Merge "Merge commit '0b564a62' - AU138 onto...

	* qcom,inst-id: must be present. QMI instance id for remote ETMs.

* Optional properties for funnels:

	* qcom,duplicate-funnel: boolean, indicates its a duplicate of an

	  existing funnel. Funnel devices are now capable of supporting

	  multiple-input and multiple-output configuration with in built

	  hardware filtering for TPDM devices. Each set of input-output

	  combination is treated as independent funnel device.

	  funnel-base-dummy and funnel-base-real reg-names must be specified

	  when this property is enabled.

	* reg-names: funnel-base-dummy: dummy register space used by a

	  duplicate funnel. Should be a valid register address space that

	  no other device is using.

	* reg-names: funnel-base-real: actual register space for the

	  duplicate funnel.

Example:

1. Sinks

- compatible:		Must be "devfreq-simple-dev"

- clock-names:		Must be "devfreq_clk"

- clocks:		Must refer to the clock that's fed to the device.

- freq-tbl-khz:		A list of usable frequencies (in KHz) for the device

			clock.

Optional properties:

- polling-ms:	Polling interval for the device in milliseconds. Default: 50

- governor:	Initial governor to user for the device. Default: "performance"

- qcom,prepare-clk:	Prepare the device clock during initialization.

- freq-tbl-khz:		A list of usable frequencies (in kHz) for the device

			clock.

Example:

Qualcomm Technologies, Inc. Parallel Interface controller (QPIC) for NAND devices

Required properties:

- compatible : "qcom,msm-nand".

- reg : should specify QPIC NANDc and BAM physical address range.

- reg-names : should specify relevant names to each reg property defined.

- interrupts : should specify QPIC/BAM interrupt numbers.

- interrupt-names : should specify relevant names to each interrupts property

  defined.

- qcom,reg-adjustment-offset : Specify the base adjustment offset value for the

  version registers

MTD flash partition layout for NAND devices -

Each partition is represented as a sub-node of the qcom,mtd-partitions device.

Each node's name represents the name of the corresponding partition.

This is now completely optional as the partition information is avaialble from

bootloader.

Optional properties:

- reg : boot_cfg. This is needed only on the targets where both NAND and eMMC

  devices are supported. On eMMC based builds, NAND cannot be enabled by

  default due to the absence of some of its required resources.

- reg : The partition offset and size

- label : The label / name for this partition.

- read-only: This parameter, if present, indicates that this partition

  should only be mounted read-only.

- Refer to "Documentation/devicetree/bindings/arm/msm/msm_bus.txt" for

below optional properties:

	- qcom,msm-bus,name

	- qcom,msm-bus,num-cases

	- qcom,msm-bus,active-only

	- qcom,msm-bus,num-paths

	- qcom,msm-bus,vectors-KBps

