JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix: Change the format of the latest patch (#4019)

Browse Source
This commit is contained in:
The-going
2022-07-27 09:41:19 +03:00
committed by GitHub
parent fdf73a025b
commit aaabfd3a17
4 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patch/kernel/archive/sunxi-5.18/patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch
View File

@@ -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 = <&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;

40
patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-Rollback-r_rsb-to-r_i2c.patch Normal file
View File

@@ -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 = <&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;
--
2.35.3

2
patch/kernel/archive/sunxi-5.18/series.armbian
View File

@@ -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

2
patch/kernel/archive/sunxi-5.18/series.conf
View File

@@ -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