Commit 8888f651 authored by Shawn Guo's avatar Shawn Guo

ARM: dts: imx6qdl: use DT macro for clock ID

Switch to use DT macro for clock ID, so that device tree source is more
readable.
Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent 4014a4f7
...@@ -35,8 +35,11 @@ cpu@0 { ...@@ -35,8 +35,11 @@ cpu@0 {
396000 1175000 396000 1175000
>; >;
clock-latency = <61036>; /* two CLK32 periods */ clock-latency = <61036>; /* two CLK32 periods */
clocks = <&clks 104>, <&clks 6>, <&clks 16>, clocks = <&clks IMX6QDL_CLK_ARM>,
<&clks 17>, <&clks 170>; <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
<&clks IMX6QDL_CLK_STEP>,
<&clks IMX6QDL_CLK_PLL1_SW>,
<&clks IMX6QDL_CLK_PLL1_SYS>;
clock-names = "arm", "pll2_pfd2_396m", "step", clock-names = "arm", "pll2_pfd2_396m", "step",
"pll1_sw", "pll1_sys"; "pll1_sw", "pll1_sys";
arm-supply = <&reg_arm>; arm-supply = <&reg_arm>;
...@@ -56,7 +59,7 @@ soc { ...@@ -56,7 +59,7 @@ soc {
ocram: sram@00900000 { ocram: sram@00900000 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0x00900000 0x20000>; reg = <0x00900000 0x20000>;
clocks = <&clks 142>; clocks = <&clks IMX6QDL_CLK_OCRAM>;
}; };
aips1: aips-bus@02000000 { aips1: aips-bus@02000000 {
...@@ -87,7 +90,7 @@ i2c4: i2c@021f8000 { ...@@ -87,7 +90,7 @@ i2c4: i2c@021f8000 {
compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c"; compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c";
reg = <0x021f8000 0x4000>; reg = <0x021f8000 0x4000>;
interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks 116>; clocks = <&clks IMX6DL_CLK_I2C4>;
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -104,9 +107,9 @@ &hdmi { ...@@ -104,9 +107,9 @@ &hdmi {
}; };
&ldb { &ldb {
clocks = <&clks 33>, <&clks 34>, clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, <&clks IMX6QDL_CLK_LDB_DI1_SEL>,
<&clks 39>, <&clks 40>, <&clks IMX6QDL_CLK_IPU1_DI0_SEL>, <&clks IMX6QDL_CLK_IPU1_DI1_SEL>,
<&clks 135>, <&clks 136>; <&clks IMX6QDL_CLK_LDB_DI0>, <&clks IMX6QDL_CLK_LDB_DI1>;
clock-names = "di0_pll", "di1_pll", clock-names = "di0_pll", "di1_pll",
"di0_sel", "di1_sel", "di0_sel", "di1_sel",
"di0", "di1"; "di0", "di1";
......
...@@ -43,8 +43,11 @@ cpu@0 { ...@@ -43,8 +43,11 @@ cpu@0 {
396000 1175000 396000 1175000
>; >;
clock-latency = <61036>; /* two CLK32 periods */ clock-latency = <61036>; /* two CLK32 periods */
clocks = <&clks 104>, <&clks 6>, <&clks 16>, clocks = <&clks IMX6QDL_CLK_ARM>,
<&clks 17>, <&clks 170>; <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
<&clks IMX6QDL_CLK_STEP>,
<&clks IMX6QDL_CLK_PLL1_SW>,
<&clks IMX6QDL_CLK_PLL1_SYS>;
clock-names = "arm", "pll2_pfd2_396m", "step", clock-names = "arm", "pll2_pfd2_396m", "step",
"pll1_sw", "pll1_sys"; "pll1_sw", "pll1_sys";
arm-supply = <&reg_arm>; arm-supply = <&reg_arm>;
...@@ -78,7 +81,7 @@ soc { ...@@ -78,7 +81,7 @@ soc {
ocram: sram@00900000 { ocram: sram@00900000 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0x00900000 0x40000>; reg = <0x00900000 0x40000>;
clocks = <&clks 142>; clocks = <&clks IMX6QDL_CLK_OCRAM>;
}; };
aips-bus@02000000 { /* AIPS1 */ aips-bus@02000000 { /* AIPS1 */
...@@ -89,7 +92,8 @@ ecspi5: ecspi@02018000 { ...@@ -89,7 +92,8 @@ ecspi5: ecspi@02018000 {
compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
reg = <0x02018000 0x4000>; reg = <0x02018000 0x4000>;
interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks 116>, <&clks 116>; clocks = <&clks IMX6Q_CLK_ECSPI5>,
<&clks IMX6Q_CLK_ECSPI5>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
status = "disabled"; status = "disabled";
}; };
...@@ -140,7 +144,9 @@ sata: sata@02200000 { ...@@ -140,7 +144,9 @@ sata: sata@02200000 {
compatible = "fsl,imx6q-ahci"; compatible = "fsl,imx6q-ahci";
reg = <0x02200000 0x4000>; reg = <0x02200000 0x4000>;
interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks 154>, <&clks 187>, <&clks 105>; clocks = <&clks IMX6QDL_CLK_SATA>,
<&clks IMX6QDL_CLK_SATA_REF_100M>,
<&clks IMX6QDL_CLK_AHB>;
clock-names = "sata", "sata_ref", "ahb"; clock-names = "sata", "sata_ref", "ahb";
status = "disabled"; status = "disabled";
}; };
...@@ -152,7 +158,9 @@ ipu2: ipu@02800000 { ...@@ -152,7 +158,9 @@ ipu2: ipu@02800000 {
reg = <0x02800000 0x400000>; reg = <0x02800000 0x400000>;
interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>, interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>,
<0 7 IRQ_TYPE_LEVEL_HIGH>; <0 7 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks 133>, <&clks 134>, <&clks 137>; clocks = <&clks IMX6QDL_CLK_IPU2>,
<&clks IMX6QDL_CLK_IPU2_DI0>,
<&clks IMX6QDL_CLK_IPU2_DI1>;
clock-names = "bus", "di0", "di1"; clock-names = "bus", "di0", "di1";
resets = <&src 4>; resets = <&src 4>;
...@@ -238,9 +246,10 @@ hdmi_mux_3: endpoint { ...@@ -238,9 +246,10 @@ hdmi_mux_3: endpoint {
}; };
&ldb { &ldb {
clocks = <&clks 33>, <&clks 34>, clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, <&clks IMX6QDL_CLK_LDB_DI1_SEL>,
<&clks 39>, <&clks 40>, <&clks 41>, <&clks 42>, <&clks IMX6QDL_CLK_IPU1_DI0_SEL>, <&clks IMX6QDL_CLK_IPU1_DI1_SEL>,
<&clks 135>, <&clks 136>; <&clks IMX6QDL_CLK_IPU2_DI0_SEL>, <&clks IMX6QDL_CLK_IPU2_DI1_SEL>,
<&clks IMX6QDL_CLK_LDB_DI0>, <&clks IMX6QDL_CLK_LDB_DI1>;
clock-names = "di0_pll", "di1_pll", clock-names = "di0_pll", "di1_pll",
"di0_sel", "di1_sel", "di2_sel", "di3_sel", "di0_sel", "di1_sel", "di2_sel", "di3_sel",
"di0", "di1"; "di0", "di1";
......
This diff is collapsed.
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