serial: msm-geni: Use upstream Linux bindings

The name "se" is used in upstream Linux device trees and has been for
ages, long before this U-Boot-ism was introduced. Same goes for the
existing compatible. Get rid of that.

[vzapolskiy: removed a ready change in the driver]
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>

diff --git a/arch/arm/dts/sdm845.dtsi b/arch/arm/dts/sdm845.dtsi
index 607af277f8be9e5aa12d37973727210555fb4dd1..92bdc82177d6d058c759d7cd55b241765e090267 100644 (file)
--- a/arch/arm/dts/sdm845.dtsi
+++ b/arch/arm/dts/sdm845.dtsi
@@ -52,10 +52,10 @@
                };
 
                debug_uart: serial@a84000 {
-                       compatible = "qcom,msm-geni-uart";
+                       compatible = "qcom,geni-debug-uart";
                        reg = <0xa84000 0x4000>;
                        reg-names = "se_phys";
-                       clock-names = "se-clk";
+                       clock-names = "se";
                        clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&qup_uart9>;

diff --git a/doc/device-tree-bindings/serial/msm-geni-serial.txt b/doc/device-tree-bindings/serial/msm-geni-serial.txt
index 9eadc2561b4b7d78200d9663cb4eeb497deb7153..eaa39c949b1072e34dc253b2a7e3b74ae352b7df 100644 (file)
--- a/doc/device-tree-bindings/serial/msm-geni-serial.txt
+++ b/doc/device-tree-bindings/serial/msm-geni-serial.txt
@@ -1,6 +1,6 @@
 Qualcomm GENI UART
 
 Required properties:
-- compatible: must be "qcom,msm-geni-uart"
+- compatible: must be "qcom,geni-debug-uart"
 - reg: start address and size of the registers
 - clock: interface clock (must accept baudrate as a frequency)

diff --git a/drivers/serial/serial_msm_geni.c b/drivers/serial/serial_msm_geni.c
index 3a200f45a6cea7493f50a1cb853f7ca6e5199893..29fae810d6feb89d85eafbed40b2802aa9c16237 100644 (file)
--- a/drivers/serial/serial_msm_geni.c
+++ b/drivers/serial/serial_msm_geni.c
@@ -547,7 +547,9 @@ static int msm_serial_ofdata_to_platdata(struct udevice *dev)
 }
 
 static const struct udevice_id msm_serial_ids[] = {
-       {.compatible = "qcom,msm-geni-uart"}, {}};
+       { .compatible = "qcom,geni-debug-uart" },
+       { }
+};
 
 U_BOOT_DRIVER(serial_msm_geni) = {
        .name = "serial_msm_geni",