From 21cd92faa5f65072b9867c69f4b63ce357cb9bcf Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Fri, 11 Oct 2019 17:33:55 +0200 Subject: ARM: dts: meson-sm1: add U-Boot specific DT for graphics Rename meson-g12a-u-boot.dtsi into meson-g12-common-u-boot.dtsi to match the new DT architecture and add meson-sm1-sei610-u-boot.dtsi to handle the U-Boot specific DT for graphics. Signed-off-by: Neil Armstrong --- arch/arm/dts/meson-g12-common-u-boot.dtsi | 29 +++++++++++++++++++++++++++ arch/arm/dts/meson-g12a-sei510-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12a-u-boot.dtsi | 29 --------------------------- arch/arm/dts/meson-g12a-u200-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi | 2 +- arch/arm/dts/meson-sm1-sei610-u-boot.dtsi | 7 +++++++ 6 files changed, 39 insertions(+), 32 deletions(-) create mode 100644 arch/arm/dts/meson-g12-common-u-boot.dtsi delete mode 100644 arch/arm/dts/meson-g12a-u-boot.dtsi create mode 100644 arch/arm/dts/meson-sm1-sei610-u-boot.dtsi (limited to 'arch/arm') diff --git a/arch/arm/dts/meson-g12-common-u-boot.dtsi b/arch/arm/dts/meson-g12-common-u-boot.dtsi new file mode 100644 index 0000000000..38fd3d3feb --- /dev/null +++ b/arch/arm/dts/meson-g12-common-u-boot.dtsi @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 BayLibre, SAS. + * Author: Maxime Jourdan + */ + +/ { + soc { + u-boot,dm-pre-reloc; + }; +}; + +&canvas { + status = "disabled"; +}; + +&vpu { + reg = <0x0 0xff900000 0x0 0x100000>, + <0x0 0xff63c000 0x0 0x1000>, + <0x0 0xff638000 0x0 0x400>; + reg-names = "vpu", "hhi", "dmc"; + u-boot,dm-pre-reloc; +}; + +&hdmi_tx { + reg = <0x0 0x0 0x0 0x10000>, + <0x0 0x3c000 0x0 0x1000>; + reg-names = "hdmitx", "hhi"; +}; diff --git a/arch/arm/dts/meson-g12a-sei510-u-boot.dtsi b/arch/arm/dts/meson-g12a-sei510-u-boot.dtsi index fddffd628c..236f2468dc 100644 --- a/arch/arm/dts/meson-g12a-sei510-u-boot.dtsi +++ b/arch/arm/dts/meson-g12a-sei510-u-boot.dtsi @@ -4,4 +4,4 @@ * Author: Neil Armstrong */ -#include "meson-g12a-u-boot.dtsi" +#include "meson-g12-common-u-boot.dtsi" diff --git a/arch/arm/dts/meson-g12a-u-boot.dtsi b/arch/arm/dts/meson-g12a-u-boot.dtsi deleted file mode 100644 index 38fd3d3feb..0000000000 --- a/arch/arm/dts/meson-g12a-u-boot.dtsi +++ /dev/null @@ -1,29 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2019 BayLibre, SAS. - * Author: Maxime Jourdan - */ - -/ { - soc { - u-boot,dm-pre-reloc; - }; -}; - -&canvas { - status = "disabled"; -}; - -&vpu { - reg = <0x0 0xff900000 0x0 0x100000>, - <0x0 0xff63c000 0x0 0x1000>, - <0x0 0xff638000 0x0 0x400>; - reg-names = "vpu", "hhi", "dmc"; - u-boot,dm-pre-reloc; -}; - -&hdmi_tx { - reg = <0x0 0x0 0x0 0x10000>, - <0x0 0x3c000 0x0 0x1000>; - reg-names = "hdmitx", "hhi"; -}; diff --git a/arch/arm/dts/meson-g12a-u200-u-boot.dtsi b/arch/arm/dts/meson-g12a-u200-u-boot.dtsi index fddffd628c..236f2468dc 100644 --- a/arch/arm/dts/meson-g12a-u200-u-boot.dtsi +++ b/arch/arm/dts/meson-g12a-u200-u-boot.dtsi @@ -4,4 +4,4 @@ * Author: Neil Armstrong */ -#include "meson-g12a-u-boot.dtsi" +#include "meson-g12-common-u-boot.dtsi" diff --git a/arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi b/arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi index fddffd628c..236f2468dc 100644 --- a/arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi @@ -4,4 +4,4 @@ * Author: Neil Armstrong */ -#include "meson-g12a-u-boot.dtsi" +#include "meson-g12-common-u-boot.dtsi" diff --git a/arch/arm/dts/meson-sm1-sei610-u-boot.dtsi b/arch/arm/dts/meson-sm1-sei610-u-boot.dtsi new file mode 100644 index 0000000000..236f2468dc --- /dev/null +++ b/arch/arm/dts/meson-sm1-sei610-u-boot.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 BayLibre, SAS. + * Author: Neil Armstrong + */ + +#include "meson-g12-common-u-boot.dtsi" -- cgit v1.2.3