Skip to content

L
linux
Commit 70db442d authored by Michael Walle's avatar Michael Walle Committed by Shawn Guo
Browse files
Options

arm64: dts: ls1012a: use constants in the clockgen phandle 

Now that we have constants, use them. This is just a mechanical change.
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 1773b8d6
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 17 deletions
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
View file @ 70db442d
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* *
*/ */
#include <dt-bindings/clock/fsl,qoriq-clockgen.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/thermal/thermal.h> #include <dt-bindings/thermal/thermal.h>
...@@ -34,7 +35,7 @@ cpu0: cpu@0 { ...@@ -34,7 +35,7 @@ cpu0: cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a53"; compatible = "arm,cortex-a53";
reg = <0x0>; reg = <0x0>;
clocks = <&clockgen 1 0>; clocks = <&clockgen QORIQ_CLK_CMUX 0>;
#cooling-cells = <2>; #cooling-cells = <2>;
cpu-idle-states = <&CPU_PH20>; cpu-idle-states = <&CPU_PH20>;
}; };
...@@ -148,7 +149,10 @@ qspi: spi@1550000 { ...@@ -148,7 +149,10 @@ qspi: spi@1550000 {
reg-names = "QuadSPI", "QuadSPI-memory"; reg-names = "QuadSPI", "QuadSPI-memory";
interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "qspi_en", "qspi"; clock-names = "qspi_en", "qspi";
clocks = <&clockgen 4 0>, <&clockgen 4 0>; clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(1)>,
<&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(1)>;
status = "disabled"; status = "disabled";
}; };
...@@ -156,7 +160,8 @@ esdhc0: esdhc@1560000 { ...@@ -156,7 +160,8 @@ esdhc0: esdhc@1560000 {
compatible = "fsl,ls1012a-esdhc", "fsl,esdhc"; compatible = "fsl,ls1012a-esdhc", "fsl,esdhc";
reg = <0x0 0x1560000 0x0 0x10000>; reg = <0x0 0x1560000 0x0 0x10000>;
interrupts = <0 62 0x4>; interrupts = <0 62 0x4>;
clocks = <&clockgen 4 0>; clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(1)>;
voltage-ranges = <1800 1800 3300 3300>; voltage-ranges = <1800 1800 3300 3300>;
sdhci,auto-cmd12; sdhci,auto-cmd12;
big-endian; big-endian;
...@@ -174,7 +179,8 @@ esdhc1: esdhc@1580000 { ...@@ -174,7 +179,8 @@ esdhc1: esdhc@1580000 {
compatible = "fsl,ls1012a-esdhc", "fsl,esdhc"; compatible = "fsl,ls1012a-esdhc", "fsl,esdhc";
reg = <0x0 0x1580000 0x0 0x10000>; reg = <0x0 0x1580000 0x0 0x10000>;
interrupts = <0 65 0x4>; interrupts = <0 65 0x4>;
clocks = <&clockgen 4 0>; clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(1)>;
voltage-ranges = <1800 1800 3300 3300>; voltage-ranges = <1800 1800 3300 3300>;
sdhci,auto-cmd12; sdhci,auto-cmd12;
big-endian; big-endian;
...@@ -341,7 +347,8 @@ i2c0: i2c@2180000 { ...@@ -341,7 +347,8 @@ i2c0: i2c@2180000 {
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x2180000 0x0 0x10000>; reg = <0x0 0x2180000 0x0 0x10000>;
interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 3>; clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(4)>;
status = "disabled"; status = "disabled";
}; };
...@@ -351,7 +358,8 @@ i2c1: i2c@2190000 { ...@@ -351,7 +358,8 @@ i2c1: i2c@2190000 {
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x2190000 0x0 0x10000>; reg = <0x0 0x2190000 0x0 0x10000>;
interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 3>; clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(4)>;
status = "disabled"; status = "disabled";
}; };
...@@ -362,7 +370,8 @@ dspi: spi@2100000 { ...@@ -362,7 +370,8 @@ dspi: spi@2100000 {
reg = <0x0 0x2100000 0x0 0x10000>; reg = <0x0 0x2100000 0x0 0x10000>;
interrupts = <0 64 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 64 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "dspi"; clock-names = "dspi";
clocks = <&clockgen 4 0>; clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(1)>;
spi-num-chipselects = <5>; spi-num-chipselects = <5>;
big-endian; big-endian;
status = "disabled"; status = "disabled";
...@@ -372,7 +381,8 @@ duart0: serial@21c0500 { ...@@ -372,7 +381,8 @@ duart0: serial@21c0500 {
compatible = "fsl,ns16550", "ns16550a"; compatible = "fsl,ns16550", "ns16550a";
reg = <0x00 0x21c0500 0x0 0x100>; reg = <0x00 0x21c0500 0x0 0x100>;
interrupts = <0 54 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 54 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 0>; clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(1)>;
status = "disabled"; status = "disabled";
}; };
...@@ -380,7 +390,8 @@ duart1: serial@21c0600 { ...@@ -380,7 +390,8 @@ duart1: serial@21c0600 {
compatible = "fsl,ns16550", "ns16550a"; compatible = "fsl,ns16550", "ns16550a";
reg = <0x00 0x21c0600 0x0 0x100>; reg = <0x00 0x21c0600 0x0 0x100>;
interrupts = <0 54 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 54 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 0>; clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(1)>;
status = "disabled"; status = "disabled";
}; };
...@@ -409,7 +420,7 @@ wdog0: watchdog@2ad0000 { ...@@ -409,7 +420,7 @@ wdog0: watchdog@2ad0000 {
"fsl,imx21-wdt"; "fsl,imx21-wdt";
reg = <0x0 0x2ad0000 0x0 0x10000>; reg = <0x0 0x2ad0000 0x0 0x10000>;
interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 0>; clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL QORIQ_CLK_PLL_DIV(1)>;
big-endian; big-endian;
}; };
...@@ -418,8 +429,14 @@ sai1: sai@2b50000 { ...@@ -418,8 +429,14 @@ sai1: sai@2b50000 {
compatible = "fsl,vf610-sai"; compatible = "fsl,vf610-sai";
reg = <0x0 0x2b50000 0x0 0x10000>; reg = <0x0 0x2b50000 0x0 0x10000>;
interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 3>, <&clockgen 4 3>, clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
<&clockgen 4 3>, <&clockgen 4 3>; QORIQ_CLK_PLL_DIV(4)>,
<&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(4)>,
<&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(4)>,
<&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(4)>;
clock-names = "bus", "mclk1", "mclk2", "mclk3"; clock-names = "bus", "mclk1", "mclk2", "mclk3";
dma-names = "tx", "rx"; dma-names = "tx", "rx";
dmas = <&edma0 1 47>, dmas = <&edma0 1 47>,
...@@ -432,8 +449,14 @@ sai2: sai@2b60000 { ...@@ -432,8 +449,14 @@ sai2: sai@2b60000 {
compatible = "fsl,vf610-sai"; compatible = "fsl,vf610-sai";
reg = <0x0 0x2b60000 0x0 0x10000>; reg = <0x0 0x2b60000 0x0 0x10000>;
interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 3>, <&clockgen 4 3>, clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
<&clockgen 4 3>, <&clockgen 4 3>; QORIQ_CLK_PLL_DIV(4)>,
<&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(4)>,
<&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(4)>,
<&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(4)>;
clock-names = "bus", "mclk1", "mclk2", "mclk3"; clock-names = "bus", "mclk1", "mclk2", "mclk3";
dma-names = "tx", "rx"; dma-names = "tx", "rx";
dmas = <&edma0 1 45>, dmas = <&edma0 1 45>,
...@@ -453,8 +476,10 @@ edma0: edma@2c00000 { ...@@ -453,8 +476,10 @@ edma0: edma@2c00000 {
dma-channels = <32>; dma-channels = <32>;
big-endian; big-endian;
clock-names = "dmamux0", "dmamux1"; clock-names = "dmamux0", "dmamux1";
clocks = <&clockgen 4 3>, clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
<&clockgen 4 3>; QORIQ_CLK_PLL_DIV(4)>,
<&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(4)>;
}; };
usb0: usb@2f00000 { usb0: usb@2f00000 {
...@@ -473,7 +498,8 @@ sata: sata@3200000 { ...@@ -473,7 +498,8 @@ sata: sata@3200000 {
<0x0 0x20140520 0x0 0x4>; <0x0 0x20140520 0x0 0x4>;
reg-names = "ahci", "sata-ecc"; reg-names = "ahci", "sata-ecc";
interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 0>; clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
QORIQ_CLK_PLL_DIV(1)>;
dma-coherent; dma-coherent;
status = "disabled"; status = "disabled";
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7