Skip to contentSkip to conversation

ARM: meson6: DTS: Fix wrong reg mapping and IRQ numbers

PATCH New Carlo Caione 3 participants 5 messages Oct 1, 2015 – Oct 14, 2015

Subsystems (2)
Device tree bindings Arm/Amlogic Meson SoC support
lore
Share & tools
lore

Carlo Caione

author
#0 lore raw

PATCH 1/1 ARM: meson6: DTS: Fix wrong reg mapping and IRQ numbers

From: Carlo Caione <[email protected]>

The DTS erronously uses the wrong reg mapping and IRQ numbers for some UART, WDT and timer nodes. Fix this.

Reported-by John Wehle <[email protected]>
Signed-off-by Carlo Caione <[email protected]>
---
 arch/arm/boot/dts/meson.dtsi | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)
arch/arm/boot/dts/meson.dtsi +12 -11
index 5484413..8c77c87 100644
@@ -67,7 +67,7 @@
 
 	timer at c1109940 {
 		compatible = "amlogic,meson6-timer";
-		reg = <0xc1109940 0x14>;
+		reg = <0xc1109940 0x18>;
 		interrupts = <0 10 1>;
 	};
 

@@ -80,36 +80,37 @@
 		wdt: watchdog at c1109900 {
 			compatible = "amlogic,meson6-wdt";
 			reg = <0xc1109900 0x8>;
+			interrupts = <0 0 1>;
 		};
 
 		uart_AO: serial at c81004c0 {
 			compatible = "amlogic,meson-uart";
-			reg = <0xc81004c0 0x14>;
+			reg = <0xc81004c0 0x18>;
 			interrupts = <0 90 1>;
 			clocks = <&clk81>;
 			status = "disabled";
 		};
 
-		uart_A: serial at c81084c0 {
+		uart_A: serial at c11084c0 {
 			compatible = "amlogic,meson-uart";
-			reg = <0xc81084c0 0x14>;
-			interrupts = <0 90 1>;
+			reg = <0xc11084c0 0x18>;
+			interrupts = <0 26 1>;
 			clocks = <&clk81>;
 			status = "disabled";
 		};
 
-		uart_B: serial at c81084dc {
+		uart_B: serial at c11084dc {
 			compatible = "amlogic,meson-uart";
-			reg = <0xc81084dc 0x14>;
-			interrupts = <0 90 1>;
+			reg = <0xc11084dc 0x18>;
+			interrupts = <0 75 1>;
 			clocks = <&clk81>;
 			status = "disabled";
 		};
 
-		uart_C: serial at c8108700 {
+		uart_C: serial at c1108700 {
 			compatible = "amlogic,meson-uart";
-			reg = <0xc8108700 0x14>;
-			interrupts = <0 90 1>;
+			reg = <0xc1108700 0x18>;
+			interrupts = <0 93 1>;
 			clocks = <&clk81>;
 			status = "disabled";
 		};
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 ARM: meson6: DTS: Fix wrong reg mapping and IRQ numbers

Quoted 4 lines · Carlo Caione

From: Carlo Caione <[email protected]>

The DTS erronously uses the wrong reg mapping and IRQ numbers for some UART, WDT and timer nodes. Fix this.

Hi Arnd,
if you have no complains could you take this into next/dt?

Thanks,

Signature · 1 line
Carlo Caione
#2 lore raw

PATCH 1/1 ARM: meson6: DTS: Fix wrong reg mapping and IRQ numbers

Quoted 10 lines · On Saturday 10 October 2015 11:56:23 Carlo Caione wrote:
Quoted 4 lines · Carlo Caione

From: Carlo Caione <[email protected]>

The DTS erronously uses the wrong reg mapping and IRQ numbers for some UART, WDT and timer nodes. Fix this.

Hi Arnd,
if you have no complains could you take this into next/dt?

Pulled into next/dt, but please let me know if it should actually go into 4.3 instead. It looks like a bugfix patch and perhaps also applies to stable?

Arnd

#3 lore raw

PATCH 1/1 ARM: meson6: DTS: Fix wrong reg mapping and IRQ numbers

Quoted 7 lines · Arnd Bergmann
Quoted 6 lines · On Saturday 10 October 2015 11:56:23 Carlo Caione wrote:
Quoted 4 lines · Carlo Caione

From: Carlo Caione <[email protected]>

The DTS erronously uses the wrong reg mapping and IRQ numbers for some UART, WDT and timer nodes. Fix this.

Quoted 8 lines
Quoted 4 lines

Hi Arnd,
if you have no complains could you take this into next/dt?

Pulled into next/dt, but please let me know if it should actually go into 4.3 instead. It looks like a bugfix patch and perhaps also applies to stable?

It is actually, thank you for the reminder. I can resubmit it with with stable in CC even though I'm pretty sure that ATM the number of people actually using this DTS is dramatically close to 0.

Thanks,

Signature · 1 line
Carlo Caione
#4 lore raw

PATCH 1/1 ARM: meson6: DTS: Fix wrong reg mapping and IRQ numbers

Quoted 13 lines · On Wednesday 14 October 2015 18:04:54 Carlo Caione wrote:
Quoted 12 lines · Arnd Bergmann
Quoted 10 lines · On Saturday 10 October 2015 11:56:23 Carlo Caione wrote:
Quoted 4 lines · Carlo Caione

From: Carlo Caione <[email protected]>

The DTS erronously uses the wrong reg mapping and IRQ numbers for some UART, WDT and timer nodes. Fix this.

Hi Arnd,
if you have no complains could you take this into next/dt?

Quoted 8 lines
Quoted 3 lines

Pulled into next/dt, but please let me know if it should actually go into 4.3 instead. It looks like a bugfix patch and perhaps also applies to stable?

It is actually, thank you for the reminder. I can resubmit it with with stable in CC even though I'm pretty sure that ATM the number of people actually using this DTS is dramatically close to 0.

Ok, I've applied it to the fixes branch now, but not added the stable tag.

Thanks!

Arnd