diff --git a/patch/kernel/archive/rockchip64-6.6/board-orangepi-r1-plus.patch b/patch/kernel/archive/rockchip64-6.6/board-orangepi-r1-plus.patch index 847286563f91..8cecc060fda3 100644 --- a/patch/kernel/archive/rockchip64-6.6/board-orangepi-r1-plus.patch +++ b/patch/kernel/archive/rockchip64-6.6/board-orangepi-r1-plus.patch @@ -3,9 +3,6 @@ From: Igor Pecovnik Date: Sat, 20 Jun 2020 22:39:57 +0200 Subject: [ARCHEOLOGY] Initial ROCK Pi E support (as WIP) (#2042) -note: rpardini: rebased on top of v6.3.1. this patch used to overwrite -a file, and is now a complete diff. - > X-Git-Archeology: > recovered message: > * WIP: Adding RockpiE config > X-Git-Archeology: > recovered message: > Signed-off-by: Igor Pecovnik > X-Git-Archeology: > recovered message: > * Mainline u-boot for ROCK Pi E @@ -77,106 +74,51 @@ a file, and is now a complete diff. > X-Git-Archeology: From: aiamadeus <42570690+aiamadeus@users.noreply.github.com> > X-Git-Archeology: Subject: rockchip: fixes support for orangepi-r1plus (#4215) > X-Git-Archeology: -> X-Git-Archeology: - Revision 6765f734cc4a22aeaa9f99a3ad28c8c322de26f6: https://github.com/armbian/build/commit/6765f734cc4a22aeaa9f99a3ad28c8c322de26f6 -> X-Git-Archeology: Date: Tue, 25 Oct 2022 11:26:51 +0200 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Bump rockchip64 edge to 6.0.y (#4337) -> X-Git-Archeology: -> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7 -> X-Git-Archeology: Date: Fri, 16 Dec 2022 13:38:13 +0100 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Re-add rockchip64 6.0 patches (#4575) -> X-Git-Archeology: -> X-Git-Archeology: - Revision 34ae84fac5d0b66a1ab2d1e51534b7beb13ef245: https://github.com/armbian/build/commit/34ae84fac5d0b66a1ab2d1e51534b7beb13ef245 -> X-Git-Archeology: Date: Fri, 05 May 2023 14:22:00 +0200 +> X-Git-Archeology: - Revision 85bab47bba73e0ef0e4ea5fde60e0aab56f82906: https://github.com/armbian/build/commit/85bab47bba73e0ef0e4ea5fde60e0aab56f82906 +> X-Git-Archeology: Date: Sat, 06 May 2023 12:55:10 +0200 > X-Git-Archeology: From: amazingfate > X-Git-Archeology: Subject: bump rockchip64 edge to v6.3 > X-Git-Archeology: +> X-Git-Archeology: - Revision 906ca66430329ab774f5b9d0f62eef1ce5e398fe: https://github.com/armbian/build/commit/906ca66430329ab774f5b9d0f62eef1ce5e398fe +> X-Git-Archeology: Date: Tue, 16 May 2023 08:55:33 +0200 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: `rockchip64`/`edge`/`6.3`: rebase/rewrite patches against `v6.3.1`; do archeology for mbox-less patches; materialize overwrites +> X-Git-Archeology: +> X-Git-Archeology: - Revision 19d532b13cabc1a749f61b9c400d933ba5aeb7e3: https://github.com/armbian/build/commit/19d532b13cabc1a749f61b9c400d933ba5aeb7e3 +> X-Git-Archeology: Date: Tue, 13 Jun 2023 12:33:59 +0200 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: `rockchip64` `edge` 6.3: rename most remaining "add-board" patches to "board" (all "add-board"s are now bare .dts in `dt/` folder) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 41ade999f04c26a277cfa1c3c721cbe869d3ad12: https://github.com/armbian/build/commit/41ade999f04c26a277cfa1c3c721cbe869d3ad12 +> X-Git-Archeology: Date: Tue, 03 Oct 2023 13:54:03 +0200 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: `rockchip64`/`edge`: bump to `6.6-rc4`; initial copy patches from 6.5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision fae4549764c548cb65d3cbfe319f1e11bc777505: https://github.com/armbian/build/commit/fae4549764c548cb65d3cbfe319f1e11bc777505 +> X-Git-Archeology: Date: Thu, 04 Apr 2024 13:38:18 +0800 +> X-Git-Archeology: From: aiamadeus <2789289348@qq.com> +> X-Git-Archeology: Subject: rockchip: update dts patches for orangepi r1-plus +> X-Git-Archeology: --- - arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts | 109 +++++++--- - 1 file changed, 73 insertions(+), 36 deletions(-) + arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts | 45 ++++++++++ + 1 file changed, 45 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts -index dc83d74045a3..4fe8eb39b64f 100644 +index dc83d74045a3..63b4a6bd206c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts -@@ -1,13 +1,10 @@ - // SPDX-License-Identifier: (GPL-2.0+ OR MIT) --/* -- * Based on rk3328-nanopi-r2s.dts, which is: -- * Copyright (c) 2020 David Bauer -- */ +@@ -8,6 +8,7 @@ - /dts-v1/; - -+#include #include --#include + #include +#include "rk3328-dram-default-timing.dtsi" #include "rk3328.dtsi" / { -@@ -35,23 +32,20 @@ leds { - pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>; - pinctrl-names = "default"; - -- led-0 { -- function = LED_FUNCTION_LAN; -- color = ; -+ lan_led: led-0 { - gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; -+ label = "orangepi-r1-plus:green:lan"; - }; - -- led-1 { -- function = LED_FUNCTION_STATUS; -- color = ; -+ sys_led: led-1 { - gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; -+ label = "orangepi-r1-plus:red:status"; - linux,default-trigger = "heartbeat"; - }; - -- led-2 { -- function = LED_FUNCTION_WAN; -- color = ; -+ wan_led: led-2 { - gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>; -+ label = "orangepi-r1-plus:green:wan"; - }; - }; - -@@ -62,19 +56,19 @@ vcc_sd: sdmmc-regulator { - pinctrl-names = "default"; - regulator-name = "vcc_sd"; - regulator-boot-on; -- vin-supply = <&vcc_io>; -+ vin-supply = <&vcc_io_33>; - }; - -- vcc_sys: vcc-sys-regulator { -+ vdd_5v: vdd-5v { - compatible = "regulator-fixed"; -- regulator-name = "vcc_sys"; -+ regulator-name = "vdd_5v"; - regulator-always-on; +@@ -85,6 +86,33 @@ vdd_5v_lan: vdd-5v-lan-regulator { regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; + vin-supply = <&vcc_sys>; }; - -- vdd_5v_lan: vdd-5v-lan-regulator { -+ vdd_5v_lan: vdd-5v-lan { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>; -@@ -83,7 +77,34 @@ vdd_5v_lan: vdd-5v-lan-regulator { - regulator-name = "vdd_5v_lan"; - regulator-always-on; - regulator-boot-on; -- vin-supply = <&vcc_sys>; -+ vin-supply = <&vdd_5v>; -+ }; + + /delete-node/ dmc-opp-table; + @@ -203,11 +145,12 @@ index dc83d74045a3..4fe8eb39b64f 100644 + opp-hz = /bits/ 64 <1056000000>; + opp-microvolt = <1175000 1175000 1200000>; + }; - }; ++ }; }; -@@ -103,6 +124,16 @@ &cpu3 { - cpu-supply = <&vdd_arm>; + &cpu0 { +@@ -107,6 +135,16 @@ &display_subsystem { + status = "disabled"; }; +&dfi { @@ -220,19 +163,10 @@ index dc83d74045a3..4fe8eb39b64f 100644 + status = "okay"; +}; + - &display_subsystem { - status = "disabled"; - }; -@@ -113,7 +144,7 @@ &gmac2io { - clock_in_out = "input"; - phy-handle = <&rtl8211e>; - phy-mode = "rgmii"; -- phy-supply = <&vcc_io>; -+ phy-supply = <&vcc_io_33>; - pinctrl-0 = <&rgmiim1_pins>; - pinctrl-names = "default"; - snps,aal; -@@ -137,6 +168,10 @@ rtl8211e: ethernet-phy@1 { + &gmac2io { + assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; + assigned-clock-parents = <&gmac_clk>, <&gmac_clk>; +@@ -137,6 +175,10 @@ rtl8211e: ethernet-phy@1 { }; }; @@ -243,25 +177,7 @@ index dc83d74045a3..4fe8eb39b64f 100644 &i2c1 { status = "okay"; -@@ -154,18 +189,19 @@ rk805: pmic@18 { - rockchip,system-power-controller; - wakeup-source; - -- vcc1-supply = <&vcc_sys>; -- vcc2-supply = <&vcc_sys>; -- vcc3-supply = <&vcc_sys>; -- vcc4-supply = <&vcc_sys>; -- vcc5-supply = <&vcc_io>; -- vcc6-supply = <&vcc_sys>; -+ vcc1-supply = <&vdd_5v>; -+ vcc2-supply = <&vdd_5v>; -+ vcc3-supply = <&vdd_5v>; -+ vcc4-supply = <&vdd_5v>; -+ vcc5-supply = <&vcc_io_33>; -+ vcc6-supply = <&vdd_5v>; - - regulators { - vdd_log: DCDC_REG1 { +@@ -166,6 +208,7 @@ vdd_log: DCDC_REG1 { regulator-name = "vdd_log"; regulator-always-on; regulator-boot-on; @@ -269,7 +185,7 @@ index dc83d74045a3..4fe8eb39b64f 100644 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; -@@ -180,6 +216,7 @@ vdd_arm: DCDC_REG2 { +@@ -180,6 +223,7 @@ vdd_arm: DCDC_REG2 { regulator-name = "vdd_arm"; regulator-always-on; regulator-boot-on; @@ -277,52 +193,7 @@ index dc83d74045a3..4fe8eb39b64f 100644 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; -@@ -200,8 +237,8 @@ regulator-state-mem { - }; - }; - -- vcc_io: DCDC_REG4 { -- regulator-name = "vcc_io"; -+ vcc_io_33: DCDC_REG4 { -+ regulator-name = "vcc_io_33"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; -@@ -256,13 +293,13 @@ regulator-state-mem { - }; - - &io_domains { -- pmuio-supply = <&vcc_io>; -- vccio1-supply = <&vcc_io>; -+ pmuio-supply = <&vcc_io_33>; -+ vccio1-supply = <&vcc_io_33>; - vccio2-supply = <&vcc18_emmc>; -- vccio3-supply = <&vcc_io>; -- vccio4-supply = <&vcc_io>; -- vccio5-supply = <&vcc_io>; -- vccio6-supply = <&vcc_io>; -+ vccio3-supply = <&vcc_io_33>; -+ vccio4-supply = <&vcc_io_33>; -+ vccio5-supply = <&vcc_io_33>; -+ vccio6-supply = <&vcc_io_33>; - status = "okay"; - }; - -@@ -347,8 +384,8 @@ &uart2 { - }; - - &usb20_otg { -- dr_mode = "host"; - status = "okay"; -+ dr_mode = "host"; - }; - - &usbdrd3 { -@@ -357,10 +394,10 @@ &usbdrd3 { - #address-cells = <1>; - #size-cells = <0>; - -- /* Second port is for USB 3.0 */ +@@ -361,6 +405,7 @@ &usbdrd3 { rtl8153: device@2 { compatible = "usbbda,8153"; reg = <2>; diff --git a/patch/kernel/archive/rockchip64-6.8/board-orangepi-r1-plus.patch b/patch/kernel/archive/rockchip64-6.8/board-orangepi-r1-plus.patch index 847286563f91..7cb0c747bf7b 100644 --- a/patch/kernel/archive/rockchip64-6.8/board-orangepi-r1-plus.patch +++ b/patch/kernel/archive/rockchip64-6.8/board-orangepi-r1-plus.patch @@ -3,9 +3,6 @@ From: Igor Pecovnik Date: Sat, 20 Jun 2020 22:39:57 +0200 Subject: [ARCHEOLOGY] Initial ROCK Pi E support (as WIP) (#2042) -note: rpardini: rebased on top of v6.3.1. this patch used to overwrite -a file, and is now a complete diff. - > X-Git-Archeology: > recovered message: > * WIP: Adding RockpiE config > X-Git-Archeology: > recovered message: > Signed-off-by: Igor Pecovnik > X-Git-Archeology: > recovered message: > * Mainline u-boot for ROCK Pi E @@ -77,106 +74,61 @@ a file, and is now a complete diff. > X-Git-Archeology: From: aiamadeus <42570690+aiamadeus@users.noreply.github.com> > X-Git-Archeology: Subject: rockchip: fixes support for orangepi-r1plus (#4215) > X-Git-Archeology: -> X-Git-Archeology: - Revision 6765f734cc4a22aeaa9f99a3ad28c8c322de26f6: https://github.com/armbian/build/commit/6765f734cc4a22aeaa9f99a3ad28c8c322de26f6 -> X-Git-Archeology: Date: Tue, 25 Oct 2022 11:26:51 +0200 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Bump rockchip64 edge to 6.0.y (#4337) -> X-Git-Archeology: -> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7 -> X-Git-Archeology: Date: Fri, 16 Dec 2022 13:38:13 +0100 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Re-add rockchip64 6.0 patches (#4575) -> X-Git-Archeology: -> X-Git-Archeology: - Revision 34ae84fac5d0b66a1ab2d1e51534b7beb13ef245: https://github.com/armbian/build/commit/34ae84fac5d0b66a1ab2d1e51534b7beb13ef245 -> X-Git-Archeology: Date: Fri, 05 May 2023 14:22:00 +0200 +> X-Git-Archeology: - Revision 85bab47bba73e0ef0e4ea5fde60e0aab56f82906: https://github.com/armbian/build/commit/85bab47bba73e0ef0e4ea5fde60e0aab56f82906 +> X-Git-Archeology: Date: Sat, 06 May 2023 12:55:10 +0200 > X-Git-Archeology: From: amazingfate > X-Git-Archeology: Subject: bump rockchip64 edge to v6.3 > X-Git-Archeology: +> X-Git-Archeology: - Revision 906ca66430329ab774f5b9d0f62eef1ce5e398fe: https://github.com/armbian/build/commit/906ca66430329ab774f5b9d0f62eef1ce5e398fe +> X-Git-Archeology: Date: Tue, 16 May 2023 08:55:33 +0200 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: `rockchip64`/`edge`/`6.3`: rebase/rewrite patches against `v6.3.1`; do archeology for mbox-less patches; materialize overwrites +> X-Git-Archeology: +> X-Git-Archeology: - Revision 19d532b13cabc1a749f61b9c400d933ba5aeb7e3: https://github.com/armbian/build/commit/19d532b13cabc1a749f61b9c400d933ba5aeb7e3 +> X-Git-Archeology: Date: Tue, 13 Jun 2023 12:33:59 +0200 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: `rockchip64` `edge` 6.3: rename most remaining "add-board" patches to "board" (all "add-board"s are now bare .dts in `dt/` folder) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 41ade999f04c26a277cfa1c3c721cbe869d3ad12: https://github.com/armbian/build/commit/41ade999f04c26a277cfa1c3c721cbe869d3ad12 +> X-Git-Archeology: Date: Tue, 03 Oct 2023 13:54:03 +0200 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: `rockchip64`/`edge`: bump to `6.6-rc4`; initial copy patches from 6.5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 1f4df4c41fe33f9822ca2f42d14a2a445e27aed7: https://github.com/armbian/build/commit/1f4df4c41fe33f9822ca2f42d14a2a445e27aed7 +> X-Git-Archeology: Date: Sun, 14 Jan 2024 14:14:50 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip64: bump edge to 6.7, current to 6.6 +> X-Git-Archeology: +> X-Git-Archeology: - Revision e4d413b9166e3633b40fb23382fb1045b9d0e315: https://github.com/armbian/build/commit/e4d413b9166e3633b40fb23382fb1045b9d0e315 +> X-Git-Archeology: Date: Tue, 26 Mar 2024 13:46:35 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip64: bump edge kernel to 6.8 +> X-Git-Archeology: +> X-Git-Archeology: - Revision fae4549764c548cb65d3cbfe319f1e11bc777505: https://github.com/armbian/build/commit/fae4549764c548cb65d3cbfe319f1e11bc777505 +> X-Git-Archeology: Date: Thu, 04 Apr 2024 13:38:18 +0800 +> X-Git-Archeology: From: aiamadeus <2789289348@qq.com> +> X-Git-Archeology: Subject: rockchip: update dts patches for orangepi r1-plus +> X-Git-Archeology: --- - arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts | 109 +++++++--- - 1 file changed, 73 insertions(+), 36 deletions(-) + arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts | 45 ++++++++++ + 1 file changed, 45 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts -index dc83d74045a3..4fe8eb39b64f 100644 +index f20662929c77..c55d79e12f16 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts -@@ -1,13 +1,10 @@ - // SPDX-License-Identifier: (GPL-2.0+ OR MIT) --/* -- * Based on rk3328-nanopi-r2s.dts, which is: -- * Copyright (c) 2020 David Bauer -- */ +@@ -8,6 +8,7 @@ - /dts-v1/; - -+#include #include --#include + #include +#include "rk3328-dram-default-timing.dtsi" #include "rk3328.dtsi" / { -@@ -35,23 +32,20 @@ leds { - pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>; - pinctrl-names = "default"; - -- led-0 { -- function = LED_FUNCTION_LAN; -- color = ; -+ lan_led: led-0 { - gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; -+ label = "orangepi-r1-plus:green:lan"; - }; - -- led-1 { -- function = LED_FUNCTION_STATUS; -- color = ; -+ sys_led: led-1 { - gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; -+ label = "orangepi-r1-plus:red:status"; - linux,default-trigger = "heartbeat"; - }; - -- led-2 { -- function = LED_FUNCTION_WAN; -- color = ; -+ wan_led: led-2 { - gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>; -+ label = "orangepi-r1-plus:green:wan"; - }; - }; - -@@ -62,19 +56,19 @@ vcc_sd: sdmmc-regulator { - pinctrl-names = "default"; - regulator-name = "vcc_sd"; +@@ -86,6 +87,33 @@ vdd_5v_lan: vdd-5v-lan-regulator { regulator-boot-on; -- vin-supply = <&vcc_io>; -+ vin-supply = <&vcc_io_33>; + vin-supply = <&vcc_sys>; }; - -- vcc_sys: vcc-sys-regulator { -+ vdd_5v: vdd-5v { - compatible = "regulator-fixed"; -- regulator-name = "vcc_sys"; -+ regulator-name = "vdd_5v"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - }; - -- vdd_5v_lan: vdd-5v-lan-regulator { -+ vdd_5v_lan: vdd-5v-lan { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>; -@@ -83,7 +77,34 @@ vdd_5v_lan: vdd-5v-lan-regulator { - regulator-name = "vdd_5v_lan"; - regulator-always-on; - regulator-boot-on; -- vin-supply = <&vcc_sys>; -+ vin-supply = <&vdd_5v>; -+ }; + + /delete-node/ dmc-opp-table; + @@ -203,11 +155,12 @@ index dc83d74045a3..4fe8eb39b64f 100644 + opp-hz = /bits/ 64 <1056000000>; + opp-microvolt = <1175000 1175000 1200000>; + }; - }; ++ }; }; -@@ -103,6 +124,16 @@ &cpu3 { - cpu-supply = <&vdd_arm>; + &cpu0 { +@@ -108,6 +136,16 @@ &display_subsystem { + status = "disabled"; }; +&dfi { @@ -220,19 +173,10 @@ index dc83d74045a3..4fe8eb39b64f 100644 + status = "okay"; +}; + - &display_subsystem { - status = "disabled"; - }; -@@ -113,7 +144,7 @@ &gmac2io { - clock_in_out = "input"; - phy-handle = <&rtl8211e>; - phy-mode = "rgmii"; -- phy-supply = <&vcc_io>; -+ phy-supply = <&vcc_io_33>; - pinctrl-0 = <&rgmiim1_pins>; - pinctrl-names = "default"; - snps,aal; -@@ -137,6 +168,10 @@ rtl8211e: ethernet-phy@1 { + &gmac2io { + assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; + assigned-clock-parents = <&gmac_clk>, <&gmac_clk>; +@@ -138,6 +176,10 @@ rtl8211e: ethernet-phy@1 { }; }; @@ -243,25 +187,7 @@ index dc83d74045a3..4fe8eb39b64f 100644 &i2c1 { status = "okay"; -@@ -154,18 +189,19 @@ rk805: pmic@18 { - rockchip,system-power-controller; - wakeup-source; - -- vcc1-supply = <&vcc_sys>; -- vcc2-supply = <&vcc_sys>; -- vcc3-supply = <&vcc_sys>; -- vcc4-supply = <&vcc_sys>; -- vcc5-supply = <&vcc_io>; -- vcc6-supply = <&vcc_sys>; -+ vcc1-supply = <&vdd_5v>; -+ vcc2-supply = <&vdd_5v>; -+ vcc3-supply = <&vdd_5v>; -+ vcc4-supply = <&vdd_5v>; -+ vcc5-supply = <&vcc_io_33>; -+ vcc6-supply = <&vdd_5v>; - - regulators { - vdd_log: DCDC_REG1 { +@@ -167,6 +209,7 @@ vdd_log: DCDC_REG1 { regulator-name = "vdd_log"; regulator-always-on; regulator-boot-on; @@ -269,7 +195,7 @@ index dc83d74045a3..4fe8eb39b64f 100644 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; -@@ -180,6 +216,7 @@ vdd_arm: DCDC_REG2 { +@@ -181,6 +224,7 @@ vdd_arm: DCDC_REG2 { regulator-name = "vdd_arm"; regulator-always-on; regulator-boot-on; @@ -277,52 +203,7 @@ index dc83d74045a3..4fe8eb39b64f 100644 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; -@@ -200,8 +237,8 @@ regulator-state-mem { - }; - }; - -- vcc_io: DCDC_REG4 { -- regulator-name = "vcc_io"; -+ vcc_io_33: DCDC_REG4 { -+ regulator-name = "vcc_io_33"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; -@@ -256,13 +293,13 @@ regulator-state-mem { - }; - - &io_domains { -- pmuio-supply = <&vcc_io>; -- vccio1-supply = <&vcc_io>; -+ pmuio-supply = <&vcc_io_33>; -+ vccio1-supply = <&vcc_io_33>; - vccio2-supply = <&vcc18_emmc>; -- vccio3-supply = <&vcc_io>; -- vccio4-supply = <&vcc_io>; -- vccio5-supply = <&vcc_io>; -- vccio6-supply = <&vcc_io>; -+ vccio3-supply = <&vcc_io_33>; -+ vccio4-supply = <&vcc_io_33>; -+ vccio5-supply = <&vcc_io_33>; -+ vccio6-supply = <&vcc_io_33>; - status = "okay"; - }; - -@@ -347,8 +384,8 @@ &uart2 { - }; - - &usb20_otg { -- dr_mode = "host"; - status = "okay"; -+ dr_mode = "host"; - }; - - &usbdrd3 { -@@ -357,10 +394,10 @@ &usbdrd3 { - #address-cells = <1>; - #size-cells = <0>; - -- /* Second port is for USB 3.0 */ +@@ -362,6 +406,7 @@ &usbdrd3 { rtl8153: device@2 { compatible = "usbbda,8153"; reg = <2>;