sunxi: SPL SPI booting: Enable R40 and H6 SoCs
Subsystems (3)
cover sunxi: SPL SPI booting: Enable R40 and H6 SoCs
This series enables the SPI booting feature for Allwinner R40 and H6 SoCs. To achieve this, we enable our spl_spi_sunxi.c driver to deal with those two SoCs. The R40 is pretty straightforward, as it just needs its base address adjusted. This is prepared in patch 2/6 and finalised in patch 4/6.
For the H6, on top of yet another different base address, the new clocks and slightly different pinmux setup need to be cared for. Patch 3/6 and 5/6 take care of that.
Patch 6/6 enables this feature for the Pine H64 board, which comes with soldered SPI flash.
Patch 1/6 deals with some annoyance in enabling SPI boot on new boards.
This has been tested on the Pine H64 board and a Bananapi M2 Berry (with SPI flash connected to the SPI0-PortC header pins). For the existing SPI boot platforms this does not change the code size, as the toolchain is clever enough to optimise this properly.
There is a similar series to enable SPI support for the sunxi-fel tool, which was used to test this. I will post this ASAP.
Cheers,
Andre.
Andre Przywara (6):
sunxi: move CONFIG_SYS_SPI_U_BOOT_OFFS out of defconfig
sunxi: SPL SPI: Split off SPI0 base address
sunxi: SPL SPI: Introduce is_new_gen_spi()
sunxi: SPL SPI: Add SPI boot support for the Allwinner R40 SoC
sunxi: SPL SPI: Add SPI boot support for the Allwinner H6 SoC
sunxi: Pine H64: Enable SPI booting in defconfig
arch/arm/mach-sunxi/Kconfig | 2 +- arch/arm/mach-sunxi/spl_spi_sunxi.c | 153 +++++++++++++++++++---------- common/spl/Kconfig | 1 + configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 - configs/oceanic_5205_5inmfd_defconfig | 1 - configs/orangepi_pc2_defconfig | 1 - configs/orangepi_r1_defconfig | 1 - configs/orangepi_win_defconfig | 1 - configs/orangepi_zero_defconfig | 1 - configs/pine64-lts_defconfig | 1 - configs/pine_h64_defconfig | 1 + configs/sopine_baseboard_defconfig | 1 - 12 files changed, 102 insertions(+), 63 deletions(-)
Signature · 1 line
2.14.5
PATCH 1/6 sunxi: move CONFIG_SYS_SPI_U_BOOT_OFFS out of defconfig
For Allwinner SoCs the CONFIG_SYS_SPI_U_BOOT_OFFS value is not really a board choice: The boot ROM only loads the SPL from offset 0 of the SPI NOR flash, and loads at most 32KB. This is a similar situation as on MMC, so consequently we create our "joint" image (SPL + U-Boot proper) with that 32KB offset during the build.
So define the value of this symbol to be 32KB by default for every Allwinner SoC. This removes the definition of this symbol from the _defconfig files, and avoids every board to define this over and over again.
--- common/spl/Kconfig | 1 + configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 - configs/oceanic_5205_5inmfd_defconfig | 1 - configs/orangepi_pc2_defconfig | 1 - configs/orangepi_r1_defconfig | 1 - configs/orangepi_win_defconfig | 1 - configs/orangepi_zero_defconfig | 1 - configs/pine64-lts_defconfig | 1 - configs/sopine_baseboard_defconfig | 1 - 9 files changed, 1 insertion(+), 8 deletions(-)
common/spl/Kconfig +1 -0
@@ -1078,6 +1078,7 @@ endif # SPL_SPI_FLASH_SUPPORT config SYS_SPI_U_BOOT_OFFS hex "address of u-boot payload in SPI flash" + default 0x8000 if ARCH_SUNXI default 0x0 depends on SPL_SPI_LOAD || SPL_SPI_SUNXI help
configs/A20-OLinuXino-Lime2-eMMC_defconfig +0 -1
@@ -15,7 +15,6 @@ CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_USE_PREBOOT=y CONFIG_SPL_I2C_SUPPORT=y -CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000 CONFIG_CMD_DFU=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_SPL_DOS_PARTITION is not set
configs/oceanic_5205_5inmfd_defconfig +0 -1
@@ -11,7 +11,6 @@ CONFIG_MMC0_CD_PIN="" CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_USE_PREBOOT=y -CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000 # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-oceanic-5205-5inmfd"
configs/orangepi_pc2_defconfig +0 -1
@@ -10,7 +10,6 @@ CONFIG_MACPWR="PD6" CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_USE_PREBOOT=y -CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000 # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-orangepi-pc2"
configs/orangepi_r1_defconfig +0 -1
@@ -9,7 +9,6 @@ CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_USE_PREBOOT=y CONFIG_CONSOLE_MUX=y -CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000 CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-r1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SUN8I_EMAC=y
configs/orangepi_win_defconfig +0 -1
@@ -7,7 +7,6 @@ CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_USE_PREBOOT=y -CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000 # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-orangepi-win"
configs/orangepi_zero_defconfig +0 -1
@@ -9,7 +9,6 @@ CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_USE_PREBOOT=y CONFIG_CONSOLE_MUX=y -CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000 CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-zero" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SUN8I_EMAC=y
configs/pine64-lts_defconfig +0 -1
@@ -11,7 +11,6 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_USE_PREBOOT=y -CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000 # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pine64-lts"
configs/sopine_baseboard_defconfig +0 -1
@@ -12,7 +12,6 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_USE_PREBOOT=y -CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000 # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-sopine-baseboard"
Signature · 1 line
2.14.5
PATCH 1/6 sunxi: move CONFIG_SYS_SPI_U_BOOT_OFFS out of defconfig
Quoted 7 lines · Andre Przywara
For Allwinner SoCs the
CONFIG_SYS_SPI_U_BOOT_OFFSvalue is not really a board choice: The boot ROM only loads the SPL from offset 0 of the SPI NOR flash, and loads at most 32KB. This is a similar situation as on MMC, so consequently we create our "joint" image (SPL + U-Boot proper) with that 32KB offset during the build.
Quoted 7 lines
So define the value of this symbol to be 32KB by default for every Allwinner SoC. This removes the definition of this symbol from the
_defconfigfiles, and avoids every board to define this over and over again.Signed-off-by Andre Przywara <[email protected]>---
Applied to u-boot-sunxi/master
PATCH 2/6 sunxi: SPL SPI: Split off SPI0 base address
In reply to Andre PrzywaraSo far on all supported Allwinner SoCs we find the old generation SPI controller always at address 0x1c05000, and the new generation one at 0x1c68000. However the Allwinner R40 SoC has a new generation SPI at the old address, and the H6 uses a completely different address.
So split off the base address from the respective SPI registers, by changing the #defines to just contain offsets.
The base address is provided by a function, so it can easily be extended later when support for those SoCs materialises.
This does not change the code size (since the toolchain is clever enough to optimise this properly), also does not bring any functional change at this point.
--- arch/arm/mach-sunxi/spl_spi_sunxi.c | 94 +++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 41 deletions(-)
arch/arm/mach-sunxi/spl_spi_sunxi.c +53 -41
@@ -36,13 +36,13 @@/* SUN4I variant of the SPI controller */ /*****************************************************************************/ -#define SUN4I_SPI0_CCTL (0x01C05000 + 0x1C) -#define SUN4I_SPI0_CTL (0x01C05000 + 0x08) -#define SUN4I_SPI0_RX (0x01C05000 + 0x00) -#define SUN4I_SPI0_TX (0x01C05000 + 0x04) -#define SUN4I_SPI0_FIFO_STA (0x01C05000 + 0x28) -#define SUN4I_SPI0_BC (0x01C05000 + 0x20) -#define SUN4I_SPI0_TC (0x01C05000 + 0x24) +#define SUN4I_SPI0_CCTL 0x1C +#define SUN4I_SPI0_CTL 0x08 +#define SUN4I_SPI0_RX 0x00 +#define SUN4I_SPI0_TX 0x04 +#define SUN4I_SPI0_FIFO_STA 0x28 +#define SUN4I_SPI0_BC 0x20 +#define SUN4I_SPI0_TC 0x24#define SUN4I_CTL_ENABLE BIT(0)#define SUN4I_CTL_MASTER BIT(1)
@@ -54,15 +54,15 @@/* SUN6I variant of the SPI controller */ /*****************************************************************************/ -#define SUN6I_SPI0_CCTL (0x01C68000 + 0x24) -#define SUN6I_SPI0_GCR (0x01C68000 + 0x04) -#define SUN6I_SPI0_TCR (0x01C68000 + 0x08) -#define SUN6I_SPI0_FIFO_STA (0x01C68000 + 0x1C) -#define SUN6I_SPI0_MBC (0x01C68000 + 0x30) -#define SUN6I_SPI0_MTC (0x01C68000 + 0x34) -#define SUN6I_SPI0_BCC (0x01C68000 + 0x38) -#define SUN6I_SPI0_TXD (0x01C68000 + 0x200) -#define SUN6I_SPI0_RXD (0x01C68000 + 0x300) +#define SUN6I_SPI0_CCTL 0x24 +#define SUN6I_SPI0_GCR 0x04 +#define SUN6I_SPI0_TCR 0x08 +#define SUN6I_SPI0_FIFO_STA 0x1C +#define SUN6I_SPI0_MBC 0x30 +#define SUN6I_SPI0_MTC 0x34 +#define SUN6I_SPI0_BCC 0x38 +#define SUN6I_SPI0_TXD 0x200 +#define SUN6I_SPI0_RXD 0x300#define SUN6I_CTL_ENABLE BIT(0)#define SUN6I_CTL_MASTER BIT(1)
@@ -100,11 +100,21 @@ static void spi0_pinmux_setup(unsigned int pin_function)sunxi_gpio_set_cfgpin (SUNXI_GPC (3 ), pin_function); } +static uintptr_t spi0_base_address (void ) +{ +if (!IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I )) +return 0x01C05000 ; + +return 0x01C68000 ; +} +/* * Setup 6 MHz from OSC24M (because the BROM is doing the same). */ static void spi0_enable_clock (void ) { +uintptr_t base =spi0_base_address (); +/* Deassert SPI0 reset on SUN6I */ if (IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I )) setbits_le32(SUN6I_BUS_SOFT_RST_REG0,
@@ -114,36 +124,37 @@ static void spi0_enable_clock(void)setbits_le32 (CCM_AHB_GATING0 , (1 <<AHB_GATE_OFFSET_SPI0 ));/* Divide by 4 */ -writel (SPI0_CLK_DIV_BY_4 ,IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I ) ? -SUN6I_SPI0_CCTL :SUN4I_SPI0_CCTL ); +writel (SPI0_CLK_DIV_BY_4 , base + (IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I ) ? +SUN6I_SPI0_CCTL :SUN4I_SPI0_CCTL ));/* 24MHz from OSC24M */ writel ((1 <<31 ),CCM_SPI0_CLK );if (IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I )) {/* Enable SPI in the master mode and do a soft reset */ -setbits_le32 (SUN6I_SPI0_GCR ,SUN6I_CTL_MASTER | -SUN6I_CTL_ENABLE | -SUN6I_CTL_SRST ); +setbits_le32 (base +SUN6I_SPI0_GCR ,SUN6I_CTL_MASTER | +SUN6I_CTL_ENABLE |SUN6I_CTL_SRST );/* Wait for completion */ -while (readl (SUN6I_SPI0_GCR ) &SUN6I_CTL_SRST ) +while (readl (base +SUN6I_SPI0_GCR ) &SUN6I_CTL_SRST ) ; }else {/* Enable SPI in the master mode and reset FIFO */ -setbits_le32 (SUN4I_SPI0_CTL ,SUN4I_CTL_MASTER | -SUN4I_CTL_ENABLE | -SUN4I_CTL_TF_RST | -SUN4I_CTL_RF_RST ); +setbits_le32 (base +SUN4I_SPI0_CTL ,SUN4I_CTL_MASTER | +SUN4I_CTL_ENABLE | +SUN4I_CTL_TF_RST | +SUN4I_CTL_RF_RST ); } }static void spi0_disable_clock (void ) { +uintptr_t base =spi0_base_address (); +/* Disable the SPI0 controller */ if (IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I )) -clrbits_le32 (SUN6I_SPI0_GCR ,SUN6I_CTL_MASTER | +clrbits_le32 (base +SUN6I_SPI0_GCR ,SUN6I_CTL_MASTER |SUN6I_CTL_ENABLE );else -clrbits_le32 (SUN4I_SPI0_CTL ,SUN4I_CTL_MASTER | +clrbits_le32 (base +SUN4I_SPI0_CTL ,SUN4I_CTL_MASTER |SUN4I_CTL_ENABLE );/* Disable the SPI0 clock */
@@ -227,6 +238,7 @@ static void spi0_read_data(void *buf, u32 addr, u32 len) {u8 *buf8 = buf;u32 chunk_len; +uintptr_t base =spi0_base_address ();while (len >0 ) { chunk_len = len;
@@ -235,23 +247,23 @@ static void spi0_read_data(void *buf, u32 addr, u32 len)if (IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I )) {sunxi_spi0_read_data (buf8, addr, chunk_len, -SUN6I_SPI0_TCR , + base +SUN6I_SPI0_TCR ,SUN6I_TCR_XCH , -SUN6I_SPI0_FIFO_STA , -SUN6I_SPI0_TXD , -SUN6I_SPI0_RXD , -SUN6I_SPI0_MBC , -SUN6I_SPI0_MTC , -SUN6I_SPI0_BCC ); + base +SUN6I_SPI0_FIFO_STA , + base +SUN6I_SPI0_TXD , + base +SUN6I_SPI0_RXD , + base +SUN6I_SPI0_MBC , + base +SUN6I_SPI0_MTC , + base +SUN6I_SPI0_BCC ); }else {sunxi_spi0_read_data (buf8, addr, chunk_len, -SUN4I_SPI0_CTL , + base +SUN4I_SPI0_CTL ,SUN4I_CTL_XCH , -SUN4I_SPI0_FIFO_STA , -SUN4I_SPI0_TX , -SUN4I_SPI0_RX , -SUN4I_SPI0_BC , -SUN4I_SPI0_TC , + base +SUN4I_SPI0_FIFO_STA , + base +SUN4I_SPI0_TX , + base +SUN4I_SPI0_RX , + base +SUN4I_SPI0_BC , + base +SUN4I_SPI0_TC ,0 ); }
Signature · 1 line
2.14.5
PATCH 3/6 sunxi: SPL SPI: Introduce is_new_gen_spi()
In reply to Andre PrzywaraSo far we were using the CONFIG_SUNXI_GEN_SUN6I symbol to select between the two SPI controller generations used on Allwinner SoCs. This is a convenience symbol to roughly differentiate between "older" and "newer" generation of SoCs.
The H6 SoCs is the newest SoC so far, but is sufficiently different to not define this symbol. However it is using a SPI controller compatible to the "new gen" SoCs.
To prepare for H6 support, we replace the check for this single symbol with an explicit function, which can later be extended.
For now we just return CONFIG_SUNXI_GEN_SUN6I in there, so this does not create a functional change.
--- arch/arm/mach-sunxi/spl_spi_sunxi.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
arch/arm/mach-sunxi/spl_spi_sunxi.c +14 -8
@@ -100,9 +100,14 @@ static void spi0_pinmux_setup(unsigned int pin_function)sunxi_gpio_set_cfgpin (SUNXI_GPC (3 ), pin_function); } +static bool is_new_gen_spi (void ) +{ +return IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I ); +} +static uintptr_t spi0_base_address (void ) { -if (!IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I )) +if (!is_new_gen_spi ())return 0x01C05000 ;return 0x01C68000 ;
@@ -116,7 +121,7 @@ static void spi0_enable_clock(void)uintptr_t base =spi0_base_address ();/* Deassert SPI0 reset on SUN6I */ -if (IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I )) +if (is_new_gen_spi ())setbits_le32 (SUN6I_BUS_SOFT_RST_REG0 , (1 <<AHB_RESET_SPI0_SHIFT ));
@@ -124,12 +129,12 @@ static void spi0_enable_clock(void)setbits_le32 (CCM_AHB_GATING0 , (1 <<AHB_GATE_OFFSET_SPI0 ));/* Divide by 4 */ -writel (SPI0_CLK_DIV_BY_4 , base + (IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I ) ? +writel (SPI0_CLK_DIV_BY_4 , base + (is_new_gen_spi () ?SUN6I_SPI0_CCTL :SUN4I_SPI0_CCTL ));/* 24MHz from OSC24M */ writel ((1 <<31 ),CCM_SPI0_CLK ); -if (IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I )) { +if (is_new_gen_spi ()) {/* Enable SPI in the master mode and do a soft reset */ setbits_le32 (base +SUN6I_SPI0_GCR ,SUN6I_CTL_MASTER |SUN6I_CTL_ENABLE |SUN6I_CTL_SRST );
@@ -150,7 +155,7 @@ static void spi0_disable_clock(void)uintptr_t base =spi0_base_address ();/* Disable the SPI0 controller */ -if (IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I )) +if (is_new_gen_spi ())clrbits_le32 (base +SUN6I_SPI0_GCR ,SUN6I_CTL_MASTER |SUN6I_CTL_ENABLE );else
@@ -164,7 +169,7 @@ static void spi0_disable_clock(void)clrbits_le32 (CCM_AHB_GATING0 , (1 <<AHB_GATE_OFFSET_SPI0 ));/* Assert SPI0 reset on SUN6I */ -if (IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I )) +if (is_new_gen_spi ())clrbits_le32 (SUN6I_BUS_SOFT_RST_REG0 , (1 <<AHB_RESET_SPI0_SHIFT )); }
@@ -184,7 +189,8 @@ static void spi0_deinit(void) {/* New SoCs can disable pins, older could only set them as input */ unsigned int pin_function =SUNXI_GPIO_INPUT ; -if (IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I )) + +if (is_new_gen_spi ()) pin_function =SUNXI_GPIO_DISABLE ;spi0_disable_clock ();
@@ -245,7 +251,7 @@ static void spi0_read_data(void *buf, u32 addr, u32 len)if (chunk_len >SPI_READ_MAX_SIZE ) chunk_len =SPI_READ_MAX_SIZE ; -if (IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I )) { +if (is_new_gen_spi ()) { sunxi_spi0_read_data(buf8, addr, chunk_len, base + SUN6I_SPI0_TCR, SUN6I_TCR_XCH,
Signature · 1 line
2.14.5
PATCH 3/6 sunxi: SPL SPI: Introduce is_new_gen_spi()
Quoted 25 lines · Andre Przywara
So far we were using the
CONFIG_SUNXI_GEN_SUN6Isymbol to select between the two SPI controller generations used on Allwinner SoCs. This is a convenience symbol to roughly differentiate between "older" and "newer" generation of SoCs.The H6 SoCs is the newest SoC so far, but is sufficiently different to not define this symbol. However it is using a SPI controller compatible to the "new gen" SoCs.
To prepare for H6 support, we replace the check for this single symbol with an explicit function, which can later be extended.
For now we just returnCONFIG_SUNXI_GEN_SUN6Iin there, so this does not create a functional change.Signed-off-by Andre Przywara <[email protected]>--- arch/arm/mach-sunxi/spl_spi_sunxi.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)arch/arm/mach-sunxi/spl_spi_sunxi.c +0
-0
arch/arm/mach-sunxi/spl_spi_sunxi.c static void spi0_pinmux_setup(unsigned int pin_function) · line 106
Quoted 7 lines
arch/arm/mach-sunxi/spl_spi_sunxi.c +4
-0@@ -100,9 +100,14 @@ static void spi0_pinmux_setup(unsigned int pin_function)sunxi_gpio_set_cfgpin (SUNXI_GPC (3 ), pin_function); } +static bool is_new_gen_spi (void ) +{ +return IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I ); +}
Doesn't it confusing? new gen is H6, but it returns 6I?
PATCH 3/6 sunxi: SPL SPI: Introduce is_new_gen_spi()
On 21/01/2020 08:20, Jagan Teki wrote:
Hi Jagan,
first: many thanks for merging those other patches of mine, much appreciated!
Quoted 29 lines · Andre Przywara
Quoted 28 lines
So far we were using the
CONFIG_SUNXI_GEN_SUN6Isymbol to select between the two SPI controller generations used on Allwinner SoCs. This is a convenience symbol to roughly differentiate between "older" and "newer" generation of SoCs.The H6 SoCs is the newest SoC so far, but is sufficiently different to not define this symbol. However it is using a SPI controller compatible to the "new gen" SoCs.
To prepare for H6 support, we replace the check for this single symbol with an explicit function, which can later be extended.
For now we just returnCONFIG_SUNXI_GEN_SUN6Iin there, so this does not create a functional change.Signed-off-by Andre Przywara <[email protected]>--- arch/arm/mach-sunxi/spl_spi_sunxi.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)arch/arm/mach-sunxi/spl_spi_sunxi.c +0
-0@@ -100,9 +100,14 @@ static void spi0_pinmux_setup(unsigned int pin_function)sunxi_gpio_set_cfgpin (SUNXI_GPC (3 ), pin_function); }
Quoted 6 lines
arch/arm/mach-sunxi/spl_spi_sunxi.c static void spi0_pinmux_setup(unsigned int pin_function) · line 106
Quoted 4 lines
arch/arm/mach-sunxi/spl_spi_sunxi.c +4
-0+static bool is_new_gen_spi (void ) +{ +return IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I ); +}Doesn't it confusing? new gen is H6, but it returns 6I?
Well, naming ...
For the purpose of U-Boot there are two generations of SPI controller *register interfaces*, the "old" one used in the older SoCs like the A20, and the "newer" one used in everything halfway recent. The H6 uses the same "new" generation, just at a different address. Yes, it adds quad-SPI, but this is not relevant for this driver.
I have seen this old/new terminology at different places, so just went with it.
I could rename it to is_spi_sun6i_gen() or something if that makes you happy...
Cheers,
Andre
PATCH 3/6 sunxi: SPL SPI: Introduce is_new_gen_spi()
Quoted 44 lines · André Przywara
On 21/01/2020 08:20, Jagan Teki wrote:
Hi Jagan,
first: many thanks for merging those other patches of mine, much appreciated!
Quoted 29 lines · Andre Przywara
Quoted 28 lines
So far we were using the
CONFIG_SUNXI_GEN_SUN6Isymbol to select between the two SPI controller generations used on Allwinner SoCs. This is a convenience symbol to roughly differentiate between "older" and "newer" generation of SoCs.The H6 SoCs is the newest SoC so far, but is sufficiently different to not define this symbol. However it is using a SPI controller compatible to the "new gen" SoCs.
To prepare for H6 support, we replace the check for this single symbol with an explicit function, which can later be extended.
For now we just returnCONFIG_SUNXI_GEN_SUN6Iin there, so this does not create a functional change.Signed-off-by Andre Przywara <[email protected]>--- arch/arm/mach-sunxi/spl_spi_sunxi.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)arch/arm/mach-sunxi/spl_spi_sunxi.c +0
-0@@ -100,9 +100,14 @@ static void spi0_pinmux_setup(unsigned int pin_function)sunxi_gpio_set_cfgpin (SUNXI_GPC (3 ), pin_function); }Quoted 6 lines
arch/arm/mach-sunxi/spl_spi_sunxi.c static void spi0_pinmux_setup(unsigned int pin_function) · line 106
Quoted 4 lines
arch/arm/mach-sunxi/spl_spi_sunxi.c +4
-0+static bool is_new_gen_spi (void ) +{ +return IS_ENABLED (CONFIG_SUNXI_GEN_SUN6I ); +}Doesn't it confusing? new gen is H6, but it returns 6I?
Quoted 10 lines
Well, naming ...
For the purpose of U-Boot there are two generations of SPI controller *register interfaces*, the "old" one used in the older SoCs like the A20, and the "newer" one used in everything halfway recent. The H6 uses the same "new" generation, just at a different address. Yes, it adds quad-SPI, but this is not relevant for this driver.
I have seen this old/new terminology at different places, so just went with it.
I could rename it tois_spi_sun6i_gen()or something if that makes you happy...
Please do, would be great if you can send the new changes as soon as possible so-that I can send PR for the rc1.
Jagan.
PATCH 4/6 sunxi: SPL SPI: Add SPI boot support for the Allwinner R40 SoC
In reply to Andre PrzywaraNow that we can easily select an SoC specific SPI0 base address, adding support for the Allwinner R40 is fairly trivial:
We set the base address, add this SoC to the ones that use PC23 and enable it in Kconfig.
This allows booting from SPI flash on R40 boards.
Tested on a Bananapi M2 Berry with SPI flash connected to the header pins.
--- arch/arm/mach-sunxi/Kconfig | 2 +- arch/arm/mach-sunxi/spl_spi_sunxi.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-)
arch/arm/mach-sunxi/Kconfig +1 -1
@@ -993,7 +993,7 @@ config SPL_STACK_R_ADDR config SPL_SPI_SUNXI bool "Support for SPI Flash on Allwinner SoCs in SPL" - depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I + depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_R40 help Enable support for SPI Flash. This option allows SPL to read from sunxi SPI Flash. It uses the same method as the boot ROM, so does
arch/arm/mach-sunxi/spl_spi_sunxi.c +5 -1
@@ -94,7 +94,8 @@ static void spi0_pinmux_setup(unsigned int pin_function)for (pin =SUNXI_GPC (0 ); pin <=SUNXI_GPC (2 ); pin++)sunxi_gpio_set_cfgpin (pin, pin_function); -if (IS_ENABLED (CONFIG_MACH_SUN4I ) ||IS_ENABLED (CONFIG_MACH_SUN7I )) +if (IS_ENABLED (CONFIG_MACH_SUN4I ) ||IS_ENABLED (CONFIG_MACH_SUN7I ) || +IS_ENABLED (CONFIG_MACH_SUN8I_R40 ))sunxi_gpio_set_cfgpin (SUNXI_GPC (23 ), pin_function);else sunxi_gpio_set_cfgpin (SUNXI_GPC (3 ), pin_function);
@@ -107,6 +108,9 @@ static bool is_new_gen_spi(void)static uintptr_t spi0_base_address (void ) { +if (IS_ENABLED (CONFIG_MACH_SUN8I_R40 )) +return 0x01C05000 ; +if (!is_new_gen_spi ())return 0x01C05000 ;
Signature · 1 line
2.14.5
PATCH 5/6 sunxi: SPL SPI: Add SPI boot support for the Allwinner H6 SoC
In reply to Andre PrzywaraThe Allwinner H6 SoC uses a quite different memory map, also changes the clocks quite a bit. This requires some changes to the SPL SPI routine, which hardcodes these values so far.
Using the just introduced helper functions to determine base address and SPI controller generation, we can cover some of these differences easily.
The clock setup is different, so requires some explicit code changes there (reset and clock gate in one register at a different address). Also we need to change the pinmux function to use a different set of pins that the H6 uses for SPI0.
Eventually we can enable the H6 to use SPI booting in Kconfig.
--- arch/arm/mach-sunxi/Kconfig | 2 +- arch/arm/mach-sunxi/spl_spi_sunxi.c | 41 +++++++++++++++++++++++++++++-------- 2 files changed, 33 insertions(+), 10 deletions(-)
arch/arm/mach-sunxi/Kconfig +1 -1
@@ -993,7 +993,7 @@ config SPL_STACK_R_ADDR config SPL_SPI_SUNXI bool "Support for SPI Flash on Allwinner SoCs in SPL" - depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_R40 + depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_R40 || MACH_SUN50I_H6 help Enable support for SPI Flash. This option allows SPL to read from sunxi SPI Flash. It uses the same method as the boot ROM, so does
arch/arm/mach-sunxi/spl_spi_sunxi.c +32 -9
95 lines not on this page · raw message
Signature · 1 line
2.14.5
PATCH 6/6 sunxi: Pine H64: Enable SPI booting in defconfig
In reply to Andre PrzywaraThe Pine H64 board comes with some onboard SPI flash chip, which is perfect for loading SPL, ATF and U-Boot proper from there.
Enable the functionality in the defconfig, so that we use sunxi-fel to transfer a bootable image to the NOR flash.
--- configs/pine_h64_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/pine_h64_defconfig +1 -0
@@ -16,3 +16,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-pine-h64" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y +CONFIG_SPL_SPI_SUNXI=y
Signature · 1 line
2.14.5