Message ID | 20230525132708.855753-1-megi@xff.cz |
---|---|
State | Accepted |
Commit | 3856a3d6449484d29b32e09350888832cf5a0c10 |
Delegated to: | Kever Yang |
Headers | show |
Series | pinephone-pro: Fix I/O port voltage (GPIO3D4A is 1.8V) | expand |
Hi Ondrej, Thanks for your patch. On 2023/5/25 21:27, Ondřej Jirman wrote: > From: Ondrej Jirman <megi@xff.cz> > > This fixes access to camera sensor over I2C during probe time in > the kernel. (Kernel will fix I/0 port voltage by itself, but the > timing depends on probe order of the drivers, so the fix can > come after the camera sensor driver already failed to probe.) > > Signed-off-by: Ondrej Jirman <megi@xff.cz> > Cc: Kever Yang <kever.yang@rock-chips.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c b/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c > index eb639cd0d070..b6ccbb9c1c4b 100644 > --- a/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c > +++ b/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c > @@ -15,7 +15,8 @@ > #include <asm/arch-rockchip/misc.h> > #include <power/regulator.h> > > -#define GRF_IO_VSEL_BT565_SHIFT 0 > +#define GRF_IO_VSEL_BT565_GPIO2AB 1 > +#define GRF_IO_VSEL_AUDIO_GPIO3D4A 2 > #define PMUGRF_CON0_VSEL_SHIFT 8 > > #ifndef CONFIG_SPL_BUILD > @@ -48,7 +49,8 @@ static void setup_iodomain(void) > syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF); > > /* BT565 is in 1.8v domain */ > - rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_BT565_SHIFT); > + rk_setreg(&grf->io_vsel, > + GRF_IO_VSEL_BT565_GPIO2AB | GRF_IO_VSEL_AUDIO_GPIO3D4A); > > /* Set GPIO1 1.8v/3.0v source select to PMU1830_VOL */ > rk_setreg(&pmugrf->soc_con0, 1 << PMUGRF_CON0_VSEL_SHIFT);
On Thu, May 25, 2023 at 2:27 PM Ondřej Jirman <megi@xff.cz> wrote: > > From: Ondrej Jirman <megi@xff.cz> > > This fixes access to camera sensor over I2C during probe time in > the kernel. (Kernel will fix I/0 port voltage by itself, but the > timing depends on probe order of the drivers, so the fix can > come after the camera sensor driver already failed to probe.) > > Signed-off-by: Ondrej Jirman <megi@xff.cz> Reviewed-by: Peter Robinson <pbrobinson@gmail.com> Tested-by: Peter Robinson <pbrobinson@gmail.com> > Cc: Kever Yang <kever.yang@rock-chips.com> > --- > board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c b/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c > index eb639cd0d070..b6ccbb9c1c4b 100644 > --- a/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c > +++ b/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c > @@ -15,7 +15,8 @@ > #include <asm/arch-rockchip/misc.h> > #include <power/regulator.h> > > -#define GRF_IO_VSEL_BT565_SHIFT 0 > +#define GRF_IO_VSEL_BT565_GPIO2AB 1 > +#define GRF_IO_VSEL_AUDIO_GPIO3D4A 2 > #define PMUGRF_CON0_VSEL_SHIFT 8 > > #ifndef CONFIG_SPL_BUILD > @@ -48,7 +49,8 @@ static void setup_iodomain(void) > syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF); > > /* BT565 is in 1.8v domain */ > - rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_BT565_SHIFT); > + rk_setreg(&grf->io_vsel, > + GRF_IO_VSEL_BT565_GPIO2AB | GRF_IO_VSEL_AUDIO_GPIO3D4A); > > /* Set GPIO1 1.8v/3.0v source select to PMU1830_VOL */ > rk_setreg(&pmugrf->soc_con0, 1 << PMUGRF_CON0_VSEL_SHIFT); > -- > 2.40.1 >
diff --git a/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c b/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c index eb639cd0d070..b6ccbb9c1c4b 100644 --- a/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c +++ b/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c @@ -15,7 +15,8 @@ #include <asm/arch-rockchip/misc.h> #include <power/regulator.h> -#define GRF_IO_VSEL_BT565_SHIFT 0 +#define GRF_IO_VSEL_BT565_GPIO2AB 1 +#define GRF_IO_VSEL_AUDIO_GPIO3D4A 2 #define PMUGRF_CON0_VSEL_SHIFT 8 #ifndef CONFIG_SPL_BUILD @@ -48,7 +49,8 @@ static void setup_iodomain(void) syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF); /* BT565 is in 1.8v domain */ - rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_BT565_SHIFT); + rk_setreg(&grf->io_vsel, + GRF_IO_VSEL_BT565_GPIO2AB | GRF_IO_VSEL_AUDIO_GPIO3D4A); /* Set GPIO1 1.8v/3.0v source select to PMU1830_VOL */ rk_setreg(&pmugrf->soc_con0, 1 << PMUGRF_CON0_VSEL_SHIFT);