Commit 1e86355a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.3/dt-pt3' of... 

Merge tag 'omap-for-v4.3/dt-pt3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Omap device tree changes for v4.3 merge window. Pretty much all
just trivial additions to configure devices for various SoCs and
boards:

- Updates for omap3-devkit8000 board support

- M3 coprosessor, regulator, mux, RTC and eMMC updates for am437x

- MMC, regmap, mux and dwc3 updates for dra7 and omap5

* tag 'omap-for-v4.3/dt-pt3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (27 commits)
  ARM: dts: omap3-devkit8000: Add ADS7846 Touchscreen support
  ARM: dts: omap3-devkit8000: add LCD panels
  ARM: dts: omap3-devkit8000: Add DSS' DVI support
  ARM: dts: omap3-devkit8000: Add S-video output support
  ARM: dts: omap3-devkit8000: Add keymap support
  ARM: dts: omap3-devkit8000: Add PMU stat support
  ARM: dts: omap3-devkit8000: Add user button support
  ARM: dts: am437x-gp-evm: Add regulator-always-on and regulator-boot-on for RTC DCDCs
  ARM: dts: AM4372: Reorder the rtc compatible string
  ARM: dts: am437x-gp-evm: Add eMMC support
  ARM: dts: am437x-gp-evm: Add gpio-hog for configuring eMMC/NAND driver
  ARM: dts: am43xx: Introduce MUX_MODE9 for pinctrl
  ARM: dts: dra72-evm: Fix spurious card insert/removal interrupt
  ARM: dts: dra7-evm: Fix spurious card insert/removal interrupt
  ARM: dts: am57xx-beagle-x15: mmc1: remove redundant pbias-supply property
  ARM: dts: dra7-evm: Add MMCSD card removal GPIO
  ARM: dts: dra72-evm: Set max clock frequency of MMC1 and MMC2
  ARM: dts: dra7-evm: add evm_3v3_sd regulator
  ARM: dts: dra72-evm: add evm_3v3_sd regulator
  ARM: dts: AM4372: Add the wkup_m3_ipc node
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 63ef577d ed05637c

arch/arm/boot/dts/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -394,6 +394,8 @@ dtb-$(CONFIG_ARCH_OMAP3) += \ 
	omap3-cm-t3530.dtb \

	omap3-cm-t3530.dtb \

	omap3-cm-t3730.dtb \

	omap3-cm-t3730.dtb \

	omap3-devkit8000.dtb \

	omap3-devkit8000.dtb \

	omap3-devkit8000-lcd43.dtb \

	omap3-devkit8000-lcd70.dtb \

	omap3-evm.dtb \

	omap3-evm.dtb \

	omap3-evm-37xx.dtb \

	omap3-evm-37xx.dtb \

	omap3-gta04a3.dtb \

	omap3-gta04a3.dtb \

arch/arm/boot/dts/am33xx.dtsi

+8 −0
Original line number Original line Diff line number Diff line
@@ -153,6 +153,14 @@ 
					};

					};

				};

				};





				wkup_m3_ipc: wkup_m3_ipc@1324 {

					compatible = "ti,am3352-wkup-m3-ipc";

					reg = <0x1324 0x24>;

					interrupts = <78>;

					ti,rproc = <&wkup_m3>;

					mboxes = <&mailbox &mbox_wkupm3>;

				};



				scm_clockdomains: clockdomains {

				scm_clockdomains: clockdomains {

				};

				};

			};

			};

arch/arm/boot/dts/am4372.dtsi

+21 −3
Original line number Original line Diff line number Diff line
@@ -141,6 +141,14 @@ 
					};

					};

				};

				};





				wkup_m3_ipc: wkup_m3_ipc@1324 {

					compatible = "ti,am4372-wkup-m3-ipc";

					reg = <0x1324 0x44>;

					interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;

					ti,rproc = <&wkup_m3>;

					mboxes = <&mailbox &mbox_wkupm3>;

				};



				scm_clockdomains: clockdomains {

				scm_clockdomains: clockdomains {

				};

				};

			};

			};
