ARM: dts: mxs: move 'compatible' property to beginning of node and do some whitespace cleanups

PATCH New Lothar Waßmann 5 participants 19 messages Jul 31, 2013 – Apr 17, 2014

Subsystems (3)

Device tree bindings Arm i.MX and Layerscape Pin control

lore

Share & tools

lore

Lothar Waßmann

author

2013-07-31 14:37 UTC #0 lore raw

PATCH 1/10 ARM: dts: mxs: move 'compatible' property to beginning of node and do some whitespace cleanups

Signed-off-by Lothar Wa?mann <[email protected]>

---
 arch/arm/boot/dts/imx28.dtsi |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

arch/arm/boot/dts/imx28.dtsi +2 -3

index 47fc5ef..0360acc 100644
@@ -731,9 +731,9 @@
 			};
 
 			dcp at 80028000 {
+				compatible = "fsl-dcp";
 				reg = <0x80028000 0x2000>;
 				interrupts = <52 53 54>;
-				compatible = "fsl-dcp";
 			};
 
 			pxp at 8002a000 {

@@ -815,7 +815,7 @@
 				reg = <0x8003c800 0x100>;
 				status = "disabled";
 			};
-                };
+		};
 
 		apbx at 80040000 {
 			compatible = "simple-bus";

@@ -1045,6 +1045,5 @@
 			reg = <0x800f8000 0x8000>;
 			status = "disabled";
 		};
-
 	};
 };

Signature · 1 line

1.7.2.5

Lothar Waßmann

author

2013-07-31 14:37 UTC #1 lore raw

PATCH 2/10 ARM: dts: mxs: add labels to most nodes for easier reference

Signed-off-by Lothar Wa?mann <[email protected]>

---
 arch/arm/boot/dts/imx28.dtsi |   48 +++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

arch/arm/boot/dts/imx28.dtsi +24 ~~-24~~

index 0360acc..d077958 100644
@@ -64,7 +64,7 @@
 				reg = <0x80000000 0x2000>;
 			};
 
