Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: Group omap3 CONTROL_DEVCONF0 clocks

The clksel related registers on omap3 cause unique_unit_address and
node_name_chars_strict warnings with the W=1 or W=2 make flags enabled.

With the clock drivers updated, we can now avoid most of these warnings
by grouping the TI component clocks using the TI clksel binding, and
with the use of clock-output-names property to avoid non-standard node
names for the clocks.

Signed-off-by: Tony Lindgren <tony@atomide.com>

+22 -14
+22 -14
arch/arm/boot/dts/omap3xxx-clocks.dtsi
··· 92 92 clocks = <&mcbsp5_gate_fck>, <&mcbsp5_mux_fck>; 93 93 }; 94 94 95 - mcbsp1_mux_fck: mcbsp1_mux_fck@4 { 96 - #clock-cells = <0>; 97 - compatible = "ti,composite-mux-clock"; 98 - clocks = <&core_96m_fck>, <&mcbsp_clks>; 99 - ti,bit-shift = <2>; 100 - reg = <0x04>; 95 + /* CONTROL_DEVCONF0 */ 96 + clock@4 { 97 + compatible = "ti,clksel"; 98 + reg = <0x4>; 99 + #clock-cells = <2>; 100 + #address-cells = <0>; 101 + 102 + mcbsp1_mux_fck: clock-mcbsp1-mux-fck { 103 + #clock-cells = <0>; 104 + compatible = "ti,composite-mux-clock"; 105 + clock-output-names = "mcbsp1_mux_fck"; 106 + clocks = <&core_96m_fck>, <&mcbsp_clks>; 107 + ti,bit-shift = <2>; 108 + }; 109 + 110 + mcbsp2_mux_fck: clock-mcbsp2-mux-fck { 111 + #clock-cells = <0>; 112 + compatible = "ti,composite-mux-clock"; 113 + clock-output-names = "mcbsp2_mux_fck"; 114 + clocks = <&per_96m_fck>, <&mcbsp_clks>; 115 + ti,bit-shift = <6>; 116 + }; 101 117 }; 102 118 103 119 mcbsp1_fck: mcbsp1_fck { 104 120 #clock-cells = <0>; 105 121 compatible = "ti,composite-clock"; 106 122 clocks = <&mcbsp1_gate_fck>, <&mcbsp1_mux_fck>; 107 - }; 108 - 109 - mcbsp2_mux_fck: mcbsp2_mux_fck@4 { 110 - #clock-cells = <0>; 111 - compatible = "ti,composite-mux-clock"; 112 - clocks = <&per_96m_fck>, <&mcbsp_clks>; 113 - ti,bit-shift = <6>; 114 - reg = <0x04>; 115 123 }; 116 124 117 125 mcbsp2_fck: mcbsp2_fck {