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

Commit 73799d64 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: Update the target name reference for MDM9607"

parents 1a513fea 5936316c

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

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 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-mdmfermium"

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

- reg: pairs of physical address and region size

- reg-names: "rcg-base" is expected

- clock-names: list of names of clock inputs

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

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ Required properties: 
			"qcom,gcc-gfx-titanium"

			"qcom,gcc-californium"

			"qcom,cc-debug-californium"

			"qcom,gcc-mdmfermium"

			"qcom,cc-debug-mdmfermium"

			"qcom,gcc-mdm9607"

			"qcom,cc-debug-mdm9607"

			"qcom,gcc-cobalt"

			"qcom,cc-debug-cobalt"

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

+5 −5
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ SoCs: 
- VPIPA

  compatible = "qcom,msmvpipa"



- MDMFERMIUM

  compatible = "qcom,mdmfermium"

- MDM9607

  compatible = "qcom,mdm9607"



Generic board variants:
@@ -258,9 +258,9 @@ compatible = "qcom,mdm9640-mtp" 
compatible = "qcom,mdm9640-rumi"

compatible = "qcom,mdm9640-sim"

compatible = "qcom,msmvpipa-sim"

compatible = "qcom,mdmfermium-rumi"

compatible = "qcom,mdmfermium-cdp"

compatible = "qcom,mdmfermium-mtp"

compatible = "qcom,mdm9607-rumi"

compatible = "qcom,mdm9607-cdp"

compatible = "qcom,mdm9607-mtp"

compatible = "qcom,mdmcalifornium-rumi"

compatible = "qcom,mdmcalifornium-sim"

compatible = "qcom,mdmcalifornium-cdp"

Documentation/devicetree/bindings/cnss/cnss-sdio-wlan.txt

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ Example: 
	qcom,cnss-sdio {

		compatible = "qcom,cnss_sdio";

		cnss_sdio,wlan-pmic-gpio = <&pm8019_gpios 3 0>;

		vdd-wlan-io-supply = <&mdmfermium_l11>;

		vdd-wlan-xtal-supply = <&mdmfermium_l2>;

		vdd-wlan-io-supply = <&mdm9607_l11>;

		vdd-wlan-xtal-supply = <&mdm9607_l2>;

	};

Documentation/devicetree/bindings/pinctrl/msm.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ MSM Pinctrl Bindings 
Required properties:

- compatible: "qcom,msm8996-pinctrl"

	      "qcom,mdm9640-pinctrl"

	      "qcom,mdmfermium-pinctrl"

	      "qcom,mdm9607-pinctrl"

	      "qcom,msmgold-pinctrl"

	       "qcom,mdmcalifornium-pinctrl"

	      "qcom,msm8952-pinctrl"