Skip to content

Commit 36daa83

Browse files
committed
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "There are three more fixes for this week: - The Windows-on-ARM laptops require a workaround to prevent crashing at boot from ACPI - The Renesas 'draak' board needs one bugfix for the backlight regulator - Also for Renesas, the 'hihope' board accidentally had its eMMC turned off in the 5.3 merge window" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: soc: qcom: geni: Provide parameter error checking arm64: dts: renesas: hihope-common: Fix eMMC status arm64: dts: renesas: r8a77995: draak: Fix backlight regulator name
2 parents 30d7030 + 8928e91 commit 36daa83

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

arch/arm64/boot/dts/renesas/hihope-common.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@
279279
mmc-hs200-1_8v;
280280
non-removable;
281281
fixed-emmc-driver-type = <1>;
282+
status = "okay";
282283
};
283284

284285
&usb_extal_clk {

arch/arm64/boot/dts/renesas/r8a77995-draak.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
reg = <0x0 0x48000000 0x0 0x18000000>;
9898
};
9999

100-
reg_1p8v: regulator0 {
100+
reg_1p8v: regulator-1p8v {
101101
compatible = "regulator-fixed";
102102
regulator-name = "fixed-1.8V";
103103
regulator-min-microvolt = <1800000>;
@@ -106,7 +106,7 @@
106106
regulator-always-on;
107107
};
108108

109-
reg_3p3v: regulator1 {
109+
reg_3p3v: regulator-3p3v {
110110
compatible = "regulator-fixed";
111111
regulator-name = "fixed-3.3V";
112112
regulator-min-microvolt = <3300000>;
@@ -115,7 +115,7 @@
115115
regulator-always-on;
116116
};
117117

118-
reg_12p0v: regulator1 {
118+
reg_12p0v: regulator-12p0v {
119119
compatible = "regulator-fixed";
120120
regulator-name = "D12.0V";
121121
regulator-min-microvolt = <12000000>;

drivers/soc/qcom/qcom-geni-se.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,9 @@ int geni_se_tx_dma_prep(struct geni_se *se, void *buf, size_t len,
630630
struct geni_wrapper *wrapper = se->wrapper;
631631
u32 val;
632632

633+
if (!wrapper)
634+
return -EINVAL;
635+
633636
*iova = dma_map_single(wrapper->dev, buf, len, DMA_TO_DEVICE);
634637
if (dma_mapping_error(wrapper->dev, *iova))
635638
return -EIO;
@@ -663,6 +666,9 @@ int geni_se_rx_dma_prep(struct geni_se *se, void *buf, size_t len,
663666
struct geni_wrapper *wrapper = se->wrapper;
664667
u32 val;
665668

669+
if (!wrapper)
670+
return -EINVAL;
671+
666672
*iova = dma_map_single(wrapper->dev, buf, len, DMA_FROM_DEVICE);
667673
if (dma_mapping_error(wrapper->dev, *iova))
668674
return -EIO;

0 commit comments

Comments
 (0)