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

Commit b07ffac3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: Update the target name reference for MDM9650"

parents d238b3f9 57f6fd87

Documentation/devicetree/bindings/arm/msm/acpuclock/clock-a7.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ optionally have a register which encodes the maximum rate supported by hw. 
Required properties:

- compatible: "qcom,clock-a7-8226", "qcom,clock-a7-9630",

		"qcom,clock-a53-8916", "qcom,clock-a7-vpipa",

		"qcom,clock-a7-9640", "qcom,clock-a7-californium",

		"qcom,clock-a7-9640", "qcom,clock-a7-9650",

		"qcom,clock-a7-9640", "qcom,clock-a7-mdm9607",

		"qcom,clock-a7-sdxhedgehog"

- reg: pairs of physical address and region size

Documentation/devicetree/bindings/arm/msm/clock-controller.txt

+2 −2
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ Required properties: 
			"qcom,gpucc-8996-v3.0"

			"qcom,gpucc-8996-pro"

			"qcom,gcc-gfx-8953"

			"qcom,gcc-californium"

			"qcom,cc-debug-californium"

			"qcom,gcc-9650"

			"qcom,cc-debug-9650"

			"qcom,gcc-mdm9607"

			"qcom,cc-debug-mdm9607"

			"qcom,gcc-cobalt"

Documentation/devicetree/bindings/arm/msm/msm.txt

+6 −6
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ SoCs: 
- MDM9640

  compatible = "qcom,mdm9640"



- MDMCALIFORNIUM

  compatible = "qcom,mdmcalifornium"

- MDM9650

  compatible = "qcom,mdm9650"



- SDXHEDGEHOG

  compatible = "qcom,sdxhedgehog"
@@ -307,10 +307,10 @@ compatible = "qcom,msmvpipa-sim" 
compatible = "qcom,mdm9607-rumi"

compatible = "qcom,mdm9607-cdp"

compatible = "qcom,mdm9607-mtp"

compatible = "qcom,mdmcalifornium-rumi"

compatible = "qcom,mdmcalifornium-sim"

compatible = "qcom,mdmcalifornium-cdp"

compatible = "qcom,mdmcalifornium-mtp"

compatible = "qcom,mdm9650-rumi"

compatible = "qcom,mdm9650-sim"

compatible = "qcom,mdm9650-cdp"

compatible = "qcom,mdm9650-mtp"

compatible = "qcom,sdxhedgehog-mtp"

compatible = "qcom,sdxhedgehog-cdp"

compatible = "qcom,apq8009-cdp"

Documentation/devicetree/bindings/pinctrl/msm.txt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Required properties: 
	      "qcom,mdm9607-pinctrl"

	      "qcom,msm8917-pinctrl"

	      "qcom,sdxhedgehog-pinctrl"

	       "qcom,mdmcalifornium-pinctrl"

	       "qcom,mdm9650-pinctrl"

	      "qcom,msm8952-pinctrl"

	      "qcom,msm8953-pinctrl"

	      "qcom,msm8937-pinctrl"

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+2 −2
Original line number Diff line number Diff line
@@ -1994,7 +1994,7 @@ sound-9330 { 
		asoc-codec-names = "msm-stub-codec.1";

	};



* MDMCALIFORNIUM ASoC Machine driver

* MDM9650 ASoC Machine driver



- compatible : "qcom,mdm-audio-tasha" for tasha codec and

                node is "sound"
@@ -2084,7 +2084,7 @@ Example: 
		qcom,aux-codec = <&stub_codec>;

	};



* MDMCALIFORNIUM Automotive ASoC Machine driver

* MDM9650 Automotive ASoC Machine driver



- compatible : "qcom,mdm-audio-auto" for auto codec and

		node is "sound-auto"