On Thursday, February 23, 2017 08:33:11 PM David Wu wrote:
> From: "david.wu" <david...@rock-chips.com>
>
> This adds the necessary data for handling io voltage domains on the rk3328.
> As interesting tidbit, the rk3328 only contains one iodomain area in the
> regular General Register Files (GRF).
>
> Signed-off-by: david.wu <david...@rock-chips.com>
> Reviewed-by: Heiko Stuebner <he...@sntech.de>
Kevin?
> ---
> .../bindings/power/rockchip-io-domain.txt | 1 +
> drivers/power/avs/rockchip-io-domain.c | 41
> ++++++++++++++++++++++
> 2 files changed, 42 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/power/rockchip-io-domain.txt
> b/Documentation/devicetree/bindings/power/rockchip-io-domain.txt
> index d23dc00..d3a5a93 100644
> --- a/Documentation/devicetree/bindings/power/rockchip-io-domain.txt
> +++ b/Documentation/devicetree/bindings/power/rockchip-io-domain.txt
> @@ -33,6 +33,7 @@ Required properties:
> - compatible: should be one of:
> - "rockchip,rk3188-io-voltage-domain" for rk3188
> - "rockchip,rk3288-io-voltage-domain" for rk3288
> + - "rockchip,rk3328-io-voltage-domain" for rk3328
> - "rockchip,rk3368-io-voltage-domain" for rk3368
> - "rockchip,rk3368-pmu-io-voltage-domain" for rk3368 pmu-domains
> - "rockchip,rk3399-io-voltage-domain" for rk3399
> diff --git a/drivers/power/avs/rockchip-io-domain.c
> b/drivers/power/avs/rockchip-io-domain.c
> index 56bce19..8581252 100644
> --- a/drivers/power/avs/rockchip-io-domain.c
> +++ b/drivers/power/avs/rockchip-io-domain.c
> @@ -43,6 +43,10 @@
> #define RK3288_SOC_CON2_FLASH0 BIT(7)
> #define RK3288_SOC_FLASH_SUPPLY_NUM 2
>
> +#define RK3328_SOC_CON4 0x410
> +#define RK3328_SOC_CON4_VCCIO2 BIT(7)
> +#define RK3328_SOC_VCCIO2_SUPPLY_NUM 1
> +
> #define RK3368_SOC_CON15 0x43c
> #define RK3368_SOC_CON15_FLASH0 BIT(14)
> #define RK3368_SOC_FLASH_SUPPLY_NUM 2
> @@ -166,6 +170,25 @@ static void rk3288_iodomain_init(struct
> rockchip_iodomain *iod)
> dev_warn(iod->dev, "couldn't update flash0 ctrl\n");
> }
>
> +static void rk3328_iodomain_init(struct rockchip_iodomain *iod)
> +{
> + int ret;
> + u32 val;
> +
> + /* if no vccio2 supply we should leave things alone */
> + if (!iod->supplies[RK3328_SOC_VCCIO2_SUPPLY_NUM].reg)
> + return;
> +
> + /*
> + * set vccio2 iodomain to also use this framework
> + * instead of a special gpio.
> + */
> + val = RK3328_SOC_CON4_VCCIO2 | (RK3328_SOC_CON4_VCCIO2 << 16);
> + ret = regmap_write(iod->grf, RK3328_SOC_CON4, val);
> + if (ret < 0)
> + dev_warn(iod->dev, "couldn't update vccio2 vsel ctrl\n");
> +}
> +
> static void rk3368_iodomain_init(struct rockchip_iodomain *iod)
> {
> int ret;
> @@ -247,6 +270,20 @@ static void rk3399_pmu_iodomain_init(struct
> rockchip_iodomain *iod)
> .init = rk3288_iodomain_init,
> };
>
> +static const struct rockchip_iodomain_soc_data soc_data_rk3328 = {
> + .grf_offset = 0x410,
> + .supply_names = {
> + "vccio1",
> + "vccio2",
> + "vccio3",
> + "vccio4",
> + "vccio5",
> + "vccio6",
> + "pmuio",
> + },
> + .init = rk3328_iodomain_init,
> +};
> +
> static const struct rockchip_iodomain_soc_data soc_data_rk3368 = {
> .grf_offset = 0x900,
> .supply_names = {
> @@ -312,6 +349,10 @@ static void rk3399_pmu_iodomain_init(struct
> rockchip_iodomain *iod)
> .data = (void *)&soc_data_rk3288
> },
> {
> + .compatible = "rockchip,rk3328-io-voltage-domain",
> + .data = (void *)&soc_data_rk3328
> + },
> + {
> .compatible = "rockchip,rk3368-io-voltage-domain",
> .data = (void *)&soc_data_rk3368
> },
>