-			hsadc at 80002000 {
+			hsadc: hsadc at 80002000 {
 				reg = <0x80002000 0x2000>;
 				interrupts = <13>;
 				dmas = <&dma_apbh 12>;

@@ -88,13 +88,13 @@
 				clocks = <&clks 25>;
 			};
 
-			perfmon at 80006000 {
+			perfmon: perfmon at 80006000 {
 				reg = <0x80006000 0x800>;
 				interrupts = <27>;
 				status = "disabled";
 			};
 
-			gpmi-nand at 8000c000 {
+			gpmi: gpmi-nand at 8000c000 {
 				compatible = "fsl,imx28-gpmi-nand";
 				#address-cells = <1>;
 				#size-cells = <1>;

@@ -153,7 +153,7 @@
 				status = "disabled";
 			};
 
-			pinctrl at 80018000 {
+			pinctrl: pinctrl at 80018000 {
 				#address-cells = <1>;
 				#size-cells = <0>;
 				compatible = "fsl,imx28-pinctrl", "simple-bus";

@@ -702,14 +702,14 @@
 				};
 			};
 
-			digctl at 8001c000 {
+			digctl: digctl at 8001c000 {
 				compatible = "fsl,imx28-digctl", "fsl,imx23-digctl";
 				reg = <0x8001c000 0x2000>;
 				interrupts = <89>;
 				status = "disabled";
 			};
 
-			etm at 80022000 {
+			etm: etm at 80022000 {
 				reg = <0x80022000 0x2000>;
 				status = "disabled";
 			};

@@ -730,19 +730,19 @@
 				clocks = <&clks 26>;
 			};
 
-			dcp at 80028000 {
+			dcp: dcp at 80028000 {
 				compatible = "fsl-dcp";
 				reg = <0x80028000 0x2000>;
 				interrupts = <52 53 54>;
 			};
 
-			pxp at 8002a000 {
+			pxp: pxp at 8002a000 {
 				reg = <0x8002a000 0x2000>;
 				interrupts = <39>;
 				status = "disabled";
 			};
 
-			ocotp at 8002c000 {
+			ocotp: ocotp at 8002c000 {
 				compatible = "fsl,ocotp";
 				reg = <0x8002c000 0x2000>;
 				status = "disabled";

@@ -753,7 +753,7 @@
 				status = "disabled";
 			};
 
-			lcdif at 80030000 {
+			lcdif: lcdif at 80030000 {
 				compatible = "fsl,imx28-lcdif";
 				reg = <0x80030000 0x2000>;
 				interrupts = <38>;

@@ -781,37 +781,37 @@
 				status = "disabled";
 			};
 
-			simdbg at 8003c000 {
+			simdbg: simdbg at 8003c000 {
 				reg = <0x8003c000 0x200>;
 				status = "disabled";
 			};
 
-			simgpmisel at 8003c200 {
+			simgpmisel: simgpmisel at 8003c200 {
 				reg = <0x8003c200 0x100>;
 				status = "disabled";
 			};
 
-			simsspsel at 8003c300 {
+			simsspsel: simsspsel at 8003c300 {
 				reg = <0x8003c300 0x100>;
 				status = "disabled";
 			};
 
-			simmemsel at 8003c400 {
+			simmemsel: simmemsel at 8003c400 {
 				reg = <0x8003c400 0x100>;
 				status = "disabled";
 			};
 
-			gpiomon at 8003c500 {
+			gpiomon: gpiomon at 8003c500 {
 				reg = <0x8003c500 0x100>;
 				status = "disabled";
 			};
 
-			simenet at 8003c700 {
+			simenet: simenet at 8003c700 {
 				reg = <0x8003c700 0x100>;
 				status = "disabled";
 			};
 
-			armjtag at 8003c800 {
+			armjtag: armjtag at 8003c800 {
 				reg = <0x8003c800 0x100>;
 				status = "disabled";
 			};

@@ -841,7 +841,7 @@
 				status = "disabled";
 			};
 
-			power at 80044000 {
+			power: power at 80044000 {
 				reg = <0x80044000 0x2000>;
 				status = "disabled";
 			};

@@ -856,7 +856,7 @@
 				status = "disabled";
 			};
 
-			lradc at 80050000 {
+			lradc: lradc at 80050000 {
 				compatible = "fsl,imx28-lradc";
 				reg = <0x80050000 0x2000>;
 				interrupts = <10 14 15 16 17 18 19

@@ -864,7 +864,7 @@
 				status = "disabled";
 			};
 
-			spdif at 80054000 {
+			spdif: spdif@80054000 {
 				reg = <0x80054000 0x2000>;
 				interrupts = <45>;
 				dmas = <&dma_apbx 2>;

@@ -872,7 +872,7 @@
 				status = "disabled";
 			};
 
-			rtc at 80056000 {
+			mxs_rtc: rtc at 80056000 {
 				compatible = "fsl,imx28-rtc", "fsl,stmp3xxx-rtc";
 				reg = <0x80056000 0x2000>;
 				interrupts = <29>;

@@ -911,7 +911,7 @@
 				status = "disabled";
 			};
 
-			timrot at 80068000 {
+			timer: timrot at 80068000 {
 				compatible = "fsl,imx28-timrot", "fsl,timrot";
 				reg = <0x80068000 0x2000>;
 				interrupts = <48 49 50 51>;

@@ -1018,7 +1018,7 @@
 			status = "disabled";
 		};
 
-		dflpt at 800c0000 {
+		dflpt: dflpt at 800c0000 {
 			reg = <0x800c0000 0x10000>;
 			status = "disabled";
 		};

@@ -1041,7 +1041,7 @@
 			status = "disabled";
 		};
 
-		switch at 800f8000 {
+		etn_switch: switch at 800f8000 {
 			reg = <0x800f8000 0x8000>;
 			status = "disabled";
 		};

Signature · 1 line

1.7.2.5

Stephen Warren

2013-07-31 19:46 UTC #2 lore raw

PATCH 2/10 ARM: dts: mxs: add labels to most nodes for easier reference

On 07/31/2013 08:37 AM, Lothar Wa?mann wrote:

Are the labels needed? Adding them when they're used might be a better approach.

Lothar Waßmann

author

2013-08-02 07:34 UTC #3 lore raw

PATCH 2/10 ARM: dts: mxs: add labels to most nodes for easier reference

Hi,

Quoted 5 lines · Stephen Warren

On 07/31/2013 08:37 AM, Lothar Wa?mann wrote:
Are the labels needed? Adding them when they're used might be a better approach.

I'd prefer to have them defined once, so that possible new users of the labels won't have to add the labels to this file, which might produce conflicts when multiple patches try to add the same label to the file.

Lothar Wa?mann

Signature · 9 lines

___________________________________________________________

Ka-Ro electronics GmbH | Pascalstra?e 22 | D - 52076 Aachen
Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10
Gesch?ftsf?hrer: Matthias Kaussen
Handelsregistereintrag: Amtsgericht Aachen, HRB 4996

www.karo-electronics.de | info at karo-electronics.de
___________________________________________________________

Lothar Waßmann

author

2013-07-31 14:37 UTC #4 lore raw

PATCH 3/10 ARM: dts: mxs: set dcp to "disabled" by default

In reply to Lothar Waßmann

Reintroduce 'status = "disabled"' for the dcp node that was dropped by commit 519d8b1a "Added support for Freescale's DCP co-processor".

Explicitly enable it in imx28-evk which is referenced in the commit message of that commit.

Signed-off-by Lothar Wa?mann <[email protected]>

---
 arch/arm/boot/dts/imx28-evk.dts |    4 ++++
 arch/arm/boot/dts/imx28.dtsi    |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)

arch/arm/boot/dts/imx28-evk.dts +4 -0

index e035f46..6556197 100644
@@ -360,3 +360,7 @@
 		default-brightness-level = <6>;
 	};
 };
+
+&dcp {
+	status = "okay";
+};

arch/arm/boot/dts/imx28.dtsi +1 -0

index d077958..acfb8ac 100644
@@ -734,6 +734,7 @@
 				compatible = "fsl-dcp";
 				reg = <0x80028000 0x2000>;
 				interrupts = <52 53 54>;
+				status = "disabled";
 			};
 
 			pxp: pxp at 8002a000 {

Signature · 1 line

1.7.2.5

Lothar Waßmann

author

2013-07-31 14:37 UTC #5 lore raw

PATCH 4/10 ARM: dts: mxs: add another set of saif0_pins (without MCLK)

In reply to Lothar Waßmann

Signed-off-by Lothar Wa?mann <[email protected]>

---
 arch/arm/boot/dts/imx28.dtsi |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

arch/arm/boot/dts/imx28.dtsi +12 -0

index acfb8ac..3ec9a68 100644
@@ -518,6 +518,18 @@
 					fsl,pull-up = <1>;
 				};
 
+				saif0_pins_b: saif0 at 1 {
+					reg = <1>;
+					fsl,pinmux-ids = <
+						0x3150 /* MX28_PAD_SAIF0_LRCLK__SAIF0_LRCLK */
+						0x3160 /* MX28_PAD_SAIF0_BITCLK__SAIF0_BITCLK */
+						0x3170 /* MX28_PAD_SAIF0_SDATA0__SAIF0_SDATA0 */
+					>;
+					fsl,drive-strength = <2>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <1>;
+				};
+
 				saif1_pins_a: saif1 at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <

Signature · 1 line

1.7.2.5

Lothar Waßmann

author

2013-07-31 14:37 UTC #6 lore raw

PATCH 5/10 ARM: dts: mxs: add pin config for SSP3 interface

In reply to Lothar Waßmann

Signed-off-by Lothar Wa?mann <[email protected]>

---
 arch/arm/boot/dts/imx28.dtsi |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

arch/arm/boot/dts/imx28.dtsi +15 -0

index 3ec9a68..f597c0f 100644
@@ -683,6 +683,21 @@
 					fsl,pull-up = <1>;
 				};
 
+				spi3_pins_a: spi3 at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x3082 /* MX28_PAD_AUART2_RX__SSP3_D4 */
+						0x3092 /* MX28_PAD_AUART2_TX__SSP3_D5 */
+						0x2180 /* MX28_PAD_SSP3_SCK__SSP3_SCK */
+						0x2190 /* MX28_PAD_SSP3_MOSI__SSP3_CMD */
+						0x21A0 /* MX28_PAD_SSP3_MISO__SSP3_D0 */
+						0x21B0 /* MX28_PAD_SSP3_SS0__SSP3_D3 */
+					>;
+					fsl,drive-strength = <1>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
 				usbphy0_pins_a: usbphy0 at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <

Signature · 1 line

1.7.2.5

Lothar Waßmann

author

2013-07-31 14:37 UTC #7 lore raw

PATCH 6/10 ARM: dts: mxs: add pin config for LCD sync and clock pins

In reply to Lothar Waßmann

Signed-off-by Lothar Wa?mann <[email protected]>

---
 arch/arm/boot/dts/imx28.dtsi |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

arch/arm/boot/dts/imx28.dtsi +13 -0

index f597c0f..284166a9 100644
@@ -648,6 +648,19 @@
 					fsl,pull-up = <0>;
 				};
 
+				lcdif_sync_pins_a: lcdif-sync at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */
+						0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */
+						0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */
+						0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
 				can0_pins_a: can0 at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <

Signature · 1 line

1.7.2.5

Lothar Waßmann

author

2013-07-31 14:37 UTC #8 lore raw

PATCH 7/10 ARM: dts: mxs: add pin config options for usbphy pins

In reply to Lothar Waßmann

Signed-off-by Lothar Wa?mann <[email protected]>

---
 arch/arm/boot/dts/imx28.dtsi |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

arch/arm/boot/dts/imx28.dtsi +22 -0

index 284166a9..2387d46 100644
@@ -731,6 +731,17 @@
 					fsl,pull-up = <0>;
 				};
 
+				usbphy0_pins_c: usbphy0 at 2 {
+					reg = <2>;
+					fsl,pinmux-ids = <
+						0x0123 /* MX28_PAD_GPMI_CE2N__GPIO_0_18 - USBOTG_VBUSEN */
+						0x0133 /* MX28_PAD_GPMI_CE3N__GPIO_0_19 - USBOTH_OC */
+					>;
+					fsl,drive-strength = <2>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
 				usbphy1_pins_a: usbphy1 at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <

@@ -740,6 +751,17 @@
 					fsl,voltage = <1>;
 					fsl,pull-up = <0>;
 				};
+
+				usbphy1_pins_b: usbphy1 at 1 {
+					reg = <1>;
+					fsl,pinmux-ids = <
+						0x31b3 /* MX28_PAD_SPDIF__GPIO_3_27 - USBH_VBUSEN */
+						0x4143 /* MX28_PAD_JTAG_RTCK__GPIO_4_20 - USBH_OC */
+					>;
+					fsl,drive-strength = <2>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
 			};
 
 			digctl: digctl at 8001c000 {

Signature · 1 line

1.7.2.5

Lothar Waßmann

author

2013-07-31 14:37 UTC #9 lore raw

PATCH 8/10 ARM: dts: mxs: add 'phy_type' property to usbphy nodes

In reply to Lothar Waßmann

Signed-off-by Lothar Wa?mann <[email protected]>

---
 arch/arm/boot/dts/imx28.dtsi |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

arch/arm/boot/dts/imx28.dtsi +2 -0

index 2387d46..d9bf387 100644
@@ -1044,6 +1044,7 @@
 				compatible = "fsl,imx28-usbphy", "fsl,imx23-usbphy";
 				reg = <0x8007c000 0x2000>;
 				clocks = <&clks 62>;
+				phy_type = "utmi";
 				status = "disabled";
 			};

@@ -1051,6 +1052,7 @@
 				compatible = "fsl,imx28-usbphy", "fsl,imx23-usbphy";
 				reg = <0x8007e000 0x2000>;
 				clocks = <&clks 63>;
+				phy_type = "utmi";
 				status = "disabled";
 			};
 		};

Signature · 1 line

1.7.2.5

Lothar Waßmann

author

2013-07-31 14:37 UTC #10 lore raw

PATCH 9/10 ARM: dts: tx28: restructure and update DTS file

In reply to Lothar Waßmann

Signed-off-by Lothar Wa?mann <[email protected]>

---
 arch/arm/boot/dts/imx28-tx28.dts |  750 +++++++++++++++++++++++++++++++++-----
 1 files changed, 667 insertions(+), 83 deletions(-)

arch/arm/boot/dts/imx28-tx28.dts +667 ~~-83~~

index 37be532..7b2e6ce 100644
@@ -1,106 +1,144 @@
+/*
+ * Copyright 2013 Lothar Wa?mann <[email protected]>
+ *
+ * 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 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
 /dts-v1/;
-/include/ "imx28.dtsi"
+#include "imx28.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+#define USE_SPI_GPIO
 
 / {
 	model = "Ka-Ro electronics TX28 module";
 	compatible = "karo,tx28", "fsl,imx28";
 
+	aliases {
+		can0 = &can0;
+		can1 = &can1;
+		display = &display;
+		ds1339 = &ds1339;
+		gpio5 = &gpio5;
+		stk5led = &user_led;
+		usbotg = &usb0;
+		lcdif = &lcdif;
+		lcdif_24bit_pins_a = &lcdif_24bit_pins_a;
+		lcdif_23bit_pins_a = &lcdif_23bit_pins_a;
+	};
+
+	chosen {
+		bootargs = "init=/linuxrc console=ttyAMA0,115200 root=/dev/mtdblock3 rootfstype=jffs2 ro debug panic=1";
+	};
+
 	memory {
-		reg = <0x40000000 0x08000000>;
-	};
-
-	apb at 80000000 {
-		apbh at 80000000 {
-			ssp0: ssp at 80010000 {
-				compatible = "fsl,imx28-mmc";
-				pinctrl-names = "default";
-				pinctrl-0 = <&mmc0_4bit_pins_a
-					     &mmc0_cd_cfg
-					     &mmc0_sck_cfg>;
-				bus-width = <4>;
-				status = "okay";
-			};
+		reg = <0 0>; /* will be filled in by U-Boot */
+	};
 
-			pinctrl at 80018000 {
-				pinctrl-names = "default";
-				pinctrl-0 = <&hog_pins_a>;
-
-				hog_pins_a: hog at 0 {
-					reg = <0>;
-					fsl,pinmux-ids = <
-						0x40a3 /* MX28_PAD_ENET0_RXD3__GPIO_4_10 */
-					>;
-					fsl,drive-strength = <0>;
-					fsl,voltage = <1>;
-					fsl,pull-up = <0>;
-				};
-
-				mac0_pins_gpio: mac0-gpio-mode at 0 {
-					reg = <0>;
-					fsl,pinmux-ids = <
-						0x4003 /* MX28_PAD_ENET0_MDC__GPIO_4_0 */
-						0x4013 /* MX28_PAD_ENET0_MDIO__GPIO_4_1 */
-						0x4023 /* MX28_PAD_ENET0_RX_EN__GPIO_4_2 */
-						0x4033 /* MX28_PAD_ENET0_RXD0__GPIO_4_3 */
-						0x4043 /* MX28_PAD_ENET0_RXD1__GPIO_4_4 */
-						0x4063 /* MX28_PAD_ENET0_TX_EN__GPIO_4_6 */
-						0x4073 /* MX28_PAD_ENET0_TXD0__GPIO_4_7 */
-						0x4083 /* MX28_PAD_ENET0_TXD1__GPIO_4_8 */
-						0x4103 /* MX28_PAD_ENET_CLK__GPIO_4_16 */
-					>;
-					fsl,drive-strength = <0>;
-					fsl,voltage = <1>;
-					fsl,pull-up = <0>;
-				};
-			};
+	onewire at 0 {
+		compatible = "w1-gpio";
+		gpios = <&gpio2 7 0>;
+		status = "disabled";
+	};
+
+	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 = <&gpio0 18 0>;
+			enable-active-high;
 		};
 
-		apbx at 80040000 {
-			i2c0: i2c at 80058000 {
-				pinctrl-names = "default";
-				pinctrl-0 = <&i2c0_pins_a>;
-				status = "okay";
+		reg_usb1_vbus: usb1_vbus {
+			compatible = "regulator-fixed";
+			regulator-name = "usb1_vbus";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			gpio = <&gpio3 27 0>;
+			enable-active-high;
+		};
 
-				ds1339: rtc at 68 {
-					compatible = "mxim,ds1339";
-					reg = <0x68>;
-				};
-			};
+		reg_2p5v: 2p5v {
+			compatible = "regulator-fixed";
+			regulator-name = "2P5V";
+			regulator-min-microvolt = <2500000>;
+			regulator-max-microvolt = <2500000>;
+			regulator-always-on;
+		};
 
-			pwm: pwm at 80064000 {
-				pinctrl-names = "default";
-				pinctrl-0 = <&pwm0_pins_a>;
-				status = "okay";
-			};
+		reg_3p3v: 3p3v {
+			compatible = "regulator-fixed";
+			regulator-name = "3P3V";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			regulator-always-on;
+		};
 
-			duart: serial at 80074000 {
-				pinctrl-names = "default";
-				pinctrl-0 = <&duart_4pins_a>;
-				status = "okay";
-			};
+		reg_can_xcvr: can-xcvr {
+			compatible = "regulator-fixed";
+			regulator-name = "CAN XCVR";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			gpio = <&gpio1 0 0>;
+			enable-active-low;
+			pinctrl-names = "default";
+			pinctrl-0 = <&flexcan_xcvr_pins_a>;
+		};
 
-			auart1: serial at 8006c000 {
-				pinctrl-names = "default";
-				pinctrl-0 = <&auart1_pins_a>;
-				status = "okay";
-			};
+		reg_lcd: lcd-power {
+			compatible = "regulator-fixed";
+			regulator-name = "LCD POWER";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			gpio = <&gpio1 31 0>;
+			enable-active-high;
+		};
+
+		reg_lcd_reset: lcd-reset {
+			compatible = "regulator-fixed";
+			regulator-name = "LCD RESET";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			gpio = <&gpio3 30 0>;
+			startup-delay-us = <300000>;
+			enable-active-high;
+			regulator-always-on;
+			regulator-boot-on;
 		};
 	};
 
-	ahb at 80080000 {
-		mac0: ethernet at 800f0000 {
-			phy-mode = "rmii";
-			pinctrl-names = "default", "gpio_mode";
-			pinctrl-0 = <&mac0_pins_a>;
-			pinctrl-1 = <&mac0_pins_gpio>;
-			status = "okay";
+	clocks {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		mclk: codec_clock {
+			compatible = "fixed-clock";
+			reg = <0>;
+			#clock-cells = <0>;
+			clock-frequency = <27000000>;
 		};
 	};
 
+	sound {
+		compatible = "fsl,imx28-tx28-sgtl5000",
+			     "fsl,mxs-audio-sgtl5000";
+		model = "imx28-tx28-sgtl5000";
+		saif-controllers = <&saif0 &saif1>;
+		audio-codec = <&sgtl5000>;
+	};
+
 	leds {
 		compatible = "gpio-leds";
 
-		user {
+		user_led: user {
 			label = "Heartbeat";
 			gpios = <&gpio4 10 0>;
 			linux,default-trigger = "heartbeat";

@@ -109,8 +147,554 @@
 
 	backlight {
 		compatible = "pwm-backlight";
-		pwms = <&pwm 0 5000000>;
-		brightness-levels = <0 4 8 16 32 64 128 255>;
-		default-brightness-level = <6>;
+		pwms = <&pwm 0 500000>;
+		/*
+		 * a silly way to create a 1:1 relationship between the
+		 * PWM value and the actual duty cycle
+		 */
+		brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+				     10 11 12 13 14 15 16 17 18 19
+				     20 21 22 23 24 25 26 27 28 29
+				     30 31 32 33 34 35 36 37 38 39
+				     40 41 42 43 44 45 46 47 48 49
+				     50 51 52 53 54 55 56 57 58 59
+				     60 61 62 63 64 65 66 67 68 69
+				     70 71 72 73 74 75 76 77 78 79
+				     80 81 82 83 84 85 86 87 88 89
+				     90 91 92 93 94 95 96 97 98 99
+				    100>;
+		default-brightness-level = <50>;
+	};
+#ifdef USE_SPI_GPIO
+	spi {
+		compatible = "spi-gpio";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&spi_pins_gpio>;
+
+		gpio-sck = <&gpio2 24 0>;
+		gpio-mosi = <&gpio2 25 0>;
+		gpio-miso = <&gpio2 26 0>;
+		num-chipselects = <3>;
+		cs-gpios = <
+			&gpio3 8 1
+			&gpio3 9 1
+			&gpio2 27 1
+		>;
+
+		spidev0: spi at 0 {
+			compatible = "spidev";
+			reg = <0>;
+			spi-max-frequency = <57600000>;
+		};
+
+		spidev1: spi at 1 {
+			compatible = "spidev";
+			reg = <1>;
+			spi-max-frequency = <57600000>;
+		};
+
+		spidev2: spi at 2 {
+			compatible = "spidev";
+			reg = <2>;
+			spi-max-frequency = <57600000>;
+		};
 	};
+#endif
+	matrix_keypad: matrix-keypad at 0 {
+		compatible = "gpio-matrix-keypad";
+		col-gpios = <
+			&gpio5 0 0
+			&gpio5 1 0
+			&gpio5 2 0
+			&gpio5 3 0
+		>;
+
+		row-gpios = <
+			&gpio5 4 0
+			&gpio5 5 0
+			&gpio5 6 0
+			&gpio5 7 0
+		>;
+
+		/* sample keymap */
+		linux,keymap = <
+			0x00000074 /* row 0, col 0, KEY_POWER */
+			0x00010052 /* row 0, col 1, KEY_KP0 */
+			0x0002004f /* row 0, col 2, KEY_KP1 */
+			0x00030050 /* row 0, col 3, KEY_KP2 */
+			0x01000051 /* row 1, col 0, KEY_KP3 */
+			0x0101004b /* row 1, col 1, KEY_KP4 */
+			0x0102004c /* row 1, col 2, KEY_KP5 */
+			0x0103004d /* row 1, col 3, KEY_KP6 */
+			0x02000047 /* row 2, col 0, KEY_KP7 */
+			0x02010048 /* row 2, col 1, KEY_KP8 */
+			0x02020049 /* row 2, col 2, KEY_KP9 */
+		>;
+		gpio-activelow;
+		linux,wakeup;
+
+		debounce-delay-ms = <100>;
+		col-scan-delay-us = <5000>;
+		linux,no-autorepeat;
+	};
+};
+
+/* 2nd TX-Std UART - (A)UART1  */
+&auart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&auart1_pins_a>;
+	status = "okay";
+};
+
+/* 3rd TX-Std UART - (A)UART3  */
+&auart3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&auart3_pins_a>;
+	status = "okay";
+};
+
+&can0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&can0_pins_a>;
+	xceiver-supply = <&reg_can_xcvr>;
+	status = "okay";
+};
+
+&can1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&can1_pins_a>;
+	xceiver-supply = <&reg_can_xcvr>;
+	status = "okay";
+};
+
+&digctl {
+	status = "okay";
+};
+
+/* 1st TX-Std UART - (D)UART */
+&duart {
+	pinctrl-names = "default";
+	pinctrl-0 = <&duart_4pins_a>;
+	status = "okay";
+};
+
+&gpmi {
+	pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
+	nand-on-flash-bbt;
+	status = "okay";
+};
+
+&i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0_pins_a>;
+	clock-frequency = <400000>;
+	status = "okay";
+
+	ds1339: rtc at 68 {
+		compatible = "mxim,ds1339";
+		reg = <0x68>;
+	};
+
+	gpio5: pca953x at 20 {
+		compatible = "nxp,pca9554";
+		reg = <0x20>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pca9554_pins>;
+		interrupt-parent = <&gpio3>;
+		interrupts = <28 0>;
+		gpio-controller;
+		#gpio-cells = <2>;
+		interrupt-controller;
+		#interrupt-cells = <2>;
+	};
+
+	touchscreen: tsc2007 at 48 {
+		compatible = "ti,tsc2007";
+		reg = <0x48>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&tsc2007_pins>;
+		interrupt-parent = <&gpio3>;
+		interrupts = <20 0>;
+		pendown-gpio = <&gpio3 20 1>;
+		ti,x-plate-ohms = <660>;
+	};
+
+	polytouch: edt-ft5x06 at 38 {
+		compatible = "edt,edt-ft5x06";
+		reg = <0x38>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&edt_ft5x06_pins>;
+		interrupt-parent = <&gpio2>;
+		interrupts = <5 0>;
+		reset-gpios = <&gpio2 6 1>;
+		wake-gpios = <&gpio4 9 0>;
+	};
+
+	sgtl5000: sgtl5000 at 0a {
+		compatible = "fsl,sgtl5000";
+		reg = <0x0a>;
+		VDDA-supply = <&reg_2p5v>;
+		VDDIO-supply = <&reg_3p3v>;
+		clocks = <&mclk>;
+	};
+};
+
+&lcdif {
+	pinctrl-names = "default";
+	pinctrl-0 = <&lcdif_24bit_pins_a &lcdif_sync_pins_a &lcdif_ctrl_pins_a>;
+	lcd-supply = <&reg_lcd>;
+	display = <&display>;
+	status = "okay";
+
+	display: display at 0 {
+		bits-per-pixel = <32>;
+		bus-width = <24>;
+
+		display-timings {
+			native-mode = <&timing5>;
+			timing0: timing0 {
+				panel-name = "VGA";
+				clock-frequency = <25175000>;
+				hactive = <640>;
+				vactive = <480>;
+				hback-porch = <48>;
+				hsync-len = <96>;
+				hfront-porch = <16>;
+				vback-porch = <33>;
+				vsync-len = <2>;
+				vfront-porch = <10>;
+				hsync-active = <0>;
+				vsync-active = <0>;
+				de-active = <1>;
+				pixelclk-active = <1>;
+			};
+
+			timing1: timing1 {
+				panel-name = "ETV570";
+				clock-frequency = <25175000>;
+				hactive = <640>;
+				vactive = <480>;
+				hback-porch = <114>;
+				hsync-len = <30>;
+				hfront-porch = <16>;
+				vback-porch = <32>;
+				vsync-len = <3>;
+				vfront-porch = <10>;
+				hsync-active = <0>;
+				vsync-active = <0>;
+				de-active = <1>;
+				pixelclk-active = <1>;
+			};
+
+			timing2: timing2 {
+				panel-name = "ET0350";
+				clock-frequency = <6500000>;
+				hactive = <320>;
+				vactive = <240>;
+				hback-porch = <34>;
+				hsync-len = <34>;
+				hfront-porch = <20>;
+				vback-porch = <15>;
+				vsync-len = <3>;
+				vfront-porch = <4>;
+				hsync-active = <0>;
+				vsync-active = <0>;
+				de-active = <1>;
+				pixelclk-active = <1>;
+			};
+
+			timing3: timing3 {
+				panel-name = "ET0430";
+				clock-frequency = <9000000>;
+				hactive = <480>;
+				vactive = <272>;
+				hback-porch = <2>;
+				hsync-len = <41>;
+				hfront-porch = <2>;
+				vback-porch = <2>;
+				vsync-len = <10>;
+				vfront-porch = <2>;
+				hsync-active = <0>;
+				vsync-active = <0>;
+				de-active = <1>;
+				pixelclk-active = <1>;
+			};
+
+			timing4: timing4 {
+				panel-name = "ET0500", "ET0700";
+				clock-frequency = <33260000>;
+				hactive = <800>;
+				vactive = <480>;
+				hback-porch = <88>;
+				hsync-len = <128>;
+				hfront-porch = <40>;
+				vback-porch = <33>;
+				vsync-len = <2>;
+				vfront-porch = <10>;
+				hsync-active = <0>;
+				vsync-active = <0>;
+				de-active = <1>;
+				pixelclk-active = <1>;
+			};
+
+			timing5: timing5 {
+				panel-name = "ETQ570";
+				clock-frequency = <6400000>;
+				hactive = <320>;
+				vactive = <240>;
+				hback-porch = <38>;
+				hsync-len = <30>;
+				hfront-porch = <30>;
+				vback-porch = <16>;
+				vsync-len = <3>;
+				vfront-porch = <4>;
+				hsync-active = <0>;
+				vsync-active = <0>;
+				de-active = <1>;
+				pixelclk-active = <1>;
+			};
+        	};
+	};
+};
+
+&lradc {
+	fsl,lradc-touchscreen-wires = <4>;
+	status = "okay";
+};
+
+&mac0 {
+	phy-mode = "rmii";
+	pinctrl-names = "default", "gpio_mode";
+	pinctrl-0 = <&mac0_pins_a>;
+	pinctrl-1 = <&mac0_pins_gpio>;
+	status = "okay";
+};
+
+&mac1 {
+	phy-mode = "rmii";
+	pinctrl-names = "default";
+	pinctrl-0 = <&mac1_pins_a>;
+	/* not enabled by default */
+};
+
+&mxs_rtc {
+	status = "okay";
+};
+
+&ocotp {
+	status = "okay";
+};
+
+&pwm {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pwm0_pins_a>;
+	status = "okay";
+};
+
+&pinctrl {
+	pinctrl-names = "default";
+	pinctrl-0 = <&hog_pins_a>;
+	edt_ft5x06_pins: edt-ft5x06-pins at 0 {
+		reg = <0>;
+		fsl,pinmux-ids = <
+			0x2063 /* MX28_PAD_SSP0_DATA6__GPIO_2_6	RESET */
+			0x2053 /* MX28_PAD_SSP0_DATA5__GPIO_2_5 IRQ */
+			0x4093 /* MX28_PAD_ENET0_RXD2__GPIO_4_9 WAKE */
+		>;
+		fsl,drive-strength = <0>;
+		fsl,voltage = <1>;
+		fsl,pull-up = <0>;
+	};
+
+	flexcan_xcvr_pins_a: flexcan-xcvr {
+		reg = <0>;
+		fsl,pinmux-ids = <
+			0x1003 /* MX28_PAD_LCD_D00__GPIO_1_0 */
+		>;
+		fsl,drive-strength = <0>;
+		fsl,voltage = <1>;
+		fsl,pull-up = <0>;
+	};
+
+	hog_pins_a: hog at 0 {
+		reg = <0>;
+		fsl,pinmux-ids = <
+			0x40a3 /* MX28_PAD_ENET0_RXD3__GPIO_4_10 - module LED */
+		>;
+		fsl,drive-strength = <0>;
+		fsl,voltage = <1>;
+		fsl,pull-up = <0>;
+	};
+
+	lcdif_23bit_pins_a: lcdif-23bit at 0 {
+		reg = <0>;
+		fsl,pinmux-ids = <
+			/* LCD_D00 may be used as Flexcan Transceiver Enable on STK5-V5 */
+			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 */
+			0x1120 /* MX28_PAD_LCD_D18__LCD_D18 */
+			0x1130 /* MX28_PAD_LCD_D19__LCD_D19 */
+			0x1140 /* MX28_PAD_LCD_D20__LCD_D20 */
+			0x1150 /* MX28_PAD_LCD_D21__LCD_D21 */
+			0x1160 /* MX28_PAD_LCD_D22__LCD_D22 */
+			0x1170 /* MX28_PAD_LCD_D23__LCD_D23 */
+		>;
+		fsl,drive-strength = <0>;
+		fsl,voltage = <1>;
+		fsl,pull-up = <0>;
+	};
+
+	lcdif_ctrl_pins_a: lcdif-ctrl at 0 {
+		reg = <0>;
+		fsl,pinmux-ids = <
+			0x11f3	/* MX28_PAD_LCD_ENABLE__GPIO_1_31 - Enable */
+			0x31e3	/* MX28_PAD_LCD_RESET__GPIO_3_30 - Reset */
+		>;
+		fsl,drive-strength = <0>;
+		fsl,voltage = <1>;
+		fsl,pull-up = <0>;
+	};
+
+	mac0_pins_gpio: mac0-gpio-mode at 0 {
+		reg = <0>;
+		fsl,pinmux-ids = <
+			0x4003 /* MX28_PAD_ENET0_MDC__GPIO_4_0 */
+			0x4013 /* MX28_PAD_ENET0_MDIO__GPIO_4_1 */
+			0x4023 /* MX28_PAD_ENET0_RX_EN__GPIO_4_2 */
+			0x4033 /* MX28_PAD_ENET0_RXD0__GPIO_4_3 */
+			0x4043 /* MX28_PAD_ENET0_RXD1__GPIO_4_4 */
+			0x4063 /* MX28_PAD_ENET0_TX_EN__GPIO_4_6 */
+			0x4073 /* MX28_PAD_ENET0_TXD0__GPIO_4_7 */
+			0x4083 /* MX28_PAD_ENET0_TXD1__GPIO_4_8 */
+			0x4103 /* MX28_PAD_ENET_CLK__GPIO_4_16 */
+		>;
+		fsl,drive-strength = <0>;
+		fsl,voltage = <1>;
+		fsl,pull-up = <0>;
+	};
+
+	pca9554_pins: pca9554-pins at 0 {
+		reg = <0>;
+		fsl,pinmux-ids = <
+			0x31c3 /* MX28_PAD_PWM3__GPIO_3_28 IRQ */
+		>;
+		fsl,drive-strength = <0>;
+		fsl,voltage = <1>;
+		fsl,pull-up = <0>;
+	};
+
+	spi_pins_gpio: spi at 0 {
+		reg = <0>;
+		fsl,pinmux-ids = <
+			0x3083	/* MX28_PAD_AUART2_RX__GPIO_3_8 SS0 */
+			0x3093	/* MX28_PAD_AUART2_TX__GPIO_3_9 SS1 */
+			0x2183	/* MX28_PAD_SSP3_SCK__GPIO_2_24 SCK */
+			0x2193	/* MX28_PAD_SSP3_MOSI__GPIO_2_25 MOSI */
+			0x21A3	/* MX28_PAD_SSP3_MISO__GPIO_2_26 MISO */
+			0x21B3	/* MX28_PAD_SSP3_SS0__GPIO_2_27 SS2 */
+		>;
+		fsl,drive-strength = <1>;
+		fsl,voltage = <1>;
+		fsl,pull-up = <0>;
+	};
+
+	tsc2007_pins: tsc2007-pins at 0 {
+		reg = <0>;
+		fsl,pinmux-ids = <
+			0x3143 /* MX28_PAD_SAIF0_MCLK__GPIO_3_20 - TSC2007 IRQ */
+		>;
+		fsl,drive-strength = <0>;
+		fsl,voltage = <1>;
+		fsl,pull-up = <0>;
+	};
+};
+
+&saif0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&saif0_pins_b>;
+	fsl,saif-master;
+	status = "okay";
+};
+
+&saif1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&saif1_pins_a>;
+	status = "okay";
+};
+
+&ssp0 {
+	compatible = "fsl,imx28-mmc";
+	pinctrl-names = "default", "special";
+	pinctrl-0 = <&mmc0_4bit_pins_a
+		     &mmc0_cd_cfg
+		     &mmc0_sck_cfg>;
+	bus-width = <4>;
+	status = "okay";
+};
+#ifndef USE_SPI_GPIO
+&ssp3 {
+	compatible = "fsl,imx28-spi";
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi3_pins_a>;
+	clock-frequency = <57600000>;
+	status = "okay";
+
+	spidev0: spi at 0 {
+		compatible = "spidev";
+		reg = <0>;
+		spi-max-frequency = <57600000>;
+	};
+
+	spidev1: spi at 1 {
+		compatible = "spidev";
+		reg = <1>;
+		spi-max-frequency = <57600000>;
+	};
+};
+#endif
+&timer {
+	status = "okay";
+};
+
+&usb0 {
+	vbus-supply = <&reg_usb0_vbus>;
+	disable-over-current;
+	dr_mode = "peripheral";
+	status = "okay";
+};
+
+&usb1 {
+	vbus-supply = <&reg_usb1_vbus>;
+	disable-over-current;
+	dr_mode = "host";
+	status = "okay";
+};
+
+&usbphy0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&usbphy0_pins_c>;
+	status = "okay";
+};
+
+&usbphy1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&usbphy1_pins_b>;
+	status = "okay";
 };

Signature · 1 line

1.7.2.5

Stephen Warren

2013-07-31 19:49 UTC #11 lore raw

PATCH 9/10 ARM: dts: tx28: restructure and update DTS file

On 07/31/2013 08:37 AM, Lothar Wa?mann wrote:

This patch is definitely too invasive not to have a description.

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

Quoted 3 lines

arch/arm/boot/dts/imx28-tx28.dts +1 -0
 
+ * Copyright 2013 Lothar Wa?mann <[email protected]>

I don't think you're the only person who wrote these. Perhaps other people should be listed here too?

Quoted 1 line

+#define USE_SPI_GPIO

What's that?

arch/arm/boot/dts/imx28-tx28.dts line 37

Quoted 3 lines

arch/arm/boot/dts/imx28-tx28.dts +3 -0

+	chosen {
+		bootargs = "init=/linuxrc console=ttyAMA0,115200 root=/dev/mtdblock3 rootfstype=jffs2 ro debug panic=1";
+	};

I think this should be set by the bootloader, not hard-coded.

Dirk Behme

2014-04-17 06:39 UTC #12 lore raw

PATCH 9/10 ARM: dts: tx28: restructure and update DTS file

In reply to Lothar Waßmann

Quoted 3 lines · Lothar Wa?mann

Signed-off-by Lothar Wa?mann <[email protected]>
---

...

Quoted 5 lines

+&lcdif {

arch/arm/boot/dts/imx28-tx28.dts +4 -0

+       pinctrl-names = "default";
+       pinctrl-0 = <&lcdif_24bit_pins_a &lcdif_sync_pins_a &lcdif_ctrl_pins_a>;
+       lcd-supply = <&reg_lcd>;
+       display = <&display>;

arch/arm/boot/dts/imx28-tx28.dts line 358

Quoted 10 lines

arch/arm/boot/dts/imx28-tx28.dts +10 -0

+       status = "okay";
+
+       display: display at 0 {
+               bits-per-pixel = <32>;
+               bus-width = <24>;
+
+               display-timings {
+                       native-mode = <&timing5>;
+                       timing0: timing0 {
+                               panel-name = "VGA";

...

I've been looking for any user or documentation of 'panel-name'. But couldn't find anything. Anything I missed?

Many thanks

Dirk

Lothar Waßmann

author

2014-04-17 07:35 UTC #13 lore raw

PATCH 9/10 ARM: dts: tx28: restructure and update DTS file

Hi,

Quoted 22 lines · Dirk Behme

Quoted 3 lines · Lothar Wa?mann

Signed-off-by Lothar Wa?mann <[email protected]>
---

...

Quoted 15 lines

+&lcdif {

arch/arm/boot/dts/imx28-tx28.dts +14 -0

+       pinctrl-names = "default";
+       pinctrl-0 = <&lcdif_24bit_pins_a &lcdif_sync_pins_a &lcdif_ctrl_pins_a>;
+       lcd-supply = <&reg_lcd>;
+       display = <&display>;
+       status = "okay";
+
+       display: display at 0 {
+               bits-per-pixel = <32>;
+               bus-width = <24>;
+
+               display-timings {
+                       native-mode = <&timing5>;
+                       timing0: timing0 {
+                               panel-name = "VGA";

...

Quoted 3 lines

I've been looking for any user or documentation of 'panel-name'. But couldn't find anything. Anything I missed?

Our U-Boot uses this to find the active video setting according to an environment variable setting.

Lothar Wa?mann

Signature · 9 lines

___________________________________________________________

Ka-Ro electronics GmbH | Pascalstra?e 22 | D - 52076 Aachen
Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10
Gesch?ftsf?hrer: Matthias Kaussen
Handelsregistereintrag: Amtsgericht Aachen, HRB 4996

www.karo-electronics.de | info at karo-electronics.de
___________________________________________________________

Lothar Waßmann

author

2013-07-31 14:38 UTC #14 lore raw

PATCH 10/10 ARM: dts: mxs: add pinctrl header files to be able to use symbolic names in dts files

In reply to Lothar Waßmann

Signed-off-by Lothar Wa?mann <[email protected]>

---
 arch/arm/boot/dts/imx28-apf28.dts      |    2 +-
 arch/arm/boot/dts/imx28-apf28dev.dts   |    2 +-
 arch/arm/boot/dts/imx28-apx4devkit.dts |    2 +-
 arch/arm/boot/dts/imx28-cfa10036.dts   |    2 +-
 arch/arm/boot/dts/imx28-cfa10037.dts   |    2 +-
 arch/arm/boot/dts/imx28-cfa10049.dts   |    2 +-
 arch/arm/boot/dts/imx28-cfa10055.dts   |    2 +-
 arch/arm/boot/dts/imx28-cfa10056.dts   |    2 +-
 arch/arm/boot/dts/imx28-cfa10057.dts   |    2 +-
 arch/arm/boot/dts/imx28-cfa10058.dts   |    2 +-
 arch/arm/boot/dts/imx28-evk.dts        |    2 +-
 arch/arm/boot/dts/imx28-m28evk.dts     |    2 +-
 arch/arm/boot/dts/imx28-sps1.dts       |    2 +-
 arch/arm/boot/dts/imx28-tx28.dts       |   94 +++---
 arch/arm/boot/dts/imx28.dtsi           |  179 ++++++------
 include/dt-bindings/pinctrl/mx23.h     |  333 +++++++++++++++++++++
 include/dt-bindings/pinctrl/mx28.h     |  506 ++++++++++++++++++++++++++++++++
 include/dt-bindings/pinctrl/mxs.h      |   31 ++
 18 files changed, 1020 insertions(+), 149 deletions(-)
 create mode 100644 include/dt-bindings/pinctrl/mx23.h
 create mode 100644 include/dt-bindings/pinctrl/mx28.h
 create mode 100644 include/dt-bindings/pinctrl/mxs.h

arch/arm/boot/dts/imx28-apf28.dts +1 -1

index 7eb0758..7198fe3 100644
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-/include/ "imx28.dtsi"
+#include "imx28.dtsi"
 
 / {
 	model = "Armadeus Systems APF28 module";

arch/arm/boot/dts/imx28-apf28dev.dts +1 -1

index b602494..a71d38a 100644
@@ -10,7 +10,7 @@
  */
 
 /* APF28Dev is a docking board for the APF28 SOM */
-/include/ "imx28-apf28.dts"
+#include "imx28-apf28.dts"
 
 / {
 	model = "Armadeus Systems APF28Dev docking/development board";

arch/arm/boot/dts/imx28-apx4devkit.dts +1 -1

index 0e7fed4..11befa0 100644
@@ -1,5 +1,5 @@
 /dts-v1/;
-/include/ "imx28.dtsi"
+#include "imx28.dtsi"
 
 / {
 	model = "Bluegiga APX4 Development Kit";

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

index 1ec8c94..db3edb8 100644
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-/include/ "imx28.dtsi"
+#include "imx28.dtsi"
 
 / {
 	model = "Crystalfontz CFA-10036 Board";

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

index 182b99f..2935fa9 100644
@@ -13,7 +13,7 @@
  * 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"
+#include "imx28-cfa10036.dts"
 
 / {
 	model = "Crystalfontz CFA-10037 Board";

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

index 06e4cfa..4132bdd 100644
@@ -13,7 +13,7 @@
  * 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"
+#include "imx28-cfa10036.dts"
 
 / {
 	model = "Crystalfontz CFA-10049 Board";

arch/arm/boot/dts/imx28-cfa10055.dts +1 -1

index 171bcbe..dabc1d5 100644
@@ -14,7 +14,7 @@
  * The CFA-10055 is an expansion board for the CFA-10036 module and
  * CFA-10037, thus we need to include the CFA-10037 DTS.
  */
-/include/ "imx28-cfa10037.dts"
+#include "imx28-cfa10037.dts"
 
 / {
 	model = "Crystalfontz CFA-10055 Board";

arch/arm/boot/dts/imx28-cfa10056.dts +1 -1

index b45dd0e..8938744 100644
@@ -13,7 +13,7 @@
  * The CFA-10055 is an expansion board for the CFA-10036 module and
  * CFA-10037, thus we need to include the CFA-10037 DTS.
  */
-/include/ "imx28-cfa10037.dts"
+#include "imx28-cfa10037.dts"
 
 / {
 	model = "Crystalfontz CFA-10056 Board";

arch/arm/boot/dts/imx28-cfa10057.dts +1 -1

index 0333c05..d01eac9 100644
@@ -14,7 +14,7 @@
  * The CFA-10057 is an expansion board for the CFA-10036 module, thus we
  * need to include the CFA-10036 DTS.
  */
-/include/ "imx28-cfa10036.dts"
+#include "imx28-cfa10036.dts"
 
 / {
 	model = "Crystalfontz CFA-10057 Board";

arch/arm/boot/dts/imx28-cfa10058.dts +1 -1

index 64c64c5..3066188 100644
@@ -14,7 +14,7 @@
  * The CFA-10058 is an expansion board for the CFA-10036 module, thus we
  * need to include the CFA-10036 DTS.
  */
-/include/ "imx28-cfa10036.dts"
+#include "imx28-cfa10036.dts"
 
 / {
 	model = "Crystalfontz CFA-10058 Board";

arch/arm/boot/dts/imx28-evk.dts +1 -1

index 6556197..0b10f61 100644
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-/include/ "imx28.dtsi"
+#include "imx28.dtsi"
 
 / {
 	model = "Freescale i.MX28 Evaluation Kit";

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

index 0d322a2..b371b2a 100644
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-/include/ "imx28.dtsi"
+#include "imx28.dtsi"
 
 / {
 	model = "DENX M28EVK";

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

index 6c6a544..1171676 100644
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-/include/ "imx28.dtsi"
+#include "imx28.dtsi"
 
 / {
 	model = "SchulerControl GmbH, SC SPS 1";

arch/arm/boot/dts/imx28-tx28.dts +47 ~~-47~~

148 lines not on this page · raw message

arch/arm/boot/dts/imx28.dtsi +90 ~~-89~~

281 lines not on this page · raw message

include/dt-bindings/pinctrl/mx23.h new file +333 -0

333 lines not on this page · raw message

include/dt-bindings/pinctrl/mx28.h new file +506 -0

506 lines not on this page · raw message

include/dt-bindings/pinctrl/mxs.h new file +31 -0

new file mode 100644
index 0000000..c6da987
@@ -0,0 +1,31 @@
+/*
+ * Header providing constants for i.MX28 pinctrl bindings.
+ *
+ * Copyright (C) 2013 Lothar Wa?mann <[email protected]>
+ *
+ * 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 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#ifndef __DT_BINDINGS_MXS_PINCTRL_H__
+#define __DT_BINDINGS_MXS_PINCTRL_H__
+
+/* fsl,drive-strength property */
+#define MXS_DRIVE_4mA		0
+#define MXS_DRIVE_8mA		1
+#define MXS_DRIVE_12mA		2
+#define MXS_DRIVE_16mA		3
+
+/* fsl,voltage property */
+#define MXS_VOLTAGE_LOW		0
+#define MXS_VOLTAGE_HIGH	1
+
+/* fsl,pull-up property */
+#define MXS_PULL_DISABLE	0
+#define MXS_PULL_ENABLE		1
+
+#endif /* __DT_BINDINGS_MXS_PINCTRL_H__ */

Signature · 1 line

1.7.2.5

Stephen Warren

2013-07-31 19:46 UTC #15 lore raw

PATCH 1/10 ARM: dts: mxs: move 'compatible' property to beginning of node and do some whitespace cleanups

In reply to Lothar Waßmann

On 07/31/2013 08:37 AM, Lothar Wa?mann wrote:

These really need patch descriptions.

I'm not sure if doing multiple things at once in a patch is a good idea, although admittedly otherwise it'd mean a lot of trivial patches.

Sergei Shtylyov

2013-07-31 20:21 UTC #16 lore raw

PATCH 1/10 ARM: dts: mxs: move 'compatible' property to beginning of node and do some whitespace cleanups

In reply to Lothar Waßmann

Hello.

Quoted 10 lines · Lothar Wa?mann

Signed-off-by Lothar Wa?mann <[email protected]>
---
  arch/arm/boot/dts/imx28.dtsi |    5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx28.dtsi +0 -0
index 47fc5ef..0360acc 100644

arch/arm/boot/dts/imx28.dtsi line 734

Quoted 4 lines

arch/arm/boot/dts/imx28.dtsi +1 -0

@@ -731,9 +731,9 @@
  			};
 
  			dcp at 80028000 {
+				compatible = "fsl-dcp";

Hm, why not the usual "fsl,dcp", where "fsl" is Freescale's stock ticker?

arch/arm/boot/dts/imx28.dtsi line 737

Quoted 4 lines

arch/arm/boot/dts/imx28.dtsi +0 -1

  				reg = <0x80028000 0x2000>;
  				interrupts = <52 53 54>;
-				compatible = "fsl-dcp";
  			};

WBR, Sergei

Lothar Waßmann

author

2013-08-01 05:57 UTC #17 lore raw

PATCH 1/10 ARM: dts: mxs: move 'compatible' property to beginning of node and do some whitespace cleanups

Hi,

Quoted 16 lines · Sergei Shtylyov

Hello.
Quoted 12 lines · Lothar Wa?mann
Signed-off-by Lothar Wa?mann <[email protected]>
---
  arch/arm/boot/dts/imx28.dtsi |    5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx28.dtsi +0 -0
index 47fc5ef..0360acc 100644
@@ -731,9 +731,9 @@
  			};
 

Quoted 5 lines

arch/arm/boot/dts/imx28.dtsi line 734
Quoted 2 lines
arch/arm/boot/dts/imx28.dtsi +1 -0
  			dcp at 80028000 {
+				compatible = "fsl-dcp";
Hm, why not the usual "fsl,dcp", where "fsl" is Freescale's stock ticker?

Don't ask me, but the author of the patch that introduced this (CC'ed), or the maintainer who accepted this in the first place.

Lothar Wa?mann

Signature · 9 lines

___________________________________________________________

Ka-Ro electronics GmbH | Pascalstra?e 22 | D - 52076 Aachen
Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10
Gesch?ftsf?hrer: Matthias Kaussen
Handelsregistereintrag: Amtsgericht Aachen, HRB 4996

www.karo-electronics.de | info at karo-electronics.de
___________________________________________________________

Tobias Rauter

2013-08-01 07:40 UTC #18 lore raw

PATCH 1/10 ARM: dts: mxs: move 'compatible' property to beginning of node and do some whitespace cleanups

Quoted 13 lines · Lothar Wa?mann

Hi,
Quoted 10 lines · Sergei Shtylyov
Hello.
Quoted 7 lines · Lothar Wa?mann
arch/arm/boot/dts/imx28.dtsi +0 -0
index 47fc5ef..0360acc 100644
@@ -731,9 +731,9 @@
   			};
 

Quoted 6 lines

Quoted 4 lines
arch/arm/boot/dts/imx28.dtsi line 734
Quoted 2 lines
arch/arm/boot/dts/imx28.dtsi +1 -0
   			dcp at 80028000 {
+				compatible = "fsl-dcp";
Hm, why not the usual "fsl,dcp", where "fsl" is Freescale's stock ticker?
Don't ask me, but the author of the patch that introduced this (CC'ed), or the maintainer who accepted this in the first place.

Hi!

The simple reason is that I didn't know it better when I wrote this. I think I can send a patch until Monday.
But feel free to change it yourself if you want.

Tobias