11 files changed, 197 insertions, 15 deletions

diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index b50e9efc7741..fd8bd3a254fe 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -378,6 +378,10 @@
                 status = "okay";
                 dr_mode = "host";
         };
+
+        dma-controller@07402000  {
+                status = "okay";
+        };
 };
 
 &epwmss2 {
diff --git a/arch/arm/boot/dts/omap3-cm-t3530.dts b/arch/arm/boot/dts/omap3-cm-t3530.dts
index 9faf1cd1dcaa..d1458496520e 100644
--- a/arch/arm/boot/dts/omap3-cm-t3530.dts
+++ b/arch/arm/boot/dts/omap3-cm-t3530.dts
@@ -9,4 +9,40 @@
 / {
         model = "CompuLab CM-T3530";
         compatible = "compulab,omap3-cm-t3530", "ti,omap34xx", "ti,omap3";
+
+        /* Regulator to trigger the reset signal of the Wifi module */
+        mmc2_sdio_reset: regulator-mmc2-sdio-reset {
+                compatible = "regulator-fixed";
+                regulator-name = "regulator-mmc2-sdio-reset";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&twl_gpio 2 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+};
+
+&omap3_pmx_core {
+        mmc2_pins: pinmux_mmc2_pins {
+                pinctrl-single,pins = <
+                        OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP | MUX_MODE0)         /* sdmmc2_clk.sdmmc2_clk */
+                        OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP | MUX_MODE0)         /* sdmmc2_cmd.sdmmc2_cmd */
+                        OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0)         /* sdmmc2_dat0.sdmmc2_dat0 */
+                        OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0)         /* sdmmc2_dat1.sdmmc2_dat1 */
+                        OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP | MUX_MODE0)         /* sdmmc2_dat2.sdmmc2_dat2 */
+                        OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0)         /* sdmmc2_dat3.sdmmc2_dat3 */
+                        OMAP3_CORE1_IOPAD(0x2164, PIN_OUTPUT | MUX_MODE1)               /* sdmmc2_dat4.sdmmc2_dir_dat0 */
+                        OMAP3_CORE1_IOPAD(0x2166, PIN_OUTPUT | MUX_MODE1)               /* sdmmc2_dat5.sdmmc2_dir_dat1 */
+                        OMAP3_CORE1_IOPAD(0x2168, PIN_OUTPUT | MUX_MODE1)               /* sdmmc2_dat6.sdmmc2_dir_cmd */
+                        OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT | MUX_MODE1)                /* sdmmc2_dat7.sdmmc2_clkin */
+                >;
+        };
+};
+
+&mmc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mmc2_pins>;
+        vmmc-supply = <&mmc2_sdio_reset>;
+        non-removable;
+        bus-width = <4>;
+        cap-power-off-card;
 };
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index b91117a38100..a089e6e00457 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -416,10 +416,19 @@
                 };
 
                 mmu_isp: mmu@480bd400 {
-                        compatible = "ti,omap3-mmu-isp";
-                        ti,hwmods = "mmu_isp";
+                        compatible = "ti,omap2-iommu";
                         reg = <0x480bd400 0x80>;
-                        interrupts = <8>;
+                        interrupts = <24>;
+                        ti,hwmods = "mmu_isp";
+                        ti,#tlb-entries = <8>;
+                };
+
+                mmu_iva: mmu@5d000000 {
+                        compatible = "ti,omap2-iommu";
+                        reg = <0x5d000000 0x80>;
+                        interrupts = <28>;
+                        ti,hwmods = "mmu_iva";
+                        status = "disabled";
                 };
 
                 wdt2: wdt@48314000 {
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 4e15be59b839..3dfec86c1dc9 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -467,6 +467,21 @@
                         dma-names = "tx", "rx";
                 };
 
+                mmu_dsp: mmu@4a066000 {
+                        compatible = "ti,omap4-iommu";
+                        reg = <0x4a066000 0x100>;
+                        interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+                        ti,hwmods = "mmu_dsp";
+                };
+
+                mmu_ipu: mmu@55082000 {
+                        compatible = "ti,omap4-iommu";
+                        reg = <0x55082000 0x100>;
+                        interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+                        ti,hwmods = "mmu_ipu";
+                        ti,iommu-bus-err-back;
+                };
+
                 wdt2: wdt@4a314000 {
                         compatible = "ti,omap4-wdt", "ti,omap3-wdt";
                         reg = <0x4a314000 0x80>;
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 859a800a77fc..757f0b9343c2 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -520,6 +520,21 @@
                         dma-names = "tx", "rx";
                 };
 
+                mmu_dsp: mmu@4a066000 {
+                        compatible = "ti,omap4-iommu";
+                        reg = <0x4a066000 0x100>;
+                        interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+                        ti,hwmods = "mmu_dsp";
+                };
+
+                mmu_ipu: mmu@55082000 {
+                        compatible = "ti,omap4-iommu";
+                        reg = <0x55082000 0x100>;
+                        interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+                        ti,hwmods = "mmu_ipu";
+                        ti,iommu-bus-err-back;
+                };
+
                 keypad: keypad@4ae1c000 {
                         compatible = "ti,omap4-keypad";
                         reg = <0x4ae1c000 0x400>;
diff --git a/arch/arm/mach-omap2/clockdomains3xxx_data.c b/arch/arm/mach-omap2/clockdomains3xxx_data.c
index e6b91e552d3d..f03dc97921ad 100644
--- a/arch/arm/mach-omap2/clockdomains3xxx_data.c
+++ b/arch/arm/mach-omap2/clockdomains3xxx_data.c
@@ -247,7 +247,7 @@ static struct clockdomain neon_clkdm = {
 static struct clockdomain iva2_clkdm = {
         .name           = "iva2_clkdm",
         .pwrdm          = { .name = "iva2_pwrdm" },
-        .flags          = CLKDM_CAN_HWSUP_SWSUP,
+        .flags          = CLKDM_CAN_SWSUP,
         .dep_bit        = OMAP3430_PM_WKDEP_MPU_EN_IVA2_SHIFT,
         .wkdep_srcs     = iva2_wkdeps,
         .clktrctrl_mask = OMAP3430_CLKTRCTRL_IVA2_MASK,
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 0dd6398bade4..e58609b312c7 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -229,6 +229,9 @@ static struct omap_iommu_arch_data omap3_isp_iommu = {
 
 int omap3_init_camera(struct isp_platform_data *pdata)
 {
+        if (of_have_populated_dt())
+                omap3_isp_iommu.name = "480bd400.mmu";
+
         omap3isp_device.dev.platform_data = pdata;
         omap3isp_device.dev.archdata.iommu = &omap3_isp_iommu;
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 4c3b1e6df508..9c7e23aa0e7f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -3029,8 +3029,6 @@ static struct omap_hwmod omap3xxx_mmu_isp_hwmod = {
         .flags          = HWMOD_NO_IDLEST,
 };