Re: [PATCH v3 12/12] rockchip: fix boot_devices constants

Kever Yang
2022-03-28T12:51:49Z

On 2022/3/4 07:52, Johan Jonker wrote:
> The DT node name pattern in mmc-controller.yaml for mmc
> is "^mmc(@.*)?$". The Rockchip mmc nodes have been synced
> with Linux, so update the boot_devices constants as well.
>
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
> arch/arm/mach-rockchip/rk3188/rk3188.c | 4 ++--
> arch/arm/mach-rockchip/rk322x/rk322x.c | 4 ++--
> arch/arm/mach-rockchip/rk3288/rk3288.c | 4 ++--
> arch/arm/mach-rockchip/rk3328/rk3328.c | 4 ++--
> arch/arm/mach-rockchip/rk3368/rk3368.c | 4 ++--
> 5 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c
> index 5a02914e..df8fa156 100644
> --- a/arch/arm/mach-rockchip/rk3188/rk3188.c
> +++ b/arch/arm/mach-rockchip/rk3188/rk3188.c
> @@ -21,8 +21,8 @@
> #define GRF_BASE 0x20008000
>
> const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
> - [BROM_BOOTSOURCE_EMMC] = "/dwmmc@1021c000",
> - [BROM_BOOTSOURCE_SD] = "/dwmmc@10214000",
> + [BROM_BOOTSOURCE_EMMC] = "/mmc@1021c000",
> + [BROM_BOOTSOURCE_SD] = "/mmc@10214000",
> };
>
> #ifdef CONFIG_DEBUG_UART_BOARD_INIT
> diff --git a/arch/arm/mach-rockchip/rk322x/rk322x.c b/arch/arm/mach-rockchip/rk322x/rk322x.c
> index ad4ac62e..a304795f 100644
> --- a/arch/arm/mach-rockchip/rk322x/rk322x.c
> +++ b/arch/arm/mach-rockchip/rk322x/rk322x.c
> @@ -9,8 +9,8 @@
> #include <asm/arch-rockchip/hardware.h>
>
> const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
> - [BROM_BOOTSOURCE_EMMC] = "/dwmmc@30020000",
> - [BROM_BOOTSOURCE_SD] = "/dwmmc@30000000",
> + [BROM_BOOTSOURCE_EMMC] = "/mmc@30020000",
> + [BROM_BOOTSOURCE_SD] = "/mmc@30000000",
> };
>
> #ifdef CONFIG_DEBUG_UART_BOARD_INIT
> diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
> index bc20bc5a..3ad28875 100644
> --- a/arch/arm/mach-rockchip/rk3288/rk3288.c
> +++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
> @@ -28,8 +28,8 @@ DECLARE_GLOBAL_DATA_PTR;
> #define GRF_BASE 0xff770000
>
> const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
> - [BROM_BOOTSOURCE_EMMC] = "/dwmmc@ff0f0000",
> - [BROM_BOOTSOURCE_SD] = "/dwmmc@ff0c0000",
> + [BROM_BOOTSOURCE_EMMC] = "/mmc@ff0f0000",
> + [BROM_BOOTSOURCE_SD] = "/mmc@ff0c0000",
> };
>
> #ifdef CONFIG_SPL_BUILD
> diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c
> index ec3336cb..de17b886 100644
> --- a/arch/arm/mach-rockchip/rk3328/rk3328.c
> +++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
> @@ -21,8 +21,8 @@ DECLARE_GLOBAL_DATA_PTR;
> #define FW_DDR_CON_REG 0xFF7C0040
>
> const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
> - [BROM_BOOTSOURCE_EMMC] = "/rksdmmc@ff520000",
> - [BROM_BOOTSOURCE_SD] = "/rksdmmc@ff500000",
> + [BROM_BOOTSOURCE_EMMC] = "/mmc@ff520000",
> + [BROM_BOOTSOURCE_SD] = "/mmc@ff500000",
> };
>
> static struct mm_region rk3328_mem_map[] = {
> diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c
> index 9b7132d4..d0a6107e 100644
> --- a/arch/arm/mach-rockchip/rk3368/rk3368.c
> +++ b/arch/arm/mach-rockchip/rk3368/rk3368.c
> @@ -58,8 +58,8 @@ static struct mm_region rk3368_mem_map[] = {
> struct mm_region *mem_map = rk3368_mem_map;
>
> const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
> - [BROM_BOOTSOURCE_EMMC] = "/dwmmc@ff0f0000",
> - [BROM_BOOTSOURCE_SD] = "/dwmmc@ff0c0000",
> + [BROM_BOOTSOURCE_EMMC] = "/mmc@ff0f0000",
> + [BROM_BOOTSOURCE_SD] = "/mmc@ff0c0000",
> };
>
> #ifdef CONFIG_ARCH_EARLY_INIT_R