Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+10
-3
+1
arch/arm64/boot/dts/renesas/hihope-common.dtsi
+1
arch/arm64/boot/dts/renesas/hihope-common.dtsi
+3
-3
arch/arm64/boot/dts/renesas/r8a77995-draak.dts
+3
-3
arch/arm64/boot/dts/renesas/r8a77995-draak.dts
···
97
97
reg = <0x0 0x48000000 0x0 0x18000000>;
98
98
};
99
99
100
-
reg_1p8v: regulator0 {
100
+
reg_1p8v: regulator-1p8v {
101
101
compatible = "regulator-fixed";
102
102
regulator-name = "fixed-1.8V";
103
103
regulator-min-microvolt = <1800000>;
···
106
106
regulator-always-on;
107
107
};
108
108
109
-
reg_3p3v: regulator1 {
109
+
reg_3p3v: regulator-3p3v {
110
110
compatible = "regulator-fixed";
111
111
regulator-name = "fixed-3.3V";
112
112
regulator-min-microvolt = <3300000>;
···
115
115
regulator-always-on;
116
116
};
117
117
118
-
reg_12p0v: regulator1 {
118
+
reg_12p0v: regulator-12p0v {
119
119
compatible = "regulator-fixed";
120
120
regulator-name = "D12.0V";
121
121
regulator-min-microvolt = <12000000>;
+6
drivers/soc/qcom/qcom-geni-se.c
+6
drivers/soc/qcom/qcom-geni-se.c
···
630
630
struct geni_wrapper *wrapper = se->wrapper;
631
631
u32 val;
632
632
633
+
if (!wrapper)
634
+
return -EINVAL;
635
+
633
636
*iova = dma_map_single(wrapper->dev, buf, len, DMA_TO_DEVICE);
634
637
if (dma_mapping_error(wrapper->dev, *iova))
635
638
return -EIO;
···
665
662
{
666
663
struct geni_wrapper *wrapper = se->wrapper;
667
664
u32 val;
665
+
666
+
if (!wrapper)
667
+
return -EINVAL;
668
668
669
669
*iova = dma_map_single(wrapper->dev, buf, len, DMA_FROM_DEVICE);
670
670
if (dma_mapping_error(wrapper->dev, *iova))