Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 937b5991 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.15/dt-part3' of... 

Merge tag 'omap-for-v3.15/dt-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "omap device tree changes for v3.15, part 3" from Tony Lindgren:

Device tree related changes to the omap iommu driver as that
is finally getting updated. Also few trivial board related
.dts updates to add more devices.

* tag 'omap-for-v3.15/dt-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: Add MMC2/SDIO/WLAN support for cm-t3530
  ARM: dts: am335x-evmsk: enable DMA controller for USB
  ARM: dts: OMAP5: Add IOMMU nodes
  ARM: dts: OMAP4: Add IOMMU nodes
  ARM: dts: OMAP3: Add IVA IOMMU node
  ARM: dts: OMAP3: Update ISP IOMMU node
  ARM: OMAP2+: extend iommu pdata-quirks to OMAP5
  ARM: OMAP5: hwmod data: add mmu data for ipu & dsp
  ARM: OMAP2+: use pdata quirks for iommu reset lines
  ARM: OMAP2+: change the ISP device archdata MMU name for DT
  ARM: OMAP3: fix iva mmu programming issues
  ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a38f8913 e1902bbe

arch/arm/boot/dts/am335x-evmsk.dts

+4 −0
Original line number Diff line number Diff line
@@ -378,6 +378,10 @@ 
		status = "okay";

		dr_mode = "host";

	};



	dma-controller@07402000  {

		status = "okay";

	};

};



&epwmss2 {

arch/arm/boot/dts/omap3-cm-t3530.dts

+36 −0
Original line number Diff line number Diff line
@@ -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;

};

arch/arm/boot/dts/omap3.dtsi

+12 −3
Original line number Diff line number Diff line
@@ -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 {

arch/arm/boot/dts/omap4.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/omap5.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -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>;