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

Commit 9d8022ff authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable spi4 instead of spi1 for mdmcalifornium CCARD boards"

parents a406d572 6596ab38

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

+3 −3
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
@@ -281,7 +281,7 @@ 
		pinctrl-1 = <&spi_3_sleep>;

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

		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,

			 <&clock_gcc clk_gcc_blsp1_qup2_spi_apps_clk>;

			 <&clock_gcc clk_gcc_blsp1_qup3_spi_apps_clk>;

		status = "disabled";

	};
@@ -306,7 +306,7 @@ 
		pinctrl-1 = <&spi_4_sleep>;

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

		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,

			 <&clock_gcc clk_gcc_blsp1_qup3_spi_apps_clk>;

			 <&clock_gcc clk_gcc_blsp1_qup4_spi_apps_clk>;

		status = "disabled";

	};

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

+3 −3
Original line number Diff line number Diff line
@@ -237,9 +237,9 @@ 
	};

};



&spi_2 {

	status = "disabled";

	spi-max-frequency = <19200000>;

&spi_4 {

	status = "ok";

	/delete-property/ qcom,use-bam;

};



&usb3 {

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

+32 −16
Original line number Diff line number Diff line
@@ -242,12 +242,14 @@ 
		spi_1 {

			spi_1_active: spi_1_active {

				mux {

					pins = "gpio0", "gpio1", "gpio3";

					pins = "gpio0", "gpio1", "gpio2",

						"gpio3";

					function = "blsp_spi1";

				};



				config {

					pins = "gpio0", "gpio1", "gpio3";

					pins = "gpio0", "gpio1", "gpio2",

						"gpio3";

					drive-strength = <6>;

					bias-disable;

				};
@@ -255,12 +257,14 @@ 


			spi_1_sleep: spi_1_sleep {

				mux {

					pins = "gpio0", "gpio1", "gpio3";

					pins = "gpio0", "gpio1", "gpio2",

						"gpio3";

					function = "blsp_spi1";

				};



				config {

					pins = "gpio0", "gpio1", "gpio3";

					pins = "gpio0", "gpio1", "gpio2",

						"gpio3";

					drive-strength = <6>;

					bias-disable;

				};
@@ -270,12 +274,14 @@ 
		spi_2 {

			spi_2_active: spi_2_active {

				mux {

					pins = "gpio4", "gpio5", "gpio7";

					pins = "gpio4", "gpio5", "gpio6",

						"gpio7";

					function = "blsp_spi2";

				};



				config {

					pins = "gpio4", "gpio5", "gpio7";

					pins = "gpio4", "gpio5", "gpio6",

						"gpio7";

					drive-strength = <6>;

					bias-disable;

				};
@@ -283,12 +289,14 @@ 


			spi_2_sleep: spi_2_sleep {

				mux {

					pins = "gpio4", "gpio5", "gpio7";

					pins = "gpio4", "gpio5", "gpio6",

						"gpio7";

					function = "blsp_spi2";

				};



				config {

					pins = "gpio4", "gpio5", "gpio7";

					pins = "gpio4", "gpio5", "gpio6",

						"gpio7";

					drive-strength = <6>;

					bias-disable;

				};
@@ -298,12 +306,14 @@ 
		spi_3 {

			spi_3_active: spi_3_active {

				mux {

					pins = "gpio8", "gpio9", "gpio11";

					pins = "gpio8", "gpio9", "gpio10",

						"gpio11";

					function = "blsp_spi3";

				};



				config {

					pins = "gpio8", "gpio9", "gpio11";

					pins = "gpio8", "gpio9", "gpio10",

						"gpio11";

					drive-strength = <6>;

					bias-disable;

				};
@@ -311,12 +321,14 @@ 


			spi_3_sleep: spi_3_sleep {

				mux {

					pins = "gpio8", "gpio9", "gpio11";

					pins = "gpio8", "gpio9", "gpio10",

						"gpio11";

					function = "blsp_spi3";

				};



				config {

					pins = "gpio8", "gpio9", "gpio11";

					pins = "gpio8", "gpio9", "gpio10",

						"gpio11";

					drive-strength = <6>;

					bias-disable;

				};
@@ -326,12 +338,14 @@ 
		spi_4 {

			spi_4_active: spi_4_active {

				mux {

					pins = "gpio16", "gpio17", "gpio19";

					pins = "gpio16", "gpio17", "gpio18",

						"gpio19";

					function = "blsp_spi4";

				};



				config {

					pins = "gpio16", "gpio17", "gpio19";

					pins = "gpio16", "gpio17", "gpio18",

						"gpio19";

					drive-strength = <6>;

					bias-disable;

				};
@@ -339,12 +353,14 @@ 


			spi_4_sleep: spi_4_sleep {

				mux {

					pins = "gpio16", "gpio17", "gpio19";

					pins = "gpio16", "gpio17", "gpio18",

						"gpio19";

					function = "blsp_spi4";

				};



				config {

					pins = "gpio16", "gpio17", "gpio19";

					pins = "gpio16", "gpio17", "gpio18",

						"gpio19";

					drive-strength = <6>;

					bias-disable;

				};