@@ -322,7 +330,7 @@ 
		};

		};





		rtc: rtc@44e3e000 {

		rtc: rtc@44e3e000 {

			compatible = "ti,am4372-rtc","ti,da830-rtc";

			compatible = "ti,am3352-rtc", "ti,da830-rtc";

			reg = <0x44e3e000 0x1000>;

			reg = <0x44e3e000 0x1000>;

			interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH

			interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;

				      GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
@@ -879,7 +887,12 @@ 
			usb1: usb@48390000 {

			usb1: usb@48390000 {

				compatible = "synopsys,dwc3";

				compatible = "synopsys,dwc3";

				reg = <0x48390000 0x10000>;

				reg = <0x48390000 0x10000>;

				interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-names = "peripheral",

						  "host",

						  "otg";

				phys = <&usb2_phy1>;

				phys = <&usb2_phy1>;

				phy-names = "usb2-phy";

				phy-names = "usb2-phy";

				maximum-speed = "high-speed";

				maximum-speed = "high-speed";
@@ -903,7 +916,12 @@ 
			usb2: usb@483d0000 {

			usb2: usb@483d0000 {

				compatible = "synopsys,dwc3";

				compatible = "synopsys,dwc3";

				reg = <0x483d0000 0x10000>;

				reg = <0x483d0000 0x10000>;

				interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-names = "peripheral",

						  "host",

						  "otg";

				phys = <&usb2_phy2>;

				phys = <&usb2_phy2>;

				phy-names = "usb2-phy";

				phy-names = "usb2-phy";

				maximum-speed = "high-speed";

				maximum-speed = "high-speed";

arch/arm/boot/dts/am437x-gp-evm.dts

+75 −1
Original line number Original line Diff line number Diff line
@@ -231,7 +231,6 @@ 




	nand_flash_x8: nand_flash_x8 {

	nand_flash_x8: nand_flash_x8 {

		pinctrl-single,pins = <

		pinctrl-single,pins = <

			0x26c(PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* spi2_cs0.gpio/eMMCorNANDsel */

			0x0  (PIN_INPUT  | MUX_MODE0)	/* gpmc_ad0.gpmc_ad0 */

			0x0  (PIN_INPUT  | MUX_MODE0)	/* gpmc_ad0.gpmc_ad0 */

			0x4  (PIN_INPUT  | MUX_MODE0)	/* gpmc_ad1.gpmc_ad1 */

			0x4  (PIN_INPUT  | MUX_MODE0)	/* gpmc_ad1.gpmc_ad1 */

			0x8  (PIN_INPUT  | MUX_MODE0)	/* gpmc_ad2.gpmc_ad2 */

			0x8  (PIN_INPUT  | MUX_MODE0)	/* gpmc_ad2.gpmc_ad2 */
@@ -441,6 +440,42 @@ 
			0x144 (PIN_INPUT_PULLDOWN | MUX_MODE7)

			0x144 (PIN_INPUT_PULLDOWN | MUX_MODE7)

		>;

		>;

	};

	};



	gpio0_pins: gpio0_pins {

		pinctrl-single,pins = <

			0x26c (PIN_OUTPUT | MUX_MODE9) /* spi2_cs0.gpio0_23 SEL_eMMCorNANDn */

		>;

	};



	emmc_pins_default: emmc_pins_default {

		pinctrl-single,pins = <

			0x00 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */

			0x04 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad1.mmc1_dat1 */

			0x08 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad2.mmc1_dat2 */

			0x0c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad3.mmc1_dat3 */

			0x10 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad4.mmc1_dat4 */

			0x14 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad5.mmc1_dat5 */

			0x18 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad6.mmc1_dat6 */

			0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */

			0x80 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */

			0x84 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn2.mmc1_cmd */

		>;

	};



	emmc_pins_sleep: emmc_pins_sleep {

		pinctrl-single,pins = <

			0x00 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad0.gpio1_0 */

			0x04 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad1.gpio1_1 */

			0x08 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad2.gpio1_2 */

			0x0c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad3.gpio1_3 */

			0x10 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad4.gpio1_4 */

			0x14 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad5.gpio1_5 */

			0x18 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad6.gpio1_6 */

			0x1c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad7.gpio1_7 */

			0x80 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_csn1.gpio1_30 */

			0x84 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_csn2.gpio1_31 */

		>;

	};

};

};





&i2c0 {

&i2c0 {
@@ -487,6 +522,8 @@ 
			regulator-name = "v1_0bat";

			regulator-name = "v1_0bat";

			regulator-min-microvolt = <1000000>;

			regulator-min-microvolt = <1000000>;

			regulator-max-microvolt = <1000000>;

			regulator-max-microvolt = <1000000>;

			regulator-boot-on;

			regulator-always-on;

		};

		};





		dcdc6: regulator-dcdc6 {

		dcdc6: regulator-dcdc6 {
@@ -494,6 +531,8 @@ 
			regulator-name = "v1_8bat";

			regulator-name = "v1_8bat";

			regulator-min-microvolt = <1800000>;

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-boot-on;

			regulator-always-on;

		};

		};





		ldo1: regulator-ldo1 {

		ldo1: regulator-ldo1 {
@@ -587,7 +626,23 @@ 
};

};





&gpio0 {

&gpio0 {

	pinctrl-names = "default";

	pinctrl-0 = <&gpio0_pins>;

	status = "okay";

	status = "okay";



	p23 {

		gpio-hog;

		gpios = <23 GPIO_ACTIVE_HIGH>;

		/* SelEMMCorNAND selects between eMMC and NAND:

		 * Low: NAND

		 * High: eMMC

		 * When changing this line make sure the newly

		 * selected device node is enabled and the previously

		 * selected device node is disabled.

		 */

		output-low;

		line-name = "SelEMMCorNAND";

	};

};

};





&gpio1 {

&gpio1 {
@@ -630,6 +685,21 @@ 
	cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;

	cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;

};

};





/* eMMC sits on mmc2 */

&mmc2 {

	/*

	 * When enabling eMMC, disable GPMC/NAND and set

	 * SelEMMCorNAND to output-high

	 */

	status = "disabled";

	vmmc-supply = <&evm_v3_3d>;

	bus-width = <8>;

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&emmc_pins_default>;

	pinctrl-1 = <&emmc_pins_sleep>;

	ti,non-removable;

};



&mmc3 {

&mmc3 {

	status = "okay";

	status = "okay";

	/* these are on the crossbar and are outlined in the

	/* these are on the crossbar and are outlined in the
@@ -710,6 +780,10 @@ 
};

};





&gpmc {

&gpmc {

	/*

	 * When enabling GPMC, disable eMMC and set

	 * SelEMMCorNAND to output-low

	 */

	status = "okay";

	status = "okay";

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&nand_flash_x8>;

	pinctrl-0 = <&nand_flash_x8>;

arch/arm/boot/dts/am57xx-beagle-x15.dts

+0 −1
Original line number Original line Diff line number Diff line
@@ -580,7 +580,6 @@ 




	vmmc-supply = <&ldo1_reg>;

	vmmc-supply = <&ldo1_reg>;

	vmmc_aux-supply = <&vdd_3v3>;

	vmmc_aux-supply = <&vdd_3v3>;

	pbias-supply = <&pbias_mmc_reg>;

	bus-width = <4>;

	bus-width = <4>;

	cd-gpios = <&gpio6 27 0>; /* gpio 219 */

	cd-gpios = <&gpio6 27 0>; /* gpio 219 */

};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE