s3cmci: change GPIO to gpiolib from S3C24XX specific calls (916a3077) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/mmc/host/s3cmci.c

+69 −18

Original line number	Original line	Diff line number	Diff line
	@@ -1047,7 +1047,7 @@ static int s3cmci_card_present(struct mmc_host *mmc)
	if (pdata->gpio_detect == 0)		if (pdata->gpio_detect == 0)
	return -ENOSYS;		return -ENOSYS;

	ret = s3c2410_gpio_getpin(pdata->gpio_detect) ? 0 : 1;		ret = gpio_get_value(pdata->gpio_detect) ? 0 : 1;
	return ret ^ pdata->detect_invert;		return ret ^ pdata->detect_invert;
	}		}

	@@ -1102,12 +1102,12 @@ static void s3cmci_set_ios(struct mmc_host mmc, struct mmc_ios ios)
	switch (ios->power_mode) {		switch (ios->power_mode) {
	case MMC_POWER_ON:		case MMC_POWER_ON:
	case MMC_POWER_UP:		case MMC_POWER_UP:
	s3c2410_gpio_cfgpin(S3C2410_GPE5, S3C2410_GPE5_SDCLK);		s3c2410_gpio_cfgpin(S3C2410_GPE(5), S3C2410_GPE5_SDCLK);
	s3c2410_gpio_cfgpin(S3C2410_GPE6, S3C2410_GPE6_SDCMD);		s3c2410_gpio_cfgpin(S3C2410_GPE(6), S3C2410_GPE6_SDCMD);
	s3c2410_gpio_cfgpin(S3C2410_GPE7, S3C2410_GPE7_SDDAT0);		s3c2410_gpio_cfgpin(S3C2410_GPE(7), S3C2410_GPE7_SDDAT0);
	s3c2410_gpio_cfgpin(S3C2410_GPE8, S3C2410_GPE8_SDDAT1);		s3c2410_gpio_cfgpin(S3C2410_GPE(8), S3C2410_GPE8_SDDAT1);
	s3c2410_gpio_cfgpin(S3C2410_GPE9, S3C2410_GPE9_SDDAT2);		s3c2410_gpio_cfgpin(S3C2410_GPE(9), S3C2410_GPE9_SDDAT2);
	s3c2410_gpio_cfgpin(S3C2410_GPE10, S3C2410_GPE10_SDDAT3);		s3c2410_gpio_cfgpin(S3C2410_GPE(10), S3C2410_GPE10_SDDAT3);

	if (host->pdata->set_power)		if (host->pdata->set_power)
	host->pdata->set_power(ios->power_mode, ios->vdd);		host->pdata->set_power(ios->power_mode, ios->vdd);
	@@ -1119,8 +1119,7 @@ static void s3cmci_set_ios(struct mmc_host mmc, struct mmc_ios ios)

	case MMC_POWER_OFF:		case MMC_POWER_OFF:
	default:		default:
	s3c2410_gpio_setpin(S3C2410_GPE5, 0);		gpio_direction_output(S3C2410_GPE(5), 0);
	s3c2410_gpio_cfgpin(S3C2410_GPE5, S3C2410_GPIO_OUTPUT);

	if (host->is2440)		if (host->is2440)
	mci_con \|= S3C2440_SDICON_SDRESET;		mci_con \|= S3C2440_SDICON_SDRESET;
	@@ -1244,12 +1243,14 @@ static inline void s3cmci_cpufreq_deregister(struct s3cmci_host *host)
	}		}
	#endif		#endif


	static int __devinit s3cmci_probe(struct platform_device *pdev)		static int __devinit s3cmci_probe(struct platform_device *pdev)
	{		{
	struct s3cmci_host *host;		struct s3cmci_host *host;
	struct mmc_host *mmc;		struct mmc_host *mmc;
	int ret;		int ret;
	int is2440;		int is2440;
			int i;

	is2440 = platform_get_device_id(pdev)->driver_data;		is2440 = platform_get_device_id(pdev)->driver_data;

	@@ -1259,6 +1260,18 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)
	goto probe_out;		goto probe_out;
	}		}

			for (i = S3C2410_GPE(5); i <= S3C2410_GPE(10); i++) {
			ret = gpio_request(i, dev_name(&pdev->dev));
			if (ret) {
			dev_err(&pdev->dev, "failed to get gpio %d\n", i);

			for (i--; i >= S3C2410_GPE(5); i--)
			gpio_free(i);

			goto probe_free_host;
			}
			}

	host = mmc_priv(mmc);		host = mmc_priv(mmc);
	host->mmc = mmc;		host->mmc = mmc;
	host->pdev = pdev;		host->pdev = pdev;
	@@ -1295,7 +1308,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)
	"failed to get io memory region resouce.\n");		"failed to get io memory region resouce.\n");

	ret = -ENOENT;		ret = -ENOENT;
	goto probe_free_host;		goto probe_free_gpio;
	}		}

	host->mem = request_mem_region(host->mem->start,		host->mem = request_mem_region(host->mem->start,
	@@ -1304,7 +1317,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)
	if (!host->mem) {		if (!host->mem) {
	dev_err(&pdev->dev, "failed to request io memory region.\n");		dev_err(&pdev->dev, "failed to request io memory region.\n");
	ret = -ENOENT;		ret = -ENOENT;
	goto probe_free_host;		goto probe_free_gpio;
	}		}

	host->base = ioremap(host->mem->start, resource_size(host->mem));		host->base = ioremap(host->mem->start, resource_size(host->mem));
	@@ -1333,6 +1346,14 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)

	disable_irq(host->irq);		disable_irq(host->irq);

			if (host->pdata->gpio_detect) {
			ret = gpio_request(host->pdata->gpio_detect, "s3cmci detect");
			if (ret) {
			dev_err(&pdev->dev, "failed to get detect gpio\n");
			goto probe_free_irq;
			}
			}

	host->irq_cd = s3c2410_gpio_getirq(host->pdata->gpio_detect);		host->irq_cd = s3c2410_gpio_getirq(host->pdata->gpio_detect);

	if (host->irq_cd >= 0) {		if (host->irq_cd >= 0) {
	@@ -1341,22 +1362,27 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)
	DRIVER_NAME, host)) {		DRIVER_NAME, host)) {
	dev_err(&pdev->dev, "can't get card detect irq.\n");		dev_err(&pdev->dev, "can't get card detect irq.\n");
	ret = -ENOENT;		ret = -ENOENT;
	goto probe_free_irq;		goto probe_free_gpio_cd;
	}		}
	} else {		} else {
	dev_warn(&pdev->dev, "host detect has no irq available\n");		dev_warn(&pdev->dev, "host detect has no irq available\n");
	s3c2410_gpio_cfgpin(host->pdata->gpio_detect,		gpio_direction_input(host->pdata->gpio_detect);
	S3C2410_GPIO_INPUT);
	}		}

	if (host->pdata->gpio_wprotect)		if (host->pdata->gpio_wprotect) {
	s3c2410_gpio_cfgpin(host->pdata->gpio_wprotect,		ret = gpio_request(host->pdata->gpio_wprotect, "s3cmci wp");
	S3C2410_GPIO_INPUT);		if (ret) {
			dev_err(&pdev->dev, "failed to get writeprotect\n");
			goto probe_free_irq_cd;
			}

			gpio_direction_input(host->pdata->gpio_wprotect);
			}

	if (s3c2410_dma_request(S3CMCI_DMA, &s3cmci_dma_client, NULL) < 0) {		if (s3c2410_dma_request(S3CMCI_DMA, &s3cmci_dma_client, NULL) < 0) {
	dev_err(&pdev->dev, "unable to get DMA channel.\n");		dev_err(&pdev->dev, "unable to get DMA channel.\n");
	ret = -EBUSY;		ret = -EBUSY;
	goto probe_free_irq_cd;		goto probe_free_gpio_wp;
	}		}

	host->clk = clk_get(&pdev->dev, "sdi");		host->clk = clk_get(&pdev->dev, "sdi");
	@@ -1423,6 +1449,14 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)
	clk_free:		clk_free:
	clk_put(host->clk);		clk_put(host->clk);

			probe_free_gpio_wp:
			if (host->pdata->gpio_wprotect)
			gpio_free(host->pdata->gpio_wprotect);

			probe_free_gpio_cd:
			if (host->pdata->gpio_detect)
			gpio_free(host->pdata->gpio_detect);

	probe_free_irq_cd:		probe_free_irq_cd:
	if (host->irq_cd >= 0)		if (host->irq_cd >= 0)
	free_irq(host->irq_cd, host);		free_irq(host->irq_cd, host);
	@@ -1436,8 +1470,13 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)
	probe_free_mem_region:		probe_free_mem_region:
	release_mem_region(host->mem->start, resource_size(host->mem));		release_mem_region(host->mem->start, resource_size(host->mem));

			probe_free_gpio:
			for (i = S3C2410_GPE(5); i <= S3C2410_GPE(10); i++)
			gpio_free(i);

	probe_free_host:		probe_free_host:
	mmc_free_host(mmc);		mmc_free_host(mmc);

	probe_out:		probe_out:
	return ret;		return ret;
	}		}
	@@ -1459,6 +1498,8 @@ static int __devexit s3cmci_remove(struct platform_device *pdev)
	{		{
	struct mmc_host *mmc = platform_get_drvdata(pdev);		struct mmc_host *mmc = platform_get_drvdata(pdev);
	struct s3cmci_host *host = mmc_priv(mmc);		struct s3cmci_host *host = mmc_priv(mmc);
			struct s3c24xx_mci_pdata *pd = host->pdata;
			int i;

	s3cmci_shutdown(pdev);		s3cmci_shutdown(pdev);

	@@ -1469,6 +1510,16 @@ static int __devexit s3cmci_remove(struct platform_device *pdev)

	free_irq(host->irq, host);		free_irq(host->irq, host);

			if (pd->gpio_wprotect)
			gpio_free(pd->gpio_wprotect);

			if (pd->gpio_detect)
			gpio_free(pd->gpio_detect);

			for (i = S3C2410_GPE(5); i <= S3C2410_GPE(10); i++)
			gpio_free(i);


	iounmap(host->base);		iounmap(host->base);
	release_mem_region(host->mem->start, resource_size(host->mem));		release_mem_region(host->mem->start, resource_size(host->mem));