ARM: dts: bcm21664/23550: use CCU compatibles directly

BCM21664 and BCM23550 DTs for some reason use constants from a header file
for their CCU node compatibles. Change these to use the strings directly.

Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
Link: https://lore.kernel.org/r/65c54bd4076d646623d2a2f518631435522dc628.1685127525.git.stano.jakubek@gmail.com
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

diff --git a/arch/arm/boot/dts/bcm21664.dtsi b/arch/arm/boot/dts/bcm21664.dtsi
index 2a426125f9feef3f464d3a87be92b040649303c1..19ade84e42c142e757b2199ca241981b62835d68 100644 (file)
--- a/arch/arm/boot/dts/bcm21664.dtsi
+++ b/arch/arm/boot/dts/bcm21664.dtsi
@@ -285,21 +285,21 @@
                };
 
                root_ccu: root_ccu@35001000 {
-                       compatible = BCM21664_DT_ROOT_CCU_COMPAT;
+                       compatible = "brcm,bcm21664-root-ccu";
                        reg = <0x35001000 0x0f00>;
                        #clock-cells = <1>;
                        clock-output-names = "frac_1m";
                };
 
                aon_ccu: aon_ccu@35002000 {
-                       compatible = BCM21664_DT_AON_CCU_COMPAT;
+                       compatible = "brcm,bcm21664-aon-ccu";
                        reg = <0x35002000 0x0f00>;
                        #clock-cells = <1>;
                        clock-output-names = "hub_timer";
                };
 
                master_ccu: master_ccu@3f001000 {
-                       compatible = BCM21664_DT_MASTER_CCU_COMPAT;
+                       compatible = "brcm,bcm21664-master-ccu";
                        reg = <0x3f001000 0x0f00>;
                        #clock-cells = <1>;
                        clock-output-names = "sdio1",
@@ -313,7 +313,7 @@
                };
 
                slave_ccu: slave_ccu@3e011000 {
-                       compatible = BCM21664_DT_SLAVE_CCU_COMPAT;
+                       compatible = "brcm,bcm21664-slave-ccu";
                        reg = <0x3e011000 0x0f00>;
                        #clock-cells = <1>;
                        clock-output-names = "uartb",

diff --git a/arch/arm/boot/dts/bcm23550.dtsi b/arch/arm/boot/dts/bcm23550.dtsi
index 424c818d7a1b41efa0dc24b852f4a63bf4c3b86b..ed3ce2fabca60731f8af9bf5827f8fc0f58c5f17 100644 (file)
--- a/arch/arm/boot/dts/bcm23550.dtsi
+++ b/arch/arm/boot/dts/bcm23550.dtsi
@@ -371,21 +371,21 @@
                };
 
                root_ccu: root_ccu@35001000 {
-                       compatible = BCM21664_DT_ROOT_CCU_COMPAT;
+                       compatible = "brcm,bcm21664-root-ccu";
                        reg = <0x35001000 0x0f00>;
                        #clock-cells = <1>;
                        clock-output-names = "frac_1m";
                };
 
                aon_ccu: aon_ccu@35002000 {
-                       compatible = BCM21664_DT_AON_CCU_COMPAT;
+                       compatible = "brcm,bcm21664-aon-ccu";
                        reg = <0x35002000 0x0f00>;
                        #clock-cells = <1>;
                        clock-output-names = "hub_timer";
                };
 
                slave_ccu: slave_ccu@3e011000 {
-                       compatible = BCM21664_DT_SLAVE_CCU_COMPAT;
+                       compatible = "brcm,bcm21664-slave-ccu";
                        reg = <0x3e011000 0x0f00>;
                        #clock-cells = <1>;
                        clock-output-names = "uartb",
@@ -398,7 +398,7 @@
                };
 
                master_ccu: master_ccu@3f001000 {
-                       compatible = BCM21664_DT_MASTER_CCU_COMPAT;
+                       compatible = "brcm,bcm21664-master-ccu";
                        reg = <0x3f001000 0x0f00>;
                        #clock-cells = <1>;
                        clock-output-names = "sdio1",