mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 22:25:03 +00:00
Code Issues Releases Wiki Activity

ARM: dts: artpec: update clock bindings in artpec6.dtsi

Browse source 
The clock binding for the main clock controller was changed to an
indexed controller style binding on request of the clk
maintainers. This updates the dtsi to use the new bindings.

Signed-off-by: Lars Persson <larper@axis.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Lars Persson 2016-03-14 10:01:43 +01:00 committed by Arnd Bergmann
parent fe0082d473
commit 9b61aefce7
1 changed files with 22 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
arch/arm/boot/dts/artpec6.dtsi
View file

@ -91,96 +91,32 @@ ext_clk: ext_clk {
clock-frequency = <50000000>;
};
/* PLL1 is used by CPU and some peripherals */
pll1_clk: pll1_clk@f8000000 {
eth_phy_ref_clk: eth_phy_ref_clk {
#clock-cells = <0>;
compatible = "axis,artpec6-pll1-clock";
reg = <0xf8000000 4>;
compatible = "fixed-clock";
clock-frequency = <125000000>;
};
clkctrl: clkctrl@0xf8000000 {
#clock-cells = <1>;
compatible = "axis,artpec6-clkctrl";
reg = <0xf8000000 0x48>;
clocks = <&ext_clk>;
clock-names = "sys_refclk";
};
cpu_clk: cpu_clk {
#clock-cells = <0>;
compatible = "fixed-factor-clock";
clock-div = <1>;
clock-mult = <1>;
clocks = <&pll1_clk>;
clock-output-names = "cpu_clk";
};
cpu_clkdiv2: cpu_clkdiv2 {
#clock-cells = <0>;
compatible = "fixed-factor-clock";
clock-div = <2>;
clock-mult = <1>;
clocks = <&cpu_clk>;
};
cpu_clkdiv4: cpu_clkdiv4 {
#clock-cells = <0>;
compatible = "fixed-factor-clock";
clock-div = <4>;
clock-mult = <1>;
clocks = <&cpu_clk>;
};
apb_pclk: apb_pclk {
#clock-cells = <0>;
compatible = "fixed-factor-clock";
clock-div = <8>;
clock-mult = <1>;
clocks = <&cpu_clk>;
clock-output-names = "apb_pclk";
};
/* PLL2 is used by a number of peripherals, including UDL */
pll2: pll2 {
#clock-cells = <0>;
compatible = "fixed-factor-clock";
clock-div = <1>;
clock-mult = <24>;
clocks = <&ext_clk>;
};
/* PLL2DIV2 is used by the Fractional Clock Divider, for i2s */
pll2div2: pll2div2 {
#clock-cells = <0>;
compatible = "fixed-factor-clock";
clock-div = <2>;
clock-mult = <1>;
clocks = <&pll2>;
};
pll2div12: pll2div12 {
#clock-cells = <0>;
compatible = "fixed-factor-clock";
clock-div = <12>;
clock-mult = <1>;
clocks = <&pll2>;
};
pll2div24: pll2div24 {
#clock-cells = <0>;
compatible = "fixed-factor-clock";
clock-div = <24>;
clock-mult = <1>;
clocks = <&pll2>;
clock-output-names = "uart_clk";
};
gtimer@faf00200 {
compatible = "arm,cortex-a9-global-timer";
reg = <0xfaf00200 0x20>;
interrupts = <GIC_PPI 11 0xf01>;
clocks = <&cpu_clkdiv2>;
clocks = <&clkctrl 1>;
};
timer@faf00600 {
compatible = "arm,cortex-a9-twd-timer";
reg = <0xfaf00600 0x20>;
interrupts = <GIC_PPI 13 0xf04>;
clocks = <&cpu_clkdiv2>;
clocks = <&clkctrl 1>;
status = "disabled";
};
@ -220,7 +156,8 @@ amba@0 {
ethernet: ethernet@f8010000 {
clock-names = "phy_ref_clk", "apb_pclk";
clocks = <&ext_clk>, <&apb_pclk>;
clocks = <&eth_phy_ref_clk>,
<&clkctrl 4>;
compatible = "snps,dwc-qos-ethernet-4.10";
interrupt-parent = <&intc>;
interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
@ -238,7 +175,8 @@ uart0: serial@f8036000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0xf8036000 0x1000>;
interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&pll2div24>, <&apb_pclk>;
clocks = <&clkctrl 13>,
<&clkctrl 12>;
clock-names = "uart_clk", "apb_pclk";
status = "disabled";
};
@ -246,7 +184,8 @@ uart1: serial@f8037000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0xf8037000 0x1000>;
interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&pll2div24>, <&apb_pclk>;
clocks = <&clkctrl 13>,
<&clkctrl 12>;
clock-names = "uart_clk", "apb_pclk";
status = "disabled";
};
@ -254,7 +193,8 @@ uart2: serial@f8038000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0xf8038000 0x1000>;
interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&pll2div24>, <&apb_pclk>;
clocks = <&clkctrl 13>,
<&clkctrl 12>;
clock-names = "uart_clk", "apb_pclk";
status = "disabled";
};
@ -262,7 +202,8 @@ uart3: serial@f8039000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0xf8039000 0x1000>;
interrupts = <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&pll2div24>, <&apb_pclk>;
clocks = <&clkctrl 13>,
<&clkctrl 12>;
clock-names = "uart_clk", "apb_pclk";
status = "disabled";
};