Skip to contentSkip to conversation

dts: v8500: Cleanups for 3.10

PATCH New Tony Prisk 2 participants 6 messages Apr 24, 2013

Subsystems (2)
lore
Share & tools
lore

Tony Prisk

author
#0 lore raw

cover dts: v8500: Cleanups for 3.10

Arnd, Olof,

This is probably a bit late for 3.10 now but its just a bunch of cleanups for the arch-vt8500 devicetree SoC and board files, and the addition of a new dts for the VIA APC8750.

Regards
Tony P

Tony Prisk (3):
dts: vt8500: Fix invalid/missing cpu nodes for soc files.
dts: vt8500: Add devicetree support for WM8750 SoC and APC8750 board
dts: vt8500: Update serial nodes and disable by default in SoC files

 arch/arm/boot/dts/Makefile           |    1 +
 arch/arm/boot/dts/vt8500-bv07.dts    |    4 +
 arch/arm/boot/dts/vt8500.dtsi        |   29 ++-
 arch/arm/boot/dts/wm8505-ref.dts     |    4 +
 arch/arm/boot/dts/wm8505.dtsi        |   35 +++-
 arch/arm/boot/dts/wm8650-mid.dts     |    4 +
 arch/arm/boot/dts/wm8650.dtsi        |   21 +-
 arch/arm/boot/dts/wm8750-apc8750.dts |   30 +++
 arch/arm/boot/dts/wm8750.dtsi        |  355 ++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/wm8850-w70v2.dts   |    4 +
 arch/arm/boot/dts/wm8850.dtsi        |   23 ++-
 11 files changed, 492 insertions(+), 18 deletions(-)
 create mode 100644 arch/arm/boot/dts/wm8750-apc8750.dts
 create mode 100644 arch/arm/boot/dts/wm8750.dtsi
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/3 dts: vt8500: Fix invalid/missing cpu nodes for soc files.

vt8500, wm8650 and wm8850 have no cpu node specified. wm8505 has a cpu node which contains an invalid compatible string, and is missing the other required properties.

---
 arch/arm/boot/dts/vt8500.dtsi |   10 ++++++++++
 arch/arm/boot/dts/wm8505.dtsi |    8 ++++++--
 arch/arm/boot/dts/wm8650.dtsi |   10 ++++++++++
 arch/arm/boot/dts/wm8850.dtsi |   11 +++++++++++
 4 files changed, 37 insertions(+), 2 deletions(-)
