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

Commit 45d45978 authored by Gustavo Solaira's avatar Gustavo Solaira
Browse files

ARM: dts: msm: Enable uart1 and uart3 on mdmcalifornium CCARD boards 



Add support for using the uart1 and uart3 ports as serial on
mdmcalifornium ccard boards and reverse order via alias so that
console remains at uart3.

Change-Id: I72743dcb16c3cc364d09a1c3672cab71200ea8e4
Signed-off-by: default avatarGustavo Solaira <gustavos@codeaurora.org>
parent 1d2e9200

arch/arm/boot/dts/qcom/mdmcalifornium-ccard.dtsi

+21 −1
Original line number Diff line number Diff line
@@ -14,6 +14,13 @@ 
#include "mdmcalifornium-v1.1.dtsi"

#include "mdmcalifornium-pinctrl.dtsi"



/ {

	aliases {

		serial0 = &blsp1_uart3;

		serial1 = &blsp1_uart1;

	};

};



&soc {

	sound {

		status = "disabled";
@@ -89,6 +96,7 @@ 


	/* 4V regulator for peripherals */

	periph_vreg: regulator-periph-lm53635 {

		status = "disabled";

		compatible = "regulator-fixed";

		regulator-name = "periph_vreg";

		startup-delay-us = <4000>;
@@ -182,9 +190,16 @@ 
	/delete-property/ vdd-wlan-xtal-aon-supply;

};



/* BLE serial (no HCI) */

&blsp1_uart1 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_console_active>;

};



/* Console conflicts with periph_vreg (GPIO_9) */

&blsp1_uart3 {

	status = "disabled";

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_console_active>;

};
@@ -236,6 +251,11 @@ 
	qcom,charging-disabled;

};



/* Needed by blsp1_uart1 (BLE) */

&pmdcalifornium_l13 {

	regulator-always-on;

};



&pmdcalifornium_gpios {

	gpio@c000 { /* GPIO 1 - PCIESW_EN */

		status = "ok";

arch/arm/boot/dts/qcom/mdmcalifornium-pinctrl.dtsi

+13 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, 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
@@ -20,6 +20,18 @@ 
		interrupt-controller;

		#interrupt-cells = <2>;



		uart1_console_active: uart1_console_active {

			mux {

				pins = "gpio0", "gpio1";

				function = "blsp_uart1";

			};

			config {

				pins = "gpio0", "gpio1";

				drive-strength = <2>;

				bias-disable;

			};

		};



		uart2_console_active: uart2_console_active {

			mux {

				pins = "gpio4", "gpio5";

arch/arm/boot/dts/qcom/mdmcalifornium.dtsi

+11 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, 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
@@ -607,6 +607,16 @@ 
			qcom,mhi-use-gsi;

	};



	blsp1_uart1: serial@78af000 {

		compatible = "qcom,msm-lsuart-v14";

		reg = <0x78af000 0x200>;

		interrupts = <0 107 0>;

		clocks = <&clock_gcc clk_gcc_blsp1_uart1_apps_clk>,

			 <&clock_gcc clk_gcc_blsp1_ahb_clk>;

		clock-names = "core_clk", "iface_clk";

		status = "disabled";

	};



	blsp1_uart2: serial@78b0000 {

		compatible = "qcom,msm-lsuart-v14";

		reg = <0x78b0000 0x200>;