Commit 36daa831 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 30d7030b 8928e917
...@@ -279,6 +279,7 @@ &sdhi3 { ...@@ -279,6 +279,7 @@ &sdhi3 {
mmc-hs200-1_8v; mmc-hs200-1_8v;
non-removable; non-removable;
fixed-emmc-driver-type = <1>; fixed-emmc-driver-type = <1>;
status = "okay";
}; };
&usb_extal_clk { &usb_extal_clk {
......
...@@ -97,7 +97,7 @@ memory@48000000 { ...@@ -97,7 +97,7 @@ memory@48000000 {
reg = <0x0 0x48000000 0x0 0x18000000>; reg = <0x0 0x48000000 0x0 0x18000000>;
}; };
reg_1p8v: regulator0 { reg_1p8v: regulator-1p8v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "fixed-1.8V"; regulator-name = "fixed-1.8V";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
...@@ -106,7 +106,7 @@ reg_1p8v: regulator0 { ...@@ -106,7 +106,7 @@ reg_1p8v: regulator0 {
regulator-always-on; regulator-always-on;
}; };
reg_3p3v: regulator1 { reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "fixed-3.3V"; regulator-name = "fixed-3.3V";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -115,7 +115,7 @@ reg_3p3v: regulator1 { ...@@ -115,7 +115,7 @@ reg_3p3v: regulator1 {
regulator-always-on; regulator-always-on;
}; };
reg_12p0v: regulator1 { reg_12p0v: regulator-12p0v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "D12.0V"; regulator-name = "D12.0V";
regulator-min-microvolt = <12000000>; regulator-min-microvolt = <12000000>;
......
...@@ -630,6 +630,9 @@ int geni_se_tx_dma_prep(struct geni_se *se, void *buf, size_t len, ...@@ -630,6 +630,9 @@ int geni_se_tx_dma_prep(struct geni_se *se, void *buf, size_t len,
struct geni_wrapper *wrapper = se->wrapper; struct geni_wrapper *wrapper = se->wrapper;
u32 val; u32 val;
if (!wrapper)
return -EINVAL;
*iova = dma_map_single(wrapper->dev, buf, len, DMA_TO_DEVICE); *iova = dma_map_single(wrapper->dev, buf, len, DMA_TO_DEVICE);
if (dma_mapping_error(wrapper->dev, *iova)) if (dma_mapping_error(wrapper->dev, *iova))
return -EIO; return -EIO;
...@@ -663,6 +666,9 @@ int geni_se_rx_dma_prep(struct geni_se *se, void *buf, size_t len, ...@@ -663,6 +666,9 @@ int geni_se_rx_dma_prep(struct geni_se *se, void *buf, size_t len,
struct geni_wrapper *wrapper = se->wrapper; struct geni_wrapper *wrapper = se->wrapper;
u32 val; u32 val;
if (!wrapper)
return -EINVAL;
*iova = dma_map_single(wrapper->dev, buf, len, DMA_FROM_DEVICE); *iova = dma_map_single(wrapper->dev, buf, len, DMA_FROM_DEVICE);
if (dma_mapping_error(wrapper->dev, *iova)) if (dma_mapping_error(wrapper->dev, *iova))
return -EIO; return -EIO;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment