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

Commit 0847cc94 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: Add IPA device"

parents bbc50de4 2a63185b

arch/arm/boot/dts/msmkrypton.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -315,6 +315,18 @@ 
		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_1_out 0 0>;

	};



	ipa_hw: qcom,ipa@fd4c0000 {

		compatible = "qcom,ipa";

		reg = <0xfd4c0000 0x29000>,

		      <0xfd4c4000 0x15820>;

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

		interrupts = <0 252 0>,

		             <0 253 0>;

		interrupt-names = "ipa-irq", "bam-irq";

		qcom,ipa-hw-ver = <3>; /* IPA core version = IPAv2.0 */

		qcom,ipa-hw-mode = <0>; /* IPA hw type = Normal */

	};



	usb3: qcom,ssusb@f9200000 {

		compatible = "qcom,dwc-usb3-msm";

		reg = <0xf9200000 0xfc000>,

drivers/platform/msm/ipa/ipa.c

+1 −1
Original line number Diff line number Diff line
@@ -2147,7 +2147,7 @@ static int get_ipa_dts_configuration(struct platform_device *pdev, 
	IPADBG(": ipa_hw_type = %d", ipa_drv_res->ipa_hw_type);



	/* Get IPA HW mode */

	result = of_property_read_u32(pdev->dev.of_node, "ipa-hw-mode",

	result = of_property_read_u32(pdev->dev.of_node, "qcom,ipa-hw-mode",

			&ipa_drv_res->ipa_hw_mode);

	if (result)

		IPADBG("using default (IPA_MODE_NORMAL) for ipa-hw-mode\n");