Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC fixes from Olof Johansson:
 "A slightly larger set of fixes have accrued in the last two weeks.
  Mostly a collection of the usual smaller fixes:

   - Marvell Armada: USB phy setup issues on Turris Mox

   - Broadcom: GPIO/pinmux DT mapping corrections for Stingray, MMC bus
     width fix for RPi Zero W, GPIO LED removal for RPI CM3. Also some
     maintainer updates.

   - OMAP: Fixlets for display config, interrupt settings for wifi, some
     clock/PM pieces. Also IOMMU regression fix and a ti-sysc
     no-watchdog regression fix.

   - i.MX: A few fixes around PM/settings, some devicetree fixlets and
     catching up with config option changes in DRM

   - Rockchip: RockRro64 misc DT fixups, Hugsun X99 USB-C, Kevin display
     panel settings

  ... and some smaller fixes for Davinci (backlight, McBSP DMA),
  Allwinner (phy regulators, PMU removal on A64, etc)"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (42 commits)
  ARM: dts: stm32: relax qspi pins slew-rate for stm32mp157
  MAINTAINERS: Update the Spreadtrum SoC maintainer
  MAINTAINERS: Remove Gregory and Brian for ARCH_BRCMSTB
  ARM: dts: bcm2837-rpi-cm3: Avoid leds-gpio probing issue
  bus: ti-sysc: Fix watchdog quirk handling
  ARM: OMAP2+: Add pdata for OMAP3 ISP IOMMU
  ARM: OMAP2+: Plug in device_enable/idle ops for IOMMUs
  ARM: davinci_all_defconfig: enable GPIO backlight
  ARM: davinci: dm365: Fix McBSP dma_slave_map entry
  ARM: dts: bcm2835-rpi-zero-w: Fix bus-width of sdhci
  ARM: imx_v6_v7_defconfig: Enable CONFIG_DRM_MSM
  arm64: dts: imx8mn: Use correct clock for usdhc's ipg clk
  arm64: dts: imx8mm: Use correct clock for usdhc's ipg clk
  arm64: dts: imx8mq: Use correct clock for usdhc's ipg clk
  ARM: dts: imx7s: Correct GPT's ipg clock source
  ARM: dts: vf610-zii-scu4-aib: Specify 'i2c-mux-idle-disconnect'
  ARM: dts: imx6q-logicpd: Re-Enable SNVS power key
  arm64: dts: lx2160a: Correct CPU core idle state name
  mailmap: Add Simon Arlott (replacement for expired email address)
  arm64: dts: rockchip: Fix override mode for rk3399-kevin panel
  ...

20 files changed, 57 insertions, 33 deletions

diff --git a/arch/arm/boot/dts/am3874-iceboard.dts b/arch/arm/boot/dts/am3874-iceboard.dts
index 883fb85135d4..1b4b2b0500e4 100644
--- a/arch/arm/boot/dts/am3874-iceboard.dts
+++ b/arch/arm/boot/dts/am3874-iceboard.dts
@@ -111,13 +111,13 @@
                 reg = <0x70>;
                 #address-cells = <1>;
                 #size-cells = <0>;
