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

Commit a1180293 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v4.21/dt' into omap-for-v5.1/dt

parents bfeffd15 7c695e87

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

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
	compatible = "grinn,am335x-chiliboard", "grinn,am335x-chilisom",

		     "ti,am33xx";



	chosen {

		stdout-path = &uart0;

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

arch/arm/boot/dts/omap3-evm-common.dtsi

+5 −2
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ 
};



&mmc2 {

	interrupts-extended = <&intc 86 &omap3_pmx_core 0x12e>;

	vmmc-supply = <&wl12xx_vmmc>;

	non-removable;

	bus-width = <4>;
@@ -132,8 +133,10 @@ 
	wlcore: wlcore@2 {

		compatible = "ti,wl1271";

		reg = <2>;

		interrupt-parent = <&gpio5>;

		interrupts = <21 IRQ_TYPE_EDGE_RISING>; /* gpio 149 */

		/* gpio_149 with uart1_rts pad as wakeirq */

		interrupts-extended = <&gpio5 21 IRQ_TYPE_EDGE_RISING>,

				      <&omap3_pmx_core 0x14e>;

		interrupt-names = "irq", "wakeup";

		ref-clock-frequency = <38400000>;

	};

};

arch/arm/boot/dts/omap3-evm-processor-common.dtsi

+9 −1
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ 
			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 */

		>;

	};
@@ -127,9 +131,13 @@ 
		>;

	};



	/*

	 * Note that gpio_150 pulled high with internal pull to prevent wlcore

	 * reset on return from off mode in idle.

	 */

	wl12xx_gpio: pinmux_wl12xx_gpio {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2180, PIN_OUTPUT | MUX_MODE4)		/* uart1_cts.gpio_150 */

			OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLUP | MUX_MODE7)		/* uart1_cts.gpio_150 */

			OMAP3_CORE1_IOPAD(0x217e, PIN_INPUT | MUX_MODE4)		/* uart1_rts.gpio_149 */

		>;

	};

arch/arm/boot/dts/omap4-droid4-xt894.dts

+7 −3
Original line number Diff line number Diff line
@@ -359,20 +359,24 @@ 


&mmc3 {

	vmmc-supply = <&wl12xx_vmmc>;

	/* uart2_tx.sdmmc3_dat1 pad as wakeirq */

	interrupts-extended = <&wakeupgen GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH

			       &omap4_pmx_core 0xde>;



	interrupt-names = "irq", "wakeup";

	non-removable;

	bus-width = <4>;

	cap-power-off-card;

	keep-power-in-suspend;



	#address-cells = <1>;

	#size-cells = <0>;

	wlcore: wlcore@2 {

		compatible = "ti,wl1285", "ti,wl1283";

		reg = <2>;

		interrupt-parent = <&gpio4>;

		interrupts = <4 IRQ_TYPE_EDGE_RISING>; /* gpio100 */

		/* gpio_100 with gpmc_wait2 pad as wakeirq */

		interrupts-extended = <&gpio4 4 IRQ_TYPE_EDGE_RISING>,

				      <&omap4_pmx_core 0x4e>;

		interrupt-names = "irq", "wakeup";

		ref-clock-frequency = <26000000>;

		tcxo-clock-frequency = <26000000>;

	};

arch/arm/boot/dts/omap4-panda-common.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -485,8 +485,10 @@ 
	wlcore: wlcore@2 {

		compatible = "ti,wl1271";

		reg = <2>;

		interrupt-parent = <&gpio2>;

		interrupts = <21 IRQ_TYPE_EDGE_RISING>; /* gpio 53 */

		/* gpio_53 with gpmc_ncs3 pad as wakeup */

		interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_RISING>,

				      <&omap4_pmx_core 0x3a>;

		interrupt-names = "irq", "wakeup";

		ref-clock-frequency = <38400000>;

	};

};