Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Artur Weber and committed by
Florian Fainelli
e74cdabc 9cd4b79e

+32 -127
+32 -36
arch/arm/boot/dts/broadcom/bcm28155-ap.dts
··· 37 37 status = "okay"; 38 38 39 39 pmu: pmu@8 { 40 + compatible = "brcm,bcm59056"; 41 + interrupts = <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>; 40 42 reg = <0x08>; 43 + 44 + regulators { 45 + camldo1_reg: camldo1 { 46 + regulator-min-microvolt = <3300000>; 47 + regulator-max-microvolt = <3300000>; 48 + regulator-always-on; 49 + }; 50 + 51 + sdldo_reg: sdldo { 52 + regulator-min-microvolt = <3000000>; 53 + regulator-max-microvolt = <3000000>; 54 + }; 55 + 56 + sdxldo_reg: sdxldo { 57 + regulator-min-microvolt = <2700000>; 58 + regulator-max-microvolt = <3300000>; 59 + }; 60 + 61 + usbldo_reg: usbldo { 62 + regulator-min-microvolt = <3300000>; 63 + regulator-max-microvolt = <3300000>; 64 + regulator-always-on; 65 + }; 66 + 67 + iosr1_reg: iosr1 { 68 + regulator-min-microvolt = <1800000>; 69 + regulator-max-microvolt = <1800000>; 70 + regulator-always-on; 71 + }; 72 + }; 41 73 }; 42 74 }; 43 75 ··· 105 73 106 74 &usbphy { 107 75 status = "okay"; 108 - }; 109 - 110 - #include "bcm59056.dtsi" 111 - 112 - &pmu { 113 - compatible = "brcm,bcm59056"; 114 - interrupts = <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>; 115 - regulators { 116 - camldo1_reg: camldo1 { 117 - regulator-min-microvolt = <3300000>; 118 - regulator-max-microvolt = <3300000>; 119 - regulator-always-on; 120 - }; 121 - 122 - sdldo_reg: sdldo { 123 - regulator-min-microvolt = <3000000>; 124 - regulator-max-microvolt = <3000000>; 125 - }; 126 - 127 - sdxldo_reg: sdxldo { 128 - regulator-min-microvolt = <2700000>; 129 - regulator-max-microvolt = <3300000>; 130 - }; 131 - 132 - usbldo_reg: usbldo { 133 - regulator-min-microvolt = <3300000>; 134 - regulator-max-microvolt = <3300000>; 135 - regulator-always-on; 136 - }; 137 - 138 - iosr1_reg: iosr1 { 139 - regulator-min-microvolt = <1800000>; 140 - regulator-max-microvolt = <1800000>; 141 - regulator-always-on; 142 - }; 143 - }; 144 76 };
-91
arch/arm/boot/dts/broadcom/bcm59056.dtsi
··· 1 - // SPDX-License-Identifier: GPL-2.0-or-later 2 - /* 3 - * Copyright 2014 Linaro Limited 4 - * Author: Matt Porter <mporter@linaro.org> 5 - */ 6 - 7 - &pmu { 8 - compatible = "brcm,bcm59056"; 9 - regulators { 10 - rfldo_reg: rfldo { 11 - }; 12 - 13 - camldo1_reg: camldo1 { 14 - }; 15 - 16 - camldo2_reg: camldo2 { 17 - }; 18 - 19 - simldo1_reg: simldo1 { 20 - }; 21 - 22 - simldo2_reg: simldo2 { 23 - }; 24 - 25 - sdldo_reg: sdldo { 26 - }; 27 - 28 - sdxldo_reg: sdxldo { 29 - }; 30 - 31 - mmcldo1_reg: mmcldo1 { 32 - }; 33 - 34 - mmcldo2_reg: mmcldo2 { 35 - }; 36 - 37 - audldo_reg: audldo { 38 - }; 39 - 40 - micldo_reg: micldo { 41 - }; 42 - 43 - usbldo_reg: usbldo { 44 - }; 45 - 46 - vibldo_reg: vibldo { 47 - }; 48 - 49 - csr_reg: csr { 50 - }; 51 - 52 - iosr1_reg: iosr1 { 53 - }; 54 - 55 - iosr2_reg: iosr2 { 56 - }; 57 - 58 - msr_reg: msr { 59 - }; 60 - 61 - sdsr1_reg: sdsr1 { 62 - }; 63 - 64 - sdsr2_reg: sdsr2 { 65 - }; 66 - 67 - vsr_reg: vsr { 68 - }; 69 - 70 - gpldo1_reg: gpldo1 { 71 - }; 72 - 73 - gpldo2_reg: gpldo2 { 74 - }; 75 - 76 - gpldo3_reg: gpldo3 { 77 - }; 78 - 79 - gpldo4_reg: gpldo4 { 80 - }; 81 - 82 - gpldo5_reg: gpldo5 { 83 - }; 84 - 85 - gpldo6_reg: gpldo6 { 86 - }; 87 - 88 - vbus_reg: vbus { 89 - }; 90 - }; 91 - };