* [PATCH 0/4] STi: Allow to use gpio specifier's second parameter
@ 2016-08-10 13:12 patrice.chotard at st.com
2016-08-10 13:12 ` [PATCH 1/4] pinctrl: st: Use second parameter to gpio specifier patrice.chotard at st.com
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: patrice.chotard at st.com @ 2016-08-10 13:12 UTC (permalink / raw)
To: linux-arm-kernel
From: Patrice Chotard <patrice.chotard@st.com>
Currently, on STi platforms, only first parameter of gpio specifier
is used. It's not possible to indicate is a GPIO is active high or
low, although second gpio specifier parameter is already present in
some STi dts files.
This patchset update ST specific pinctrl driver and update/clean
boards dts files.
Only last dts's SoC generation (STiH407/410/418) are updated.
STiH415/416 are intentionnally not updated as STMicrolectronics stops
to supporting these SoCs. A patch series is under internal review
and will be send soon to drop all STiH415/416 kernel code.
Patrice Chotard (4):
pinctrl: st: Use second parameter to gpio specifier
ARM: dts: STiH407-pinctrl: Update gpio-cells to 2
ARM: dts: STiH418-B2199: Update gpio specifier
ARM: dts: STiH41x-b2020: Update gpio specifier
.../devicetree/bindings/pinctrl/pinctrl-st.txt | 8 +++-
arch/arm/boot/dts/stih407-pinctrl.dtsi | 52 +++++++++++-----------
arch/arm/boot/dts/stih418-b2199.dts | 7 ++-
arch/arm/boot/dts/stih41x-b2020.dtsi | 6 +--
drivers/pinctrl/pinctrl-st.c | 17 -------
5 files changed, 38 insertions(+), 52 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/4] pinctrl: st: Use second parameter to gpio specifier 2016-08-10 13:12 [PATCH 0/4] STi: Allow to use gpio specifier's second parameter patrice.chotard at st.com @ 2016-08-10 13:12 ` patrice.chotard at st.com 2016-08-11 14:07 ` Linus Walleij 2016-08-10 13:12 ` [PATCH 2/4] ARM: dts: STiH407-pinctrl: Update gpio-cells to 2 patrice.chotard at st.com ` (2 subsequent siblings) 3 siblings, 1 reply; 9+ messages in thread From: patrice.chotard at st.com @ 2016-08-10 13:12 UTC (permalink / raw) To: linux-arm-kernel From: Patrice Chotard <patrice.chotard@st.com> This patch allows to use the second parameter of gpio specifier, which is used to specify whether the gpio is active high or low. Simply remove specific of_xlate callback() and of_gpio_n_cells and use default one set by of_gpiochip_add() which allows to use second parameter gpio specifier. Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com> Signed-off-by: Patrice Chotard <patrice.chotard@st.com> --- .../devicetree/bindings/pinctrl/pinctrl-st.txt | 8 ++++++-- drivers/pinctrl/pinctrl-st.c | 17 ----------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt index 26bcb18..e6cc5e8 100644 --- a/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt +++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt @@ -50,7 +50,11 @@ Optional properties: GPIO controller/bank node. Required properties: - gpio-controller : Indicates this device is a GPIO controller -- #gpio-cells : Should be one. The first cell is the pin number. +- #gpio-cells : Must be two. + - First cell: specifies the pin number inside the controller + - Second cell: specifies whether the pin is logically inverted. + - 0 = active high + - 1 = active low - st,bank-name : Should be a name string for this bank as specified in datasheet. @@ -88,7 +92,7 @@ Example: PIO0: gpio at fe610000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0 0x100>; diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c index 0de1c67..2e5c545 100644 --- a/drivers/pinctrl/pinctrl-st.c +++ b/drivers/pinctrl/pinctrl-st.c @@ -799,21 +799,6 @@ static int st_gpio_get_direction(struct gpio_chip *chip, unsigned offset) return (direction == ST_GPIO_DIRECTION_IN); } -static int st_gpio_xlate(struct gpio_chip *gc, - const struct of_phandle_args *gpiospec, u32 *flags) -{ - if (WARN_ON(gc->of_gpio_n_cells < 1)) - return -EINVAL; - - if (WARN_ON(gpiospec->args_count < gc->of_gpio_n_cells)) - return -EINVAL; - - if (gpiospec->args[0] > gc->ngpio) - return -EINVAL; - - return gpiospec->args[0]; -} - /* Pinctrl Groups */ static int st_pctl_get_groups_count(struct pinctrl_dev *pctldev) { @@ -1486,8 +1471,6 @@ static struct gpio_chip st_gpio_template = { .direction_output = st_gpio_direction_output, .get_direction = st_gpio_get_direction, .ngpio = ST_GPIO_PINS_PER_BANK, - .of_gpio_n_cells = 1, - .of_xlate = st_gpio_xlate, }; static struct irq_chip st_gpio_irqchip = { -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 1/4] pinctrl: st: Use second parameter to gpio specifier 2016-08-10 13:12 ` [PATCH 1/4] pinctrl: st: Use second parameter to gpio specifier patrice.chotard at st.com @ 2016-08-11 14:07 ` Linus Walleij 0 siblings, 0 replies; 9+ messages in thread From: Linus Walleij @ 2016-08-11 14:07 UTC (permalink / raw) To: linux-arm-kernel On Wed, Aug 10, 2016 at 3:12 PM, <patrice.chotard@st.com> wrote: > From: Patrice Chotard <patrice.chotard@st.com> > > This patch allows to use the second parameter of gpio > specifier, which is used to specify whether the gpio is > active high or low. > > Simply remove specific of_xlate callback() and of_gpio_n_cells > and use default one set by of_gpiochip_add() which allows > to use second parameter gpio specifier. > > Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com> > Signed-off-by: Patrice Chotard <patrice.chotard@st.com> Patch applied. It seems this is one of those drivers that could also implement .set_single_ended() and support native open drain. Either it can do so by poking that pin config directly from the gpiochip callback or by figuring out how to interface with the pin config backend and do it genercially... I've been thinking a bit about that. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/4] ARM: dts: STiH407-pinctrl: Update gpio-cells to 2 2016-08-10 13:12 [PATCH 0/4] STi: Allow to use gpio specifier's second parameter patrice.chotard at st.com 2016-08-10 13:12 ` [PATCH 1/4] pinctrl: st: Use second parameter to gpio specifier patrice.chotard at st.com @ 2016-08-10 13:12 ` patrice.chotard at st.com 2016-08-11 14:08 ` Linus Walleij 2016-08-10 13:13 ` [PATCH 3/4] ARM: dts: STiH418-B2199: Update gpio specifier patrice.chotard at st.com 2016-08-10 13:13 ` [PATCH 4/4] ARM: dts: STiH41x-b2020: " patrice.chotard at st.com 3 siblings, 1 reply; 9+ messages in thread From: patrice.chotard at st.com @ 2016-08-10 13:12 UTC (permalink / raw) To: linux-arm-kernel From: Patrice Chotard <patrice.chotard@st.com> This patch allows to use second parameter to the gpio specifier, which is used to specify whether the gpio is active high or low. Signed-off-by: Patrice Chotard <patrice.chotard@st.com> --- arch/arm/boot/dts/stih407-pinctrl.dtsi | 52 +++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/arch/arm/boot/dts/stih407-pinctrl.dtsi b/arch/arm/boot/dts/stih407-pinctrl.dtsi index a538ae5..5653840 100644 --- a/arch/arm/boot/dts/stih407-pinctrl.dtsi +++ b/arch/arm/boot/dts/stih407-pinctrl.dtsi @@ -58,7 +58,7 @@ pio0: gpio at 09610000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x0 0x100>; @@ -66,7 +66,7 @@ }; pio1: gpio at 09611000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x1000 0x100>; @@ -74,7 +74,7 @@ }; pio2: gpio at 09612000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x2000 0x100>; @@ -82,7 +82,7 @@ }; pio3: gpio at 09613000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x3000 0x100>; @@ -90,7 +90,7 @@ }; pio4: gpio at 09614000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x4000 0x100>; @@ -99,7 +99,7 @@ pio5: gpio at 09615000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x5000 0x100>; @@ -373,7 +373,7 @@ pio10: pio at 09200000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x0 0x100>; @@ -381,7 +381,7 @@ }; pio11: pio at 09201000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x1000 0x100>; @@ -389,7 +389,7 @@ }; pio12: pio at 09202000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x2000 0x100>; @@ -397,7 +397,7 @@ }; pio13: pio at 09203000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x3000 0x100>; @@ -405,7 +405,7 @@ }; pio14: pio at 09204000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x4000 0x100>; @@ -413,7 +413,7 @@ }; pio15: pio at 09205000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x5000 0x100>; @@ -421,7 +421,7 @@ }; pio16: pio at 09206000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x6000 0x100>; @@ -429,7 +429,7 @@ }; pio17: pio at 09207000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x7000 0x100>; @@ -437,7 +437,7 @@ }; pio18: pio at 09208000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x8000 0x100>; @@ -445,7 +445,7 @@ }; pio19: pio at 09209000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x9000 0x100>; @@ -930,7 +930,7 @@ pio20: pio at 09210000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x0 0x100>; @@ -951,7 +951,7 @@ pio30: gpio at 09220000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x0 0x100>; @@ -959,7 +959,7 @@ }; pio31: gpio at 09221000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x1000 0x100>; @@ -967,7 +967,7 @@ }; pio32: gpio at 09222000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x2000 0x100>; @@ -975,7 +975,7 @@ }; pio33: gpio at 09223000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x3000 0x100>; @@ -983,7 +983,7 @@ }; pio34: gpio at 09224000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x4000 0x100>; @@ -991,7 +991,7 @@ }; pio35: gpio at 09225000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x5000 0x100>; @@ -1090,7 +1090,7 @@ pio40: gpio at 09230000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0 0x100>; @@ -1098,7 +1098,7 @@ }; pio41: gpio at 09231000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x1000 0x100>; @@ -1106,7 +1106,7 @@ }; pio42: gpio at 09232000 { gpio-controller; - #gpio-cells = <1>; + #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; reg = <0x2000 0x100>; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/4] ARM: dts: STiH407-pinctrl: Update gpio-cells to 2 2016-08-10 13:12 ` [PATCH 2/4] ARM: dts: STiH407-pinctrl: Update gpio-cells to 2 patrice.chotard at st.com @ 2016-08-11 14:08 ` Linus Walleij 0 siblings, 0 replies; 9+ messages in thread From: Linus Walleij @ 2016-08-11 14:08 UTC (permalink / raw) To: linux-arm-kernel On Wed, Aug 10, 2016 at 3:12 PM, <patrice.chotard@st.com> wrote: > From: Patrice Chotard <patrice.chotard@st.com> > > This patch allows to use second parameter to the gpio > specifier, which is used to specify whether the gpio is > active high or low. > > Signed-off-by: Patrice Chotard <patrice.chotard@st.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/4] ARM: dts: STiH418-B2199: Update gpio specifier 2016-08-10 13:12 [PATCH 0/4] STi: Allow to use gpio specifier's second parameter patrice.chotard at st.com 2016-08-10 13:12 ` [PATCH 1/4] pinctrl: st: Use second parameter to gpio specifier patrice.chotard at st.com 2016-08-10 13:12 ` [PATCH 2/4] ARM: dts: STiH407-pinctrl: Update gpio-cells to 2 patrice.chotard at st.com @ 2016-08-10 13:13 ` patrice.chotard at st.com 2016-08-11 14:09 ` Linus Walleij 2016-08-10 13:13 ` [PATCH 4/4] ARM: dts: STiH41x-b2020: " patrice.chotard at st.com 3 siblings, 1 reply; 9+ messages in thread From: patrice.chotard at st.com @ 2016-08-10 13:13 UTC (permalink / raw) To: linux-arm-kernel From: Patrice Chotard <patrice.chotard@st.com> - Remove useless gpio-cells - Update second parameter by using GPIO_ACTIVE_HIGH/LOW instead of hardcoded value Signed-off-by: Patrice Chotard <patrice.chotard@st.com> --- arch/arm/boot/dts/stih418-b2199.dts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts index 772d2bb..24e98a9 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -8,6 +8,7 @@ */ /dts-v1/; #include "stih418.dtsi" +#include <dt-bindings/gpio/gpio.h> / { model = "STiH418 B2199"; compatible = "st,stih418-b2199", "st,stih418"; @@ -35,14 +36,12 @@ leds { compatible = "gpio-leds"; red { - #gpio-cells = <2>; label = "Front Panel LED"; - gpios = <&pio4 1 0>; + gpios = <&pio4 1 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; green { - #gpio-cells = <2>; - gpios = <&pio1 3 0>; + gpios = <&pio1 3 GPIO_ACTIVE_HIGH>; default-state = "off"; }; }; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/4] ARM: dts: STiH418-B2199: Update gpio specifier 2016-08-10 13:13 ` [PATCH 3/4] ARM: dts: STiH418-B2199: Update gpio specifier patrice.chotard at st.com @ 2016-08-11 14:09 ` Linus Walleij 0 siblings, 0 replies; 9+ messages in thread From: Linus Walleij @ 2016-08-11 14:09 UTC (permalink / raw) To: linux-arm-kernel On Wed, Aug 10, 2016 at 3:13 PM, <patrice.chotard@st.com> wrote: > From: Patrice Chotard <patrice.chotard@st.com> > > - Remove useless gpio-cells > - Update second parameter by using GPIO_ACTIVE_HIGH/LOW > instead of hardcoded value > > Signed-off-by: Patrice Chotard <patrice.chotard@st.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 4/4] ARM: dts: STiH41x-b2020: Update gpio specifier 2016-08-10 13:12 [PATCH 0/4] STi: Allow to use gpio specifier's second parameter patrice.chotard at st.com ` (2 preceding siblings ...) 2016-08-10 13:13 ` [PATCH 3/4] ARM: dts: STiH418-B2199: Update gpio specifier patrice.chotard at st.com @ 2016-08-10 13:13 ` patrice.chotard at st.com 2016-08-11 14:09 ` Linus Walleij 3 siblings, 1 reply; 9+ messages in thread From: patrice.chotard at st.com @ 2016-08-10 13:13 UTC (permalink / raw) To: linux-arm-kernel From: Patrice Chotard <patrice.chotard@st.com> - Remove useless gpio-cells - Update second parameter by using GPIO_ACTIVE_HIGH/LOW instead of hardcoded value Signed-off-by: Patrice Chotard <patrice.chotard@st.com> --- arch/arm/boot/dts/stih41x-b2020.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/stih41x-b2020.dtsi b/arch/arm/boot/dts/stih41x-b2020.dtsi index 487d7d8..322e0e9 100644 --- a/arch/arm/boot/dts/stih41x-b2020.dtsi +++ b/arch/arm/boot/dts/stih41x-b2020.dtsi @@ -7,6 +7,7 @@ * publishhed by the Free Software Foundation. */ #include "stih41x-b2020x.dtsi" +#include <dt-bindings/gpio/gpio.h> / { memory{ device_type = "memory"; @@ -30,13 +31,12 @@ leds { compatible = "gpio-leds"; red { - #gpio-cells = <1>; label = "Front Panel LED"; - gpios = <&pio4 1>; + gpios = <&pio4 1 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; green { - gpios = <&pio4 7>; + gpios = <&pio4 7 GPIO_ACTIVE_HIGH>; default-state = "off"; }; }; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/4] ARM: dts: STiH41x-b2020: Update gpio specifier 2016-08-10 13:13 ` [PATCH 4/4] ARM: dts: STiH41x-b2020: " patrice.chotard at st.com @ 2016-08-11 14:09 ` Linus Walleij 0 siblings, 0 replies; 9+ messages in thread From: Linus Walleij @ 2016-08-11 14:09 UTC (permalink / raw) To: linux-arm-kernel On Wed, Aug 10, 2016 at 3:13 PM, <patrice.chotard@st.com> wrote: > From: Patrice Chotard <patrice.chotard@st.com> > > - Remove useless gpio-cells > - Update second parameter by using GPIO_ACTIVE_HIGH/LOW > instead of hardcoded value > > Signed-off-by: Patrice Chotard <patrice.chotard@st.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-08-11 14:09 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-08-10 13:12 [PATCH 0/4] STi: Allow to use gpio specifier's second parameter patrice.chotard at st.com 2016-08-10 13:12 ` [PATCH 1/4] pinctrl: st: Use second parameter to gpio specifier patrice.chotard at st.com 2016-08-11 14:07 ` Linus Walleij 2016-08-10 13:12 ` [PATCH 2/4] ARM: dts: STiH407-pinctrl: Update gpio-cells to 2 patrice.chotard at st.com 2016-08-11 14:08 ` Linus Walleij 2016-08-10 13:13 ` [PATCH 3/4] ARM: dts: STiH418-B2199: Update gpio specifier patrice.chotard at st.com 2016-08-11 14:09 ` Linus Walleij 2016-08-10 13:13 ` [PATCH 4/4] ARM: dts: STiH41x-b2020: " patrice.chotard at st.com 2016-08-11 14:09 ` Linus Walleij
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).