Merge tag 'devprop-4.21-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / at91sam9x5_can.dtsi

diff --git a/arch/arm/boot/dts/at91sam9x5_can.dtsi b/arch/arm/boot/dts/at91sam9x5_can.dtsi
index 8eb2f9c1b97847d94db2cf58b57f5c82b423832f..125f9e3b49adde6d2d64cca76f0cdaa8c34489ed 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5_can.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5_can.dtsi
@@ -13,27 +13,13 @@
 / {
        ahb {
                apb {
-                       pmc: pmc@fffffc00 {
-                               periphck {
-                                       can0_clk: can0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <29>;
-                                       };
-
-                                       can1_clk: can1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <30>;
-                                       };
-                               };
-                       };
-
                        can0: can@f8000000 {
                                compatible = "atmel,at91sam9x5-can";
                                reg = <0xf8000000 0x300>;
                                interrupts = <29 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_can0_rx_tx>;
-                               clocks = <&can0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 29>;
                                clock-names = "can_clk";
                                status = "disabled";
                        };
@@ -44,7 +30,7 @@
                                interrupts = <30 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_can1_rx_tx>;
-                               clocks = <&can1_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 30>;
                                clock-names = "can_clk";
                                status = "disabled";
                        };