Skip to content

Commit

Permalink
ARM: dts: Drop DTS for BCM59056 PMIC
Browse files Browse the repository at this point in the history
The BCM59056 PMIC has its own separate DTSI, meant to be included
in a DTS file after defining the pmu node on some I2C bus.

I'm not aware of any other device that does this, and it seems very
unintuitive. Drop the DTS in favor of adding the BCM59056 PMIC node
directly into the device DTS files.

Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
  • Loading branch information
refractionware committed Jul 25, 2023
1 parent 94c7fce commit 9983307
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 127 deletions.
68 changes: 32 additions & 36 deletions arch/arm/boot/dts/broadcom/bcm28155-ap.dts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,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;
};
};
};
};

Expand Down Expand Up @@ -74,39 +106,3 @@
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;
};
};
};
91 changes: 0 additions & 91 deletions arch/arm/boot/dts/broadcom/bcm59056.dtsi

This file was deleted.

0 comments on commit 9983307

Please sign in to comment.