Amlogic T7 SoCs uses the same UART controller as S4 SoCs and G12A.
There is no need for an extra compatible line in the driver, but
add T7 compatible line for documentation.
Signed-off-by: Lucas Tanure <[email protected]>
Acked-by: Krzysztof Kozlowski <[email protected]>
---
Since v8:
- Fix issues with git send-mail command line
Since v7:
- Send to the correct maintainers
.../devicetree/bindings/serial/amlogic,meson-uart.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
index f1ae8c4934d9..2e189e548327 100644
--- a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
+++ b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
@@ -52,6 +52,10 @@ properties:
items:
- const: amlogic,meson-g12a-uart
- const: amlogic,meson-gx-uart
+ - description: UART controller on S4 compatible SoCs
+ items:
+ - const: amlogic,t7-uart
+ - const: amlogic,meson-s4-uart
reg:
maxItems: 1
--
2.41.0
The new Amlogic T7 SoC does not have a always-on uart,
so add OF_EARLYCON_DECLARE for it.
Signed-off-by: Lucas Tanure <[email protected]>
Acked-by: Neil Armstrong <[email protected]>
---
Since v8:
- Fix issues with git send-mail command line
Since v7:
- Send to the correct maintainers
drivers/tty/serial/meson_uart.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
index 790d910dafa5..c4f61d82fb72 100644
--- a/drivers/tty/serial/meson_uart.c
+++ b/drivers/tty/serial/meson_uart.c
@@ -648,6 +648,8 @@ meson_serial_early_console_setup(struct earlycon_device *device, const char *opt
OF_EARLYCON_DECLARE(meson, "amlogic,meson-ao-uart",
meson_serial_early_console_setup);
+OF_EARLYCON_DECLARE(meson, "amlogic,t7-uart",
+ meson_serial_early_console_setup);
#define MESON_SERIAL_CONSOLE_PTR(_devname) (&meson_serial_console_##_devname)
#else
--
2.41.0
On Sat, Aug 26, 2023 at 07:07:18PM +0100, Lucas Tanure wrote:
> On 23-08-2023 09:29, Dmitry Rokosov wrote:
> > Hello Lucas,
> >
> > Thank you for the patch! Please find my small comment below.
> >
> > On Mon, Aug 14, 2023 at 09:01:28AM +0100, Lucas Tanure wrote:
> > > The new Amlogic T7 SoC does not have a always-on uart,
> > > so add OF_EARLYCON_DECLARE for it.
> > >
> > > Signed-off-by: Lucas Tanure <[email protected]>
> > > Acked-by: Neil Armstrong <[email protected]>
> > > ---
> > > Since v8:
> > > - Fix issues with git send-mail command line
> > > Since v7:
> > > - Send to the correct maintainers
> > >
> > > drivers/tty/serial/meson_uart.c | 2 ++
> > > 1 file changed, 2 insertions(+)
> > >
> > > diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
> > > index 790d910dafa5..c4f61d82fb72 100644
> > > --- a/drivers/tty/serial/meson_uart.c
> > > +++ b/drivers/tty/serial/meson_uart.c
> > > @@ -648,6 +648,8 @@ meson_serial_early_console_setup(struct earlycon_device *device, const char *opt
> > > OF_EARLYCON_DECLARE(meson, "amlogic,meson-ao-uart",
> > > meson_serial_early_console_setup);
> > > +OF_EARLYCON_DECLARE(meson, "amlogic,t7-uart",
> > > + meson_serial_early_console_setup);
> > > #define MESON_SERIAL_CONSOLE_PTR(_devname) (&meson_serial_console_##_devname)
> > > #else
> >
> > I suppose you need to add a separate meson_t7_uart_data to switch the T7
> > UART to a regular TTY devname 'ttyS'. For the new Amlogic SoCs, we have
> > agreed to use 'ttyS' instead of 'ttyAML'. Please refer to the already
> > applied patch series at [1] and the IRC discussion at [2].
> >
> > Links:
> > [1] https://lore.kernel.org/all/[email protected]/
> > [2] https://libera.irclog.whitequark.org/linux-amlogic/2023-07-03
> >
> I asked Greg to drop this patch as is not need anymore.
> T7 will use S4 TTY/UART code.
I can't drop it, I need a revert :(