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

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

Merge "usb: usb_bam: Rename "qcom" vendor prefix to "qti""

parents eb1f8b83 256a162c

Documentation/devicetree/bindings/usb/msm-hsusb.txt

+51 −51
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ Example Android USB device node : 
BAM:



Required properties:

- compatible: should be "qcom,usb-bam-msm"

- compatible: should be "qti,usb-bam-msm"

- reg  : pairs of physical base addresses and region sizes

            of all the memory mapped BAM devices present

- reg-names : Register region name(s), in 1-1 correspondence with the
@@ -233,10 +233,10 @@ Required properties: 
            If SSUSB_BAM is used, "ssusb" should be present.

            If HSUSB_BAM is used, "hsusb" should be present.

            If HSIC_BAM is used, "hsic" should be present.

- qcom,usb-bam-num-pipes: max number of pipes that can be used

- qti,usb-bam-num-pipes: max number of pipes that can be used



Optional properties:

- qcom,usb-bam-fifo-baseaddr: base address for bam pipe's data and descriptor

- qti,usb-bam-fifo-baseaddr: base address for bam pipe's data and descriptor

  fifos. This can be on chip memory (ocimem) or usb private memory. This

  property is required if sub-node's mem-type is ocimem or usb private mem.
@@ -249,82 +249,82 @@ Subnode Required: 
	peer options: qdss, ipa, a2

	direction options: in (from peer to usb), out (from usb to peer)

	pipe num options: 0..127

- qcom,usb-bam-mem-type: Type of memory used by this PIPE. Can be one of

- qti,usb-bam-mem-type: Type of memory used by this PIPE. Can be one of

            0 - Uses SPS's dedicated pipe memory

            1 - USB's private memory residing @ 'qcom,usb-bam-fifo-baseaddr'

            1 - USB's private memory residing @ 'qti,usb-bam-fifo-baseaddr'

            2 - System RAM allocated by driver

	    3 - OCI memory residing @ 'qcom,usb-bam-fifo-baseaddr'

- qcom,bam-type: BAM type can be one of

	    3 - OCI memory residing @ 'qti,usb-bam-fifo-baseaddr'

- qti,bam-type: BAM type can be one of

	0 - SSUSB_BAM

	1 - HSUSB_BAM

	2 - HSIC_BAM

- qcom,dir: pipe direction

- qti,dir: pipe direction

	0 - from usb (out)

	1 - to usb (in)

- qcom,pipe-num: pipe number

- qcom,peer-bam: peer BAM can be one of

- qti,pipe-num: pipe number

- qti,peer-bam: peer BAM can be one of

	0 - A2_P_BAM

	1 - QDSS_P_BAM

	2 - IPA_P_BAM

- qcom,data-fifo-size: data fifo size

- qcom,descriptor-fifo-size: descriptor fifo size

- qti,data-fifo-size: data fifo size

- qti,descriptor-fifo-size: descriptor fifo size



Optional Properties for Subnode:

- qcom,reset-bam-on-connect: If present then BAM is RESET before connecting

- qti,reset-bam-on-connect: If present then BAM is RESET before connecting

  pipe. This may be required if BAM peripheral is also reset before connect.

- qcom,dst-bam-physical-address: destination BAM physical address

- qcom,dst-bam-pipe-index: destination BAM pipe index

- qcom,src-bam-physical-address: source BAM physical address

- qcom,src-bam-pipe-index: source BAM pipe index

- qcom,data-fifo-offset: data fifo offset address

- qcom,descriptor-fifo-offset: descriptor fifo offset address

- qti,dst-bam-physical-address: destination BAM physical address

- qti,dst-bam-pipe-index: destination BAM pipe index

- qti,src-bam-physical-address: source BAM physical address

- qti,src-bam-pipe-index: source BAM pipe index

- qti,data-fifo-offset: data fifo offset address

- qti,descriptor-fifo-offset: descriptor fifo offset address



Optional properties :

- qcom,ignore-core-reset-ack: If present then BAM ignores ACK from USB core

- qti,ignore-core-reset-ack: If present then BAM ignores ACK from USB core

	    while performing PIPE RESET