Examples:

	qcom,nand@f9af0000 {

		compatible = "qcom,msm-nand";

		reg = <0xf9af0000 0x1000>,

		      <0xf9ac4000 0x8000>,

		      <0x5e02c 0x4>;

		reg-names = "nand_phys",

			    "bam_phys",

			    "boot_cfg";

		qcom,reg-adjustment-offset = <0x4000>;

		interrupts = <0 279 0>;

		interrupt-names = "bam_irq";

		qcom,msm-bus,name = "qpic_nand";

		qcom,msm-bus,num-cases = <1>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps = <91 512 0 0>,

	};

       qcom,mtd-partitions {

	       #address-cells = <1>;

	       #size-cells = <1>;

               partition@0 {

                       label = "boot";

                       reg = <0x0 0x1000>;

		       read-only;

               };

               partition@20000 {

                       label = "userdata";

                       reg = <0x20000 0x1000>;

               };

               partition@40000 {

                       label = "system";

                       reg = <0x40000 0x1000>;

               };

       };

					    <&tpdm_lpass_out_funnel_lpass>;

				};

			};

		};

	};

			port@2 {

	funnel_lpass_1: funnel_1@6845000 {

		compatible = "arm,primecell";

		arm,primecell-periphid = <0x0003b908>;

		reg = <0x6867010 0x10>,

		      <0x6845000 0x1000>;

		reg-names = "funnel-base-dummy", "funnel-base-real";

		coresight-name = "coresight-funnel-lpass-1";

		clocks = <&clock_aop QDSS_CLK>;

		clock-names = "apb_pclk";

		qcom,duplicate-funnel;

		ports {

			#address-cells = <1>;

			#size-cells = <0>;

			port@0 {

				reg = <0>;

				funnel_lpass_1_out_funnel_qatb: endpoint {

					remote-endpoint =

					    <&funnel_qatb_in_funnel_lpass_1>;

				};

			};

			port@1 {

				reg = <1>;

				funnel_lpass_in_audio_etm0: endpoint {

				funnel_lpass_1_in_audio_etm0: endpoint {

					slave-mode;

					remote-endpoint =

					    <&audio_etm0_out_funnel_lpass>;

					    <&audio_etm0_out_funnel_lpass_1>;

				};

			};

		};

					    <&tpdm_turing_out_funnel_turing>;

				};

			};

		};

	};

			port@2 {

	funnel_turing_1: funnel_1@6861000 {

		compatible = "arm,primecell";

		arm,primecell-periphid = <0x0003b908>;

		reg = <0x6867000 0x10>,

		      <0x6861000 0x1000>;

		reg-names = "funnel-base-dummy", "funnel-base-real";

		coresight-name = "coresight-funnel-turing-1";

		clocks = <&clock_aop QDSS_CLK>;

		clock-names = "apb_pclk";

		qcom,duplicate-funnel;

		ports {

			#address-cells = <1>;

			#size-cells = <0>;

			port@0 {

				reg = <0>;

				funnel_turing_1_out_funnel_qatb: endpoint {

					remote-endpoint =

					    <&funnel_qatb_in_funnel_turing_1>;

				};

			};

			port@1 {

				reg = <1>;

				funnel_turing_in_turing_etm0: endpoint {

				funnel_turing_1_in_turing_etm0: endpoint {

					slave-mode;

					remote-endpoint =

					    <&turing_etm0_out_funnel_turing>;

					    <&turing_etm0_out_funnel_turing_1>;

				};

			};

		};

						<&tpda_out_funnel_qatb>;

				};

			};

			port@2 {

				reg = <6>;

				funnel_qatb_in_funnel_lpass_1: endpoint {

					slave-mode;

					remote-endpoint =

					    <&funnel_lpass_1_out_funnel_qatb>;

				};

			};

			port@3 {

				reg = <7>;

				funnel_qatb_in_funnel_turing_1: endpoint {

					slave-mode;

					remote-endpoint =

					    <&funnel_turing_1_out_funnel_qatb>;

				};

			};

		};

	};

		qcom,inst-id = <13>;

		port{

			turing_etm0_out_funnel_turing: endpoint {

			turing_etm0_out_funnel_turing_1: endpoint {

				remote-endpoint =

					<&funnel_turing_in_turing_etm0>;

					<&funnel_turing_1_in_turing_etm0>;

			};

		};

	};

		qcom,inst-id = <5>;

		port {

			audio_etm0_out_funnel_lpass: endpoint {

				remote-endpoint = <&funnel_lpass_in_audio_etm0>;

			audio_etm0_out_funnel_lpass_1: endpoint {

				remote-endpoint =

					<&funnel_lpass_1_in_audio_etm0>;

			};

		};

	};

		clocks = <&clock_cpucc L3_CLUSTER0_VOTE_CLK>;

		governor = "performance";

		qcom,prepare-clk;

		freq-tbl-khz =

			< 300000 >,

			< 422400 >,

			< 499200 >,

			< 576000 >,

			< 652800 >,

			< 729600 >,

			< 806400 >,

			< 883200 >,

			< 960000 >,

			< 1036800 >,

			< 1094400 >,

			< 1209600 >,

			< 1305600 >;

	};

	l3_cpu4: qcom,l3-cpu4 {

		clocks = <&clock_cpucc L3_CLUSTER1_VOTE_CLK>;

		governor = "performance";

		qcom,prepare-clk;

		freq-tbl-khz =

			< 300000 >,

			< 422400 >,

			< 499200 >,

			< 576000 >,

			< 652800 >,

			< 729600 >,

			< 806400 >,

			< 883200 >,

			< 960000 >,

			< 1036800 >,

			< 1094400 >,

			< 1209600 >,

			< 1305600 >;

	};

	devfreq_l3lat_0: qcom,cpu0-l3lat-mon {