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

Commit 9b4bef5e authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: Rename msmskunk and sdmbat to sdm845 and sdm830" into msm-4.8

parents 99b505bb 6a20faef

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

+13 −13
Original line number Diff line number Diff line
@@ -86,11 +86,11 @@ SoCs: 
- MSMCOBALT

  compatible = "qcom,msmcobalt"



- MSMSKUNK

  compatible = "qcom,msmskunk"

- SDM845

  compatible = "qcom,sdm845"



- SDMBAT

  compatible = "qcom,sdmbat"

- SDM830

  compatible = "qcom,sdm830"



- MSM8952

  compatible = "qcom,msm8952"
@@ -258,15 +258,15 @@ compatible = "qcom,msm8996-adp" 
compatible = "qcom,msmcobalt-sim"

compatible = "qcom,msmcobalt-rumi"

compatible = "qcom,msmcobalt-cdp"

compatible = "qcom,msmskunk-sim"

compatible = "qcom,msmskunk-rumi"

compatible = "qcom,msmskunk-cdp"

compatible = "qcom,msmskunk-mtp"

compatible = "qcom,msmskunk-mtp"

compatible = "qcom,sdmbat-sim"

compatible = "qcom,sdmbat-rumi"

compatible = "qcom,sdmbat-cdp"

compatible = "qcom,sdmbat-mtp"

compatible = "qcom,sdm845-sim"

compatible = "qcom,sdm845-rumi"

compatible = "qcom,sdm845-cdp"

compatible = "qcom,sdm845-mtp"

compatible = "qcom,sdm845-mtp"

compatible = "qcom,sdm830-sim"

compatible = "qcom,sdm830-rumi"

compatible = "qcom,sdm830-cdp"

compatible = "qcom,sdm830-mtp"

compatible = "qcom,msm8952-rumi"

compatible = "qcom,msm8952-sim"

compatible = "qcom,msm8952-qrd"

Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt

+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ Example: 
		reg-names = "llcc_base";

		status = "disabled";



		llcc: qcom,msmskunk-llcc {

			compatible = "qcom,msmskunk-llcc";

		llcc: qcom,sdm845-llcc {

			compatible = "qcom,sdm845-llcc";

			#cache-cells = <1>;

			max-slices = <32>;

		};

Documentation/devicetree/bindings/clock/qcom,gcc.txt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ Required properties : 
			"qcom,gcc-msm8974pro-ac"

			"qcom,gcc-msm8996"

			"qcom,gcc-mdm9615"

			"qcom,gcc-msmskunk"

			"qcom,gcc-sdm845"



- reg : shall contain base register location and length

- #clock-cells : shall contain 1

Documentation/devicetree/bindings/clock/qcom,videocc.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Qualcomm Technologies Video Clock & Reset Controller Binding 
----------------------------------------------------



Required properties :

- compatible : shall contain "qcom,video_cc-msmskunk"

- compatible : shall contain "qcom,video_cc-sdm845"

- reg : shall contain base register location and length

- reg-names: names of registers listed in the same order as in

	     the reg property.
@@ -14,7 +14,7 @@ Optional properties : 


Example:

	clock_videocc: qcom,videocc@ab00000 {

		compatible = "qcom,video_cc-msmskunk";

		compatible = "qcom,video_cc-sdm845";

		reg = <0xab00000 0x10000>;

		reg-names = "cc_base";

		vdd_cx-supply = <&pmcobalt_s9_level>;

Documentation/devicetree/bindings/pinctrl/qcom,sdmbat-pinctrl→Documentation/devicetree/bindings/pinctrl/qcom,sdm830-pinctrl

+4 −4
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. SDMBAT TLMM block

Qualcomm Technologies, Inc. SDM830 TLMM block



This binding describes the Top Level Mode Multiplexer block found in the

SDMBAT platform.

SDM830 platform.



- compatible:

	Usage: required

	Value type: <string>

	Definition: must be "qcom,sdmbat-pinctrl"

	Definition: must be "qcom,sdm830-pinctrl"



- reg:

	Usage: required
@@ -136,7 +136,7 @@ to specify in a pin configuration subnode: 
Example:



	tlmm: pinctrl@03800000 {

		compatible = "qcom,sdmbat-pinctrl";

		compatible = "qcom,sdm830-pinctrl";

		reg = <0x03800000 0xc00000>;

		interrupts = <0 208 0>;

		gpio-controller;