@@ -622,10 +622,7 @@ meson_serial_early_console_setup(struct earlycon_device *device, const char *opt
622
622
device -> con -> write = meson_serial_early_console_write ;
623
623
return 0 ;
624
624
}
625
- /* Legacy bindings, should be removed when no more used */
626
- OF_EARLYCON_DECLARE (meson , "amlogic,meson-uart" ,
627
- meson_serial_early_console_setup );
628
- /* Stable bindings */
625
+
629
626
OF_EARLYCON_DECLARE (meson , "amlogic,meson-ao-uart" ,
630
627
meson_serial_early_console_setup );
631
628
@@ -668,25 +665,6 @@ static inline struct clk *meson_uart_probe_clock(struct device *dev,
668
665
return clk ;
669
666
}
670
667
671
- /*
672
- * This function gets clocks in the legacy non-stable DT bindings.
673
- * This code will be remove once all the platforms switch to the
674
- * new DT bindings.
675
- */
676
- static int meson_uart_probe_clocks_legacy (struct platform_device * pdev ,
677
- struct uart_port * port )
678
- {
679
- struct clk * clk = NULL ;
680
-
681
- clk = meson_uart_probe_clock (& pdev -> dev , NULL );
682
- if (IS_ERR (clk ))
683
- return PTR_ERR (clk );
684
-
685
- port -> uartclk = clk_get_rate (clk );
686
-
687
- return 0 ;
688
- }
689
-
690
668
static int meson_uart_probe_clocks (struct platform_device * pdev ,
691
669
struct uart_port * port )
692
670
{
@@ -755,12 +733,7 @@ static int meson_uart_probe(struct platform_device *pdev)
755
733
if (!port )
756
734
return - ENOMEM ;
757
735
758
- /* Use legacy way until all platforms switch to new bindings */
759
- if (of_device_is_compatible (pdev -> dev .of_node , "amlogic,meson-uart" ))
760
- ret = meson_uart_probe_clocks_legacy (pdev , port );
761
- else
762
- ret = meson_uart_probe_clocks (pdev , port );
763
-
736
+ ret = meson_uart_probe_clocks (pdev , port );
764
737
if (ret )
765
738
return ret ;
766
739
@@ -805,9 +778,6 @@ static int meson_uart_remove(struct platform_device *pdev)
805
778
}
806
779
807
780
static const struct of_device_id meson_uart_dt_match [] = {
808
- /* Legacy bindings, should be removed when no more used */
809
- { .compatible = "amlogic,meson-uart" },
810
- /* Stable bindings */
811
781
{ .compatible = "amlogic,meson6-uart" },
812
782
{ .compatible = "amlogic,meson8-uart" },
813
783
{ .compatible = "amlogic,meson8b-uart" },
0 commit comments