From aaabfd3a17d0fa2f168c69852db462eaf09ca93c Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Wed, 27 Jul 2022 09:41:19 +0300 Subject: [PATCH] fix: Change the format of the latest patch (#4019) --- ...epi_one_plus_Rollback-r_rsb-to-r_i2c.patch | 20 ---------- ...rangepi.dtsi-Rollback-r_rsb-to-r_i2c.patch | 40 +++++++++++++++++++ .../kernel/archive/sunxi-5.18/series.armbian | 2 +- patch/kernel/archive/sunxi-5.18/series.conf | 2 +- 4 files changed, 42 insertions(+), 22 deletions(-) delete mode 100644 patch/kernel/archive/sunxi-5.18/patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch create mode 100644 patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-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 deleted file mode 100644 index 5218f75c72..0000000000 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch +++ /dev/null @@ -1,20 +0,0 @@ -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/patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-Rollback-r_rsb-to-r_i2c.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-Rollback-r_rsb-to-r_i2c.patch new file mode 100644 index 0000000000..3031a2160f --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-Rollback-r_rsb-to-r_i2c.patch @@ -0,0 +1,40 @@ +From f4bf9a0989a99aa7a43f7af3ea34784a1b587e21 Mon Sep 17 00:00:00 2001 +From: The-going <48602507+The-going@users.noreply.github.com> +Date: Sun, 24 Jul 2022 13:56:50 +0300 +Subject: [PATCH] arm64: dts: sun50i-h6-orangepi.dtsi: Rollback r_rsb to r_i2c + +This fix affects two boards: +sun50i-h6-orangepi-lite2.dts +sun50i-h6-orangepi-one-plus.dts + +It also depends on the revision of the board. +If your board fails when working with this fix, just disable +it by adding (-) minus to the first position of the line +in which the patch is written in the series.conf file. +--- + arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +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; +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.18/series.armbian b/patch/kernel/archive/sunxi-5.18/series.armbian index ff7d2896cc..4fb7f2ac3a 100644 --- a/patch/kernel/archive/sunxi-5.18/series.armbian +++ b/patch/kernel/archive/sunxi-5.18/series.armbian @@ -178,4 +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 + patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-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 d0ca9230f7..a578fd918f 100644 --- a/patch/kernel/archive/sunxi-5.18/series.conf +++ b/patch/kernel/archive/sunxi-5.18/series.conf @@ -732,4 +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 + patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-Rollback-r_rsb-to-r_i2c.patch