175 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			175 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From cdc36b22f0e4b8badf3db14395f0aa44dcbce4b3 Mon Sep 17 00:00:00 2001
 | 
						|
From: Jon Mason <jonmason@broadcom.com>
 | 
						|
Date: Fri, 20 Nov 2015 10:17:18 -0500
 | 
						|
Subject: [PATCH] ARM: dts: enable clock support for BCM5301X
 | 
						|
 | 
						|
Replace current device tree dummy clocks with real clock support for
 | 
						|
Broadcom Northstar SoCs.
 | 
						|
 | 
						|
Signed-off-by: Jon Mason <jonmason@broadcom.com>
 | 
						|
Reviewed-by: Ray Jui <rjui@broadcom.com>
 | 
						|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 | 
						|
---
 | 
						|
 arch/arm/boot/dts/bcm5301x.dtsi | 92 +++++++++++++++++++++++++++++++----------
 | 
						|
 1 file changed, 71 insertions(+), 21 deletions(-)
 | 
						|
 | 
						|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
 | 
						|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
 | 
						|
@@ -8,6 +8,7 @@
 | 
						|
  * Licensed under the GNU/GPL. See COPYING for details.
 | 
						|
  */
 | 
						|
 
 | 
						|
+#include <dt-bindings/clock/bcm-nsp.h>
 | 
						|
 #include <dt-bindings/gpio/gpio.h>
 | 
						|
 #include <dt-bindings/input/input.h>
 | 
						|
 #include <dt-bindings/interrupt-controller/irq.h>
 | 
						|
@@ -27,7 +28,7 @@
 | 
						|
 			compatible = "ns16550";
 | 
						|
 			reg = <0x0300 0x100>;
 | 
						|
 			interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
 | 
						|
-			clock-frequency = <100000000>;
 | 
						|
+			clocks = <&iprocslow>;
 | 
						|
 			status = "disabled";
 | 
						|
 		};
 | 
						|
 
 | 
						|
@@ -35,48 +36,55 @@
 | 
						|
 			compatible = "ns16550";
 | 
						|
 			reg = <0x0400 0x100>;
 | 
						|
 			interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
 | 
						|
-			clock-frequency = <100000000>;
 | 
						|
