Merge pull request #1649 from armbian/roc-rk3399-pc-add-current

Enabled current kernel for roc-rk3399-pc (and fixed legacy build)
This commit is contained in:
Tony 2019-11-30 14:23:16 +08:00 committed by GitHub
commit 444b24910a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 1 deletions

View file

@ -6,7 +6,7 @@ BOOTCONFIG="roc-rk3399-pc_defconfig"
MODULES=""
MODULES_NEXT=""
#
KERNEL_TARGET="default,dev"
KERNEL_TARGET="legacy,current,dev"
CLI_TARGET="buster,bionic:default"
DESKTOP_TARGET="buster,bionic:default"
#

View file

@ -0,0 +1,24 @@
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
@@ -113,6 +113,10 @@
vcc_sys: vcc-sys {
compatible = "regulator-fixed";
+ enable-active-high;
+ gpio = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&vcc_sys_en>;
regulator-name = "vcc_sys";
regulator-always-on;
regulator-boot-on;
@@ -521,6 +525,10 @@
rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
+ vcc_sys_en: vcc-sys-en {
+ rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
hub_rst: hub-rst {
rockchip,pins = <2 RK_PA4 RK_FUNC_GPIO &pcfg_output_high>;
};