redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Martin Blumenstingl 2017-06-04 20:33:41 +02:00 committed by Kevin Hilman
parent bbe5b23dfd
commit 2c323c43a3
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
arch/arm/boot/dts/meson8.dtsi
View File

@ -43,6 +43,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include <dt-bindings/clock/meson8b-clkc.h>
#include <dt-bindings/gpio/meson8-gpio.h>
/include/ "meson.dtsi"
@ -82,13 +83,6 @@
reg = <0x203>;
};
};
clk81: clk@0 {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <141666666>;
};
}; /* end of / */
&aobus {
@ -126,6 +120,12 @@
};
&cbus {
clkc: clock-controller@4000 {
#clock-cells = <1>;
compatible = "amlogic,meson8-clkc";
reg = <0x8000 0x4>, <0x4000 0x460>;
};
pinctrl_cbus: pinctrl@9880 {
compatible = "amlogic,meson8-cbus-pinctrl";
reg = <0x9880 0x10>;
@ -172,20 +172,20 @@
};
&ethmac {
clocks = <&clk81>;
clocks = <&clkc CLKID_CLK81>;
clock-names = "stmmaceth";
};
&i2c_AO {
clocks = <&clk81>;
clocks = <&clkc CLKID_CLK81>;
};
&i2c_A {
clocks = <&clk81>;
clocks = <&clkc CLKID_CLK81>;
};
&i2c_B {
clocks = <&clk81>;
clocks = <&clkc CLKID_CLK81>;
};
&L2 {
@ -195,21 +195,21 @@
};
&spifc {
clocks = <&clk81>;
clocks = <&clkc CLKID_CLK81>;
};
&uart_AO {
clocks = <&clk81>;
clocks = <&clkc CLKID_CLK81>;
};
&uart_A {
clocks = <&clk81>;
clocks = <&clkc CLKID_CLK81>;
};
&uart_B {
clocks = <&clk81>;
clocks = <&clkc CLKID_CLK81>;
};
&uart_C {
clocks = <&clk81>;
clocks = <&clkc CLKID_CLK81>;
};