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

Commit 87dc4c73 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: correct WSA8815 chip id"

parents d837d7de f51d0bcc

arch/arm/boot/dts/qcom/msm8937-wsa881x.dtsi

+5 −5
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, 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
@@ -30,15 +30,15 @@ 
				qcom,spkr-sd-n-gpio = <&tlmm 96 0>;

			};



			wsa881x_213: wsa881x@20170213 {

			wsa881x_213: wsa881x@21170213 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170213>;

				reg = <0x00 0x21170213>;

				qcom,spkr-sd-n-gpio = <&tlmm 96 0>;

			};



			wsa881x_214: wsa881x@20170214 {

			wsa881x_214: wsa881x@21170214 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170214>;

				reg = <0x00 0x21170214>;

				qcom,spkr-sd-n-gpio = <&tlmm 96 0>;

			};

		};

arch/arm/boot/dts/qcom/msm8952-wsa881x.dtsi

+5 −5
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, 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
@@ -30,15 +30,15 @@ 
				qcom,spkr-sd-n-gpio = <&msm_gpio 95 0>;

			};



			wsa881x_213: wsa881x@20170213 {

			wsa881x_213: wsa881x@21170213 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170213>;

				reg = <0x00 0x21170213>;

				qcom,spkr-sd-n-gpio = <&msm_gpio 94 0>;

			};



			wsa881x_214: wsa881x@20170214 {

			wsa881x_214: wsa881x@21170214 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170214>;

				reg = <0x00 0x21170214>;

				qcom,spkr-sd-n-gpio = <&msm_gpio 95 0>;

			};

		};

arch/arm/boot/dts/qcom/msmtitanium-wsa881x.dtsi

+5 −5
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, 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
@@ -30,15 +30,15 @@ 
				qcom,spkr-sd-n-gpio = <&tlmm 96 0>;

			};



			wsa881x_213: wsa881x@20170213 {

			wsa881x_213: wsa881x@21170213 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170213>;

				reg = <0x00 0x21170213>;

				qcom,spkr-sd-n-gpio = <&tlmm 96 0>;

			};



			wsa881x_214: wsa881x@20170214 {

			wsa881x_214: wsa881x@21170214 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170214>;

				reg = <0x00 0x21170214>;

				qcom,spkr-sd-n-gpio = <&tlmm 96 0>;

			};

		};