- qcom,disable-clk-gating: If present then disable BAM clock gating.

- qcom,usb-bam-override-threshold: If present then the default 512 byte threshold

- qti,disable-clk-gating: If present then disable BAM clock gating.

- qti,usb-bam-override-threshold: If present then the default 512 byte threshold

		is overriden. This threshold configures the threshold value for Read/Write

		event generation by the BAM towards another BAM.



Example USB BAM controller device node:



	qcom,usbbam@f9a44000 {

		compatible = "qcom,usb-bam-msm";

	qti,usbbam@f9a44000 {

		compatible = "qti,usb-bam-msm";

		reg = <0xf9a44000 0x11000>;

		reg-names = "hsusb";

		interrupts = <0 135 0>;

		interrupt-names = "hsusb";

		qcom,usb-bam-num-pipes = <16>;

		qcom,ignore-core-reset-ack;

		qcom,disable-clk-gating;

		qti,usb-bam-num-pipes = <16>;

		qti,ignore-core-reset-ack;

		qti,disable-clk-gating;



		qcom,pipe0 {

		qti,pipe0 {

			label = "hsusb-ipa-out-0";

			qcom,usb-bam-mem-type = <0>;

			qcom,bam-type = <1>;

			qcom,dir = <0>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <2>;

			qcom,src-bam-physical-address = <0xf9a44000>;

			qcom,src-bam-pipe-index = <1>;

			qcom,data-fifo-offset = <0x2200>;

			qcom,data-fifo-size = <0x1e00>;

			qcom,descriptor-fifo-offset = <0x2100>;

			qcom,descriptor-fifo-size = <0x100>;

			qti,usb-bam-mem-type = <0>;

			qti,bam-type = <1>;

			qti,dir = <0>;

			qti,pipe-num = <0>;

			qti,peer-bam = <2>;

			qti,src-bam-physical-address = <0xf9a44000>;

			qti,src-bam-pipe-index = <1>;

			qti,data-fifo-offset = <0x2200>;

			qti,data-fifo-size = <0x1e00>;

			qti,descriptor-fifo-offset = <0x2100>;

			qti,descriptor-fifo-size = <0x100>;

		};

		qcom,pipe1 {

		qti,pipe1 {

			label = "hsusb-ipa-in-0";

			qcom,usb-bam-mem-type = <0>;

			qcom,bam-type = <1>;

			qcom,dir = <1>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <2>;

			qcom,dst-bam-physical-address = <0xf9a44000>;

			qcom,dst-bam-pipe-index = <0>;

			qcom,data-fifo-offset = <0x300>;

			qcom,data-fifo-size = <0x1e00>;

			qcom,descriptor-fifo-offset = <0>;

			qcom,descriptor-fifo-size = <0x300>;

			qti,usb-bam-mem-type = <0>;

			qti,bam-type = <1>;

			qti,dir = <1>;

			qti,pipe-num = <0>;

			qti,peer-bam = <2>;

			qti,dst-bam-physical-address = <0xf9a44000>;

			qti,dst-bam-pipe-index = <0>;

			qti,data-fifo-offset = <0x300>;

			qti,data-fifo-size = <0x1e00>;

			qti,descriptor-fifo-offset = <0>;

			qti,descriptor-fifo-size = <0x300>;

		};

	};

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

+21 −21
Original line number Diff line number Diff line
@@ -1812,34 +1812,34 @@ 
				<87 512 60000 960000>;

	};



	qcom,usbbam@f9304000 {

		compatible = "qcom,usb-bam-msm";

	qti,usbbam@f9304000 {

		compatible = "qti,usb-bam-msm";

		reg = <0xf9304000 0x5000>,

		      <0xf92f880c 0x4>;

		reg-names = "ssusb", "qscratch_ram1_reg";

		interrupts = <0 132 0>;

		interrupt-names = "ssusb";

		qcom,usb-bam-num-pipes = <16>;

		qcom,usb-bam-fifo-baseaddr = <0xf9200000>;

		qcom,ignore-core-reset-ack;

		qcom,disable-clk-gating;

		qti,usb-bam-num-pipes = <16>;

		qti,usb-bam-fifo-baseaddr = <0xf9200000>;

		qti,ignore-core-reset-ack;

		qti,disable-clk-gating;



		qcom,pipe0 {

		qti,pipe0 {

			label = "ssusb-qdss-in-0";

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <0>;

			qcom,dir = <1>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <1>;

			qcom,src-bam-physical-address = <0xfc37C000>;

			qcom,src-bam-pipe-index = <0>;

			qcom,dst-bam-physical-address = <0xf9304000>;

			qcom,dst-bam-pipe-index = <2>;

			qcom,data-fifo-offset = <0xf0000>;

			qcom,data-fifo-size = <0x1800>;

			qcom,descriptor-fifo-offset = <0xf4000>;

			qcom,descriptor-fifo-size = <0x1400>;

			qcom,reset-bam-on-connect;

			qti,usb-bam-mem-type = <1>;

			qti,bam-type = <0>;

			qti,dir = <1>;

			qti,pipe-num = <0>;

			qti,peer-bam = <1>;

			qti,src-bam-physical-address = <0xfc37C000>;

			qti,src-bam-pipe-index = <0>;

			qti,dst-bam-physical-address = <0xf9304000>;

			qti,dst-bam-pipe-index = <2>;

			qti,data-fifo-offset = <0xf0000>;

			qti,data-fifo-size = <0x1800>;

			qti,descriptor-fifo-offset = <0xf4000>;

			qti,descriptor-fifo-size = <0x1400>;

			qti,reset-bam-on-connect;

		};

	};

arch/arm/boot/dts/qti/mpq8092.dtsi

+20 −20
Original line number Diff line number Diff line
@@ -178,32 +178,32 @@ 
		};

	};



	qcom,usbbam@f9a44000 {

		compatible = "qcom,usb-bam-msm";

	qti,usbbam@f9a44000 {

		compatible = "qti,usb-bam-msm";

		reg = <0xf9a44000 0x11000>;

		reg-names = "hsusb";

		interrupts = <0 135 0>;

		interrupt-names = "hsusb";

		qcom,usb-bam-num-pipes = <16>;

		qcom,usb-bam-fifo-baseaddr = <0xfe803000>;

		qcom,ignore-core-reset-ack;

		qcom,disable-clk-gating;

		qti,usb-bam-num-pipes = <16>;

		qti,usb-bam-fifo-baseaddr = <0xfe803000>;

		qti,ignore-core-reset-ack;

		qti,disable-clk-gating;



		qcom,pipe0 {

		qti,pipe0 {

			label = "hsusb-qdss-in-0";

			qcom,usb-bam-mem-type = <3>;

			qcom,bam-type = <1>;

			qcom,dir = <1>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <1>;

			qcom,src-bam-physical-address = <0xfc37c000>;

			qcom,src-bam-pipe-index = <0>;

			qcom,dst-bam-physical-address = <0xf9a44000>;

			qcom,dst-bam-pipe-index = <2>;

			qcom,data-fifo-offset = <0x0>;

			qcom,data-fifo-size = <0x600>;

			qcom,descriptor-fifo-offset = <0x600>;

			qcom,descriptor-fifo-size = <0x200>;

			qti,usb-bam-mem-type = <3>;

			qti,bam-type = <1>;

			qti,dir = <1>;

			qti,pipe-num = <0>;

			qti,peer-bam = <1>;

			qti,src-bam-physical-address = <0xfc37c000>;

			qti,src-bam-pipe-index = <0>;

			qti,dst-bam-physical-address = <0xf9a44000>;

			qti,dst-bam-pipe-index = <2>;

			qti,data-fifo-offset = <0x0>;

			qti,data-fifo-size = <0x600>;

			qti,descriptor-fifo-offset = <0x600>;

			qti,descriptor-fifo-size = <0x200>;

		};

	};

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

+20 −20
Original line number Diff line number Diff line
@@ -268,32 +268,32 @@ 
		interrupts = <0 94 0>;

	};



	qcom,usbbam@f9a44000 {

		compatible = "qcom,usb-bam-msm";

	qti,usbbam@f9a44000 {

		compatible = "qti,usb-bam-msm";

		reg = <0xf9a44000 0x11000>;

		reg-names = "hsusb";

		interrupts = <0 135 0>;

		interrupt-names = "hsusb";

		qcom,usb-bam-num-pipes = <16>;

		qcom,usb-bam-fifo-baseaddr = <0xfe803000>;

		qcom,ignore-core-reset-ack;

		qcom,disable-clk-gating;

		qti,usb-bam-num-pipes = <16>;

		qti,usb-bam-fifo-baseaddr = <0xfe803000>;

		qti,ignore-core-reset-ack;

		qti,disable-clk-gating;



		qcom,pipe0 {

		qti,pipe0 {

			label = "hsusb-qdss-in-0";

			qcom,usb-bam-mem-type = <3>;

			qcom,bam-type = <1>;

			qcom,dir = <1>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <1>;

			qcom,src-bam-physical-address = <0xfc37c000>;

			qcom,src-bam-pipe-index = <0>;

			qcom,dst-bam-physical-address = <0xf9a44000>;

			qcom,dst-bam-pipe-index = <2>;

			qcom,data-fifo-offset = <0x0>;

			qcom,data-fifo-size = <0x600>;

			qcom,descriptor-fifo-offset = <0x600>;

			qcom,descriptor-fifo-size = <0x200>;

			qti,usb-bam-mem-type = <3>;

			qti,bam-type = <1>;

			qti,dir = <1>;

			qti,pipe-num = <0>;

			qti,peer-bam = <1>;

			qti,src-bam-physical-address = <0xfc37c000>;

			qti,src-bam-pipe-index = <0>;

			qti,dst-bam-physical-address = <0xf9a44000>;

			qti,dst-bam-pipe-index = <2>;

			qti,data-fifo-offset = <0x0>;

			qti,data-fifo-size = <0x600>;

			qti,descriptor-fifo-offset = <0x600>;

			qti,descriptor-fifo-size = <0x200>;

		};

	};

arch/arm/boot/dts/qti/msm8610.dtsi

+20 −20
Original line number Diff line number Diff line
@@ -223,32 +223,32 @@ 
		};

};



	qcom,usbbam@f9a44000 {

		compatible = "qcom,usb-bam-msm";

	qti,usbbam@f9a44000 {

		compatible = "qti,usb-bam-msm";

		reg = <0xf9a44000 0x11000>;

		reg-names = "hsusb";

		interrupts = <0 135 0>;

		interrupt-names = "hsusb";

		qcom,usb-bam-num-pipes = <16>;

		qcom,usb-bam-fifo-baseaddr = <0xfe803000>;

		qcom,ignore-core-reset-ack;

		qcom,disable-clk-gating;

		qti,usb-bam-num-pipes = <16>;

		qti,usb-bam-fifo-baseaddr = <0xfe803000>;

		qti,ignore-core-reset-ack;

		qti,disable-clk-gating;



		qcom,pipe0 {

		qti,pipe0 {

			label = "hsusb-qdss-in-0";

			qcom,usb-bam-mem-type = <3>;

			qcom,bam-type = <1>;

			qcom,dir = <1>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <1>;

			qcom,src-bam-physical-address = <0xfc37c000>;

			qcom,src-bam-pipe-index = <0>;

			qcom,dst-bam-physical-address = <0xf9a44000>;

			qcom,dst-bam-pipe-index = <2>;

			qcom,data-fifo-offset = <0x0>;

			qcom,data-fifo-size = <0x600>;

			qcom,descriptor-fifo-offset = <0x600>;

			qcom,descriptor-fifo-size = <0x200>;

			qti,usb-bam-mem-type = <3>;

			qti,bam-type = <1>;

			qti,dir = <1>;

			qti,pipe-num = <0>;

			qti,peer-bam = <1>;

			qti,src-bam-physical-address = <0xfc37c000>;

			qti,src-bam-pipe-index = <0>;

			qti,dst-bam-physical-address = <0xf9a44000>;

			qti,dst-bam-pipe-index = <2>;

			qti,data-fifo-offset = <0x0>;

			qti,data-fifo-size = <0x600>;

			qti,descriptor-fifo-offset = <0x600>;

			qti,descriptor-fifo-size = <0x200>;

		};

	};