Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b9929f0eb466089e14389a7d467196c4e179dc6a

Authored by Sylwester Nawrocki
Committed by Chris Ball
1 parent bd6a8c30fa
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

mmc: s3cmci: Convert s3cmci driver to gpiolib API 

The s3c2410_gpio* calls are obsolete and have been scheduled for
removal since several kernel releases. Remove them and use common
gpiolib API.

This patch is a prerequisite for removal of the S3C24XX SoC specific
arch/arm/plat-samsung/include/gpio-fns.h header.

Tested on Micro2440-SDK.

Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

Showing 1 changed file with 3 additions and 7 deletions Side-by-side Diff

drivers/mmc/host/s3cmci.c
Diff comments   View file @ b9929f0
... ... @@ -26,7 +26,6 @@
26 26 #include <mach/dma.h>
27 27  
28 28 #include <mach/regs-sdi.h>
29   -#include <mach/regs-gpio.h>
30 29  
31 30 #include <plat/mci.h>
32 31  
... ... @@ -1237,12 +1236,9 @@
1237 1236 switch (ios->power_mode) {
1238 1237 case MMC_POWER_ON:
1239 1238 case MMC_POWER_UP:
1240   - s3c2410_gpio_cfgpin(S3C2410_GPE(5), S3C2410_GPE5_SDCLK);
1241   - s3c2410_gpio_cfgpin(S3C2410_GPE(6), S3C2410_GPE6_SDCMD);
1242   - s3c2410_gpio_cfgpin(S3C2410_GPE(7), S3C2410_GPE7_SDDAT0);
1243   - s3c2410_gpio_cfgpin(S3C2410_GPE(8), S3C2410_GPE8_SDDAT1);
1244   - s3c2410_gpio_cfgpin(S3C2410_GPE(9), S3C2410_GPE9_SDDAT2);
1245   - s3c2410_gpio_cfgpin(S3C2410_GPE(10), S3C2410_GPE10_SDDAT3);
  1239 + /* Configure GPE5...GPE10 pins in SD mode */
  1240 + s3c_gpio_cfgall_range(S3C2410_GPE(5), 6, S3C_GPIO_SFN(2),
  1241 + S3C_GPIO_PULL_NONE);
1246 1242  
1247 1243 if (host->pdata->set_power)
1248 1244 host->pdata->set_power(ios->power_mode, ios->vdd);