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

Commit 80a981cd 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: Use "-" to separate words of dcc compatible name"

parents 0c38ce18 1d656f94

Documentation/devicetree/bindings/soc/qcom/dcc.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ It can also perform CRC over the same configuration or memory space. 
Required properties:



- compatible : name of the component used for driver matching, should be

	       "qcom,dcc" or "qcom,dcc_v2"

	       "qcom,dcc" or "qcom,dcc-v2"



- reg : physical base address and length of the register set(s), SRAM and XPU

	of the component.

arch/arm/boot/dts/qcom/sdxpoorwills.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -817,6 +817,15 @@ 
		qcom,ipa-advertise-sg-support;

	};



	dcc: dcc_v2@10a2000 {

		compatible = "qcom,dcc-v2";

		reg = <0x10a2000 0x1000>,

		      <0x10ae000 0x2000>;

		reg-names = "dcc-base", "dcc-ram-base";



		dcc-ram-offset = <0x6000>;

	};



	system_pm {

		compatible = "qcom,system-pm";

		mboxes = <&apps_rsc 0>;

arch/arm64/boot/dts/qcom/sdm670.dtsi

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



	dcc: dcc_v2@10a2000 {

		compatible = "qcom,dcc_v2";

		compatible = "qcom,dcc-v2";

		reg = <0x10a2000 0x1000>,

		      <0x10ae000 0x2000>;

		reg-names = "dcc-base", "dcc-ram-base";

arch/arm64/boot/dts/qcom/sdm845.dtsi

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



	dcc: dcc_v2@10a2000 {

		compatible = "qcom,dcc_v2";

		compatible = "qcom,dcc-v2";

		reg = <0x10a2000 0x1000>,

		      <0x10ae000 0x2000>;

		reg-names = "dcc-base", "dcc-ram-base";

drivers/soc/qcom/dcc_v2.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1635,7 +1635,7 @@ static int dcc_remove(struct platform_device *pdev) 
}



static const struct of_device_id msm_dcc_match[] = {

	{ .compatible = "qcom,dcc_v2"},

	{ .compatible = "qcom,dcc-v2"},

	{}

};