ARM: dts: meson8: add and use the real clock controller
This removes the dummy clk81 gate and replaces it with the actual clock controller's CLKID_CLK81. This will also allow us to pass the real clock IDs to all devices where the clock is controlled by clkc in the future. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Acked-by: Jerome Brunet <jbrunet@baylibre.com> Signed-off-by: Kevin Hilman <khilman@baylibre.com>
This commit is contained in:
parent
bbe5b23dfd
commit
2c323c43a3
arch/arm/boot/dts
|
@ -43,6 +43,7 @@
|
||||||
* OTHER DEALINGS IN THE SOFTWARE.
|
* OTHER DEALINGS IN THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <dt-bindings/clock/meson8b-clkc.h>
|
||||||
#include <dt-bindings/gpio/meson8-gpio.h>
|
#include <dt-bindings/gpio/meson8-gpio.h>
|
||||||
/include/ "meson.dtsi"
|
/include/ "meson.dtsi"
|
||||||
|
|
||||||
|
@ -82,13 +83,6 @@ cpu@203 {
|
||||||
reg = <0x203>;
|
reg = <0x203>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
clk81: clk@0 {
|
|
||||||
#clock-cells = <0>;
|
|
||||||
compatible = "fixed-clock";
|
|
||||||
clock-frequency = <141666666>;
|
|
||||||
};
|
|
||||||
|
|
||||||
}; /* end of / */
|
}; /* end of / */
|
||||||
|
|
||||||
&aobus {
|
&aobus {
|
||||||
|
@ -126,6 +120,12 @@ mux {
|
||||||
};
|
};
|
||||||
|
|
||||||
&cbus {
|
&cbus {
|
||||||
|
clkc: clock-controller@4000 {
|
||||||
|
#clock-cells = <1>;
|
||||||
|
compatible = "amlogic,meson8-clkc";
|
||||||
|
reg = <0x8000 0x4>, <0x4000 0x460>;
|
||||||
|
};
|
||||||
|
|
||||||
pinctrl_cbus: pinctrl@9880 {
|
pinctrl_cbus: pinctrl@9880 {
|
||||||
compatible = "amlogic,meson8-cbus-pinctrl";
|
compatible = "amlogic,meson8-cbus-pinctrl";
|
||||||
reg = <0x9880 0x10>;
|
reg = <0x9880 0x10>;
|
||||||
|
@ -172,20 +172,20 @@ mux {
|
||||||
};
|
};
|
||||||
|
|
||||||
ðmac {
|
ðmac {
|
||||||
clocks = <&clk81>;
|
clocks = <&clkc CLKID_CLK81>;
|
||||||
clock-names = "stmmaceth";
|
clock-names = "stmmaceth";
|
||||||
};
|
};
|
||||||
|
|
||||||
&i2c_AO {
|
&i2c_AO {
|
||||||
clocks = <&clk81>;
|
clocks = <&clkc CLKID_CLK81>;
|
||||||
};
|
};
|
||||||
|
|
||||||
&i2c_A {
|
&i2c_A {
|
||||||
clocks = <&clk81>;
|
clocks = <&clkc CLKID_CLK81>;
|
||||||
};
|
};
|
||||||
|
|
||||||
&i2c_B {
|
&i2c_B {
|
||||||
clocks = <&clk81>;
|
clocks = <&clkc CLKID_CLK81>;
|
||||||
};
|
};
|
||||||
|
|
||||||
&L2 {
|
&L2 {
|
||||||
|
@ -195,21 +195,21 @@ &L2 {
|
||||||
};
|
};
|
||||||
|
|
||||||
&spifc {
|
&spifc {
|
||||||
clocks = <&clk81>;
|
clocks = <&clkc CLKID_CLK81>;
|
||||||
};
|
};
|
||||||
|
|
||||||
&uart_AO {
|
&uart_AO {
|
||||||
clocks = <&clk81>;
|
clocks = <&clkc CLKID_CLK81>;
|
||||||
};
|
};
|
||||||
|
|
||||||
&uart_A {
|
&uart_A {
|
||||||
clocks = <&clk81>;
|
clocks = <&clkc CLKID_CLK81>;
|
||||||
};
|
};
|
||||||
|
|
||||||
&uart_B {
|
&uart_B {
|
||||||
clocks = <&clk81>;
|
clocks = <&clkc CLKID_CLK81>;
|
||||||
};
|
};
|
||||||
|
|
||||||
&uart_C {
|
&uart_C {
|
||||||
clocks = <&clk81>;
|
clocks = <&clkc CLKID_CLK81>;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue