* [PATCH V3 1/4] mfd: f81504-core: Add Fintek F81504/508/512 PCIE-to-UART/GPIO core support
2016-02-16 6:55 [PATCH V3 0/4] Transform Fintek PCIE driver from 8250 to MFD Peter Hung
@ 2016-02-16 6:55 ` Peter Hung
2016-02-16 6:55 ` [PATCH V3 2/4] gpio: gpio-f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO GPIOLIB support Peter Hung
` (2 subsequent siblings)
3 siblings, 0 replies; 11+ messages in thread
From: Peter Hung @ 2016-02-16 6:55 UTC (permalink / raw)
To: linus.walleij, gnurou, gregkh, andriy.shevchenko, paul.gortmaker,
lee.jones, jslaby, gnomes, peter_hong
Cc: heikki.krogerus, peter, soeren.grunewald, udknight, adam.lee,
arnd, manabian, scottwood, yamada.masahiro, paul.burton, mans,
matthias.bgg, ralf, linux-kernel, linux-gpio, linux-serial,
tom_tsai, Peter Hung
The Fintek F81504/508/512 had implemented the basic serial port function in
8250_pci.c. We try to implement high baudrate & GPIOLIB with a spilt file
8250_f81504.c, but it seems too complex to add GPIOLIB.
Alan & Andy recommend us to rewrite and spilt our driver with MFD
architecture.
https://lkml.org/lkml/2016/1/19/288
This driver is core driver for F81504/508/512, it'll handle the generation
of UART/GPIO platform device and initialize PCIE configuration space when
probe()/resume().
IC function list:
F81504: Max 2x8 GPIOs and max 4 serial ports
port2/3 are multi-function
F81508: Max 6x8 GPIOs and max 8 serial ports
port2/3 are multi-function, port8/9/10/11 are gpio only
F81512: Max 6x8 GPIOs and max 12 serial ports
port2/3/8/9/10/11 are multi-function
H/W provider could changes the PCI configure space F0/F3h
values in EEPROM or ASL code to change mode.
F0h bit0~5: Enable GPIO0~5
bit6~7: Reserve
F3h bit0~5: Multi-Functional Flag (0:GPIO/1:UART)
bit0: UART2 pin out for UART2 / GPIO0
bit1: UART3 pin out for UART3 / GPIO1
bit2: UART8 pin out for UART8 / GPIO2
bit3: UART9 pin out for UART9 / GPIO3
bit4: UART10 pin out for UART10 / GPIO4
bit5: UART11 pin out for UART11 / GPIO5
bit6~7: Reserve
Suggested-by: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
---
drivers/mfd/Kconfig | 12 ++
drivers/mfd/Makefile | 2 +
drivers/mfd/f81504-core.c | 336 +++++++++++++++++++++++++++++++++++++++++++++
include/linux/mfd/f81504.h | 52 +++++++
4 files changed, 402 insertions(+)
create mode 100644 drivers/mfd/f81504-core.c
create mode 100644 include/linux/mfd/f81504.h
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index aa21dc5..775761f 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -345,6 +345,18 @@ config HTC_I2CPLD
This device provides input and output GPIOs through an I2C
interface to one or more sub-chips.
+config MFD_FINTEK_F81504_CORE
+ tristate "Fintek F81504/508/512 PCIE-to-UART/GPIO MFD support"
+ depends on PCI
+ select MFD_CORE
+ default SERIAL_8250
+ help
+ This driver provides the F81504/508/512 UART & GPIO platform
+ devices. You should enable CONFIG_GPIO_F81504 to get GPIOLIB
+ support and CONFIG_8250_F81504 to get serial port support.
+ This driver needs to be built into the kernel to use early
+ console support.
+
config MFD_INTEL_QUARK_I2C_GPIO
tristate "Intel Quark MFD I2C GPIO"
depends on PCI
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 5eaa6465d..8e581ad 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -22,6 +22,8 @@ obj-$(CONFIG_HTC_EGPIO) += htc-egpio.o
obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o
obj-$(CONFIG_HTC_I2CPLD) += htc-i2cpld.o
+obj-$(CONFIG_MFD_FINTEK_F81504_CORE) += f81504-core.o
+
obj-$(CONFIG_MFD_DAVINCI_VOICECODEC) += davinci_voicecodec.o
obj-$(CONFIG_MFD_DM355EVM_MSP) += dm355evm_msp.o
obj-$(CONFIG_MFD_TI_AM335X_TSCADC) += ti_am335x_tscadc.o
diff --git a/drivers/mfd/f81504-core.c b/drivers/mfd/f81504-core.c
new file mode 100644
index 0000000..12a5f7f
--- /dev/null
+++ b/drivers/mfd/f81504-core.c
@@ -0,0 +1,336 @@
+/*
+ * Core operations for Fintek F81504/508/512 PCIE-to-UART/GPIO device
+ */
+#include <linux/platform_device.h>
+#include <linux/pci.h>
+#include <linux/gpio.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/f81504.h>
+
+#define F81504_IO_REGION 8
+
+const u8 fintek_gpio_mapping[F81504_MAX_GPIO_CNT] = { 2, 3, 8, 9, 10, 11 };
+EXPORT_SYMBOL(fintek_gpio_mapping);
+
+static bool f81504_is_gpio(unsigned int idx, u8 gpio_en)
+{
+ unsigned int i;
+
+ /* find every port to check is multi-function port? */
+ for (i = 0; i < ARRAY_SIZE(fintek_gpio_mapping); i++) {
+ if (fintek_gpio_mapping[i] != idx || !(gpio_en & BIT(i)))
+ continue;
+
+ /*
+ * This port is multi-function and enabled as gpio
+ * mode. So we'll not configure it as serial port.
+ */
+ return true;
+ }
+
+ return false;
+}
+
+static int f81504_port_init(struct pci_dev *pdev)
+{
+ struct f81504_pci_private *priv = pci_get_drvdata(pdev);
+ unsigned int i;
+ u32 gpio_addr;
+ u8 gpio_en, f0h_data, f3h_data;
+ u32 max_port, iobase;
+ u32 bar_data[3];
+ u16 tmp;
+ u8 config_base;
+
+ /* Init GPIO IO Address */
+ gpio_addr = pci_resource_start(pdev, 2);
+
+ /*
+ * Write GPIO IO Address LSB/MSB to corresponding register. Due to we
+ * can't write once with pci_write_config_word() on x86 platform, we'll
+ * write it with pci_write_config_byte().
+ */
+ pci_write_config_byte(pdev, F81504_GPIO_IO_LSB_REG, gpio_addr & 0xff);
+ pci_write_config_byte(pdev, F81504_GPIO_IO_MSB_REG, (gpio_addr >> 8) &
+ 0xff);
+
+ /*
+ * The PCI board is multi-function, some serial port can converts to
+ * GPIO function. Customers could changes the F0/F3h values in EEPROM
+ *
+ * F0h bit0~5: Enable GPIO0~5
+ * bit6~7: Reserve
+ *
+ * F3h bit0~5: Multi-Functional Flag (0:GPIO/1:UART)
+ * bit0: UART2 pin out for UART2 / GPIO0
+ * bit1: UART3 pin out for UART3 / GPIO1
+ * bit2: UART8 pin out for UART8 / GPIO2
+ * bit3: UART9 pin out for UART9 / GPIO3
+ * bit4: UART10 pin out for UART10 / GPIO4
+ * bit5: UART11 pin out for UART11 / GPIO5
+ * bit6~7: Reserve
+ */
+ if (priv) {
+ /* Re-save GPIO IO address for called by resume() */
+ priv->gpio_ioaddr = gpio_addr;
+
+ /* Reinit from resume(), read the previous value from priv */
+ gpio_en = priv->gpio_en;
+ } else {
+ /* Driver first init */
+ pci_read_config_byte(pdev, F81504_GPIO_ENABLE_REG, &f0h_data);
+ pci_read_config_byte(pdev, F81504_GPIO_MODE_REG, &f3h_data);
+
+ /* Find the max set of GPIOs */
+ gpio_en = f0h_data | ~f3h_data;
+ }
+
+ /*
+ * We'll determinate the max count of serial port by IC Product ID.
+ * Product ID list: F81504 pid = 0x1104
+ * F81508 pid = 0x1108
+ * F81512 pid = 0x1112
+ *
+ * In F81504/508, we can use pid & 0xff to get max serial port count,
+ * but F81512 can't use this. So we should direct set F81512 to 12.
+ */
+ switch (pdev->device) {
+ case FINTEK_F81504: /* 4 ports */
+ /* F81504 max 2 sets of GPIO, others are max 6 sets */
+ gpio_en &= 0x03;
+ case FINTEK_F81508: /* 8 ports */
+ max_port = pdev->device & 0xff;
+ break;
+ case FINTEK_F81512: /* 12 ports */
+ max_port = 12;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ /* Rewrite GPIO Mode setting */
+ pci_write_config_byte(pdev, F81504_GPIO_ENABLE_REG, gpio_en & 0x3f);
+ pci_write_config_byte(pdev, F81504_GPIO_MODE_REG, ~gpio_en & 0x3f);
+
+ /* Get the UART IO address dispatch from the BIOS */
+ for (i = 0; i < 3; i++)
+ bar_data[i] = pci_resource_start(pdev, 3 + i);
+
+ /* Compatible bit for newer step IC */
+ pci_read_config_word(pdev, F81504_IRQSEL_REG, &tmp);
+ tmp |= BIT(8);
+ pci_write_config_word(pdev, F81504_IRQSEL_REG, tmp);
+
+ for (i = 0; i < max_port; i++) {
+ /* UART0 configuration offset start from 0x40 */
+ config_base = F81504_UART_START_ADDR + F81504_UART_OFFSET * i;
+
+ /*
+ * If the serial port is setting to gpio mode, don't init it.
+ * Disable the serial port for user-space application to
+ * control.
+ */
+ if (f81504_is_gpio(i, gpio_en)) {
+ /* Disable current serial port */
+ pci_write_config_byte(pdev, config_base + 0x00, 0x00);
+ continue;
+ }
+
+ /* Calculate Real IO Port */
+ iobase = (bar_data[i / 4] & 0xffffffe0) + (i % 4) * 8;
+
+ /* Enable UART I/O port */
+ pci_write_config_byte(pdev, config_base + 0x00, 0x01);
+
+ /* Select 128-byte FIFO and 8x FIFO threshold */
+ pci_write_config_byte(pdev, config_base + 0x01, 0x33);
+
+ /* Write UART IO address */
+ pci_write_config_word(pdev, config_base + 0x04, iobase);
+
+ pci_write_config_byte(pdev, config_base + 0x06, pdev->irq);
+
+ /*
+ * Force init to RS232 / Share Mode, recovery previous mode
+ * will done in F81504 8250 platform driver resume().
+ */
+ pci_write_config_byte(pdev, config_base + 0x07, 0x01);
+ }
+
+ return 0;
+}
+
+static int f81504_prepage_serial_port(struct pci_dev *pdev, int max_port)
+{
+ struct resource resources = DEFINE_RES_IO(0, 0);
+ struct mfd_cell f81504_serial_cell = {
+ .name = F81504_SERIAL_NAME,
+ .num_resources = 1,
+ .pdata_size = sizeof(unsigned int),
+ };
+ unsigned int i;
+ u8 tmp;
+ u16 iobase;
+ int status;
+
+ for (i = 0; i < max_port; i++) {
+ /* Check UART is enabled */
+ pci_read_config_byte(pdev, F81504_UART_START_ADDR + i *
+ F81504_UART_OFFSET, &tmp);
+ if (!tmp)
+ continue;
+
+ /* Get UART IO Address */
+ pci_read_config_word(pdev, F81504_UART_START_ADDR + i *
+ F81504_UART_OFFSET + 4, &iobase);
+
+ resources.start = iobase;
+ resources.end = iobase + F81504_IO_REGION - 1;
+
+ f81504_serial_cell.resources = &resources;
+ f81504_serial_cell.platform_data = &i;
+
+ status = mfd_add_devices(&pdev->dev, PLATFORM_DEVID_AUTO,
+ &f81504_serial_cell, 1, NULL,
+ pdev->irq, NULL);
+ if (status) {
+ dev_warn(&pdev->dev, "%s: add device failed: %d\n",
+ __func__, status);
+ return status;
+ }
+ }
+
+ return 0;
+}
+
+static int f81504_prepage_gpiolib(struct pci_dev *pdev)
+{
+ struct f81504_pci_private *priv = pci_get_drvdata(pdev);
+ struct mfd_cell f81504_gpio_cell = {
+ .name = F81504_GPIO_NAME,
+ .pdata_size = sizeof(unsigned int),
+ };
+ unsigned int i;
+ int status;
+
+ for (i = 0; i < ARRAY_SIZE(fintek_gpio_mapping); i++) {
+ if (!(priv->gpio_en & BIT(i)))
+ continue;
+
+ f81504_gpio_cell.platform_data = &i;
+ status = mfd_add_devices(&pdev->dev, PLATFORM_DEVID_AUTO,
+ &f81504_gpio_cell, 1, NULL, pdev->irq,
+ NULL);
+ if (status) {
+ dev_warn(&pdev->dev, "%s: add device failed: %d\n",
+ __func__, status);
+ return status;
+ }
+ }
+
+ return 0;
+}
+
+static int f81504_probe(struct pci_dev *pdev, const struct pci_device_id
+ *dev_id)
+{
+ struct f81504_pci_private *priv;
+ u8 tmp;
+ int status;
+
+ status = pcim_enable_device(pdev);
+ if (status)
+ return status;
+
+ /* Init PCI Configuration Space */
+ status = f81504_port_init(pdev);
+ if (status)
+ return status;
+
+ priv = devm_kzalloc(&pdev->dev, sizeof(struct f81504_pci_private),
+ GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
+
+ /* Save the GPIO_ENABLE_REG after f81504_port_init() for future use */
+ pci_read_config_byte(pdev, F81504_GPIO_ENABLE_REG, &priv->gpio_en);
+
+ /*
+ * Save GPIO IO Addr to private data. Due to we can't read once with
+ * pci_read_config_word() on x86 platform, we'll read it with
+ * pci_read_config_byte().
+ */
+ pci_read_config_byte(pdev, F81504_GPIO_IO_MSB_REG, &tmp);
+ priv->gpio_ioaddr = tmp << 8;
+ pci_read_config_byte(pdev, F81504_GPIO_IO_LSB_REG, &tmp);
+ priv->gpio_ioaddr |= tmp;
+
+ pci_set_drvdata(pdev, priv);
+
+ /* Generate UART Ports */
+ status = f81504_prepage_serial_port(pdev, dev_id->driver_data);
+ if (status)
+ return status;
+
+ /* Generate GPIO Sets */
+ status = f81504_prepage_gpiolib(pdev);
+ if (status)
+ return status;
+
+ return 0;
+}
+
+static void f81504_remove(struct pci_dev *pdev)
+{
+ mfd_remove_devices(&pdev->dev);
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int f81504_suspend(struct device *dev)
+{
+ return 0;
+}
+
+static int f81504_resume(struct device *dev)
+{
+ struct pci_dev *pdev = to_pci_dev(dev);
+ int status;
+
+ /* Re-init PCI Configuration Space */
+ status = f81504_port_init(pdev);
+ if (status)
+ return status;
+
+ return 0;
+}
+#endif
+
+static const struct pci_device_id f81504_dev_table[] = {
+ /* Fintek PCI serial cards */
+ {PCI_DEVICE(FINTEK_VID, FINTEK_F81504), .driver_data = 4},
+ {PCI_DEVICE(FINTEK_VID, FINTEK_F81508), .driver_data = 8},
+ {PCI_DEVICE(FINTEK_VID, FINTEK_F81512), .driver_data = 12},
+ {}
+};
+
+static SIMPLE_DEV_PM_OPS(f81504_pm_ops, f81504_suspend, f81504_resume);
+
+static struct pci_driver f81504_driver = {
+ .name = "f81504_core",
+ .probe = f81504_probe,
+ .remove = f81504_remove,
+ .driver = {
+ .pm = &f81504_pm_ops,
+ .owner = THIS_MODULE,
+ },
+ .id_table = f81504_dev_table,
+};
+
+module_pci_driver(f81504_driver);
+
+MODULE_DEVICE_TABLE(pci, f81504_dev_table);
+MODULE_DESCRIPTION("Fintek F81504/508/512 PCIE-to-UART core");
+MODULE_AUTHOR("Peter Hong <Peter_Hong@fintek.com.tw>");
+MODULE_LICENSE("GPL");
diff --git a/include/linux/mfd/f81504.h b/include/linux/mfd/f81504.h
new file mode 100644
index 0000000..820d4e0
--- /dev/null
+++ b/include/linux/mfd/f81504.h
@@ -0,0 +1,52 @@
+#ifndef __MFD_F81504_H__
+#define __MFD_F81504_H__
+
+#define FINTEK_VID 0x1c29
+#define FINTEK_F81504 0x1104
+#define FINTEK_F81508 0x1108
+#define FINTEK_F81512 0x1112
+
+#define FINTEK_MAX_PORT 12
+#define FINTEK_GPIO_NAME_LEN 32
+#define FINTEK_GPIO_DISPLAY "GPIO"
+
+#define F81504_UART_START_ADDR 0x40
+#define F81504_UART_MODE_OFFSET 0x07
+#define F81504_UART_OFFSET 0x08
+
+/* RTS will control by MCR if this bit is 0 */
+#define F81504_RTS_CONTROL_BY_HW BIT(4)
+/* only worked with FINTEK_RTS_CONTROL_BY_HW on */
+#define F81504_RTS_INVERT BIT(5)
+
+#define F81504_CLOCK_RATE_MASK 0xc0
+#define F81504_CLKSEL_1DOT846_MHZ 0x00
+#define F81504_CLKSEL_18DOT46_MHZ 0x40
+#define F81504_CLKSEL_24_MHZ 0x80
+#define F81504_CLKSEL_14DOT77_MHZ 0xc0
+
+#define F81504_IRQSEL_REG 0xb8
+
+#define F81504_GPIO_ENABLE_REG 0xf0
+#define F81504_GPIO_IO_LSB_REG 0xf1
+#define F81504_GPIO_IO_MSB_REG 0xf2
+#define F81504_GPIO_MODE_REG 0xf3
+
+#define F81504_GPIO_START_ADDR 0xf8
+#define F81504_GPIO_OUT_EN_OFFSET 0x00
+#define F81504_GPIO_DRIVE_EN_OFFSET 0x01
+#define F81504_GPIO_SET_OFFSET 0x08
+
+#define F81504_GPIO_NAME "f81504_gpio"
+#define F81504_SERIAL_NAME "f81504_serial"
+#define F81504_MAX_GPIO_CNT 6
+
+extern const u8 fintek_gpio_mapping[F81504_MAX_GPIO_CNT];
+
+struct f81504_pci_private {
+ int line[FINTEK_MAX_PORT];
+ u8 gpio_en;
+ u16 gpio_ioaddr;
+ u32 uart_count, gpio_count;
+};
+#endif
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH V3 2/4] gpio: gpio-f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO GPIOLIB support
2016-02-16 6:55 [PATCH V3 0/4] Transform Fintek PCIE driver from 8250 to MFD Peter Hung
2016-02-16 6:55 ` [PATCH V3 1/4] mfd: f81504-core: Add Fintek F81504/508/512 PCIE-to-UART/GPIO core support Peter Hung
@ 2016-02-16 6:55 ` Peter Hung
2016-02-16 15:22 ` Linus Walleij
2016-02-16 6:55 ` [PATCH V3 3/4] 8250: 8250_f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO UART support Peter Hung
2016-02-16 6:55 ` [PATCH V3 4/4] serial: 8250_pci: Remove Fintek F81504/508/512 UART driver Peter Hung
3 siblings, 1 reply; 11+ messages in thread
From: Peter Hung @ 2016-02-16 6:55 UTC (permalink / raw)
To: linus.walleij, gnurou, gregkh, andriy.shevchenko, paul.gortmaker,
lee.jones, jslaby, gnomes, peter_hong
Cc: heikki.krogerus, peter, soeren.grunewald, udknight, adam.lee,
arnd, manabian, scottwood, yamada.masahiro, paul.burton, mans,
matthias.bgg, ralf, linux-kernel, linux-gpio, linux-serial,
tom_tsai, Peter Hung
This driver is GPIOLIB driver for F81504/508/512, it'll handle the
GPIOLIB operation of this device. This module will depend on
MFD_FINTEK_F81504_CORE.
IC function list:
F81504: Max 2x8 GPIOs and max 4 serial ports
port2/3 are multi-function
F81508: Max 6x8 GPIOs and max 8 serial ports
port2/3 are multi-function, port8/9/10/11 are gpio only
F81512: Max 6x8 GPIOs and max 12 serial ports
port2/3/8/9/10/11 are multi-function
GPIO register:
PCI Configuration space:
F0h: bit0~5: Enable GPIO0~5
bit6~7: Reserve
F3h: bit0~5: Multi-Functional Flag (0:GPIO/1:UART)
bit0: UART2 pin out for UART2 / GPIO0
bit1: UART3 pin out for UART3 / GPIO1
bit2: UART8 pin out for UART8 / GPIO2
bit3: UART9 pin out for UART9 / GPIO3
bit4: UART10 pin out for UART10 / GPIO4
bit5: UART11 pin out for UART11 / GPIO5
bit6~7: Reserve
F1h: IO address (LSB)
F2h: IO address (MSB)
F8h + 8 * set: Direction control (bitwise)
bitx: 0 - Input mode
bitx: 1 - Output mode
F9h + 8 * set: Drive ability control (bitwise)
bitx: 0 - Open drain (default)
bitx: 1 - Push Pull
In this driver, we only implements open drain mode.
IO space:
(IO base + 0~5): GPIO-0x~5x in/out value (bitwise)
Suggested-by: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
---
drivers/gpio/Kconfig | 10 ++
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio-f81504.c | 241 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 252 insertions(+)
create mode 100644 drivers/gpio/gpio-f81504.c
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 2b80903..c9e1cf8 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -912,6 +912,16 @@ config GPIO_WM8994
Say yes here to access the GPIO signals of WM8994 audio hub
CODECs from Wolfson Microelectronics.
+config GPIO_F81504
+ tristate "Fintek F81504/508/512 PCIE-to-UART/GPIO support"
+ depends on MFD_FINTEK_F81504_CORE
+ select MFD_CORE
+ help
+ Say yes here to support the GPIO functionality of Fintek
+ F81504/508/512 PCIE-to-UART/GPIO.
+
+ If unsure, say N.
+
endmenu
menu "PCI GPIO expanders"
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index c759190..f277089 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -112,6 +112,7 @@ obj-$(CONFIG_GPIO_VX855) += gpio-vx855.o
obj-$(CONFIG_GPIO_WM831X) += gpio-wm831x.o
obj-$(CONFIG_GPIO_WM8350) += gpio-wm8350.o
obj-$(CONFIG_GPIO_WM8994) += gpio-wm8994.o
+obj-$(CONFIG_GPIO_F81504) += gpio-f81504.o
obj-$(CONFIG_GPIO_XGENE) += gpio-xgene.o
obj-$(CONFIG_GPIO_XGENE_SB) += gpio-xgene-sb.o
obj-$(CONFIG_GPIO_XILINX) += gpio-xilinx.o
diff --git a/drivers/gpio/gpio-f81504.c b/drivers/gpio/gpio-f81504.c
new file mode 100644
index 0000000..ef42e4f
--- /dev/null
+++ b/drivers/gpio/gpio-f81504.c
@@ -0,0 +1,241 @@
+/*
+ * Copyright (C) 2016 Fintek Corporation
+ * Based on gpio-mpc8xxx.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <linux/platform_device.h>
+#include <linux/gpio/driver.h>
+#include <linux/pci.h>
+#include <linux/mfd/f81504.h>
+
+struct f81504_gpio_chip {
+ struct gpio_chip chip;
+ struct mutex locker;
+ u8 idx;
+ u8 save_out_en;
+ u8 save_drive_en;
+ u8 save_value;
+};
+
+static int f81504_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
+{
+ struct f81504_gpio_chip *gc = gpiochip_get_data(chip);
+ struct platform_device *pdev = to_platform_device(chip->parent);
+ struct pci_dev *pci_dev = to_pci_dev(pdev->dev.parent);
+ u8 tmp;
+
+ mutex_lock(&gc->locker);
+
+ /* set input mode */
+ pci_read_config_byte(pci_dev, F81504_GPIO_START_ADDR + gc->idx *
+ F81504_GPIO_SET_OFFSET +
+ F81504_GPIO_OUT_EN_OFFSET, &tmp);
+ pci_write_config_byte(pci_dev, F81504_GPIO_START_ADDR + gc->idx *
+ F81504_GPIO_SET_OFFSET +
+ F81504_GPIO_OUT_EN_OFFSET, tmp & ~BIT(offset));
+
+ mutex_unlock(&gc->locker);
+ return 0;
+}
+
+static int f81504_gpio_direction_out(struct gpio_chip *chip, unsigned offset,
+ int value)
+{
+ struct f81504_gpio_chip *gc = gpiochip_get_data(chip);
+ struct platform_device *pdev = to_platform_device(chip->parent);
+ struct pci_dev *pci_dev = to_pci_dev(pdev->dev.parent);
+ struct f81504_pci_private *priv = pci_get_drvdata(pci_dev);
+ u8 tmp;
+
+ mutex_lock(&gc->locker);
+
+ /* set output mode */
+ pci_read_config_byte(pci_dev, F81504_GPIO_START_ADDR + gc->idx *
+ F81504_GPIO_SET_OFFSET +
+ F81504_GPIO_OUT_EN_OFFSET, &tmp);
+ pci_write_config_byte(pci_dev, F81504_GPIO_START_ADDR + gc->idx *
+ F81504_GPIO_SET_OFFSET +
+ F81504_GPIO_OUT_EN_OFFSET, tmp | BIT(offset));
+
+ /*
+ * The GPIO default driven mode for this device is open-drain. The
+ * GPIOLIB had no change GPIO mode API currently. So we leave the
+ * Push-Pull code below.
+ *
+ * pci_read_config_byte(dev, GPIO_START_ADDR + idx * GPIO_SET_OFFSET +
+ * GPIO_DRIVE_EN_OFFSET, &tmp);
+ * pci_write_config_byte(dev, GPIO_START_ADDR + idx * GPIO_SET_OFFSET +
+ * GPIO_DRIVE_EN_OFFSET, tmp | BIT(gpio_num));
+ */
+
+ /* set output data */
+ tmp = inb(priv->gpio_ioaddr + gc->idx);
+
+ if (value)
+ outb(tmp | BIT(offset), priv->gpio_ioaddr + gc->idx);
+ else
+ outb(tmp & ~BIT(offset), priv->gpio_ioaddr + gc->idx);
+
+ mutex_unlock(&gc->locker);
+ return 0;
+}
+
+static int f81504_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
+{
+ struct f81504_gpio_chip *gc = gpiochip_get_data(chip);
+ struct platform_device *pdev = to_platform_device(chip->parent);
+ struct pci_dev *pci_dev = to_pci_dev(pdev->dev.parent);
+ u8 tmp;
+
+ mutex_lock(&gc->locker);
+ pci_read_config_byte(pci_dev, F81504_GPIO_START_ADDR + gc->idx *
+ F81504_GPIO_SET_OFFSET, &tmp);
+ mutex_unlock(&gc->locker);
+
+ if (tmp & BIT(offset))
+ return 0;
+
+ return 1;
+}
+
+static int f81504_gpio_get(struct gpio_chip *chip, unsigned offset)
+{
+ struct f81504_gpio_chip *gc = gpiochip_get_data(chip);
+ struct platform_device *pdev = to_platform_device(chip->parent);
+ struct pci_dev *pci_dev = to_pci_dev(pdev->dev.parent);
+ struct f81504_pci_private *priv = pci_get_drvdata(pci_dev);
+ int tmp;
+
+ mutex_lock(&gc->locker);
+ tmp = inb(priv->gpio_ioaddr + gc->idx);
+ mutex_unlock(&gc->locker);
+
+ return !!(tmp & BIT(offset));
+}
+
+static void f81504_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
+{
+ f81504_gpio_direction_out(chip, offset, value);
+}
+
+static int f81504_gpio_suspend(struct device *dev)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct pci_dev *pci_dev = to_pci_dev(pdev->dev.parent);
+ struct f81504_pci_private *priv = pci_get_drvdata(pci_dev);
+ struct f81504_gpio_chip *gc = platform_get_drvdata(pdev);
+
+ mutex_lock(&gc->locker);
+ pci_read_config_byte(pci_dev, F81504_GPIO_START_ADDR + gc->idx *
+ F81504_GPIO_SET_OFFSET +
+ F81504_GPIO_OUT_EN_OFFSET, &gc->save_out_en);
+
+ pci_read_config_byte(pci_dev, F81504_GPIO_START_ADDR + gc->idx *
+ F81504_GPIO_SET_OFFSET +
+ F81504_GPIO_DRIVE_EN_OFFSET, &gc->save_drive_en);
+
+ gc->save_value = inb(priv->gpio_ioaddr + gc->idx);
+ mutex_unlock(&gc->locker);
+ return 0;
+}
+
+static int f81504_gpio_resume(struct device *dev)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct pci_dev *pci_dev = to_pci_dev(pdev->dev.parent);
+ struct f81504_pci_private *priv = pci_get_drvdata(pci_dev);
+ struct f81504_gpio_chip *gc = platform_get_drvdata(pdev);
+
+ mutex_lock(&gc->locker);
+ pci_write_config_byte(pci_dev, F81504_GPIO_START_ADDR + gc->idx *
+ F81504_GPIO_SET_OFFSET +
+ F81504_GPIO_OUT_EN_OFFSET, gc->save_out_en);
+
+ pci_write_config_byte(pci_dev, F81504_GPIO_START_ADDR + gc->idx *
+ F81504_GPIO_SET_OFFSET +
+ F81504_GPIO_DRIVE_EN_OFFSET, gc->save_drive_en);
+
+ outb(gc->save_value, priv->gpio_ioaddr + gc->idx);
+ mutex_unlock(&gc->locker);
+ return 0;
+}
+
+static int f81504_gpio_probe(struct platform_device *pdev)
+{
+ unsigned int gpio_idx = *(unsigned int *)dev_get_platdata(&pdev->dev);
+ struct f81504_gpio_chip *gc;
+ char *name;
+
+ if (gpio_idx >= ARRAY_SIZE(fintek_gpio_mapping)) {
+ dev_err(&pdev->dev, "%s: gpio_idx:%d out of range.\n",
+ __func__, gpio_idx);
+ return -ENODEV;
+ }
+
+ gc = devm_kzalloc(&pdev->dev, sizeof(*gc), GFP_KERNEL);
+ if (!gc)
+ return -ENOMEM;
+
+ mutex_init(&gc->locker);
+ platform_set_drvdata(pdev, gc);
+
+ name = devm_kzalloc(&pdev->dev, FINTEK_GPIO_NAME_LEN, GFP_KERNEL);
+ if (!name)
+ return -ENOMEM;
+
+ /* This will display like as GPIO-1x */
+ sprintf(name, "%s-%dx", FINTEK_GPIO_DISPLAY, gpio_idx);
+
+ gc->chip.owner = THIS_MODULE;
+ gc->chip.parent = &pdev->dev;
+ gc->chip.label = name;
+ gc->chip.ngpio = 8;
+ gc->chip.get = f81504_gpio_get;
+ gc->chip.set = f81504_gpio_set;
+ gc->chip.direction_input = f81504_gpio_direction_in;
+ gc->chip.direction_output = f81504_gpio_direction_out;
+ gc->chip.get_direction = f81504_gpio_get_direction;
+ gc->chip.can_sleep = 1;
+ gc->chip.base = -1;
+ gc->idx = gpio_idx;
+
+ return gpiochip_add_data(&gc->chip, gc);
+}
+
+static int f81504_gpio_remove(struct platform_device *pdev)
+{
+ struct f81504_gpio_chip *gc = platform_get_drvdata(pdev);
+
+ gpiochip_remove(&gc->chip);
+ return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(f81504_gpio_pm_ops, f81504_gpio_suspend,
+ f81504_gpio_resume);
+
+static struct platform_driver f81504_gpio_driver = {
+ .driver = {
+ .name = F81504_GPIO_NAME,
+ .pm = &f81504_gpio_pm_ops,
+ },
+ .probe = f81504_gpio_probe,
+ .remove = f81504_gpio_remove,
+};
+
+module_platform_driver(f81504_gpio_driver);
+
+MODULE_AUTHOR("Peter Hong <Peter_Hong@fintek.com.tw>");
+MODULE_DESCRIPTION("Fintek F81504/508/512 PCIE GPIOLIB driver");
+MODULE_LICENSE("GPL");
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH V3 2/4] gpio: gpio-f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO GPIOLIB support
2016-02-16 6:55 ` [PATCH V3 2/4] gpio: gpio-f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO GPIOLIB support Peter Hung
@ 2016-02-16 15:22 ` Linus Walleij
0 siblings, 0 replies; 11+ messages in thread
From: Linus Walleij @ 2016-02-16 15:22 UTC (permalink / raw)
To: Peter Hung
Cc: Alexandre Courbot, Greg KH, Andy Shevchenko, Paul Gortmaker,
Lee Jones, Jiri Slaby, One Thousand Gnomes, Peter H,
Heikki Krogerus, Peter Hurley, Soeren Grunewald, Wang YanQing,
Adam Lee, Arnd Bergmann, Joachim Eastwood, Scott Wood,
Masahiro Yamada, Paul Burton, Måns Rullgård,
Matthias Brugger, Ralf Baechle, linux-kernel
On Tue, Feb 16, 2016 at 7:55 AM, Peter Hung <hpeter@gmail.com> wrote:
> This driver is GPIOLIB driver for F81504/508/512, it'll handle the
> GPIOLIB operation of this device. This module will depend on
> MFD_FINTEK_F81504_CORE.
>
> IC function list:
> F81504: Max 2x8 GPIOs and max 4 serial ports
> port2/3 are multi-function
> F81508: Max 6x8 GPIOs and max 8 serial ports
> port2/3 are multi-function, port8/9/10/11 are gpio only
> F81512: Max 6x8 GPIOs and max 12 serial ports
> port2/3/8/9/10/11 are multi-function
>
> GPIO register:
> PCI Configuration space:
> F0h: bit0~5: Enable GPIO0~5
> bit6~7: Reserve
> F3h: bit0~5: Multi-Functional Flag (0:GPIO/1:UART)
> bit0: UART2 pin out for UART2 / GPIO0
> bit1: UART3 pin out for UART3 / GPIO1
> bit2: UART8 pin out for UART8 / GPIO2
> bit3: UART9 pin out for UART9 / GPIO3
> bit4: UART10 pin out for UART10 / GPIO4
> bit5: UART11 pin out for UART11 / GPIO5
> bit6~7: Reserve
> F1h: IO address (LSB)
> F2h: IO address (MSB)
> F8h + 8 * set: Direction control (bitwise)
> bitx: 0 - Input mode
> bitx: 1 - Output mode
> F9h + 8 * set: Drive ability control (bitwise)
> bitx: 0 - Open drain (default)
> bitx: 1 - Push Pull
> In this driver, we only implements open drain mode.
>
> IO space:
> (IO base + 0~5): GPIO-0x~5x in/out value (bitwise)
>
> Suggested-by: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
> Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
It's fine with me if this is queued in MFD, serial or whatever tree, or
we can wait until the MFD parts are in and take it for the next merge
window.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH V3 2/4] gpio: gpio-f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO GPIOLIB support
@ 2016-02-16 15:22 ` Linus Walleij
0 siblings, 0 replies; 11+ messages in thread
From: Linus Walleij @ 2016-02-16 15:22 UTC (permalink / raw)
To: Peter Hung
Cc: Alexandre Courbot, Greg KH, Andy Shevchenko, Paul Gortmaker,
Lee Jones, Jiri Slaby, One Thousand Gnomes, Peter H,
Heikki Krogerus, Peter Hurley, Soeren Grunewald, Wang YanQing,
Adam Lee, Arnd Bergmann, Joachim Eastwood, Scott Wood,
Masahiro Yamada, Paul Burton, Måns Rullgård,
Matthias Brugger, Ralf Baechle, linux-kernel, linux-gpio,
linux-serial, tom_tsai, Peter Hung
On Tue, Feb 16, 2016 at 7:55 AM, Peter Hung <hpeter@gmail.com> wrote:
> This driver is GPIOLIB driver for F81504/508/512, it'll handle the
> GPIOLIB operation of this device. This module will depend on
> MFD_FINTEK_F81504_CORE.
>
> IC function list:
> F81504: Max 2x8 GPIOs and max 4 serial ports
> port2/3 are multi-function
> F81508: Max 6x8 GPIOs and max 8 serial ports
> port2/3 are multi-function, port8/9/10/11 are gpio only
> F81512: Max 6x8 GPIOs and max 12 serial ports
> port2/3/8/9/10/11 are multi-function
>
> GPIO register:
> PCI Configuration space:
> F0h: bit0~5: Enable GPIO0~5
> bit6~7: Reserve
> F3h: bit0~5: Multi-Functional Flag (0:GPIO/1:UART)
> bit0: UART2 pin out for UART2 / GPIO0
> bit1: UART3 pin out for UART3 / GPIO1
> bit2: UART8 pin out for UART8 / GPIO2
> bit3: UART9 pin out for UART9 / GPIO3
> bit4: UART10 pin out for UART10 / GPIO4
> bit5: UART11 pin out for UART11 / GPIO5
> bit6~7: Reserve
> F1h: IO address (LSB)
> F2h: IO address (MSB)
> F8h + 8 * set: Direction control (bitwise)
> bitx: 0 - Input mode
> bitx: 1 - Output mode
> F9h + 8 * set: Drive ability control (bitwise)
> bitx: 0 - Open drain (default)
> bitx: 1 - Push Pull
> In this driver, we only implements open drain mode.
>
> IO space:
> (IO base + 0~5): GPIO-0x~5x in/out value (bitwise)
>
> Suggested-by: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
> Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
It's fine with me if this is queued in MFD, serial or whatever tree, or
we can wait until the MFD parts are in and take it for the next merge
window.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH V3 2/4] gpio: gpio-f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO GPIOLIB support
2016-02-16 15:22 ` Linus Walleij
@ 2016-02-17 10:13 ` Peter Hung
-1 siblings, 0 replies; 11+ messages in thread
From: Peter Hung @ 2016-02-17 10:13 UTC (permalink / raw)
To: Linus Walleij
Cc: Alexandre Courbot, Greg KH, Andy Shevchenko, Paul Gortmaker,
Lee Jones, Jiri Slaby, One Thousand Gnomes, Peter H,
Heikki Krogerus, Peter Hurley, Soeren Grunewald, Wang YanQing,
Adam Lee, Arnd Bergmann, Joachim Eastwood, Scott Wood,
Masahiro Yamada, Paul Burton, Måns Rullgård,
Matthias Brugger, Ralf Baechle, linux-kernel
Hi Linus,
Linus Walleij 於 2016/2/16 下午 11:22 寫道:
> On Tue, Feb 16, 2016 at 7:55 AM, Peter Hung <hpeter@gmail.com> wrote:
>>
>> Suggested-by: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
>> Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>> Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> It's fine with me if this is queued in MFD, serial or whatever tree, or
> we can wait until the MFD parts are in and take it for the next merge
> window.
>
Thanks for your review, but Andy give me some advice for 8250_f81504.c.
So I'll send V4 when I rewrite it.
--
With Best Regards,
Peter Hung
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH V3 2/4] gpio: gpio-f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO GPIOLIB support
@ 2016-02-17 10:13 ` Peter Hung
0 siblings, 0 replies; 11+ messages in thread
From: Peter Hung @ 2016-02-17 10:13 UTC (permalink / raw)
To: Linus Walleij
Cc: Alexandre Courbot, Greg KH, Andy Shevchenko, Paul Gortmaker,
Lee Jones, Jiri Slaby, One Thousand Gnomes, Peter H,
Heikki Krogerus, Peter Hurley, Soeren Grunewald, Wang YanQing,
Adam Lee, Arnd Bergmann, Joachim Eastwood, Scott Wood,
Masahiro Yamada, Paul Burton, Måns Rullgård,
Matthias Brugger, Ralf Baechle, linux-kernel, linux-gpio,
linux-serial, tom_tsai, Peter Hung
Hi Linus,
Linus Walleij 於 2016/2/16 下午 11:22 寫道:
> On Tue, Feb 16, 2016 at 7:55 AM, Peter Hung <hpeter@gmail.com> wrote:
>>
>> Suggested-by: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
>> Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>> Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> It's fine with me if this is queued in MFD, serial or whatever tree, or
> we can wait until the MFD parts are in and take it for the next merge
> window.
>
Thanks for your review, but Andy give me some advice for 8250_f81504.c.
So I'll send V4 when I rewrite it.
--
With Best Regards,
Peter Hung
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH V3 3/4] 8250: 8250_f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO UART support
2016-02-16 6:55 [PATCH V3 0/4] Transform Fintek PCIE driver from 8250 to MFD Peter Hung
2016-02-16 6:55 ` [PATCH V3 1/4] mfd: f81504-core: Add Fintek F81504/508/512 PCIE-to-UART/GPIO core support Peter Hung
2016-02-16 6:55 ` [PATCH V3 2/4] gpio: gpio-f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO GPIOLIB support Peter Hung
@ 2016-02-16 6:55 ` Peter Hung
2016-02-16 9:11 ` Andy Shevchenko
2016-02-16 6:55 ` [PATCH V3 4/4] serial: 8250_pci: Remove Fintek F81504/508/512 UART driver Peter Hung
3 siblings, 1 reply; 11+ messages in thread
From: Peter Hung @ 2016-02-16 6:55 UTC (permalink / raw)
To: linus.walleij, gnurou, gregkh, andriy.shevchenko, paul.gortmaker,
lee.jones, jslaby, gnomes, peter_hong
Cc: heikki.krogerus, peter, soeren.grunewald, udknight, adam.lee,
arnd, manabian, scottwood, yamada.masahiro, paul.burton, mans,
matthias.bgg, ralf, linux-kernel, linux-gpio, linux-serial,
tom_tsai, Peter Hung
This driver is 8250 driver for F81504/508/512, it'll handle the serial
port operation of this device. This module will depend on
MFD_FINTEK_F81504_CORE.
The serial ports support from 50bps to 1.5Mbps with Linux baudrate
define excluding 1.0Mbps due to not support 16MHz clock source.
PCI Configuration Space Registers, set:0~11(Max):
40h + 8 * set:
bit7~6: Clock source selector
00: 1.8432MHz
01: 18.432MHz
10: 24MHz
11: 14.769MHz
bit0: UART enable
41h + 8 * set:
bit5~4: RX trigger multiple
00: 1x * trigger level
01: 2x * trigger level
10: 4x * trigger level
11: 8x * trigger level
bit1~0: FIFO Size
11: 128Bytes
44h + 8 * set: UART IO address (LSB)
45h + 8 * set: UART IO address (MSB)
47h + 8 * set:
bit5: RTS invert (bit4 must enable)
bit4: RTS auto direction enable
0: RTS control by MCR
1: RTS driven high when TX, otherwise low
Suggested-by: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
---
drivers/tty/serial/8250/8250_f81504.c | 254 ++++++++++++++++++++++++++++++++++
drivers/tty/serial/8250/Kconfig | 11 ++
drivers/tty/serial/8250/Makefile | 1 +
3 files changed, 266 insertions(+)
create mode 100644 drivers/tty/serial/8250/8250_f81504.c
diff --git a/drivers/tty/serial/8250/8250_f81504.c b/drivers/tty/serial/8250/8250_f81504.c
new file mode 100644
index 0000000..747af87
--- /dev/null
+++ b/drivers/tty/serial/8250/8250_f81504.c
@@ -0,0 +1,254 @@
+#include <linux/pci.h>
+#include <linux/serial_8250.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/mfd/f81504.h>
+
+#include "8250.h"
+
+static u32 baudrate_table[] = { 1500000, 1152000, 921600 };
+static u8 clock_table[] = { F81504_CLKSEL_24_MHZ, F81504_CLKSEL_18DOT46_MHZ,
+ F81504_CLKSEL_14DOT77_MHZ };
+
+/* We should do proper H/W transceiver setting before change to RS485 mode */
+static int f81504_rs485_config(struct uart_port *port,
+ struct serial_rs485 *rs485)
+{
+ u8 setting;
+ u8 *index = (u8 *) port->private_data;
+ struct platform_device *pdev = container_of(port->dev,
+ struct platform_device, dev);
+ struct pci_dev *pci_dev = to_pci_dev(pdev->dev.parent);
+
+ pci_read_config_byte(pci_dev, F81504_UART_START_ADDR +
+ F81504_UART_OFFSET * *index + F81504_UART_MODE_OFFSET,
+ &setting);
+
+ if (!rs485)
+ rs485 = &port->rs485;
+ else if (rs485->flags & SER_RS485_ENABLED)
+ memset(rs485->padding, 0, sizeof(rs485->padding));
+ else
+ memset(rs485, 0, sizeof(*rs485));
+
+ /* F81504/508/512 not support RTS delay before or after send */
+ rs485->flags &= SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND;
+
+ if (rs485->flags & SER_RS485_ENABLED) {
+ /* Enable RTS H/W control mode */
+ setting |= F81504_RTS_CONTROL_BY_HW;
+
+ if (rs485->flags & SER_RS485_RTS_ON_SEND) {
+ /* RTS driving high on TX */
+ setting &= ~F81504_RTS_INVERT;
+ } else {
+ /* RTS driving low on TX */
+ setting |= F81504_RTS_INVERT;
+ }
+
+ rs485->delay_rts_after_send = 0;
+ rs485->delay_rts_before_send = 0;
+ } else {
+ /* Disable RTS H/W control mode */
+ setting &= ~(F81504_RTS_CONTROL_BY_HW | F81504_RTS_INVERT);
+ }
+
+ pci_write_config_byte(pci_dev, F81504_UART_START_ADDR +
+ F81504_UART_OFFSET * *index + F81504_UART_MODE_OFFSET,
+ setting);
+
+ if (rs485 != &port->rs485)
+ port->rs485 = *rs485;
+
+ return 0;
+}
+
+static int f81504_check_baudrate(u32 baud, size_t *idx)
+{
+ size_t index;
+ u32 quot, rem;
+
+ for (index = 0; index < ARRAY_SIZE(baudrate_table); ++index) {
+ /* Clock source must largeer than desire baudrate */
+ if (baud > baudrate_table[index])
+ continue;
+
+ quot = DIV_ROUND_CLOSEST(baudrate_table[index], baud);
+ /* find divisible clock source */
+ rem = baudrate_table[index] % baud;
+
+ if (quot && !rem) {
+ if (idx)
+ *idx = index;
+ return 0;
+ }
+ }
+
+ return -EINVAL;
+}
+
+static void f81504_set_termios(struct uart_port *port,
+ struct ktermios *termios, struct ktermios *old)
+{
+ struct platform_device *pdev = container_of(port->dev,
+ struct platform_device, dev);
+ struct pci_dev *dev = to_pci_dev(pdev->dev.parent);
+ unsigned int baud = tty_termios_baud_rate(termios);
+ u8 tmp, *offset = (u8 *) port->private_data;
+ size_t i;
+
+ do {
+ /* read current clock source (masked with CLOCK_RATE_MASK) */
+ pci_read_config_byte(dev, F81504_UART_START_ADDR + *offset *
+ F81504_UART_OFFSET, &tmp);
+
+ if (baud <= 115200) {
+ /*
+ * direct use 1.8432MHz when baudrate smaller then or
+ * equal 115200bps
+ */
+ port->uartclk = 115200 * 16;
+ pci_write_config_byte(dev, F81504_UART_START_ADDR +
+ *offset * F81504_UART_OFFSET,
+ tmp & ~F81504_CLOCK_RATE_MASK);
+ break;
+ }
+
+ if (!f81504_check_baudrate(baud, &i)) {
+ /* had optimize value */
+ port->uartclk = baudrate_table[i] * 16;
+ tmp = (tmp & ~F81504_CLOCK_RATE_MASK) | clock_table[i];
+ pci_write_config_byte(dev, F81504_UART_START_ADDR +
+ *offset * F81504_UART_OFFSET, tmp);
+ break;
+ }
+
+ if (old && !f81504_check_baudrate(tty_termios_baud_rate(old),
+ NULL)) {
+ /*
+ * If it can't found suitable clock source but had old
+ * accpetable baudrate, we'll use it
+ */
+ baud = tty_termios_baud_rate(old);
+ } else {
+ /*
+ * If it can't found suitable clock source and not old
+ * config, we'll direct set 115200bps for future use
+ */
+ baud = 115200;
+ }
+
+ if (tty_termios_baud_rate(termios))
+ tty_termios_encode_baud_rate(termios, baud, baud);
+ } while (1);
+
+ serial8250_do_set_termios(port, termios, old);
+}
+
+static int f81504_register_port(struct platform_device *dev,
+ unsigned long address, int idx)
+{
+ struct pci_dev *pci_dev = to_pci_dev(dev->dev.parent);
+ struct uart_8250_port port;
+ u8 *data;
+
+ memset(&port, 0, sizeof(port));
+ data = devm_kzalloc(&dev->dev, sizeof(u8), GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ *data = idx;
+ port.port.iotype = UPIO_PORT;
+ port.port.irq = pci_dev->irq;
+ port.port.flags = UPF_SKIP_TEST | UPF_FIXED_TYPE | UPF_BOOT_AUTOCONF |
+ UPF_SHARE_IRQ;
+ port.port.uartclk = 1843200;
+ port.port.dev = &dev->dev;
+ port.port.iobase = address;
+ port.port.type = PORT_16550A;
+ port.port.fifosize = 128;
+ port.port.rs485_config = f81504_rs485_config;
+ port.port.set_termios = f81504_set_termios;
+ port.tx_loadsz = 32;
+ port.port.private_data = data; /* save current idx */
+
+ return serial8250_register_8250_port(&port);
+}
+
+static int f81504_serial_probe(struct platform_device *pdev)
+{
+ int line;
+ size_t *index = (size_t *)dev_get_platdata(&pdev->dev);
+ struct resource *io = platform_get_resource(pdev, IORESOURCE_IO, 0);
+
+ line = f81504_register_port(pdev, io->start, *index);
+ if (line < 0)
+ return line;
+
+ /*
+ * Re-assign line to replace old port PCIE configuration space idx,
+ * port idx is saved in per-port private data.
+ */
+ *index = line;
+ return 0;
+}
+
+static int f81504_serial_remove(struct platform_device *pdev)
+{
+ size_t *line = (size_t *)dev_get_platdata(&pdev->dev);
+
+ serial8250_unregister_port(*line);
+ return 0;
+}
+
+
+#ifdef CONFIG_PM_SLEEP
+static int f81504_serial_suspend(struct device *dev)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ size_t *line = (size_t *)dev_get_platdata(&pdev->dev);
+
+ serial8250_suspend_port(*line);
+ return 0;
+}
+
+static int f81504_serial_resume(struct device *dev)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ size_t *line = (size_t *)dev_get_platdata(&pdev->dev);
+ struct uart_8250_port *port = serial8250_get_port(*line);
+
+ f81504_rs485_config(&port->port, NULL);
+ serial8250_resume_port(*line);
+ return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(f81504_serial_pm_ops, f81504_serial_suspend,
+ f81504_serial_resume);
+
+static struct platform_driver f81504_serial_driver = {
+ .driver = {
+ .name = F81504_SERIAL_NAME,
+ .owner = THIS_MODULE,
+ .pm = &f81504_serial_pm_ops,
+ },
+ .probe = f81504_serial_probe,
+ .remove = f81504_serial_remove,
+};
+
+static int __init f81504_serial_init(void)
+{
+ return platform_driver_register(&f81504_serial_driver);
+}
+subsys_initcall(f81504_serial_init);
+
+static void __exit f81504_serial_exit(void)
+{
+ platform_driver_unregister(&f81504_serial_driver);
+}
+module_exit(f81504_serial_exit);
+
+MODULE_AUTHOR("Peter Hong <Peter_Hong@fintek.com.tw>");
+MODULE_DESCRIPTION("Fintek F81504/508/512 PCIE 16550A serial port driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
index b03cb517..b5c817e 100644
--- a/drivers/tty/serial/8250/Kconfig
+++ b/drivers/tty/serial/8250/Kconfig
@@ -116,6 +116,17 @@ config SERIAL_8250_PCI
Note that serial ports on NetMos 9835 Multi-I/O cards are handled
by the parport_serial driver, enabled with CONFIG_PARPORT_SERIAL.
+config SERIAL_8250_F81504
+ tristate "Fintek F81504/508/512 16550 PCIE device support" if EXPERT
+ depends on SERIAL_8250 && MFD_FINTEK_F81504_CORE
+ default SERIAL_8250
+ select RATIONAL
+ help
+ This builds Fintek F81504/508/512 PCIE serial ports support.
+ You may be able to enable GPIO_F81504 to get GPIOLIB support if
+ the devices supported. Please enable MFD_FINTEK_F81504_CORE &
+ this with Y if you need a early console.
+
config SERIAL_8250_HP300
tristate
depends on SERIAL_8250 && HP300
diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile
index b9b9bca..c84245e 100644
--- a/drivers/tty/serial/8250/Makefile
+++ b/drivers/tty/serial/8250/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_SERIAL_8250) += 8250.o 8250_base.o
8250_base-$(CONFIG_SERIAL_8250_DMA) += 8250_dma.o
obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o
obj-$(CONFIG_SERIAL_8250_PCI) += 8250_pci.o
+obj-$(CONFIG_SERIAL_8250_F81504) += 8250_f81504.o
obj-$(CONFIG_SERIAL_8250_HP300) += 8250_hp300.o
obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o
obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH V3 3/4] 8250: 8250_f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO UART support
2016-02-16 6:55 ` [PATCH V3 3/4] 8250: 8250_f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO UART support Peter Hung
@ 2016-02-16 9:11 ` Andy Shevchenko
2016-02-17 9:30 ` Peter Hung
0 siblings, 1 reply; 11+ messages in thread
From: Andy Shevchenko @ 2016-02-16 9:11 UTC (permalink / raw)
To: Peter Hung, linus.walleij, gnurou, gregkh, paul.gortmaker,
lee.jones, jslaby, gnomes, peter_hong
Cc: heikki.krogerus, peter, soeren.grunewald, udknight, adam.lee,
arnd, manabian, scottwood, yamada.masahiro, paul.burton, mans,
matthias.bgg, ralf, linux-kernel, linux-gpio, linux-serial,
tom_tsai, Peter Hung
On Tue, 2016-02-16 at 14:55 +0800, Peter Hung wrote:
> This driver is 8250 driver for F81504/508/512, it'll handle the
> serial
> port operation of this device. This module will depend on
> MFD_FINTEK_F81504_CORE.
>
> The serial ports support from 50bps to 1.5Mbps with Linux baudrate
> define excluding 1.0Mbps due to not support 16MHz clock source.
>
> PCI Configuration Space Registers, set:0~11(Max):
> 40h + 8 * set:
> bit7~6: Clock source selector
> 00: 1.8432MHz
> 01: 18.432MHz
> 10: 24MHz
> 11: 14.769MHz
> bit0: UART enable
> 41h + 8 * set:
> bit5~4: RX trigger multiple
> 00: 1x * trigger level
> 01: 2x * trigger level
> 10: 4x * trigger level
> 11: 8x * trigger level
> bit1~0: FIFO Size
> 11: 128Bytes
> 44h + 8 * set: UART IO address (LSB)
> 45h + 8 * set: UART IO address (MSB)
> 47h + 8 * set:
> bit5: RTS invert (bit4 must enable)
> bit4: RTS auto direction enable
> 0: RTS control by MCR
> 1: RTS driven high when TX, otherwise low
>
Few my comments below.
> +++ b/drivers/tty/serial/8250/8250_f81504.c
> @@ -0,0 +1,254 @@
> +#include <linux/pci.h>
> +#include <linux/serial_8250.h>
> +#include <linux/module.h>
> +#include <linux/version.h>
> +#include <linux/mfd/f81504.h>
> +
> +#include "8250.h"
> +
> +static u32 baudrate_table[] = { 1500000, 1152000, 921600 };
> +static u8 clock_table[] = { F81504_CLKSEL_24_MHZ,
> F81504_CLKSEL_18DOT46_MHZ,
> + F81504_CLKSEL_14DOT77_MHZ };
I suggest to replace DOT by _.
> +
> +/* We should do proper H/W transceiver setting before change to
> RS485 mode */
> +static int f81504_rs485_config(struct uart_port *port,
> + struct serial_rs485 *rs485)
> +{
> + u8 setting;
> + u8 *index = (u8 *) port->private_data;
private_data is a type of void *, therefore no need to have an explicit
casting.
> +static int f81504_check_baudrate(u32 baud, size_t *idx)
> +{
> + size_t index;
> + u32 quot, rem;
> +
> + for (index = 0; index < ARRAY_SIZE(baudrate_table); ++index)
Post-increment is also okay.
> {
> + /* Clock source must largeer than desire baudrate */
> + if (baud > baudrate_table[index])
> + continue;
> +
> + quot = DIV_ROUND_CLOSEST(baudrate_table[index],
> baud);
So, how quot is used and is it possible to set, for example, baud rate
as 1000000 or 576000?
> + /* find divisible clock source */
> + rem = baudrate_table[index] % baud;
> +
> + if (quot && !rem) {
> + if (idx)
> + *idx = index;
> + return 0;
> + }
> + }
> +
> + return -EINVAL;
> +}
> +
> +static void f81504_set_termios(struct uart_port *port,
> + struct ktermios *termios, struct ktermios *old)
> +{
> + struct platform_device *pdev = container_of(port->dev,
> + struct platform_device,
> dev);
> + struct pci_dev *dev = to_pci_dev(pdev->dev.parent);
> + unsigned int baud = tty_termios_baud_rate(termios);
> + u8 tmp, *offset = (u8 *) port->private_data;
Same for provate_data as above.
> + /* read current clock source (masked with
> CLOCK_RATE_MASK) */
...
> + /*
> + * direct use 1.8432MHz when baudrate
> smaller then or
> + * equal 115200bps
Check your style of comments in a _whole_ your series.
/*
* Start sentence with Capital letter and end with a period.
*/
> + */
>
> + if (!f81504_check_baudrate(baud, &i)) {
> + /* had optimize value */
/* For one line comment */
> + /*
> + * If it can't found suitable clock source
> but had old
> + * accpetable baudrate, we'll use it
Typo: acceptable.
Baudrate -> baud rate.
> + */
> + baud = tty_termios_baud_rate(old);
> + } else {
> + /*
> + * If it can't found suitable clock source
> and not old
> + * config, we'll direct set 115200bps for
> future use
> + */
> +static int f81504_register_port(struct platform_device *dev,
> + unsigned long address, int idx)
> +{
> + struct pci_dev *pci_dev = to_pci_dev(dev->dev.parent);
> + struct uart_8250_port port;
> + u8 *data;
> +
> + memset(&port, 0, sizeof(port));
> + data = devm_kzalloc(&dev->dev, sizeof(u8), GFP_KERNEL);
> + if (!data)
> + return -ENOMEM;
> +
> + *data = idx;
> + port.port.iotype = UPIO_PORT;
> + port.port.irq = pci_dev->irq;
> + port.port.flags = UPF_SKIP_TEST | UPF_FIXED_TYPE |
> UPF_BOOT_AUTOCONF |
> + UPF_SHARE_IRQ;
> + port.port.uartclk = 1843200;
> + port.port.dev = &dev->dev;
> + port.port.iobase = address;
> + port.port.type = PORT_16550A;
> + port.port.fifosize = 128;
> + port.port.rs485_config = f81504_rs485_config;
> + port.port.set_termios = f81504_set_termios;
> + port.tx_loadsz = 32;
> + port.port.private_data = data; /* save current idx */
Not sure you need to allocate memory for that at all, or maybe use a
struct with one member (for now).
> +static SIMPLE_DEV_PM_OPS(f81504_serial_pm_ops,
> f81504_serial_suspend,
> + f81504_serial_resume);
> +
> +static struct platform_driver f81504_serial_driver = {
> + .driver = {
> + .name = F81504_SERIAL_NAME,
> + .owner = THIS_MODULE,
You perhaps don't need this. Check the rest of the modules.
> + .pm = &f81504_serial_pm_ops,
> + },
>
> --- a/drivers/tty/serial/8250/Kconfig
> +++ b/drivers/tty/serial/8250/Kconfig
> @@ -116,6 +116,17 @@ config SERIAL_8250_PCI
> Note that serial ports on NetMos 9835 Multi-I/O cards are
> handled
> by the parport_serial driver, enabled with
> CONFIG_PARPORT_SERIAL.
>
> +config SERIAL_8250_F81504
> + tristate "Fintek F81504/508/512 16550 PCIE device support"
> if EXPERT
> + depends on SERIAL_8250 && MFD_FINTEK_F81504_CORE
> + default SERIAL_8250
> + select RATIONAL
It seems RATIONAL API is not used here.
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH V3 3/4] 8250: 8250_f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO UART support
2016-02-16 9:11 ` Andy Shevchenko
@ 2016-02-17 9:30 ` Peter Hung
0 siblings, 0 replies; 11+ messages in thread
From: Peter Hung @ 2016-02-17 9:30 UTC (permalink / raw)
To: Andy Shevchenko, linus.walleij, gnurou, gregkh, paul.gortmaker,
lee.jones, jslaby, gnomes, peter_hong
Cc: heikki.krogerus, peter, soeren.grunewald, udknight, adam.lee,
arnd, manabian, scottwood, yamada.masahiro, paul.burton, mans,
matthias.bgg, ralf, linux-kernel, linux-gpio, linux-serial,
tom_tsai, Peter Hung
Hi Andy,
Andy Shevchenko 於 2016/2/16 下午 05:11 寫道:
> On Tue, 2016-02-16 at 14:55 +0800, Peter Hung wrote:
>> +static u32 baudrate_table[] = { 1500000, 1152000, 921600 };
>> +static u8 clock_table[] = { F81504_CLKSEL_24_MHZ,
>> F81504_CLKSEL_18DOT46_MHZ,
>> + F81504_CLKSEL_14DOT77_MHZ };
>
> I suggest to replace DOT by _.
ok
>> +/* We should do proper H/W transceiver setting before change to
>> RS485 mode */
>> +static int f81504_rs485_config(struct uart_port *port,
>> + struct serial_rs485 *rs485)
>> +{
>> + u8 setting;
>> + u8 *index = (u8 *) port->private_data;
>
> private_data is a type of void *, therefore no need to have an explicit
> casting.
ok
>> +static int f81504_check_baudrate(u32 baud, size_t *idx)
>> +{
>> + size_t index;
>> + u32 quot, rem;
>> +
>> + for (index = 0; index < ARRAY_SIZE(baudrate_table); ++index)
>
> Post-increment is also okay.
>
>> {
>> + /* Clock source must largeer than desire baudrate */
>> + if (baud > baudrate_table[index])
>> + continue;
>> +
>> + quot = DIV_ROUND_CLOSEST(baudrate_table[index],
>> baud);
>
> So, how quot is used and is it possible to set, for example, baud rate
> as 1000000 or 576000?
The IC don't support B1000000 due to no 16MHz clock source.
The quot & rem is only use for compare, and it's must be not 0
when the code run to calculate DIV_ROUND_CLOSEST. So quot
is a redundancy here.
This function will find the suitable clock source for future use.
We'll pass suitable baud rate * 16 to port->uartclk for
serial8250_do_set_termios() to do advance divider operations.
I'll rewrite this section with remove quot and direct check
the "baudrate_table[index] % baud" divisible.
>> + u8 tmp, *offset = (u8 *) port->private_data;
>
> Same for provate_data as above.
ok
>> + /*
>> + * direct use 1.8432MHz when baudrate
>> smaller then or
>> + * equal 115200bps
>
> Check your style of comments in a _whole_ your series.
ok
>> + /*
>> + * If it can't found suitable clock source
>> but had old
>> + * accpetable baudrate, we'll use it
>
> Typo: acceptable.
> Baudrate -> baud rate.
ok
>> + port.port.private_data = data; /* save current idx */
>
> Not sure you need to allocate memory for that at all, or maybe use a
> struct with one member (for now).
>
We just pass the index of PCI configuration space currently. So
I just set a allocated u8 memory to private data. We'll maintain
current method.
>> +static SIMPLE_DEV_PM_OPS(f81504_serial_pm_ops,
>> f81504_serial_suspend,
>> + f81504_serial_resume);
>> +
>> +static struct platform_driver f81504_serial_driver = {
>> + .driver = {
>> + .name = F81504_SERIAL_NAME,
>> + .owner = THIS_MODULE,
>
> You perhaps don't need this. Check the rest of the modules.
ok
>> +config SERIAL_8250_F81504
>> + tristate "Fintek F81504/508/512 16550 PCIE device support"
>> if EXPERT
>> + depends on SERIAL_8250 && MFD_FINTEK_F81504_CORE
>> + default SERIAL_8250
>> + select RATIONAL
>
> It seems RATIONAL API is not used here.
>
This driver hadn't use RATIONAL API. I'll remove it.
Thanks for your advice.
--
With Best Regards,
Peter Hung
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH V3 4/4] serial: 8250_pci: Remove Fintek F81504/508/512 UART driver
2016-02-16 6:55 [PATCH V3 0/4] Transform Fintek PCIE driver from 8250 to MFD Peter Hung
` (2 preceding siblings ...)
2016-02-16 6:55 ` [PATCH V3 3/4] 8250: 8250_f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO UART support Peter Hung
@ 2016-02-16 6:55 ` Peter Hung
3 siblings, 0 replies; 11+ messages in thread
From: Peter Hung @ 2016-02-16 6:55 UTC (permalink / raw)
To: linus.walleij, gnurou, gregkh, andriy.shevchenko, paul.gortmaker,
lee.jones, jslaby, gnomes, peter_hong
Cc: heikki.krogerus, peter, soeren.grunewald, udknight, adam.lee,
arnd, manabian, scottwood, yamada.masahiro, paul.burton, mans,
matthias.bgg, ralf, linux-kernel, linux-gpio, linux-serial,
tom_tsai, Peter Hung
Remove Fintek F81504/508/512 PCIE-to-UART device driver from 8250_pci.c
Paul recommed us do less code deletion to avoid confusing problem when
bisect.
https://lkml.org/lkml/2016/1/18/646
But this patch is sent after with following patch.
8250: 8250_f81504: Add Fintek F81504/508/512 PCIE-to-UART/GPIO UART support
mfd: f81504-core: Add Fintek F81504/508/512 PCIE-to-UART/GPIO core support
We must remove F81504/508/512 support in 8250_pci.c and migrate to
f81504-core/8250_f81504 to enable MFD support and Andy recommend me to
add these this in blacklist to avoid probed by 8250_pci.c
Suggested-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
---
drivers/tty/serial/8250/8250_pci.c | 206 +------------------------------------
1 file changed, 5 insertions(+), 201 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index e71ec78..24a669c 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1532,156 +1532,6 @@ pci_brcm_trumanage_setup(struct serial_private *priv,
return ret;
}
-/* RTS will control by MCR if this bit is 0 */
-#define FINTEK_RTS_CONTROL_BY_HW BIT(4)
-/* only worked with FINTEK_RTS_CONTROL_BY_HW on */
-#define FINTEK_RTS_INVERT BIT(5)
-
-/* We should do proper H/W transceiver setting before change to RS485 mode */
-static int pci_fintek_rs485_config(struct uart_port *port,
- struct serial_rs485 *rs485)
-{
- u8 setting;
- u8 *index = (u8 *) port->private_data;
- struct pci_dev *pci_dev = container_of(port->dev, struct pci_dev,
- dev);
-
- pci_read_config_byte(pci_dev, 0x40 + 8 * *index + 7, &setting);
-
- if (!rs485)
- rs485 = &port->rs485;
- else if (rs485->flags & SER_RS485_ENABLED)
- memset(rs485->padding, 0, sizeof(rs485->padding));
- else
- memset(rs485, 0, sizeof(*rs485));
-
- /* F81504/508/512 not support RTS delay before or after send */
- rs485->flags &= SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND;
-
- if (rs485->flags & SER_RS485_ENABLED) {
- /* Enable RTS H/W control mode */
- setting |= FINTEK_RTS_CONTROL_BY_HW;
-
- if (rs485->flags & SER_RS485_RTS_ON_SEND) {
- /* RTS driving high on TX */
- setting &= ~FINTEK_RTS_INVERT;
- } else {
- /* RTS driving low on TX */
- setting |= FINTEK_RTS_INVERT;
- }
-
- rs485->delay_rts_after_send = 0;
- rs485->delay_rts_before_send = 0;
- } else {
- /* Disable RTS H/W control mode */
- setting &= ~(FINTEK_RTS_CONTROL_BY_HW | FINTEK_RTS_INVERT);
- }
-
- pci_write_config_byte(pci_dev, 0x40 + 8 * *index + 7, setting);
-
- if (rs485 != &port->rs485)
- port->rs485 = *rs485;
-
- return 0;
-}
-
-static int pci_fintek_setup(struct serial_private *priv,
- const struct pciserial_board *board,
- struct uart_8250_port *port, int idx)
-{
- struct pci_dev *pdev = priv->dev;
- u8 *data;
- u8 config_base;
- u16 iobase;
-
- config_base = 0x40 + 0x08 * idx;
-
- /* Get the io address from configuration space */
- pci_read_config_word(pdev, config_base + 4, &iobase);
-
- dev_dbg(&pdev->dev, "%s: idx=%d iobase=0x%x", __func__, idx, iobase);
-
- port->port.iotype = UPIO_PORT;
- port->port.iobase = iobase;
- port->port.rs485_config = pci_fintek_rs485_config;
-
- data = devm_kzalloc(&pdev->dev, sizeof(u8), GFP_KERNEL);
- if (!data)
- return -ENOMEM;
-
- /* preserve index in PCI configuration space */
- *data = idx;
- port->port.private_data = data;
-
- return 0;
-}
-
-static int pci_fintek_init(struct pci_dev *dev)
-{
- unsigned long iobase;
- u32 max_port, i;
- u32 bar_data[3];
- u8 config_base;
- struct serial_private *priv = pci_get_drvdata(dev);
- struct uart_8250_port *port;
-
- switch (dev->device) {
- case 0x1104: /* 4 ports */
- case 0x1108: /* 8 ports */
- max_port = dev->device & 0xff;
- break;
- case 0x1112: /* 12 ports */
- max_port = 12;
- break;
- default:
- return -EINVAL;
- }
-
- /* Get the io address dispatch from the BIOS */
- pci_read_config_dword(dev, 0x24, &bar_data[0]);
- pci_read_config_dword(dev, 0x20, &bar_data[1]);
- pci_read_config_dword(dev, 0x1c, &bar_data[2]);
-
- for (i = 0; i < max_port; ++i) {
- /* UART0 configuration offset start from 0x40 */
- config_base = 0x40 + 0x08 * i;
-
- /* Calculate Real IO Port */
- iobase = (bar_data[i / 4] & 0xffffffe0) + (i % 4) * 8;
-
- /* Enable UART I/O port */
- pci_write_config_byte(dev, config_base + 0x00, 0x01);
-
- /* Select 128-byte FIFO and 8x FIFO threshold */
- pci_write_config_byte(dev, config_base + 0x01, 0x33);
-
- /* LSB UART */
- pci_write_config_byte(dev, config_base + 0x04,
- (u8)(iobase & 0xff));
-
- /* MSB UART */
- pci_write_config_byte(dev, config_base + 0x05,
- (u8)((iobase & 0xff00) >> 8));
-
- pci_write_config_byte(dev, config_base + 0x06, dev->irq);
-
- if (priv) {
- /* re-apply RS232/485 mode when
- * pciserial_resume_ports()
- */
- port = serial8250_get_port(priv->line[i]);
- pci_fintek_rs485_config(&port->port, NULL);
- } else {
- /* First init without port data
- * force init to RS232 Mode
- */
- pci_write_config_byte(dev, config_base + 0x07, 0x01);
- }
- }
-
- return max_port;
-}
-
static int skip_tx_en_setup(struct serial_private *priv,
const struct pciserial_board *board,
struct uart_8250_port *port, int idx)
@@ -2726,31 +2576,6 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.setup = pci_brcm_trumanage_setup,
},
- {
- .vendor = 0x1c29,
- .device = 0x1104,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- .setup = pci_fintek_setup,
- .init = pci_fintek_init,
- },
- {
- .vendor = 0x1c29,
- .device = 0x1108,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- .setup = pci_fintek_setup,
- .init = pci_fintek_init,
- },
- {
- .vendor = 0x1c29,
- .device = 0x1112,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- .setup = pci_fintek_setup,
- .init = pci_fintek_init,
- },
-
/*
* Default "match everything" terminator entry
*/
@@ -2952,9 +2777,6 @@ enum pci_board_num_t {
pbn_omegapci,
pbn_NETMOS9900_2s_115200,
pbn_brcm_trumanage,
- pbn_fintek_4,
- pbn_fintek_8,
- pbn_fintek_12,
pbn_wch384_4,
pbn_pericom_PI7C9X7951,
pbn_pericom_PI7C9X7952,
@@ -3757,24 +3579,6 @@ static struct pciserial_board pci_boards[] = {
.reg_shift = 2,
.base_baud = 115200,
},
- [pbn_fintek_4] = {
- .num_ports = 4,
- .uart_offset = 8,
- .base_baud = 115200,
- .first_offset = 0x40,
- },
- [pbn_fintek_8] = {
- .num_ports = 8,
- .uart_offset = 8,
- .base_baud = 115200,
- .first_offset = 0x40,
- },
- [pbn_fintek_12] = {
- .num_ports = 12,
- .uart_offset = 8,
- .base_baud = 115200,
- .first_offset = 0x40,
- },
[pbn_wch384_4] = {
.flags = FL_BASE0,
.num_ports = 4,
@@ -3829,6 +3633,11 @@ static const struct pci_device_id blacklist[] = {
{ PCI_VDEVICE(INTEL, 0x081d), },
{ PCI_VDEVICE(INTEL, 0x1191), },
{ PCI_VDEVICE(INTEL, 0x19d8), },
+
+ /* Fintek F81504/508/512. It'll handle by MFD f81504-core.c */
+ { PCI_DEVICE(0x1c29, 0x1104), },
+ { PCI_DEVICE(0x1c29, 0x1108), },
+ { PCI_DEVICE(0x1c29, 0x1112), },
};
/*
@@ -5610,11 +5419,6 @@ static struct pci_device_id serial_pci_tbl[] = {
0,
0, pbn_exar_XR17V358 },
- /* Fintek PCI serial cards */
- { PCI_DEVICE(0x1c29, 0x1104), .driver_data = pbn_fintek_4 },
- { PCI_DEVICE(0x1c29, 0x1108), .driver_data = pbn_fintek_8 },
- { PCI_DEVICE(0x1c29, 0x1112), .driver_data = pbn_fintek_12 },
-
/*
* These entries match devices with class COMMUNICATION_SERIAL,
* COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread