15d740b746
* Add u-boot build with a lot of patches that makes the display work in u-boot for boot selection * Upgrade the rockchip kernel to 5.11 mainline with config for the rk3399 devices built-in * Make the rockpro64 and pinebook pro use the newer kernel [ci:skip-build]
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
From 61eb4a33dfbffbf19ab5aca62533d20b0e4cba43 Mon Sep 17 00:00:00 2001
|
|
From: dhivael <dhivael.git@eno.space>
|
|
Date: Sat, 11 Jan 2020 15:04:46 +0100
|
|
Subject: [PATCH] rk3399: light pinebook power and standby leds during early
|
|
boot
|
|
|
|
this is a hack, but it works for now.
|
|
|
|
Origin: https://git.eno.space/pbp-uboot.git/commit/?id=1a01021c9361c4e017cb5b032300f5555c393710
|
|
---
|
|
arch/arm/mach-rockchip/rk3399/rk3399.c | 12 +++++++++++-
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
|
|
index 4fda93b1527..952ac881711 100644
|
|
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
|
|
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
|
|
@@ -19,6 +19,8 @@
|
|
#include <asm/arch-rockchip/hardware.h>
|
|
#include <linux/bitops.h>
|
|
#include <power/regulator.h>
|
|
+#include <dt-bindings/gpio/gpio.h>
|
|
+#include <dt-bindings/pinctrl/rockchip.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
@@ -119,8 +121,8 @@ void board_debug_uart_init(void)
|
|
struct rk3399_grf_regs * const grf = (void *)GRF_BASE;
|
|
#ifdef CONFIG_TARGET_CHROMEBOOK_BOB
|
|
struct rk3399_pmugrf_regs * const pmugrf = (void *)PMUGRF_BASE;
|
|
- struct rockchip_gpio_regs * const gpio = (void *)GPIO0_BASE;
|
|
#endif
|
|
+ struct rockchip_gpio_regs * const gpio = (void *)GPIO0_BASE;
|
|
|
|
#if defined(CONFIG_DEBUG_UART_BASE) && (CONFIG_DEBUG_UART_BASE == 0xff180000)
|
|
/* Enable early UART0 on the RK3399 */
|
|
@@ -153,6 +155,14 @@ void board_debug_uart_init(void)
|
|
spl_gpio_set_pull(&pmugrf->gpio0_p, GPIO(BANK_B, 4), GPIO_PULL_NORMAL);
|
|
#endif /* CONFIG_TARGET_CHROMEBOOK_BOB */
|
|
|
|
+ {
|
|
+ // set GPIO0_A2/B3 to GPIO_ACTIVE_HIGH
|
|
+ // set GPIO0_A2/B3 to OUTPUT
|
|
+ int mask = (1UL << RK_PA2)/* | (1UL << RK_PB3) green LED */;
|
|
+ setbits_le32(&gpio->swport_dr, mask);
|
|
+ setbits_le32(&gpio->swport_ddr, mask);
|
|
+ }
|
|
+
|
|
/* Enable early UART2 channel C on the RK3399 */
|
|
rk_clrsetreg(&grf->gpio4c_iomux,
|
|
GRF_GPIO4C3_SEL_MASK,
|
|
--
|
|
2.25.4
|
|
|