sunxi: 6.18: refresh patches

Refresh patches as required.

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
This commit is contained in:
Zoltan HERPAI 2026-02-05 15:35:54 +00:00
parent 7727944a5c
commit e78de66600
5 changed files with 12 additions and 12 deletions

View File

@ -9,7 +9,7 @@
gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
wakeup-source;
};
@@ -221,7 +221,7 @@
@@ -222,7 +222,7 @@
};
&usb_otg {

View File

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

View File

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

View File

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

View File

@ -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 */ }
};