This series cleans up some parts of Broadcom Kona platform's DT files.
No functional change intended.
Stanislav Jakubek (6):
ARM: dts: bcm-mobile: change "" includes to <> where applicable
ARM: dts: bcm21664/23550: use CCU compatibles directly
ARM: dts: bcm-mobile: move status properties to the end of nodes
ARM: dts: bcm11351/21664: add UART, I2C node labels
ARM: dts: bcm21664-garnet: use node labels
ARM: dts: bcm28155-ap: use node labels
arch/arm/boot/dts/bcm11351.dtsi | 27 +++----
arch/arm/boot/dts/bcm21664-garnet.dts | 46 +++++------
arch/arm/boot/dts/bcm21664.dtsi | 31 ++++----
arch/arm/boot/dts/bcm23550.dtsi | 19 +++--
arch/arm/boot/dts/bcm28155-ap.dts | 110 +++++++++++++-------------
5 files changed, 115 insertions(+), 118 deletions(-)
--
2.25.1
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 <[email protected]>
---
arch/arm/boot/dts/bcm21664.dtsi | 8 ++++----
arch/arm/boot/dts/bcm23550.dtsi | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/bcm21664.dtsi b/arch/arm/boot/dts/bcm21664.dtsi
index 2a426125f9fe..19ade84e42c1 100644
--- a/arch/arm/boot/dts/bcm21664.dtsi
+++ b/arch/arm/boot/dts/bcm21664.dtsi
@@ -285,21 +285,21 @@ var_156m_clk: var_156m {
};
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 @@ master_ccu: master_ccu@3f001000 {
};
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 424c818d7a1b..ed3ce2fabca6 100644
--- a/arch/arm/boot/dts/bcm23550.dtsi
+++ b/arch/arm/boot/dts/bcm23550.dtsi
@@ -371,21 +371,21 @@ var_156m_clk: var_156m {
};
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 @@ slave_ccu: slave_ccu@3e011000 {
};
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",
--
2.25.1
On 5/26/23 12:29, Stanislav Jakubek wrote:
> 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 <[email protected]>
The reason is to ensure the code and the DTS reference the same string,
applied anyway.
--
Florian