From: Jan Kiszka <jan.kiszka@siemens.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linus Walleij <linus.walleij@linaro.org>,
Alexandre Courbot <gnurou@gmail.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-serial@vger.kernel.org, linux-gpio@vger.kernel.org,
Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Sascha Weisenberger <sascha.weisenberger@siemens.com>
Subject: [PATCH v3 01/10] serial: exar: Leave MPIOs as output for Commtech adapters
Date: Fri, 26 May 2017 18:02:28 +0200 [thread overview]
Message-ID: <75735f97cf0d453207831effb5bc284704f2a554.1495814557.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1495814557.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1495814557.git.jan.kiszka@siemens.com>
Commtech adapters apparently need the original setting as outputs, see
https://marc.info/?l=linux-gpio&m=149557425201323&w=2. Account for that.
Fixes: 7dea8165f1d6 ("serial: exar: Preconfigure xr17v35x MPIOs as output")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
drivers/tty/serial/8250/8250_exar.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
index b4fa585156c7..8984e8b2d524 100644
--- a/drivers/tty/serial/8250/8250_exar.c
+++ b/drivers/tty/serial/8250/8250_exar.c
@@ -171,19 +171,26 @@ pci_xr17c154_setup(struct exar8250 *priv, struct pci_dev *pcidev,
return default_setup(priv, pcidev, idx, offset, port);
}
-static void setup_gpio(u8 __iomem *p)
+static void setup_gpio(struct pci_dev *pcidev, u8 __iomem *p)
{
+ /*
+ * The Commtech adapters required the MPIOs to be driven low. The Exar
+ * devices will export them as GPIOs, so we pre-configure them safely
+ * as inputs.
+ */
+ u8 dir = pcidev->vendor == PCI_VENDOR_ID_EXAR ? 0xff : 0x00;
+
writeb(0x00, p + UART_EXAR_MPIOINT_7_0);
writeb(0x00, p + UART_EXAR_MPIOLVL_7_0);
writeb(0x00, p + UART_EXAR_MPIO3T_7_0);
writeb(0x00, p + UART_EXAR_MPIOINV_7_0);
- writeb(0xff, p + UART_EXAR_MPIOSEL_7_0);
+ writeb(dir, p + UART_EXAR_MPIOSEL_7_0);
writeb(0x00, p + UART_EXAR_MPIOOD_7_0);
writeb(0x00, p + UART_EXAR_MPIOINT_15_8);
writeb(0x00, p + UART_EXAR_MPIOLVL_15_8);
writeb(0x00, p + UART_EXAR_MPIO3T_15_8);
writeb(0x00, p + UART_EXAR_MPIOINV_15_8);
- writeb(0xff, p + UART_EXAR_MPIOSEL_15_8);
+ writeb(dir, p + UART_EXAR_MPIOSEL_15_8);
writeb(0x00, p + UART_EXAR_MPIOOD_15_8);
}
@@ -236,7 +243,7 @@ pci_xr17v35x_setup(struct exar8250 *priv, struct pci_dev *pcidev,
if (idx == 0) {
/* Setup Multipurpose Input/Output pins. */
- setup_gpio(p);
+ setup_gpio(pcidev, p);
port->port.private_data = xr17v35x_register_gpio(pcidev);
}
--
2.12.0
next prev parent reply other threads:[~2017-05-26 16:03 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-26 16:02 [PATCH v3 00/10] serial/gpio: exar: Fixes and support for IOT2000 Jan Kiszka
2017-05-26 16:02 ` Jan Kiszka [this message]
2017-05-26 16:02 ` [PATCH v3 02/10] gpio-exar/8250-exar: Do not even instantiate a GPIO device for Commtech cards Jan Kiszka
2017-05-27 13:40 ` Andy Shevchenko
2017-05-29 12:30 ` Linus Walleij
2017-05-26 16:02 ` [PATCH v3 03/10] gpio-exar/8250-exar: Fix passing in of parent PCI device Jan Kiszka
2017-05-27 13:41 ` Andy Shevchenko
2017-05-29 12:31 ` Linus Walleij
2017-05-26 16:02 ` [PATCH v3 04/10] gpio: exar: Allocate resources on behalf of the platform device Jan Kiszka
2017-05-29 12:32 ` Linus Walleij
2017-05-26 16:02 ` [PATCH v3 05/10] gpio: exar: Fix iomap request Jan Kiszka
2017-05-29 12:32 ` Linus Walleij
2017-05-26 16:02 ` [PATCH v3 06/10] gpio: exar: Fix reading of directions and values Jan Kiszka
2017-05-29 12:33 ` Linus Walleij
2017-05-26 16:02 ` [PATCH v3 07/10] gpio-exar/8250-exar: Rearrange gpiochip parenthood Jan Kiszka
2017-05-27 13:43 ` Andy Shevchenko
2017-05-29 12:34 ` Linus Walleij
2017-05-26 16:02 ` [PATCH v3 08/10] gpio: exar: Refactor address and bit calculations Jan Kiszka
2017-05-27 13:44 ` Andy Shevchenko
2017-05-29 12:34 ` Linus Walleij
2017-05-26 16:02 ` [PATCH v3 09/10] gpio-exar/8250-exar: Make set of exported GPIOs configurable Jan Kiszka
2017-05-27 13:48 ` Andy Shevchenko
2017-05-28 16:30 ` Jan Kiszka
2017-05-26 16:02 ` [PATCH v3 10/10] serial: exar: Add support for IOT2040 device Jan Kiszka
2017-05-27 13:52 ` Andy Shevchenko
2017-05-28 16:41 ` Jan Kiszka
2017-05-29 12:39 ` [PATCH v3 00/10] serial/gpio: exar: Fixes and support for IOT2000 Linus Walleij
2017-05-29 13:41 ` Jan Kiszka
2017-05-31 0:01 ` Linus Walleij
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=75735f97cf0d453207831effb5bc284704f2a554.1495814557.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=andy.shevchenko@gmail.com \
--cc=gnurou@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=sascha.weisenberger@siemens.com \
--cc=sudip.mukherjee@codethink.co.uk \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).