pinctrl/nomadik: add STn8815 ASIC support

This adds support for the STN8815 ASIC for the Nomadik pin controller. Acked-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
author: Linus Walleij <linus.walleij@linaro.org> 2012-08-09 18:43:28 -0400
committer: Linus Walleij <linus.walleij@linaro.org> 2012-09-03 07:21:37 -0400
commit: f79c5ed9dab3ae80f6cbe9edaafbc8a4dadb8408 (patch)
tree: 7ff9f4063a1ff487758be23cbe8acef272c46c6d /drivers/pinctrl
parent: 45a1b53195069f53d5cbdbfff5e5fed97004320b (diff)
5 files changed, 377 insertions, 0 deletions
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 062f1a3e6640..606b953009cd 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -86,6 +86,10 @@ config PINCTRL_NOMADIK
        select PINMUX
        select PINCONF
+config PINCTRL_STN8815
+        bool "STN8815 pin controller driver"
+        depends on PINCTRL_NOMADIK && ARCH_NOMADIK
 config PINCTRL_DB8500
        bool "DB8500 pin controller driver"
        depends on PINCTRL_NOMADIK && ARCH_U8500
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index b44538ecc35d..59ef76537987 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_PINCTRL_MXS)	+= pinctrl-mxs.o
 obj-$(CONFIG_PINCTRL_IMX23)     += pinctrl-imx23.o
 obj-$(CONFIG_PINCTRL_IMX28)     += pinctrl-imx28.o
 obj-$(CONFIG_PINCTRL_NOMADIK)   += pinctrl-nomadik.o
+obj-$(CONFIG_PINCTRL_STN8815)   += pinctrl-nomadik-stn8815.o
 obj-$(CONFIG_PINCTRL_DB8500)    += pinctrl-nomadik-db8500.o
 obj-$(CONFIG_PINCTRL_DB8540)    += pinctrl-nomadik-db8540.o
 obj-$(CONFIG_PINCTRL_PXA168)    += pinctrl-pxa168.o
