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

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

Merge "sdx20: Rename target name from sdxhedgehog to sdx20"

parents 2dc2816f ac08ec01

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Required properties: 
		"qcom,clock-a53-8916", "qcom,clock-a7-vpipa",

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

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

		"qcom,clock-a7-sdxhedgehog"

		"qcom,clock-a7-sdx20"

- 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

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ Required properties: 
			"qcom,cc-debug-cobalt"

			"qcom,gpucc-cobalt"

			"qcom,mmsscc-cobalt"

			"qcom,gcc-sdxhedgehog"

			"qcom,gcc-sdx20"



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

			memory mapped registers.

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

+4 −4
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ SoCs: 
- MDM9650

  compatible = "qcom,mdm9650"



- SDXHEDGEHOG

  compatible = "qcom,sdxhedgehog"

- SDX20

  compatible = "qcom,sdx20"



- VPIPA

  compatible = "qcom,msmvpipa"
@@ -311,7 +311,7 @@ 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,sdx20-mtp"

compatible = "qcom,sdx20-cdp"

compatible = "qcom,apq8009-cdp"

compatible = "qcom,apq8009-mtp"

Documentation/devicetree/bindings/pinctrl/msm.txt

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

	      "qcom,mdm9607-pinctrl"

	      "qcom,msm8917-pinctrl"

	      "qcom,sdxhedgehog-pinctrl"

	      "qcom,sdx20-pinctrl"

	       "qcom,mdm9650-pinctrl"

	      "qcom,msm8952-pinctrl"

	      "qcom,msm8953-pinctrl"

arch/arm/boot/dts/qcom/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -164,12 +164,12 @@ dtb-$(CONFIG_ARCH_MDM9650) += mdm9650-sim.dtb \ 
	mdm9650-v1.1-nand-dualwifi-mtp.dtb \

	mdm9650-v1.1-nand-ccard.dtb



dtb-$(CONFIG_ARCH_SDXHEDGEHOG) += sdxhedgehog-emmc-cdp.dtb \

	sdxhedgehog-emmc-mtp.dtb \

	sdxhedgehog-nand-cdp.dtb \

	sdxhedgehog-nand-mtp.dtb \

	sdxhedgehog-nand-dualwifi-mtp.dtb \

	sdxhedgehog-nand-dualwifi-cdp.dtb

dtb-$(CONFIG_ARCH_SDX20) += sdx20-emmc-cdp.dtb \

	sdx20-emmc-mtp.dtb \

	sdx20-nand-cdp.dtb \

	sdx20-nand-mtp.dtb \

	sdx20-nand-dualwifi-mtp.dtb \

	sdx20-nand-dualwifi-cdp.dtb



dtb-$(CONFIG_ARCH_MSM8937) += msm8937-rumi.dtb \

	msm8937-pmi8950-cdp.dtb \