Merge tag 'v6.12-rockchip-drivers-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/drivers
rk3308 io-domains, and some default settings for bits in the general register files for rk3128 and the new rk3576 soc. * tag 'v6.12-rockchip-drivers-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: soc: rockchip: grf: Add rk3576 default GRF values dt-bindings: soc: rockchip: Add rk3576 syscon compatibles soc: rockchip: grf: Set RK3128's vpu main clock soc: rockchip: io-domain: Add RK3308 IO voltage domains dt-bindings: power: rockchip: Document RK3308 IO voltage domains Link: https://lore.kernel.org/r/23316481.ssLaC8jLEa@diego Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
@@ -50,6 +50,7 @@ properties:
|
||||
- rockchip,rk3188-io-voltage-domain
|
||||
- rockchip,rk3228-io-voltage-domain
|
||||
- rockchip,rk3288-io-voltage-domain
|
||||
- rockchip,rk3308-io-voltage-domain
|
||||
- rockchip,rk3328-io-voltage-domain
|
||||
- rockchip,rk3368-io-voltage-domain
|
||||
- rockchip,rk3368-pmu-io-voltage-domain
|
||||
@@ -71,6 +72,7 @@ allOf:
|
||||
- $ref: "#/$defs/rk3188"
|
||||
- $ref: "#/$defs/rk3228"
|
||||
- $ref: "#/$defs/rk3288"
|
||||
- $ref: "#/$defs/rk3308"
|
||||
- $ref: "#/$defs/rk3328"
|
||||
- $ref: "#/$defs/rk3368"
|
||||
- $ref: "#/$defs/rk3368-pmu"
|
||||
@@ -194,6 +196,28 @@ $defs:
|
||||
wifi-supply:
|
||||
description: The supply connected to APIO3_VDD. Also known as SDIO0.
|
||||
|
||||
rk3308:
|
||||
if:
|
||||
properties:
|
||||
compatible:
|
||||
contains:
|
||||
const: rockchip,rk3308-io-voltage-domain
|
||||
|
||||
then:
|
||||
properties:
|
||||
vccio0-supply:
|
||||
description: The supply connected to VCCIO0.
|
||||
vccio1-supply:
|
||||
description: The supply connected to VCCIO1.
|
||||
vccio2-supply:
|
||||
description: The supply connected to VCCIO2.
|
||||
vccio3-supply:
|
||||
description: The supply connected to VCCIO3.
|
||||
vccio4-supply:
|
||||
description: The supply connected to VCCIO4.
|
||||
vccio5-supply:
|
||||
description: The supply connected to VCCIO5.
|
||||
|
||||
rk3328:
|
||||
if:
|
||||
properties:
|
||||
|
||||
@@ -20,6 +20,20 @@ properties:
|
||||
- rockchip,rk3568-pipe-grf
|
||||
- rockchip,rk3568-pipe-phy-grf
|
||||
- rockchip,rk3568-usb2phy-grf
|
||||
- rockchip,rk3576-bigcore-grf
|
||||
- rockchip,rk3576-cci-grf
|
||||
- rockchip,rk3576-gpu-grf
|
||||
- rockchip,rk3576-litcore-grf
|
||||
- rockchip,rk3576-npu-grf
|
||||
- rockchip,rk3576-php-grf
|
||||
- rockchip,rk3576-pipe-phy-grf
|
||||
- rockchip,rk3576-pmu1-grf
|
||||
- rockchip,rk3576-sdgmac-grf
|
||||
- rockchip,rk3576-sys-grf
|
||||
- rockchip,rk3576-usb-grf
|
||||
- rockchip,rk3576-usbdpphy-grf
|
||||
- rockchip,rk3576-vo0-grf
|
||||
- rockchip,rk3576-vop-grf
|
||||
- rockchip,rk3588-bigcore0-grf
|
||||
- rockchip,rk3588-bigcore1-grf
|
||||
- rockchip,rk3588-hdptxphy-grf
|
||||
@@ -58,6 +72,8 @@ properties:
|
||||
- rockchip,rk3399-pmugrf
|
||||
- rockchip,rk3568-grf
|
||||
- rockchip,rk3568-pmugrf
|
||||
- rockchip,rk3576-ioc-grf
|
||||
- rockchip,rk3576-pmu0-grf
|
||||
- rockchip,rk3588-usb2phy-grf
|
||||
- rockchip,rv1108-grf
|
||||
- rockchip,rv1108-pmugrf
|
||||
|
||||
@@ -41,9 +41,11 @@ static const struct rockchip_grf_info rk3036_grf __initconst = {
|
||||
};
|
||||
|
||||
#define RK3128_GRF_SOC_CON0 0x140
|
||||
#define RK3128_GRF_SOC_CON1 0x144
|
||||
|
||||
static const struct rockchip_grf_value rk3128_defaults[] __initconst = {
|
||||
{ "jtag switching", RK3128_GRF_SOC_CON0, HIWORD_UPDATE(0, 1, 8) },
|
||||
{ "vpu main clock", RK3128_GRF_SOC_CON1, HIWORD_UPDATE(0, 1, 10) },
|
||||
};
|
||||
|
||||
static const struct rockchip_grf_info rk3128_grf __initconst = {
|
||||
@@ -121,6 +123,29 @@ static const struct rockchip_grf_info rk3566_pipegrf __initconst = {
|
||||
.num_values = ARRAY_SIZE(rk3566_defaults),
|
||||
};
|
||||
|
||||
#define RK3576_SYSGRF_SOC_CON1 0x0004
|
||||
|
||||
static const struct rockchip_grf_value rk3576_defaults_sys_grf[] __initconst = {
|
||||
{ "i3c0 weakpull", RK3576_SYSGRF_SOC_CON1, HIWORD_UPDATE(3, 3, 6) },
|
||||
{ "i3c1 weakpull", RK3576_SYSGRF_SOC_CON1, HIWORD_UPDATE(3, 3, 8) },
|
||||
};
|
||||
|
||||
static const struct rockchip_grf_info rk3576_sysgrf __initconst = {
|
||||
.values = rk3576_defaults_sys_grf,
|
||||
.num_values = ARRAY_SIZE(rk3576_defaults_sys_grf),
|
||||
};
|
||||
|
||||
#define RK3576_IOCGRF_MISC_CON 0x04F0
|
||||
|
||||
static const struct rockchip_grf_value rk3576_defaults_ioc_grf[] __initconst = {
|
||||
{ "jtag switching", RK3576_IOCGRF_MISC_CON, HIWORD_UPDATE(0, 1, 1) },
|
||||
};
|
||||
|
||||
static const struct rockchip_grf_info rk3576_iocgrf __initconst = {
|
||||
.values = rk3576_defaults_ioc_grf,
|
||||
.num_values = ARRAY_SIZE(rk3576_defaults_ioc_grf),
|
||||
};
|
||||
|
||||
#define RK3588_GRF_SOC_CON6 0x0318
|
||||
|
||||
static const struct rockchip_grf_value rk3588_defaults[] __initconst = {
|
||||
@@ -132,7 +157,6 @@ static const struct rockchip_grf_info rk3588_sysgrf __initconst = {
|
||||
.num_values = ARRAY_SIZE(rk3588_defaults),
|
||||
};
|
||||
|
||||
|
||||
static const struct of_device_id rockchip_grf_dt_match[] __initconst = {
|
||||
{
|
||||
.compatible = "rockchip,rk3036-grf",
|
||||
@@ -158,6 +182,12 @@ static const struct of_device_id rockchip_grf_dt_match[] __initconst = {
|
||||
}, {
|
||||
.compatible = "rockchip,rk3566-pipe-grf",
|
||||
.data = (void *)&rk3566_pipegrf,
|
||||
}, {
|
||||
.compatible = "rockchip,rk3576-sys-grf",
|
||||
.data = (void *)&rk3576_sysgrf,
|
||||
}, {
|
||||
.compatible = "rockchip,rk3576-ioc-grf",
|
||||
.data = (void *)&rk3576_iocgrf,
|
||||
}, {
|
||||
.compatible = "rockchip,rk3588-sys-grf",
|
||||
.data = (void *)&rk3588_sysgrf,
|
||||
|
||||
@@ -39,6 +39,10 @@
|
||||
#define RK3288_SOC_CON2_FLASH0 BIT(7)
|
||||
#define RK3288_SOC_FLASH_SUPPLY_NUM 2
|
||||
|
||||
#define RK3308_SOC_CON0 0x300
|
||||
#define RK3308_SOC_CON0_VCCIO3 BIT(8)
|
||||
#define RK3308_SOC_VCCIO3_SUPPLY_NUM 3
|
||||
|
||||
#define RK3328_SOC_CON4 0x410
|
||||
#define RK3328_SOC_CON4_VCCIO2 BIT(7)
|
||||
#define RK3328_SOC_VCCIO2_SUPPLY_NUM 1
|
||||
@@ -229,6 +233,25 @@ static void rk3288_iodomain_init(struct rockchip_iodomain *iod)
|
||||
dev_warn(iod->dev, "couldn't update flash0 ctrl\n");
|
||||
}
|
||||
|
||||
static void rk3308_iodomain_init(struct rockchip_iodomain *iod)
|
||||
{
|
||||
int ret;
|
||||
u32 val;
|
||||
|
||||
/* if no vccio3 supply we should leave things alone */
|
||||
if (!iod->supplies[RK3308_SOC_VCCIO3_SUPPLY_NUM].reg)
|
||||
return;
|
||||
|
||||
/*
|
||||
* set vccio3 iodomain to also use this framework
|
||||
* instead of a special gpio.
|
||||
*/
|
||||
val = RK3308_SOC_CON0_VCCIO3 | (RK3308_SOC_CON0_VCCIO3 << 16);
|
||||
ret = regmap_write(iod->grf, RK3308_SOC_CON0, val);
|
||||
if (ret < 0)
|
||||
dev_warn(iod->dev, "couldn't update vccio3 vsel ctrl\n");
|
||||
}
|
||||
|
||||
static void rk3328_iodomain_init(struct rockchip_iodomain *iod)
|
||||
{
|
||||
int ret;
|
||||
@@ -376,6 +399,19 @@ static const struct rockchip_iodomain_soc_data soc_data_rk3288 = {
|
||||
.init = rk3288_iodomain_init,
|
||||
};
|
||||
|
||||
static const struct rockchip_iodomain_soc_data soc_data_rk3308 = {
|
||||
.grf_offset = 0x300,
|
||||
.supply_names = {
|
||||
"vccio0",
|
||||
"vccio1",
|
||||
"vccio2",
|
||||
"vccio3",
|
||||
"vccio4",
|
||||
"vccio5",
|
||||
},
|
||||
.init = rk3308_iodomain_init,
|
||||
};
|
||||
|
||||
static const struct rockchip_iodomain_soc_data soc_data_rk3328 = {
|
||||
.grf_offset = 0x410,
|
||||
.supply_names = {
|
||||
@@ -528,6 +564,10 @@ static const struct of_device_id rockchip_iodomain_match[] = {
|
||||
.compatible = "rockchip,rk3288-io-voltage-domain",
|
||||
.data = &soc_data_rk3288
|
||||
},
|
||||
{
|
||||
.compatible = "rockchip,rk3308-io-voltage-domain",
|
||||
.data = &soc_data_rk3308
|
||||
},
|
||||
{
|
||||
.compatible = "rockchip,rk3328-io-voltage-domain",
|
||||
.data = &soc_data_rk3328
|
||||
|
||||
Reference in New Issue
Block a user