From 39afb9809ca2da30f266369c5620f5d6230a3558 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Thu, 16 Apr 2015 11:37:51 -0700 Subject: ARM: dts: BCM63xx: Add PMB busses nodes Add the two BCM63138 PMB busses nodes found on this System-on-a-Chip as described in their corresponding binding document. Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm63138.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'arch/arm/boot/dts/bcm63138.dtsi') diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi index f46329c8ad75..f5b5c528c26c 100644 --- a/arch/arm/boot/dts/bcm63138.dtsi +++ b/arch/arm/boot/dts/bcm63138.dtsi @@ -105,6 +105,18 @@ reg = <0x1e620 0x20>; interrupts = ; }; + + pmb0: reset-controller@4800c0 { + compatible = "brcm,bcm63138-pmb"; + reg = <0x4800c0 0x10>; + #reset-cells = <2>; + }; + + pmb1: reset-controller@4800e0 { + compatible = "brcm,bcm63138-pmb"; + reg = <0x4800e0 0x10>; + #reset-cells = <2>; + }; }; /* Legacy UBUS base */ -- cgit From 9f98802911cf784433546791838102a9d3c97d92 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 17 Apr 2015 11:27:51 -0700 Subject: ARM: dts: BCM63xx: Add SMP nodes and required properties Update bcm63138.dtsi with the following: - enable-method for both CPU nodes - brcm,bcm63138-bootlut node - resets properties to point to the correct PMB controller to release the secondary CPU from reset Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm63138.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'arch/arm/boot/dts/bcm63138.dtsi') diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi index f5b5c528c26c..bcc0089b0150 100644 --- a/arch/arm/boot/dts/bcm63138.dtsi +++ b/arch/arm/boot/dts/bcm63138.dtsi @@ -26,6 +26,7 @@ compatible = "arm,cortex-a9"; next-level-cache = <&L2>; reg = <0>; + enable-method = "brcm,bcm63138"; }; cpu@1 { @@ -33,6 +34,8 @@ compatible = "arm,cortex-a9"; next-level-cache = <&L2>; reg = <1>; + enable-method = "brcm,bcm63138"; + resets = <&pmb0 4 1>; }; }; @@ -143,5 +146,10 @@ clock-names = "periph"; status = "disabled"; }; + + bootlut: bootlut@8000 { + compatible = "brcm,bcm63138-bootlut"; + reg = <0x8000 0x50>; + }; }; }; -- cgit From b5762cacc4119ad0c1cd3160f0f3e10a052ad06b Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Tue, 12 May 2015 17:53:42 -0700 Subject: ARM: bcm63138: add NAND DT support Signed-off-by: Brian Norris Reviewed-by: Florian Fainelli Tested-by: Florian Fainelli Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm63138.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'arch/arm/boot/dts/bcm63138.dtsi') diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi index bcc0089b0150..c7175487d7d7 100644 --- a/arch/arm/boot/dts/bcm63138.dtsi +++ b/arch/arm/boot/dts/bcm63138.dtsi @@ -120,6 +120,17 @@ reg = <0x4800e0 0x10>; #reset-cells = <2>; }; + + nand: nand@2000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand"; + reg = <0x2000 0x600>, <0xf0 0x10>; + reg-names = "nand", "nand-int-base"; + status = "disabled"; + interrupts = ; + interrupt-names = "nand"; + }; }; /* Legacy UBUS base */ -- cgit From 8ab1428864d39e94b4d7842fe1e81b4f08bffd66 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Thu, 23 Apr 2015 15:57:21 -0700 Subject: ARM: dts: BCM63xx: Add timer and syscon-reboot nodes Add a "brcm,bcm6328-timer" and "syscon-reboot" nodes to allow the generic syscon-reboot driver to reset a BCM63138 SoC. Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm63138.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'arch/arm/boot/dts/bcm63138.dtsi') diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi index c7175487d7d7..0ad836f310f1 100644 --- a/arch/arm/boot/dts/bcm63138.dtsi +++ b/arch/arm/boot/dts/bcm63138.dtsi @@ -140,6 +140,11 @@ #size-cells = <1>; ranges = <0 0xfffe8000 0x8100>; + timer: timer@80 { + compatible = "brcm,bcm6328-timer", "syscon"; + reg = <0x80 0x3c>; + }; + serial0: serial@600 { compatible = "brcm,bcm6345-uart"; reg = <0x600 0x1b>; @@ -162,5 +167,12 @@ compatible = "brcm,bcm63138-bootlut"; reg = <0x8000 0x50>; }; + + reboot { + compatible = "syscon-reboot"; + regmap = <&timer>; + offset = <0x34>; + mask = <1>; + }; }; }; -- cgit From 9d7ef1b76c131f9b5e0a31fd1444d4fa6b8a841c Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 26 May 2015 20:27:30 -0700 Subject: ARM: dts: BCM63xx: re-parent NAND controller node The NAND controller is a child node of the UBUS (legacy) bus, not the AXI (new) bus, re-parent the NAND controller node accordingly. This was a mistake introduced by a failed merge of this NAND node with other changes (PMB). Fixes: b5762cacc411 ("ARM: bcm63138: add NAND DT support") Reported-by: Brian Norris Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm63138.dtsi | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'arch/arm/boot/dts/bcm63138.dtsi') diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi index 0ad836f310f1..34cd64051250 100644 --- a/arch/arm/boot/dts/bcm63138.dtsi +++ b/arch/arm/boot/dts/bcm63138.dtsi @@ -120,17 +120,6 @@ reg = <0x4800e0 0x10>; #reset-cells = <2>; }; - - nand: nand@2000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand"; - reg = <0x2000 0x600>, <0xf0 0x10>; - reg-names = "nand", "nand-int-base"; - status = "disabled"; - interrupts = ; - interrupt-names = "nand"; - }; }; /* Legacy UBUS base */ @@ -163,6 +152,17 @@ status = "disabled"; }; + nand: nand@2000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand"; + reg = <0x2000 0x600>, <0xf0 0x10>; + reg-names = "nand", "nand-int-base"; + status = "disabled"; + interrupts = ; + interrupt-names = "nand"; + }; + bootlut: bootlut@8000 { compatible = "brcm,bcm63138-bootlut"; reg = <0x8000 0x50>; -- cgit