diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-01-04 02:39:44 +0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-01-29 01:53:12 +0400 |
| commit | a352d85adbe8ed0c5c8c69e3ea0ee1833b3ee27e (patch) | |
| tree | 393fdf515217be92a6330609f2c6a6373ab7794e /arch/arm/mach-nomadik/i2c-8815nhk.c | |
| parent | f8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff) | |
| download | linux-a352d85adbe8ed0c5c8c69e3ea0ee1833b3ee27e.tar.xz | |
ARM: nomadik: move last custom calls to pinctrl
The I2C pins were still set up using custom nmk_* calls, move
these to use the pinctrl mapping table instead. There was also
a remaining call to turn the Ethernet pin to GPIO, and this is
now done implicitly by the GPIO-to-pinctrl range translation
calls.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-nomadik/i2c-8815nhk.c')
| -rw-r--r-- | arch/arm/mach-nomadik/i2c-8815nhk.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-nomadik/i2c-8815nhk.c b/arch/arm/mach-nomadik/i2c-8815nhk.c index 0c2f6628299a..f0e9e64f731a 100644 --- a/arch/arm/mach-nomadik/i2c-8815nhk.c +++ b/arch/arm/mach-nomadik/i2c-8815nhk.c @@ -4,7 +4,6 @@ #include <linux/i2c-algo-bit.h> #include <linux/i2c-gpio.h> #include <linux/platform_device.h> -#include <linux/platform_data/pinctrl-nomadik.h> /* * There are two busses in the 8815NHK. @@ -57,18 +56,8 @@ static struct platform_device nhk8815_i2c_dev2 = { }, }; -static pin_cfg_t cpu8815_pins_i2c[] = { - PIN_CFG_INPUT(62, GPIO, PULLUP), - PIN_CFG_INPUT(63, GPIO, PULLUP), - PIN_CFG_INPUT(53, GPIO, PULLUP), - PIN_CFG_INPUT(54, GPIO, PULLUP), - PIN_CFG_INPUT(73, GPIO, PULLUP), - PIN_CFG_INPUT(74, GPIO, PULLUP), -}; - static int __init nhk8815_i2c_init(void) { - nmk_config_pins(cpu8815_pins_i2c, ARRAY_SIZE(cpu8815_pins_i2c)); platform_device_register(&nhk8815_i2c_dev0); platform_device_register(&nhk8815_i2c_dev1); platform_device_register(&nhk8815_i2c_dev2); |