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

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

Merge "coresight: remove tlmm api references from tpiu driver"

parents de6c83ce 03c4cda2

Documentation/devicetree/bindings/coresight/coresight.txt

+14 −4
Original line number Diff line number Diff line
@@ -158,12 +158,22 @@ Optional properties: 
		spi/ppi, b is the interrupt number and c is the mask,

- interrupt-names : a list of strings that map in order to the list of

		    interrupts specified in the 'interrupts' property.

- qcom,nidnt : indicates NIDnT serial wire debug support present. Used for tpiu

	       component

- qcom,sg-enable : indicates whether scatter gather feature is supported for TMC

		   ETR configuration.

- qcom,nidnthw : indicates NIDnT hardware sensing support present. Used for tpiu

	         component

- qcom,nidntsw : boolean, indicating NIDnT software debug or trace support

		 present. Used for tpiu component

- qcom,nidnthw : boolean, indicating NIDnT hardware sensing support present.

		 Used for tpiu component

  qcom,nidntsw and qcom,nidnthw are mutually exclusive properties, either of

  these may specified for tpiu component

- qcom,nidnt-swduart : boolean, indicating NIDnT swd uart support present. Used

		       for tpiu component

- qcom,nidnt-swdtrc : boolean, indicating NIDnT swd trace support present. Used

		      for tpiu component

- qcom,nidnt-jtag : boolean, indicating NIDnT jtag debug support present. Used

		    for tpiu component

- qcom,nidnt-spmi : boolean, indicating NIDnT spmi debug support present. Used

		    for tpiu component

- nidnt-gpio : specifies gpio for NIDnT hardware detection

- nidnt-gpio-polarity : specifies gpio polarity for NIDnT hardware detection

arch/arm/boot/dts/qcom/apq8084-coresight.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -47,7 +47,9 @@ 
		qcom,vdd-io-voltage-level = <2950000 2950000>;

		qcom,vdd-io-current-level = <200 22000>;



		qcom,nidnt;

		qcom,nidntsw;

		qcom,nidnt-swduart;

		qcom,nidnt-swdtrc;

	};



	replicator: replicator@fc324000 {

arch/arm/boot/dts/qcom/mdm9630-coresight.dtsi

+6 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013 - 2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -29,12 +29,15 @@ 


	tpiu: tpiu@fc320000 {

		compatible = "arm,coresight-tpiu";

		reg = <0xfc320000 0x1000>;

		reg-names = "tpiu-base";

		reg = <0xfc320000 0x1000>,

		      <0xfd512000 0x1000>;

		reg-names = "tpiu-base", "nidnt-base";



		coresight-id = <1>;

		coresight-name = "coresight-tpiu";

		coresight-nr-inports = <1>;



		qcom,nidntsw;

	};



	replicator: replicator@fc324000 {

arch/arm/boot/dts/qcom/msm8226-coresight.dtsi

+5 −2
Original line number Diff line number Diff line
@@ -30,8 +30,9 @@ 


	tpiu: tpiu@fc318000 {

		compatible = "arm,coresight-tpiu";

		reg = <0xfc318000 0x1000>;

		reg-names = "tpiu-base";

		reg = <0xfc318000 0x1000>,

		      <0xfd512000 0x1000>;

		reg-names = "tpiu-base", "nidnt-base";



		coresight-id = <1>;

		coresight-name = "coresight-tpiu";
@@ -46,6 +47,8 @@ 


		qcom,vdd-io-voltage-level = <2950000 2950000>;

		qcom,vdd-io-current-level = <6 22000>;



		qcom,nidntsw;

	};



	replicator: replicator@fc31c000 {

arch/arm/boot/dts/qcom/msm8610-coresight.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -48,7 +48,9 @@ 
		qcom,vdd-io-voltage-level = <2950000 2950000>;

		qcom,vdd-io-current-level = <200 50000>;



		qcom,nidnt;

		qcom,nidntsw;

		qcom,nidnt-swduart;

		qcom,nidnt-swdtrc;

	};



	replicator: replicator@fc324000 {