git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'upstream-4.9-rc1' of git://git.infradead.org/linux-ubifs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
stih407-clock.dtsi
diff --git
a/arch/arm/boot/dts/stih407-clock.dtsi
b/arch/arm/boot/dts/stih407-clock.dtsi
index 38a56d7edab330c32a1272109e34e76df926d451..13029c03d7c6c7903811f11da4470cb83985a369 100644
(file)
--- a/
arch/arm/boot/dts/stih407-clock.dtsi
+++ b/
arch/arm/boot/dts/stih407-clock.dtsi
@@
-216,7
+216,7
@@
clk_s_d0_flexgen: clk-s-d0-flexgen {
#clock-cells = <1>;
clk_s_d0_flexgen: clk-s-d0-flexgen {
#clock-cells = <1>;
- compatible = "st,flexgen";
+ compatible = "st,flexgen
-audio", "st,flexgen
";
clocks = <&clk_s_d0_quadfs 0>,
<&clk_s_d0_quadfs 1>,
clocks = <&clk_s_d0_quadfs 0>,
<&clk_s_d0_quadfs 1>,
@@
-256,7
+256,7
@@
clk_s_d2_flexgen: clk-s-d2-flexgen {
#clock-cells = <1>;
clk_s_d2_flexgen: clk-s-d2-flexgen {
#clock-cells = <1>;
- compatible = "st,flexgen";
+ compatible = "st,flexgen
-video", "st,flexgen
";
clocks = <&clk_s_d2_quadfs 0>,
<&clk_s_d2_quadfs 1>,
clocks = <&clk_s_d2_quadfs 0>,
<&clk_s_d2_quadfs 1>,