mirror of
https://github.com/LibreELEC/LibreELEC.tv
synced 2025-09-24 19:46:01 +07:00
2c1d9eb04c
-3ce7384048- The following changes were introduced in 6.11-rc1 and 6.11-rc7 only pass 3 variables to - of: remove internal arguments from of_property_for_each_u32() -9722c3b66e6.11-rc7 has refactored drm9da7ec9b19resulting in the following compile error. build.LibreELEC-H6.aarch64-13.0-devel/toolchain/bin/aarch64-libreelec-linux-gnu-ld: drivers/gpu/drm/sun4i/sun8i_dw_hdmi.o: in function `sun8i_dw_hdmi_bind': build.LibreELEC-H6.aarch64-13.0-devel/build/linux-6.11-rc7/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c:394:(.text+0x73c): undefined reference to `drm_bridge_connector_init' -db300ab0e9- allwinner: OrangePi PC also needs SW CEC hack CEC stopped working after updating from LE10 to LE11 as the former enabled the SW CEC hack for all H3 boards and the latter only for specific boards. Add OrangePi PC to that list of specific boards. - Use old OrangePi 3 net patches - Switch PMIC connection to I2C Co-authored-by: Jernej Skrabec <jernej.skrabec@gmail.com>
138 lines
3.4 KiB
Diff
138 lines
3.4 KiB
Diff
From 8f163618d4021cb84334109796c60f083fabda8d Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Date: Sun, 26 Sep 2021 09:31:45 +0200
|
|
Subject: [PATCH] WIP: OPi3 DT fixes
|
|
|
|
---
|
|
.../dts/allwinner/sun50i-h6-orangepi-3.dts | 72 +++++++++----------
|
|
1 file changed, 35 insertions(+), 37 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
|
|
index f005072c68a1..d01a318653a3 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
|
|
@@ -63,27 +63,7 @@ reg_vcc5v: vcc5v {
|
|
regulator-max-microvolt = <5000000>;
|
|
regulator-always-on;
|
|
};
|
|
-
|
|
- reg_vcc33_wifi: vcc33-wifi {
|
|
- /* Always on 3.3V regulator for WiFi and BT */
|
|
- compatible = "regulator-fixed";
|
|
- regulator-name = "vcc33-wifi";
|
|
- regulator-min-microvolt = <3300000>;
|
|
- regulator-max-microvolt = <3300000>;
|
|
- regulator-always-on;
|
|
- vin-supply = <®_vcc5v>;
|
|
- };
|
|
-
|
|
- reg_vcc_wifi_io: vcc-wifi-io {
|
|
- /* Always on 1.8V/300mA regulator for WiFi and BT IO */
|
|
- compatible = "regulator-fixed";
|
|
- regulator-name = "vcc-wifi-io";
|
|
- regulator-min-microvolt = <1800000>;
|
|
- regulator-max-microvolt = <1800000>;
|
|
- regulator-always-on;
|
|
- vin-supply = <®_vcc33_wifi>;
|
|
- };
|
|
-
|
|
+
|
|
wifi_pwrseq: wifi-pwrseq {
|
|
compatible = "mmc-pwrseq-simple";
|
|
clocks = <&rtc CLK_OSC32K_FANOUT>;
|
|
@@ -137,8 +117,8 @@ &mmc0 {
|
|
};
|
|
|
|
&mmc1 {
|
|
- vmmc-supply = <®_vcc33_wifi>;
|
|
- vqmmc-supply = <®_vcc_wifi_io>;
|
|
+ vmmc-supply = <®_cldo2>;
|
|
+ vqmmc-supply = <®_bldo3>;
|
|
mmc-pwrseq = <&wifi_pwrseq>;
|
|
bus-width = <4>;
|
|
non-removable;
|
|
@@ -173,7 +153,7 @@ &ohci3 {
|
|
&pio {
|
|
vcc-pc-supply = <®_bldo2>;
|
|
vcc-pd-supply = <®_cldo1>;
|
|
- vcc-pg-supply = <®_vcc_wifi_io>;
|
|
+ vcc-pg-supply = <®_bldo3>;
|
|
};
|
|
|
|
&r_i2c {
|
|
@@ -231,13 +211,12 @@ reg_bldo2: bldo2 {
|
|
regulator-max-microvolt = <1800000>;
|
|
regulator-name = "vcc-efuse-pcie-hdmi-pc";
|
|
};
|
|
-
|
|
- bldo3 {
|
|
- /* unused */
|
|
- };
|
|
-
|
|
- bldo4 {
|
|
- /* unused */
|
|
+
|
|
+ reg_bldo3: bldo3 {
|
|
+ regulator-always-on;
|
|
+ regulator-min-microvolt = <1800000>;
|
|
+ regulator-max-microvolt = <1800000>;
|
|
+ regulator-name = "vcc-dcxoio";
|
|
};
|
|
|
|
reg_cldo1: cldo1 {
|
|
@@ -247,19 +226,34 @@ reg_cldo1: cldo1 {
|
|
regulator-name = "vcc33-io-pd-emmc-sd-usb-uart-2";
|
|
};
|
|
|
|
- cldo2 {
|
|
- /* unused */
|
|
+ reg_cldo2: cldo2 {
|
|
+ /*
|
|
+ * This regulator is connected with CLDO3.
|
|
+ * Before the kernel can support synchronized
|
|
+ * enable of coupled regulators, keep them
|
|
+ * both always on as a ugly hack.
|
|
+ */
|
|
+ regulator-always-on;
|
|
+ regulator-min-microvolt = <3300000>;
|
|
+ regulator-max-microvolt = <3300000>;
|
|
+ regulator-name = "vcc-wifi-1";
|
|
};
|
|
|
|
cldo3 {
|
|
- /* unused */
|
|
+ /*
|
|
+ * This regulator is connected with CLDO2.
|
|
+ * See the comments for CLDO2.
|
|
+ */
|
|
+ regulator-always-on;
|
|
+ regulator-min-microvolt = <3300000>;
|
|
+ regulator-max-microvolt = <3300000>;
|
|
+ regulator-name = "vcc-wifi-2";
|
|
};
|
|
|
|
reg_dcdca: dcdca {
|
|
regulator-always-on;
|
|
- regulator-min-microvolt = <800000>;
|
|
- regulator-max-microvolt = <1160000>;
|
|
- regulator-ramp-delay = <2500>;
|
|
+ regulator-min-microvolt = <810000>;
|
|
+ regulator-max-microvolt = <1080000>;
|
|
regulator-name = "vdd-cpu";
|
|
};
|
|
|
|
@@ -296,6 +290,10 @@ &r_ir {
|
|
status = "okay";
|
|
};
|
|
|
|
+&r_pio {
|
|
+ vcc-pm-supply = <®_bldo3>;
|
|
+};
|
|
+
|
|
&rtc {
|
|
clocks = <&ext_osc32k>;
|
|
};
|
|
--
|
|
2.48.1
|
|
|