spi: Add Atmel QuadSPI driver
Subsystems (3)
v5 cover spi: Add Atmel QuadSPI driver
From: Tudor Ambarus <[email protected]>
Backport the driver from linux v5.1-rc5 and adapt it for u-boot. Tested on sama5d2_xplained Rev B with mx25l25635e spi-nor flash, and on sama5d27_som1_ek with sst26vf064b spi-nor flash.
V5: drop struct platform_device *pdev; linux leftover, add 2 new blank lines
v4: Update Kconfig description
v3: fix following config warnings reported by travis:./tools/genboardscfg.py
WARNING: no status info for 'sama5d2_xplained_qspiflash'
WARNING: no maintainers for 'sama5d2_xplained_qspiflash'
WARNING: no status info for 'sama5d27_som1_ek_qspiflash'
WARNING: no maintainers for 'sama5d27_som1_ek_qspiflash'
v2: update/add configs and update sama5d2_xplained dts
Cyrille Pitchen (2):
ARM: dts: at91: sama5d2_xplained: fix QSPI0 node
ARM: at91: sama5: add common environment for QSPI
Eugen Hristev (1):
configs: sama5d2_xplained: add support QSPI flash boot
Tudor Ambarus (7):
dt-bindings: spi: add bindings for Atmel QSPI driver
spi: Add Atmel QuadSPI driver
configs: sama5d2_xplained: enable qspi controller and flashes
configs: sama5d27_som1_ek: enable qspi controller and flashes
configs: sama5d2_xplained: add qspiflash_defconfig
configs: sama5d27_som1_ek: add qspiflash_defconfig
configs: sama5d27_som1_ek: qspi: use common memory layout
arch/arm/dts/at91-sama5d2_xplained.dts | 36 +- board/atmel/sama5d27_som1_ek/MAINTAINERS | 1 + board/atmel/sama5d2_xplained/MAINTAINERS | 1 + configs/sama5d27_som1_ek_mmc1_defconfig | 2 + configs/sama5d27_som1_ek_mmc_defconfig | 2 + configs/sama5d27_som1_ek_qspiflash_defconfig | 101 +++++ configs/sama5d2_xplained_emmc_defconfig | 5 + configs/sama5d2_xplained_mmc_defconfig | 5 + configs/sama5d2_xplained_qspiflash_defconfig | 101 +++++ configs/sama5d2_xplained_spiflash_defconfig | 5 + doc/device-tree-bindings/spi/atmel-quadspi.txt | 37 ++ drivers/spi/Kconfig | 8 + drivers/spi/Makefile | 1 + drivers/spi/atmel-quadspi.c | 536 +++++++++++++++++++++++++ include/configs/at91-sama5_common.h | 8 + include/configs/sama5d27_som1_ek.h | 7 - include/configs/sama5d2_xplained.h | 11 + 17 files changed, 841 insertions(+), 26 deletions(-) create mode 100644 configs/sama5d27_som1_ek_qspiflash_defconfig create mode 100644 configs/sama5d2_xplained_qspiflash_defconfig create mode 100644 doc/device-tree-bindings/spi/atmel-quadspi.txt create mode 100644 drivers/spi/atmel-quadspi.c
Signature · 1 line
2.9.5
PATCH v5 1/10 dt-bindings: spi: add bindings for Atmel QSPI driver
From: Tudor Ambarus <[email protected]>
Describe the DT bindings for the driver of the Atmel QSPI controller. Taken form linux v5.1-rc5.
---
v5: no change
v4: no change
v3: no change
v2: no change
doc/device-tree-bindings/spi/atmel-quadspi.txt | 37 ++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 doc/device-tree-bindings/spi/atmel-quadspi.txt
doc/device-tree-bindings/spi/atmel-quadspi.txt new file +37 -0
@@ -0,0 +1,37 @@ +* Atmel Quad Serial Peripheral Interface (QSPI) + +Required properties: +- compatible: Should be one of the following: + - "atmel,sama5d2-qspi" + - "microchip,sam9x60-qspi" +- reg: Should contain the locations and lengths of the base registers + and the mapped memory. +- reg-names: Should contain the resource reg names: + - qspi_base: configuration register address space + - qspi_mmap: memory mapped address space +- interrupts: Should contain the interrupt for the device. +- clocks: Should reference the peripheral clock and the QSPI system + clock if available. +- clock-names: Should contain "pclk" for the peripheral clock and "qspick" + for the system clock when available. +- #address-cells: Should be <1>. +- #size-cells: Should be <0>. + +Example: + +spi at f0020000 { + compatible = "atmel,sama5d2-qspi"; + reg = <0xf0020000 0x100>, <0xd0000000 0x8000000>; + reg-names = "qspi_base", "qspi_mmap"; + interrupts = <52 IRQ_TYPE_LEVEL_HIGH 7>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 52>; + clock-names = "pclk"; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi0_default>; + + m25p80 at 0 { + ... + }; +};
Signature · 1 line
2.9.5
PATCH v5 1/10 dt-bindings: spi: add bindings for Atmel QSPI driver
Quoted 13 lines · On Tue, Jun 18, 2019 at 2:21 PM <[email protected]> wrote:
From: Tudor Ambarus <[email protected]>
Describe the DT bindings for the driver of the Atmel QSPI controller. Taken form linux v5.1-rc5.
Signed-off-by Tudor Ambarus <[email protected]>---
v5: no change
v4: no change
v3: no change
v2: no change
Quoted 3 lines
doc/device-tree-bindings/spi/atmel-quadspi.txt | 37 ++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 doc/device-tree-bindings/spi/atmel-quadspi.txt
We are no particular about bindings, atleast I don't based on my experience since the driver bindings remain the same like Linux. So I would recommend this to keep drop from the series or may be pick it up if we have any conclusive evidence for the usage.
PATCH v5 2/10 spi: Add Atmel QuadSPI driver
In reply to Tudor.Ambarus at microchip.comFrom: Tudor Ambarus <[email protected]>
Backport the driver from linux v5.1-rc5 and adapt it for u-boot. Tested on sama5d2_xplained Rev B with mx25l25635e spi-nor flash.
---
v5: drop struct platform_device *pdev; linux leftover, 2 new blank lines
v4: update Kconfig description
v3: no change
v2: no change
drivers/spi/Kconfig | 8 + drivers/spi/Makefile | 1 + drivers/spi/atmel-quadspi.c | 536 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 545 insertions(+) create mode 100644 drivers/spi/atmel-quadspi.c
drivers/spi/Kconfig +8 -0
@@ -49,6 +49,14 @@ config ATH79_SPI uses driver model and requires a device tree binding to operate. please refer to doc/device-tree-bindings/spi/spi-ath79.txt. +config ATMEL_QSPI + bool "Atmel Quad SPI Controller" + depends on ARCH_AT91 + help + Enable the Atmel Quad SPI controller in master mode. This driver + does not support generic SPI. The implementation supports only the + spi-mem interface. + config ATMEL_SPI bool "Atmel SPI driver" default y if ARCH_AT91
drivers/spi/Makefile +1 -0
@@ -18,6 +18,7 @@ endif obj-$(CONFIG_ALTERA_SPI) += altera_spi.o obj-$(CONFIG_ATH79_SPI) += ath79_spi.o +obj-$(CONFIG_ATMEL_QSPI) += atmel-quadspi.o obj-$(CONFIG_ATMEL_SPI) += atmel_spi.o obj-$(CONFIG_BCM63XX_HSSPI) += bcm63xx_hsspi.o obj-$(CONFIG_BCM63XX_SPI) += bcm63xx_spi.o
drivers/spi/atmel-quadspi.c new file +536 -0
536 lines not on this page · raw message
Signature · 1 line
2.9.5
PATCH v5 2/10 spi: Add Atmel QuadSPI driver
Quoted 8 lines · On Tue, Jun 18, 2019 at 2:21 PM <[email protected]> wrote:
From: Tudor Ambarus <[email protected]>
Backport the driver from linux v5.1-rc5 and adapt it for u-boot. Tested on
sama5d2_xplainedRev B with mx25l25635e spi-nor flash.Signed-off-by Tudor Ambarus <[email protected]>---
PATCH v5 3/10 configs: sama5d2_xplained: enable qspi controller and flashes
In reply to Tudor.Ambarus at microchip.comFrom: Tudor Ambarus <[email protected]>
We have a macronix spi-nor flash on sama5d2_xplained RevB and a sst spi-nor flash on RevC. Select the rest for testing purposes.
---
v5: no change
v4: no change
v3: no change
v2: new patch
configs/sama5d2_xplained_emmc_defconfig | 5 +++++ configs/sama5d2_xplained_mmc_defconfig | 5 +++++ configs/sama5d2_xplained_spiflash_defconfig | 5 +++++ 3 files changed, 15 insertions(+)
configs/sama5d2_xplained_emmc_defconfig +5 -0
@@ -65,6 +65,10 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=30000000 CONFIG_SPI_FLASH_ATMEL=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_SST=y CONFIG_DM_ETH=y CONFIG_MACB=y CONFIG_PINCTRL=y
@@ -76,6 +80,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_ATMEL_QSPI=y CONFIG_TIMER=y CONFIG_SPL_TIMER=y CONFIG_ATMEL_PIT_TIMER=y
configs/sama5d2_xplained_mmc_defconfig +5 -0
@@ -67,6 +67,10 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=30000000 CONFIG_SPI_FLASH_ATMEL=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_SST=y CONFIG_DM_ETH=y CONFIG_MACB=y CONFIG_PINCTRL=y
@@ -78,6 +82,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_ATMEL_QSPI=y CONFIG_TIMER=y CONFIG_SPL_TIMER=y CONFIG_ATMEL_PIT_TIMER=y
configs/sama5d2_xplained_spiflash_defconfig +5 -0
@@ -64,6 +64,10 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=30000000 CONFIG_SPI_FLASH_ATMEL=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_SST=y CONFIG_DM_ETH=y CONFIG_MACB=y CONFIG_PINCTRL=y
@@ -75,6 +79,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_ATMEL_QSPI=y CONFIG_TIMER=y CONFIG_SPL_TIMER=y CONFIG_ATMEL_PIT_TIMER=y
Signature · 1 line
2.9.5
PATCH v5 3/10 configs: sama5d2_xplained: enable qspi controller and flashes
Quoted 13 lines · On Tue, Jun 18, 2019 at 2:21 PM <[email protected]> wrote:
From: Tudor Ambarus <[email protected]>
We have a macronix spi-nor flash on
sama5d2_xplainedRevB and a sst spi-nor flash on RevC. Select the rest for testing purposes.Signed-off-by Tudor Ambarus <[email protected]>---
v5: no change
v4: no change
v3: no change
v2: new patch
Quoted 4 lines
configs/sama5d2_xplained_emmc_defconfig | 5 +++++ configs/sama5d2_xplained_mmc_defconfig | 5 +++++ configs/sama5d2_xplained_spiflash_defconfig | 5 +++++ 3 files changed, 15 insertions(+)
PATCH v5 4/10 configs: sama5d27_som1_ek: enable qspi controller and flashes
In reply to Tudor.Ambarus at microchip.comFrom: Tudor Ambarus <[email protected]>
We use a sst spi-nor flash memory on sama5d27_som1_ek. Select the others for testing purposes.
---
v5: no change
v4: no change
v3: no change
v2: new patch
configs/sama5d27_som1_ek_mmc1_defconfig | 2 ++ configs/sama5d27_som1_ek_mmc_defconfig | 2 ++ 2 files changed, 4 insertions(+)
configs/sama5d27_som1_ek_mmc1_defconfig +2 -0
@@ -67,6 +67,7 @@ CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=66000000 CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_DM_ETH=y
@@ -80,6 +81,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_ATMEL_QSPI=y CONFIG_TIMER=y CONFIG_SPL_TIMER=y CONFIG_ATMEL_PIT_TIMER=y
configs/sama5d27_som1_ek_mmc_defconfig +2 -0
@@ -67,6 +67,7 @@ CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=66000000 CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_DM_ETH=y
@@ -80,6 +81,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_ATMEL_QSPI=y CONFIG_TIMER=y CONFIG_SPL_TIMER=y CONFIG_ATMEL_PIT_TIMER=y
Signature · 1 line
2.9.5
PATCH v5 4/10 configs: sama5d27_som1_ek: enable qspi controller and flashes
Quoted 13 lines · On Tue, Jun 18, 2019 at 2:22 PM <[email protected]> wrote:
From: Tudor Ambarus <[email protected]>
We use a sst spi-nor flash memory on
sama5d27_som1_ek. Select the others for testing purposes.Signed-off-by Tudor Ambarus <[email protected]>---
v5: no change
v4: no change
v3: no change
v2: new patch
Quoted 3 lines
configs/sama5d27_som1_ek_mmc1_defconfig | 2 ++ configs/sama5d27_som1_ek_mmc_defconfig | 2 ++ 2 files changed, 4 insertions(+)
PATCH v5 5/10 ARM: dts: at91: sama5d2_xplained: fix QSPI0 node
In reply to Tudor.Ambarus at microchip.comFrom: Cyrille Pitchen <[email protected]>
Fix the following:
- use "jedec,spi-nor" binding, we use jedec compatible flashes
- set bus width to 4, we use quad capable flashes
- differentiate bewteen data and clk and cs pins
- drop partions as we don't use them in u-boot.
---
v5: no change
v4: no change
v3: no change
v2: new patch
arch/arm/dts/at91-sama5d2_xplained.dts | 36 ++++++++++++++++------------------ 1 file changed, 17 insertions(+), 19 deletions(-)
arch/arm/dts/at91-sama5d2_xplained.dts +17 -19
@@ -79,26 +79,18 @@ }; qspi0: spi at f0020000 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_qspi0_sck_cs_default &pinctrl_qspi0_dat_default>; status = "okay"; + u-boot,dm-pre-reloc; flash at 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 at 00000000 { - label = "boot"; - reg = <0x00000000 0x00c00000>; - }; - - partition at 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 {
Signature · 1 line
2.9.5
PATCH v5 5/10 ARM: dts: at91: sama5d2_xplained: fix QSPI0 node
Quoted 26 lines · On Tue, Jun 18, 2019 at 2:22 PM <[email protected]> wrote:
From: Cyrille Pitchen <[email protected]>
Fix the following:
- use "jedec,spi-nor" binding, we use jedec compatible flashes
- set bus width to 4, we use quad capable flashes
- differentiate bewteen data and clk and cs pins
- drop partions as we don't use them in u-boot.Signed-off-by Cyrille Pitchen <[email protected]>[tudor.ambarus at microchip.com: use "jedec,spi-nor", edit commit message]Signed-off-by Tudor Ambarus <[email protected]>---
v5: no change
v4: no change
v3: no change
v2: new patcharch/arm/dts/at91-sama5d2_xplained.dts | 36 ++++++++++++++++------------------ 1 file changed, 17 insertions(+), 19 deletions(-)arch/arm/dts/at91-sama5d2_xplained.dts +0
-0
arch/arm/dts/at91-sama5d2_xplained.dts line 85
Quoted 7 lines
arch/arm/dts/at91-sama5d2_xplained.dts +3
-0@@ -79,26 +79,18 @@ }; qspi0: spi at f0020000 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_qspi0_sck_cs_default &pinctrl_qspi0_dat_default>; status = "okay"; + u-boot,dm-pre-reloc;
I always believe, keeping period sync of DTS changes from linux rather than minimal or required changes when it needed. it is up to Eugen to make decision here.
Jagan.
PATCH v5 6/10 ARM: at91: sama5: add common environment for QSPI
In reply to Tudor.Ambarus at microchip.comFrom: Cyrille Pitchen <[email protected]>
Use the same memory layout as we use for the NAND boot on the other boards.
QSPI flashes are present on the following boards:
sama5d2_xplained RevB: 32 Mbyte flash (mx25l3273fm2i-08g) sama5d2_xplained RevC: 8 Mbyte flash (sst26vf064b-104i/sn) sama5d27_som1_ek: 8 Mbyte flash (sst26vf064b-104i/sn) sama5d2_ptc_ek: 8 Mbyte flash (sst26vf064b-104i/sn)
The 8 Mbyte limit is enough to cope with the memory layout used in the NAND boot. rootfs exceeds the 8 Mbyte limit and will stay in eMMC in the sama5d2_xplained case. The final scope is to use a single memory layout for all boot medias.
---
v5: no change
v4: no change
v3: no change
v2: new patch
include/configs/at91-sama5_common.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/configs/at91-sama5_common.h +8 -0
@@ -72,6 +72,14 @@"sf read 0x21000000 0x60000 0xc000; " \"sf read 0x22000000 0x6c000 0x394000; " \ "bootz 0x22000000 - 0x21000000" +#elif CONFIG_QSPI_BOOT +#define CONFIG_ENV_OFFSET 0x140000 +#define CONFIG_ENV_SIZE 0x20000 +#define CONFIG_ENV_SECT_SIZE 0x1000 +#define CONFIG_BOOTCOMMAND "sf probe 0; " \ + "sf read 0x21000000 0x180000 0x80000; " \ + "sf read 0x22000000 0x200000 0x600000; " \ + "bootz 0x22000000 - 0x21000000"#endif #endif
Signature · 1 line
2.9.5
PATCH v5 7/10 configs: sama5d2_xplained: add qspiflash_defconfig
In reply to Tudor.Ambarus at microchip.comFrom: Tudor Ambarus <[email protected]>
Add the default config file of QSPI media. The config is based on sama5d2_xplained_mmc_defconfig.
---
v5: no change
v4: no change
v3: fix the following:./tools/genboardscfg.py
WARNING: no status info for 'sama5d2_xplained_qspiflash'
WARNING: no maintainers for 'sama5d2_xplained_qspiflash'
v2: new patch
board/atmel/sama5d2_xplained/MAINTAINERS | 1 + configs/sama5d2_xplained_qspiflash_defconfig | 101 +++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 configs/sama5d2_xplained_qspiflash_defconfig
board/atmel/sama5d2_xplained/MAINTAINERS +1 -0
@@ -6,3 +6,4 @@ F: include/configs/sama5d2_xplained.h F: configs/sama5d2_xplained_mmc_defconfig F: configs/sama5d2_xplained_spiflash_defconfig F: configs/sama5d2_xplained_emmc_defconfig +F: configs/sama5d2_xplained_qspiflash_defconfig
configs/sama5d2_xplained_qspiflash_defconfig new file +101 -0
101 lines not on this page · raw message
Signature · 1 line
2.9.5
PATCH v5 7/10 configs: sama5d2_xplained: add qspiflash_defconfig
Quoted 8 lines · On Tue, Jun 18, 2019 at 2:22 PM <[email protected]> wrote:
From: Tudor Ambarus <[email protected]>
Add the default config file of QSPI media. The config is based on
sama5d2_xplained_mmc_defconfig.Signed-off-by Tudor Ambarus <[email protected]>---
Quoted 13 lines · On Tue, Jun 18, 2019 at 2:22 PM <[email protected]> wrote:
From: Tudor Ambarus <[email protected]>
We use a sst spi-nor flash memory on
sama5d27_som1_ek. Select the others for testing purposes.Signed-off-by Tudor Ambarus <[email protected]>---
v5: no change
v4: no change
v3: no change
v2: new patch
Quoted 3 lines
configs/sama5d27_som1_ek_mmc1_defconfig | 2 ++ configs/sama5d27_som1_ek_mmc_defconfig | 2 ++ 2 files changed, 4 insertions(+)
PATCH v5 8/10 configs: sama5d27_som1_ek: add qspiflash_defconfig
In reply to Tudor.Ambarus at microchip.comFrom: Tudor Ambarus <[email protected]>
Add the default config file of QSPI media. The config is based on sama5d27_som1_ek_mmc_defconfig.
---
v5: no change
v4: no change
v3: fix the following:./tools/genboardscfg.py
WARNING: no status info for 'sama5d27_som1_ek_qspiflash'
WARNING: no maintainers for 'sama5d27_som1_ek_qspiflash'
v2: new patch
board/atmel/sama5d27_som1_ek/MAINTAINERS | 1 + configs/sama5d27_som1_ek_qspiflash_defconfig | 101 +++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 configs/sama5d27_som1_ek_qspiflash_defconfig
board/atmel/sama5d27_som1_ek/MAINTAINERS +1 -0
@@ -5,3 +5,4 @@ F: board/atmel/sama5d27_som1_ek/ F: include/configs/sama5d27_som1_ek.h F: configs/sama5d27_som1_ek_mmc_defconfig F: configs/sama5d27_som1_ek_mmc1_defconfig +F: configs/sama5d27_som1_ek_qspiflash_defconfig
configs/sama5d27_som1_ek_qspiflash_defconfig new file +101 -0
101 lines not on this page · raw message
Signature · 1 line
2.9.5
PATCH v5 8/10 configs: sama5d27_som1_ek: add qspiflash_defconfig
Quoted 7 lines · On Tue, Jun 18, 2019 at 2:22 PM <[email protected]> wrote:
From: Tudor Ambarus <[email protected]>
Add the default config file of QSPI media. The config is based on
sama5d27_som1_ek_mmc_defconfig.Signed-off-by Tudor Ambarus <[email protected]>
Quoted 8 lines
---
v5: no change
v4: no change
v3: fix the following:./tools/genboardscfg.py
WARNING: no status info for 'sama5d27_som1_ek_qspiflash'
WARNING: no maintainers for 'sama5d27_som1_ek_qspiflash'
v2: new patch
PATCH v5 9/10 configs: sama5d27_som1_ek: qspi: use common memory layout
In reply to Tudor.Ambarus at microchip.comFrom: Tudor Ambarus <[email protected]>
Use the qspi memory layout defined in at91-sama5_common - it aligns with the 8 Mbyte flash (sst26vf064b-104i/sn) available in sama5d27_som1_ek.
---
v5: no change
v4: no change
v3: no change
v2: new patch
include/configs/sama5d27_som1_ek.h | 7 ------- 1 file changed, 7 deletions(-)
include/configs/sama5d27_som1_ek.h +0 -7
@@ -43,13 +43,6 @@#endif #ifdef CONFIG_QSPI_BOOT -#define CONFIG_ENV_OFFSET 0xb0000 -#define CONFIG_ENV_SIZE 0x10000 -#define CONFIG_ENV_SECT_SIZE 0x10000 -#define CONFIG_BOOTCOMMAND "sf probe 0; " \ - "sf read 0x21000000 0xc0000 0x20000; " \ - "sf read 0x22000000 0xe0000 0x400000; " \ - "bootz 0x22000000 - 0x21000000"#undef CONFIG_BOOTARGS#define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
Signature · 1 line
2.9.5
PATCH v5 10/10 configs: sama5d2_xplained: add support QSPI flash boot
In reply to Tudor.Ambarus at microchip.comFrom: Eugen Hristev <[email protected]>
The spi-nor flash resides on spi bus 1. Update the CONFIG_ENV_SPI_CS and CONFIG_BOOTCOMMAND accordingly.
Based on original work by Wenyou Yang.
---
v5: no change
v4: no change
v3: no change
v2: new patch
include/configs/sama5d2_xplained.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
include/configs/sama5d2_xplained.h +11 -0
@@ -46,6 +46,17 @@#endif +#ifdef CONFIG_QSPI_BOOT +#undef CONFIG_ENV_SPI_BUS +#undef CONFIG_BOOTCOMMAND +#define CONFIG_ENV_SPI_BUS 1 +#define CONFIG_BOOTCOMMAND "sf probe 1:0; " \ + "sf read 0x21000000 0x180000 0x80000; " \ + "sf read 0x22000000 0x200000 0x600000; "\ + "bootz 0x22000000 - 0x21000000" + +#endif +/* SPL */ #define CONFIG_SPL_MAX_SIZE 0x10000#define CONFIG_SPL_BSS_START_ADDR 0x20000000
Signature · 1 line
2.9.5
v5 cover spi: Add Atmel QuadSPI driver
In reply to Tudor.Ambarus at microchip.comHello Jagan,
I can only take these patches through u-boot-atmel tree if you Ack/Review them.
Otherwise you can consider taking them through u-boot-spi ?
Thanks,
Eugen
Quoted 59 lines · On 18.06.2019 11:51, Tudor Ambarus - M18064 wrote:
From: Tudor Ambarus <[email protected]>
Backport the driver from linux v5.1-rc5 and adapt it for u-boot. Tested on
sama5d2_xplainedRev B with mx25l25635e spi-nor flash, and onsama5d27_som1_ekwith sst26vf064b spi-nor flash.V5: drop struct
platform_device*pdev; linux leftover, add 2 new blank linesv4: Update
Kconfigdescriptionv3: fix following config warnings reported by travis:
./tools/genboardscfg.py
WARNING: no status info for 'sama5d2_xplained_qspiflash'
WARNING: no maintainers for 'sama5d2_xplained_qspiflash'
WARNING: no status info for 'sama5d27_som1_ek_qspiflash'
WARNING: no maintainers for 'sama5d27_som1_ek_qspiflash'v2: update/add configs and update
sama5d2_xplaineddtsCyrille Pitchen (2):
ARM: dts: at91:sama5d2_xplained: fix QSPI0 node
ARM: at91: sama5: add common environment for QSPIEugen Hristev (1):
configs:sama5d2_xplained: add support QSPI flash bootTudor Ambarus (7):
dt-bindings: spi: add bindings for Atmel QSPI driver
spi: Add Atmel QuadSPI driver
configs:sama5d2_xplained: enable qspi controller and flashes
configs:sama5d27_som1_ek: enable qspi controller and flashes
configs:sama5d2_xplained: addqspiflash_defconfig
configs:sama5d27_som1_ek: addqspiflash_defconfig
configs:sama5d27_som1_ek: qspi: use common memory layoutarch/arm/dts/at91-sama5d2_xplained.dts | 36 +- board/atmel/sama5d27_som1_ek/MAINTAINERS | 1 + board/atmel/sama5d2_xplained/MAINTAINERS | 1 + configs/sama5d27_som1_ek_mmc1_defconfig | 2 + configs/sama5d27_som1_ek_mmc_defconfig | 2 + configs/sama5d27_som1_ek_qspiflash_defconfig | 101 +++++ configs/sama5d2_xplained_emmc_defconfig | 5 + configs/sama5d2_xplained_mmc_defconfig | 5 + configs/sama5d2_xplained_qspiflash_defconfig | 101 +++++ configs/sama5d2_xplained_spiflash_defconfig | 5 + doc/device-tree-bindings/spi/atmel-quadspi.txt | 37 ++ drivers/spi/Kconfig | 8 + drivers/spi/Makefile | 1 + drivers/spi/atmel-quadspi.c | 536 +++++++++++++++++++++++++ include/configs/at91-sama5_common.h | 8 + include/configs/sama5d27_som1_ek.h | 7 - include/configs/sama5d2_xplained.h | 11 + 17 files changed, 841 insertions(+), 26 deletions(-)create mode 100644 configs/sama5d27_som1_ek_qspiflash_defconfig create mode 100644 configs/sama5d2_xplained_qspiflash_defconfig create mode 100644
doc/device-tree-bindings/spi/atmel-quadspi.txtcreate mode 100644drivers/spi/atmel-quadspi.c
v5 cover spi: Add Atmel QuadSPI driver
Quoted 6 lines · On Tue, Jun 25, 2019 at 5:05 PM <[email protected]> wrote:
Hello Jagan,
I can only take these patches through u-boot-atmel tree if you Ack/Review them.
Otherwise you can consider taking them through u-boot-spi ?
I would need a look on the new version, once ie fine I can pick via spi tree. if possible please assign me on the patchwork, thanks.
v5 cover spi: Add Atmel QuadSPI driver
Hi Eugen,
Quoted 11 lines · Jagan Teki
Quoted 6 lines · On Tue, Jun 25, 2019 at 5:05 PM <[email protected]> wrote:
Hello Jagan,
I can only take these patches through u-boot-atmel tree if you Ack/Review them.
Otherwise you can consider taking them through u-boot-spi ?I would need a look on the new version, once ie fine I can pick via spi tree. if possible please assign me on the patchwork, thanks.
I have marked my comments, you can make the decision accordingly. By the way I assigned them to you as well, thanks.
Jagan.
v5 cover spi: Add Atmel QuadSPI driver
Quoted 12 lines · Jagan Teki
Hi Eugen,
Quoted 9 lines · Jagan Teki
Quoted 6 lines · On Tue, Jun 25, 2019 at 5:05 PM <[email protected]> wrote:
Hello Jagan,
I can only take these patches through u-boot-atmel tree if you Ack/Review them.
Otherwise you can consider taking them through u-boot-spi ?
Quoted 8 lines
Quoted 2 lines
I would need a look on the new version, once ie fine I can pick via spi tree. if possible please assign me on the patchwork, thanks.
I have marked my comments, you can make the decision accordingly. By the way I assigned them to you as well, thanks.
Jagan.
Applied patches 2-10 to u-boot-atmel/next Dropped patch 1 (dt-bindings) as advised by Jagan. Will be queued for 2019.10 merge window.
Thanks Tudor and Jagan !
Eugen