[PATCH 2/4] configs: at91: sam9x60: Switch to new reset driver

[Eugen Hristev]

Hi Alexander,

On 8/9/23 17:16, Alexander Dahl wrote:
> Since commit 61040097a9d1 ("reset: at91: Add reset driver for basic
> assert/deassert operations") the compatible "microchip,sam9x60-rstc" for
> the sam9x60 reset controller in sam9x60.dtsi is not handled by
> CONFIG_SYSRESET_AT91 anymore, but by CONFIG_RESET_AT91 now.  This
> resulted in the following error message, when trying to reset from
> U-Boot shell:
> 
>      U-Boot> reset
>      resetting ...
>      System reset not supported on this platform
>      ### ERROR ### Please RESET the board ###
> 
> Fixed with the switch to the new driver.  Tested on sam9x60-curiosity
> board.  Defconfigs for sam9x60ek adapted in the same way, but without
> testing.  These should be all sam9x60 boards affected in U-Boot here.

 From what I remember from the top of my head, it makes sense to use the 
new reset driver, however, you should not remove the old SYSRESET 
driver, because that driver handles different kind of resets on the SoC 
and PHYs. Can you double check that?

> 
> Signed-off-by: Alexander Dahl <ada at thorsis.com>
> ---
>   configs/sam9x60_curiosity_mmc1_defconfig | 4 ++--
>   configs/sam9x60_curiosity_mmc_defconfig  | 4 ++--
>   configs/sam9x60ek_mmc_defconfig          | 4 ++--
>   configs/sam9x60ek_nandflash_defconfig    | 4 ++--
>   configs/sam9x60ek_qspiflash_defconfig    | 4 ++--
>   5 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/configs/sam9x60_curiosity_mmc1_defconfig b/configs/sam9x60_curiosity_mmc1_defconfig
> index 21b2cc2edd..e8781b363b 100644
> --- a/configs/sam9x60_curiosity_mmc1_defconfig
> +++ b/configs/sam9x60_curiosity_mmc1_defconfig
> @@ -14,6 +14,7 @@ CONFIG_DM_GPIO=y
>   CONFIG_DEFAULT_DEVICE_TREE="at91-sam9x60_curiosity"
>   CONFIG_SYS_PROMPT="U-Boot> "
>   CONFIG_OF_LIBFDT_OVERLAY=y
> +CONFIG_DM_RESET=y
>   CONFIG_DEBUG_UART_BASE=0xfffff200
>   CONFIG_DEBUG_UART_CLOCK=200000000
>   CONFIG_DEBUG_UART_BOARD_INIT=y
> @@ -79,11 +80,10 @@ CONFIG_PHY_MICREL=y
>   CONFIG_MACB=y
>   CONFIG_PINCTRL=y
>   CONFIG_PINCTRL_AT91=y
> +CONFIG_RESET_AT91=y
>   CONFIG_DM_SERIAL=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
> -CONFIG_SYSRESET=y
> -CONFIG_SYSRESET_AT91=y
>   CONFIG_TIMER=y
>   CONFIG_MCHP_PIT64B_TIMER=y
>   CONFIG_W1=y
> diff --git a/configs/sam9x60_curiosity_mmc_defconfig b/configs/sam9x60_curiosity_mmc_defconfig
> index 269f015989..0f57588d8b 100644
> --- a/configs/sam9x60_curiosity_mmc_defconfig
> +++ b/configs/sam9x60_curiosity_mmc_defconfig
> @@ -14,6 +14,7 @@ CONFIG_DM_GPIO=y
>   CONFIG_DEFAULT_DEVICE_TREE="at91-sam9x60_curiosity"
>   CONFIG_SYS_PROMPT="U-Boot> "
>   CONFIG_OF_LIBFDT_OVERLAY=y
> +CONFIG_DM_RESET=y
>   CONFIG_DEBUG_UART_BASE=0xfffff200
>   CONFIG_DEBUG_UART_CLOCK=200000000
>   CONFIG_DEBUG_UART_BOARD_INIT=y
> @@ -79,11 +80,10 @@ CONFIG_PHY_MICREL=y
>   CONFIG_MACB=y
>   CONFIG_PINCTRL=y
>   CONFIG_PINCTRL_AT91=y
> +CONFIG_RESET_AT91=y
>   CONFIG_DM_SERIAL=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
> -CONFIG_SYSRESET=y
> -CONFIG_SYSRESET_AT91=y
>   CONFIG_TIMER=y
>   CONFIG_MCHP_PIT64B_TIMER=y
>   CONFIG_W1=y
> diff --git a/configs/sam9x60ek_mmc_defconfig b/configs/sam9x60ek_mmc_defconfig
> index 2a1399748c..446caceba0 100644
> --- a/configs/sam9x60ek_mmc_defconfig
> +++ b/configs/sam9x60ek_mmc_defconfig
> @@ -15,6 +15,7 @@ CONFIG_DM_GPIO=y
>   CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek"
>   CONFIG_SYS_PROMPT="U-Boot> "
>   CONFIG_OF_LIBFDT_OVERLAY=y
> +CONFIG_DM_RESET=y
>   CONFIG_DEBUG_UART_BASE=0xfffff200
>   CONFIG_DEBUG_UART_CLOCK=200000000
>   CONFIG_DEBUG_UART_BOARD_INIT=y
> @@ -87,14 +88,13 @@ CONFIG_PHY_MICREL=y
>   CONFIG_MACB=y
>   CONFIG_PINCTRL=y
>   CONFIG_PINCTRL_AT91=y
> +CONFIG_RESET_AT91=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_SYSRESET=y
> -CONFIG_SYSRESET_AT91=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_W1=y
> diff --git a/configs/sam9x60ek_nandflash_defconfig b/configs/sam9x60ek_nandflash_defconfig
> index c6c4686658..acaa16ee49 100644
> --- a/configs/sam9x60ek_nandflash_defconfig
> +++ b/configs/sam9x60ek_nandflash_defconfig
> @@ -14,6 +14,7 @@ CONFIG_DM_GPIO=y
>   CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek"
>   CONFIG_SYS_PROMPT="U-Boot> "
>   CONFIG_OF_LIBFDT_OVERLAY=y
> +CONFIG_DM_RESET=y
>   CONFIG_DEBUG_UART_BASE=0xfffff200
>   CONFIG_DEBUG_UART_CLOCK=200000000
>   CONFIG_DEBUG_UART_BOARD_INIT=y
> @@ -89,14 +90,13 @@ CONFIG_PHY_MICREL=y
>   CONFIG_MACB=y
>   CONFIG_PINCTRL=y
>   CONFIG_PINCTRL_AT91=y
> +CONFIG_RESET_AT91=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_SYSRESET=y
> -CONFIG_SYSRESET_AT91=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_W1=y
> diff --git a/configs/sam9x60ek_qspiflash_defconfig b/configs/sam9x60ek_qspiflash_defconfig
> index ef2e2db8b8..6fb79214e5 100644
> --- a/configs/sam9x60ek_qspiflash_defconfig
> +++ b/configs/sam9x60ek_qspiflash_defconfig
> @@ -14,6 +14,7 @@ CONFIG_DM_GPIO=y
>   CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek"
>   CONFIG_SYS_PROMPT="U-Boot> "
>   CONFIG_OF_LIBFDT_OVERLAY=y
> +CONFIG_DM_RESET=y
>   CONFIG_DEBUG_UART_BASE=0xfffff200
>   CONFIG_DEBUG_UART_CLOCK=200000000
>   CONFIG_DEBUG_UART_BOARD_INIT=y
> @@ -88,14 +89,13 @@ CONFIG_PHY_MICREL=y
>   CONFIG_MACB=y
>   CONFIG_PINCTRL=y
>   CONFIG_PINCTRL_AT91=y
> +CONFIG_RESET_AT91=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_SYSRESET=y
> -CONFIG_SYSRESET_AT91=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_W1=y