| Message ID | 20201224020354.2212037-1-daniel@0x0f.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8367611892442ea788139ea1063308b6e7b6f04f |
| Headers | show |
| Series | [v2] ARM: mstar: Unify common parts of BreadBee boards into a dtsi | expand |
From: Arnd Bergmann <arnd@arndb.de> On Thu, 24 Dec 2020 11:03:54 +0900, Daniel Palmer wrote: > The BreadBee and the BreadBee Crust are the same PCB with a different > SoC mounted. There are two top level dts to handle this. > > To avoid deduplicating the parts that are more related to the PCB than > the SoC (i.e. the voltage regs and LEDs) add a common dtsi that can > be included in both top level dts. This was missing in my earlier merges, sorry about that. Now applied to arm/dt for v5.12, thanks! [1/1] ARM: mstar: Unify common parts of BreadBee boards into a dtsi commit: 8367611892442ea788139ea1063308b6e7b6f04f Arnd
Hello: This patch was applied to soc/soc.git (refs/heads/for-next): On Thu, 24 Dec 2020 11:03:54 +0900 you wrote: > The BreadBee and the BreadBee Crust are the same PCB with a different > SoC mounted. There are two top level dts to handle this. > > To avoid deduplicating the parts that are more related to the PCB than > the SoC (i.e. the voltage regs and LEDs) add a common dtsi that can > be included in both top level dts. > > [...] Here is the summary with links: - [v2] ARM: mstar: Unify common parts of BreadBee boards into a dtsi https://git.kernel.org/soc/soc/c/836761189244 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/arch/arm/boot/dts/mstar-infinity-breadbee-common.dtsi b/arch/arm/boot/dts/mstar-infinity-breadbee-common.dtsi new file mode 100644 index 000000000000..507ff2fba837 --- /dev/null +++ b/arch/arm/boot/dts/mstar-infinity-breadbee-common.dtsi @@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2020 thingy.jp. + * Author: Daniel Palmer <daniel@thingy.jp> + */ + +#include <dt-bindings/gpio/gpio.h> + +/ { + vcc_core: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "vcc_core"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-boot-on; + }; + + vcc_dram: fixedregulator@1 { + compatible = "regulator-fixed"; + regulator-name = "vcc_dram"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + }; + + vcc_io: fixedregulator@2 { + compatible = "regulator-fixed"; + regulator-name = "vcc_io"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + }; + + leds { + compatible = "gpio-leds"; + red { + gpios = <&gpio MSC313_GPIO_SR_IO16 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "activity"; + }; + yellow { + gpios = <&gpio MSC313_GPIO_SR_IO17 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + }; + }; +}; + +&cpu0 { + cpu-supply = <&vcc_core>; +}; diff --git a/arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts b/arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts index f9db2ff86f2d..db4910dcb8a7 100644 --- a/arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts +++ b/arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts @@ -6,6 +6,7 @@ /dts-v1/; #include "mstar-infinity-msc313.dtsi" +#include "mstar-infinity-breadbee-common.dtsi" / { model = "BreadBee Crust"; diff --git a/arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts b/arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts index f0eda80a95cc..e64ca4ce1830 100644 --- a/arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts +++ b/arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts @@ -6,6 +6,7 @@ /dts-v1/; #include "mstar-infinity3-msc313e.dtsi" +#include "mstar-infinity-breadbee-common.dtsi" / { model = "BreadBee";
The BreadBee and the BreadBee Crust are the same PCB with a different SoC mounted. There are two top level dts to handle this. To avoid deduplicating the parts that are more related to the PCB than the SoC (i.e. the voltage regs and LEDs) add a common dtsi that can be included in both top level dts. Signed-off-by: Daniel Palmer <daniel@0x0f.com> --- .../dts/mstar-infinity-breadbee-common.dtsi | 49 +++++++++++++++++++ .../mstar-infinity-msc313-breadbee_crust.dts | 1 + .../dts/mstar-infinity3-msc313e-breadbee.dts | 1 + 3 files changed, 51 insertions(+) create mode 100644 arch/arm/boot/dts/mstar-infinity-breadbee-common.dtsi