[ rockchip64 ] renegade u-boot tweaks

This commit is contained in:
Thomas McKahan 2019-03-20 00:21:54 -04:00
parent a81df41f0b
commit 377324db9d
2 changed files with 114 additions and 0 deletions

View file

@ -0,0 +1,63 @@
From 6c8818cd725efe738184f87fe067d0066d116db0 Mon Sep 17 00:00:00 2001
From: zouxf <zxf@t-tchip.com.cn>
Date: Sat, 10 Mar 2018 14:12:29 +0800
Subject: [PATCH] add recovery button
Change-Id: If4a7bb9bfdadea8d09c47b6aded2ef6a75302f1b
---
arch/arm/dts/rk3328-roc-cc.dts | 5 +++++
arch/arm/mach-rockchip/Kconfig | 1 +
arch/arm/mach-rockchip/boot_mode.c | 2 +-
arch/arm/mach-rockchip/rk3328/Kconfig | 1 +
arch/arm/mach-rockchip/rk3328/rk3328.c | 8 ++++++++
5 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/arch/arm/dts/rk3328-roc-cc.dts b/arch/arm/dts/rk3328-roc-cc.dts
index 4f3c2cf935..eab84c7769 100644
--- a/arch/arm/dts/rk3328-roc-cc.dts
+++ b/arch/arm/dts/rk3328-roc-cc.dts
@@ -42,6 +42,11 @@
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
};
+
+ adc-keys {
+ compatible = "adc-keys";
+ io-channels = <&saradc 0>;
+ };
};
&saradc {
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index d0dbff3bb8..7a997c0516 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -4,6 +4,7 @@
* SPDX-License-Identifier: GPL-2.0+
*/
+#define DEBUG
#include <common.h>
#include <adc.h>
#include <asm/io.h>
@@ -72,7 +73,6 @@ int setup_boot_mode(void)
char env_preboot[256] = {0};
rockchip_dnl_mode_check();
-
reg = (void *)CONFIG_ROCKCHIP_BOOT_MODE_REG;
boot_mode = readl(reg);
diff --git a/arch/arm/mach-rockchip/rk3328/Kconfig b/arch/arm/mach-rockchip/rk3328/Kconfig
index 0faf50085f..3dfe6c402e 100644
--- a/arch/arm/mach-rockchip/rk3328/Kconfig
+++ b/arch/arm/mach-rockchip/rk3328/Kconfig
@@ -12,6 +12,7 @@ config TARGET_EVB_RK3328
config TARGET_ROC_RK3328_CC
bool "ROC-RK3328-CC board, "
+ select BOARD_LATE_INIT
help
ROC-RK3328-CC is a Raspberry Pi-2 sized 4K60P HDR Media Board Computer
powered by Rockchip RK3328 Quad-Core ARM Cortex A53 64-Bit Processor

View file

@ -0,0 +1,51 @@
From 4f8960bd89243ace2282fbc890cf14cc8cca7a52 Mon Sep 17 00:00:00 2001
From: zouxf <zxf@t-tchip.com.cn>
Date: Wed, 14 Mar 2018 15:11:45 +0800
Subject: [PATCH] firefly: dts: add led device to rk3328-roc-cc
Change-Id: I60c39f4f71437d9cf9aac828deb9c19c3c9fe45a
---
arch/arm/dts/rk3328-roc-cc.dts | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/rk3328-roc-cc.dts b/arch/arm/dts/rk3328-roc-cc.dts
index eab84c7769..b9b8fbc5ec 100644
--- a/arch/arm/dts/rk3328-roc-cc.dts
+++ b/arch/arm/dts/rk3328-roc-cc.dts
@@ -38,7 +38,7 @@
compatible = "regulator-fixed";
enable-active-high;
regulator-name = "vcc5v0_host_xhci";
- gpio = <&gpio1 26 GPIO_ACTIVE_HIGH>;
+ gpio = <&gpio0 26 GPIO_ACTIVE_HIGH>;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
};
@@ -109,8 +109,10 @@
};
&usb_host0_xhci {
- vbus-supply = <&vcc5v0_host_xhci>;
+ //vbus-supply = <&vcc5v0_host_xhci>;
+ vbus-supply = <&vcc5v0_otg>;
status = "okay";
+ maximum-speed = "high-speed";
};
&i2c1 {
@@ -138,6 +140,14 @@
status = "okay";
};
+ led1 {
+ label = "standby";
+ };
+
+ led2 {
+ label = "power";
+ };
+
regulators {
vdd_logic: DCDC_REG1 {
regulator-name = "vdd_logic";