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

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

Merge "msm: ensigma uccp330: Rename "qti" device tree prefix back to "qcom""

parents 37327df8 bcabd262

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

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ The devicetree representation of the Ensigma UCCP330 block should be: 


Required properties:



- compatible: "qti,msm-demod"

- compatible: "qcom,msm-demod"

- reg: physical memory base addresses and sizes for the following:

	Ensigma UCCP330, TOP BCSS

- reg-names: names of the memory regions:
@@ -20,7 +20,7 @@ Required properties: 
Example:



	demod: msm-demod@fc600000 {

		compatible = "qti,msm-demod";

		compatible = "qcom,msm-demod";

		reg = <0xfc600000 0xd0008>,<0xfc747000 0x1000>;

		reg-names = "msm-demod", "top-bcss";

		vdd-supply = <&gdsc_bcss>;

arch/arm/boot/dts/qti/mpq8092.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ 
	};



	demod: msm-demod@fc600000 {

		compatible = "qti,msm-demod";

		compatible = "qcom,msm-demod";

		reg = <0xfc600000 0xd0008>,<0xfc747000 0x1000>;

		reg-names = "msm-demod", "top-bcss";

		vdd-supply = <&gdsc_bcss>;

drivers/media/platform/msm/broadcast/ensigma_uccp330.c

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static const struct dev_pm_ops demod_dev_pm_ops = { 
/* Platform driver information */



static struct of_device_id msm_demod_match_table[] = {

	{.compatible = "qti,msm-demod"}

	{.compatible = "qcom,msm-demod"}

};



static struct platform_driver msm_demod_driver = {