From 06a8a7cb67a161e838d2ac6c089f032b209fc424 Mon Sep 17 00:00:00 2001 From: arnaldovalente <37136367+arnaldovalente@users.noreply.github.com> Date: Sat, 9 Jul 2022 11:39:27 +0200 Subject: [PATCH] Orangepi One Plus Rollback to i2c (#3964) Co-authored-by: gleam2003 --- ...epi_one_plus_Rollback-r_rsb-to-r_i2c.patch | 20 +++++++++++++++++++ .../kernel/archive/sunxi-5.15/series.armbian | 1 + patch/kernel/archive/sunxi-5.15/series.conf | 1 + ...epi_one_plus_Rollback-r_rsb-to-r_i2c.patch | 20 +++++++++++++++++++ .../kernel/archive/sunxi-5.18/series.armbian | 1 + patch/kernel/archive/sunxi-5.18/series.conf | 1 + 6 files changed, 44 insertions(+) create mode 100644 patch/kernel/archive/sunxi-5.15/patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch create mode 100644 patch/kernel/archive/sunxi-5.18/patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch new file mode 100644 index 0000000000..5218f75c72 --- /dev/null +++ b/patch/kernel/archive/sunxi-5.15/patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch @@ -0,0 +1,20 @@ +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +index ee1919b80..15f4d7de9 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +@@ -129,12 +129,12 @@ &r_pio { + vcc-pm-supply = <®_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 = ; + interrupt-controller; diff --git a/patch/kernel/archive/sunxi-5.15/series.armbian b/patch/kernel/archive/sunxi-5.15/series.armbian index d37a84dc00..c1e116fd6b 100644 --- a/patch/kernel/archive/sunxi-5.15/series.armbian +++ b/patch/kernel/archive/sunxi-5.15/series.armbian @@ -198,3 +198,4 @@ patches.armbian/0013-x-fix-h6-emmc-dts.patch patches.armbian/0014-add-uwe-bsp-to-orangepi3-lts-dts-file.patch patches.armbian/999-rollback-rsb.patch + patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch diff --git a/patch/kernel/archive/sunxi-5.15/series.conf b/patch/kernel/archive/sunxi-5.15/series.conf index 92a8958196..22d824f8e7 100644 --- a/patch/kernel/archive/sunxi-5.15/series.conf +++ b/patch/kernel/archive/sunxi-5.15/series.conf @@ -674,3 +674,4 @@ patches.armbian/0013-x-fix-h6-emmc-dts.patch patches.armbian/0014-add-uwe-bsp-to-orangepi3-lts-dts-file.patch patches.armbian/999-rollback-rsb.patch + patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch new file mode 100644 index 0000000000..5218f75c72 --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch @@ -0,0 +1,20 @@ +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +index ee1919b80..15f4d7de9 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +@@ -129,12 +129,12 @@ &r_pio { + vcc-pm-supply = <®_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 = ; + interrupt-controller; diff --git a/patch/kernel/archive/sunxi-5.18/series.armbian b/patch/kernel/archive/sunxi-5.18/series.armbian index 47e6ad5bed..ff7d2896cc 100644 --- a/patch/kernel/archive/sunxi-5.18/series.armbian +++ b/patch/kernel/archive/sunxi-5.18/series.armbian @@ -178,3 +178,4 @@ patches.armbian/arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc.patch patches.armbian/add-uwe-bsp-to-OPi3-LTS-dts-file.patch patches.armbian/Rollback-r_rsb-to-r_i2c.patch + patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch diff --git a/patch/kernel/archive/sunxi-5.18/series.conf b/patch/kernel/archive/sunxi-5.18/series.conf index f250926c2c..d0ca9230f7 100644 --- a/patch/kernel/archive/sunxi-5.18/series.conf +++ b/patch/kernel/archive/sunxi-5.18/series.conf @@ -732,3 +732,4 @@ patches.armbian/arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc.patch patches.armbian/add-uwe-bsp-to-OPi3-LTS-dts-file.patch patches.armbian/Rollback-r_rsb-to-r_i2c.patch + patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch