diff mbox series

[v2,3/9] serial: msm_geni: Use upstream Linux bindings

Message ID 20230327-qc_cleanups-v2-3-9a80cc563c76@linaro.org
State New
Headers show
Series Qualcomm cleanups / preparations | expand

Commit Message

Konrad Dybcio March 27, 2023, 10:45 a.m. UTC 
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.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 arch/arm/dts/sdm845.dtsi                            | 4 ++--
 doc/device-tree-bindings/serial/msm-geni-serial.txt | 2 +-
 drivers/serial/serial_msm_geni.c                    | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/arch/arm/dts/sdm845.dtsi b/arch/arm/dts/sdm845.dtsi
index 607af277f8be..92bdc82177d6 100644
--- 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 9eadc2561b4b..eaa39c949b10 100644
--- 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 3943ca43e49e..6c9371c4e69d 100644
--- a/drivers/serial/serial_msm_geni.c
+++ b/drivers/serial/serial_msm_geni.c
@@ -189,7 +189,7 @@  static int geni_serial_set_clock_rate(struct udevice *dev, u64 rate)
 	struct clk *clk;
 	int ret;
 
-	clk = devm_clk_get(dev, "se-clk");
+	clk = devm_clk_get(dev, "se");
 	if (!clk)
 		return -EINVAL;
 
@@ -554,7 +554,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",