+                i2c-mux-idle-disconnect;
 
                 i2c@0 {
                         /* FMC A */
                         #address-cells = <1>;
                         #size-cells = <0>;
                         reg = <0>;
-                        i2c-mux-idle-disconnect;
                 };
 
                 i2c@1 {
@@ -125,7 +125,6 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         reg = <1>;
-                        i2c-mux-idle-disconnect;
                 };
 
                 i2c@2 {
@@ -133,7 +132,6 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         reg = <2>;
-                        i2c-mux-idle-disconnect;
                 };
 
                 i2c@3 {
@@ -141,7 +139,6 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         reg = <3>;
-                        i2c-mux-idle-disconnect;
                 };
 
                 i2c@4 {
@@ -149,14 +146,12 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         reg = <4>;
-                        i2c-mux-idle-disconnect;
                 };
 
                 i2c@5 {
                         #address-cells = <1>;
                         #size-cells = <0>;
                         reg = <5>;
-                        i2c-mux-idle-disconnect;
 
                         ina230@40 { compatible = "ti,ina230"; reg = <0x40>; shunt-resistor = <5000>; };
                         ina230@41 { compatible = "ti,ina230"; reg = <0x41>; shunt-resistor = <5000>; };
@@ -182,14 +177,12 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         reg = <6>;
-                        i2c-mux-idle-disconnect;
                 };
 
                 i2c@7 {
                         #address-cells = <1>;
                         #size-cells = <0>;
                         reg = <7>;
-                        i2c-mux-idle-disconnect;
 
                         u41: pca9575@20 {
                                 compatible = "nxp,pca9575";
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
index 09a088f98566..b75af21069f9 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -113,6 +113,7 @@
         #address-cells = <1>;
         #size-cells = <0>;
         pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>;
+        bus-width = <4>;
         mmc-pwrseq = <&wifi_pwrseq>;
         non-removable;
         status = "okay";
diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
index 7c3cb7ece6cb..925cb37c22f0 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
+++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
@@ -9,6 +9,14 @@
                 reg = <0 0x40000000>;
         };
 
+        leds {
+                /*
+                 * Since there is no upstream GPIO driver yet,
+                 * remove the incomplete node.
+                 */
+                /delete-node/ act;
+        };
+
         reg_3v3: fixed-regulator {
                 compatible = "regulator-fixed";
                 regulator-name = "3V3";
diff --git a/arch/arm/boot/dts/imx6-logicpd-som.dtsi b/arch/arm/boot/dts/imx6-logicpd-som.dtsi
index 7ceae3573248..547fb141ec0c 100644
--- a/arch/arm/boot/dts/imx6-logicpd-som.dtsi
+++ b/arch/arm/boot/dts/imx6-logicpd-som.dtsi
@@ -207,6 +207,10 @@
         vin-supply = <&sw1c_reg>;
 };
 
+&snvs_poweroff {
+        status = "okay";
+};
+
 &iomuxc {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_hog>;
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 710f850e785c..e2e604d6ba0b 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -448,7 +448,7 @@
                                 compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
                                 reg = <0x302d0000 0x10000>;
                                 interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks IMX7D_CLK_DUMMY>,
+                                clocks = <&clks IMX7D_GPT1_ROOT_CLK>,
                                          <&clks IMX7D_GPT1_ROOT_CLK>;
                                 clock-names = "ipg", "per";
                         };
@@ -457,7 +457,7 @@
                                 compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
                                 reg = <0x302e0000 0x10000>;
                                 interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks IMX7D_CLK_DUMMY>,
+                                clocks = <&clks IMX7D_GPT2_ROOT_CLK>,
                                          <&clks IMX7D_GPT2_ROOT_CLK>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
@@ -467,7 +467,7 @@
                                 compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
                                 reg = <0x302f0000 0x10000>;
                                 interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks IMX7D_CLK_DUMMY>,
+                                clocks = <&clks IMX7D_GPT3_ROOT_CLK>,
                                          <&clks IMX7D_GPT3_ROOT_CLK>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
@@ -477,7 +477,7 @@
                                 compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
                                 reg = <0x30300000 0x10000>;
                                 interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks IMX7D_CLK_DUMMY>,
+                                clocks = <&clks IMX7D_GPT4_ROOT_CLK>,
                                          <&clks IMX7D_GPT4_ROOT_CLK>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
index 3fdd0a72f87f..506b118e511a 100644
--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@ -192,3 +192,7 @@
 &twl_gpio {
         ti,use-leds;
 };
+
+&twl_keypad {
+        status = "disabled";
+};
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index 4454449de00c..a40fe8d49da6 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -369,7 +369,7 @@
                 compatible = "ti,wl1285", "ti,wl1283";
                 reg = <2>;
                 /* gpio_100 with gpmc_wait2 pad as wakeirq */
-                interrupts-extended = <&gpio4 4 IRQ_TYPE_EDGE_RISING>,
+                interrupts-extended = <&gpio4 4 IRQ_TYPE_LEVEL_HIGH>,
                                       <&omap4_pmx_core 0x4e>;
                 interrupt-names = "irq", "wakeup";
                 ref-clock-frequency = <26000000>;
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index 14be2ecb62b1..55ea8b6189af 100644
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -474,7 +474,7 @@
                 compatible = "ti,wl1271";
                 reg = <2>;
                 /* gpio_53 with gpmc_ncs3 pad as wakeup */
-                interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_RISING>,
+                interrupts-extended = <&gpio2 21 IRQ_TYPE_LEVEL_HIGH>,
                                       <&omap4_pmx_core 0x3a>;
                 interrupt-names = "irq", "wakeup";
                 ref-clock-frequency = <38400000>;
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 3c274965ff40..91480ac1f328 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -512,7 +512,7 @@
                 compatible = "ti,wl1281";
                 reg = <2>;
                 interrupt-parent = <&gpio1>;
-                interrupts = <21 IRQ_TYPE_EDGE_RISING>; /* gpio 53 */
+                interrupts = <21 IRQ_TYPE_LEVEL_HIGH>; /* gpio 53 */
                 ref-clock-frequency = <26000000>;
                 tcxo-clock-frequency = <26000000>;
         };
