[PATCH 09/11] rockchip: vamrs: rock960: Migrate to use IO-domain driver

[Kever Yang]

On 2024/2/18 02:35, Jonas Karlman wrote:
> Switch to use the IO-domain driver to configure IO-domain based on
> device tree instead of a setup_iodomain() function.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   board/vamrs/rock960_rk3399/Makefile         |  6 -----
>   board/vamrs/rock960_rk3399/rock960-rk3399.c | 27 ---------------------
>   configs/ficus-rk3399_defconfig              |  1 +
>   configs/rock960-rk3399_defconfig            |  1 +
>   4 files changed, 2 insertions(+), 33 deletions(-)
>   delete mode 100644 board/vamrs/rock960_rk3399/Makefile
>   delete mode 100644 board/vamrs/rock960_rk3399/rock960-rk3399.c
>
> diff --git a/board/vamrs/rock960_rk3399/Makefile b/board/vamrs/rock960_rk3399/Makefile
> deleted file mode 100644
> index 6c3e475b3a85..000000000000
> --- a/board/vamrs/rock960_rk3399/Makefile
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -# SPDX-License-Identifier: GPL-2.0+
> -#
> -# Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam at linaro.org>
> -#
> -
> -obj-y	+= rock960-rk3399.o
> diff --git a/board/vamrs/rock960_rk3399/rock960-rk3399.c b/board/vamrs/rock960_rk3399/rock960-rk3399.c
> deleted file mode 100644
> index 876be8ed9e10..000000000000
> --- a/board/vamrs/rock960_rk3399/rock960-rk3399.c
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+
> -/*
> - * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam at linaro.org>
> - */
> -
> -#include <common.h>
> -#include <syscon.h>
> -#include <asm/arch-rockchip/clock.h>
> -#include <asm/arch-rockchip/grf_rk3399.h>
> -#include <asm/arch-rockchip/hardware.h>
> -#include <linux/bitops.h>
> -
> -#ifdef CONFIG_MISC_INIT_R
> -int misc_init_r(void)
> -{
> -	struct rk3399_grf_regs *grf =
> -	    syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
> -
> -	/**
> -	 * Some SSD's to work on rock960 would require explicit
> -	 * domain voltage change, so BT565 is in 1.8v domain
> -	 */
> -	rk_setreg(&grf->io_vsel, BIT(0));
> -
> -	return 0;
> -}
> -#endif
> diff --git a/configs/ficus-rk3399_defconfig b/configs/ficus-rk3399_defconfig
> index 3ff894f1207b..5f6cdeb99d50 100644
> --- a/configs/ficus-rk3399_defconfig
> +++ b/configs/ficus-rk3399_defconfig
> @@ -42,6 +42,7 @@ CONFIG_SYS_MMC_ENV_DEV=1
>   CONFIG_NET_RANDOM_ETHADDR=y
>   CONFIG_ROCKCHIP_GPIO=y
>   CONFIG_SYS_I2C_ROCKCHIP=y
> +CONFIG_ROCKCHIP_IODOMAIN=y
>   CONFIG_MMC_DW=y
>   CONFIG_MMC_DW_ROCKCHIP=y
>   CONFIG_MMC_SDHCI=y
> diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
> index 6e22b83ec910..1685fe3c19e7 100644
> --- a/configs/rock960-rk3399_defconfig
> +++ b/configs/rock960-rk3399_defconfig
> @@ -49,6 +49,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>   CONFIG_SYS_MMC_ENV_DEV=1
>   CONFIG_ROCKCHIP_GPIO=y
>   CONFIG_SYS_I2C_ROCKCHIP=y
> +CONFIG_ROCKCHIP_IODOMAIN=y
>   CONFIG_MMC_DW=y
>   CONFIG_MMC_DW_ROCKCHIP=y
>   CONFIG_MMC_SDHCI=y