diff options
| author | Konrad Dybcio <konrad.dybcio@linaro.org> | 2023-04-21 20:50:39 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-05-02 14:23:58 -0400 |
| commit | aa539d89e18487ab5dc5feb3d8d8a3fca1a04b97 (patch) | |
| tree | 022fec451e052dc70645ae496955d8b44be173af | |
| parent | babdadc8a51ec54157d9e050eaf3f745052e1583 (diff) | |
| download | u-boot-aa539d89e18487ab5dc5feb3d8d8a3fca1a04b97.zip u-boot-aa539d89e18487ab5dc5feb3d8d8a3fca1a04b97.tar.gz u-boot-aa539d89e18487ab5dc5feb3d8d8a3fca1a04b97.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/dts/sdm845.dtsi | 4 | ||||
| -rw-r--r-- | doc/device-tree-bindings/serial/msm-geni-serial.txt | 2 | ||||
| -rw-r--r-- | drivers/serial/serial_msm_geni.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/dts/sdm845.dtsi b/arch/arm/dts/sdm845.dtsi index 607af27..92bdc82 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 9eadc25..eaa39c9 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 3a200f4..29fae81 100644 --- 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", |