arch/arm/boot/dts/vt8500.dtsi +10 -0
index cf31ced..e35590e 100644
@@ -11,6 +11,16 @@
 / {
 	compatible = "via,vt8500";
 
+	cpus {
+		#size-cells = <0>;
+		#address-cells = <1>;
+
+		cpu {
+			device_type = "cpu";
+			compatible = "arm,arm926";
+		};
+	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
arch/arm/boot/dts/wm8505.dtsi +6 -2
index e74a1c0..dc21d13 100644
@@ -12,8 +12,12 @@
 	compatible = "wm,wm8505";
 
 	cpus {
-		cpu at 0 {
-			compatible = "arm,arm926ejs";
+		#size-cells = <0>;
+		#address-cells = <1>;
+
+		cpu {
+			device_type = "cpu";
+			compatible = "arm,arm926";
 		};
 	};
 
arch/arm/boot/dts/wm8650.dtsi +10 -0
index db3c0a1..f4cd55e 100644
@@ -11,6 +11,16 @@
 / {
 	compatible = "wm,wm8650";
 
+	cpus {
+		#size-cells = <0>;
+		#address-cells = <1>;
+
+		cpu {
+			device_type = "cpu";
+			compatible = "arm,arm926";
+		};
+	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
arch/arm/boot/dts/wm8850.dtsi +11 -0
index e8cbfdc..4b56aa0 100644
@@ -11,6 +11,17 @@
 / {
 	compatible = "wm,wm8850";
 
+	cpus {
+		#size-cells = <0>;
+		#address-cells = <1>;
+
+		cpu at 0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a9";
+			reg = <0x0>;
+		};
+	};
+
 	aliases {
 		serial0 = &uart0;
 		serial1 = &uart1;
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/3 dts: vt8500: Add devicetree support for WM8750 SoC and APC8750 board

In reply to Tony Prisk

This patch adds support for the WonderMedia WM8750 SoC and the VIA APC8750 board.

---
 arch/arm/boot/dts/Makefile           |    1 +
 arch/arm/boot/dts/wm8750-apc8750.dts |   26 +++
 arch/arm/boot/dts/wm8750.dtsi        |  349 ++++++++++++++++++++++++++++++++++
 3 files changed, 376 insertions(+)
 create mode 100644 arch/arm/boot/dts/wm8750-apc8750.dts
 create mode 100644 arch/arm/boot/dts/wm8750.dtsi
arch/arm/boot/dts/Makefile +1 -0
index 9c62558..389536e 100644
@@ -173,6 +173,7 @@ dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
 dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
 	wm8505-ref.dtb \
 	wm8650-mid.dtb \
+	wm8750-apc8750.dtb \
 	wm8850-w70v2.dtb
 dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb
 
arch/arm/boot/dts/wm8750-apc8750.dts new file +26 -0
new file mode 100644
index 0000000..62675eb
@@ -0,0 +1,26 @@
+/*
+ * wm8750-apc8750.dts
+ *  - Device tree file for VIA APC8750
+ *
+ * Copyright (C) 2012 Tony Prisk <[email protected]>
+ *
+ * Licensed under GPLv2 or later
+ */
+
+/dts-v1/;
+/include/ "wm8750.dtsi"
+
+/ {
+	model = "VIA APC8750";
+};
+
+&pinctrl {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c>;
+
+	i2c: i2c {
+		wm,pins = <168 169 170 171>;
+		wm,function = <2>;	/* alt */
+		wm,pull = <2>;	/* pull-up */
+	};
+};
arch/arm/boot/dts/wm8750.dtsi new file +349 -0

349 lines not on this page · raw message

Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH 3/3 dts: vt8500: Update serial nodes and disable by default in SoC files

In reply to Tony Prisk

Missing aliases for uarts on vt8500, wm8505, wm8650 added.
Nodes incorrectly labelled uart at .., changed to serial at ... on all SoCs. Set each uarts default status = "disabled" as they generally don't exist.

For each board file, we only need to enable uart0 as no other uarts are physically present on any of these boards.

---
 arch/arm/boot/dts/vt8500-bv07.dts    |    4 ++++
 arch/arm/boot/dts/vt8500.dtsi        |   19 +++++++++++++++----
 arch/arm/boot/dts/wm8505-ref.dts     |    4 ++++
 arch/arm/boot/dts/wm8505.dtsi        |   27 +++++++++++++++++++++------
 arch/arm/boot/dts/wm8650-mid.dts     |    4 ++++
 arch/arm/boot/dts/wm8650.dtsi        |   11 +++++++++--
 arch/arm/boot/dts/wm8750-apc8750.dts |    4 ++++
 arch/arm/boot/dts/wm8750.dtsi        |   18 ++++++++++++------
 arch/arm/boot/dts/wm8850-w70v2.dts   |    4 ++++
 arch/arm/boot/dts/wm8850.dtsi        |   12 ++++++++----
 10 files changed, 85 insertions(+), 22 deletions(-)
arch/arm/boot/dts/vt8500-bv07.dts +4 -0
index 567cf4e..faabc9c 100644
@@ -34,3 +34,7 @@
 		};
 	};
 };
+
+&uart0 {
+	status = "okay";
+};
arch/arm/boot/dts/vt8500.dtsi +15 -4
index e35590e..4908222 100644
@@ -21,6 +21,13 @@
 		};
 	};
 
+	aliases {
+		serial0 = &uart0;
+		serial1 = &uart1;
+		serial2 = &uart2;
+		serial3 = &uart3;
+	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -121,32 +128,36 @@
 			reg = <0xd8050400 0x100>;
 		};
 
-		uart at d8200000 {
+		uart0: serial at d8200000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd8200000 0x1040>;
 			interrupts = <32>;
 			clocks = <&clkuart0>;
+			status = "disabled";
 		};
 
-		uart at d82b0000 {
+		uart1: serial at d82b0000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd82b0000 0x1040>;
 			interrupts = <33>;
 			clocks = <&clkuart1>;
+			status = "disabled";
 		};
 
-		uart at d8210000 {
+		uart2: serial at d8210000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd8210000 0x1040>;
 			interrupts = <47>;
 			clocks = <&clkuart2>;
+			status = "disabled";
 		};
 
-		uart at d82c0000 {
+		uart3: serial at d82c0000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd82c0000 0x1040>;
 			interrupts = <50>;
 			clocks = <&clkuart3>;
+			status = "disabled";
 		};
 
 		rtc at d8100000 {
arch/arm/boot/dts/wm8505-ref.dts +4 -0
index fd4e248..acb996f 100644
@@ -34,3 +34,7 @@
 		};
 	};
 };
