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

Commit 8b5bb77c authored Feb 12, 2017 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Feb 12, 2017

Merge "ARM: dts: msm: disable SPI9 in APQ8096 drone"

parents b656a873 fb609537

arch/arm/boot/dts/qcom/apq8096-drone-sensors.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -105,11 +105,11 @@
		pinctrl-names = "i2c_active", "i2c_sleep";
		pinctrl-0 = <&i2c_3_active>;
		pinctrl-1 = <&i2c_3_sleep>;
		status = "ok";
		status = "disabled";
		};

		i2c_7: i2c@75b5000 { /* BLSP2 QUP1 */
		status = "ok";
		status = "disabled";
		};

		blsp2_uart3: uart@075b1000 { /* HW-BLSP9 = BLSP2 UART3 */

arch/arm/boot/dts/qcom/apq8096-v3-drone.dts

+1 −6

Original line number	Diff line number	Diff line
		/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2016-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
		@@ -24,8 +24,3 @@
		<246 0x30001>, <291 0x30001>;
		qcom,board-id = <8 3>;
		};

		&spi_9 {
		status = "ok";
		};