diff options
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio-exar.txt | 5 | ||||
| -rw-r--r-- | drivers/gpio/gpio-exar.c | 2 | ||||
| -rw-r--r-- | drivers/tty/serial/8250/8250_exar.c | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/gpio/gpio-exar.txt b/Documentation/devicetree/bindings/gpio/gpio-exar.txt new file mode 100644 index 000000000000..4540d61824af --- /dev/null +++ b/Documentation/devicetree/bindings/gpio/gpio-exar.txt | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | Exportable MPIO interface of Exar UART chips | ||
| 2 | |||
| 3 | Required properties of the device: | ||
| 4 | - exar,first-pin: first exportable pins (0..15) | ||
| 5 | - ngpios: number of exportable pins (1..16) | ||
diff --git a/drivers/gpio/gpio-exar.c b/drivers/gpio/gpio-exar.c index fb8d304cfa17..0ecd2369c2ca 100644 --- a/drivers/gpio/gpio-exar.c +++ b/drivers/gpio/gpio-exar.c | |||
| @@ -132,7 +132,7 @@ static int gpio_exar_probe(struct platform_device *pdev) | |||
| 132 | if (!p) | 132 | if (!p) |
| 133 | return -ENOMEM; | 133 | return -ENOMEM; |
| 134 | 134 | ||
| 135 | ret = device_property_read_u32(&pdev->dev, "linux,first-pin", | 135 | ret = device_property_read_u32(&pdev->dev, "exar,first-pin", |
| 136 | &first_pin); | 136 | &first_pin); |
| 137 | if (ret) | 137 | if (ret) |
| 138 | return ret; | 138 | return ret; |
diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c index b5c98e5bf524..c6360fbdf808 100644 --- a/drivers/tty/serial/8250/8250_exar.c +++ b/drivers/tty/serial/8250/8250_exar.c | |||
| @@ -261,7 +261,7 @@ __xr17v35x_register_gpio(struct pci_dev *pcidev, | |||
| 261 | } | 261 | } |
| 262 | 262 | ||
| 263 | static const struct property_entry exar_gpio_properties[] = { | 263 | static const struct property_entry exar_gpio_properties[] = { |
| 264 | PROPERTY_ENTRY_U32("linux,first-pin", 0), | 264 | PROPERTY_ENTRY_U32("exar,first-pin", 0), |
| 265 | PROPERTY_ENTRY_U32("ngpios", 16), | 265 | PROPERTY_ENTRY_U32("ngpios", 16), |
| 266 | { } | 266 | { } |
| 267 | }; | 267 | }; |
| @@ -326,7 +326,7 @@ static int iot2040_rs485_config(struct uart_port *port, | |||
| 326 | } | 326 | } |
| 327 | 327 | ||
| 328 | static const struct property_entry iot2040_gpio_properties[] = { | 328 | static const struct property_entry iot2040_gpio_properties[] = { |
| 329 | PROPERTY_ENTRY_U32("linux,first-pin", 10), | 329 | PROPERTY_ENTRY_U32("exar,first-pin", 10), |
| 330 | PROPERTY_ENTRY_U32("ngpios", 1), | 330 | PROPERTY_ENTRY_U32("ngpios", 1), |
| 331 | { } | 331 | { } |
| 332 | }; | 332 | }; |
