提交 8799b5d5 编写于 作者: S Shawn Guo

ARM: dts: imx: drop 'clocks' container for board level clocks

For soc level of clocks which are input to Clock Control Module, clock
driver expects them to be under 'clocks' container node.  But for board
level clocks, this container is not really necessary.  Let's drop it and
use an unique name for fixed rate clock, so that 'reg' property can be
saved as well.
Signed-off-by: NShawn Guo <shawnguo@kernel.org>
Acked-By: NLothar Waßmann <LW@KARO-electronics.de>
上级 0c414b06
...@@ -140,16 +140,11 @@ ...@@ -140,16 +140,11 @@
regulator-boot-on; regulator-boot-on;
}; };
clocks { mclk: clock-mclk {
#address-cells = <1>;
#size-cells = <0>;
mclk: clock@0 {
compatible = "fixed-clock"; compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>; #clock-cells = <0>;
clock-frequency = <26000000>; clock-frequency = <26000000>;
}; };
};
sound { sound {
compatible = "fsl,imx28-tx28-sgtl5000", compatible = "fsl,imx28-tx28-sgtl5000",
......
...@@ -67,14 +67,13 @@ ...@@ -67,14 +67,13 @@
ckih1 { ckih1 {
clock-frequency = <0>; clock-frequency = <0>;
}; };
};
mclk: clock@0 { mclk: clock-mclk {
compatible = "fixed-clock"; compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>; #clock-cells = <0>;
clock-frequency = <26000000>; clock-frequency = <26000000>;
}; };
};
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
......
...@@ -72,16 +72,13 @@ ...@@ -72,16 +72,13 @@
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
clocks {
/* Fixed crystal dedicated to mcp251x */ /* Fixed crystal dedicated to mcp251x */
clk16m: clk@1 { clk16m: clock-16m {
compatible = "fixed-clock"; compatible = "fixed-clock";
reg = <1>;
#clock-cells = <0>; #clock-cells = <0>;
clock-frequency = <16000000>; clock-frequency = <16000000>;
clock-output-names = "clk16m"; clock-output-names = "clk16m";
}; };
};
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
......
...@@ -43,14 +43,11 @@ ...@@ -43,14 +43,11 @@
#include "imx6q-ba16.dtsi" #include "imx6q-ba16.dtsi"
/ { / {
clocks { mclk: clock-mclk {
mclk: clock@0 {
compatible = "fixed-clock"; compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>; #clock-cells = <0>;
clock-frequency = <22000000>; clock-frequency = <22000000>;
}; };
};
gpio-poweroff { gpio-poweroff {
compatible = "gpio-poweroff"; compatible = "gpio-poweroff";
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册