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

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

Merge "sensors: Rename ADSP driver to SSC and move it to drivers/sensors"

parents 0bedcccb 7163cc94

Documentation/devicetree/bindings/qdsp/msm-adsp-sensors.txt

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
* msm-adsp-sensors



Required properties:



 - compatible:	"qcom,msm-adsp-sensors"



Example:



	qcom,msm-adsp-sensors {

		compatible = "qcom,msm-adsp-sensors";

	};

Documentation/devicetree/bindings/qdsp/msm-ssc-sensors.txt

0 → 100644
+11 −0
Original line number Diff line number Diff line 
* msm-ssc-sensors



Required properties:



 - compatible:	"qcom,msm-ssc-sensors"



Example:



	qcom,msm-ssc-sensors {

		compatible = "qcom,msm-ssc-sensors";

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -3183,8 +3183,8 @@ 
		compatible = "qcom,msm-wfd";

	};



	qcom,msm-adsp-sensors {

		compatible = "qcom,msm-adsp-sensors";

	qcom,msm-ssc-sensors {

		compatible = "qcom,msm-ssc-sensors";

	};



	sound {

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

+2 −2
Original line number Diff line number Diff line
@@ -679,8 +679,8 @@ 
		qcom,wcnss-adc_tm = <&pm8226_adc_tm>;

	};



	qcom,msm-adsp-sensors {

		compatible = "qcom,msm-adsp-sensors";

	qcom,msm-ssc-sensors {

		compatible = "qcom,msm-ssc-sensors";

	};



	qcom,wdt@f9017000 {

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

+2 −2
Original line number Diff line number Diff line
@@ -1970,8 +1970,8 @@ 
			<11 604 32506 32506>;

	};



	qcom,msm-adsp-sensors {

		compatible = "qcom,msm-adsp-sensors";

	qcom,msm-ssc-sensors {

		compatible = "qcom,msm-ssc-sensors";

	};



	qcom,mss@fc880000 {