+
+&uart0 {
+	status = "okay";
+};
arch/arm/boot/dts/wm8505.dtsi +21 -6
index dc21d13..e5076d5 100644
@@ -21,6 +21,15 @@
 		};
 	};
 
+ 	aliases {
+		serial0 = &uart0;
+		serial1 = &uart1;
+		serial2 = &uart2;
+		serial3 = &uart3;
+		serial4 = &uart4;
+		serial5 = &uart5;
+ 	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -144,46 +153,52 @@
 			reg = <0xd8050400 0x100>;
 		};
 
-		uart at d8200000 {
+		uart0: serial at d8200000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd8200000 0x1040>;
 			interrupts = <32>;
 			clocks = <&clkuart0>;
+			status = "disabled";
 		};
 
-		uart at d82b0000 {
+		uart1: serial at d82b0000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd82b0000 0x1040>;
 			interrupts = <33>;
 			clocks = <&clkuart1>;
+			status = "disabled";
 		};
 
-		uart at d8210000 {
+		uart2: serial at d8210000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd8210000 0x1040>;
 			interrupts = <47>;
 			clocks = <&clkuart2>;
+			status = "disabled";
 		};
 
-		uart at d82c0000 {
+		uart3: serial at d82c0000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd82c0000 0x1040>;
 			interrupts = <50>;
 			clocks = <&clkuart3>;
+			status = "disabled";
 		};
 
-		uart at d8370000 {
+		uart4: serial at d8370000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd8370000 0x1040>;
 			interrupts = <31>;
 			clocks = <&clkuart4>;
+			status = "disabled";
 		};
 
-		uart at d8380000 {
+		uart5: serial at d8380000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd8380000 0x1040>;
 			interrupts = <30>;
 			clocks = <&clkuart5>;
+			status = "disabled";
 		};
 
 		rtc at d8100000 {
arch/arm/boot/dts/wm8650-mid.dts +4 -0
index cefd938..fec12f1 100644
@@ -34,3 +34,7 @@
 		};
 	};
 };
+
+&uart0 {
+	status = "okay";
+};
arch/arm/boot/dts/wm8650.dtsi +9 -2
index f4cd55e..8e099a8 100644
@@ -21,6 +21,11 @@
 		};
 	};
 
+ 	aliases {
+		serial0 = &uart0;
+		serial1 = &uart1;
+	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -150,18 +155,20 @@
 			reg = <0xd8050400 0x100>;
 		};
 
-		uart at d8200000 {
+		uart0: serial at d8200000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd8200000 0x1040>;
 			interrupts = <32>;
 			clocks = <&clkuart0>;
+			status = "disabled";
 		};
 
-		uart at d82b0000 {
+		uart1: serial at d82b0000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd82b0000 0x1040>;
 			interrupts = <33>;
 			clocks = <&clkuart1>;
+			status = "disabled";
 		};
 
 		rtc at d8100000 {
arch/arm/boot/dts/wm8750-apc8750.dts +4 -0
index 62675eb..37e4a40 100644
@@ -24,3 +24,7 @@
 		wm,pull = <2>;	/* pull-up */
 	};
 };
+
+&uart0 {
+	status = "okay";
+};
arch/arm/boot/dts/wm8750.dtsi +12 -6
index 81683fa..c048c04 100644
@@ -273,46 +273,52 @@
 			interrupts = <26>;
 		};
 
-		uart0: uart at d8200000 {
+		uart0: serial at d8200000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd8200000 0x1040>;
 			interrupts = <32>;
 			clocks = <&clkuart0>;
+			status = "disabled";
 		};
 
-		uart1: uart at d82b0000 {
+		uart1: serial at d82b0000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd82b0000 0x1040>;
 			interrupts = <33>;
 			clocks = <&clkuart1>;
+			status = "disabled";
 		};
 
-                uart2: uart at d8210000 {
+                uart2: serial at d8210000 {
                         compatible = "via,vt8500-uart";
                         reg = <0xd8210000 0x1040>;
                         interrupts = <47>;
                         clocks = <&clkuart2>;
+			status = "disabled";
                 };
 
-                uart3: uart at d82c0000 {
+                uart3: serial at d82c0000 {
                         compatible = "via,vt8500-uart";
                         reg = <0xd82c0000 0x1040>;
                         interrupts = <50>;
                         clocks = <&clkuart3>;
+			status = "disabled";
                 };
 
-                uart4: uart at d8370000 {
+                uart4: serial at d8370000 {
                         compatible = "via,vt8500-uart";
                         reg = <0xd8370000 0x1040>;
                         interrupts = <30>;
                         clocks = <&clkuart4>;
+			status = "disabled";
                 };
 
-                uart5: uart at d8380000 {
+                uart5: serial at d8380000 {
                         compatible = "via,vt8500-uart";
                         reg = <0xd8380000 0x1040>;
                         interrupts = <43>;
                         clocks = <&clkuart5>;
+			status = "disabled";
                 };
 
 		rtc at d8100000 {
arch/arm/boot/dts/wm8850-w70v2.dts +4 -0
index fcc660c..5b96ba2 100644
@@ -45,3 +45,7 @@
 		default-brightness-level = <5>;
 	};
 };
+
+&uart0 {
+	status = "okay";
+};
arch/arm/boot/dts/wm8850.dtsi +8 -4
index 4b56aa0..b5d36e1 100644
@@ -189,32 +189,36 @@
 			interrupts = <26>;
 		};
 
-		uart0: uart at d8200000 {
+		uart0: serial at d8200000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd8200000 0x1040>;
 			interrupts = <32>;
 			clocks = <&clkuart0>;
+			status = "disabled";
 		};
 
-		uart1: uart at d82b0000 {
+		uart1: serial at d82b0000 {
 			compatible = "via,vt8500-uart";
 			reg = <0xd82b0000 0x1040>;
 			interrupts = <33>;
 			clocks = <&clkuart1>;
+			status = "disabled";
 		};
 
-                uart2: uart at d8210000 {
+                uart2: serial at d8210000 {
                         compatible = "via,vt8500-uart";
                         reg = <0xd8210000 0x1040>;
                         interrupts = <47>;
                         clocks = <&clkuart2>;
+			status = "disabled";
                 };
 
-                uart3: uart at d82c0000 {
+                uart3: serial at d82c0000 {
                         compatible = "via,vt8500-uart";
                         reg = <0xd82c0000 0x1040>;
                         interrupts = <50>;
                         clocks = <&clkuart3>;
+			status = "disabled";
                 };
 
 		rtc at d8100000 {
Signature · 1 line
1.7.9.5
author
#4 lore raw

cover dts: v8500: Cleanups for 3.10

In reply to Tony Prisk
Quoted 26 lines · Tony Prisk

Arnd, Olof,

This is probably a bit late for 3.10 now but its just a bunch of cleanups for the arch-vt8500 devicetree SoC and board files, and the addition of a new dts for the VIA APC8750.

Regards
Tony P

Tony Prisk (3):
dts: vt8500: Fix invalid/missing cpu nodes for soc files.
dts: vt8500: Add devicetree support for WM8750 SoC and APC8750 board
dts: vt8500: Update serial nodes and disable by default in SoC files

  arch/arm/boot/dts/Makefile           |    1 +
  arch/arm/boot/dts/vt8500-bv07.dts    |    4 +
  arch/arm/boot/dts/vt8500.dtsi        |   29 ++-
  arch/arm/boot/dts/wm8505-ref.dts     |    4 +
  arch/arm/boot/dts/wm8505.dtsi        |   35 +++-
  arch/arm/boot/dts/wm8650-mid.dts     |    4 +
  arch/arm/boot/dts/wm8650.dtsi        |   21 +-
  arch/arm/boot/dts/wm8750-apc8750.dts |   30 +++
  arch/arm/boot/dts/wm8750.dtsi        |  355 ++++++++++++++++++++++++++++++++++
  arch/arm/boot/dts/wm8850-w70v2.dts   |    4 +
  arch/arm/boot/dts/wm8850.dtsi        |   23 ++-
  11 files changed, 492 insertions(+), 18 deletions(-)
Quoted 3 lines

create mode 100644 arch/arm/boot/dts/wm8750-apc8750.dts create mode 100644 arch/arm/boot/dts/wm8750.dtsi

Don't worry about this patch series - it looks like we are going back to 926ejs (rather than changing to 926) so I will send out another request after the merge window.

Regards
Tony P

#5 lore raw

cover dts: v8500: Cleanups for 3.10

Quoted 33 lines · Tony Prisk
Quoted 29 lines · Tony Prisk

Arnd, Olof,

This is probably a bit late for 3.10 now but its just a bunch of cleanups for
the arch-vt8500 devicetree SoC and board files, and the addition of a new dts for the VIA APC8750.

Regards
Tony P

Tony Prisk (3):
dts: vt8500: Fix invalid/missing cpu nodes for soc files.
dts: vt8500: Add devicetree support for WM8750 SoC and APC8750 board
dts: vt8500: Update serial nodes and disable by default in SoC files

  arch/arm/boot/dts/Makefile           |    1 +
  arch/arm/boot/dts/vt8500-bv07.dts    |    4 +
  arch/arm/boot/dts/vt8500.dtsi        |   29 ++-
  arch/arm/boot/dts/wm8505-ref.dts     |    4 +
  arch/arm/boot/dts/wm8505.dtsi        |   35 +++-
  arch/arm/boot/dts/wm8650-mid.dts     |    4 +
  arch/arm/boot/dts/wm8650.dtsi        |   21 +-
  arch/arm/boot/dts/wm8750-apc8750.dts |   30 +++
  arch/arm/boot/dts/wm8750.dtsi        |  355
++++++++++++++++++++++++++++++++++
  arch/arm/boot/dts/wm8850-w70v2.dts   |    4 +
  arch/arm/boot/dts/wm8850.dtsi        |   23 ++-
  11 files changed, 492 insertions(+), 18 deletions(-)
Quoted 3 lines

create mode 100644 arch/arm/boot/dts/wm8750-apc8750.dts create mode 100644 arch/arm/boot/dts/wm8750.dtsi

Quoted 3 lines

Don't worry about this patch series - it looks like we are going back to 926ejs (rather than changing to 926) so I will send out another request after the merge window.

Ok, it was definitely late for 3.10 anyway. :) We'll merge after -rc1 if you send a fresh request then.

-Olof