tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ARM: dts: omap3 clocks: simplify ssi aliases
update aliases for the ssi clocks ssi_ssr_fck, ssi_sst_fck and ssi_ick
to make them consistent for omap34xx and omap36xx. This makes it
possible to reference the clocks from generic omap3 dts files.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
authored by
Sebastian Reichel
and committed by
Tony Lindgren
3a24a3cb
3a6ae3c5
+10
-10
+5
-5
arch/arm/boot/dts/omap3430es1-clocks.dtsi
+5
-5
arch/arm/boot/dts/omap3430es1-clocks.dtsi
···
82
82
ti,dividers = <0>, <1>, <2>, <3>, <4>, <0>, <6>, <0>, <8>;
83
83
};
84
84
85
-
ssi_ssr_fck_3430es1: ssi_ssr_fck_3430es1 {
85
+
ssi_ssr_fck: ssi_ssr_fck_3430es1 {
86
86
#clock-cells = <0>;
87
87
compatible = "ti,composite-clock";
88
88
clocks = <&ssi_ssr_gate_fck_3430es1>, <&ssi_ssr_div_fck_3430es1>;
89
89
};
90
90
91
-
ssi_sst_fck_3430es1: ssi_sst_fck_3430es1 {
91
+
ssi_sst_fck: ssi_sst_fck_3430es1 {
92
92
#clock-cells = <0>;
93
93
compatible = "fixed-factor-clock";
94
-
clocks = <&ssi_ssr_fck_3430es1>;
94
+
clocks = <&ssi_ssr_fck>;
95
95
clock-mult = <1>;
96
96
clock-div = <2>;
97
97
};
···
120
120
clock-div = <1>;
121
121
};
122
122
123
-
ssi_ick_3430es1: ssi_ick_3430es1 {
123
+
ssi_ick: ssi_ick_3430es1 {
124
124
#clock-cells = <0>;
125
125
compatible = "ti,omap3-no-wait-interface-clock";
126
126
clocks = <&ssi_l4_ick>;
···
203
203
<&i2c1_ick>, <&uart2_ick>, <&uart1_ick>, <&gpt11_ick>,
204
204
<&gpt10_ick>, <&mcbsp5_ick>, <&mcbsp1_ick>,
205
205
<&omapctrl_ick>, <&aes2_ick>, <&sha12_ick>,
206
-
<&fshostusb_fck>, <&fac_ick>, <&ssi_ick_3430es1>;
206
+
<&fshostusb_fck>, <&fac_ick>, <&ssi_ick>;
207
207
};
208
208
};
+5
-5
arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi
+5
-5
arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi
···
25
25
ti,dividers = <0>, <1>, <2>, <3>, <4>, <0>, <6>, <0>, <8>;
26
26
};
27
27
28
-
ssi_ssr_fck_3430es2: ssi_ssr_fck_3430es2 {
28
+
ssi_ssr_fck: ssi_ssr_fck_3430es2 {
29
29
#clock-cells = <0>;
30
30
compatible = "ti,composite-clock";
31
31
clocks = <&ssi_ssr_gate_fck_3430es2>, <&ssi_ssr_div_fck_3430es2>;
32
32
};
33
33
34
-
ssi_sst_fck_3430es2: ssi_sst_fck_3430es2 {
34
+
ssi_sst_fck: ssi_sst_fck_3430es2 {
35
35
#clock-cells = <0>;
36
36
compatible = "fixed-factor-clock";
37
-
clocks = <&ssi_ssr_fck_3430es2>;
37
+
clocks = <&ssi_ssr_fck>;
38
38
clock-mult = <1>;
39
39
clock-div = <2>;
40
40
};
···
55
55
clock-div = <1>;
56
56
};
57
57
58
-
ssi_ick_3430es2: ssi_ick_3430es2 {
58
+
ssi_ick: ssi_ick_3430es2 {
59
59
#clock-cells = <0>;
60
60
compatible = "ti,omap3-ssi-interface-clock";
61
61
clocks = <&ssi_l4_ick>;
···
193
193
<&i2c1_ick>, <&uart2_ick>, <&uart1_ick>, <&gpt11_ick>,
194
194
<&gpt10_ick>, <&mcbsp5_ick>, <&mcbsp1_ick>,
195
195
<&omapctrl_ick>, <&aes2_ick>, <&sha12_ick>,
196
-
<&ssi_ick_3430es2>;
196
+
<&ssi_ick>;
197
197
};
198
198
};