Merge pull request #1 from kszaq/fix_sd

arch/arm64/boot/dts/amlogic: revert f46f2bf for gxbb_p200 device trees
kszaq · Aug 11, 2016 · 6a87858 · 6a87858
2 parents 6f9a415 + b5d0971
commit 6a87858
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/arch/arm64/boot/dts/amlogic/gxbb_p200.dts b/arch/arm64/boot/dts/amlogic/gxbb_p200.dts
@@ -433,20 +433,16 @@
 	   		pinname = "sd";
 	   		ocr_avail = <0x00200080>; // 3.3:0x200000, 1.8+3.3:0x00200080
 	   		caps = "MMC_CAP_4_BIT_DATA","MMC_CAP_MMC_HIGHSPEED",
-					"MMC_CAP_SD_HIGHSPEED", "MMC_CAP_UHS_SDR12", "MMC_CAP_UHS_SDR25","MMC_CAP_UHS_SDR50";
+					"MMC_CAP_SD_HIGHSPEED";
 					//"MMC_CAP_UHS_SDR12",
 					//"MMC_CAP_UHS_SDR25","MMC_CAP_UHS_SDR50",
 					//"MMC_CAP_UHS_SDR104";
-			f_min = <400000>;
+	   		f_min = <400000>;
 	   		f_max = <100000000>;
 	   		max_req_size = <0x20000>;          /**128KB*/
 			gpio_dat3 = <&gpio       CARD_4       GPIO_ACTIVE_HIGH>;
 			jtag_pin =  <&gpio       CARD_0       GPIO_ACTIVE_HIGH>;
 			gpio_cd =  <&gpio       CARD_6       GPIO_ACTIVE_HIGH>;
-			/*if card have no switch gpio, remove all relative to vol_switch */
-			vol_switch =  <&gpio_ao       GPIOAO_5       GPIO_ACTIVE_HIGH>;
-			vol_switch_18 = <0>; /* 1 = high, 0 = low */
-			vol_switch_delay = <150>; /* Uint: ms*/
 	   		irq_in = <3>;
 	   		irq_out = <5>;
 	   		card_type = <5>; /* 0:unknown, 1:mmc card(include eMMC), 2:sd card(include tSD), 3:sdio device(ie:sdio-wifi), 4:SD combo (IO+mem) card, 5:NON sdio device(means sd/mmc card), other:reserved */

diff --git a/arch/arm64/boot/dts/amlogic/gxbb_p200_1G_wetek_hub.dts b/arch/arm64/boot/dts/amlogic/gxbb_p200_1G_wetek_hub.dts
@@ -433,20 +433,16 @@
 	   		pinname = "sd";
 	   		ocr_avail = <0x00200080>; // 3.3:0x200000, 1.8+3.3:0x00200080
 	   		caps = "MMC_CAP_4_BIT_DATA","MMC_CAP_MMC_HIGHSPEED",
-					"MMC_CAP_SD_HIGHSPEED", "MMC_CAP_UHS_SDR12", "MMC_CAP_UHS_SDR25","MMC_CAP_UHS_SDR50";
+					"MMC_CAP_SD_HIGHSPEED";
 					//"MMC_CAP_UHS_SDR12",
 					//"MMC_CAP_UHS_SDR25","MMC_CAP_UHS_SDR50",
 					//"MMC_CAP_UHS_SDR104";
-			f_min = <400000>;
+	   		f_min = <400000>;
 	   		f_max = <100000000>;
 	   		max_req_size = <0x20000>;          /**128KB*/
 			gpio_dat3 = <&gpio       CARD_4       GPIO_ACTIVE_HIGH>;
 			jtag_pin =  <&gpio       CARD_0       GPIO_ACTIVE_HIGH>;
 			gpio_cd =  <&gpio       CARD_6       GPIO_ACTIVE_HIGH>;
-			/*if card have no switch gpio, remove all relative to vol_switch */
-			vol_switch =  <&gpio_ao       GPIOAO_5       GPIO_ACTIVE_HIGH>;
-			vol_switch_18 = <0>; /* 1 = high, 0 = low */
-			vol_switch_delay = <150>; /* Uint: ms*/
 	   		irq_in = <3>;
 	   		irq_out = <5>;
 	   		card_type = <5>; /* 0:unknown, 1:mmc card(include eMMC), 2:sd card(include tSD), 3:sdio device(ie:sdio-wifi), 4:SD combo (IO+mem) card, 5:NON sdio device(means sd/mmc card), other:reserved */