Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d73bdfb authored by Avaneesh Kumar Dwivedi's avatar Avaneesh Kumar Dwivedi
Browse files

ARM: dts: msm: Fix serial driver device tree node for qcs405 



Use UART2 for serial logging instead of UART1 and update corresponding
TLMM ping configuration.

Change-Id: Iddfe65ad731a93861f5ab013258916c0de8fb0ae
Signed-off-by: default avatarAvaneesh Kumar Dwivedi <akdwived@codeaurora.org>
parent 55c3d32b

arch/arm64/boot/dts/qcom/qcs405-pinctrl.dtsi

+22 −9
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
&soc {

	tlmm: pinctrl@1000000 {

		compatible = "qcom,qcs405-pinctrl";

		reg = <0x1000000 0x300000>;

		reg = <0x1000000 0x500000>;

		interrupts-extended = <&wakegic GIC_SPI 208 IRQ_TYPE_NONE>;

		gpio-controller;

		#gpio-cells = <2>;
@@ -22,30 +22,43 @@ 
		interrupt-parent = <&wakegpio>;

		#interrupt-cells = <2>;



		pmx-uartconsole {

			uart_console_active: uart_console_active {

		blsp1_uart2_console {

			blsp_uart_tx_a2_active: blsp_uart_tx_a2_active {

				mux {

					pins = "gpio17", "gpio18";

					function = "blsp1_uart2";

					pins = "gpio17";

					function = "blsp_uart_tx_a2";

				};



				config {

					pins = "gpio17", "gpio18";

					pins = "gpio17";

					drive-strength = <2>;

					bias-disable;

				};

			};



			blsp_uart_rx_a2_active: blsp_uart_rx_a2_active {

				mux {

					pins = "gpio18";

					function = "blsp_uart_rx_a2";

				};



				config {

					pins = "gpio18";

					drive-strength = <2>;

					bias-disable;

				};

			};



			uart_console_sleep: uart_console_sleep {

			blsp_uart_tx_rx_a2_sleep: blsp_uart_tx_rx_a2_sleep {

				mux {

					pins = "gpio17", "gpio18";

					function = "blsp1_uart2";

					function = "gpio";

				};



				config {

					pins = "gpio17", "gpio18";

					drive-strength = <2>;

					bias-pull-down;

					bias-disable;

				};

			};

		};

arch/arm64/boot/dts/qcom/qcs405.dtsi

+8 −5
Original line number Diff line number Diff line
@@ -348,14 +348,17 @@ 
		status = "disabled";

	};



	blsp1_uart1: serial@78b0000 {

	blsp1_uart2_console: serial@78b1000 {

		compatible = "qcom,msm-uartdm", "qcom,msm-uartdm-v1.4";

		reg = <0x78b0000 0x200>;

		interrupts = <0 108 0>;



		clocks = <&clock_gcc GCC_BLSP1_UART1_APPS_CLK>,

		reg = <0x78b1000 0x200>;

		interrupts = <0 118 0>;

		clocks = <&clock_gcc GCC_BLSP1_UART2_APPS_CLK>,

			<&clock_gcc GCC_BLSP1_AHB_CLK>;

		clock-names = "core", "iface";

		pinctrl-names = "active", "sleep";

		pinctrl-0 = <&blsp_uart_tx_a2_active

			     &blsp_uart_rx_a2_active>;

		pinctrl-1 = <&blsp_uart_tx_rx_a2_sleep>;

		status = "okay";

	};