77 lines
2.7 KiB
Diff
77 lines
2.7 KiB
Diff
From 1af5e42f170d2c4b944beeb875b80ec7f061038a Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Jirman <megi@xff.cz>
|
|
Date: Thu, 25 May 2023 15:27:08 +0200
|
|
Subject: [PATCH] pinephone-pro: Fix I/O port voltage (GPIO3D4A is 1.8V)
|
|
|
|
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>
|
|
---
|
|
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 eb639cd0d07..b6ccbb9c1c4 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.41.0
|
|
|
|
From 6a7f8be74b44013513e51f5e7979dcc410ca2723 Mon Sep 17 00:00:00 2001
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
|
Date: Sun, 11 Jun 2023 18:13:19 +0100
|
|
Subject: [PATCH] rockchip: Pinephone Pro: Add DDR RAM type config
|
|
|
|
Add the RAM_ROCKCHIP_LPDDR4 to fix the Pinephone Pro booting.
|
|
When the configs were updated in 26f92be07e2 it somehow broke
|
|
the PPP boot process so let's fix it.
|
|
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
CC: Jagan Teki <jagan@edgeble.ai>
|
|
CC: Kever Yang <kever.yang@rock-chips.com>
|
|
|
|
---
|
|
configs/pinephone-pro-rk3399_defconfig | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/configs/pinephone-pro-rk3399_defconfig b/configs/pinephone-pro-rk3399_defconfig
|
|
index 4edea88665f..e4a8beeb1ab 100644
|
|
--- a/configs/pinephone-pro-rk3399_defconfig
|
|
+++ b/configs/pinephone-pro-rk3399_defconfig
|
|
@@ -73,6 +73,7 @@ CONFIG_PMIC_RK8XX=y
|
|
CONFIG_REGULATOR_PWM=y
|
|
CONFIG_REGULATOR_RK8XX=y
|
|
CONFIG_PWM_ROCKCHIP=y
|
|
+CONFIG_RAM_ROCKCHIP_LPDDR4=y
|
|
CONFIG_DM_RNG=y
|
|
CONFIG_RNG_ROCKCHIP=y
|
|
CONFIG_BAUDRATE=1500000
|
|
--
|
|
2.41.0
|
|
|