Fixes for the Pinephone Pro, RockPro64
This commit is contained in:
Peter Robinson
parent
181c3671e7
commit
0d5f023cd6
|
|
@ -0,0 +1,41 @@
|
|||
From ed5ffb3b53690a47333b931301a3765b9588b5dc Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Sun, 11 Jun 2023 21:22:41 +0100
|
||||
Subject: [PATCH] Revert "rockchip: rockpro64: Build u-boot-rockchip-spi.bin"
|
||||
|
||||
This reverts commit 5713135ecc75660684ff3eb6cfba7bc11eb6433c.
|
||||
---
|
||||
configs/rockpro64-rk3399_defconfig | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
|
||||
index f41c0306790..0ca2cecade2 100644
|
||||
--- a/configs/rockpro64-rk3399_defconfig
|
||||
+++ b/configs/rockpro64-rk3399_defconfig
|
||||
@@ -11,7 +11,6 @@ CONFIG_ENV_OFFSET=0x3F8000
|
||||
CONFIG_DEFAULT_DEVICE_TREE="rk3399-rockpro64"
|
||||
CONFIG_DM_RESET=y
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
-CONFIG_ROCKCHIP_SPI_IMAGE=y
|
||||
CONFIG_TARGET_ROCKPRO64_RK3399=y
|
||||
CONFIG_SPL_STACK=0x400000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
@@ -21,7 +20,6 @@ CONFIG_SPL_SPI=y
|
||||
CONFIG_SYS_LOAD_ADDR=0x800800
|
||||
CONFIG_PCI=y
|
||||
CONFIG_DEBUG_UART=y
|
||||
-CONFIG_LTO=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
CONFIG_BOOTSTAGE=y
|
||||
CONFIG_BOOTSTAGE_REPORT=y
|
||||
@@ -39,7 +37,6 @@ CONFIG_SPL_BSS_MAX_SIZE=0x2000
|
||||
CONFIG_SPL_STACK_R=y
|
||||
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
|
||||
CONFIG_SPL_SPI_LOAD=y
|
||||
-CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
|
||||
CONFIG_TPL=y
|
||||
CONFIG_CMD_BOOTZ=y
|
||||
CONFIG_CMD_GPT=y
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
|
@ -0,0 +1,127 @@
|
|||
From 671b2e758900f4a733d6840b2f39bc24dd63cfdb Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Jirman <megi@xff.cz>
|
||||
Date: Thu, 25 May 2023 14:18:17 +0200
|
||||
Subject: [PATCH] i2c: rockchip: De-initialize the bus after start bit failure
|
||||
|
||||
Failure can happen when i2c is used without initializing pinctrl properly,
|
||||
which U-Boot happily allows in SPL. Without this fix, further I2C access would
|
||||
fail, even after proper pinctrl initialization.
|
||||
|
||||
Signed-off-by: Ondrej Jirman <megi@xff.cz>
|
||||
Cc: Heiko Schocher <hs@denx.de>
|
||||
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
|
||||
Reviewed-by: Heiko Schocher <hs@denx.de>
|
||||
---
|
||||
drivers/i2c/rk_i2c.c | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c
|
||||
index f8fac45b6ca..9927af94a80 100644
|
||||
--- a/drivers/i2c/rk_i2c.c
|
||||
+++ b/drivers/i2c/rk_i2c.c
|
||||
@@ -342,7 +342,7 @@ static int rockchip_i2c_xfer(struct udevice *bus, struct i2c_msg *msg,
|
||||
int nmsgs)
|
||||
{
|
||||
struct rk_i2c *i2c = dev_get_priv(bus);
|
||||
- int ret;
|
||||
+ int ret = 0;
|
||||
|
||||
debug("i2c_xfer: %d messages\n", nmsgs);
|
||||
for (; nmsgs > 0; nmsgs--, msg++) {
|
||||
@@ -356,14 +356,15 @@ static int rockchip_i2c_xfer(struct udevice *bus, struct i2c_msg *msg,
|
||||
}
|
||||
if (ret) {
|
||||
debug("i2c_write: error sending\n");
|
||||
- return -EREMOTEIO;
|
||||
+ ret = -EREMOTEIO;
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
|
||||
rk_i2c_send_stop_bit(i2c);
|
||||
rk_i2c_disable(i2c);
|
||||
|
||||
- return 0;
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
int rockchip_i2c_set_bus_speed(struct udevice *bus, unsigned int speed)
|
||||
--
|
||||
2.41.0
|
||||
|
||||
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
|
||||
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
Name: uboot-tools
|
||||
Version: 2023.07
|
||||
Release: 0.1%{?candidate:.%{candidate}}%{?dist}
|
||||
Release: 0.2%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
||||
URL: http://www.denx.de/wiki/U-Boot
|
||||
|
|
@ -26,6 +26,8 @@ Patch2: smbios-Simplify-reporting-of-unknown-values.patch
|
|||
Patch3: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
||||
# Rockchips improvements
|
||||
Patch6: rockchip-Add-initial-support-for-the-PinePhone-Pro.patch
|
||||
Patch7: rockchip-PinePhone-Pro-fixes.patch
|
||||
Patch8: 0001-Revert-rockchip-rockpro64-Build-u-boot-rockchip-spi..patch
|
||||
|
||||
BuildRequires: bc
|
||||
BuildRequires: bison
|
||||
|
|
@ -210,6 +212,10 @@ cp -p board/sunxi/README.nand builds/docs/README.sunxi-nand
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Sun Jun 11 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.07-0.2.rc3
|
||||
- Update to 2023.07 RC3
|
||||
- Fixes for the Pinephone Pro, RockPro64
|
||||
|
||||
* Wed May 17 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.07-0.1.rc2
|
||||
- Update to 2023.07 RC2
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue