diff options
| author | Tom Rini | 2019-07-09 08:16:50 -0400 |
|---|---|---|
| committer | Tom Rini | 2019-07-09 08:17:12 -0400 |
| commit | b4944e25744aa42dc23c6912e1cd4ccad270c4e0 (patch) | |
| tree | 6b5045e5054113ea4f66b8c0c5caeac76c691354 /arch | |
| parent | cad28d37d5146cf293fe841c7c8e6f658c8a4940 (diff) | |
| parent | 5dd4fa7fadf5a2cea130b6ab650e3982c5084f52 (diff) | |
Merge tag 'u-boot-atmel-2019.10-a' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmel
First set of u-boot-atmel features and fixes for 2019.10 cycle
This includes the Atmel QSPI driver and support for the at91 boards.
This is the port of the driver from Linux, mostly done by Tudor Ambarus.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/at91-sama5d2_xplained.dts | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/arch/arm/dts/at91-sama5d2_xplained.dts b/arch/arm/dts/at91-sama5d2_xplained.dts index c0708feeb7b..7f0d1696ba3 100644 --- a/arch/arm/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/dts/at91-sama5d2_xplained.dts @@ -79,26 +79,18 @@ }; qspi0: spi@f0020000 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_qspi0_sck_cs_default &pinctrl_qspi0_dat_default>; status = "okay"; + u-boot,dm-pre-reloc; flash@0 { - compatible = "atmel,sama5d2-qspi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; - #address-cells = <1>; - #size-cells = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_qspi0_default>; spi-max-frequency = <83000000>; - - partition@00000000 { - label = "boot"; - reg = <0x00000000 0x00c00000>; - }; - - partition@00c00000 { - label = "rootfs"; - reg = <0x00c00000 0x00000000>; - }; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <4>; + u-boot,dm-pre-reloc; }; }; @@ -208,14 +200,20 @@ bias-disable; }; - pinctrl_qspi0_default: qspi0_default { + pinctrl_qspi0_sck_cs_default: qspi0_sck_cs_default { pinmux = <PIN_PA22__QSPI0_SCK>, - <PIN_PA23__QSPI0_CS>, - <PIN_PA24__QSPI0_IO0>, + <PIN_PA23__QSPI0_CS>; + bias-disable; + u-boot,dm-pre-reloc; + }; + + pinctrl_qspi0_dat_default: qspi0_dat_default { + pinmux = <PIN_PA24__QSPI0_IO0>, <PIN_PA25__QSPI0_IO1>, <PIN_PA26__QSPI0_IO2>, <PIN_PA27__QSPI0_IO3>; - bias-disable; + bias-pull-up; + u-boot,dm-pre-reloc; }; pinctrl_sdmmc0_cmd_dat_default: sdmmc0_cmd_dat_default { |