ARM: at91/dt: remove useless usb clock

The ohci driver now calls clk_set_rate on the uhpck clock (which forwards
set_rate requests to its parent: the usb clock).
Remove useless references to usb clocks from ohci definitions.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index 4fb333bd1f85f10dcce81e953cf232f1ab14c74f..28edc8af9424ac54633936f6ec677530f58d5091 100644 (file)
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -940,8 +940,8 @@
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00300000 0x100000>;
                        interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;
-                       clocks = <&usb>, <&ohci_clk>, <&ohci_clk>, <&uhpck>;
-                       clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
+                       clocks = <&ohci_clk>, <&ohci_clk>, <&uhpck>;
+                       clock-names = "ohci_clk", "hclk", "uhpck";
                        status = "disabled";
                };
        };

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index d88fe62a2b2e12e41aaeb8058d028b7fa89cd788..4bc34754910280fd1c0dd2a6db06a93b560ed9ba 100644 (file)
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -1008,8 +1008,8 @@
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00500000 0x100000>;
                        interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;
-                       clocks = <&usb>, <&ohci_clk>, <&ohci_clk>, <&uhpck>;
-                       clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
+                       clocks = <&ohci_clk>, <&ohci_clk>, <&uhpck>;
+                       clock-names = "ohci_clk", "hclk", "uhpck";
                        status = "disabled";
                };
        };

diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index bf8d1856a55a55a3668bd69879df1ef2c8d1dd26..b2c44a07a3d0eee7618da3390315f15c0a8daa9a 100644 (file)
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -75,8 +75,8 @@
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00500000 0x100000>;
                        interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;
-                       clocks = <&usb>, <&ohci_clk>, <&hclk0>, <&uhpck>;
-                       clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
+                       clocks = <&ohci_clk>, <&hclk0>, <&uhpck>;
+                       clock-names = "ohci_clk", "hclk", "uhpck";
                        status = "disabled";
                };
 

diff --cc arch/arm/boot/dts/at91sam9263.dtsi
Simple merge

diff --cc arch/arm/boot/dts/at91sam9g45.dtsi
Simple merge

diff --cc arch/arm/boot/dts/at91sam9n12.dtsi
Simple merge

diff --cc arch/arm/boot/dts/at91sam9x5.dtsi
Simple merge

diff --cc arch/arm/boot/dts/sama5d3.dtsi
Simple merge

diff --cc arch/arm/boot/dts/sama5d4.dtsi
Simple merge