drop mainlined patch, adjust x96 mate T95 eth sd card hack

Author: EvilOlaf

patch/kernel/archive/sunxi-6.18/patches.armbian/arm64-dts-sun50i-h616-x96-mate-T95-eth-sd-card-hack.patch

@@ -1,27 +1,38 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <jernej.skrabec@gmail.com>
-Date: Mon, 14 Jun 2021 20:48:15 +0200
-Subject: arm64:dts: sun50i-h616-x96-mate T95 eth & sd card hack
+From: Werner <werner@armbian.com>
+Date: Tue, 9 Dec 2025 17:19:52 +0000
+Subject: Patching kernel sunxi files
+ arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts
+ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+
+Origin: Subject: arm64:dts: sun50i-h616-x96-mate T95 eth & sd card hack
 
 Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
+Signed-off-by: Werner <werner@armbian.com>
 ---
- arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts | 21 +++++++-
+ arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts | 20 +++++++
  arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi         | 26 ++++++++++
- 2 files changed, 46 insertions(+), 1 deletion(-)
+ 2 files changed, 46 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts
-index 111111111111..222222222222 100644
+index 978de97f081f..61a621676848 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts
-@@ -16,6 +16,7 @@ / {
+@@ -14,10 +14,11 @@
+ / {
+ 	model = "X96 Mate";
  	compatible = "hechuang,x96-mate", "allwinner,sun50i-h616";
 
  	aliases {
 +		ethernet0 = &emac1;
  		serial0 = &uart0;
  	};
 
-@@ -55,13 +56,31 @@ &gpu {
+ 	chosen {
+ 		stdout-path = "serial0:115200n8";
+@@ -68,10 +69,29 @@ &ehci2 {
+ &gpu {
+ 	mali-supply = <&reg_dcdcc>;
  	status = "okay";
  };
 
@@ -43,22 +54,19 @@ index 111111111111..222222222222 100644
 +	};
 +};
 +
- &ir {
++
+ &hdmi {
+ 	hvcc-supply = <&reg_bldo1>;
  	status = "okay";
  };
 
- &mmc0 {
- 	vmmc-supply = <&reg_dcdce>;
--	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;	/* PF6 */
-+	broken-cd;
- 	disable-wp;
- 	bus-width = <4>;
- 	status = "okay";
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
-index 111111111111..222222222222 100644
+index 79ef11ad3282..8ddfb43831a4 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
-@@ -287,6 +287,13 @@ ext_rgmii_pins: rgmii-pins {
+@@ -415,10 +415,17 @@ ext_rgmii_pins: rgmii-pins {
+ 				       /* "PI16" Managed by mdio */
+ 				function = "emac0";
  				drive-strength = <40>;
  			};
 
@@ -72,7 +80,11 @@ index 111111111111..222222222222 100644
  			i2c0_pins: i2c0-pins {
  				pins = "PI5", "PI6";
  				function = "i2c0";
-@@ -669,6 +676,25 @@ mdio0: mdio {
+ 			};
+ 
+@@ -978,10 +985,29 @@ mdio0: mdio {
+ 				#address-cells = <1>;
+ 				#size-cells = <0>;
  			};
  		};
 
@@ -98,6 +110,7 @@ index 111111111111..222222222222 100644
  		gpadc: adc@5070000 {
  			compatible = "allwinner,sun50i-h616-gpadc",
  				     "allwinner,sun20i-d1-gpadc";
+ 			reg = <0x05070000 0x400>;
+ 			clocks = <&ccu CLK_BUS_GPADC>;
 -- 
-Armbian
-
+Armbian

patch/kernel/archive/sunxi-6.18/patches.armbian/arm64-dts-sun50i-h616-x96-mate-add-hdmi.patch

@@ -452,8 +452,7 @@ patches.drm/0043-T95-broken-CD.patch
 	patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch
 	patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch
 	patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch
--	patches.armbian/arm64-dts-sun50i-h616-x96-mate-T95-eth-sd-card-hack.patch
--	patches.armbian/arm64-dts-sun50i-h616-x96-mate-add-hdmi.patch
+	patches.armbian/arm64-dts-sun50i-h616-x96-mate-T95-eth-sd-card-hack.patch
 	patches.armbian/arm64-dts-allwinner-Add-axp313a.dtsi.patch
 	patches.armbian/arm64-dts-add-sun50i-h618-cpu-dvfs.dtsi.patch
 	patches.armbian/LED-green_power_on-red_status_heartbeat-arch-arm64-boot-dts-all.patch