diff --git a/arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi b/arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi
index 6dbbc9b3229c..d0032213101e 100644
--- a/arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi
+++ b/arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi
@@ -69,7 +69,7 @@
                 compatible = "ti,wl1271";
                 reg = <2>;
                 interrupt-parent = <&gpio2>;
-                interrupts = <9 IRQ_TYPE_EDGE_RISING>; /* gpio 41 */
+                interrupts = <9 IRQ_TYPE_LEVEL_HIGH>; /* gpio 41 */
                 ref-clock-frequency = <38400000>;
         };
 };
diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
index 7fff555ee394..68ac04641bdb 100644
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -362,7 +362,7 @@
                 pinctrl-names = "default";
                 pinctrl-0 = <&wlcore_irq_pin>;
                 interrupt-parent = <&gpio1>;
-                interrupts = <14 IRQ_TYPE_EDGE_RISING>; /* gpio 14 */
+                interrupts = <14 IRQ_TYPE_LEVEL_HIGH>;  /* gpio 14 */
                 ref-clock-frequency = <26000000>;
         };
 };
diff --git a/arch/arm/boot/dts/omap54xx-clocks.dtsi b/arch/arm/boot/dts/omap54xx-clocks.dtsi
index fac2e57dcca9..4791834dacb2 100644
--- a/arch/arm/boot/dts/omap54xx-clocks.dtsi
+++ b/arch/arm/boot/dts/omap54xx-clocks.dtsi
@@ -1146,7 +1146,7 @@
                 };
         };
 
-        gpu_cm: clock-controller@1500 {
+        gpu_cm: gpu_cm@1500 {
                 compatible = "ti,omap4-cm";
                 reg = <0x1500 0x100>;
                 #address-cells = <1>;
diff --git a/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
index e4a0d51ec3a8..0a3a7d66737b 100644
--- a/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
@@ -609,13 +609,13 @@
                                                  <STM32_PINMUX('F', 6, AF9)>; /* QSPI_BK1_IO3 */
                                         bias-disable;
                                         drive-push-pull;
-                                        slew-rate = <3>;
+                                        slew-rate = <1>;
                                 };
                                 pins2 {
                                         pinmux = <STM32_PINMUX('B', 6, AF10)>; /* QSPI_BK1_NCS */
                                         bias-pull-up;
                                         drive-push-pull;
-                                        slew-rate = <3>;
+                                        slew-rate = <1>;
                                 };
                         };
 
@@ -637,13 +637,13 @@
                                                  <STM32_PINMUX('G', 7, AF11)>; /* QSPI_BK2_IO3 */
                                         bias-disable;
                                         drive-push-pull;
-                                        slew-rate = <3>;
+                                        slew-rate = <1>;
                                 };
                                 pins2 {
                                         pinmux = <STM32_PINMUX('C', 0, AF10)>; /* QSPI_BK2_NCS */
                                         bias-pull-up;
                                         drive-push-pull;
-                                        slew-rate = <3>;
+                                        slew-rate = <1>;
                                 };
                         };
 
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 874231be04e4..8aebefd6accf 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -380,9 +380,8 @@
                         compatible = "allwinner,sun7i-a20-csi0";
                         reg = <0x01c09000 0x1000>;
                         interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI0>,
-                                 <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>;
-                        clock-names = "bus", "mod", "isp", "ram";
+                        clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>;
+                        clock-names = "bus", "isp", "ram";
                         resets = <&ccu RST_CSI0>;
                         status = "disabled";
                 };
diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
index dc8a5f37a1ef..c8ebb23c4e02 100644
--- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
+++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
@@ -602,6 +602,7 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
                 reg = <0x70>;
