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

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

Merge "ARM: dts: qcom: add A2B I2C support on auto platforms"

parents a76475e8 e724cf3b

arch/arm64/boot/dts/qcom/sa6155-audio.dtsi

+10 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -12,6 +12,12 @@ 
 */

 */

#include "sm6150-lpi.dtsi"

#include "sm6150-lpi.dtsi"





/ {

	aliases {

		i2c7 = &qupv3_se8_i2c;

	};

};



&soc {

&soc {

	tdm_pri_rx: qcom,msm-dai-tdm-pri-rx {

	tdm_pri_rx: qcom,msm-dai-tdm-pri-rx {

		compatible = "qcom,msm-dai-tdm";

		compatible = "qcom,msm-dai-tdm";
@@ -597,3 +603,6 @@ 
	};

	};

};

};





&qupv3_se8_i2c {

	status = "ok";

};

arch/arm64/boot/dts/qcom/sa8155-audio.dtsi

+7 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -11,6 +11,12 @@ 
 * GNU General Public License for more details.

 * GNU General Public License for more details.

 */

 */





/ {

	aliases {

		i2c7 = &qupv3_se20_i2c;

	};

};



&soc {

&soc {

	tdm_pri_rx: qcom,msm-dai-tdm-pri-rx {

	tdm_pri_rx: qcom,msm-dai-tdm-pri-rx {

		compatible = "qcom,msm-dai-tdm";

		compatible = "qcom,msm-dai-tdm";

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -10,12 +10,6 @@ 
 * GNU General Public License for more details.

 * GNU General Public License for more details.

 */

 */





/ {

	aliases {

		i2c7 = &qupv3_se20_i2c;

	};

};



/* Remove regulator nodes specific to SA8155 */

/* Remove regulator nodes specific to SA8155 */

&soc {

&soc {

	/delete-node/ regulator-pm8150-s4;

	/delete-node/ regulator-pm8150-s4;