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

Commit cdd6a928 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: Change crypto hw assignments in fsm9900"

parents c09eaab4 ec21788c

arch/arm/boot/dts/fsm9900.dtsi

+33 −23
Original line number Diff line number Diff line
@@ -225,23 +225,14 @@ 
		status = "disable";

	};



	qcom,sps@0xfe204000 {

	qcom,sps@fe204000 {

		compatible = "qcom,msm_sps";

		reg = <0xfe204000 0x15000>,

			<0xfe223000 0xb000>;

		reg-names = "bam_mem", "core_mem";

		interrupts = <0 94 0>;

	};



	qcom,qcrypto@fd400000 {

		compatible = "qcom,qcrypto";

		reg = <0xfd400000 0x20000>,

			<0xfd404000 0x8000>;

		reg-names = "crypto-base","crypto-bam-base";

		interrupts = <0 109 0>;

		qcom,bam-pipe-pair = <1>;

		qcom,ce-hw-instance = <0>;

	};



	qcom,qcrypto@fd440000 {

		compatible = "qcom,qcrypto";

		reg = <0xfd440000 0x20000>,
@@ -251,6 +242,25 @@ 
		qcom,bam-pipe-pair = <1>;

		qcom,ce-hw-instance = <1>;

	};

	qcom,qcrypto@fe040000 {

		compatible = "qcom,qcrypto";

		reg = <0xfe040000 0x20000>,

			<0xfe044000 0x8000>;

		reg-names = "crypto-base","crypto-bam-base";

		interrupts = <0 115 0>;

		qcom,bam-pipe-pair = <1>;

		qcom,ce-hw-instance = <6>;

	};

	qcom,qcrypto@fe000000 {

		compatible = "qcom,qcrypto";

		reg = <0xfe000000 0x20000>,

			<0xfe004000 0x8000>;

		reg-names = "crypto-base","crypto-bam-base";

		interrupts = <0 116 0>;

		qcom,bam-pipe-pair = <1>;

		qcom,ce-hw-instance = <7>;

	};



	qcom,qcota@fe140000 {

		compatible = "qcom,qcota";

		reg = <0xfe140000 0x20000>,
@@ -260,14 +270,14 @@ 
		qcom,bam-pipe-pair = <1>;

		qcom,ce-hw-instance = <2>;

	};

	qcom,qcota@fe100000 {

	qcom,qcota@fe0c0000 {

		compatible = "qcom,qcota";

		reg = <0xfe100000 0x20000>,

			<0xfe104000 0x8000>;

		reg = <0xfe0c0000 0x20000>,

			<0xfe0c4000 0x8000>;

		reg-names = "crypto-base","crypto-bam-base";

			interrupts = <0 112 0>;

		interrupts = <0 113 0>;

		qcom,bam-pipe-pair = <1>;

			qcom,ce-hw-instance = <3>;

		qcom,ce-hw-instance = <4>;

	};



	tsens: tsens@fc4a8000 {