diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-17 08:10:08 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-17 08:10:08 +0200 |
| commit | 2817ad889bafa33883031df4461ffb6339369bce (patch) | |
| tree | 4c054eb47a7178d0d08e404195aa31b2b41eb455 /arch/arm/dts | |
| parent | 41c344979d5d0484dfc0d50ab029d0673b7cd8e7 (diff) | |
| parent | 8bfb1852cf6ad9b2193bc7d0dbdae67e0553361a (diff) | |
| download | barebox-2817ad889bafa33883031df4461ffb6339369bce.tar.gz barebox-2817ad889bafa33883031df4461ffb6339369bce.tar.xz | |
Merge branch 'for-next/at91'
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/dts/at91-sama5d27_som1_ek.dts | 36 | ||||
| -rw-r--r-- | arch/arm/dts/at91sam9x5ek.dts | 19 | ||||
| -rw-r--r-- | arch/arm/dts/sama5d2.dtsi | 0 |
4 files changed, 44 insertions, 12 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 8cb8467b49..bffcfad018 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -134,6 +134,7 @@ lwl-dtb-$(CONFIG_MACH_ZII_VF610_DEV) += \ vf610-zii-ssmb-dtu.dtb.o lwl-dtb-$(CONFIG_MACH_AT91SAM9263EK_DT) += at91sam9263ek.dtb.o lwl-dtb-$(CONFIG_MACH_MICROCHIP_KSZ9477_EVB) += at91-microchip-ksz9477-evb.dtb.o +lwl-dtb-$(CONFIG_MACH_SAMA5D27_SOM1) += at91-sama5d27_som1_ek.dtb.o lwl-dtb-$(CONFIG_MACH_AT91SAM9X5EK) += at91sam9x5ek.dtb.o lwl-dtb-$(CONFIG_MACH_XILINX_ZCU104) += zynqmp-zcu104-revA.dtb.o diff --git a/arch/arm/dts/at91-sama5d27_som1_ek.dts b/arch/arm/dts/at91-sama5d27_som1_ek.dts new file mode 100644 index 0000000000..936f07eac4 --- /dev/null +++ b/arch/arm/dts/at91-sama5d27_som1_ek.dts @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 +/* + * Copyright (C) 2019 Oleksij Rempel - Pengutronix + */ + +#include <arm/at91-sama5d27_som1_ek.dts> + +/ { + chosen { + environment { + compatible = "barebox,environment"; + device-path = &barebox_env; + }; + }; + + memory { + reg = <0x20000000 0x8000000>; + }; +}; + +&qspi1 { + flash@0 { + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "barebox"; + reg = <0x0 0x80000>; + }; + + barebox_env: partition@80000 { + label = "barebox-environment"; + reg = <0x80000 0x80000>; + }; + }; +}; diff --git a/arch/arm/dts/at91sam9x5ek.dts b/arch/arm/dts/at91sam9x5ek.dts index d5c7a8fe5c..bc2a279709 100644 --- a/arch/arm/dts/at91sam9x5ek.dts +++ b/arch/arm/dts/at91sam9x5ek.dts @@ -19,18 +19,6 @@ status = "okay"; }; - ahb { - apb { - pinctrl@fffff400 { - spi { - pinctrl_board_spi: spi-board { - atmel,pins = <AT91_PIOA 14 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; - }; - }; - }; - }; - }; - leds { /* * PB18 has a resource conflict since it is both used @@ -68,3 +56,10 @@ phy-mode = "rmii"; }; +&{/ahb/apb/pinctrl@fffff400} { + spi0 { + pinctrl_board_spi: spi-board { + atmel,pins = <AT91_PIOA 14 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; + }; + }; +}; diff --git a/arch/arm/dts/sama5d2.dtsi b/arch/arm/dts/sama5d2.dtsi new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/arch/arm/dts/sama5d2.dtsi |