+                i2c-mux-idle-disconnect;
 
                 sff0_i2c: i2c@1 {
                         #address-cells = <1>;
@@ -640,6 +641,7 @@
                 reg = <0x71>;
                 #address-cells = <1>;
                 #size-cells = <0>;
+                i2c-mux-idle-disconnect;
 
                 sff5_i2c: i2c@1 {
                         #address-cells = <1>;
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig
index 01e3c0f4be92..231f8973bbb2 100644
--- a/arch/arm/configs/davinci_all_defconfig
+++ b/arch/arm/configs/davinci_all_defconfig
@@ -167,6 +167,7 @@ CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DA8XX=y
 CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_GPIO=m
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 CONFIG_SOUND=m
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 9bfffbe22d53..0f7381ee0c37 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -276,6 +276,7 @@ CONFIG_VIDEO_OV5640=m
 CONFIG_VIDEO_OV5645=m
 CONFIG_IMX_IPUV3_CORE=y
 CONFIG_DRM=y
+CONFIG_DRM_MSM=y
 CONFIG_DRM_PANEL_LVDS=y
 CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index d3f50971e451..40d7f1a4fc45 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -356,15 +356,15 @@ CONFIG_DRM_OMAP_CONNECTOR_HDMI=m
 CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m
 CONFIG_DRM_OMAP_PANEL_DPI=m
 CONFIG_DRM_OMAP_PANEL_DSI_CM=m
-CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=m
-CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02=m
-CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01=m
-CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m
-CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m
-CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=m
 CONFIG_DRM_TILCDC=m
 CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_TI_TFP410=m
+CONFIG_DRM_PANEL_LG_LB035Q02=m
+CONFIG_DRM_PANEL_NEC_NL8048HL11=m
+CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m
+CONFIG_DRM_PANEL_SONY_ACX565AKM=m
+CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
+CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 8062412be70f..9fc5c73cc0be 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -462,8 +462,8 @@ static s8 dm365_queue_priority_mapping[][2] = {
 };
 
 static const struct dma_slave_map dm365_edma_map[] = {
-        { "davinci-mcbsp.0", "tx", EDMA_FILTER_PARAM(0, 2) },
-        { "davinci-mcbsp.0", "rx", EDMA_FILTER_PARAM(0, 3) },
+        { "davinci-mcbsp", "tx", EDMA_FILTER_PARAM(0, 2) },
+        { "davinci-mcbsp", "rx", EDMA_FILTER_PARAM(0, 3) },
         { "davinci_voicecodec", "tx", EDMA_FILTER_PARAM(0, 2) },
         { "davinci_voicecodec", "rx", EDMA_FILTER_PARAM(0, 3) },
         { "spi_davinci.2", "tx", EDMA_FILTER_PARAM(0, 10) },
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index d942a3357090..2efd18e8824c 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -89,6 +89,13 @@ static struct iommu_platform_data omap3_iommu_pdata = {
         .reset_name = "mmu",
         .assert_reset = omap_device_assert_hardreset,
         .deassert_reset = omap_device_deassert_hardreset,
+        .device_enable = omap_device_enable,
+        .device_idle = omap_device_idle,
+};
+
+static struct iommu_platform_data omap3_iommu_isp_pdata = {
+        .device_enable = omap_device_enable,
+        .device_idle = omap_device_idle,
 };
 
 static int omap3_sbc_t3730_twl_callback(struct device *dev,
@@ -424,6 +431,8 @@ static struct iommu_platform_data omap4_iommu_pdata = {
         .reset_name = "mmu_cache",
         .assert_reset = omap_device_assert_hardreset,
         .deassert_reset = omap_device_deassert_hardreset,
+        .device_enable = omap_device_enable,
+        .device_idle = omap_device_idle,
 };
 #endif
 
@@ -617,6 +626,8 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = {
 #ifdef CONFIG_ARCH_OMAP3
         OF_DEV_AUXDATA("ti,omap2-iommu", 0x5d000000, "5d000000.mmu",
                        &omap3_iommu_pdata),
+        OF_DEV_AUXDATA("ti,omap2-iommu", 0x480bd400, "480bd400.mmu",
+                       &omap3_iommu_isp_pdata),
         OF_DEV_AUXDATA("ti,omap3-smartreflex-core", 0x480cb000,
                        "480cb000.smartreflex", &omap_sr_pdata[OMAP_SR_CORE]),
         OF_DEV_AUXDATA("ti,omap3-smartreflex-mpu-iva", 0x480c9000,