Commit 8d7cf837 authored by Shawn Guo's avatar Shawn Guo Committed by Grant Likely
Browse files

gpio/mxs: Change gpio-mxs into an upstanding gpio driver 



The patch makes necessary changes on gpio-mxs as below to turn it
into an upstanding gpio driver.

 * Clean up the gpio port definition stuff

 * Use readl/writel to replace mach-specific accessors
   __raw_readl/__raw_writel

 * Change mxs_gpio_init into mxs_gpio_probe function

And it then migrates mach-mxs to the updated driver by adding
corresponding platform devices.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 7b2fa570

arch/arm/mach-mxs/devices.c

+11 −0
Original line number Diff line number Diff line
@@ -88,3 +88,14 @@ int __init mxs_add_amba_device(const struct amba_device *dev) 


	return amba_device_register(adev, &iomem_resource);

}



struct device mxs_apbh_bus = {

	.init_name	= "mxs_apbh",

	.parent         = &platform_bus,

};



static int __init mxs_device_init(void)

{

	return device_register(&mxs_apbh_bus);

}

core_initcall(mxs_device_init);

arch/arm/mach-mxs/devices/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,4 +6,5 @@ obj-$(CONFIG_MXS_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o 
obj-$(CONFIG_MXS_HAVE_PLATFORM_MXS_I2C) += platform-mxs-i2c.o

obj-$(CONFIG_MXS_HAVE_PLATFORM_MXS_MMC) += platform-mxs-mmc.o

obj-$(CONFIG_MXS_HAVE_PLATFORM_MXS_PWM) += platform-mxs-pwm.o

obj-y += platform-gpio-mxs.o

obj-$(CONFIG_MXS_HAVE_PLATFORM_MXSFB) += platform-mxsfb.o

arch/arm/mach-mxs/devices/platform-gpio-mxs.c

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or modify it under

 * the terms of the GNU General Public License version 2 as published by the

 * Free Software Foundation.

 */

#include <linux/compiler.h>

#include <linux/err.h>

#include <linux/init.h>



#include <mach/mx23.h>

#include <mach/mx28.h>

#include <mach/devices-common.h>



struct platform_device *__init mxs_add_gpio(

	int id, resource_size_t iobase, int irq)

{

	struct resource res[] = {

		{

			.start = iobase,

			.end = iobase + SZ_8K - 1,

			.flags = IORESOURCE_MEM,

		}, {

			.start = irq,

			.end = irq,

			.flags = IORESOURCE_IRQ,

		},

	};



	return platform_device_register_resndata(&mxs_apbh_bus,

			"gpio-mxs", id, res, ARRAY_SIZE(res), NULL, 0);

}



static int __init mxs_add_mxs_gpio(void)

{

	if (cpu_is_mx23()) {

		mxs_add_gpio(0, MX23_PINCTRL_BASE_ADDR, MX23_INT_GPIO0);

		mxs_add_gpio(1, MX23_PINCTRL_BASE_ADDR, MX23_INT_GPIO1);

		mxs_add_gpio(2, MX23_PINCTRL_BASE_ADDR, MX23_INT_GPIO2);

	}



	if (cpu_is_mx28()) {

		mxs_add_gpio(0, MX28_PINCTRL_BASE_ADDR, MX28_INT_GPIO0);

		mxs_add_gpio(1, MX28_PINCTRL_BASE_ADDR, MX28_INT_GPIO1);

		mxs_add_gpio(2, MX28_PINCTRL_BASE_ADDR, MX28_INT_GPIO2);

		mxs_add_gpio(3, MX28_PINCTRL_BASE_ADDR, MX28_INT_GPIO3);

		mxs_add_gpio(4, MX28_PINCTRL_BASE_ADDR, MX28_INT_GPIO4);

	}



	return 0;

}

postcore_initcall(mxs_add_mxs_gpio);

arch/arm/mach-mxs/include/mach/devices-common.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include <linux/init.h>

#include <linux/amba/bus.h>



extern struct device mxs_apbh_bus;



struct platform_device *mxs_add_platform_device_dmamask(

		const char *name, int id,

		const struct resource *res, unsigned int num_resources,

arch/arm/mach-mxs/mm-mx23.c

+0 −1
Original line number Diff line number Diff line
@@ -41,5 +41,4 @@ void __init mx23_map_io(void) 
void __init mx23_init_irq(void)

{

	icoll_init_irq();

	mx23_register_gpios();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE