* [PATCH 1/3] dts: vt8500: Fix invalid/missing cpu nodes for soc files.
2013-04-24 5:38 [PATCH 0/3] dts: v8500: Cleanups for 3.10 Tony Prisk
@ 2013-04-24 5:38 ` Tony Prisk
2013-04-24 5:38 ` [PATCH 2/3] dts: vt8500: Add devicetree support for WM8750 SoC and APC8750 board Tony Prisk
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Tony Prisk @ 2013-04-24 5:38 UTC (permalink / raw)
To: linux-arm-kernel
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.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
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(-)
diff --git a/arch/arm/boot/dts/vt8500.dtsi b/arch/arm/boot/dts/vt8500.dtsi
index cf31ced..e35590e 100644
--- a/arch/arm/boot/dts/vt8500.dtsi
+++ b/arch/arm/boot/dts/vt8500.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/wm8505.dtsi b/arch/arm/boot/dts/wm8505.dtsi
index e74a1c0..dc21d13 100644
--- a/arch/arm/boot/dts/wm8505.dtsi
+++ b/arch/arm/boot/dts/wm8505.dtsi
@@ -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";
};
};
diff --git a/arch/arm/boot/dts/wm8650.dtsi b/arch/arm/boot/dts/wm8650.dtsi
index db3c0a1..f4cd55e 100644
--- a/arch/arm/boot/dts/wm8650.dtsi
+++ b/arch/arm/boot/dts/wm8650.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/wm8850.dtsi b/arch/arm/boot/dts/wm8850.dtsi
index e8cbfdc..4b56aa0 100644
--- a/arch/arm/boot/dts/wm8850.dtsi
+++ b/arch/arm/boot/dts/wm8850.dtsi
@@ -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;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] dts: vt8500: Add devicetree support for WM8750 SoC and APC8750 board
2013-04-24 5:38 [PATCH 0/3] dts: v8500: Cleanups for 3.10 Tony Prisk
2013-04-24 5:38 ` [PATCH 1/3] dts: vt8500: Fix invalid/missing cpu nodes for soc files Tony Prisk
@ 2013-04-24 5:38 ` Tony Prisk
2013-04-24 5:38 ` [PATCH 3/3] dts: vt8500: Update serial nodes and disable by default in SoC files Tony Prisk
2013-04-24 22:39 ` [PATCH 0/3] dts: v8500: Cleanups for 3.10 Tony Prisk
3 siblings, 0 replies; 6+ messages in thread
From: Tony Prisk @ 2013-04-24 5:38 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds support for the WonderMedia WM8750 SoC and the VIA
APC8750 board.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
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
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 9c62558..389536e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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
diff --git a/arch/arm/boot/dts/wm8750-apc8750.dts b/arch/arm/boot/dts/wm8750-apc8750.dts
new file mode 100644
index 0000000..62675eb
--- /dev/null
+++ b/arch/arm/boot/dts/wm8750-apc8750.dts
@@ -0,0 +1,26 @@
+/*
+ * wm8750-apc8750.dts
+ * - Device tree file for VIA APC8750
+ *
+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>
+ *
+ * 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 */
+ };
+};
diff --git a/arch/arm/boot/dts/wm8750.dtsi b/arch/arm/boot/dts/wm8750.dtsi
new file mode 100644
index 0000000..81683fa
--- /dev/null
+++ b/arch/arm/boot/dts/wm8750.dtsi
@@ -0,0 +1,349 @@
+/*
+ * wm8750.dtsi - Device tree file for Wondermedia WM8750 SoC
+ *
+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>
+ *
+ * Licensed under GPLv2 or later
+ */
+
+/include/ "skeleton.dtsi"
+
+/ {
+ compatible = "wm,wm8750";
+
+ cpus {
+ #size-cells = <0>;
+ #address-cells = <1>;
+
+ cpu {
+ device_type = "cpu";
+ compatible = "arm,arm1176";
+ };
+ };
+
+ aliases {
+ serial0 = &uart0;
+ serial1 = &uart1;
+ serial2 = &uart2;
+ serial3 = &uart3;
+ serial4 = &uart4;
+ serial5 = &uart5;
+ i2c0 = &i2c_0;
+ i2c1 = &i2c_1;
+ };
+
+ soc {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "simple-bus";
+ ranges;
+ interrupt-parent = <&intc0>;
+
+ intc0: interrupt-controller at d8140000 {
+ compatible = "via,vt8500-intc";
+ interrupt-controller;
+ reg = <0xd8140000 0x10000>;
+ #interrupt-cells = <1>;
+ };
+
+ /* Secondary IC cascaded to intc0 */
+ intc1: interrupt-controller at d8150000 {
+ compatible = "via,vt8500-intc";
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ reg = <0xD8150000 0x10000>;
+ interrupts = <56 57 58 59 60 61 62 63>;
+ };
+
+ pinctrl: pinctrl at d8110000 {
+ compatible = "wm,wm8750-pinctrl";
+ reg = <0xd8110000 0x10000>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ pmc at d8130000 {
+ compatible = "via,vt8500-pmc";
+ reg = <0xd8130000 0x1000>;
+
+ clocks {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ref24: ref24M {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ clock-frequency = <24000000>;
+ };
+
+ ref25: ref25M {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ clock-frequency = <25000000>;
+ };
+
+ plla: plla {
+ #clock-cells = <0>;
+ compatible = "wm,wm8750-pll-clock";
+ clocks = <&ref25>;
+ reg = <0x200>;
+ };
+
+ pllb: pllb {
+ #clock-cells = <0>;
+ compatible = "wm,wm8750-pll-clock";
+ clocks = <&ref25>;
+ reg = <0x204>;
+ };
+
+ pllc: pllc {
+ #clock-cells = <0>;
+ compatible = "wm,wm8750-pll-clock";
+ clocks = <&ref25>;
+ reg = <0x208>;
+ };
+
+ plld: plld {
+ #clock-cells = <0>;
+ compatible = "wm,wm8750-pll-clock";
+ clocks = <&ref25>;
+ reg = <0x20C>;
+ };
+
+ plle: plle {
+ #clock-cells = <0>;
+ compatible = "wm,wm8750-pll-clock";
+ clocks = <&ref25>;
+ reg = <0x210>;
+ };
+
+ clkarm: arm {
+ #clock-cells = <0>;
+ compatible = "via,vt8500-device-clock";
+ clocks = <&plla>;
+ divisor-reg = <0x300>;
+ };
+
+ clkahb: ahb {
+ #clock-cells = <0>;
+ compatible = "via,vt8500-device-clock";
+ clocks = <&pllb>;
+ divisor-reg = <0x304>;
+ };
+
+ clkddr: ddr {
+ #clock-cells = <0>;
+ compatible = "via,vt8500-device-clock";
+ clocks = <&plld>;
+ divisor-reg = <0x310>;
+ };
+
+ clkuart0: uart0 {
+ #clock-cells = <0>;
+ compatible = "via,vt8500-device-clock";
+ clocks = <&ref24>;
+ enable-reg = <0x254>;
+ enable-bit = <24>;
+ };
+
+ clkuart1: uart1 {
+ #clock-cells = <0>;
+ compatible = "via,vt8500-device-clock";
+ clocks = <&ref24>;
+ enable-reg = <0x254>;
+ enable-bit = <25>;
+ };
+
+ clkuart2: uart2 {
+ #clock-cells = <0>;
+ compatible = "via,vt8500-device-clock";
+ clocks = <&ref24>;
+ enable-reg = <0x254>;
+ enable-bit = <26>;
+ };
+
+ clkuart3: uart3 {
+ #clock-cells = <0>;
+ compatible = "via,vt8500-device-clock";
+ clocks = <&ref24>;
+ enable-reg = <0x254>;
+ enable-bit = <27>;
+ };
+
+ clkuart4: uart4 {
+ #clock-cells = <0>;
+ compatible = "via,vt8500-device-clock";
+ clocks = <&ref24>;
+ enable-reg = <0x254>;
+ enable-bit = <28>;
+ };
+
+ clkuart5: uart5 {
+ #clock-cells = <0>;
+ compatible = "via,vt8500-device-clock";
+ clocks = <&ref24>;
+ enable-reg = <0x254>;
+ enable-bit = <29>;
+ };
+
+ clkpwm: pwm {
+ #clock-cells = <0>;
+ compatible = "via,vt8500-device-clock";
+ clocks = <&pllb>;
+ divisor-reg = <0x350>;
+ enable-reg = <0x250>;
+ enable-bit = <17>;
+ };
+
+ clksdhc: sdhc {
+ #clock-cells = <0>;
+ compatible = "via,vt8500-device-clock";
+ clocks = <&pllb>;
+ divisor-reg = <0x330>;
+ divisor-mask = <0x3f>;
+ enable-reg = <0x250>;
+ enable-bit = <0>;
+ };
+
+ clksf: sf {
+ #clock-cells = <0>;
+ compatible = "via,vt8500-device-clock";
+ clocks = <&pllb>;
+ divisor-reg = <0x314>;
+ enable-reg = <0x254>;
+ enable-bit = <23>;
+ };
+
+ clki2c0: i2c0clk {
+ #clock-cells = <0>;
+ compatible = "via,vt8500-device-clock";
+ clocks = <&pllb>;
+ divisor-reg = <0x3A0>;
+ enable-reg = <0x250>;
+ enable-bit = <8>;
+ };
+
+ clki2c1: i2c1clk {
+ #clock-cells = <0>;
+ compatible = "via,vt8500-device-clock";
+ clocks = <&pllb>;
+ divisor-reg = <0x3A4>;
+ enable-reg = <0x250>;
+ enable-bit = <9>;
+ };
+ };
+ };
+
+ sf at d8002000 {
+ compatible = "wm,wm8505-sf";
+ reg = <0xd8002000 0x400>;
+ clocks = <&clksf>;
+ };
+
+ pwm: pwm at d8220000 {
+ #pwm-cells = <3>;
+ compatible = "via,vt8500-pwm";
+ reg = <0xd8220000 0x100>;
+ clocks = <&clkpwm>;
+ };
+
+ timer at d8130100 {
+ compatible = "via,vt8500-timer";
+ reg = <0xd8130100 0x28>;
+ interrupts = <36>;
+ };
+
+ ehci at d8007900 {
+ compatible = "via,vt8500-ehci";
+ reg = <0xd8007900 0x200>;
+ interrupts = <26>;
+ };
+
+ uhci at d8007b00 {
+ compatible = "platform-uhci";
+ reg = <0xd8007b00 0x200>;
+ interrupts = <26>;
+ };
+
+ uhci at d8008d00 {
+ compatible = "platform-uhci";
+ reg = <0xd8008d00 0x200>;
+ interrupts = <26>;
+ };
+
+ uart0: uart at d8200000 {
+ compatible = "via,vt8500-uart";
+ reg = <0xd8200000 0x1040>;
+ interrupts = <32>;
+ clocks = <&clkuart0>;
+ };
+
+ uart1: uart at d82b0000 {
+ compatible = "via,vt8500-uart";
+ reg = <0xd82b0000 0x1040>;
+ interrupts = <33>;
+ clocks = <&clkuart1>;
+ };
+
+ uart2: uart at d8210000 {
+ compatible = "via,vt8500-uart";
+ reg = <0xd8210000 0x1040>;
+ interrupts = <47>;
+ clocks = <&clkuart2>;
+ };
+
+ uart3: uart at d82c0000 {
+ compatible = "via,vt8500-uart";
+ reg = <0xd82c0000 0x1040>;
+ interrupts = <50>;
+ clocks = <&clkuart3>;
+ };
+
+ uart4: uart at d8370000 {
+ compatible = "via,vt8500-uart";
+ reg = <0xd8370000 0x1040>;
+ interrupts = <30>;
+ clocks = <&clkuart4>;
+ };
+
+ uart5: uart at d8380000 {
+ compatible = "via,vt8500-uart";
+ reg = <0xd8380000 0x1040>;
+ interrupts = <43>;
+ clocks = <&clkuart5>;
+ };
+
+ rtc at d8100000 {
+ compatible = "via,vt8500-rtc";
+ reg = <0xd8100000 0x10000>;
+ interrupts = <48>;
+ };
+
+ sdhc at d800a000 {
+ compatible = "wm,wm8505-sdhc";
+ reg = <0xd800a000 0x1000>;
+ interrupts = <20 21>;
+ clocks = <&clksdhc>;
+ bus-width = <4>;
+ sdon-inverted;
+ };
+
+ i2c_0: i2c at d8280000 {
+ compatible = "wm,wm8505-i2c";
+ reg = <0xd8280000 0x1000>;
+ interrupts = <19>;
+ clocks = <&clki2c0>;
+ clock-frequency = <400000>;
+ };
+
+ i2c_1: i2c at d8320000 {
+ compatible = "wm,wm8505-i2c";
+ reg = <0xd8320000 0x1000>;
+ interrupts = <18>;
+ clocks = <&clki2c1>;
+ clock-frequency = <400000>;
+ };
+ };
+};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] dts: vt8500: Update serial nodes and disable by default in SoC files
2013-04-24 5:38 [PATCH 0/3] dts: v8500: Cleanups for 3.10 Tony Prisk
2013-04-24 5:38 ` [PATCH 1/3] dts: vt8500: Fix invalid/missing cpu nodes for soc files Tony Prisk
2013-04-24 5:38 ` [PATCH 2/3] dts: vt8500: Add devicetree support for WM8750 SoC and APC8750 board Tony Prisk
@ 2013-04-24 5:38 ` Tony Prisk
2013-04-24 22:39 ` [PATCH 0/3] dts: v8500: Cleanups for 3.10 Tony Prisk
3 siblings, 0 replies; 6+ messages in thread
From: Tony Prisk @ 2013-04-24 5:38 UTC (permalink / raw)
To: linux-arm-kernel
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.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
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(-)
diff --git a/arch/arm/boot/dts/vt8500-bv07.dts b/arch/arm/boot/dts/vt8500-bv07.dts
index 567cf4e..faabc9c 100644
--- a/arch/arm/boot/dts/vt8500-bv07.dts
+++ b/arch/arm/boot/dts/vt8500-bv07.dts
@@ -34,3 +34,7 @@
};
};
};
+
+&uart0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/vt8500.dtsi b/arch/arm/boot/dts/vt8500.dtsi
index e35590e..4908222 100644
--- a/arch/arm/boot/dts/vt8500.dtsi
+++ b/arch/arm/boot/dts/vt8500.dtsi
@@ -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 {
diff --git a/arch/arm/boot/dts/wm8505-ref.dts b/arch/arm/boot/dts/wm8505-ref.dts
index fd4e248..acb996f 100644
--- a/arch/arm/boot/dts/wm8505-ref.dts
+++ b/arch/arm/boot/dts/wm8505-ref.dts
@@ -34,3 +34,7 @@
};
};
};
+
+&uart0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/wm8505.dtsi b/arch/arm/boot/dts/wm8505.dtsi
index dc21d13..e5076d5 100644
--- a/arch/arm/boot/dts/wm8505.dtsi
+++ b/arch/arm/boot/dts/wm8505.dtsi
@@ -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 {
diff --git a/arch/arm/boot/dts/wm8650-mid.dts b/arch/arm/boot/dts/wm8650-mid.dts
index cefd938..fec12f1 100644
--- a/arch/arm/boot/dts/wm8650-mid.dts
+++ b/arch/arm/boot/dts/wm8650-mid.dts
@@ -34,3 +34,7 @@
};
};
};
+
+&uart0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/wm8650.dtsi b/arch/arm/boot/dts/wm8650.dtsi
index f4cd55e..8e099a8 100644
--- a/arch/arm/boot/dts/wm8650.dtsi
+++ b/arch/arm/boot/dts/wm8650.dtsi
@@ -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 {
diff --git a/arch/arm/boot/dts/wm8750-apc8750.dts b/arch/arm/boot/dts/wm8750-apc8750.dts
index 62675eb..37e4a40 100644
--- a/arch/arm/boot/dts/wm8750-apc8750.dts
+++ b/arch/arm/boot/dts/wm8750-apc8750.dts
@@ -24,3 +24,7 @@
wm,pull = <2>; /* pull-up */
};
};
+
+&uart0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/wm8750.dtsi b/arch/arm/boot/dts/wm8750.dtsi
index 81683fa..c048c04 100644
--- a/arch/arm/boot/dts/wm8750.dtsi
+++ b/arch/arm/boot/dts/wm8750.dtsi
@@ -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 {
diff --git a/arch/arm/boot/dts/wm8850-w70v2.dts b/arch/arm/boot/dts/wm8850-w70v2.dts
index fcc660c..5b96ba2 100644
--- a/arch/arm/boot/dts/wm8850-w70v2.dts
+++ b/arch/arm/boot/dts/wm8850-w70v2.dts
@@ -45,3 +45,7 @@
default-brightness-level = <5>;
};
};
+
+&uart0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/wm8850.dtsi b/arch/arm/boot/dts/wm8850.dtsi
index 4b56aa0..b5d36e1 100644
--- a/arch/arm/boot/dts/wm8850.dtsi
+++ b/arch/arm/boot/dts/wm8850.dtsi
@@ -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 {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 0/3] dts: v8500: Cleanups for 3.10
2013-04-24 5:38 [PATCH 0/3] dts: v8500: Cleanups for 3.10 Tony Prisk
` (2 preceding siblings ...)
2013-04-24 5:38 ` [PATCH 3/3] dts: vt8500: Update serial nodes and disable by default in SoC files Tony Prisk
@ 2013-04-24 22:39 ` Tony Prisk
2013-04-24 22:50 ` Olof Johansson
3 siblings, 1 reply; 6+ messages in thread
From: Tony Prisk @ 2013-04-24 22:39 UTC (permalink / raw)
To: linux-arm-kernel
On 24/04/13 17:38, Tony Prisk wrote:
> 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
>
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
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 0/3] dts: v8500: Cleanups for 3.10
2013-04-24 22:39 ` [PATCH 0/3] dts: v8500: Cleanups for 3.10 Tony Prisk
@ 2013-04-24 22:50 ` Olof Johansson
0 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2013-04-24 22:50 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Apr 24, 2013 at 3:39 PM, Tony Prisk <linux@prisktech.co.nz> wrote:
> On 24/04/13 17:38, Tony Prisk wrote:
>>
>> 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
>>
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread