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

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

Merge "Remove internal code name of msmgold for msm8917"

parents 5c504dfa c12dc85c

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

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ Required properties: 
			"qcom,gcc-8996-v2"

			"qcom,gcc-8996-v3"

			"qcom,gcc-8937"

			"qcom,gcc-gold"

			"qcom,gcc-8917"

			"qcom,gcc-spm-8937"

			"qcom,gcc-8953"

			"qcom,rpmcc-8994"
@@ -43,13 +43,13 @@ Required properties: 
			"qcom,cc-debug-8996-v2"

			"qcom,cc-debug-8996-v3"

			"qcom,cc-debug-8937"

			"qcom,cc-debug-gold"

			"qcom,cc-debug-8917"

			"qcom,gcc-mdss-8936"

			"qcom,gcc-mdss-8909"

			"qcom,gcc-mdss-8916"

			"qcom,gcc-mdss-8952"

			"qcom,gcc-mdss-8937"

			"qcom,gcc-mdss-gold"

			"qcom,gcc-mdss-8917"

			"qcom,gcc-mdss-8953"

			"qcom,mmsscc-8994v2"

			"qcom,mmsscc-8994"

Documentation/devicetree/bindings/arm/msm/clock-cpu-8939.txt

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ fmax tables, avs settings table, etc. 


Required properties:

- compatible:		Must be one of "qcom,clock-cpu-8939" or

			"qcom,cpu-clock-8952", "qcom,cpu-clock-gold".

			"qcom,cpu-clock-8952", "qcom,cpu-clock-8917".

- reg:			Pairs of physical base addresses and region sizes of

			memory mapped registers.

- reg-names:		Names of the bases for the above registers. Expected

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

+11 −11
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ SoCs: 
- APQ8937

  compatible = "qcom,apq8037"



- APQGOLD

  compatible = "qcom,apqgold"

- APQ8917

  compatible = "qcom,apq8917"



- APQ8953

  compatible = "qcom,apq8953"
@@ -65,8 +65,8 @@ SoCs: 
- MSM8916

  compatible = "qcom,msm8916"



- MSMGOLD

  compatible = "qcom,msmgold"

- MSM8917

  compatible = "qcom,msm8917"



- MSM8936

  compatible = "qcom,msm8936"
@@ -175,8 +175,8 @@ compatible = "qcom,apq8096-sbc" 
compatible = "qcom,apq8096-liquid"

compatible = "qcom,apq8037-cdp"

compatible = "qcom,apq8037-mtp"

compatible = "qcom,apqgold-cdp"

compatible = "qcom,apqgold-mtp"

compatible = "qcom,apq8917-cdp"

compatible = "qcom,apq8917-mtp"

compatible = "qcom,apq8953-cdp"

compatible = "qcom,apq8953-mtp"

compatible = "qcom,mdm9630-cdp"
@@ -208,11 +208,11 @@ compatible = "qcom,msm8916-qrd-skuid" 
compatible = "qcom,msm8916-qrd-skut1"

compatible = "qcom,msm8916-rumi"

compatible = "qcom,msm8916-sim"

compatible = "qcom,msmgold-cdp"

compatible = "qcom,msmgold-mtp"

compatible = "qcom,msmgold-rumi"

compatible = "qcom,msmgold-qrd"

compatible = "qcom,msmgold-qrd-sku5"

compatible = "qcom,msm8917-cdp"

compatible = "qcom,msm8917-mtp"

compatible = "qcom,msm8917-rumi"

compatible = "qcom,msm8917-qrd"

compatible = "qcom,msm8917-qrd-sku5"

compatible = "qcom,msm8926-cdp"

compatible = "qcom,msm8926-mtp"

compatible = "qcom,msm8926-qrd"

Documentation/devicetree/bindings/pinctrl/msm.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Required properties: 
- compatible: "qcom,msm8996-pinctrl"

	      "qcom,mdm9640-pinctrl"

	      "qcom,mdm9607-pinctrl"

	      "qcom,msmgold-pinctrl"

	      "qcom,msm8917-pinctrl"

	       "qcom,mdmcalifornium-pinctrl"

	      "qcom,msm8952-pinctrl"

	      "qcom,msm8953-pinctrl"

Documentation/devicetree/bindings/thermal/tsens.txt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ Required properties: 
	       should be "qcom,mdm9607-tsens" for 9607 TSENS driver.

	       should be "qcom,msm8953-tsens" for 8953 TSENS driver.

	       should be "qcom,msm8937-tsens" for 8937 TSENS driver.

	       should be "qcom,msmgold-tsens" for gold TSENS driver.

	       should be "qcom,msm8917-tsens" for 8917 TSENS driver.

	       should be "qcom,msmcobalt-tsens" for cobalt TSENS driver.

	       The compatible property is used to identify the respective fusemap to use

	       for the corresponding SoC.