The DK2 appears to be just the DK1 with a display, thus factor out the barebox-specifics into a new stm32mp157a-dk1.dtsi, which we can include in both device trees after including the upstream device tree.
As the updated device tree introduced new nodes, the now duplicates (ðernet0, &uart4, /chosen and /aliases) are dropped from the barebox device as part of this commit as well. Signed-off-by: Ahmad Fatoum <[email protected]> --- arch/arm/dts/stm32mp157a-dk1.dts | 58 ++----------------------------- arch/arm/dts/stm32mp157a-dk1.dtsi | 23 ++++++++++++ arch/arm/dts/stm32mp157c-dk2.dts | 10 ++---- 3 files changed, 27 insertions(+), 64 deletions(-) create mode 100644 arch/arm/dts/stm32mp157a-dk1.dtsi diff --git a/arch/arm/dts/stm32mp157a-dk1.dts b/arch/arm/dts/stm32mp157a-dk1.dts index 62c28d396f00..f2cafae66b9b 100644 --- a/arch/arm/dts/stm32mp157a-dk1.dts +++ b/arch/arm/dts/stm32mp157a-dk1.dts @@ -4,59 +4,5 @@ * Author: Alexandre Torgue <[email protected]>. */ -/dts-v1/; - -#include <arm/stm32mp157c.dtsi> -#include <arm/stm32mp157-pinctrl.dtsi> -#include "stm32mp157c.dtsi" - -/ { - model = "STMicroelectronics STM32MP157A-DK1 Discovery Board"; - compatible = "st,stm32mp157a-dk1", "st,stm32mp157"; - - aliases { - ethernet0 = ðernet0; - serial0 = &uart4; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - sram: sram@10050000 { - compatible = "mmio-sram"; - reg = <0x10050000 0x10000>; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0x10050000 0x10000>; - - dma_pool: dma_pool@0 { - reg = <0x0 0x10000>; - pool; - }; - }; -}; - -ðernet0 { - status = "okay"; - pinctrl-0 = <ðernet0_rgmii_pins_a>; - pinctrl-names = "default", "sleep"; - phy-mode = "rgmii"; - max-speed = <1000>; - phy-handle = <&phy0>; - - mdio0 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "snps,dwmac-mdio"; - phy0: ethernet-phy@0 { - reg = <0>; - }; - }; -}; - -&uart4 { - pinctrl-names = "default"; - pinctrl-0 = <&uart4_pins_a>; - status = "okay"; -}; +#include <arm/stm32mp157a-dk1.dts> +#include "stm32mp157a-dk1.dtsi" diff --git a/arch/arm/dts/stm32mp157a-dk1.dtsi b/arch/arm/dts/stm32mp157a-dk1.dtsi new file mode 100644 index 000000000000..8cc70129b215 --- /dev/null +++ b/arch/arm/dts/stm32mp157a-dk1.dtsi @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (C) STMicroelectronics 2018 - All Rights Reserved + * Author: Alexandre Torgue <[email protected]>. + */ + +#include "stm32mp157c.dtsi" +#include <dt-bindings/gpio/gpio.h> + +/ { + sram: sram@10050000 { + compatible = "mmio-sram"; + reg = <0x10050000 0x10000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x10050000 0x10000>; + + dma_pool: dma_pool@0 { + reg = <0x0 0x10000>; + pool; + }; + }; +}; diff --git a/arch/arm/dts/stm32mp157c-dk2.dts b/arch/arm/dts/stm32mp157c-dk2.dts index 7565cabc3d92..6e73162ea4bd 100644 --- a/arch/arm/dts/stm32mp157c-dk2.dts +++ b/arch/arm/dts/stm32mp157c-dk2.dts @@ -4,11 +4,5 @@ * Author: Alexandre Torgue <[email protected]>. */ -/dts-v1/; - -#include "stm32mp157a-dk1.dts" - -/ { - model = "STMicroelectronics STM32MP157C-DK2 Discovery Board"; - compatible = "st,stm32mp157c-dk2", "st,stm32mp157"; -}; +#include <arm/stm32mp157c-dk2.dts> +#include "stm32mp157a-dk1.dtsi" -- 2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
