* [U-Boot] [PATCH 2/4] ARM: dts: at91: sama5d27_wlsom1_ek: add support for qspi
2019-08-26 6:47 [U-Boot] [PATCH 1/4] ARM: dts: at91: sama5d2: add seq for qspi1 Eugen.Hristev at microchip.com
@ 2019-08-26 6:47 ` Eugen.Hristev at microchip.com
2019-08-26 6:47 ` [U-Boot] [PATCH 3/4] board: atmel: sama5d2_wlsom1_ek: add qspi support and qspi boot config Eugen.Hristev at microchip.com
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Eugen.Hristev at microchip.com @ 2019-08-26 6:47 UTC (permalink / raw)
To: u-boot
From: Eugen Hristev <eugen.hristev@microchip.com>
Add node for qspi1 memory connected on the wlsom
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
arch/arm/dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi | 12 ++++++++++++
arch/arm/dts/at91-sama5d27_wlsom1_ek.dts | 4 ++++
arch/arm/dts/sama5d27_wlsom1.dtsi | 22 ++++++++++++++++++++++
3 files changed, 38 insertions(+)
diff --git a/arch/arm/dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi b/arch/arm/dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi
index 48ab217..dae1fba 100644
--- a/arch/arm/dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi
+++ b/arch/arm/dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi
@@ -13,6 +13,14 @@
};
};
+&qspi1 {
+ u-boot,dm-pre-reloc;
+};
+
+&qspi1_flash {
+ u-boot,dm-pre-reloc;
+};
+
&sdmmc0 {
u-boot,dm-pre-reloc;
};
@@ -36,3 +44,7 @@
&pinctrl_uart0_default {
u-boot,dm-pre-reloc;
};
+
+&pinctrl_qspi1_default {
+ u-boot,dm-pre-reloc;
+};
diff --git a/arch/arm/dts/at91-sama5d27_wlsom1_ek.dts b/arch/arm/dts/at91-sama5d27_wlsom1_ek.dts
index 21986ec..32d3404 100644
--- a/arch/arm/dts/at91-sama5d27_wlsom1_ek.dts
+++ b/arch/arm/dts/at91-sama5d27_wlsom1_ek.dts
@@ -38,6 +38,10 @@
};
apb {
+ qspi1: spi at f0024000 {
+ status = "okay";
+ };
+
macb0: ethernet at f8008000 {
status = "okay";
};
diff --git a/arch/arm/dts/sama5d27_wlsom1.dtsi b/arch/arm/dts/sama5d27_wlsom1.dtsi
index 3d27570..889a003 100644
--- a/arch/arm/dts/sama5d27_wlsom1.dtsi
+++ b/arch/arm/dts/sama5d27_wlsom1.dtsi
@@ -18,6 +18,19 @@
ahb {
apb {
+ qspi1: spi at f0024000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_qspi1_default>;
+
+ qspi1_flash: spi_flash at 0 {
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <50000000>;
+ spi-rx-bus-width = <4>;
+ spi-tx-bus-width = <4>;
+ };
+ };
+
macb0: ethernet at f8008000 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_macb0_rmii &pinctrl_macb0_phy_irq>;
@@ -49,6 +62,15 @@
bias-disable;
};
+ pinctrl_qspi1_default: qspi1_default {
+ pinmux = <PIN_PB5__QSPI1_SCK>,
+ <PIN_PB6__QSPI1_CS>,
+ <PIN_PB7__QSPI1_IO0>,
+ <PIN_PB8__QSPI1_IO1>,
+ <PIN_PB9__QSPI1_IO2>,
+ <PIN_PB10__QSPI1_IO3>;
+ bias-pull-up;
+ };
};
};
};
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [U-Boot] [PATCH 3/4] board: atmel: sama5d2_wlsom1_ek: add qspi support and qspi boot config
2019-08-26 6:47 [U-Boot] [PATCH 1/4] ARM: dts: at91: sama5d2: add seq for qspi1 Eugen.Hristev at microchip.com
2019-08-26 6:47 ` [U-Boot] [PATCH 2/4] ARM: dts: at91: sama5d27_wlsom1_ek: add support for qspi Eugen.Hristev at microchip.com
@ 2019-08-26 6:47 ` Eugen.Hristev at microchip.com
2019-08-26 6:47 ` [U-Boot] [PATCH 4/4] board: atmel: sama5d27_wlsom1_ek: start green led in SPL Eugen.Hristev at microchip.com
2019-09-11 7:09 ` [U-Boot] [PATCH 1/4] ARM: dts: at91: sama5d2: add seq for qspi1 Eugen.Hristev at microchip.com
3 siblings, 0 replies; 5+ messages in thread
From: Eugen.Hristev at microchip.com @ 2019-08-26 6:47 UTC (permalink / raw)
To: u-boot
From: Eugen Hristev <eugen.hristev@microchip.com>
Add support for qspi memory on board. Created boot support for QSPI
for both u-boot proper and SPL.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
board/atmel/sama5d27_wlsom1_ek/MAINTAINERS | 1 +
.../atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c | 17 +++
configs/sama5d27_wlsom1_ek_qspiflash_defconfig | 115 +++++++++++++++++++++
include/configs/sama5d27_wlsom1_ek.h | 4 +
4 files changed, 137 insertions(+)
create mode 100644 configs/sama5d27_wlsom1_ek_qspiflash_defconfig
diff --git a/board/atmel/sama5d27_wlsom1_ek/MAINTAINERS b/board/atmel/sama5d27_wlsom1_ek/MAINTAINERS
index 59671ac..ff68cf0 100644
--- a/board/atmel/sama5d27_wlsom1_ek/MAINTAINERS
+++ b/board/atmel/sama5d27_wlsom1_ek/MAINTAINERS
@@ -5,3 +5,4 @@ S: Maintained
F: board/atmel/sama5d27_wlsom1_ek/
F: include/configs/sama5d27_wlsom1_ek.h
F: configs/sama5d27_wlsom1_ek_mmc_defconfig
+F: configs/sama5d27_wlsom1_ek_qspiflash_defconfig
diff --git a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
index 3663ae4..1930048 100644
--- a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
+++ b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
@@ -97,11 +97,28 @@ void spl_mmc_init(void)
}
#endif
+#ifdef CONFIG_QSPI_BOOT
+void spl_qspi_init(void)
+{
+ atmel_pio4_set_d_periph(AT91_PIO_PORTB, 5, 0); /* SCK */
+ atmel_pio4_set_d_periph(AT91_PIO_PORTB, 6, 0); /* CS */
+ atmel_pio4_set_d_periph(AT91_PIO_PORTB, 7, 0); /* IO0 */
+ atmel_pio4_set_d_periph(AT91_PIO_PORTB, 8, 0); /* IO1 */
+ atmel_pio4_set_d_periph(AT91_PIO_PORTB, 9, 0); /* IO2 */
+ atmel_pio4_set_d_periph(AT91_PIO_PORTB, 10, 0); /* IO3 */
+
+ at91_periph_clk_enable(ATMEL_ID_QSPI1);
+}
+#endif
+
void spl_board_init(void)
{
#ifdef CONFIG_SD_BOOT
spl_mmc_init();
#endif
+#ifdef CONFIG_QSPI_BOOT
+ spl_qspi_init();
+#endif
}
void spl_display_print(void)
diff --git a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
new file mode 100644
index 0000000..56cca3e
--- /dev/null
+++ b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
@@ -0,0 +1,115 @@
+CONFIG_ARM=y
+CONFIG_ARCH_AT91=y
+CONFIG_SYS_TEXT_BASE=0x26f00000
+CONFIG_TARGET_SAMA5D27_WLSOM1_EK=y
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL=y
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_BASE=0xf801c000
+CONFIG_DEBUG_UART_CLOCK=82000000
+CONFIG_ENV_SECT_SIZE=0x1000
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_DEBUG_UART=y
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
+CONFIG_FIT=y
+CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
+CONFIG_QSPI_BOOT=y
+CONFIG_SPI_BOOT=y
+CONFIG_BOOTDELAY=3
+CONFIG_USE_BOOTARGS=y
+CONFIG_MISC_INIT_R=y
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_SPL_TEXT_BASE=0x200000
+CONFIG_SPL_SEPARATE_BSS=y
+CONFIG_SPL_DISPLAY_PRINT=y
+# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
+CONFIG_SPL_SPI_LOAD=y
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_BOOTZ=y
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_I2C=y
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_FAT=y
+CONFIG_OF_CONTROL=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d27_wlsom1_ek"
+CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_BUS=y
+CONFIG_ENV_SPI_BUS=2
+CONFIG_USE_ENV_SPI_CS=y
+CONFIG_ENV_SPI_CS=0
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=50000000
+CONFIG_USE_ENV_SPI_MODE=y
+CONFIG_ENV_SPI_MODE=0x0
+CONFIG_DM=y
+CONFIG_SPL_DM=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_CLK_AT91=y
+CONFIG_AT91_UTMI=y
+CONFIG_AT91_H32MX=y
+CONFIG_AT91_GENERIC_CLK=y
+CONFIG_DM_GPIO=y
+CONFIG_ATMEL_PIO4=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_AT91=y
+CONFIG_I2C_EEPROM=y
+CONFIG_DM_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ATMEL=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=2
+CONFIG_SF_DEFAULT_SPEED=50000000
+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_PHY_MICREL=y
+CONFIG_DM_ETH=y
+CONFIG_MACB=y
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_PINCTRL_AT91PIO4=y
+CONFIG_DM_SERIAL=y
+CONFIG_DEBUG_UART_ATMEL=y
+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
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y
+CONFIG_W1=y
+CONFIG_W1_GPIO=y
+CONFIG_W1_EEPROM=y
+CONFIG_W1_EEPROM_DS24XXX=y
+CONFIG_OF_LIBFDT_OVERLAY=y
+# CONFIG_EFI_LOADER_HII is not set
diff --git a/include/configs/sama5d27_wlsom1_ek.h b/include/configs/sama5d27_wlsom1_ek.h
index 6bcbc06..250eb73 100644
--- a/include/configs/sama5d27_wlsom1_ek.h
+++ b/include/configs/sama5d27_wlsom1_ek.h
@@ -43,4 +43,8 @@
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#endif
+#ifdef CONFIG_QSPI_BOOT
+#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000
+#endif
+
#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [U-Boot] [PATCH 4/4] board: atmel: sama5d27_wlsom1_ek: start green led in SPL
2019-08-26 6:47 [U-Boot] [PATCH 1/4] ARM: dts: at91: sama5d2: add seq for qspi1 Eugen.Hristev at microchip.com
2019-08-26 6:47 ` [U-Boot] [PATCH 2/4] ARM: dts: at91: sama5d27_wlsom1_ek: add support for qspi Eugen.Hristev at microchip.com
2019-08-26 6:47 ` [U-Boot] [PATCH 3/4] board: atmel: sama5d2_wlsom1_ek: add qspi support and qspi boot config Eugen.Hristev at microchip.com
@ 2019-08-26 6:47 ` Eugen.Hristev at microchip.com
2019-09-11 7:09 ` [U-Boot] [PATCH 1/4] ARM: dts: at91: sama5d2: add seq for qspi1 Eugen.Hristev at microchip.com
3 siblings, 0 replies; 5+ messages in thread
From: Eugen.Hristev at microchip.com @ 2019-08-26 6:47 UTC (permalink / raw)
To: u-boot
From: Eugen Hristev <eugen.hristev@microchip.com>
When SPL boots, enable green led on the board.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
index 1930048..fda06c8 100644
--- a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
+++ b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
@@ -82,6 +82,13 @@ int dram_init(void)
/* SPL */
#ifdef CONFIG_SPL_BUILD
+static void board_leds_init(void)
+{
+ atmel_pio4_set_pio_output(AT91_PIO_PORTA, 6, 0); /* RED */
+ atmel_pio4_set_pio_output(AT91_PIO_PORTA, 7, 1); /* GREEN */
+ atmel_pio4_set_pio_output(AT91_PIO_PORTA, 8, 0); /* BLUE */
+}
+
#ifdef CONFIG_SD_BOOT
void spl_mmc_init(void)
{
@@ -113,6 +120,7 @@ void spl_qspi_init(void)
void spl_board_init(void)
{
+ board_leds_init();
#ifdef CONFIG_SD_BOOT
spl_mmc_init();
#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [U-Boot] [PATCH 1/4] ARM: dts: at91: sama5d2: add seq for qspi1
2019-08-26 6:47 [U-Boot] [PATCH 1/4] ARM: dts: at91: sama5d2: add seq for qspi1 Eugen.Hristev at microchip.com
` (2 preceding siblings ...)
2019-08-26 6:47 ` [U-Boot] [PATCH 4/4] board: atmel: sama5d27_wlsom1_ek: start green led in SPL Eugen.Hristev at microchip.com
@ 2019-09-11 7:09 ` Eugen.Hristev at microchip.com
3 siblings, 0 replies; 5+ messages in thread
From: Eugen.Hristev at microchip.com @ 2019-09-11 7:09 UTC (permalink / raw)
To: u-boot
On 26.08.2019 09:47, Eugen Hristev - M18282 wrote:
> From: Eugen Hristev <eugen.hristev@microchip.com>
>
> qspi1 does not have an alias/seq number. This is required for
> SPL default SF bus booting for the boards that have this SoC
>
> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
> ---
Applied series to u-boot-atmel/next
^ permalink raw reply [flat|nested] 5+ messages in thread