msdc: multi-slot support

Author: balika011

arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-emmc.dtso

@@ -11,49 +11,6 @@
 	compatible = "bananapi,bpi-r4", "mediatek,mt7988a";
 
 	fragment@0 {
-		target-path = "/soc/mmc@11230000";
-		__overlay__ {
-			pinctrl-names = "default", "state_uhs";
-			pinctrl-0 = <&mmc0_pins_emmc_51>;
-			pinctrl-1 = <&mmc0_pins_emmc_51>;
-			bus-width = <8>;
-			max-frequency = <200000000>;
-			cap-mmc-highspeed;
-			mmc-hs200-1_8v;
-			mmc-hs400-1_8v;
-			hs400-ds-delay = <0x12814>;
-			vqmmc-supply = <&reg_1p8v>;
-			vmmc-supply = <&reg_3p3v>;
-			non-removable;
-			no-sd;
-			no-sdio;
-			status = "okay";
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			card@0 {
-				compatible = "mmc-card";
-				reg = <0>;
-
-				block {
-					compatible = "block-device";
-					partitions {
-						block-partition-env {
-							partname = "ubootenv";
-							nvmem-layout {
-								compatible = "u-boot,env-layout";
-							};
-						};
-						emmc_rootfs: block-partition-production {
-							partname = "production";
-						};
-					};
-				};
-			};
-		};
-	};
-
-	fragment@2 {
 		target-path = "/chosen";
 		__overlay__ {
 			rootdisk-emmc = <&emmc_rootfs>;

arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-sd.dtso

@@ -7,51 +7,10 @@
 /dts-v1/;
 /plugin/;
 
-#include <dt-bindings/gpio/gpio.h>
-
 / {
 	compatible = "bananapi,bpi-r4", "mediatek,mt7988a";
 
 	fragment@1 {
-		target-path = "/soc/mmc@11230000";
-		__overlay__ {
-			pinctrl-names = "default", "state_uhs";
-			pinctrl-0 = <&mmc0_pins_sdcard>;
-			pinctrl-1 = <&mmc0_pins_sdcard>;
-			cd-gpios = <&pio 12 GPIO_ACTIVE_LOW>;
-			bus-width = <4>;
-			max-frequency = <52000000>;
-			cap-sd-highspeed;
-			vmmc-supply = <&reg_3p3v>;
-			vqmmc-supply = <&reg_3p3v>;
-			no-mmc;
-			status = "okay";
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			card@0 {
-				compatible = "mmc-card";
-				reg = <0>;
-
-				block {
-					compatible = "block-device";
-					partitions {
-						block-partition-env {
-							partname = "ubootenv";
-							nvmem-layout {
-								compatible = "u-boot,env-layout";
-							};
-						};
-						sd_rootfs: block-partition-production {
-							partname = "production";
-						};
-					};
-				};
-			};
-		};
-	};
-
-	fragment@2 {
 		target-path = "/chosen";
 		__overlay__ {
 			rootdisk-sd = <&sd_rootfs>;

arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts

@@ -407,3 +407,104 @@
 &xphy {
 	status = "okay";
 };
+
+&msdc {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	pinctrl-names = "emmc-default", "emmc-state_uhs", "sdcard-default", "sdcard-state_uhs";
+	pinctrl-0 = <&mmc_pins_emmc_51>;
+	pinctrl-1 = <&mmc_pins_emmc_51>;
+	pinctrl-2 = <&mmc_pins_sdcard>;
+	pinctrl-3 = <&mmc_pins_sdcard>;
+
+	mmc0: slot@0 {
+		compatible = "mediatek,mmc-slot";
+		reg = <0>;
+
+		bus-width = <8>;
+		max-frequency = <200000000>;
+		
+		pinctrl-default = "emmc-default";
+		pinctrl-state_uhs = "emmc-state_uhs";
+
+		cap-mmc-highspeed;
+
+		mmc-hs200-1_8v;
+		mmc-hs400-1_8v;
+		hs400-ds-delay = <0x12814>;
+		vqmmc-supply = <&reg_1p8v>;
+		vmmc-supply = <&reg_3p3v>;
+
+		non-removable;
+		no-sd;
+		no-sdio;
+
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		card@0 {
+			compatible = "mmc-card";
+			reg = <0>;
+
+			block {
+				compatible = "block-device";
+				partitions {
+					block-partition-env {
+						partname = "ubootenv";
+						nvmem-layout {
+							compatible = "u-boot,env-layout";
+						};
+					};
+					emmc_rootfs: block-partition-production {
+						partname = "production";
+					};
+				};
+			};
+		};
+	};
+
+	mmc1: slot@1 {
+		compatible = "mediatek,mmc-slot";
+		reg = <1>;
+		
+		pinctrl-default = "sdcard-default";
+		pinctrl-state_uhs = "sdcard-state_uhs";
+
+		cd-gpios = <&pio 12 GPIO_ACTIVE_LOW>;
+
+		bus-width = <4>;
+		max-frequency = <52000000>;
+
+		cap-sd-highspeed;
+
+		vqmmc-supply = <&reg_3p3v>;
+		vmmc-supply = <&reg_3p3v>;
+
+		no-mmc;
+
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		card@0 {
+			compatible = "mmc-card";
+			reg = <0>;
+
+			block {
+				compatible = "block-device";
+				partitions {
+					block-partition-env {
+						partname = "ubootenv";
+						nvmem-layout {
+							compatible = "u-boot,env-layout";
+						};
+					};
+					sd_rootfs: block-partition-production {
+						partname = "production";
+					};
+				};
+			};
+		};
+	};
+};

arch/arm64/boot/dts/mediatek/mt7988a.dtsi

@@ -433,21 +433,21 @@
 				};
 			};
 
-			mmc0_pins_emmc_45: mmc0-emmc-45-pins {
+			mmc_pins_emmc_45: mmc-emmc-45-pins {
 				mux {
 					function = "flash";
 					groups = "emmc_45";
 				};
 			};
 
-			mmc0_pins_emmc_51: mmc0-emmc-51-pins {
+			mmc_pins_emmc_51: mmc-emmc-51-pins {
 				mux {
 					function = "flash";
 					groups = "emmc_51";
 				};
 			};
 
-			mmc0_pins_sdcard: mmc0-sdcard-pins {
+			mmc_pins_sdcard: mmc-sdcard-pins {
 				mux {
 					function = "flash";
 					groups = "sdcard";
@@ -859,7 +859,7 @@
 			status = "disabled";
 		};
 
-		mmc0: mmc@11230000 {
+		msdc: mmc@11230000 {
 			compatible = "mediatek,mt7988-mmc";
 			reg = <0 0x11230000 0 0x1000>,
 			      <0 0x11D60000 0 0x1000>;