* [PATCH 2/4] ARM: dts: at91: sama5d2_icp: cosmetic arrangement of the nodes
2021-08-17 10:29 [PATCH 1/4] ARM: dts: at91: sama5d2_icp: add QSPI1 device Eugen Hristev
@ 2021-08-17 10:29 ` Eugen Hristev
2021-08-17 10:29 ` [PATCH 3/4] ARM: dts: at91: sama5d2: fix dtc warning for ohci and ehci Eugen Hristev
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Eugen Hristev @ 2021-08-17 10:29 UTC (permalink / raw)
To: u-boot; +Cc: eugen.hristev, mihai.sain
Reorder the nodes following the kernel rules: nodes in a range are sorted
by ascending bus address, and when referenced by phandle, are ordered
alphabetically.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi | 23 +++++++++++----------
arch/arm/dts/at91-sama5d2_icp.dts | 25 ++++++++++++-----------
2 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi b/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi
index 68c27f229f..b45de978c2 100644
--- a/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi
+++ b/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi
@@ -13,34 +13,35 @@
};
};
-&sdmmc0 {
+&pinctrl_mikrobus1_uart {
u-boot,dm-pre-reloc;
};
-&uart0 { /* mikrobus1 uart */
+&pinctrl_qspi1_sck_cs_default {
u-boot,dm-pre-reloc;
};
-&pinctrl_sdmmc0_default {
+&pinctrl_qspi1_dat_default {
u-boot,dm-pre-reloc;
};
-&pinctrl_mikrobus1_uart {
+&pinctrl_sdmmc0_default {
u-boot,dm-pre-reloc;
};
-&pinctrl_qspi1_sck_cs_default {
+&qspi1 {
u-boot,dm-pre-reloc;
+
+ flash@0 {
+ u-boot,dm-pre-reloc;
+ };
};
-&pinctrl_qspi1_dat_default {
+&sdmmc0 {
u-boot,dm-pre-reloc;
};
-&qspi1 {
+&uart0 { /* mikrobus1 uart */
u-boot,dm-pre-reloc;
-
- flash@0 {
- u-boot,dm-pre-reloc;
- };
};
+
diff --git a/arch/arm/dts/at91-sama5d2_icp.dts b/arch/arm/dts/at91-sama5d2_icp.dts
index 2c6e91c1c7..44522197ff 100644
--- a/arch/arm/dts/at91-sama5d2_icp.dts
+++ b/arch/arm/dts/at91-sama5d2_icp.dts
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0+ OR MIT
/*
* at91-sama5d2_icp.dts - Device Tree file for SAMA5D2 ICP board
- * SAMA5D2 Industrial Connectivity Board
+ * SAMA5D2 Industrial Connectivity Platform
*
* Copyright (c) 2018, Microchip Technology Inc.
* 2018, Eugen Hristev <eugen.hristev@microchip.com>
@@ -48,16 +48,16 @@
};
};
- uart0: serial@f801c000 { /* mikrobus1 uart */
+ macb0: ethernet@f8008000 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_mikrobus1_uart>;
+ pinctrl-0 = <&pinctrl_macb0_rmii &pinctrl_macb0_phy_irq &pinctrl_macb0_rst>;
+ phy-mode = "internal";
status = "okay";
};
- macb0: ethernet@f8008000 {
+ uart0: serial@f801c000 { /* mikrobus1 uart */
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_macb0_rmii &pinctrl_macb0_phy_irq &pinctrl_macb0_rst>;
- phy-mode = "internal";
+ pinctrl-0 = <&pinctrl_mikrobus1_uart>;
status = "okay";
};
@@ -85,6 +85,7 @@
pagesize = <16>;
};
};
+
pioA: gpio@fc038000 {
status = "okay";
pinctrl {
@@ -124,6 +125,12 @@
bias-pull-up;
};
+ pinctrl_mikrobus1_uart: mikrobus1_uart {
+ pinmux = <PIN_PB26__URXD0>,
+ <PIN_PB27__UTXD0>;
+ bias-disable;
+ };
+
pinctrl_qspi1_sck_cs_default: qspi1_sck_cs_default {
pinmux = <PIN_PA6__QSPI1_SCK>,
<PIN_PA11__QSPI1_CS>;
@@ -148,12 +155,6 @@
<PIN_PA13__SDMMC0_CD>;
bias-disable;
};
-
- pinctrl_mikrobus1_uart: mikrobus1_uart {
- pinmux = <PIN_PB26__URXD0>,
- <PIN_PB27__UTXD0>;
- bias-disable;
- };
};
};
};
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] ARM: dts: at91: sama5d2: fix dtc warning for ohci and ehci
2021-08-17 10:29 [PATCH 1/4] ARM: dts: at91: sama5d2_icp: add QSPI1 device Eugen Hristev
2021-08-17 10:29 ` [PATCH 2/4] ARM: dts: at91: sama5d2_icp: cosmetic arrangement of the nodes Eugen Hristev
@ 2021-08-17 10:29 ` Eugen Hristev
2021-08-20 6:25 ` Alexander Dahl
2021-08-17 10:29 ` [PATCH 4/4] configs: sama5d2: add qspi config for QSPI1 Eugen Hristev
2021-09-07 9:25 ` [PATCH 1/4] ARM: dts: at91: sama5d2_icp: add QSPI1 device Eugen.Hristev
3 siblings, 1 reply; 6+ messages in thread
From: Eugen Hristev @ 2021-08-17 10:29 UTC (permalink / raw)
To: u-boot; +Cc: eugen.hristev, mihai.sain
Fixed the following DTC build warning (reproducible with W=1)
arch/arm/dts/at91-sama5d2_icp.dtb: Warning (unit_address_format): /ahb/ohci@00400000: unit name should not have leading 0s
arch/arm/dts/at91-sama5d2_icp.dtb: Warning (unit_address_format): /ahb/ehci@00500000: unit name should not have leading 0s
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
arch/arm/dts/at91-sama5d27_som1_ek.dts | 4 ++--
arch/arm/dts/at91-sama5d2_ptc_ek.dts | 4 ++--
arch/arm/dts/at91-sama5d2_xplained.dts | 4 ++--
arch/arm/dts/sama5d2.dtsi | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/dts/at91-sama5d27_som1_ek.dts b/arch/arm/dts/at91-sama5d27_som1_ek.dts
index ee851a1bef..efd1a5d197 100644
--- a/arch/arm/dts/at91-sama5d27_som1_ek.dts
+++ b/arch/arm/dts/at91-sama5d27_som1_ek.dts
@@ -68,7 +68,7 @@
};
ahb {
- usb1: ohci@00400000 {
+ usb1: ohci@400000 {
num-ports = <3>;
atmel,vbus-gpio = <&pioA 42 0>;
pinctrl-names = "default";
@@ -76,7 +76,7 @@
status = "okay";
};
- usb2: ehci@00500000 {
+ usb2: ehci@500000 {
status = "okay";
};
diff --git a/arch/arm/dts/at91-sama5d2_ptc_ek.dts b/arch/arm/dts/at91-sama5d2_ptc_ek.dts
index cd3711a02a..f45fb1ef26 100644
--- a/arch/arm/dts/at91-sama5d2_ptc_ek.dts
+++ b/arch/arm/dts/at91-sama5d2_ptc_ek.dts
@@ -76,7 +76,7 @@
status = "okay";
};
- usb1: ohci@00400000 {
+ usb1: ohci@400000 {
num-ports = <3>;
atmel,vbus-gpio = <0
&pioA PIN_PB12 GPIO_ACTIVE_HIGH
@@ -87,7 +87,7 @@
status = "okay";
};
- usb2: ehci@00500000 {
+ usb2: ehci@500000 {
status = "okay";
};
diff --git a/arch/arm/dts/at91-sama5d2_xplained.dts b/arch/arm/dts/at91-sama5d2_xplained.dts
index b733c4d4ce..e7c91c5fec 100644
--- a/arch/arm/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/dts/at91-sama5d2_xplained.dts
@@ -25,7 +25,7 @@
};
ahb {
- usb1: ohci@00400000 {
+ usb1: ohci@400000 {
num-ports = <3>;
atmel,vbus-gpio = <&pioA 42 0>;
pinctrl-names = "default";
@@ -33,7 +33,7 @@
status = "okay";
};
- usb2: ehci@00500000 {
+ usb2: ehci@500000 {
status = "okay";
};
diff --git a/arch/arm/dts/sama5d2.dtsi b/arch/arm/dts/sama5d2.dtsi
index 6fb2cb25f9..d8a125b073 100644
--- a/arch/arm/dts/sama5d2.dtsi
+++ b/arch/arm/dts/sama5d2.dtsi
@@ -32,7 +32,7 @@
#size-cells = <1>;
u-boot,dm-pre-reloc;
- usb1: ohci@00400000 {
+ usb1: ohci@400000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci";
reg = <0x00400000 0x100000>;
clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
@@ -40,7 +40,7 @@
status = "disabled";
};
- usb2: ehci@00500000 {
+ usb2: ehci@500000 {
compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
reg = <0x00500000 0x100000>;
clocks = <&utmi>, <&uhphs_clk>;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 3/4] ARM: dts: at91: sama5d2: fix dtc warning for ohci and ehci
2021-08-17 10:29 ` [PATCH 3/4] ARM: dts: at91: sama5d2: fix dtc warning for ohci and ehci Eugen Hristev
@ 2021-08-20 6:25 ` Alexander Dahl
0 siblings, 0 replies; 6+ messages in thread
From: Alexander Dahl @ 2021-08-20 6:25 UTC (permalink / raw)
To: Eugen Hristev; +Cc: u-boot, mihai.sain
Hello,
Am Tue, Aug 17, 2021 at 01:29:24PM +0300 schrieb Eugen Hristev:
> Fixed the following DTC build warning (reproducible with W=1)
>
> arch/arm/dts/at91-sama5d2_icp.dtb: Warning (unit_address_format): /ahb/ohci@00400000: unit name should not have leading 0s
> arch/arm/dts/at91-sama5d2_icp.dtb: Warning (unit_address_format): /ahb/ehci@00500000: unit name should not have leading 0s
>
> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
> ---
> arch/arm/dts/at91-sama5d27_som1_ek.dts | 4 ++--
> arch/arm/dts/at91-sama5d2_ptc_ek.dts | 4 ++--
> arch/arm/dts/at91-sama5d2_xplained.dts | 4 ++--
> arch/arm/dts/sama5d2.dtsi | 4 ++--
> 4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/dts/at91-sama5d27_som1_ek.dts b/arch/arm/dts/at91-sama5d27_som1_ek.dts
> index ee851a1bef..efd1a5d197 100644
> --- a/arch/arm/dts/at91-sama5d27_som1_ek.dts
> +++ b/arch/arm/dts/at91-sama5d27_som1_ek.dts
> @@ -68,7 +68,7 @@
> };
>
> ahb {
> - usb1: ohci@00400000 {
> + usb1: ohci@400000 {
> num-ports = <3>;
> atmel,vbus-gpio = <&pioA 42 0>;
> pinctrl-names = "default";
> @@ -76,7 +76,7 @@
> status = "okay";
> };
>
> - usb2: ehci@00500000 {
> + usb2: ehci@500000 {
> status = "okay";
> };
>
> diff --git a/arch/arm/dts/at91-sama5d2_ptc_ek.dts b/arch/arm/dts/at91-sama5d2_ptc_ek.dts
> index cd3711a02a..f45fb1ef26 100644
> --- a/arch/arm/dts/at91-sama5d2_ptc_ek.dts
> +++ b/arch/arm/dts/at91-sama5d2_ptc_ek.dts
> @@ -76,7 +76,7 @@
> status = "okay";
> };
>
> - usb1: ohci@00400000 {
> + usb1: ohci@400000 {
> num-ports = <3>;
> atmel,vbus-gpio = <0
> &pioA PIN_PB12 GPIO_ACTIVE_HIGH
> @@ -87,7 +87,7 @@
> status = "okay";
> };
>
> - usb2: ehci@00500000 {
> + usb2: ehci@500000 {
> status = "okay";
> };
>
> diff --git a/arch/arm/dts/at91-sama5d2_xplained.dts b/arch/arm/dts/at91-sama5d2_xplained.dts
> index b733c4d4ce..e7c91c5fec 100644
> --- a/arch/arm/dts/at91-sama5d2_xplained.dts
> +++ b/arch/arm/dts/at91-sama5d2_xplained.dts
> @@ -25,7 +25,7 @@
> };
>
> ahb {
> - usb1: ohci@00400000 {
> + usb1: ohci@400000 {
> num-ports = <3>;
> atmel,vbus-gpio = <&pioA 42 0>;
> pinctrl-names = "default";
> @@ -33,7 +33,7 @@
> status = "okay";
> };
>
> - usb2: ehci@00500000 {
> + usb2: ehci@500000 {
> status = "okay";
> };
>
> diff --git a/arch/arm/dts/sama5d2.dtsi b/arch/arm/dts/sama5d2.dtsi
> index 6fb2cb25f9..d8a125b073 100644
> --- a/arch/arm/dts/sama5d2.dtsi
> +++ b/arch/arm/dts/sama5d2.dtsi
> @@ -32,7 +32,7 @@
> #size-cells = <1>;
> u-boot,dm-pre-reloc;
>
> - usb1: ohci@00400000 {
> + usb1: ohci@400000 {
> compatible = "atmel,at91rm9200-ohci", "usb-ohci";
> reg = <0x00400000 0x100000>;
> clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
> @@ -40,7 +40,7 @@
> status = "disabled";
> };
>
> - usb2: ehci@00500000 {
> + usb2: ehci@500000 {
> compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
> reg = <0x00500000 0x100000>;
> clocks = <&utmi>, <&uhphs_clk>;
Reviewed-by: Alexander Dahl <ada@thorsis.com>
Greets
Alex
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 4/4] configs: sama5d2: add qspi config for QSPI1
2021-08-17 10:29 [PATCH 1/4] ARM: dts: at91: sama5d2_icp: add QSPI1 device Eugen Hristev
2021-08-17 10:29 ` [PATCH 2/4] ARM: dts: at91: sama5d2_icp: cosmetic arrangement of the nodes Eugen Hristev
2021-08-17 10:29 ` [PATCH 3/4] ARM: dts: at91: sama5d2: fix dtc warning for ohci and ehci Eugen Hristev
@ 2021-08-17 10:29 ` Eugen Hristev
2021-09-07 9:25 ` [PATCH 1/4] ARM: dts: at91: sama5d2_icp: add QSPI1 device Eugen.Hristev
3 siblings, 0 replies; 6+ messages in thread
From: Eugen Hristev @ 2021-08-17 10:29 UTC (permalink / raw)
To: u-boot; +Cc: eugen.hristev, mihai.sain
From: Mihai Sain <mihai.sain@microchip.com>
Add new config for storing environment from QSPI1.
Signed-off-by: Mihai Sain <mihai.sain@microchip.com>
[eugen.hristev@microchip.com: cleanup and add MAINTAINERS entry]
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
board/atmel/sama5d2_icp/MAINTAINERS | 1 +
configs/sama5d2_icp_qspiflash_defconfig | 103 ++++++++++++++++++++++++
2 files changed, 104 insertions(+)
create mode 100644 configs/sama5d2_icp_qspiflash_defconfig
diff --git a/board/atmel/sama5d2_icp/MAINTAINERS b/board/atmel/sama5d2_icp/MAINTAINERS
index db984b6ae4..4a65c65ec3 100644
--- a/board/atmel/sama5d2_icp/MAINTAINERS
+++ b/board/atmel/sama5d2_icp/MAINTAINERS
@@ -4,4 +4,5 @@ S: Maintained
F: board/atmel/sama5d2_icp/
F: include/configs/sama5d2_icp.h
F: configs/sama5d2_icp_mmc_defconfig
+F: configs/sama5d2_icp_qspiflash_defconfig
diff --git a/configs/sama5d2_icp_qspiflash_defconfig b/configs/sama5d2_icp_qspiflash_defconfig
new file mode 100644
index 0000000000..c3dd464d7f
--- /dev/null
+++ b/configs/sama5d2_icp_qspiflash_defconfig
@@ -0,0 +1,103 @@
+CONFIG_ARM=y
+CONFIG_ARCH_CPU_INIT=y
+CONFIG_ARCH_AT91=y
+CONFIG_SYS_TEXT_BASE=0x26f00000
+CONFIG_TARGET_SAMA5D2_ICP=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SYS_MEMTEST_START=0x20000000
+CONFIG_SYS_MEMTEST_END=0x40000000
+CONFIG_ENV_SIZE=0x4000
+CONFIG_DM_GPIO=y
+CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_icp"
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_BASE=0xf801c000
+CONFIG_DEBUG_UART_CLOCK=83000000
+CONFIG_DEBUG_UART=y
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
+CONFIG_SYS_BOOT_GET_CMDLINE=y
+CONFIG_SYS_BOOT_GET_KBD=y
+CONFIG_FIT=y
+CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
+CONFIG_QSPI_BOOT=y
+CONFIG_SD_BOOT=y
+CONFIG_BOOTDELAY=3
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyS0,115200 earlycon earlyprintk=serial,ttyS0, ignore_loglevel root=/dev/mmcblk0p2 memtest=0 rootfstype=ext4 rw rootwait"
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_CONFIG=y
+CONFIG_CMD_BOOTZ=y
+# CONFIG_CMD_IMI is not set
+CONFIG_CMD_EEPROM=y
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_SYS_ALT_MEMTEST=y
+CONFIG_CMD_CLK=y
+CONFIG_CMD_DM=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_SDRAM=y
+CONFIG_CMD_SF_TEST=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_GETTIME=y
+CONFIG_CMD_TIMER=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_FAT=y
+CONFIG_OF_CONTROL=y
+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=66000000
+CONFIG_USE_ENV_SPI_MODE=y
+CONFIG_ENV_SPI_MODE=0x0
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_DM=y
+CONFIG_CLK=y
+CONFIG_CLK_AT91=y
+CONFIG_AT91_UTMI=y
+CONFIG_AT91_H32MX=y
+CONFIG_AT91_GENERIC_CLK=y
+CONFIG_ATMEL_PIO4=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_AT91=y
+CONFIG_I2C_EEPROM=y
+CONFIG_MICROCHIP_FLEXCOM=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ATMEL=y
+CONFIG_MTD=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=2
+CONFIG_SF_DEFAULT_SPEED=66000000
+CONFIG_SPI_FLASH_SFDP_SUPPORT=y
+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
+CONFIG_PINCTRL_AT91PIO4=y
+CONFIG_DM_SERIAL=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_ATMEL_PIT_TIMER=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_SPL_OF_LIBFDT=y
+# CONFIG_EFI_LOADER_HII is not set
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/4] ARM: dts: at91: sama5d2_icp: add QSPI1 device
2021-08-17 10:29 [PATCH 1/4] ARM: dts: at91: sama5d2_icp: add QSPI1 device Eugen Hristev
` (2 preceding siblings ...)
2021-08-17 10:29 ` [PATCH 4/4] configs: sama5d2: add qspi config for QSPI1 Eugen Hristev
@ 2021-09-07 9:25 ` Eugen.Hristev
3 siblings, 0 replies; 6+ messages in thread
From: Eugen.Hristev @ 2021-09-07 9:25 UTC (permalink / raw)
To: u-boot; +Cc: Mihai.Sain
On 8/17/21 1:29 PM, Eugen Hristev wrote:
> From: Mihai Sain <mihai.sain@microchip.com>
>
> Add support for sst26vf064b 64Mbit qspi-flash that is
> present on sama5d2_icp board.
>
> Signed-off-by: Mihai Sain <mihai.sain@microchip.com>
> [eugen.hristev@microchip.com: move u-boot properties to sama5d2_icp-u-boot.dtsi]
> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
> ---
Applied whole series to u-boot-atmel/next , thanks !
^ permalink raw reply [flat|nested] 6+ messages in thread