Commit ad234e2b authored by Yu Tu's avatar Yu Tu Committed by Greg Kroah-Hartman
Browse files

tty: serial: meson: Drop the legacy compatible strings and clock code 



All mainline .dts files have been using the stable UART since Linux
4.16. Drop the legacy compatible strings and related clock code.

Signed-off-by: default avatarYu Tu <yu.tu@amlogic.com>
Link: https://lore.kernel.org/r/20211230102110.3861-2-yu.tu@amlogic.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3b27e2f

drivers/tty/serial/meson_uart.c

+2 −32
Original line number Diff line number Diff line
@@ -622,10 +622,7 @@ meson_serial_early_console_setup(struct earlycon_device *device, const char *opt 
	device->con->write = meson_serial_early_console_write;

	return 0;

}

/* Legacy bindings, should be removed when no more used */

OF_EARLYCON_DECLARE(meson, "amlogic,meson-uart",

		    meson_serial_early_console_setup);

/* Stable bindings */



OF_EARLYCON_DECLARE(meson, "amlogic,meson-ao-uart",

		    meson_serial_early_console_setup);
@@ -668,25 +665,6 @@ static inline struct clk *meson_uart_probe_clock(struct device *dev, 
	return clk;

}



/*

 * This function gets clocks in the legacy non-stable DT bindings.

 * This code will be remove once all the platforms switch to the

 * new DT bindings.

 */

static int meson_uart_probe_clocks_legacy(struct platform_device *pdev,

					  struct uart_port *port)

{

	struct clk *clk = NULL;



	clk = meson_uart_probe_clock(&pdev->dev, NULL);

	if (IS_ERR(clk))

		return PTR_ERR(clk);



	port->uartclk = clk_get_rate(clk);



	return 0;

}



static int meson_uart_probe_clocks(struct platform_device *pdev,

				   struct uart_port *port)

{
@@ -755,12 +733,7 @@ static int meson_uart_probe(struct platform_device *pdev) 
	if (!port)

		return -ENOMEM;



	/* Use legacy way until all platforms switch to new bindings */

	if (of_device_is_compatible(pdev->dev.of_node, "amlogic,meson-uart"))

		ret = meson_uart_probe_clocks_legacy(pdev, port);

	else

	ret = meson_uart_probe_clocks(pdev, port);



	if (ret)

		return ret;
@@ -805,9 +778,6 @@ static int meson_uart_remove(struct platform_device *pdev) 
}



static const struct of_device_id meson_uart_dt_match[] = {

	/* Legacy bindings, should be removed when no more used */

	{ .compatible = "amlogic,meson-uart" },

	/* Stable bindings */

	{ .compatible = "amlogic,meson6-uart" },

	{ .compatible = "amlogic,meson8-uart" },

	{ .compatible = "amlogic,meson8b-uart" },