diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-06-05 09:26:02 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-06-19 03:35:11 -0400 |
commit | 8966ada2d40790214444c193be4902924e7ef02e (patch) | |
tree | 27a04c778f119c9a060629dd365617950d130c19 /drivers/pinctrl/sunxi | |
parent | 6e1c30239fe31aae6b415088c39ede7fa62b190c (diff) |
pinctrl: sunxi: Declare the number of interrupt banks in the descriptor
Declare in the description structure associated to the compatible the number of
interrupt banks the device has. For now, we're not doing anything with it.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/sunxi')
-rw-r--r-- | drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1 | ||||
-rw-r--r-- | drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 1 | ||||
-rw-r--r-- | drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 1 | ||||
-rw-r--r-- | drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 1 | ||||
-rw-r--r-- | drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 1 | ||||
-rw-r--r-- | drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 1 | ||||
-rw-r--r-- | drivers/pinctrl/sunxi/pinctrl-sunxi.h | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c b/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c index fa1ff7c7e357..86b608bedca6 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c +++ b/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | |||
@@ -1010,6 +1010,7 @@ static const struct sunxi_desc_pin sun4i_a10_pins[] = { | |||
1010 | static const struct sunxi_pinctrl_desc sun4i_a10_pinctrl_data = { | 1010 | static const struct sunxi_pinctrl_desc sun4i_a10_pinctrl_data = { |
1011 | .pins = sun4i_a10_pins, | 1011 | .pins = sun4i_a10_pins, |
1012 | .npins = ARRAY_SIZE(sun4i_a10_pins), | 1012 | .npins = ARRAY_SIZE(sun4i_a10_pins), |
1013 | .irq_banks = 1, | ||
1013 | }; | 1014 | }; |
1014 | 1015 | ||
1015 | static int sun4i_a10_pinctrl_probe(struct platform_device *pdev) | 1016 | static int sun4i_a10_pinctrl_probe(struct platform_device *pdev) |
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c b/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c index 164d743f526c..2fa7430cabaf 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c +++ b/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | |||
@@ -661,6 +661,7 @@ static const struct sunxi_desc_pin sun5i_a10s_pins[] = { | |||
661 | static const struct sunxi_pinctrl_desc sun5i_a10s_pinctrl_data = { | 661 | static const struct sunxi_pinctrl_desc sun5i_a10s_pinctrl_data = { |
662 | .pins = sun5i_a10s_pins, | 662 | .pins = sun5i_a10s_pins, |
663 | .npins = ARRAY_SIZE(sun5i_a10s_pins), | 663 | .npins = ARRAY_SIZE(sun5i_a10s_pins), |
664 | .irq_banks = 1, | ||
664 | }; | 665 | }; |
665 | 666 | ||
666 | static int sun5i_a10s_pinctrl_probe(struct platform_device *pdev) | 667 | static int sun5i_a10s_pinctrl_probe(struct platform_device *pdev) |
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c b/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c index 1188a2b7b988..29c734a60b51 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c +++ b/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | |||
@@ -382,6 +382,7 @@ static const struct sunxi_desc_pin sun5i_a13_pins[] = { | |||
382 | static const struct sunxi_pinctrl_desc sun5i_a13_pinctrl_data = { | 382 | static const struct sunxi_pinctrl_desc sun5i_a13_pinctrl_data = { |
383 | .pins = sun5i_a13_pins, | 383 | .pins = sun5i_a13_pins, |
384 | .npins = ARRAY_SIZE(sun5i_a13_pins), | 384 | .npins = ARRAY_SIZE(sun5i_a13_pins), |
385 | .irq_banks = 1, | ||
385 | }; | 386 | }; |
386 | 387 | ||
387 | static int sun5i_a13_pinctrl_probe(struct platform_device *pdev) | 388 | static int sun5i_a13_pinctrl_probe(struct platform_device *pdev) |
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c index 8fcba48e0a42..9a2517b65113 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c +++ b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | |||
@@ -93,6 +93,7 @@ static const struct sunxi_pinctrl_desc sun6i_a31_r_pinctrl_data = { | |||
93 | .pins = sun6i_a31_r_pins, | 93 | .pins = sun6i_a31_r_pins, |
94 | .npins = ARRAY_SIZE(sun6i_a31_r_pins), | 94 | .npins = ARRAY_SIZE(sun6i_a31_r_pins), |
95 | .pin_base = PL_BASE, | 95 | .pin_base = PL_BASE, |
96 | .irq_banks = 2, | ||
96 | }; | 97 | }; |
97 | 98 | ||
98 | static int sun6i_a31_r_pinctrl_probe(struct platform_device *pdev) | 99 | static int sun6i_a31_r_pinctrl_probe(struct platform_device *pdev) |
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c index 8dea5856458b..7adc4888eb27 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c +++ b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | |||
@@ -836,6 +836,7 @@ static const struct sunxi_desc_pin sun6i_a31_pins[] = { | |||
836 | static const struct sunxi_pinctrl_desc sun6i_a31_pinctrl_data = { | 836 | static const struct sunxi_pinctrl_desc sun6i_a31_pinctrl_data = { |
837 | .pins = sun6i_a31_pins, | 837 | .pins = sun6i_a31_pins, |
838 | .npins = ARRAY_SIZE(sun6i_a31_pins), | 838 | .npins = ARRAY_SIZE(sun6i_a31_pins), |
839 | .irq_banks = 4, | ||
839 | }; | 840 | }; |
840 | 841 | ||
841 | static int sun6i_a31_pinctrl_probe(struct platform_device *pdev) | 842 | static int sun6i_a31_pinctrl_probe(struct platform_device *pdev) |
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c b/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c index d8577ce5f1a4..dac99e02bfdb 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c +++ b/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | |||
@@ -1036,6 +1036,7 @@ static const struct sunxi_desc_pin sun7i_a20_pins[] = { | |||
1036 | static const struct sunxi_pinctrl_desc sun7i_a20_pinctrl_data = { | 1036 | static const struct sunxi_pinctrl_desc sun7i_a20_pinctrl_data = { |
1037 | .pins = sun7i_a20_pins, | 1037 | .pins = sun7i_a20_pins, |
1038 | .npins = ARRAY_SIZE(sun7i_a20_pins), | 1038 | .npins = ARRAY_SIZE(sun7i_a20_pins), |
1039 | .irq_banks = 1, | ||
1039 | }; | 1040 | }; |
1040 | 1041 | ||
1041 | static int sun7i_a20_pinctrl_probe(struct platform_device *pdev) | 1042 | static int sun7i_a20_pinctrl_probe(struct platform_device *pdev) |
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.h b/drivers/pinctrl/sunxi/pinctrl-sunxi.h index cb87e15b1b3c..7ddcce0f3c27 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.h +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.h | |||
@@ -90,6 +90,7 @@ struct sunxi_pinctrl_desc { | |||
90 | const struct sunxi_desc_pin *pins; | 90 | const struct sunxi_desc_pin *pins; |
91 | int npins; | 91 | int npins; |
92 | unsigned pin_base; | 92 | unsigned pin_base; |
93 | unsigned irq_banks; | ||
93 | }; | 94 | }; |
94 | 95 | ||
95 | struct sunxi_pinctrl_function { | 96 | struct sunxi_pinctrl_function { |