Commit 4f163eb8 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

mx31: calls to gpio_request moved into platform code 



In order to use the gpiolib, we now have to call gpio_request in
the plaform code since it is not done in iomux code anymore.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent ef754d63

arch/arm/mach-mx3/mx31ads.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static void __init mx31ads_init_expio(void) 
	/*

	 * Configure INT line as GPIO input

	 */

	mxc_iomux_setup_pin(IOMUX_MODE(MX31_PIN_GPIO1_4, IOMUX_CONFIG_GPIO), "expio");

	mxc_iomux_alloc_pin(IOMUX_MODE(MX31_PIN_GPIO1_4, IOMUX_CONFIG_GPIO), "expio");



	/* disable the interrupt and clear the status */

	__raw_writew(0xFFFF, PBC_INTMASK_CLEAR_REG);

arch/arm/mach-mx3/mx31lite.c

+9 −2
Original line number Diff line number Diff line
@@ -118,15 +118,22 @@ void __init mx31lite_map_io(void) 
 */

static void __init mxc_board_init(void)

{

	int ret;



	mxc_iomux_setup_multiple_pins(mx31lite_pins, ARRAY_SIZE(mx31lite_pins),

				      "mx31lite");



	mxc_register_device(&mxc_uart_device0, &uart_pdata);



	/* SMSC9117 IRQ pin */

	ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_SFS6), "sms9117-irq");

	if (ret)

		pr_warning("could not get LAN irq gpio\n");

	else {

		gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_SFS6));

		platform_device_register(&smsc911x_device);

	}

}



static void __init mx31lite_timer_init(void)

{

arch/arm/mach-mx3/mx31moboard-devboard.c

+27 −1
Original line number Diff line number Diff line
@@ -56,14 +56,40 @@ static int devboard_sdhc2_get_ro(struct device *dev) 
static int devboard_sdhc2_init(struct device *dev, irq_handler_t detect_irq,

		void *data)

{

	return request_irq(gpio_to_irq(SDHC2_CD), detect_irq,

	int ret;



	ret = gpio_request(SDHC2_CD, "sdhc-detect");

	if (ret)

		return ret;



	gpio_direction_input(SDHC2_CD);



	ret = gpio_request(SDHC2_WP, "sdhc-wp");

	if (ret)

		goto err_gpio_free;

	gpio_direction_input(SDHC2_WP);



	ret = request_irq(gpio_to_irq(SDHC2_CD), detect_irq,

		IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

		"sdhc2-card-detect", data);

	if (ret)

		goto err_gpio_free_2;



	return 0;



err_gpio_free_2:

	gpio_free(SDHC2_WP);

err_gpio_free:

	gpio_free(SDHC2_CD);



	return ret;

}



static void devboard_sdhc2_exit(struct device *dev, void *data)

{

	free_irq(gpio_to_irq(SDHC2_CD), data);

	gpio_free(SDHC2_WP);

	gpio_free(SDHC2_CD);

}



static struct imxmmc_platform_data sdhc2_pdata = {

arch/arm/mach-mx3/mx31moboard-marxbot.c

+27 −1
Original line number Diff line number Diff line
@@ -60,14 +60,40 @@ static int marxbot_sdhc2_get_ro(struct device *dev) 
static int marxbot_sdhc2_init(struct device *dev, irq_handler_t detect_irq,

		void *data)

{

	return request_irq(gpio_to_irq(SDHC2_CD), detect_irq,

	int ret;



	ret = gpio_request(SDHC2_CD, "sdhc-detect");

	if (ret)

		return ret;



	gpio_direction_input(SDHC2_CD);



	ret = gpio_request(SDHC2_WP, "sdhc-wp");

	if (ret)

		goto err_gpio_free;

	gpio_direction_input(SDHC2_WP);



	ret = request_irq(gpio_to_irq(SDHC2_CD), detect_irq,

		IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

		"sdhc2-card-detect", data);

	if (ret)

		goto err_gpio_free_2;



	return 0;



err_gpio_free_2:

	gpio_free(SDHC2_WP);

err_gpio_free:

	gpio_free(SDHC2_CD);



	return ret;

}



static void marxbot_sdhc2_exit(struct device *dev, void *data)

{

	free_irq(gpio_to_irq(SDHC2_CD), data);

	gpio_free(SDHC2_WP);

	gpio_free(SDHC2_CD);

}



static struct imxmmc_platform_data sdhc2_pdata = {

arch/arm/mach-mx3/mx31moboard.c

+27 −1
Original line number Diff line number Diff line
@@ -112,14 +112,40 @@ static int moboard_sdhc1_get_ro(struct device *dev) 
static int moboard_sdhc1_init(struct device *dev, irq_handler_t detect_irq,

		void *data)

{

	return request_irq(gpio_to_irq(SDHC1_CD), detect_irq,

	int ret;



	ret = gpio_request(SDHC1_CD, "sdhc-detect");

	if (ret)

		return ret;



	gpio_direction_input(SDHC1_CD);



	ret = gpio_request(SDHC1_WP, "sdhc-wp");

	if (ret)

		goto err_gpio_free;

	gpio_direction_input(SDHC1_WP);



	ret = request_irq(gpio_to_irq(SDHC1_CD), detect_irq,

		IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

		"sdhc1-card-detect", data);

	if (ret)

		goto err_gpio_free_2;



	return 0;



err_gpio_free_2:

	gpio_free(SDHC1_WP);

err_gpio_free:

	gpio_free(SDHC1_CD);



	return ret;

}



static void moboard_sdhc1_exit(struct device *dev, void *data)

{

	free_irq(gpio_to_irq(SDHC1_CD), data);

	gpio_free(SDHC1_WP);

	gpio_free(SDHC1_CD);

}



static struct imxmmc_platform_data sdhc1_pdata = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE