diff mbox

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

Message ID 1443696760-8316-1-git-send-email-carlo@caione.org (mailing list archive)
State New, archived
Headers show

Commit Message

Carlo Caione Oct. 1, 2015, 10:52 a.m. UTC 
From: Carlo Caione <carlo@endlessm.com>

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

Reported-by: John Wehle <john@feith.com>
Signed-off-by: Carlo Caione <carlo@endlessm.com>
---
 arch/arm/boot/dts/meson.dtsi | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

Comments

Carlo Caione Oct. 10, 2015, 9:56 a.m. UTC | #1 
On Thu, Oct 1, 2015 at 12:52 PM, Carlo Caione <carlo@caione.org> wrote:
> From: Carlo Caione <carlo@endlessm.com>
>
> 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,
Arnd Bergmann Oct. 14, 2015, 3:51 p.m. UTC | #2 
On Saturday 10 October 2015 11:56:23 Carlo Caione wrote:
> On Thu, Oct 1, 2015 at 12:52 PM, Carlo Caione <carlo@caione.org> wrote:
> > From: Carlo Caione <carlo@endlessm.com>
> >
> > 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
Carlo Caione Oct. 14, 2015, 4:04 p.m. UTC | #3 
On Wed, Oct 14, 2015 at 5:51 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Saturday 10 October 2015 11:56:23 Carlo Caione wrote:
>> On Thu, Oct 1, 2015 at 12:52 PM, Carlo Caione <carlo@caione.org> wrote:
>> > From: Carlo Caione <carlo@endlessm.com>
>> >
>> > 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?

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,
Arnd Bergmann Oct. 14, 2015, 8:14 p.m. UTC | #4 
On Wednesday 14 October 2015 18:04:54 Carlo Caione wrote:
> On Wed, Oct 14, 2015 at 5:51 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> > On Saturday 10 October 2015 11:56:23 Carlo Caione wrote:
> >> On Thu, Oct 1, 2015 at 12:52 PM, Carlo Caione <carlo@caione.org> wrote:
> >> > From: Carlo Caione <carlo@endlessm.com>
> >> >
> >> > 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?
> 
> 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
diff mbox

Patch

diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi
index 5484413..8c77c87 100644
--- a/arch/arm/boot/dts/meson.dtsi
+++ b/arch/arm/boot/dts/meson.dtsi
@@ -67,7 +67,7 @@ 
 
 	timer@c1109940 {
 		compatible = "amlogic,meson6-timer";
-		reg = <0xc1109940 0x14>;
+		reg = <0xc1109940 0x18>;
 		interrupts = <0 10 1>;
 	};
 
@@ -80,36 +80,37 @@ 
 		wdt: watchdog@c1109900 {
 			compatible = "amlogic,meson6-wdt";
 			reg = <0xc1109900 0x8>;
+			interrupts = <0 0 1>;
 		};
 
 		uart_AO: serial@c81004c0 {
 			compatible = "amlogic,meson-uart";
-			reg = <0xc81004c0 0x14>;
+			reg = <0xc81004c0 0x18>;
 			interrupts = <0 90 1>;
 			clocks = <&clk81>;
 			status = "disabled";
 		};
 
-		uart_A: serial@c81084c0 {
+		uart_A: serial@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@c81084dc {
+		uart_B: serial@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@c8108700 {
+		uart_C: serial@c1108700 {
 			compatible = "amlogic,meson-uart";
-			reg = <0xc8108700 0x14>;
-			interrupts = <0 90 1>;
+			reg = <0xc1108700 0x18>;
+			interrupts = <0 93 1>;
 			clocks = <&clk81>;
 			status = "disabled";
 		};