From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Fainelli Subject: [PATCH v2 3/3] ARM: dts: BCM63xx: Add ARMPLL device tree nodes Date: Mon, 26 Oct 2015 20:53:17 -0700 Message-ID: <1445917997-3629-4-git-send-email-f.fainelli@gmail.com> References: <1445917997-3629-1-git-send-email-f.fainelli@gmail.com> Return-path: In-Reply-To: <1445917997-3629-1-git-send-email-f.fainelli@gmail.com> Sender: linux-clk-owner@vger.kernel.org To: linux-clk@vger.kernel.org Cc: bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, jonmason@broadcom.com, sboyd@codeaurora.org, mturquette@baylibre.com, linux@arm.linux.org.uk, sbranden@broadcom.com, rjui@broadcom.com, Florian Fainelli List-Id: devicetree@vger.kernel.org Add the ARM PLL controller which comes standard with the Cortex-A9 found on the BCM63138 SoCs. This is the same controller as the one found in the Broadcom iProc architecture, however, we have a separate compatible string to indicate the integration difference. While at it, properly rename references to the 50Mhz clock which is in fact a crystal/oscillator and updates references to it. Signed-off-by: Florian Fainelli --- No changes in v2 arch/arm/boot/dts/bcm63138.dtsi | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi index 34cd64051250..c146325eebdb 100644 --- a/arch/arm/boot/dts/bcm63138.dtsi +++ b/arch/arm/boot/dts/bcm63138.dtsi @@ -43,17 +43,29 @@ #address-cells = <1>; #size-cells = <0>; - arm_timer_clk: arm_timer_clk { + osc: oscillator { #clock-cells = <0>; compatible = "fixed-clock"; - clock-frequency = <500000000>; + clock-frequency = <50000000>; + clock-output-names = "periph"; }; - periph_clk: periph_clk { + /* peripheral clock for system timer */ + axi_clk: axi_clk { #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <50000000>; - clock-output-names = "periph"; + compatible = "fixed-factor-clock"; + clocks = <&armpll>; + clock-div = <2>; + clock-mult = <1>; + }; + + /* APB bus clock */ + apb_clk: apb_clk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&armpll>; + clock-div = <4>; + clock-mult = <1>; }; }; @@ -93,14 +105,14 @@ compatible = "arm,cortex-a9-global-timer"; reg = <0x1e200 0x20>; interrupts = ; - clocks = <&arm_timer_clk>; + clocks = <&axi_clk>; }; local_timer: local-timer@1e600 { compatible = "arm,cortex-a9-twd-timer"; reg = <0x1e600 0x20>; interrupts = ; - clocks = <&arm_timer_clk>; + clocks = <&axi_clk>; }; twd_watchdog: watchdog@1e620 { @@ -109,6 +121,13 @@ interrupts = ; }; + armpll: armpll { + #clock-cells = <0>; + compatible = "brcm,bcm63138-armpll"; + clocks = <&osc>; + reg = <0x20000 0xf00>; + }; + pmb0: reset-controller@4800c0 { compatible = "brcm,bcm63138-pmb"; reg = <0x4800c0 0x10>; @@ -138,7 +157,7 @@ compatible = "brcm,bcm6345-uart"; reg = <0x600 0x1b>; interrupts = ; - clocks = <&periph_clk>; + clocks = <&osc>; clock-names = "periph"; status = "disabled"; }; @@ -147,7 +166,7 @@ compatible = "brcm,bcm6345-uart"; reg = <0x620 0x1b>; interrupts = ; - clocks = <&periph_clk>; + clocks = <&osc>; clock-names = "periph"; status = "disabled"; }; -- 2.1.0