Merge tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt (8d2282a7) · Commits · e / devices / android_kernel_teracube_mt6765

arch/arm/boot/dts/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -67,6 +67,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
	imx28-cfa10049.dtb \		imx28-cfa10049.dtb \
	imx28-evk.dtb \		imx28-evk.dtb \
	imx28-m28evk.dtb \		imx28-m28evk.dtb \
			imx28-sps1.dtb \
	imx28-tx28.dtb		imx28-tx28.dtb
	dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \		dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
	omap3-beagle.dtb \		omap3-beagle.dtb \

arch/arm/boot/dts/imx23-olinuxino.dts

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,6 +56,15 @@
	fsl,pull-up = <0>;		fsl,pull-up = <0>;
	};		};
	};		};

			ssp1: ssp@80034000 {
			#address-cells = <1>;
			#size-cells = <0>;
			compatible = "fsl,imx23-spi";
			pinctrl-names = "default";
			pinctrl-0 = <&spi2_pins_a>;
			status = "okay";
			};
	};		};

	apbx@80040000 {		apbx@80040000 {

arch/arm/boot/dts/imx23.dtsi

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -279,6 +279,19 @@
	fsl,voltage = <1>;		fsl,voltage = <1>;
	fsl,pull-up = <0>;		fsl,pull-up = <0>;
	};		};

			spi2_pins_a: spi2@0 {
			reg = <0>;
			fsl,pinmux-ids = <
			0x0182 /* MX23_PAD_GPMI_WRN__SSP2_SCK */
			0x0142 /* MX23_PAD_GPMI_RDY1__SSP2_CMD */
			0x0002 /* MX23_PAD_GPMI_D00__SSP2_DATA0 */
			0x0032 /* MX23_PAD_GPMI_D03__SSP2_DATA3 */
			>;
			fsl,drive-strength = <1>;
			fsl,voltage = <1>;
			fsl,pull-up = <1>;
			};
	};		};

	digctl@8001c000 {		digctl@8001c000 {

arch/arm/boot/dts/imx28-cfa10036.dts

+19 −0

Original line number	Original line	Diff line number	Diff line
	@@ -58,11 +58,30 @@
	};		};

	apbx@80040000 {		apbx@80040000 {
			pwm: pwm@80064000 {
			pinctrl-names = "default";
			pinctrl-0 = <&pwm4_pins_a>;
			status = "okay";
			};

	duart: serial@80074000 {		duart: serial@80074000 {
	pinctrl-names = "default";		pinctrl-names = "default";
	pinctrl-0 = <&duart_pins_b>;		pinctrl-0 = <&duart_pins_b>;
	status = "okay";		status = "okay";
	};		};

			i2c0: i2c@80058000 {
			pinctrl-names = "default";
			pinctrl-0 = <&i2c0_pins_b>;
			status = "okay";

			ssd1307: oled@3c {
			compatible = "solomon,ssd1307fb-i2c";
			reg = <0x3c>;
			pwms = <&pwm 4 3000>;
			reset-gpios = <&gpio2 7 0>;
			};
			};
	};		};
	};		};

arch/arm/boot/dts/imx28-sps1.dts

0 → 100644

