- materialized overwrites:
- `add-board-helios64.patch`
- `add-board-orangepi-r1-plus.patch`
- `add-driver-for-Motorcomm-YT85xx+PHYs.patch`
- `add-board-rk3328-roc-pc.patch`
- not touched: wifi patches, those still require work before rebase is consistent.
- `wifi-4003-uwe5622-adjust-for-rockchip.patch`
- this patch is done on top of the wifi drivers patches exclusively, and fails to apply out of tree.
- we should probably consider moving this into the wifi drivers patch harness, not in the rockchip tree.
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: tonymac32 <tonymckahan@gmail.com>
|
|
Date: Sun, 8 Aug 2021 11:49:27 -0400
|
|
Subject: board_rock64_mali-usb-supply
|
|
|
|
Signed-off-by: tonymac32 <tonymckahan@gmail.com>
|
|
---
|
|
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 16 +++-------
|
|
1 file changed, 5 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
|
|
index f69a38f42d2d..a64a7713b418 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
|
|
@@ -48,17 +48,6 @@ vcc_host_5v: vcc-host-5v-regulator {
|
|
vin-supply = <&vcc_sys>;
|
|
};
|
|
|
|
- vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator {
|
|
- compatible = "regulator-fixed";
|
|
- gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&usb20_host_drv>;
|
|
- regulator-name = "vcc_host1_5v";
|
|
- regulator-always-on;
|
|
- regulator-boot-on;
|
|
- vin-supply = <&vcc_sys>;
|
|
- };
|
|
-
|
|
vcc_sys: vcc-sys {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "vcc_sys";
|
|
@@ -145,6 +134,11 @@ &emmc {
|
|
status = "okay";
|
|
};
|
|
|
|
+&gpu {
|
|
+ status = "okay";
|
|
+ mali-supply = <&vdd_logic>;
|
|
+};
|
|
+
|
|
&gmac2io {
|
|
assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
|
|
assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
|
|
--
|
|
Armbian
|
|
|