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

Merge tag 'mxs-dt-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt 

From Shawn Guo:
mxs device tree changes for 3.9

 - Mostly cfa100xx related device tree source updates

* tag 'mxs-dt-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: dts: Add rotary encoder to the CFA-10049
  ARM: mxs: dts: Add gpio-keys for the rotary to the CFA-10049
  ARM: dts: mxs: Add the LCD to the 10049 board
  ARM: dts: mxs: Add muxing options for the third PWM
  ARM: dts: cfa10049: Change the SPI3 bus to spi-gpio
  ARM: mxs: dt: Add Crystalfontz CFA-10037 device tree support
  ARM: mxs: Enable touchscreen on m28evk
  ARM: dts: cfa10049: Add PCA9555 GPIO expander to the device tree
parents 93ce2855 0943b960

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ 
	imx28-apf28dev.dtb \

	imx28-apx4devkit.dtb \

	imx28-cfa10036.dtb \

	imx28-cfa10037.dtb \

	imx28-cfa10049.dtb \

	imx28-evk.dtb \

	imx28-m28evk.dtb \

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

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

 * Copyright 2012 Free Electrons

 *

 * 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

 */



/*

 * The CFA-10049 is an expansion board for the CFA-10036 module, thus we

 * need to include the CFA-10036 DTS.

 */

/include/ "imx28-cfa10036.dts"



/ {

	model = "Crystalfontz CFA-10037 Board";

	compatible = "crystalfontz,cfa10037", "crystalfontz,cfa10036", "fsl,imx28";



	apb@80000000 {

		apbh@80000000 {

			pinctrl@80018000 {

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

				pinctrl-1 = <&hog_pins_cfa10037>;



				hog_pins_cfa10037: hog-10037@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x0073 /* MX28_PAD_GPMI_D7__GPIO_0_7 */

						0x2153 /* MX28_PAD_SSP2_D5__GPIO_2_21 */

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <0>;

				};

			};

		};



		apbx@80040000 {

			usbphy1: usbphy@8007e000 {

				status = "okay";

			};

		};

	};



	ahb@80080000 {

		usb1: usb@80090000 {

			vbus-supply = <&reg_usb1_vbus>;

			pinctrl-0 = <&usbphy1_pins_a>;

			pinctrl-names = "default";

			status = "okay";

		};



		mac0: ethernet@800f0000 {

			phy-mode = "rmii";

			pinctrl-names = "default";

			pinctrl-0 = <&mac0_pins_a>;

			phy-reset-gpios = <&gpio2 21 0>;

			phy-reset-duration = <100>;

			status = "okay";

		};

	};



	regulators {

		compatible = "simple-bus";



		reg_usb1_vbus: usb1_vbus {

			compatible = "regulator-fixed";

			regulator-name = "usb1_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio0 7 1>;

		};

	};

};

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