+169 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2012 Marek Vasut <marex@denx.de>
			*
			* The code contained herein is licensed under the GNU General Public
			* License. You may obtain a copy of the GNU General Public License
			* Version 2 or later at the following locations:
			*
			* http://www.opensource.org/licenses/gpl-license.html
			* http://www.gnu.org/copyleft/gpl.html
			*/

			/dts-v1/;
			/include/ "imx28.dtsi"

			/ {
			model = "SchulerControl GmbH, SC SPS 1";
			compatible = "schulercontrol,imx28-sps1", "fsl,imx28";

			memory {
			reg = <0x40000000 0x08000000>;
			};

			apb@80000000 {
			apbh@80000000 {
			pinctrl@80018000 {
			pinctrl-names = "default";
			pinctrl-0 = <&hog_pins_a>;

			hog_pins_a: hog-gpios@0 {
			reg = <0>;
			fsl,pinmux-ids = <
			0x0003 /* MX28_PAD_GPMI_D00__GPIO_0_0 */
			0x0033 /* MX28_PAD_GPMI_D03__GPIO_0_3 */
			0x0063 /* MX28_PAD_GPMI_D06__GPIO_0_6 */
			>;
			fsl,drive-strength = <0>;
			fsl,voltage = <1>;
			fsl,pull-up = <0>;
			};

			};

			ssp0: ssp@80010000 {
			compatible = "fsl,imx28-mmc";
			pinctrl-names = "default";
			pinctrl-0 = <&mmc0_4bit_pins_a>;
			bus-width = <4>;
			status = "okay";
			};

			ssp2: ssp@80014000 {
			#address-cells = <1>;
			#size-cells = <0>;
			compatible = "fsl,imx28-spi";
			pinctrl-names = "default";
			pinctrl-0 = <&spi2_pins_a>;
			status = "okay";

			flash: m25p80@0 {
			#address-cells = <1>;
			#size-cells = <1>;
			compatible = "everspin,mr25h256", "mr25h256";
			spi-max-frequency = <40000000>;
			reg = <0>;
			};
			};
			};

			apbx@80040000 {
			i2c0: i2c@80058000 {
			pinctrl-names = "default";
			pinctrl-0 = <&i2c0_pins_a>;
			clock-frequency = <400000>;
			status = "okay";

			rtc: rtc@51 {
			compatible = "nxp,pcf8563";
			reg = <0x51>;
			};

			eeprom: eeprom@52 {
			compatible = "atmel,24c64";
			reg = <0x52>;
			pagesize = <32>;
			};
			};

			duart: serial@80074000 {
			pinctrl-names = "default";
			pinctrl-0 = <&duart_pins_a>;
			status = "okay";
			};

			usbphy0: usbphy@8007c000 {
			status = "okay";
			};

			auart0: serial@8006a000 {
			pinctrl-names = "default";
			pinctrl-0 = <&auart0_pins_a>;
			status = "okay";
			};
			};
			};

			ahb@80080000 {
			usb0: usb@80080000 {
			vbus-supply = <&reg_usb0_vbus>;
			pinctrl-names = "default";
			pinctrl-0 = <&usbphy0_pins_b>;
			status = "okay";
			};

			mac0: ethernet@800f0000 {
			phy-mode = "rmii";
			pinctrl-names = "default";
			pinctrl-0 = <&mac0_pins_a>;
			status = "okay";
			};

			mac1: ethernet@800f4000 {
			phy-mode = "rmii";
			pinctrl-names = "default";
			pinctrl-0 = <&mac1_pins_a>;
			status = "okay";
			};
			};

			regulators {
			compatible = "simple-bus";

			reg_usb0_vbus: usb0_vbus {
			compatible = "regulator-fixed";
			regulator-name = "usb0_vbus";
			regulator-min-microvolt = <5000000>;
			regulator-max-microvolt = <5000000>;
			gpio = <&gpio3 9 0>;
			};
			};

			leds {
			#address-cells = <1>;
			#size-cells = <0>;
			compatible = "gpio-leds";
			status = "okay";

			led@1 {
			label = "sps1-1:yellow:user";
			gpios = <&gpio0 6 0>;
			linux,default-trigger = "heartbeat";
			reg = <0>;
			};

			led@2 {
			label = "sps1-2:red:user";
			gpios = <&gpio0 3 0>;
			linux,default-trigger = "heartbeat";
			reg = <1>;
			};

			led@3 {
			label = "sps1-3:red:user";
			gpios = <&gpio0 0 0>;
			default-trigger = "heartbeat";
			reg = <2>;
			};

			};
			};