From: Janusz Krzysztofik <jmkrzyszt@gmail.com> To: Dmitry Torokhov <dmitry.torokhov@gmail.com>, Tony Lindgren <tony@atomide.com>, Aaro Koskinen <aaro.koskinen@iki.fi> Cc: "David S . Miller " <davem@davemloft.net>, Mauro Carvalho Chehab <mchehab+samsung@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Andrew Morton <akpm@linux-foundation.org>, Randy Dunlap <rdunlap@infradead.org>, Linus Walleij <linus.walleij@linaro.org>, Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-input@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Janusz Krzysztofik <jmkrzyszt@gmail.com> Subject: [PATCH v2 05/10] ARM: OMAP1: ams-delta: Hog "keybrd_dataout" GPIO pin Date: Fri, 22 Jun 2018 00:41:23 +0200 [thread overview] Message-ID: <20180621224128.17623-5-jmkrzyszt@gmail.com> (raw) In-Reply-To: <20180621224128.17623-1-jmkrzyszt@gmail.com> "keybrd_dataout" GPIO pin used to be initialized by ams-delta-serio driver to a state safe for ams-delta-serio device function and not changed thereafter. As such, it may be assumed not under the driver control and responsibility for its initialization handed over to board init file. Introduce a GPIO hog table and take over control of the "keybrd_dataout" GPIO pin from the ams-delta-serio driver. Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> --- Changelog: v2: rebased on v4.18-rc1, no conflicts arch/arm/mach-omap1/board-ams-delta.c | 8 ++++++++ drivers/input/serio/ams_delta_serio.c | 5 ----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 706eb2f9301d..2821284aa0c9 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -574,6 +574,12 @@ static struct gpiod_lookup_table *late_gpio_tables[] __initdata = { &ams_delta_nand_gpio_table, }; +static struct gpiod_hog ams_delta_gpio_hogs[] = { + GPIO_HOG(LATCH2_LABEL, LATCH2_PIN_KEYBRD_DATAOUT, "keybrd_dataout", + GPIO_ACTIVE_HIGH, GPIOD_OUT_LOW), + {}, +}; + static void __init ams_delta_init(void) { /* mux pins for uarts */ @@ -594,6 +600,8 @@ static void __init ams_delta_init(void) omap_cfg_reg(J19_1610_CAM_D6); omap_cfg_reg(J18_1610_CAM_D7); + gpiod_add_hogs(ams_delta_gpio_hogs); + omap_serial_init(); omap_register_i2c_bus(1, 100, NULL, 0); diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c index 854d0d3ada52..b955c6a72e99 100644 --- a/drivers/input/serio/ams_delta_serio.c +++ b/drivers/input/serio/ams_delta_serio.c @@ -121,11 +121,6 @@ static const struct gpio ams_delta_gpios[] __initconst_or_module = { .flags = GPIOF_DIR_IN, .label = "serio-clock", }, - { - .gpio = AMS_DELTA_GPIO_PIN_KEYBRD_DATAOUT, - .flags = GPIOF_OUT_INIT_LOW, - .label = "serio-dataout", - }, }; static int ams_delta_serio_init(struct platform_device *pdev) -- 2.16.4
WARNING: multiple messages have this Message-ID (diff)
From: jmkrzyszt@gmail.com (Janusz Krzysztofik) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 05/10] ARM: OMAP1: ams-delta: Hog "keybrd_dataout" GPIO pin Date: Fri, 22 Jun 2018 00:41:23 +0200 [thread overview] Message-ID: <20180621224128.17623-5-jmkrzyszt@gmail.com> (raw) In-Reply-To: <20180621224128.17623-1-jmkrzyszt@gmail.com> "keybrd_dataout" GPIO pin used to be initialized by ams-delta-serio driver to a state safe for ams-delta-serio device function and not changed thereafter. As such, it may be assumed not under the driver control and responsibility for its initialization handed over to board init file. Introduce a GPIO hog table and take over control of the "keybrd_dataout" GPIO pin from the ams-delta-serio driver. Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> --- Changelog: v2: rebased on v4.18-rc1, no conflicts arch/arm/mach-omap1/board-ams-delta.c | 8 ++++++++ drivers/input/serio/ams_delta_serio.c | 5 ----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 706eb2f9301d..2821284aa0c9 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -574,6 +574,12 @@ static struct gpiod_lookup_table *late_gpio_tables[] __initdata = { &ams_delta_nand_gpio_table, }; +static struct gpiod_hog ams_delta_gpio_hogs[] = { + GPIO_HOG(LATCH2_LABEL, LATCH2_PIN_KEYBRD_DATAOUT, "keybrd_dataout", + GPIO_ACTIVE_HIGH, GPIOD_OUT_LOW), + {}, +}; + static void __init ams_delta_init(void) { /* mux pins for uarts */ @@ -594,6 +600,8 @@ static void __init ams_delta_init(void) omap_cfg_reg(J19_1610_CAM_D6); omap_cfg_reg(J18_1610_CAM_D7); + gpiod_add_hogs(ams_delta_gpio_hogs); + omap_serial_init(); omap_register_i2c_bus(1, 100, NULL, 0); diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c index 854d0d3ada52..b955c6a72e99 100644 --- a/drivers/input/serio/ams_delta_serio.c +++ b/drivers/input/serio/ams_delta_serio.c @@ -121,11 +121,6 @@ static const struct gpio ams_delta_gpios[] __initconst_or_module = { .flags = GPIOF_DIR_IN, .label = "serio-clock", }, - { - .gpio = AMS_DELTA_GPIO_PIN_KEYBRD_DATAOUT, - .flags = GPIOF_OUT_INIT_LOW, - .label = "serio-dataout", - }, }; static int ams_delta_serio_init(struct platform_device *pdev) -- 2.16.4
next prev parent reply other threads:[~2018-06-21 22:41 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-09 14:02 [PATCH 01/10] ARM: OMAP1: ams-delta: drop GPIO lookup table for serio device Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 02/10] Input: ams_delta_serio: convert to platform driver Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 03/10] Input: ams_delta_serio: use private structure Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 04/10] Input: ams_delta_serio: Replace power GPIO with regulator Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-12 22:17 ` Dmitry Torokhov 2018-06-12 22:17 ` Dmitry Torokhov 2018-06-13 1:01 ` Janusz Krzysztofik 2018-06-13 1:01 ` Janusz Krzysztofik 2018-06-13 20:51 ` Dmitry Torokhov 2018-06-13 20:51 ` Dmitry Torokhov 2018-06-14 22:16 ` [PATCH 4/10 v2] " Janusz Krzysztofik 2018-06-14 22:16 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 05/10] ARM: OMAP1: ams-delta: Hog "keybrd_dataout" GPIO pin Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 06/10] ARM: OMAP1: ams-delta FIQ: don't use static GPIO numbers Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-14 8:45 ` Linus Walleij 2018-06-14 8:45 ` Linus Walleij 2018-06-09 14:02 ` [PATCH 07/10] ARM: OMAP1: ams-delta FIQ: Keep serio input GPIOs requested Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 08/10] ARM: OMAP1: Get rid of <mach/ams-delta-fiq.h> Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 09/10] Input: ams_delta_serio: use IRQ resource Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-12 22:21 ` Dmitry Torokhov 2018-06-12 22:21 ` Dmitry Torokhov 2018-06-13 1:10 ` Janusz Krzysztofik 2018-06-13 1:10 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 10/10] Input: ams_delta_serio: Get FIQ buffer from platform_data Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-12 22:23 ` [PATCH 01/10] ARM: OMAP1: ams-delta: drop GPIO lookup table for serio device Dmitry Torokhov 2018-06-12 22:23 ` Dmitry Torokhov 2018-06-13 1:16 ` Janusz Krzysztofik 2018-06-13 1:16 ` Janusz Krzysztofik 2018-06-13 4:41 ` Tony Lindgren 2018-06-13 4:41 ` Tony Lindgren 2018-06-19 6:50 ` Tony Lindgren 2018-06-19 6:50 ` Tony Lindgren 2018-06-19 6:50 ` Tony Lindgren 2018-06-21 22:41 ` [PATCH v2 " Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-21 22:41 ` [PATCH v2 02/10] Input: ams_delta_serio: convert to platform driver Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-22 0:05 ` Dmitry Torokhov 2018-06-22 0:05 ` Dmitry Torokhov 2018-06-21 22:41 ` [PATCH v2 03/10] Input: ams_delta_serio: use private structure Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-22 0:07 ` Dmitry Torokhov 2018-06-22 0:07 ` Dmitry Torokhov 2018-06-21 22:41 ` [PATCH v2 04/10] Input: ams_delta_serio: Replace power GPIO with regulator Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-22 0:09 ` Dmitry Torokhov 2018-06-22 0:09 ` Dmitry Torokhov 2018-06-21 22:41 ` Janusz Krzysztofik [this message] 2018-06-21 22:41 ` [PATCH v2 05/10] ARM: OMAP1: ams-delta: Hog "keybrd_dataout" GPIO pin Janusz Krzysztofik 2018-06-21 22:41 ` [PATCH v2 06/10] ARM: OMAP1: ams-delta FIQ: don't use static GPIO numbers Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-07-02 12:56 ` Tony Lindgren 2018-07-02 12:56 ` Tony Lindgren 2018-06-21 22:41 ` [PATCH v2 07/10] ARM: OMAP1: ams-delta FIQ: Keep serio input GPIOs requested Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-22 0:10 ` Dmitry Torokhov 2018-06-22 0:10 ` Dmitry Torokhov 2018-06-21 22:41 ` [PATCH v2 08/10] ARM: OMAP1: Get rid of <mach/ams-delta-fiq.h> Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-22 0:10 ` Dmitry Torokhov 2018-06-22 0:10 ` Dmitry Torokhov 2018-06-21 22:41 ` [PATCH v2 09/10] Input: ams_delta_serio: use IRQ resource Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-22 0:11 ` Dmitry Torokhov 2018-06-22 0:11 ` Dmitry Torokhov 2018-06-21 22:41 ` [PATCH v2 10/10] Input: ams_delta_serio: Get FIQ buffer from platform_data Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-22 0:11 ` Dmitry Torokhov 2018-06-22 0:11 ` Dmitry Torokhov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180621224128.17623-5-jmkrzyszt@gmail.com \ --to=jmkrzyszt@gmail.com \ --cc=aaro.koskinen@iki.fi \ --cc=akpm@linux-foundation.org \ --cc=broonie@kernel.org \ --cc=davem@davemloft.net \ --cc=dmitry.torokhov@gmail.com \ --cc=gregkh@linuxfoundation.org \ --cc=lgirdwood@gmail.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=mchehab+samsung@kernel.org \ --cc=rdunlap@infradead.org \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.