| Message ID | 20170607200439.24450-6-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, Jun 07, 2017 at 10:04:29PM +0200, Paul Cercueil wrote: > The JZ4770 SoC's UART is no different from the other JZ SoCs, so this > commit simply adds the ingenic,jz4770-uart compatible string. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > Documentation/devicetree/bindings/serial/ingenic,uart.txt | 3 ++- > drivers/tty/serial/8250/8250_ingenic.c | 5 +++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/serial/ingenic,uart.txt b/Documentation/devicetree/bindings/serial/ingenic,uart.txt > index 02cb7fe59cb7..75fd8b314af9 100644 > --- a/Documentation/devicetree/bindings/serial/ingenic,uart.txt > +++ b/Documentation/devicetree/bindings/serial/ingenic,uart.txt > @@ -2,7 +2,8 @@ > > Required properties: > - compatible : "ingenic,jz4740-uart", "ingenic,jz4760-uart", > - "ingenic,jz4775-uart" or "ingenic,jz4780-uart" > + "ingenic,jz4770-uart", "ingenic,jz4775-uart" or > + "ingenic,jz4780-uart" If you respin, please reformat to 1 per line. Acked-by: Rob Herring <robh@kernel.org> -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/serial/ingenic,uart.txt b/Documentation/devicetree/bindings/serial/ingenic,uart.txt index 02cb7fe59cb7..75fd8b314af9 100644 --- a/Documentation/devicetree/bindings/serial/ingenic,uart.txt +++ b/Documentation/devicetree/bindings/serial/ingenic,uart.txt @@ -2,7 +2,8 @@ Required properties: - compatible : "ingenic,jz4740-uart", "ingenic,jz4760-uart", - "ingenic,jz4775-uart" or "ingenic,jz4780-uart" + "ingenic,jz4770-uart", "ingenic,jz4775-uart" or + "ingenic,jz4780-uart" - reg : offset and length of the register set for the device. - interrupts : should contain uart interrupt. - clocks : phandles to the module & baud clocks. diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c index 4d9dc10e265c..b31b2ca552d1 100644 --- a/drivers/tty/serial/8250/8250_ingenic.c +++ b/drivers/tty/serial/8250/8250_ingenic.c @@ -133,6 +133,10 @@ EARLYCON_DECLARE(jz4740_uart, ingenic_early_console_setup); OF_EARLYCON_DECLARE(jz4740_uart, "ingenic,jz4740-uart", ingenic_early_console_setup); +EARLYCON_DECLARE(jz4770_uart, ingenic_early_console_setup); +OF_EARLYCON_DECLARE(jz4770_uart, "ingenic,jz4770-uart", + ingenic_early_console_setup); + EARLYCON_DECLARE(jz4775_uart, ingenic_early_console_setup); OF_EARLYCON_DECLARE(jz4775_uart, "ingenic,jz4775-uart", ingenic_early_console_setup); @@ -327,6 +331,7 @@ static const struct ingenic_uart_config jz4780_uart_config = { static const struct of_device_id of_match[] = { { .compatible = "ingenic,jz4740-uart", .data = &jz4740_uart_config }, { .compatible = "ingenic,jz4760-uart", .data = &jz4760_uart_config }, + { .compatible = "ingenic,jz4770-uart", .data = &jz4760_uart_config }, { .compatible = "ingenic,jz4775-uart", .data = &jz4760_uart_config }, { .compatible = "ingenic,jz4780-uart", .data = &jz4780_uart_config }, { /* sentinel */ }
The JZ4770 SoC's UART is no different from the other JZ SoCs, so this commit simply adds the ingenic,jz4770-uart compatible string. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- Documentation/devicetree/bindings/serial/ingenic,uart.txt | 3 ++- drivers/tty/serial/8250/8250_ingenic.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-)