Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63325ff2 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP1: Move 16xx GPIO system clock to platform init code 



This way we can remove omap_read/write call from the GPIO driver
and remove include to linux/io.h.

Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a4f34197

arch/arm/mach-omap1/gpio16xx.c

+7 −0
Original line number Diff line number Diff line
@@ -218,6 +218,13 @@ static int __init omap16xx_gpio_init(void) 
	if (!cpu_is_omap16xx())

		return -EINVAL;



	/*

	 * Enable system clock for GPIO module.

	 * The CAM_CLK_CTRL *is* really the right place.

	 */

	omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04,

					ULPD_CAM_CLK_CTRL);



	for (i = 0; i < ARRAY_SIZE(omap16xx_gpio_dev); i++)

		platform_device_register(omap16xx_gpio_dev[i]);

drivers/gpio/gpio-omap.c

+0 −7
Original line number Diff line number Diff line
@@ -1064,13 +1064,6 @@ static void omap_gpio_mod_init(struct gpio_bank *bank, int id) 
						+ OMAP1610_GPIO_IRQSTATUS1);

			__raw_writew(0x0014, bank->base

						+ OMAP1610_GPIO_SYSCONFIG);



			/*

			 * Enable system clock for GPIO module.

			 * The CAM_CLK_CTRL *is* really the right place.

			 */

			omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04,

						ULPD_CAM_CLK_CTRL);

		}

		if (cpu_is_omap7xx() && bank->method == METHOD_GPIO_7XX) {

			__raw_writel(0xffffffff, bank->base