diff options
| author | Frank Wunderlich <frank-w@public-files.de> | 2022-05-14 17:56:09 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-05-16 10:28:31 +0200 |
| commit | afff835cb96938ee98409a3c9788aa703acaf5d6 (patch) | |
| tree | 594e5de7a718a707f0faa727b999948c70cc9615 | |
| parent | 0c9bf7cada39c5f41c4f3f32c8262b288173c612 (diff) | |
| download | barebox-afff835cb96938ee98409a3c9788aa703acaf5d6.tar.gz barebox-afff835cb96938ee98409a3c9788aa703acaf5d6.tar.xz | |
ARM: rockchip: fix iodomain for r2pro V1.0
Current code sets vccio4 and vccio6 both to 1v8. R2Pro v1.0 needs 3v3
setting on vccio4, else gmac0 (switch for lan-ports) will be damaged.
IO-domain is per default 3v3 so only vccio6 needs to be set to 1v8 and
clear this bit in the 3v3 register.
Fixes: 8ba96c5942d6 ("ARM: rockchip: add BPI-R2-Pro V00 board")
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
Link: https://lore.barebox.org/20220514155609.8306-1-linux@fw-web.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c | 9 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/include/mach/rockchip.h | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c b/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c index 9f039c6048..f79f975080 100644 --- a/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c +++ b/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c @@ -16,10 +16,13 @@ static noinline void rk3568_start(void) void *fdt; /* - * Enable vccio4 1.8V and vccio6 1.8V - * Needed for GMAC to work. + * set iodomain vccio6 to 1.8V needed for GMAC1 to work. + * vccio4 (gmac0/switch) needs to stay at 3v3 (default) */ - writel(RK_SETBITS(0x50), 0xfdc20140); + //set bit 6 in PMU_GRF_IO_VSEL0 for vccio6 1v8 + writel(RK_SETBITS(BIT(6)), PMU_GRF_IO_VSEL0); + //clear bit 6 for 3v3 as it was set to 1v8 + writel(RK_CLRBITS(BIT(6)), PMU_GRF_IO_VSEL1); fdt = __dtb_rk3568_bpi_r2_pro_start; diff --git a/arch/arm/mach-rockchip/include/mach/rockchip.h b/arch/arm/mach-rockchip/include/mach/rockchip.h index f24db36f01..ff8b1109f8 100644 --- a/arch/arm/mach-rockchip/include/mach/rockchip.h +++ b/arch/arm/mach-rockchip/include/mach/rockchip.h @@ -23,6 +23,9 @@ static inline int rk3288_init(void) #ifdef CONFIG_ARCH_RK3568 int rk3568_init(void); +#define PMU_GRF 0xfdc20000 +#define PMU_GRF_IO_VSEL0 (PMU_GRF + 0x140) +#define PMU_GRF_IO_VSEL1 (PMU_GRF + 0x144) #else static inline int rk3568_init(void) { |