From: Colin Cross Date: Fri, 16 Jul 2010 02:21:16 +0000 (-0700) Subject: [ARM] tegra: stingray: Specify nonexistant gpio for sdhci X-Git-Tag: firefly_0821_release~9834^2~789 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c28258f5509ea5675480b8f97b2bfce480910559;p=firefly-linux-kernel-4.4.55.git [ARM] tegra: stingray: Specify nonexistant gpio for sdhci The tegra sdhci driver has been changed to use -1 for "no gpio", because 0 is a valid gpio number. Change-Id: I906318d8d121019d33b98d1917e54dac90f747c1 Signed-off-by: Colin Cross --- diff --git a/arch/arm/mach-tegra/board-stingray-wifi.c b/arch/arm/mach-tegra/board-stingray-wifi.c index 3e15025ba119..6093082dcfa8 100644 --- a/arch/arm/mach-tegra/board-stingray-wifi.c +++ b/arch/arm/mach-tegra/board-stingray-wifi.c @@ -134,7 +134,10 @@ struct tegra_sdhci_platform_data stingray_wifi_data = { .status = stingray_wifi_status, .register_status_notify = stingray_wifi_status_register, .embedded_sdio = &stingray_wifi_emb_data, - } + }, + .cd_gpio = -1, + .wp_gpio = -1, + .power_gpio = -1, }; static int stingray_wifi_set_carddetect(int val) diff --git a/arch/arm/mach-tegra/board-stingray.c b/arch/arm/mach-tegra/board-stingray.c index 53299cc3107a..122ca7496376 100644 --- a/arch/arm/mach-tegra/board-stingray.c +++ b/arch/arm/mach-tegra/board-stingray.c @@ -390,6 +390,9 @@ extern struct tegra_sdhci_platform_data stingray_wifi_data; /* sdhci2 */ static struct tegra_sdhci_platform_data stingray_sdhci_platform_data3 = { .clk_id = NULL, .force_hs = 0, + .cd_gpio = -1, + .wp_gpio = -1, + .power_gpio = -1, }; static struct tegra_sdhci_platform_data stingray_sdhci_platform_data4 = {