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

Commit 2fb2d4f0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Avoid conflict in I2C nodes for sdxprairie"

parents d1d3064e 6208f195

arch/arm64/boot/dts/qcom/sdxprairie-blsp.dtsi

+4 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, 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
@@ -128,7 +128,7 @@ 
		status = "disabled";

	};



	i2c_5: i2c@835000 { /* BLSP1 QUP1: GPIO: 82,83 */

	i2c_5: i2cb@835000 { /* BLSP1 QUP1: GPIO: 82,83 */

		compatible = "qcom,i2c-msm-v2";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -151,7 +151,7 @@ 
		status = "disabled";

	};



	i2c_6: i2c@836000 { /* BLSP1 QUP2: GPIO: 65,66 */

	i2c_6: i2cb@836000 { /* BLSP1 QUP2: GPIO: 65,66 */

		compatible = "qcom,i2c-msm-v2";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -174,7 +174,7 @@ 
		status = "disabled";

	};



	i2c_7: i2c@838000 { /* BLSP1 QUP4: GPIO: 18,19 */

	i2c_7: i2cb@838000 { /* BLSP1 QUP4: GPIO: 18,19 */

		compatible = "qcom,i2c-msm-v2";

		#address-cells = <1>;

		#size-cells = <0>;