Merge "ARM: dts: msm: Remove unwanted compatible string for QUPV3 UART" (08ac1b04) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/sdm670-qupv3.dtsi

+6 −6

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -32,7 +32,7 @@
		* instances only.
		*/
		qupv3_se6_4uart: qcom,qup_uart@0x898000 {
		compatible = "qcom,msm-geni-serial-hs", "qcom,msm-geni-uart";
		compatible = "qcom,msm-geni-serial-hs";
		reg = <0x898000 0x4000>;
		reg-names = "se_phys";
		clock-names = "se-clk", "m-ahb", "s-ahb";
		@@ -52,7 +52,7 @@
		};

		qupv3_se7_4uart: qcom,qup_uart@0x89c000 {
		compatible = "qcom,msm-geni-serial-hs", "qcom,msm-geni-uart";
		compatible = "qcom,msm-geni-serial-hs";
		reg = <0x89c000 0x4000>;
		reg-names = "se_phys";
		clock-names = "se-clk", "m-ahb", "s-ahb";
		@@ -425,7 +425,7 @@

		/* Debug UART Instance for CDP/MTP platform */
		qupv3_se9_2uart: qcom,qup_uart@0xa84000 {
		compatible = "qcom,msm-geni-console", "qcom,msm-geni-uart";
		compatible = "qcom,msm-geni-console";
		reg = <0xa84000 0x4000>;
		reg-names = "se_phys";
		clock-names = "se-clk", "m-ahb", "s-ahb";
		@@ -442,7 +442,7 @@

		/* Debug UART Instance for RUMI platform */
		qupv3_se10_2uart: qcom,qup_uart@0xa88000 {
		compatible = "qcom,msm-geni-console", "qcom,msm-geni-uart";
		compatible = "qcom,msm-geni-console";
		reg = <0xa88000 0x4000>;
		reg-names = "se_phys";
		clock-names = "se-clk", "m-ahb", "s-ahb";
		@@ -459,7 +459,7 @@

		/* Debug UART Instance for CDP/MTP platform on SDM670 */
		qupv3_se12_2uart: qcom,qup_uart@0xa90000 {
		compatible = "qcom,msm-geni-console", "qcom,msm-geni-uart";
		compatible = "qcom,msm-geni-console";
		reg = <0xa90000 0x4000>;
		reg-names = "se_phys";
		clock-names = "se-clk", "m-ahb", "s-ahb";

arch/arm64/boot/dts/qcom/sdm845-qupv3.dtsi

+5 −5

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -32,7 +32,7 @@
		* instances only.
		*/
		qupv3_se6_4uart: qcom,qup_uart@0x898000 {
		compatible = "qcom,msm-geni-serial-hs", "qcom,msm-geni-uart";
		compatible = "qcom,msm-geni-serial-hs";
		reg = <0x898000 0x4000>;
		reg-names = "se_phys";
		clock-names = "se-clk", "m-ahb", "s-ahb";
		@@ -50,7 +50,7 @@
		};

		qupv3_se7_4uart: qcom,qup_uart@0x89c000 {
		compatible = "qcom,msm-geni-serial-hs", "qcom,msm-geni-uart";
		compatible = "qcom,msm-geni-serial-hs";
		reg = <0x89c000 0x4000>;
		reg-names = "se_phys";
		clock-names = "se-clk", "m-ahb", "s-ahb";
		@@ -423,7 +423,7 @@

		/* Debug UART Instance for CDP/MTP platform */
		qupv3_se9_2uart: qcom,qup_uart@0xa84000 {
		compatible = "qcom,msm-geni-console", "qcom,msm-geni-uart";
		compatible = "qcom,msm-geni-console";
		reg = <0xa84000 0x4000>;
		reg-names = "se_phys";
		clock-names = "se-clk", "m-ahb", "s-ahb";
		@@ -440,7 +440,7 @@

		/* Debug UART Instance for RUMI platform */
		qupv3_se10_2uart: qcom,qup_uart@0xa88000 {
		compatible = "qcom,msm-geni-console", "qcom,msm-geni-uart";
		compatible = "qcom,msm-geni-console";
		reg = <0xa88000 0x4000>;
		reg-names = "se_phys";
		clock-names = "se-clk", "m-ahb", "s-ahb";

drivers/tty/serial/msm_geni_serial.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -2136,7 +2136,7 @@ msm_geni_serial_earlycon_setup(struct earlycon_device *dev,
		exit_geni_serial_earlyconsetup:
		return ret;
		}
		OF_EARLYCON_DECLARE(msm_geni_serial, "qcom,msm-geni-uart",
		OF_EARLYCON_DECLARE(msm_geni_serial, "qcom,msm-geni-console",
		msm_geni_serial_earlycon_setup);

		static int console_register(struct uart_driver *drv)
		@@ -2658,17 +2658,12 @@ static const struct dev_pm_ops msm_geni_serial_pm_ops = {
		.resume_noirq = msm_geni_serial_sys_resume_noirq,
		};

		static const struct of_device_id msm_geni_serial_match_table[] = {
		{ .compatible = "qcom,msm-geni-uart"},
		{},
		};

		static struct platform_driver msm_geni_serial_platform_driver = {
		.remove = msm_geni_serial_remove,
		.probe = msm_geni_serial_probe,
		.driver = {
		.name = "msm_geni_serial",
		.of_match_table = msm_geni_serial_match_table,
		.of_match_table = msm_geni_device_tbl,
		.pm = &msm_geni_serial_pm_ops,
		},
		};