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

Commit 7c9ca7d6 authored by bait_dispatcher_monitor_system's avatar bait_dispatcher_monitor_system Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: enable i2c devices for dma engine on msm8992"

parents 73f0e661 81205a17

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

+21 −21
Original line number Diff line number Diff line
@@ -1103,11 +1103,10 @@ 
		compatible = "qcom,i2c-msm-v2";

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "qup_phys_addr", "bam_phys_addr";

		reg = <0xf9924000 0x1000>,

		      <0xf9904000 0x19000>;

		interrupt-names = "qup_irq", "bam_irq";

		interrupts = <0 96 0>, <0 238 0>;

		reg-names = "qup_phys_addr";

		reg = <0xf9924000 0x1000>;

		interrupt-names = "qup_irq";

		interrupts = <0 96 0>;

		qcom,clk-freq-out = <100000>;

		qcom,clk-freq-in  = <19200000>;

		clock-names = "iface_clk", "core_clk";
@@ -1119,8 +1118,9 @@ 
		pinctrl-1 = <&i2c_2_sleep>;

		qcom,noise-rjct-scl = <0>;

		qcom,noise-rjct-sda = <0>;

		qcom,bam-pipe-idx-cons = <14>;

		qcom,bam-pipe-idx-prod = <15>;

		dmas = <&dma_blsp1 14 64 0x20000020 0x20>,

			<&dma_blsp1 15 32 0x20000020 0x20>;

		dma-names = "tx", "rx";

		qcom,master-id = <86>;

	};
@@ -1137,11 +1137,10 @@ 
		compatible = "qcom,i2c-msm-v2";

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "qup_phys_addr", "bam_phys_addr";

		reg = <0xf9967000 0x1000>,

			<0xf9944000 0x19000>;

		interrupt-names = "qup_irq", "bam_irq";

		interrupts = <0 105 0>, <0 239 0>;

		reg-names = "qup_phys_addr";

		reg = <0xf9967000 0x1000>;

		interrupt-names = "qup_irq";

		interrupts = <0 105 0>;

		qcom,clk-freq-out = <100000>;

		qcom,clk-freq-in  = <19200000>;

		clock-names = "iface_clk", "core_clk";
@@ -1153,8 +1152,9 @@ 
		pinctrl-1 = <&i2c_5_sleep>;

		qcom,noise-rjct-scl = <0>;

		qcom,noise-rjct-sda = <0>;

		qcom,bam-pipe-idx-cons = <20>;

		qcom,bam-pipe-idx-prod = <21>;

		dmas = <&dma_blsp1 20 64 0x20000020 0x20>,

			<&dma_blsp1 21 32 0x20000020 0x20>;

		dma-names = "tx", "rx";

		qcom,master-id = <84>;

	};
@@ -1163,11 +1163,10 @@ 
		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

		reg-names = "qup_phys_addr", "bam_phys_addr";

		reg = <0xf9928000 0x1000>,

		      <0xf9904000 0x19000>;

		interrupt-names = "qup_irq", "bam_irq";

		interrupts = <0 100 0>, <0 238 0>;

		reg-names = "qup_phys_addr";

		reg = <0xf9928000 0x1000>;

		interrupt-names = "qup_irq";

		interrupts = <0 100 0>;

		qcom,clk-freq-out = <400000>;

		qcom,clk-freq-in  = <19200000>;

		clock-names = "iface_clk", "core_clk";
@@ -1179,8 +1178,9 @@ 
		pinctrl-1 = <&i2c_6_sleep>;

		qcom,noise-rjct-scl = <0>;

		qcom,noise-rjct-sda = <0>;

		qcom,bam-pipe-idx-cons = <22>;

		qcom,bam-pipe-idx-prod = <23>;

		dmas = <&dma_blsp1 22 64 0x20000020 0x20>,

			<&dma_blsp1 23 32 0x20000020 0x20>;

		dma-names = "tx", "rx";

		qcom,master-id = <86>;

	};