+			clocks = <&iprocslow>;
 | 
						|
 			status = "disabled";
 | 
						|
 		};
 | 
						|
 	};
 | 
						|
 
 | 
						|
 	mpcore {
 | 
						|
 		compatible = "simple-bus";
 | 
						|
-		ranges = <0x00000000 0x19020000 0x00003000>;
 | 
						|
+		ranges = <0x00000000 0x19000000 0x00023000>;
 | 
						|
 		#address-cells = <1>;
 | 
						|
 		#size-cells = <1>;
 | 
						|
 
 | 
						|
-		scu@0000 {
 | 
						|
+		a9pll: arm_clk@00000 {
 | 
						|
+			#clock-cells = <0>;
 | 
						|
+			compatible = "brcm,nsp-armpll";
 | 
						|
+			clocks = <&osc>;
 | 
						|
+			reg = <0x00000 0x1000>;
 | 
						|
+		};
 | 
						|
+
 | 
						|
+		scu@20000 {
 | 
						|
 			compatible = "arm,cortex-a9-scu";
 | 
						|
-			reg = <0x0000 0x100>;
 | 
						|
+			reg = <0x20000 0x100>;
 | 
						|
 		};
 | 
						|
 
 | 
						|
-		timer@0200 {
 | 
						|
+		timer@20200 {
 | 
						|
 			compatible = "arm,cortex-a9-global-timer";
 | 
						|
-			reg = <0x0200 0x100>;
 | 
						|
+			reg = <0x20200 0x100>;
 | 
						|
 			interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;
 | 
						|
-			clocks = <&clk_periph>;
 | 
						|
+			clocks = <&periph_clk>;
 | 
						|
 		};
 | 
						|
 
 | 
						|
-		local-timer@0600 {
 | 
						|
+		local-timer@20600 {
 | 
						|
 			compatible = "arm,cortex-a9-twd-timer";
 | 
						|
-			reg = <0x0600 0x100>;
 | 
						|
+			reg = <0x20600 0x100>;
 | 
						|
 			interrupts = <GIC_PPI 13 IRQ_TYPE_EDGE_RISING>;
 | 
						|
-			clocks = <&clk_periph>;
 | 
						|
+			clocks = <&periph_clk>;
 | 
						|
 		};
 | 
						|
 
 | 
						|
-		gic: interrupt-controller@1000 {
 | 
						|
+		gic: interrupt-controller@21000 {
 | 
						|
 			compatible = "arm,cortex-a9-gic";
 | 
						|
 			#interrupt-cells = <3>;
 | 
						|
 			#address-cells = <0>;
 | 
						|
 			interrupt-controller;
 | 
						|
-			reg = <0x1000 0x1000>,
 | 
						|
-			      <0x0100 0x100>;
 | 
						|
+			reg = <0x21000 0x1000>,
 | 
						|
+			      <0x20100 0x100>;
 | 
						|
 		};
 | 
						|
 
 | 
						|
-		L2: cache-controller@2000 {
 | 
						|
+		L2: cache-controller@22000 {
 | 
						|
 			compatible = "arm,pl310-cache";
 | 
						|
-			reg = <0x2000 0x1000>;
 | 
						|
+			reg = <0x22000 0x1000>;
 | 
						|
 			cache-unified;
 | 
						|
 			arm,shared-override;
 | 
						|
 			prefetch-data = <1>;
 | 
						|
@@ -94,14 +102,37 @@
 | 
						|
 
 | 
						|
 	clocks {
 | 
						|
 		#address-cells = <1>;
 | 
						|
-		#size-cells = <0>;
 | 
						|
+		#size-cells = <1>;
 | 
						|
+		ranges;
 | 
						|
 
 | 
						|
-		/* As long as we do not have a real clock driver us this
 | 
						|
-		 * fixed clock */
 | 
						|
-		clk_periph: periph {
 | 
						|
+		osc: oscillator {
 | 
						|
+			#clock-cells = <0>;
 | 
						|
 			compatible = "fixed-clock";
 | 
						|
+			clock-frequency = <25000000>;
 | 
						|
+		};
 | 
						|
+
 | 
						|
+		iprocmed: iprocmed {
 | 
						|
 			#clock-cells = <0>;
 | 
						|
-			clock-frequency = <400000000>;
 | 
						|
+			compatible = "fixed-factor-clock";
 | 
						|
+			clocks = <&genpll BCM_NSP_GENPLL_IPROCFAST_CLK>;
 | 
						|
+			clock-div = <2>;
 | 
						|
+			clock-mult = <1>;
 | 
						|
+		};
 | 
						|
+
 | 
						|
+		iprocslow: iprocslow {
 | 
						|
+			#clock-cells = <0>;
 | 
						|
+			compatible = "fixed-factor-clock";
 | 
						|
+			clocks = <&genpll BCM_NSP_GENPLL_IPROCFAST_CLK>;
 | 
						|
+			clock-div = <4>;
 | 
						|
+			clock-mult = <1>;
 | 
						|
+		};
 | 
						|
+
 | 
						|
+		periph_clk: periph_clk {
 | 
						|
+			#clock-cells = <0>;
 | 
						|
+			compatible = "fixed-factor-clock";
 | 
						|
+			clocks = <&a9pll>;
 | 
						|
+			clock-div = <2>;
 | 
						|
+			clock-mult = <1>;
 | 
						|
 		};
 | 
						|
 	};
 | 
						|
 
 | 
						|
@@ -178,6 +209,25 @@
 | 
						|
 		};
 | 
						|
 	};
 | 
						|
 
 | 
						|
+	lcpll0: lcpll0@1800c100 {
 | 
						|
+		#clock-cells = <1>;
 | 
						|
+		compatible = "brcm,nsp-lcpll0";
 | 
						|
+		reg = <0x1800c100 0x14>;
 | 
						|
+		clocks = <&osc>;
 | 
						|
+		clock-output-names = "lcpll0", "pcie_phy", "sdio",
 | 
						|
+				     "ddr_phy";
 | 
						|
+	};
 | 
						|
+
 | 
						|
+	genpll: genpll@1800c140 {
 | 
						|
+		#clock-cells = <1>;
 | 
						|
+		compatible = "brcm,nsp-genpll";
 | 
						|
+		reg = <0x1800c140 0x24>;
 | 
						|
+		clocks = <&osc>;
 | 
						|
+		clock-output-names = "genpll", "phy", "ethernetclk",
 | 
						|
+				     "usbclk", "iprocfast", "sata1",
 | 
						|
+				     "sata2";
 | 
						|
+	};
 | 
						|
+
 | 
						|
 	nand: nand@18028000 {
 | 
						|
 		compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand";
 | 
						|
 		reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>;
 |