public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: dts: r8a7794: Stop grouping clocks under a "clocks" subnode

Browse source 
The current practice is to not group clocks under a "clocks" subnode,
but just put them together with the other on-SoC devices.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Geert Uytterhoeven 2017-08-18 11:16:57 +02:00 • committed by Simon Horman
parent c67e243ccf
commit 9fb1c8ff4c
1 changed files with 54 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
arch/arm/boot/dts/r8a7794.dtsi
View file

@ -982,71 +982,65 @@
status = "disabled"; status = "disabled";
}; };
clocks { /* External root clock */
#address-cells = <2>; extal_clk: extal {
#size-cells = <2>; compatible = "fixed-clock";
ranges; #clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
};
/* External root clock */ /* External USB clock - can be overridden by the board */
extal_clk: extal { usb_extal_clk: usb_extal {
compatible = "fixed-clock"; compatible = "fixed-clock";
#clock-cells = <0>; #clock-cells = <0>;
/* This value must be overriden by the board. */ clock-frequency = <48000000>;
clock-frequency = <0>; };
};
/* External USB clock - can be overridden by the board */ /* External CAN clock */
usb_extal_clk: usb_extal { can_clk: can {
compatible = "fixed-clock"; compatible = "fixed-clock";
#clock-cells = <0>; #clock-cells = <0>;
clock-frequency = <48000000>; /* This value must be overridden by the board. */
}; clock-frequency = <0>;
};
/* External CAN clock */ /* External SCIF clock */
can_clk: can { scif_clk: scif {
compatible = "fixed-clock"; compatible = "fixed-clock";
#clock-cells = <0>; #clock-cells = <0>;
/* This value must be overridden by the board. */ /* This value must be overridden by the board. */
clock-frequency = <0>; clock-frequency = <0>;
}; };
/* External SCIF clock */ /*
scif_clk: scif { * The external audio clocks are configured as 0 Hz fixed
compatible = "fixed-clock"; * frequency clocks by default. Boards that provide audio
#clock-cells = <0>; * clocks should override them.
/* This value must be overridden by the board. */ */
clock-frequency = <0>; audio_clka: audio_clka {
}; compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <0>;
};
audio_clkb: audio_clkb {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <0>;
};
audio_clkc: audio_clkc {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <0>;
};
/* cpg: clock-controller@e6150000 {
* The external audio clocks are configured as 0 Hz fixed compatible = "renesas,r8a7794-cpg-mssr";
* frequency clocks by default. Boards that provide audio reg = <0 0xe6150000 0 0x1000>;
* clocks should override them. clocks = <&extal_clk>, <&usb_extal_clk>;
*/ clock-names = "extal", "usb_extal";
audio_clka: audio_clka { #clock-cells = <2>;
compatible = "fixed-clock"; #power-domain-cells = <0>;
#clock-cells = <0>;
clock-frequency = <0>;
};
audio_clkb: audio_clkb {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <0>;
};
audio_clkc: audio_clkc {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <0>;
};
cpg: clock-controller@e6150000 {
compatible = "renesas,r8a7794-cpg-mssr";
reg = <0 0xe6150000 0 0x1000>;
clocks = <&extal_clk>, <&usb_extal_clk>;
clock-names = "extal", "usb_extal";
#clock-cells = <2>;
#power-domain-cells = <0>;
};
}; };
rst: reset-controller@e6160000 { rst: reset-controller@e6160000 {