2 Commits

Author SHA1 Message Date
Marek Belisko
7ee5f3f733 Merge pull request #456 from mark-bchoi/feature_orangepi_one_plus
Fixed axp 20x pmic probing error
2026-02-13 09:03:46 +01:00
Mark Choi
1813d3d2e4 Fixed axp 20x pmic probing error
Orange pi one plus use axp-805 which compatible with axp-20x.
But, kernel 6.6 used RSB instread i2c for axp-805.

RSB occurred probing error and could not initialize axp 805 correctly,
it sometimes stucked the system on booting kernel.

Upstream revert this to i2c and fixed this issue. but, kernel 6.6 is not applied yet.

torvalds/linux@573f99c

Signed-off-by: Mark Choi <afewgoodman.choi@gmail.com>
2026-02-13 11:48:09 +09:00
2 changed files with 81 additions and 0 deletions

View File

@@ -0,0 +1,77 @@
From aba276a0dabae7dac88a22b5a48488058ab9048c Mon Sep 17 00:00:00 2001
From: OpenEmbedded <oe.patch@oe>
Date: Wed, 11 Feb 2026 17:02:49 +0900
Subject: [PATCH] Fixed pmic error
When kernel is boot, rsb would not probe and initialize axp806 pmic correctly.
Upstream revert it to use i2c bus instream rsb.
Signed-off-by: OpenEmbedded <oe.patch@oe>
---
.../dts/allwinner/sun50i-h6-orangepi.dtsi | 25 ++++++++++---------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
index 92745128f..e34dbb992 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
@@ -32,7 +32,7 @@ hdmi_con_in: endpoint {
};
};
- ext_osc32k: ext_osc32k_clk {
+ ext_osc32k: ext-osc32k-clk {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <32768>;
@@ -94,6 +94,7 @@ hdmi_out_con: endpoint {
&mmc0 {
vmmc-supply = <&reg_cldo1>;
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
+ disable-wp;
bus-width = <4>;
status = "okay";
};
@@ -112,20 +113,12 @@ &pio {
vcc-pg-supply = <&reg_aldo1>;
};
-&r_ir {
- status = "okay";
-};
-
-&r_pio {
- vcc-pm-supply = <&reg_bldo3>;
-};
-
-&r_rsb {
+&r_i2c {
status = "okay";
- axp805: pmic@745 {
+ axp805: pmic@36 {
compatible = "x-powers,axp805", "x-powers,axp806";
- reg = <0x745>;
+ reg = <0x36>;
interrupt-parent = <&r_intc>;
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
@@ -240,6 +233,14 @@ sw {
};
};
+&r_ir {
+ status = "okay";
+};
+
+&r_pio {
+ vcc-pm-supply = <&reg_bldo3>;
+};
+
&rtc {
clocks = <&ext_osc32k>;
};
--
2.34.1

View File

@@ -0,0 +1,4 @@
SRC_URI:append:orange-pi-one-plus = " file://axp20x.cfg"
SRC_URI:append:orange-pi-one-plus = " file://patches/0001-dts-allwinner-Orangepi-one-plus-Fixed-pmic-error.patch"