+183 −31
Original line number Diff line number Diff line
@@ -23,69 +23,120 @@ 
		apbh@80000000 {

			pinctrl@80018000 {

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

				pinctrl-1 = <&hog_pins_cfa10049>;

				pinctrl-1 = <&hog_pins_cfa10049

					&hog_pins_cfa10049_pullup>;



				hog_pins_cfa10049: hog-10049@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x0073 /* MX28_PAD_GPMI_D7__GPIO_0_7 */

						0x1153 /* MX28_PAD_LCD_D22__GPIO_1_21 */

						0x1163 /* MX28_PAD_LCD_D22__GPIO_1_22 */

						0x1173 /* MX28_PAD_LCD_D22__GPIO_1_23 */

						0x2153 /* MX28_PAD_SSP2_D5__GPIO_2_21 */

						0x3173 /* MX28_PAD_LCD_RESET__GPIO_3_23 */

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <0>;

				};



				spi3_pins_cfa10049: spi3-cfa10049@0 {

				hog_pins_cfa10049_pullup: hog-10049-pullup@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x0181 /* MX28_PAD_GPMI_RDN__SSP3_SCK */

						0x01c1 /* MX28_PAD_GPMI_RESETN__SSP3_CMD */

						0x0111 /* MX28_PAD_GPMI_CE1N__SSP3_D3 */

						0x01a2 /* MX28_PAD_GPMI_ALE__SSP3_D4 */

						0x01b2 /* MX28_PAD_GPMI_CLE__SSP3_D5 */

						0x2133 /* MX28_PAD_SSP2_D3__GPIO_2_19 */

						0x3183 /* MX28_PAD_I2C0_SCL__GPIO_3_24 */

						0x3193 /* MX28_PAD_I2C0_SDA__GPIO_3_25 */

						0x31a3 /* MX28_PAD_SAIF_SDATA0__GPIO_3_26 */

						0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */

					>;

					fsl,drive-strength = <1>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <1>;

				};

			};



			ssp3: ssp@80016000 {

				compatible = "fsl,imx28-spi";

				pinctrl-names = "default";

				pinctrl-0 = <&spi3_pins_cfa10049>;

				status = "okay";

				spi2_pins_cfa10049: spi2-cfa10049@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x2103 /* MX28_PAD_SSP2_SCK__GPIO_2_16 */

						0x2113 /* MX28_PAD_SSP2_CMD__GPIO_2_17 */

						0x2123 /* MX28_PAD_SSP2_D0__GPIO_2_18 */

					>;

					fsl,drive-strength = <1>;

					fsl,voltage = <1>;

					fsl,pull-up = <1>;

				};



				gpio5: gpio5@0 {

					compatible = "fairchild,74hc595";

					gpio-controller;

					#gpio-cells = <2>;

				spi3_pins_cfa10049: spi3-cfa10049@0 {

					reg = <0>;

					registers-number = <2>;

					spi-max-frequency = <100000>;

					fsl,pinmux-ids = <

						0x0183 /* MX28_PAD_GPMI_RDN__GPIO_0_24 */

						0x01c3 /* MX28_PAD_GPMI_RESETN__GPIO_0_28 */

						0x0113 /* MX28_PAD_GPMI_CE1N__GPIO_0_17 */

						0x01a3 /* MX28_PAD_GPMI_ALE__GPIO_0_26 */

						0x01b3 /* MX28_PAD_GPMI_CLE__GPIO_0_27 */

					>;

					fsl,drive-strength = <1>;

					fsl,voltage = <1>;

					fsl,pull-up = <1>;

				};



				gpio6: gpio6@1 {

					compatible = "fairchild,74hc595";

					gpio-controller;

					#gpio-cells = <2>;

					reg = <1>;

					registers-number = <4>;

					spi-max-frequency = <100000>;

				lcdif_18bit_pins_cfa10049: lcdif-18bit@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x1000 /* MX28_PAD_LCD_D00__LCD_D0 */

						0x1010 /* MX28_PAD_LCD_D01__LCD_D1 */

						0x1020 /* MX28_PAD_LCD_D02__LCD_D2 */

						0x1030 /* MX28_PAD_LCD_D03__LCD_D3 */

						0x1040 /* MX28_PAD_LCD_D04__LCD_D4 */

						0x1050 /* MX28_PAD_LCD_D05__LCD_D5 */

						0x1060 /* MX28_PAD_LCD_D06__LCD_D6 */

						0x1070 /* MX28_PAD_LCD_D07__LCD_D7 */

						0x1080 /* MX28_PAD_LCD_D08__LCD_D8 */

						0x1090 /* MX28_PAD_LCD_D09__LCD_D9 */

						0x10a0 /* MX28_PAD_LCD_D10__LCD_D10 */

						0x10b0 /* MX28_PAD_LCD_D11__LCD_D11 */

						0x10c0 /* MX28_PAD_LCD_D12__LCD_D12 */

						0x10d0 /* MX28_PAD_LCD_D13__LCD_D13 */

						0x10e0 /* MX28_PAD_LCD_D14__LCD_D14 */

						0x10f0 /* MX28_PAD_LCD_D15__LCD_D15 */

						0x1100 /* MX28_PAD_LCD_D16__LCD_D16 */

						0x1110 /* MX28_PAD_LCD_D17__LCD_D17 */

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <0>;

				};



				dac0: dh2228@2 {

					compatible = "rohm,dh2228fv";

					reg = <2>;

					spi-max-frequency = <100000>;

				lcdif_pins_cfa10049: lcdif-evk@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */

						0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */

						0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */

						0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <0>;

				};

			};



			lcdif@80030000 {

				pinctrl-names = "default";

				pinctrl-0 = <&lcdif_18bit_pins_cfa10049

					     &lcdif_pins_cfa10049>;

				status = "okay";

			};

		};



		apbx@80040000 {

			pwm: pwm@80064000 {

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

				pinctrl-1 = <&pwm3_pins_b>;

				status = "okay";

			};



			i2c1: i2c@8005a000 {

				pinctrl-names = "default";

				pinctrl-0 = <&i2c1_pins_a>;
@@ -113,6 +164,19 @@ 


				i2c@3 {

					reg = <3>;

					#address-cells = <1>;

					#size-cells = <0>;



					pca9555: pca9555@20 {

						compatible = "nxp,pca9555";

						interrupt-parent = <&gpio2>;

						interrupts = <19 0x2>;

						gpio-controller;

						#gpio-cells = <2>;

						interrupt-controller;

						#interrupt-cells = <2>;

						reg = <0x20>;

					};

				};

			};
@@ -153,4 +217,92 @@ 
			status = "okay";

		};

	};



	spi2 {

		compatible = "spi-gpio";

		pinctrl-names = "default";

		pinctrl-0 = <&spi2_pins_cfa10049>;

		status = "okay";

		gpio-sck = <&gpio2 16 0>;

		gpio-mosi = <&gpio2 17 0>;

		gpio-miso = <&gpio2 18 0>;

		cs-gpios = <&gpio3 23 0>;

		num-chipselects = <1>;

		#address-cells = <1>;

		#size-cells = <0>;



		hx8357: hx8357@0 {

			compatible = "himax,hx8357b", "himax,hx8357";

			reg = <0>;

			spi-max-frequency = <100000>;

			spi-cpol;

			spi-cpha;

			gpios-reset = <&gpio3 30 0>;

			im-gpios = <&gpio5 4 0 &gpio5 5 0 &gpio5 6 0>;

		};

	};



	spi3 {

		compatible = "spi-gpio";

		pinctrl-names = "default";

		pinctrl-0 = <&spi3_pins_cfa10049>;

		status = "okay";

		gpio-sck = <&gpio0 24 0>;

		gpio-mosi = <&gpio0 28 0>;

		cs-gpios = <&gpio0 17 0 &gpio0 26 0 &gpio0 27 0>;

		num-chipselects = <3>;

		#address-cells = <1>;

		#size-cells = <0>;



		gpio5: gpio5@0 {

			compatible = "fairchild,74hc595";

			gpio-controller;

			#gpio-cells = <2>;

			reg = <0>;

			registers-number = <2>;

			spi-max-frequency = <100000>;

		};



		gpio6: gpio6@1 {

			compatible = "fairchild,74hc595";

			gpio-controller;

			#gpio-cells = <2>;

			reg = <1>;

			registers-number = <4>;

			spi-max-frequency = <100000>;

		};



		dac0: dh2228@2 {

			compatible = "rohm,dh2228fv";

			reg = <2>;

			spi-max-frequency = <100000>;

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		rotary_button {

			label = "rotary_button";

			gpios = <&gpio3 26 1>;

			debounce-interval = <10>;

			linux,code = <28>;

		};

	};



	rotary {

		compatible = "rotary-encoder";

		gpios = <&gpio3 24 1>, <&gpio3 25 1>;

		linux,axis = <1>; /* REL_Y */

		rotary-encoder,relative-axis;

	};



	backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm 3 5000000>;

		brightness-levels = <0 4 8 16 32 64 128 255>;

		default-brightness-level = <6>;

	};

};

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

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


			lradc@80050000 {

				status = "okay";

				fsl,lradc-touchscreen-wires = <4>;

			};



			duart: serial@80074000 {

arch/arm/boot/dts/imx28.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -502,6 +502,16 @@ 
					fsl,pull-up = <0>;

				};



				pwm3_pins_b: pwm3@1 {

					reg = <1>;

					fsl,pinmux-ids = <

						0x3141 /* MX28_PAD_SAIF0_MCLK__PWM3 */

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <0>;

				};



				pwm4_pins_a: pwm4@0 {

					reg = <0>;

					fsl,pinmux-ids = <

CRA Git | Maintained and supported by SUSTech CRA and CCSE