Commit 2601ccfe authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: nomadik: configure Nomadik for pin control 



This converts the Nomadik to using pin control using the
driver for the STN8815 ASIC.

Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f79c5ed9

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -956,6 +956,7 @@ config ARCH_NOMADIK 
	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select PINCTRL

	select PINCTRL_STN8815

	select MIGHT_HAVE_CACHE_L2X0

	select ARCH_REQUIRE_GPIOLIB

	help

arch/arm/mach-nomadik/board-nhk8815.c

+36 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/i2c.h>

#include <linux/io.h>

#include <linux/pinctrl/machine.h>

#include <asm/hardware/vic.h>

#include <asm/sizes.h>

#include <asm/mach-types.h>
@@ -33,6 +34,7 @@ 


#include <plat/gpio-nomadik.h>

#include <plat/mtu.h>

#include <plat/pincfg.h>



#include <mach/nand.h>

#include <mach/fsmc.h>
@@ -291,8 +293,42 @@ static struct i2c_board_info __initdata nhk8815_i2c2_devices[] = { 
	},

};



static unsigned long out_low[] = { PIN_OUTPUT_LOW };

static unsigned long out_high[] = { PIN_OUTPUT_HIGH };

static unsigned long in_nopull[] = { PIN_INPUT_NOPULL };

static unsigned long in_pullup[] = { PIN_INPUT_PULLUP };



static struct pinctrl_map __initdata nhk8815_pinmap[] = {

	PIN_MAP_MUX_GROUP_DEFAULT("uart0", "pinctrl-stn8815", "u0_a_1", "u0"),

	PIN_MAP_MUX_GROUP_DEFAULT("uart1", "pinctrl-stn8815", "u1_a_1", "u1"),

	/* Hog in MMC/SD card mux */

	PIN_MAP_MUX_GROUP_HOG_DEFAULT("pinctrl-stn8815", "mmcsd_a_1", "mmcsd"),

	/* MCCLK */

	PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO8_B10", out_low),

	/* MCCMD */

	PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO9_A10", in_pullup),

	/* MCCMDDIR */

	PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO10_C11", out_high),

	/* MCDAT3-0 */

	PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO11_B11", in_pullup),

	PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO12_A11", in_pullup),

	PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO13_C12", in_pullup),

	PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO14_B12", in_pullup),

	/* MCDAT0DIR */

	PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO15_A12", out_high),

	/* MCDAT31DIR */

	PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO16_C13", out_high),

	/* MCMSFBCLK */

	PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO24_C15", in_pullup),

	/* CD input GPIO */

	PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO111_H21", in_nopull),

	/* CD bias drive */

	PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO112_J21", out_low),

};



static void __init nhk8815_platform_init(void)

{

	pinctrl_register_mappings(nhk8815_pinmap, ARRAY_SIZE(nhk8815_pinmap));

	cpu8815_platform_init();

	nhk8815_onenand_init();

	platform_add_devices(nhk8815_platform_devices,

arch/arm/mach-nomadik/cpu-8815.c

+13 −0
Original line number Diff line number Diff line
@@ -83,6 +83,18 @@ void cpu8815_add_gpios(resource_size_t *base, int num, int irq, 
	}

}



static inline void

cpu8815_add_pinctrl(struct device *parent, const char *name)

{

	struct platform_device_info pdevinfo = {

		.parent = parent,

		.name = name,

		.id = -1,

	};



	platform_device_register_full(&pdevinfo);

}



static int __init cpu8815_init(void)

{

	struct nmk_gpio_platform_data pdata = {
@@ -91,6 +103,7 @@ static int __init cpu8815_init(void) 


	cpu8815_add_gpios(cpu8815_gpio_base, ARRAY_SIZE(cpu8815_gpio_base),

			  IRQ_GPIO0, &pdata);

	cpu8815_add_pinctrl(NULL, "pinctrl-stn8815");

	amba_apb_device_add(NULL, "rng", NOMADIK_RNG_BASE, SZ_4K, 0, 0, NULL, 0);

	amba_apb_device_add(NULL, "rtc-pl031", NOMADIK_RTC_BASE, SZ_4K, IRQ_RTC_RTT, 0, NULL, 0);

	return 0;