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

Commit 114f9a73 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: fix adie rtc failure"

parents 1e50a3e3 eae034e2

Documentation/devicetree/bindings/sound/taiko_codec.txt

+2 −2
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ i2c@f9925000 { 


Tombak audio CODEC in SPMI mode



 - compatible = "qcom,wcd-spmi";

 - compatible = "qcom,msm8x16_wcd_codec";

 - reg: represents the slave base address provided to the peripheral.

 - interrupt-parent : The parent interrupt controller.

 - interrupts: List of interrupts in given SPMI peripheral.
@@ -388,7 +388,7 @@ Optional properties: 


Example:

msm8x16_wcd_codec@f000{

	compatible = "qcom,wcd-spmi";

	compatible = "qcom,msm8x16_wcd_codec";

	reg = <0xf000 0x100>;

	interrupt-parent = <&spmi_bus>;

	interrupts = <0x1 0xf0 0x0>,

arch/arm/boot/dts/qcom/msm-pm8909.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ 
		};



		pm8909_conga_dig: 8909_wcd_codec@f000 {

			compatible = "qcom,wcd-spmi";

			compatible = "qcom,msm8x16_wcd_codec";

			reg = <0xf000 0x100>;

			interrupt-parent = <&spmi_bus>;

			interrupts = <0x1 0xf0 0x0>,
@@ -545,7 +545,7 @@ 
		};



		pm8909_conga_analog: 8909_wcd_codec@f100 {

			compatible = "qcom,wcd-spmi";

			compatible = "qcom,msm8x16_wcd_codec";

			reg = <0xf100 0x100>;

			interrupt-parent = <&spmi_bus>;

			interrupts = <0x1 0xf1 0x0>,

arch/arm/boot/dts/qcom/msm-pm8916.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ 
		};



		pm8916_tombak_dig: msm8x16_wcd_codec@f000{

			compatible = "qcom,wcd-spmi";

			compatible = "qcom,msm8x16_wcd_codec";

			reg = <0xf000 0x100>;

			interrupt-parent = <&spmi_bus>;

			interrupts = <0x1 0xf0 0x0>,
@@ -602,7 +602,7 @@ 
		};



		pm8916_tombak_analog: msm8x16_wcd_codec@f100{

			compatible = "qcom,wcd-spmi";

			compatible = "qcom,msm8x16_wcd_codec";

			reg = <0xf100 0x100>;

			interrupt-parent = <&spmi_bus>;

			interrupts = <0x1 0xf1 0x0>,

sound/soc/codecs/msm8x16-wcd.c

+1 −1
Original line number Diff line number Diff line
@@ -4225,7 +4225,7 @@ static struct spmi_device_id msm8x16_wcd_spmi_id_table[] = { 
};



static struct of_device_id msm8x16_wcd_spmi_of_match[] = {

	{ .compatible = "qcom,wcd-spmi",},

	{ .compatible = "qcom,msm8x16_wcd_codec",},

	{ },

};