ARM: dts: Drop DTS for BCM59056 PMU

The BCM59056 PMU has its own separate DTSI, meant to be included
in a DTS file after defining the pmu node on some I2C bus.

This seems rather unintuitive; drop the DTS in favor of adding the
BCM59056 PMU node directly into the device DTS files.

If the amount of subdevices supported by the BCM590xx grows, and
a common device tree turns out to be beneficial, it can be reintroduced
in the future.

Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
Link: https://lore.kernel.org/r/20250304-bcm59054-v6-3-ae8302358443@gmail.com
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

diff --git a/arch/arm/boot/dts/broadcom/bcm28155-ap.dts b/arch/arm/boot/dts/broadcom/bcm28155-ap.dts
index 2f3634545e64978888cd0b47fd5647a5e2eb8e07..cefaa9a3c45c9c90bffc08f739161d8ea21d98dd 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm28155-ap.dts
+++ b/arch/arm/boot/dts/broadcom/bcm28155-ap.dts
@@ -37,7 +37,39 @@
        status = "okay";
 
        pmu: pmu@8 {
+               compatible = "brcm,bcm59056";
+               interrupts = <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>;
                reg = <0x08>;
+
+               regulators {
+                       camldo1_reg: camldo1 {
+                               regulator-min-microvolt = <3300000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+
+                       sdldo_reg: sdldo {
+                               regulator-min-microvolt = <3000000>;
+                               regulator-max-microvolt = <3000000>;
+                       };
+
+                       sdxldo_reg: sdxldo {
+                               regulator-min-microvolt = <2700000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+
+                       usbldo_reg: usbldo {
+                               regulator-min-microvolt = <3300000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+
+                       iosr1_reg: iosr1 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-always-on;
+                       };
+               };
        };
 };
 
@@ -74,39 +106,3 @@
 &usbphy {
        status = "okay";
 };
-
-#include "bcm59056.dtsi"
-
-&pmu {
-       compatible = "brcm,bcm59056";
-       interrupts = <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>;
-       regulators {
-               camldo1_reg: camldo1 {
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
-
-               sdldo_reg: sdldo {
-                       regulator-min-microvolt = <3000000>;
-                       regulator-max-microvolt = <3000000>;
-               };
-
-               sdxldo_reg: sdxldo {
-                       regulator-min-microvolt = <2700000>;
-                       regulator-max-microvolt = <3300000>;
-               };
-
-               usbldo_reg: usbldo {
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
-
-               iosr1_reg: iosr1 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-always-on;
-               };
-       };
-};

diff --git a/arch/arm/boot/dts/broadcom/bcm59056.dtsi b/arch/arm/boot/dts/broadcom/bcm59056.dtsi
deleted file mode 100644 (file)
index a9bb7ad..0000000
--- a/arch/arm/boot/dts/broadcom/bcm59056.dtsi
+++ /dev/null
@@ -1,91 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
-* Copyright 2014 Linaro Limited
-* Author: Matt Porter <mporter@linaro.org>
-*/
-
-&pmu {
-       compatible = "brcm,bcm59056";
-       regulators {
-               rfldo_reg: rfldo {
-               };
-
-               camldo1_reg: camldo1 {
-               };
-
-               camldo2_reg: camldo2 {
-               };
-
-               simldo1_reg: simldo1 {
-               };
-
-               simldo2_reg: simldo2 {
-               };
-
-               sdldo_reg: sdldo {
-               };
-
-               sdxldo_reg: sdxldo {
-               };
-
-               mmcldo1_reg: mmcldo1 {
-               };
-
-               mmcldo2_reg: mmcldo2 {
-               };
-
-               audldo_reg: audldo {
-               };
-
-               micldo_reg: micldo {
-               };
-
-               usbldo_reg: usbldo {
-               };
-
-               vibldo_reg: vibldo {
-               };
-
-               csr_reg: csr {
-               };
-
-               iosr1_reg: iosr1 {
-               };
-
-               iosr2_reg: iosr2 {
-               };
-
-               msr_reg: msr {
-               };
-
-               sdsr1_reg: sdsr1 {
-               };
-
-               sdsr2_reg: sdsr2 {
-               };
-
-               vsr_reg: vsr {
-               };
-
-               gpldo1_reg: gpldo1 {
-               };
-
-               gpldo2_reg: gpldo2 {
-               };
-
-               gpldo3_reg: gpldo3 {
-               };
-
-               gpldo4_reg: gpldo4 {
-               };
-
-               gpldo5_reg: gpldo5 {
-               };
-
-               gpldo6_reg: gpldo6 {
-               };
-
-               vbus_reg: vbus {
-               };
-       };
-};