diff --git a/drivers/pinctrl/pinctrl-nomadik-stn8815.c b/drivers/pinctrl/pinctrl-nomadik-stn8815.c
new file mode 100644
index 000000000000..7d432c3bc359
--- /dev/null
+++ b/drivers/pinctrl/pinctrl-nomadik-stn8815.c
@@ -0,0 +1,357 @@
+#include <linux/kernel.h>
+#include <linux/pinctrl/pinctrl.h>
+#include "pinctrl-nomadik.h"
+/* All the pins that can be used for GPIO and some other functions */
+#define _GPIO(offset)           (offset)
+#define STN8815_PIN_B4          _GPIO(0)
+#define STN8815_PIN_D5          _GPIO(1)
+#define STN8815_PIN_C5          _GPIO(2)
+#define STN8815_PIN_A4          _GPIO(3)
+#define STN8815_PIN_B5          _GPIO(4)
+#define STN8815_PIN_D6          _GPIO(5)
+#define STN8815_PIN_C6          _GPIO(6)
+#define STN8815_PIN_B6          _GPIO(7)
+#define STN8815_PIN_B10         _GPIO(8)
+#define STN8815_PIN_A10         _GPIO(9)
+#define STN8815_PIN_C11         _GPIO(10)
+#define STN8815_PIN_B11         _GPIO(11)
+#define STN8815_PIN_A11         _GPIO(12)
+#define STN8815_PIN_C12         _GPIO(13)
+#define STN8815_PIN_B12         _GPIO(14)
+#define STN8815_PIN_A12         _GPIO(15)
+#define STN8815_PIN_C13         _GPIO(16)
+#define STN8815_PIN_B13         _GPIO(17)
+#define STN8815_PIN_A13         _GPIO(18)
+#define STN8815_PIN_D13         _GPIO(19)
+#define STN8815_PIN_C14         _GPIO(20)
+#define STN8815_PIN_B14         _GPIO(21)
+#define STN8815_PIN_A14         _GPIO(22)
+#define STN8815_PIN_D15         _GPIO(23)
+#define STN8815_PIN_C15         _GPIO(24)
+#define STN8815_PIN_B15         _GPIO(25)
+#define STN8815_PIN_A15         _GPIO(26)
+#define STN8815_PIN_C16         _GPIO(27)
+#define STN8815_PIN_B16         _GPIO(28)
+#define STN8815_PIN_A16         _GPIO(29)
+#define STN8815_PIN_D17         _GPIO(30)
+#define STN8815_PIN_C17         _GPIO(31)
+#define STN8815_PIN_AB6         _GPIO(32)
+#define STN8815_PIN_AA6         _GPIO(33)
+#define STN8815_PIN_Y6          _GPIO(34)
+#define STN8815_PIN_Y5          _GPIO(35)
+#define STN8815_PIN_AA5         _GPIO(36)
+#define STN8815_PIN_AB5         _GPIO(37)
+#define STN8815_PIN_AB4         _GPIO(38)
+#define STN8815_PIN_Y4          _GPIO(39)
+#define STN8815_PIN_R1          _GPIO(40)
+#define STN8815_PIN_R2          _GPIO(41)
+#define STN8815_PIN_R3          _GPIO(42)
+#define STN8815_PIN_P1          _GPIO(43)
+#define STN8815_PIN_P2          _GPIO(44)
+#define STN8815_PIN_P3          _GPIO(45)
+#define STN8815_PIN_N1          _GPIO(46)
+#define STN8815_PIN_N2          _GPIO(47)
+#define STN8815_PIN_N3          _GPIO(48)
+#define STN8815_PIN_M1          _GPIO(49)
+#define STN8815_PIN_M3          _GPIO(50)
+#define STN8815_PIN_M2          _GPIO(51)
+#define STN8815_PIN_L1          _GPIO(52)
+#define STN8815_PIN_L4          _GPIO(53)
+#define STN8815_PIN_L3          _GPIO(54)
+#define STN8815_PIN_L2          _GPIO(55)
+#define STN8815_PIN_F3          _GPIO(56)
+#define STN8815_PIN_F2          _GPIO(57)
+#define STN8815_PIN_E1          _GPIO(58)
+#define STN8815_PIN_E3          _GPIO(59)
+#define STN8815_PIN_E2          _GPIO(60)
+#define STN8815_PIN_E4          _GPIO(61)
+#define STN8815_PIN_D3          _GPIO(62)
+#define STN8815_PIN_D2          _GPIO(63)
+#define STN8815_PIN_F21         _GPIO(64)
+#define STN8815_PIN_F20         _GPIO(65)
+#define STN8815_PIN_E22         _GPIO(66)
+#define STN8815_PIN_D22         _GPIO(67)
+#define STN8815_PIN_E21         _GPIO(68)
+#define STN8815_PIN_E20         _GPIO(69)
+#define STN8815_PIN_C22         _GPIO(70)
+#define STN8815_PIN_D21         _GPIO(71)
+#define STN8815_PIN_D20         _GPIO(72)
+#define STN8815_PIN_C21         _GPIO(73)
+#define STN8815_PIN_C20         _GPIO(74)
+#define STN8815_PIN_C19         _GPIO(75)
+#define STN8815_PIN_B20         _GPIO(76)
+#define STN8815_PIN_B8          _GPIO(77)
+#define STN8815_PIN_A8          _GPIO(78)
+#define STN8815_PIN_C9          _GPIO(79)
+#define STN8815_PIN_B9          _GPIO(80)
+#define STN8815_PIN_A9          _GPIO(81)
+#define STN8815_PIN_C10         _GPIO(82)
+#define STN8815_PIN_K1          _GPIO(83)
+#define STN8815_PIN_K3          _GPIO(84)
+#define STN8815_PIN_K2          _GPIO(85)
+#define STN8815_PIN_J1          _GPIO(86)
+#define STN8815_PIN_J3          _GPIO(87)
+#define STN8815_PIN_J2          _GPIO(88)
+#define STN8815_PIN_H1          _GPIO(89)
+#define STN8815_PIN_H3          _GPIO(90)
+#define STN8815_PIN_H2          _GPIO(91)
+#define STN8815_PIN_G1          _GPIO(92)
+#define STN8815_PIN_G3          _GPIO(93)
+#define STN8815_PIN_G2          _GPIO(94)
+#define STN8815_PIN_F1          _GPIO(95)
+#define STN8815_PIN_T20         _GPIO(96)
+#define STN8815_PIN_R21         _GPIO(97)
+#define STN8815_PIN_R20         _GPIO(98)
+#define STN8815_PIN_U22         _GPIO(99)
+#define STN8815_PIN_N21         _GPIO(100)
+#define STN8815_PIN_N20         _GPIO(101)
+#define STN8815_PIN_P22         _GPIO(102)
+#define STN8815_PIN_N22         _GPIO(103)
+#define STN8815_PIN_V22         _GPIO(104)
+#define STN8815_PIN_V21         _GPIO(105)
+#define STN8815_PIN_K22         _GPIO(106)
+#define STN8815_PIN_K21         _GPIO(107)
+#define STN8815_PIN_H20         _GPIO(108)
+#define STN8815_PIN_G20         _GPIO(109)
+#define STN8815_PIN_L21         _GPIO(110)
+#define STN8815_PIN_H21         _GPIO(111)
+#define STN8815_PIN_J21         _GPIO(112)
+#define STN8815_PIN_H22         _GPIO(113)
+#define STN8815_PIN_K20         _GPIO(114)
+#define STN8815_PIN_L22         _GPIO(115)
+#define STN8815_PIN_G21         _GPIO(116)
+#define STN8815_PIN_J20         _GPIO(117)
+#define STN8815_PIN_G22         _GPIO(118)
+#define STN8815_PIN_U19         _GPIO(119)
+#define STN8815_PIN_G19         _GPIO(120)
+#define STN8815_PIN_M22         _GPIO(121)
+#define STN8815_PIN_M19         _GPIO(122)
+#define STN8815_PIN_J22         _GPIO(123)
+/* GPIOs 124-127 not routed to pins */
+/*
+ * The names of the pins are denoted by GPIO number and ball name, even
+ * though they can be used for other things than GPIO, this is the first
+ * column in the table of the data sheet and often used on schematics and
+ * such.
+ */
+static const struct pinctrl_pin_desc nmk_stn8815_pins[] = {
+        PINCTRL_PIN(STN8815_PIN_B4, "GPIO0_B4"),
+        PINCTRL_PIN(STN8815_PIN_D5, "GPIO1_D5"),
+        PINCTRL_PIN(STN8815_PIN_C5, "GPIO2_C5"),
+        PINCTRL_PIN(STN8815_PIN_A4, "GPIO3_A4"),
+        PINCTRL_PIN(STN8815_PIN_B5, "GPIO4_B5"),
+        PINCTRL_PIN(STN8815_PIN_D6, "GPIO5_D6"),
+        PINCTRL_PIN(STN8815_PIN_C6, "GPIO6_C6"),
+        PINCTRL_PIN(STN8815_PIN_B6, "GPIO7_B6"),
+        PINCTRL_PIN(STN8815_PIN_B10, "GPIO8_B10"),
+        PINCTRL_PIN(STN8815_PIN_A10, "GPIO9_A10"),
+        PINCTRL_PIN(STN8815_PIN_C11, "GPIO10_C11"),
+        PINCTRL_PIN(STN8815_PIN_B11, "GPIO11_B11"),
+        PINCTRL_PIN(STN8815_PIN_A11, "GPIO12_A11"),
+        PINCTRL_PIN(STN8815_PIN_C12, "GPIO13_C12"),
+        PINCTRL_PIN(STN8815_PIN_B12, "GPIO14_B12"),
+        PINCTRL_PIN(STN8815_PIN_A12, "GPIO15_A12"),
+        PINCTRL_PIN(STN8815_PIN_C13, "GPIO16_C13"),
+        PINCTRL_PIN(STN8815_PIN_B13, "GPIO17_B13"),
+        PINCTRL_PIN(STN8815_PIN_A13, "GPIO18_A13"),
+        PINCTRL_PIN(STN8815_PIN_D13, "GPIO19_D13"),
+        PINCTRL_PIN(STN8815_PIN_C14, "GPIO20_C14"),
+        PINCTRL_PIN(STN8815_PIN_B14, "GPIO21_B14"),
+        PINCTRL_PIN(STN8815_PIN_A14, "GPIO22_A14"),
+        PINCTRL_PIN(STN8815_PIN_D15, "GPIO23_D15"),
+        PINCTRL_PIN(STN8815_PIN_C15, "GPIO24_C15"),
+        PINCTRL_PIN(STN8815_PIN_B15, "GPIO25_B15"),
+        PINCTRL_PIN(STN8815_PIN_A15, "GPIO26_A15"),
+        PINCTRL_PIN(STN8815_PIN_C16, "GPIO27_C16"),
+        PINCTRL_PIN(STN8815_PIN_B16, "GPIO28_B16"),
+        PINCTRL_PIN(STN8815_PIN_A16, "GPIO29_A16"),
+        PINCTRL_PIN(STN8815_PIN_D17, "GPIO30_D17"),
+        PINCTRL_PIN(STN8815_PIN_C17, "GPIO31_C17"),
+        PINCTRL_PIN(STN8815_PIN_AB6, "GPIO32_AB6"),
+        PINCTRL_PIN(STN8815_PIN_AA6, "GPIO33_AA6"),
+        PINCTRL_PIN(STN8815_PIN_Y6, "GPIO34_Y6"),
+        PINCTRL_PIN(STN8815_PIN_Y5, "GPIO35_Y5"),
+        PINCTRL_PIN(STN8815_PIN_AA5, "GPIO36_AA5"),
+        PINCTRL_PIN(STN8815_PIN_AB5, "GPIO37_AB5"),
+        PINCTRL_PIN(STN8815_PIN_AB4, "GPIO38_AB4"),
+        PINCTRL_PIN(STN8815_PIN_Y4, "GPIO39_Y4"),
+        PINCTRL_PIN(STN8815_PIN_R1, "GPIO40_R1"),
+        PINCTRL_PIN(STN8815_PIN_R2, "GPIO41_R2"),
+        PINCTRL_PIN(STN8815_PIN_R3, "GPIO42_R3"),
+        PINCTRL_PIN(STN8815_PIN_P1, "GPIO43_P1"),
+        PINCTRL_PIN(STN8815_PIN_P2, "GPIO44_P2"),
+        PINCTRL_PIN(STN8815_PIN_P3, "GPIO45_P3"),
+        PINCTRL_PIN(STN8815_PIN_N1, "GPIO46_N1"),
+        PINCTRL_PIN(STN8815_PIN_N2, "GPIO47_N2"),
+        PINCTRL_PIN(STN8815_PIN_N3, "GPIO48_N3"),
+        PINCTRL_PIN(STN8815_PIN_M1, "GPIO49_M1"),
+        PINCTRL_PIN(STN8815_PIN_M3, "GPIO50_M3"),
+        PINCTRL_PIN(STN8815_PIN_M2, "GPIO51_M2"),
+        PINCTRL_PIN(STN8815_PIN_L1, "GPIO52_L1"),
+        PINCTRL_PIN(STN8815_PIN_L4, "GPIO53_L4"),
+        PINCTRL_PIN(STN8815_PIN_L3, "GPIO54_L3"),
+        PINCTRL_PIN(STN8815_PIN_L2, "GPIO55_L2"),
+        PINCTRL_PIN(STN8815_PIN_F3, "GPIO56_F3"),
+        PINCTRL_PIN(STN8815_PIN_F2, "GPIO57_F2"),
+        PINCTRL_PIN(STN8815_PIN_E1, "GPIO58_E1"),
+        PINCTRL_PIN(STN8815_PIN_E3, "GPIO59_E3"),
+        PINCTRL_PIN(STN8815_PIN_E2, "GPIO60_E2"),
+        PINCTRL_PIN(STN8815_PIN_E4, "GPIO61_E4"),
+        PINCTRL_PIN(STN8815_PIN_D3, "GPIO62_D3"),
+        PINCTRL_PIN(STN8815_PIN_D2, "GPIO63_D2"),
+        PINCTRL_PIN(STN8815_PIN_F21, "GPIO64_F21"),
+        PINCTRL_PIN(STN8815_PIN_F20, "GPIO65_F20"),
+        PINCTRL_PIN(STN8815_PIN_E22, "GPIO66_E22"),
+        PINCTRL_PIN(STN8815_PIN_D22, "GPIO67_D22"),
+        PINCTRL_PIN(STN8815_PIN_E21, "GPIO68_E21"),
+        PINCTRL_PIN(STN8815_PIN_E20, "GPIO69_E20"),
+        PINCTRL_PIN(STN8815_PIN_C22, "GPIO70_C22"),
+        PINCTRL_PIN(STN8815_PIN_D21, "GPIO71_D21"),
+        PINCTRL_PIN(STN8815_PIN_D20, "GPIO72_D20"),
+        PINCTRL_PIN(STN8815_PIN_C21, "GPIO73_C21"),
+        PINCTRL_PIN(STN8815_PIN_C20, "GPIO74_C20"),
+        PINCTRL_PIN(STN8815_PIN_C19, "GPIO75_C19"),
+        PINCTRL_PIN(STN8815_PIN_B20, "GPIO76_B20"),
+        PINCTRL_PIN(STN8815_PIN_B8, "GPIO77_B8"),
+        PINCTRL_PIN(STN8815_PIN_A8, "GPIO78_A8"),
+        PINCTRL_PIN(STN8815_PIN_C9, "GPIO79_C9"),
+        PINCTRL_PIN(STN8815_PIN_B9, "GPIO80_B9"),
+        PINCTRL_PIN(STN8815_PIN_A9, "GPIO81_A9"),
+        PINCTRL_PIN(STN8815_PIN_C10, "GPIO82_C10"),
+        PINCTRL_PIN(STN8815_PIN_K1, "GPIO83_K1"),
+        PINCTRL_PIN(STN8815_PIN_K3, "GPIO84_K3"),
+        PINCTRL_PIN(STN8815_PIN_K2, "GPIO85_K2"),
+        PINCTRL_PIN(STN8815_PIN_J1, "GPIO86_J1"),
+        PINCTRL_PIN(STN8815_PIN_J3, "GPIO87_J3"),
+        PINCTRL_PIN(STN8815_PIN_J2, "GPIO88_J2"),
+        PINCTRL_PIN(STN8815_PIN_H1, "GPIO89_H1"),
+        PINCTRL_PIN(STN8815_PIN_H3, "GPIO90_H3"),
+        PINCTRL_PIN(STN8815_PIN_H2, "GPIO91_H2"),
+        PINCTRL_PIN(STN8815_PIN_G1, "GPIO92_G1"),
+        PINCTRL_PIN(STN8815_PIN_G3, "GPIO93_G3"),
+        PINCTRL_PIN(STN8815_PIN_G2, "GPIO94_G2"),
+        PINCTRL_PIN(STN8815_PIN_F1, "GPIO95_F1"),
+        PINCTRL_PIN(STN8815_PIN_T20, "GPIO96_T20"),
+        PINCTRL_PIN(STN8815_PIN_R21, "GPIO97_R21"),
+        PINCTRL_PIN(STN8815_PIN_R20, "GPIO98_R20"),
+        PINCTRL_PIN(STN8815_PIN_U22, "GPIO99_U22"),
+        PINCTRL_PIN(STN8815_PIN_N21, "GPIO100_N21"),
+        PINCTRL_PIN(STN8815_PIN_N20, "GPIO101_N20"),
+        PINCTRL_PIN(STN8815_PIN_P22, "GPIO102_P22"),
+        PINCTRL_PIN(STN8815_PIN_N22, "GPIO103_N22"),
+        PINCTRL_PIN(STN8815_PIN_V22, "GPIO104_V22"),
+        PINCTRL_PIN(STN8815_PIN_V21, "GPIO105_V21"),
+        PINCTRL_PIN(STN8815_PIN_K22, "GPIO106_K22"),
+        PINCTRL_PIN(STN8815_PIN_K21, "GPIO107_K21"),
+        PINCTRL_PIN(STN8815_PIN_H20, "GPIO108_H20"),
+        PINCTRL_PIN(STN8815_PIN_G20, "GPIO109_G20"),
+        PINCTRL_PIN(STN8815_PIN_L21, "GPIO110_L21"),
+        PINCTRL_PIN(STN8815_PIN_H21, "GPIO111_H21"),
+        PINCTRL_PIN(STN8815_PIN_J21, "GPIO112_J21"),
+        PINCTRL_PIN(STN8815_PIN_H22, "GPIO113_H22"),
+        PINCTRL_PIN(STN8815_PIN_K20, "GPIO114_K20"),
+        PINCTRL_PIN(STN8815_PIN_L22, "GPIO115_L22"),
+        PINCTRL_PIN(STN8815_PIN_G21, "GPIO116_G21"),
+        PINCTRL_PIN(STN8815_PIN_J20, "GPIO117_J20"),
+        PINCTRL_PIN(STN8815_PIN_G22, "GPIO118_G22"),
+        PINCTRL_PIN(STN8815_PIN_U19, "GPIO119_U19"),
+        PINCTRL_PIN(STN8815_PIN_G19, "GPIO120_G19"),
+        PINCTRL_PIN(STN8815_PIN_M22, "GPIO121_M22"),
+        PINCTRL_PIN(STN8815_PIN_M19, "GPIO122_M19"),
+        PINCTRL_PIN(STN8815_PIN_J22, "GPIO123_J22"),
+};
+#define STN8815_GPIO_RANGE(a, b, c) { .name = "STN8815", .id = a, .base = b, \
+                        .pin_base = b, .npins = c }
+/*
+ * This matches the 32-pin gpio chips registered by the GPIO portion. This
+ * cannot be const since we assign the struct gpio_chip * pointer at runtime.
+ */
+static struct pinctrl_gpio_range nmk_stn8815_ranges[] = {
+        STN8815_GPIO_RANGE(0, 0, 32),
+        STN8815_GPIO_RANGE(1, 32, 32),
+        STN8815_GPIO_RANGE(2, 64, 32),
+        STN8815_GPIO_RANGE(3, 96, 28),
+};
+/*
+ * Read the pin group names like this:
+ * u0_a_1    = first groups of pins for uart0 on alt function a
+ * i2c2_b_2  = second group of pins for i2c2 on alt function b
+ */
+/* Altfunction A */
+static const unsigned u0_a_1_pins[] = { STN8815_PIN_B4, STN8815_PIN_D5,
+        STN8815_PIN_C5, STN8815_PIN_A4, STN8815_PIN_B5, STN8815_PIN_D6,
+        STN8815_PIN_C6, STN8815_PIN_B6 };
+static const unsigned mmcsd_a_1_pins[] = { STN8815_PIN_B10, STN8815_PIN_A10,
+        STN8815_PIN_C11, STN8815_PIN_B11, STN8815_PIN_A11, STN8815_PIN_C12,
+        STN8815_PIN_B12, STN8815_PIN_A12, STN8815_PIN_C13, STN8815_PIN_C15 };
+static const unsigned u1_a_1_pins[] = { STN8815_PIN_M2, STN8815_PIN_L1,
+                                        STN8815_PIN_F3, STN8815_PIN_F2 };
+static const unsigned i2c1_a_1_pins[] = { STN8815_PIN_L4, STN8815_PIN_L3 };
+static const unsigned i2c0_a_1_pins[] = { STN8815_PIN_D3, STN8815_PIN_D2 };
+/* Altfunction B */
+static const unsigned u1_b_1_pins[] = { STN8815_PIN_B16, STN8815_PIN_A16 };
+static const unsigned i2cusb_b_1_pins[] = { STN8815_PIN_C21, STN8815_PIN_C20 };
+#define STN8815_PIN_GROUP(a,b) { .name = #a, .pins = a##_pins,          \
+                        .npins = ARRAY_SIZE(a##_pins), .altsetting = b }
+static const struct nmk_pingroup nmk_stn8815_groups[] = {
+        STN8815_PIN_GROUP(u0_a_1, NMK_GPIO_ALT_A),
+        STN8815_PIN_GROUP(mmcsd_a_1, NMK_GPIO_ALT_A),
+        STN8815_PIN_GROUP(u1_a_1, NMK_GPIO_ALT_A),
+        STN8815_PIN_GROUP(i2c1_a_1, NMK_GPIO_ALT_A),
+        STN8815_PIN_GROUP(i2c0_a_1, NMK_GPIO_ALT_A),
+        STN8815_PIN_GROUP(u1_b_1, NMK_GPIO_ALT_B),
+        STN8815_PIN_GROUP(i2cusb_b_1, NMK_GPIO_ALT_B),
+};
+/* We use this macro to define the groups applicable to a function */
+#define STN8815_FUNC_GROUPS(a, b...)       \
+static const char * const a##_groups[] = { b };
+STN8815_FUNC_GROUPS(u0, "u0_a_1");
+STN8815_FUNC_GROUPS(mmcsd, "mmcsd_a_1");
+STN8815_FUNC_GROUPS(u1, "u1_a_1", "u1_b_1");
+STN8815_FUNC_GROUPS(i2c1, "i2c1_a_1");
+STN8815_FUNC_GROUPS(i2c0, "i2c0_a_1");
+STN8815_FUNC_GROUPS(i2cusb, "i2cusb_b_1");
+#define FUNCTION(fname)                                 \
+        {                                               \
+                .name = #fname,                         \
+                .groups = fname##_groups,               \
+                .ngroups = ARRAY_SIZE(fname##_groups),  \
+        }
+static const struct nmk_function nmk_stn8815_functions[] = {
+        FUNCTION(u0),
+        FUNCTION(mmcsd),
+        FUNCTION(u1),
+        FUNCTION(i2c1),
+        FUNCTION(i2c0),
+        FUNCTION(i2cusb),
+};
+static const struct nmk_pinctrl_soc_data nmk_stn8815_soc = {
+        .gpio_ranges = nmk_stn8815_ranges,
+        .gpio_num_ranges = ARRAY_SIZE(nmk_stn8815_ranges),
+        .pins = nmk_stn8815_pins,
+        .npins = ARRAY_SIZE(nmk_stn8815_pins),
+        .functions = nmk_stn8815_functions,
+        .nfunctions = ARRAY_SIZE(nmk_stn8815_functions),
+        .groups = nmk_stn8815_groups,
+        .ngroups = ARRAY_SIZE(nmk_stn8815_groups),
+};
+void __devinit
+nmk_pinctrl_stn8815_init(const struct nmk_pinctrl_soc_data **soc)
+{
+        *soc = &nmk_stn8815_soc;
+}
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index 6a5f38c469a6..d12df0227561 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -1720,6 +1720,8 @@ static int __devinit nmk_pinctrl_probe(struct platform_device *pdev)
                        of_match_device(nmk_pinctrl_match, &pdev->dev)->data;
        /* Poke in other ASIC variants here */
+        if (version == PINCTRL_NMK_STN8815)
+                nmk_pinctrl_stn8815_init(&npct->soc);
        if (version == PINCTRL_NMK_DB8500)
                nmk_pinctrl_db8500_init(&npct->soc);
        if (version == PINCTRL_NMK_DB8540)
diff --git a/drivers/pinctrl/pinctrl-nomadik.h b/drivers/pinctrl/pinctrl-nomadik.h
index e88320fb4c65..5c99f1c62dfd 100644
--- a/drivers/pinctrl/pinctrl-nomadik.h
+++ b/drivers/pinctrl/pinctrl-nomadik.h
@@ -62,6 +62,19 @@ struct nmk_pinctrl_soc_data {
        unsigned ngroups;
 };
+#ifdef CONFIG_PINCTRL_STN8815
+void nmk_pinctrl_stn8815_init(const struct nmk_pinctrl_soc_data **soc);
+#else
+static inline void
+nmk_pinctrl_stn8815_init(const struct nmk_pinctrl_soc_data **soc)
+{
+}
+#endif
 #ifdef CONFIG_PINCTRL_DB8500
 void nmk_pinctrl_db8500_init(const struct nmk_pinctrl_soc_data **soc);
author	Linus Walleij <linus.walleij@linaro.org>	2012-08-09 18:43:28 -0400
committer	Linus Walleij <linus.walleij@linaro.org>	2012-09-03 07:21:37 -0400
commit	f79c5ed9dab3ae80f6cbe9edaafbc8a4dadb8408 (patch)
tree	7ff9f4063a1ff487758be23cbe8acef272c46c6d /drivers/pinctrl
parent	45a1b53195069f53d5cbdbfff5e5fed97004320b (diff)

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 062f1a3e6640..606b953009cd 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig
@@ -86,6 +86,10 @@ config PINCTRL_NOMADIK
86	select PINMUX	86	select PINMUX
87	select PINCONF	87	select PINCONF
88		88
		89	config PINCTRL_STN8815
		90	bool "STN8815 pin controller driver"
		91	depends on PINCTRL_NOMADIK && ARCH_NOMADIK
		92
89	config PINCTRL_DB8500	93	config PINCTRL_DB8500
90	bool "DB8500 pin controller driver"	94	bool "DB8500 pin controller driver"
91	depends on PINCTRL_NOMADIK && ARCH_U8500	95	depends on PINCTRL_NOMADIK && ARCH_U8500


diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index b44538ecc35d..59ef76537987 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_PINCTRL_MXS) += pinctrl-mxs.o
19	obj-$(CONFIG_PINCTRL_IMX23) += pinctrl-imx23.o	19	obj-$(CONFIG_PINCTRL_IMX23) += pinctrl-imx23.o
20	obj-$(CONFIG_PINCTRL_IMX28) += pinctrl-imx28.o	20	obj-$(CONFIG_PINCTRL_IMX28) += pinctrl-imx28.o
21	obj-$(CONFIG_PINCTRL_NOMADIK) += pinctrl-nomadik.o	21	obj-$(CONFIG_PINCTRL_NOMADIK) += pinctrl-nomadik.o
		22	obj-$(CONFIG_PINCTRL_STN8815) += pinctrl-nomadik-stn8815.o
22	obj-$(CONFIG_PINCTRL_DB8500) += pinctrl-nomadik-db8500.o	23	obj-$(CONFIG_PINCTRL_DB8500) += pinctrl-nomadik-db8500.o
23	obj-$(CONFIG_PINCTRL_DB8540) += pinctrl-nomadik-db8540.o	24	obj-$(CONFIG_PINCTRL_DB8540) += pinctrl-nomadik-db8540.o
24	obj-$(CONFIG_PINCTRL_PXA168) += pinctrl-pxa168.o	25	obj-$(CONFIG_PINCTRL_PXA168) += pinctrl-pxa168.o


diff --git a/drivers/pinctrl/pinctrl-nomadik-stn8815.c b/drivers/pinctrl/pinctrl-nomadik-stn8815.c new file mode 100644 index 000000000000..7d432c3bc359 --- /dev/null +++ b/drivers/pinctrl/pinctrl-nomadik-stn8815.c
@@ -0,0 +1,357 @@
		1	#include <linux/kernel.h>
		2	#include <linux/pinctrl/pinctrl.h>
		3	#include "pinctrl-nomadik.h"
		4
		5	/* All the pins that can be used for GPIO and some other functions */
		6	#define _GPIO(offset) (offset)
		7
		8	#define STN8815_PIN_B4 _GPIO(0)
		9	#define STN8815_PIN_D5 _GPIO(1)
		10	#define STN8815_PIN_C5 _GPIO(2)
		11	#define STN8815_PIN_A4 _GPIO(3)
		12	#define STN8815_PIN_B5 _GPIO(4)
		13	#define STN8815_PIN_D6 _GPIO(5)
		14	#define STN8815_PIN_C6 _GPIO(6)
		15	#define STN8815_PIN_B6 _GPIO(7)
		16	#define STN8815_PIN_B10 _GPIO(8)
		17	#define STN8815_PIN_A10 _GPIO(9)
		18	#define STN8815_PIN_C11 _GPIO(10)
		19	#define STN8815_PIN_B11 _GPIO(11)
		20	#define STN8815_PIN_A11 _GPIO(12)
		21	#define STN8815_PIN_C12 _GPIO(13)
		22	#define STN8815_PIN_B12 _GPIO(14)
		23	#define STN8815_PIN_A12 _GPIO(15)
		24	#define STN8815_PIN_C13 _GPIO(16)
		25	#define STN8815_PIN_B13 _GPIO(17)
		26	#define STN8815_PIN_A13 _GPIO(18)
		27	#define STN8815_PIN_D13 _GPIO(19)
		28	#define STN8815_PIN_C14 _GPIO(20)
		29	#define STN8815_PIN_B14 _GPIO(21)
		30	#define STN8815_PIN_A14 _GPIO(22)
		31	#define STN8815_PIN_D15 _GPIO(23)
		32	#define STN8815_PIN_C15 _GPIO(24)
		33	#define STN8815_PIN_B15 _GPIO(25)
		34	#define STN8815_PIN_A15 _GPIO(26)
		35	#define STN8815_PIN_C16 _GPIO(27)
		36	#define STN8815_PIN_B16 _GPIO(28)
		37	#define STN8815_PIN_A16 _GPIO(29)
		38	#define STN8815_PIN_D17 _GPIO(30)
		39	#define STN8815_PIN_C17 _GPIO(31)
		40	#define STN8815_PIN_AB6 _GPIO(32)
		41	#define STN8815_PIN_AA6 _GPIO(33)
		42	#define STN8815_PIN_Y6 _GPIO(34)
		43	#define STN8815_PIN_Y5 _GPIO(35)
		44	#define STN8815_PIN_AA5 _GPIO(36)
		45	#define STN8815_PIN_AB5 _GPIO(37)
		46	#define STN8815_PIN_AB4 _GPIO(38)
		47	#define STN8815_PIN_Y4 _GPIO(39)
		48	#define STN8815_PIN_R1 _GPIO(40)
		49	#define STN8815_PIN_R2 _GPIO(41)
		50	#define STN8815_PIN_R3 _GPIO(42)
		51	#define STN8815_PIN_P1 _GPIO(43)
		52	#define STN8815_PIN_P2 _GPIO(44)
		53	#define STN8815_PIN_P3 _GPIO(45)
		54	#define STN8815_PIN_N1 _GPIO(46)
		55	#define STN8815_PIN_N2 _GPIO(47)
		56	#define STN8815_PIN_N3 _GPIO(48)
		57	#define STN8815_PIN_M1 _GPIO(49)
		58	#define STN8815_PIN_M3 _GPIO(50)
		59	#define STN8815_PIN_M2 _GPIO(51)
		60	#define STN8815_PIN_L1 _GPIO(52)
		61	#define STN8815_PIN_L4 _GPIO(53)
		62	#define STN8815_PIN_L3 _GPIO(54)
		63	#define STN8815_PIN_L2 _GPIO(55)
		64	#define STN8815_PIN_F3 _GPIO(56)
		65	#define STN8815_PIN_F2 _GPIO(57)
		66	#define STN8815_PIN_E1 _GPIO(58)
		67	#define STN8815_PIN_E3 _GPIO(59)
		68	#define STN8815_PIN_E2 _GPIO(60)
		69	#define STN8815_PIN_E4 _GPIO(61)
		70	#define STN8815_PIN_D3 _GPIO(62)
		71	#define STN8815_PIN_D2 _GPIO(63)
		72	#define STN8815_PIN_F21 _GPIO(64)
		73	#define STN8815_PIN_F20 _GPIO(65)
		74	#define STN8815_PIN_E22 _GPIO(66)
		75	#define STN8815_PIN_D22 _GPIO(67)
		76	#define STN8815_PIN_E21 _GPIO(68)
		77	#define STN8815_PIN_E20 _GPIO(69)
		78	#define STN8815_PIN_C22 _GPIO(70)
		79	#define STN8815_PIN_D21 _GPIO(71)
		80	#define STN8815_PIN_D20 _GPIO(72)
		81	#define STN8815_PIN_C21 _GPIO(73)
		82	#define STN8815_PIN_C20 _GPIO(74)
		83	#define STN8815_PIN_C19 _GPIO(75)
		84	#define STN8815_PIN_B20 _GPIO(76)
		85	#define STN8815_PIN_B8 _GPIO(77)
		86	#define STN8815_PIN_A8 _GPIO(78)
		87	#define STN8815_PIN_C9 _GPIO(79)
		88	#define STN8815_PIN_B9 _GPIO(80)
		89	#define STN8815_PIN_A9 _GPIO(81)
		90	#define STN8815_PIN_C10 _GPIO(82)
		91	#define STN8815_PIN_K1 _GPIO(83)
		92	#define STN8815_PIN_K3 _GPIO(84)
		93	#define STN8815_PIN_K2 _GPIO(85)
		94	#define STN8815_PIN_J1 _GPIO(86)
		95	#define STN8815_PIN_J3 _GPIO(87)
		96	#define STN8815_PIN_J2 _GPIO(88)
		97	#define STN8815_PIN_H1 _GPIO(89)
		98	#define STN8815_PIN_H3 _GPIO(90)
		99	#define STN8815_PIN_H2 _GPIO(91)
		100	#define STN8815_PIN_G1 _GPIO(92)
		101	#define STN8815_PIN_G3 _GPIO(93)
		102	#define STN8815_PIN_G2 _GPIO(94)
		103	#define STN8815_PIN_F1 _GPIO(95)
		104	#define STN8815_PIN_T20 _GPIO(96)
		105	#define STN8815_PIN_R21 _GPIO(97)
		106	#define STN8815_PIN_R20 _GPIO(98)
		107	#define STN8815_PIN_U22 _GPIO(99)
		108	#define STN8815_PIN_N21 _GPIO(100)
		109	#define STN8815_PIN_N20 _GPIO(101)
		110	#define STN8815_PIN_P22 _GPIO(102)
		111	#define STN8815_PIN_N22 _GPIO(103)
		112	#define STN8815_PIN_V22 _GPIO(104)
		113	#define STN8815_PIN_V21 _GPIO(105)
		114	#define STN8815_PIN_K22 _GPIO(106)
		115	#define STN8815_PIN_K21 _GPIO(107)
		116	#define STN8815_PIN_H20 _GPIO(108)
		117	#define STN8815_PIN_G20 _GPIO(109)
		118	#define STN8815_PIN_L21 _GPIO(110)
		119	#define STN8815_PIN_H21 _GPIO(111)
		120	#define STN8815_PIN_J21 _GPIO(112)
		121	#define STN8815_PIN_H22 _GPIO(113)
		122	#define STN8815_PIN_K20 _GPIO(114)
		123	#define STN8815_PIN_L22 _GPIO(115)
		124	#define STN8815_PIN_G21 _GPIO(116)
		125	#define STN8815_PIN_J20 _GPIO(117)
		126	#define STN8815_PIN_G22 _GPIO(118)
		127	#define STN8815_PIN_U19 _GPIO(119)
		128	#define STN8815_PIN_G19 _GPIO(120)
		129	#define STN8815_PIN_M22 _GPIO(121)
		130	#define STN8815_PIN_M19 _GPIO(122)
		131	#define STN8815_PIN_J22 _GPIO(123)
		132	/* GPIOs 124-127 not routed to pins */
		133
		134	/*
		135	* The names of the pins are denoted by GPIO number and ball name, even
		136	* though they can be used for other things than GPIO, this is the first
		137	* column in the table of the data sheet and often used on schematics and
		138	* such.
		139	*/
		140	static const struct pinctrl_pin_desc nmk_stn8815_pins[] = {
		141	PINCTRL_PIN(STN8815_PIN_B4, "GPIO0_B4"),
		142	PINCTRL_PIN(STN8815_PIN_D5, "GPIO1_D5"),
		143	PINCTRL_PIN(STN8815_PIN_C5, "GPIO2_C5"),
		144	PINCTRL_PIN(STN8815_PIN_A4, "GPIO3_A4"),
		145	PINCTRL_PIN(STN8815_PIN_B5, "GPIO4_B5"),
		146	PINCTRL_PIN(STN8815_PIN_D6, "GPIO5_D6"),
		147	PINCTRL_PIN(STN8815_PIN_C6, "GPIO6_C6"),
		148	PINCTRL_PIN(STN8815_PIN_B6, "GPIO7_B6"),
		149	PINCTRL_PIN(STN8815_PIN_B10, "GPIO8_B10"),
		150	PINCTRL_PIN(STN8815_PIN_A10, "GPIO9_A10"),
		151	PINCTRL_PIN(STN8815_PIN_C11, "GPIO10_C11"),
		152	PINCTRL_PIN(STN8815_PIN_B11, "GPIO11_B11"),
		153	PINCTRL_PIN(STN8815_PIN_A11, "GPIO12_A11"),
		154	PINCTRL_PIN(STN8815_PIN_C12, "GPIO13_C12"),
		155	PINCTRL_PIN(STN8815_PIN_B12, "GPIO14_B12"),
		156	PINCTRL_PIN(STN8815_PIN_A12, "GPIO15_A12"),
		157	PINCTRL_PIN(STN8815_PIN_C13, "GPIO16_C13"),
		158	PINCTRL_PIN(STN8815_PIN_B13, "GPIO17_B13"),
		159	PINCTRL_PIN(STN8815_PIN_A13, "GPIO18_A13"),
		160	PINCTRL_PIN(STN8815_PIN_D13, "GPIO19_D13"),
		161	PINCTRL_PIN(STN8815_PIN_C14, "GPIO20_C14"),
		162	PINCTRL_PIN(STN8815_PIN_B14, "GPIO21_B14"),
		163	PINCTRL_PIN(STN8815_PIN_A14, "GPIO22_A14"),
		164	PINCTRL_PIN(STN8815_PIN_D15, "GPIO23_D15"),
		165	PINCTRL_PIN(STN8815_PIN_C15, "GPIO24_C15"),
		166	PINCTRL_PIN(STN8815_PIN_B15, "GPIO25_B15"),
		167	PINCTRL_PIN(STN8815_PIN_A15, "GPIO26_A15"),
		168	PINCTRL_PIN(STN8815_PIN_C16, "GPIO27_C16"),
		169	PINCTRL_PIN(STN8815_PIN_B16, "GPIO28_B16"),
		170	PINCTRL_PIN(STN8815_PIN_A16, "GPIO29_A16"),
		171	PINCTRL_PIN(STN8815_PIN_D17, "GPIO30_D17"),
		172	PINCTRL_PIN(STN8815_PIN_C17, "GPIO31_C17"),
		173	PINCTRL_PIN(STN8815_PIN_AB6, "GPIO32_AB6"),
		174	PINCTRL_PIN(STN8815_PIN_AA6, "GPIO33_AA6"),
		175	PINCTRL_PIN(STN8815_PIN_Y6, "GPIO34_Y6"),
		176	PINCTRL_PIN(STN8815_PIN_Y5, "GPIO35_Y5"),
		177	PINCTRL_PIN(STN8815_PIN_AA5, "GPIO36_AA5"),
		178	PINCTRL_PIN(STN8815_PIN_AB5, "GPIO37_AB5"),
		179	PINCTRL_PIN(STN8815_PIN_AB4, "GPIO38_AB4"),
		180	PINCTRL_PIN(STN8815_PIN_Y4, "GPIO39_Y4"),
		181	PINCTRL_PIN(STN8815_PIN_R1, "GPIO40_R1"),
		182	PINCTRL_PIN(STN8815_PIN_R2, "GPIO41_R2"),
		183	PINCTRL_PIN(STN8815_PIN_R3, "GPIO42_R3"),
		184	PINCTRL_PIN(STN8815_PIN_P1, "GPIO43_P1"),
		185	PINCTRL_PIN(STN8815_PIN_P2, "GPIO44_P2"),
		186	PINCTRL_PIN(STN8815_PIN_P3, "GPIO45_P3"),
		187	PINCTRL_PIN(STN8815_PIN_N1, "GPIO46_N1"),
		188	PINCTRL_PIN(STN8815_PIN_N2, "GPIO47_N2"),
		189	PINCTRL_PIN(STN8815_PIN_N3, "GPIO48_N3"),
		190	PINCTRL_PIN(STN8815_PIN_M1, "GPIO49_M1"),
		191	PINCTRL_PIN(STN8815_PIN_M3, "GPIO50_M3"),
		192	PINCTRL_PIN(STN8815_PIN_M2, "GPIO51_M2"),
		193	PINCTRL_PIN(STN8815_PIN_L1, "GPIO52_L1"),
		194	PINCTRL_PIN(STN8815_PIN_L4, "GPIO53_L4"),
		195	PINCTRL_PIN(STN8815_PIN_L3, "GPIO54_L3"),
		196	PINCTRL_PIN(STN8815_PIN_L2, "GPIO55_L2"),
		197	PINCTRL_PIN(STN8815_PIN_F3, "GPIO56_F3"),
		198	PINCTRL_PIN(STN8815_PIN_F2, "GPIO57_F2"),
		199	PINCTRL_PIN(STN8815_PIN_E1, "GPIO58_E1"),
		200	PINCTRL_PIN(STN8815_PIN_E3, "GPIO59_E3"),
		201	PINCTRL_PIN(STN8815_PIN_E2, "GPIO60_E2"),
		202	PINCTRL_PIN(STN8815_PIN_E4, "GPIO61_E4"),
		203	PINCTRL_PIN(STN8815_PIN_D3, "GPIO62_D3"),
		204	PINCTRL_PIN(STN8815_PIN_D2, "GPIO63_D2"),
		205	PINCTRL_PIN(STN8815_PIN_F21, "GPIO64_F21"),
		206	PINCTRL_PIN(STN8815_PIN_F20, "GPIO65_F20"),
		207	PINCTRL_PIN(STN8815_PIN_E22, "GPIO66_E22"),
		208	PINCTRL_PIN(STN8815_PIN_D22, "GPIO67_D22"),
		209	PINCTRL_PIN(STN8815_PIN_E21, "GPIO68_E21"),
		210	PINCTRL_PIN(STN8815_PIN_E20, "GPIO69_E20"),
		211	PINCTRL_PIN(STN8815_PIN_C22, "GPIO70_C22"),
		212	PINCTRL_PIN(STN8815_PIN_D21, "GPIO71_D21"),
		213	PINCTRL_PIN(STN8815_PIN_D20, "GPIO72_D20"),
		214	PINCTRL_PIN(STN8815_PIN_C21, "GPIO73_C21"),
		215	PINCTRL_PIN(STN8815_PIN_C20, "GPIO74_C20"),
		216	PINCTRL_PIN(STN8815_PIN_C19, "GPIO75_C19"),
		217	PINCTRL_PIN(STN8815_PIN_B20, "GPIO76_B20"),
		218	PINCTRL_PIN(STN8815_PIN_B8, "GPIO77_B8"),
		219	PINCTRL_PIN(STN8815_PIN_A8, "GPIO78_A8"),
		220	PINCTRL_PIN(STN8815_PIN_C9, "GPIO79_C9"),
		221	PINCTRL_PIN(STN8815_PIN_B9, "GPIO80_B9"),
		222	PINCTRL_PIN(STN8815_PIN_A9, "GPIO81_A9"),
		223	PINCTRL_PIN(STN8815_PIN_C10, "GPIO82_C10"),
		224	PINCTRL_PIN(STN8815_PIN_K1, "GPIO83_K1"),
		225	PINCTRL_PIN(STN8815_PIN_K3, "GPIO84_K3"),
		226	PINCTRL_PIN(STN8815_PIN_K2, "GPIO85_K2"),
		227	PINCTRL_PIN(STN8815_PIN_J1, "GPIO86_J1"),
		228	PINCTRL_PIN(STN8815_PIN_J3, "GPIO87_J3"),
		229	PINCTRL_PIN(STN8815_PIN_J2, "GPIO88_J2"),
		230	PINCTRL_PIN(STN8815_PIN_H1, "GPIO89_H1"),
		231	PINCTRL_PIN(STN8815_PIN_H3, "GPIO90_H3"),
		232	PINCTRL_PIN(STN8815_PIN_H2, "GPIO91_H2"),
		233	PINCTRL_PIN(STN8815_PIN_G1, "GPIO92_G1"),
		234	PINCTRL_PIN(STN8815_PIN_G3, "GPIO93_G3"),
		235	PINCTRL_PIN(STN8815_PIN_G2, "GPIO94_G2"),
		236	PINCTRL_PIN(STN8815_PIN_F1, "GPIO95_F1"),
		237	PINCTRL_PIN(STN8815_PIN_T20, "GPIO96_T20"),
		238	PINCTRL_PIN(STN8815_PIN_R21, "GPIO97_R21"),
		239	PINCTRL_PIN(STN8815_PIN_R20, "GPIO98_R20"),
		240	PINCTRL_PIN(STN8815_PIN_U22, "GPIO99_U22"),
		241	PINCTRL_PIN(STN8815_PIN_N21, "GPIO100_N21"),
		242	PINCTRL_PIN(STN8815_PIN_N20, "GPIO101_N20"),
		243	PINCTRL_PIN(STN8815_PIN_P22, "GPIO102_P22"),
		244	PINCTRL_PIN(STN8815_PIN_N22, "GPIO103_N22"),
		245	PINCTRL_PIN(STN8815_PIN_V22, "GPIO104_V22"),
		246	PINCTRL_PIN(STN8815_PIN_V21, "GPIO105_V21"),
		247	PINCTRL_PIN(STN8815_PIN_K22, "GPIO106_K22"),
		248	PINCTRL_PIN(STN8815_PIN_K21, "GPIO107_K21"),
		249	PINCTRL_PIN(STN8815_PIN_H20, "GPIO108_H20"),
		250	PINCTRL_PIN(STN8815_PIN_G20, "GPIO109_G20"),
		251	PINCTRL_PIN(STN8815_PIN_L21, "GPIO110_L21"),
		252	PINCTRL_PIN(STN8815_PIN_H21, "GPIO111_H21"),
		253	PINCTRL_PIN(STN8815_PIN_J21, "GPIO112_J21"),
		254	PINCTRL_PIN(STN8815_PIN_H22, "GPIO113_H22"),
		255	PINCTRL_PIN(STN8815_PIN_K20, "GPIO114_K20"),
		256	PINCTRL_PIN(STN8815_PIN_L22, "GPIO115_L22"),
		257	PINCTRL_PIN(STN8815_PIN_G21, "GPIO116_G21"),
		258	PINCTRL_PIN(STN8815_PIN_J20, "GPIO117_J20"),
		259	PINCTRL_PIN(STN8815_PIN_G22, "GPIO118_G22"),
		260	PINCTRL_PIN(STN8815_PIN_U19, "GPIO119_U19"),
		261	PINCTRL_PIN(STN8815_PIN_G19, "GPIO120_G19"),
		262	PINCTRL_PIN(STN8815_PIN_M22, "GPIO121_M22"),
		263	PINCTRL_PIN(STN8815_PIN_M19, "GPIO122_M19"),
		264	PINCTRL_PIN(STN8815_PIN_J22, "GPIO123_J22"),
		265	};
		266
		267	#define STN8815_GPIO_RANGE(a, b, c) { .name = "STN8815", .id = a, .base = b, \
		268	.pin_base = b, .npins = c }
		269
		270	/*
		271	* This matches the 32-pin gpio chips registered by the GPIO portion. This
		272	* cannot be const since we assign the struct gpio_chip * pointer at runtime.
		273	*/
		274	static struct pinctrl_gpio_range nmk_stn8815_ranges[] = {
		275	STN8815_GPIO_RANGE(0, 0, 32),
		276	STN8815_GPIO_RANGE(1, 32, 32),
		277	STN8815_GPIO_RANGE(2, 64, 32),
		278	STN8815_GPIO_RANGE(3, 96, 28),
		279	};
		280
		281	/*
		282	* Read the pin group names like this:
		283	* u0_a_1 = first groups of pins for uart0 on alt function a
		284	* i2c2_b_2 = second group of pins for i2c2 on alt function b
		285	*/
		286
		287	/* Altfunction A */
		288	static const unsigned u0_a_1_pins[] = { STN8815_PIN_B4, STN8815_PIN_D5,
		289	STN8815_PIN_C5, STN8815_PIN_A4, STN8815_PIN_B5, STN8815_PIN_D6,
		290	STN8815_PIN_C6, STN8815_PIN_B6 };
		291	static const unsigned mmcsd_a_1_pins[] = { STN8815_PIN_B10, STN8815_PIN_A10,
		292	STN8815_PIN_C11, STN8815_PIN_B11, STN8815_PIN_A11, STN8815_PIN_C12,
		293	STN8815_PIN_B12, STN8815_PIN_A12, STN8815_PIN_C13, STN8815_PIN_C15 };
		294	static const unsigned u1_a_1_pins[] = { STN8815_PIN_M2, STN8815_PIN_L1,
		295	STN8815_PIN_F3, STN8815_PIN_F2 };
		296	static const unsigned i2c1_a_1_pins[] = { STN8815_PIN_L4, STN8815_PIN_L3 };
		297	static const unsigned i2c0_a_1_pins[] = { STN8815_PIN_D3, STN8815_PIN_D2 };
		298	/* Altfunction B */
		299	static const unsigned u1_b_1_pins[] = { STN8815_PIN_B16, STN8815_PIN_A16 };
		300	static const unsigned i2cusb_b_1_pins[] = { STN8815_PIN_C21, STN8815_PIN_C20 };
		301
		302	#define STN8815_PIN_GROUP(a,b) { .name = #a, .pins = a##_pins, \
		303	.npins = ARRAY_SIZE(a##_pins), .altsetting = b }
		304
		305	static const struct nmk_pingroup nmk_stn8815_groups[] = {
		306	STN8815_PIN_GROUP(u0_a_1, NMK_GPIO_ALT_A),
		307	STN8815_PIN_GROUP(mmcsd_a_1, NMK_GPIO_ALT_A),
		308	STN8815_PIN_GROUP(u1_a_1, NMK_GPIO_ALT_A),
		309	STN8815_PIN_GROUP(i2c1_a_1, NMK_GPIO_ALT_A),
		310	STN8815_PIN_GROUP(i2c0_a_1, NMK_GPIO_ALT_A),
		311	STN8815_PIN_GROUP(u1_b_1, NMK_GPIO_ALT_B),
		312	STN8815_PIN_GROUP(i2cusb_b_1, NMK_GPIO_ALT_B),
		313	};
		314
		315	/* We use this macro to define the groups applicable to a function */
		316	#define STN8815_FUNC_GROUPS(a, b...) \
		317	static const char * const a##_groups[] = { b };
		318
		319	STN8815_FUNC_GROUPS(u0, "u0_a_1");
		320	STN8815_FUNC_GROUPS(mmcsd, "mmcsd_a_1");
		321	STN8815_FUNC_GROUPS(u1, "u1_a_1", "u1_b_1");
		322	STN8815_FUNC_GROUPS(i2c1, "i2c1_a_1");
		323	STN8815_FUNC_GROUPS(i2c0, "i2c0_a_1");
		324	STN8815_FUNC_GROUPS(i2cusb, "i2cusb_b_1");
		325
		326	#define FUNCTION(fname) \
		327	{ \
		328	.name = #fname, \
		329	.groups = fname##_groups, \
		330	.ngroups = ARRAY_SIZE(fname##_groups), \
		331	}
		332
		333	static const struct nmk_function nmk_stn8815_functions[] = {
		334	FUNCTION(u0),
		335	FUNCTION(mmcsd),
		336	FUNCTION(u1),
		337	FUNCTION(i2c1),
		338	FUNCTION(i2c0),
		339	FUNCTION(i2cusb),
		340	};
		341
		342	static const struct nmk_pinctrl_soc_data nmk_stn8815_soc = {
		343	.gpio_ranges = nmk_stn8815_ranges,
		344	.gpio_num_ranges = ARRAY_SIZE(nmk_stn8815_ranges),
		345	.pins = nmk_stn8815_pins,
		346	.npins = ARRAY_SIZE(nmk_stn8815_pins),
		347	.functions = nmk_stn8815_functions,
		348	.nfunctions = ARRAY_SIZE(nmk_stn8815_functions),
		349	.groups = nmk_stn8815_groups,
		350	.ngroups = ARRAY_SIZE(nmk_stn8815_groups),
		351	};
		352
		353	void __devinit
		354	nmk_pinctrl_stn8815_init(const struct nmk_pinctrl_soc_data **soc)
		355	{
		356	*soc = &nmk_stn8815_soc;
		357	}


diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index 6a5f38c469a6..d12df0227561 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -1720,6 +1720,8 @@ static int __devinit nmk_pinctrl_probe(struct platform_device *pdev)
1720	of_match_device(nmk_pinctrl_match, &pdev->dev)->data;	1720	of_match_device(nmk_pinctrl_match, &pdev->dev)->data;
1721		1721
1722	/* Poke in other ASIC variants here */	1722	/* Poke in other ASIC variants here */
		1723	if (version == PINCTRL_NMK_STN8815)
		1724	nmk_pinctrl_stn8815_init(&npct->soc);
1723	if (version == PINCTRL_NMK_DB8500)	1725	if (version == PINCTRL_NMK_DB8500)
1724	nmk_pinctrl_db8500_init(&npct->soc);	1726	nmk_pinctrl_db8500_init(&npct->soc);
1725	if (version == PINCTRL_NMK_DB8540)	1727	if (version == PINCTRL_NMK_DB8540)


diff --git a/drivers/pinctrl/pinctrl-nomadik.h b/drivers/pinctrl/pinctrl-nomadik.h index e88320fb4c65..5c99f1c62dfd 100644 --- a/drivers/pinctrl/pinctrl-nomadik.h +++ b/drivers/pinctrl/pinctrl-nomadik.h
@@ -62,6 +62,19 @@ struct nmk_pinctrl_soc_data {
62	unsigned ngroups;	62	unsigned ngroups;
63	};	63	};
64		64
		65	#ifdef CONFIG_PINCTRL_STN8815
		66
		67	void nmk_pinctrl_stn8815_init(const struct nmk_pinctrl_soc_data **soc);
		68
		69	#else
		70
		71	static inline void
		72	nmk_pinctrl_stn8815_init(const struct nmk_pinctrl_soc_data **soc)
		73	{
		74	}
		75
		76	#endif
		77
65	#ifdef CONFIG_PINCTRL_DB8500	78	#ifdef CONFIG_PINCTRL_DB8500
66		79
67	void nmk_pinctrl_db8500_init(const struct nmk_pinctrl_soc_data **soc);	80	void nmk_pinctrl_db8500_init(const struct nmk_pinctrl_soc_data **soc);