sunxi: 6.18: refresh patches

Refresh patches as required.

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

diff --git a/target/linux/sunxi/patches-6.18/301-orangepi_pc2_usb_otg_to_host_key_power.patch b/target/linux/sunxi/patches-6.18/301-orangepi_pc2_usb_otg_to_host_key_power.patch
index eea47737fa587a81394be94379406109620dd035..8eab29848c09d8e608ee1fa9f0f6ed3bdf6efa61 100644 (file)
--- a/target/linux/sunxi/patches-6.18/301-orangepi_pc2_usb_otg_to_host_key_power.patch
+++ b/target/linux/sunxi/patches-6.18/301-orangepi_pc2_usb_otg_to_host_key_power.patch
@@ -9,7 +9,7 @@
                        gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
                        wakeup-source;
                };
-@@ -221,7 +221,7 @@
+@@ -222,7 +222,7 @@
  };
  
  &usb_otg {

diff --git a/target/linux/sunxi/patches-6.18/410-sunxi-add-bananapi-p2-zero.patch b/target/linux/sunxi/patches-6.18/410-sunxi-add-bananapi-p2-zero.patch
index eed2f0feffdfe0c91e1cc87199c20f6525233917..e8f31d42ee05829fa3840fd901cc061da2f314a8 100644 (file)
--- a/target/linux/sunxi/patches-6.18/410-sunxi-add-bananapi-p2-zero.patch
+++ b/target/linux/sunxi/patches-6.18/410-sunxi-add-bananapi-p2-zero.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/allwinner/Makefile
 +++ b/arch/arm/boot/dts/allwinner/Makefile
-@@ -220,6 +220,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
+@@ -224,6 +224,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
        sun8i-a83t-cubietruck-plus.dtb \
        sun8i-a83t-tbs-a711.dtb \
        sun8i-h2-plus-bananapi-m2-zero.dtb \

diff --git a/target/linux/sunxi/patches-6.18/450-arm64-dts-enable-wifi-on-pine64-boards.patch b/target/linux/sunxi/patches-6.18/450-arm64-dts-enable-wifi-on-pine64-boards.patch
index 3876852c2bca76332a61e1ba321a34526a32c0ef..7b148fc433b4bc7e9982c3c3a06382211dc53bdf 100644 (file)
--- a/target/linux/sunxi/patches-6.18/450-arm64-dts-enable-wifi-on-pine64-boards.patch
+++ b/target/linux/sunxi/patches-6.18/450-arm64-dts-enable-wifi-on-pine64-boards.patch
@@ -32,8 +32,8 @@
 +      };
 +};
  
- &mmc2 {
-       pinctrl-names = "default";
+ /* On Wifi/BT connector */
+ &mmc1 {
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
 @@ -35,6 +35,11 @@
@@ -48,8 +48,8 @@
  };
  
  &codec {
-@@ -124,6 +129,21 @@
-       status = "okay";
+@@ -135,6 +140,21 @@
+       status = "disabled";
  };
  
 +&mmc1 {

diff --git a/target/linux/sunxi/patches-6.18/460-f1c100s-sram-driver.patch b/target/linux/sunxi/patches-6.18/460-f1c100s-sram-driver.patch
index 4bf090a08007963663e3aefd1ee78b5410155c2d..38361c7c5c31606ed4a02089a617d7a624cd769e 100644 (file)
--- a/target/linux/sunxi/patches-6.18/460-f1c100s-sram-driver.patch
+++ b/target/linux/sunxi/patches-6.18/460-f1c100s-sram-driver.patch
@@ -9,7 +9,7 @@ Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
 
 --- a/drivers/soc/sunxi/sunxi_sram.c
 +++ b/drivers/soc/sunxi/sunxi_sram.c
-@@ -98,6 +98,10 @@ static const struct of_device_id sunxi_s
+@@ -99,6 +99,10 @@ static const struct of_device_id sunxi_s
                .compatible     = "allwinner,sun50i-a64-sram-c",
                .data           = &sun50i_a64_sram_c.data,
        },
@@ -20,9 +20,9 @@ Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
        {}
  };
  
-@@ -430,6 +434,10 @@ static const struct of_device_id sunxi_s
-               .compatible = "allwinner,sun50i-h616-system-control",
-               .data = &sun50i_h616_sramc_variant,
+@@ -444,6 +448,10 @@ static const struct of_device_id sunxi_s
+               .compatible = "allwinner,sun55i-a523-system-control",
+               .data = &sun55i_a523_sramc_variant,
        },
 +      {
 +              .compatible = "allwinner,suniv-f1c100s-system-control",

diff --git a/target/linux/sunxi/patches-6.18/461-f1c100s-watchdog-compat.patch b/target/linux/sunxi/patches-6.18/461-f1c100s-watchdog-compat.patch
index 8baf969a0fa830b3c1d611bd5b2ab4d8d894a79d..4711187d0299091d1b74b60ae522eeef11661c72 100644 (file)
--- a/target/linux/sunxi/patches-6.18/461-f1c100s-watchdog-compat.patch
+++ b/target/linux/sunxi/patches-6.18/461-f1c100s-watchdog-compat.patch
@@ -8,10 +8,10 @@ Signed-off-by: Mesih Kilinc <mesihkilinc@gmail.com>
 
 --- a/drivers/watchdog/sunxi_wdt.c
 +++ b/drivers/watchdog/sunxi_wdt.c
-@@ -240,6 +240,7 @@ static const struct of_device_id sunxi_w
-       { .compatible = "allwinner,sun4i-a10-wdt", .data = &sun4i_wdt_reg },
+@@ -251,6 +251,7 @@ static const struct of_device_id sunxi_w
        { .compatible = "allwinner,sun6i-a31-wdt", .data = &sun6i_wdt_reg },
        { .compatible = "allwinner,sun20i-d1-wdt", .data = &sun20i_wdt_reg },
+       { .compatible = "allwinner,sun55i-a523-wdt", .data = &sun55i_wdt_reg },
 +      { .compatible = "allwinner,suniv-f1c100s-wdt", .data = &sun6i_wdt_reg },
        { /* sentinel */ }
  };