From 8ea33e5fc15acd661b3e7e7fb253d42fc87b642c Mon Sep 17 00:00:00 2001 From: Jianxin Pan Date: Fri, 28 Apr 2017 14:32:52 +0800 Subject: [PATCH] Revert "wifi: wifi work over sdio controller" Wifi and sd card can not be ok at the same time because of sdio driver problems. Remove wifi to enable sd before sdio driver is correct. This reverts commit 97c2d30b4b94dc6bd5102ef8d79cbb6272c06172. Change-Id: Ia439b0dff3ef7e0822ae8be3bb9502fb272e3864 Signed-off-by: Jianxin Pan --- arch/arm/boot/dts/amlogic/meson8b_m200.dts | 43 ++++++++++++++-------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/meson8b_m200.dts b/arch/arm/boot/dts/amlogic/meson8b_m200.dts index 8b23de2b0028..850ff06494eb 100644 --- a/arch/arm/boot/dts/amlogic/meson8b_m200.dts +++ b/arch/arm/boot/dts/amlogic/meson8b_m200.dts @@ -71,27 +71,38 @@ clocks = <&clkc CLKID_SDIO>; clock-names = "core"; - sdio{ + sd { status = "okay"; - port = <0>; + port = <1>; /* 0:sdio_a, - * 1:sdio_b, - * 2:sdio_c, - * 3:sdhc_a, - * 4:sdhc_b, - * 5:sdhc_c - */ - pinname = "sdio"; - ocr_avail = <0x200000>; - /*VDD voltage 3.3 ~ 3.4 */ + * 1:sdio_b, + * 2:sdio_c, + * 3:sdhc_a, + * 4:sdhc_b, + * 5:sdhc_c + */ + pinname = "sd"; + ocr_avail = <0x200000>; /**VDD voltage 3.3 ~ 3.4 */ caps = "MMC_CAP_4_BIT_DATA", - "MMC_CAP_MMC_HIGHSPEED", - "MMC_CAP_SD_HIGHSPEED", - "MMC_CAP_NONREMOVABLE"; + "MMC_CAP_MMC_HIGHSPEED", + "MMC_CAP_SD_HIGHSPEED"; f_min = <300000>; f_max = <50000000>; - max_req_size = <0x20000>; /**128KB*/ - card_type = <3>; + f_max_w = <50000000>; + 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>; + gpio_ro = <&gpio GPIODV_25 GPIO_ACTIVE_HIGH>; + 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 + */ }; };