We don't use the ls1046a-rdb kernel device tree as-is for barebox, but instead include it and override some nodes. Some overrides can be applicable to all SoCs so add a new file that's ls1046a-specific. Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> --- v1 -> v2: - new patch --- arch/arm/dts/fsl-ls1046a-rdb.dts | 2 +- arch/arm/dts/fsl-ls1046a.dtsi | 7 +++++++ arch/arm/dts/fsl-tqmls1046a-mbls10xxa.dts | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/fsl-ls1046a.dtsi diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts index 5a75212bb5e6..37023fae9be0 100644 --- a/arch/arm/dts/fsl-ls1046a-rdb.dts +++ b/arch/arm/dts/fsl-ls1046a-rdb.dts @@ -3,11 +3,11 @@ /dts-v1/; #include <arm64/freescale/fsl-ls1046a-rdb.dts> +#include "fsl-ls1046a.dtsi" / { aliases { eeprom = &{i2c0/eeprom@52}; - mmc0 = &esdhc; }; chosen { diff --git a/arch/arm/dts/fsl-ls1046a.dtsi b/arch/arm/dts/fsl-ls1046a.dtsi new file mode 100644 index 000000000000..a661cb0c8970 --- /dev/null +++ b/arch/arm/dts/fsl-ls1046a.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/ { + aliases { + mmc0 = &esdhc; + }; +}; diff --git a/arch/arm/dts/fsl-tqmls1046a-mbls10xxa.dts b/arch/arm/dts/fsl-tqmls1046a-mbls10xxa.dts index 13ce24a8895a..650e89bffe8a 100644 --- a/arch/arm/dts/fsl-tqmls1046a-mbls10xxa.dts +++ b/arch/arm/dts/fsl-tqmls1046a-mbls10xxa.dts @@ -11,6 +11,7 @@ #include <dt-bindings/gpio/gpio.h> #include "fsl-tqmls1046a.dtsi" +#include "fsl-ls1046a.dtsi" / { model = "TQ TQMLS1046A SoM on MBLS10xxA board"; @@ -19,7 +20,6 @@ / { aliases { serial0 = &duart0; serial1 = &duart1; - mmc0 = &esdhc; qspiflash0 = &qflash0; qspiflash1 = &qflash1; qsgmii_s1_p1 = &qsgmii1_phy1; -- 2.39.2