Commit e41006c2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.14/dt-signed' of... 

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

Split omap3 core padconf area into two as some of the registers in
the padconf area are not accessible and used for other devices.
Also fix the interrupt number for omap2 RNG, and add basic support
for sbc-3xxx with cm-t3730.

Note that the minor merge conflicts for omap_hwmod_2xxx_ipblock_data.c
can be solved by just dropping the legacy hwmod data for interrupts
for v3.14.

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

:
  ARM: dts: OMAP2: fix interrupt number for rng
  ARM: dts: Split omap3 pinmux core device
  ARM: dts: Add omap specific pinctrl defines to use padconf addresses
  ARM: dts: Add support for sbc-3xxx with cm-t3730

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5cea04ba e37e1cb0

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -180,6 +180,8 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap2420-n810-wimax.dtb \

	omap3430-sdp.dtb \

	omap3-beagle.dtb \

	omap3-cm-t3730.dtb \

	omap3-sbc-t3730.dtb \

	omap3-devkit8000.dtb \

	omap3-beagle-xm.dtb \

	omap3-evm.dtb \

arch/arm/boot/dts/omap2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ 
			compatible = "ti,omap2-rng";

			ti,hwmods = "rng";

			reg = <0x480a0000 0x50>;

			interrupts = <36>;

			interrupts = <52>;

		};



		sham: sham@480a4000 {

arch/arm/boot/dts/omap3-beagle-xm.dts

+26 −14
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
&omap3_pmx_core {

	pinctrl-names = "default";

	pinctrl-0 = <

			&hsusbb2_pins

			&hsusb2_pins

	>;



	uart3_pins: pinmux_uart3_pins {
@@ -109,20 +109,32 @@ 
		>;

	};



	hsusbb2_pins: pinmux_hsusbb2_pins {

	hsusb2_pins: pinmux_hsusb2_pins {

		pinctrl-single,pins = <

			0x5c0 (PIN_OUTPUT | MUX_MODE3)		/* etk_d10.hsusb2_clk */

			0x5c2 (PIN_OUTPUT | MUX_MODE3)		/* etk_d11.hsusb2_stp */

			0x5c4 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d12.hsusb2_dir */

			0x5c6 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d13.hsusb2_nxt */

			0x5c8 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d14.hsusb2_data0 */

			0x5cA (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d15.hsusb2_data1 */

			0x1a4 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi1_cs3.hsusb2_data2 */

			0x1a6 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_clk.hsusb2_data7 */

			0x1a8 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_simo.hsusb2_data4 */

			0x1aa (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_somi.hsusb2_data5 */

			0x1ac (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_cs0.hsusb2_data6 */

			0x1ae (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_cs1.hsusb2_data3 */

			OMAP3_CORE1_IOPAD(0x21d4, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi1_cs3.hsusb2_data2 */

			OMAP3_CORE1_IOPAD(0x21d6, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_clk.hsusb2_data7 */

			OMAP3_CORE1_IOPAD(0x21d8, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_simo.hsusb2_data4 */

			OMAP3_CORE1_IOPAD(0x21da, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_somi.hsusb2_data5 */

			OMAP3_CORE1_IOPAD(0x21dc, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_cs0.hsusb2_data6 */

			OMAP3_CORE1_IOPAD(0x21de, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_cs1.hsusb2_data3 */

		>;

	};

};



&omap3_pmx_core2 {

	pinctrl-names = "default";

	pinctrl-0 = <

			&hsusb2_2_pins

	>;



	hsusb2_2_pins: pinmux_hsusb2_2_pins {

		pinctrl-single,pins = <

			OMAP3630_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3)		/* etk_d10.hsusb2_clk */

			OMAP3630_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3)		/* etk_d11.hsusb2_stp */

			OMAP3630_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d12.hsusb2_dir */

			OMAP3630_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d13.hsusb2_nxt */

			OMAP3630_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d14.hsusb2_data0 */

			OMAP3630_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d15.hsusb2_data1 */

		>;

	};

};

arch/arm/boot/dts/omap3-beagle.dts

+26 −14
Original line number Diff line number Diff line
@@ -93,23 +93,17 @@ 
&omap3_pmx_core {

	pinctrl-names = "default";

	pinctrl-0 = <

			&hsusbb2_pins

			&hsusb2_pins

	>;



	hsusbb2_pins: pinmux_hsusbb2_pins {

	hsusb2_pins: pinmux_hsusb2_pins {

		pinctrl-single,pins = <

			0x5c0 (PIN_OUTPUT | MUX_MODE3)		/* etk_d10.hsusb2_clk */

			0x5c2 (PIN_OUTPUT | MUX_MODE3)		/* etk_d11.hsusb2_stp */

			0x5c4 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d12.hsusb2_dir */

			0x5c6 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d13.hsusb2_nxt */

			0x5c8 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d14.hsusb2_data0 */

			0x5cA (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d15.hsusb2_data1 */

			0x1a4 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi1_cs3.hsusb2_data2 */

			0x1a6 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_clk.hsusb2_data7 */

			0x1a8 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_simo.hsusb2_data4 */

			0x1aa (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_somi.hsusb2_data5 */

			0x1ac (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_cs0.hsusb2_data6 */

			0x1ae (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_cs1.hsusb2_data3 */

			OMAP3_CORE1_IOPAD(0x21d4, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi1_cs3.hsusb2_data2 */

			OMAP3_CORE1_IOPAD(0x21d6, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_clk.hsusb2_data7 */

			OMAP3_CORE1_IOPAD(0x21d8, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_simo.hsusb2_data4 */

			OMAP3_CORE1_IOPAD(0x21da, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_somi.hsusb2_data5 */

			OMAP3_CORE1_IOPAD(0x21dc, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_cs0.hsusb2_data6 */

			OMAP3_CORE1_IOPAD(0x21de, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_cs1.hsusb2_data3 */

		>;

	};
@@ -121,6 +115,24 @@ 
	};

};



&omap3_pmx_core2 {

	pinctrl-names = "default";

	pinctrl-0 = <

			&hsusb2_2_pins

	>;



	hsusb2_2_pins: pinmux_hsusb2_2_pins {

		pinctrl-single,pins = <

			OMAP3430_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3)		/* etk_d10.hsusb2_clk */

			OMAP3430_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3)		/* etk_d11.hsusb2_stp */

			OMAP3430_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d12.hsusb2_dir */

			OMAP3430_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d13.hsusb2_nxt */

			OMAP3430_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d14.hsusb2_data0 */

			OMAP3430_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d15.hsusb2_data1 */

		>;

	};

};



&i2c1 {

	clock-frequency = <2600000>;

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

0 → 100644
+104 −0
Original line number Diff line number Diff line 
/*

 * Support for CompuLab CM-T3730

 */

/dts-v1/;



#include "omap36xx.dtsi"

#include "omap3-cm-t3x30.dtsi"



/ {

	model = "CompuLab CM-T3730";

	compatible = "compulab,omap3-cm-t3730", "ti,omap36xx", "ti,omap3";



	wl12xx_vmmc2: wl12xx_vmmc2 {

		compatible = "regulator-fixed";

		regulator-name = "vw1271";

		pinctrl-names = "default";

		pinctrl-0 = <&wl12xx_gpio>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		gpio = <&gpio3 9 GPIO_ACTIVE_HIGH>;   /* gpio73 */

		startup-delay-us = <20000>;

		enable-active-high;

	};



	wl12xx_vaux2: wl12xx_vaux2 {

		compatible = "regulator-fixed";

		regulator-name = "vwl1271_vaux2";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vaux2>;

	};

};



&omap3_pmx_core {

	mmc1_pins: pinmux_mmc1_pins {

		pinctrl-single,pins = <

			0x114 (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* sdmmc1_clk.sdmmc1_clk */

			0x116 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_cmd.sdmmc1_cmd */

			0x118 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat0.sdmmc1_dat0 */

			0x11a (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat1.sdmmc1_dat1 */

			0x11c (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat2.sdmmc1_dat2 */

			0x11e (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat3.sdmmc1_dat3 */

		>;

	};



	mmc2_pins: pinmux_mmc2_pins {

		pinctrl-single,pins = <

			0x128 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_clk.sdmmc2_clk */

			0x12a (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_cmd.sdmmc2_cmd */

			0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat0.sdmmc2_dat0 */

			0x12e (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat1.sdmmc2_dat1 */

			0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat2.sdmmc2_dat2 */

			0x132 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat3.sdmmc2_dat3 */

		>;

	};



	smsc1_pins: pinmux_smsc1_pins {

		pinctrl-single,pins = <

			0x88 (PIN_OUTPUT | MUX_MODE0)		/* gpmc_ncs5.gpmc_ncs5 */

			0x16a (PIN_INPUT_PULLUP | MUX_MODE4)	/* uart3_cts_rctx.gpio_163 */

		>;

	};



	uart3_pins: pinmux_uart3_pins {

		pinctrl-single,pins = <

			0x16e (PIN_INPUT | MUX_MODE0)		/* uart3_rx_irrx.uart3_rx_irrx */

			0x170 (PIN_OUTPUT | MUX_MODE0)		/* uart3_tx_irtx.uart3_tx_irtx */

		>;

	};



	wl12xx_gpio: pinmux_wl12xx_gpio {

		pinctrl-single,pins = <

			0xb2 (PIN_OUTPUT | MUX_MODE4)		/* dss_data3.gpio_73 */

			0x134 (PIN_INPUT | MUX_MODE4)		/* sdmmc2_dat4.gpio_136 */

		>;

	};

};



&mmc1 {

	vmmc-supply = <&vmmc1>;

	bus-width = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;

	vmmc-supply = <&wl12xx_vmmc2>;

	vmmc_aux-supply = <&wl12xx_vaux2>;

	non-removable;

	bus-width = <4>;

	cap-power-off-card;

};



&smsc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&smsc1_pins>;

};



&uart3 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_pins>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE