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

Commit f678d6da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-5.2-rc1-part2' of... 

Merge tag 'char-misc-5.2-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc update part 2 from Greg KH:
 "Here is the "real" big set of char/misc driver patches for 5.2-rc1

  Loads of different driver subsystem stuff in here, all over the places:
   - thunderbolt driver updates
   - habanalabs driver updates
   - nvmem driver updates
   - extcon driver updates
   - intel_th driver updates
   - mei driver updates
   - coresight driver updates
   - soundwire driver cleanups and updates
   - fastrpc driver updates
   - other minor driver updates
   - chardev minor fixups

  Feels like this tree is getting to be a dumping ground of "small
  driver subsystems" these days. Which is fine with me, if it makes
  things easier for those subsystem maintainers.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-5.2-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (255 commits)
  intel_th: msu: Add current window tracking
  intel_th: msu: Add a sysfs attribute to trigger window switch
  intel_th: msu: Correct the block wrap detection
  intel_th: Add switch triggering support
  intel_th: gth: Factor out trace start/stop
  intel_th: msu: Factor out pipeline draining
  intel_th: msu: Switch over to scatterlist
  intel_th: msu: Replace open-coded list_{first,last,next}_entry variants
  intel_th: Only report useful IRQs to subdevices
  intel_th: msu: Start handling IRQs
  intel_th: pci: Use MSI interrupt signalling
  intel_th: Communicate IRQ via resource
  intel_th: Add "rtit" source device
  intel_th: Skip subdevices if their MMIO is missing
  intel_th: Rework resource passing between glue layers and core
  intel_th: SPDX-ify the documentation
  intel_th: msu: Fix single mode with IOMMU
  coresight: funnel: Support static funnel
  dt-bindings: arm: coresight: Unify funnel DT binding
  coresight: replicator: Add new device id for static replicator
  ...
parents 2310673c aad14ad3

Documentation/ABI/stable/sysfs-bus-nvmem

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ Description: 
		This file allows user to read/write the raw NVMEM contents.

		Permissions for write to this file depends on the nvmem

		provider configuration.

		Note: This file is only present if CONFIG_NVMEM_SYSFS

		is enabled



		ex:

		hexdump /sys/bus/nvmem/devices/qfprom0/nvmem

Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc

+8 −0
Original line number Diff line number Diff line
@@ -30,4 +30,12 @@ Description: (RW) Configure MSC buffer size for "single" or "multi" modes. 
		there are no active users and tracing is not enabled) and then

		allocates a new one.



What:		/sys/bus/intel_th/devices/<intel_th_id>-msc<msc-id>/win_switch

Date:		May 2019

KernelVersion:	5.2

Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>

Description:	(RW) Trigger window switch for the MSC's buffer, in

		multi-window mode. In "multi" mode, accepts writes of "1", thereby

		triggering a window switch for the buffer. Returns an error in any

		other operating mode or attempts to write something other than "1".

Documentation/ABI/testing/sysfs-class-mei

+15 −0
Original line number Diff line number Diff line
@@ -65,3 +65,18 @@ Description: Display the ME firmware version. 
		<platform>:<major>.<minor>.<milestone>.<build_no>.

		There can be up to three such blocks for different

		FW components.



What:		/sys/class/mei/meiN/dev_state

Date:		Mar 2019

KernelVersion:	5.1

Contact:	Tomas Winkler <tomas.winkler@intel.com>

Description:	Display the ME device state.



		The device state can have following values:

		INITIALIZING

		INIT_CLIENTS

		ENABLED

		RESETTING

		DISABLED

		POWER_DOWN

		POWER_UP

Documentation/devicetree/bindings/arm/coresight.txt

+53 −7
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ through the intermediate links connecting the source to the currently selected 
sink. Each CoreSight component device should use these properties to describe

its hardware characteristcs.



* Required properties for all components *except* non-configurable replicators:

* Required properties for all components *except* non-configurable replicators

  and non-configurable funnels:



	* compatible: These have to be supplemented with "arm,primecell" as

	  drivers are using the AMBA bus interface.  Possible values include:
@@ -24,8 +25,10 @@ its hardware characteristcs. 
		  discovered at boot time when the device is probed.

			"arm,coresight-tmc", "arm,primecell";



		- Trace Funnel:

			"arm,coresight-funnel", "arm,primecell";

		- Trace Programmable Funnel:

			"arm,coresight-dynamic-funnel", "arm,primecell";

			"arm,coresight-funnel", "arm,primecell"; (OBSOLETE. For

				backward compatibility and will be removed)



		- Embedded Trace Macrocell (version 3.x) and

					Program Flow Trace Macrocell:
@@ -65,11 +68,17 @@ its hardware characteristcs. 
	  "stm-stimulus-base", each corresponding to the areas defined in "reg".



* Required properties for devices that don't show up on the AMBA bus, such as

  non-configurable replicators:

  non-configurable replicators and non-configurable funnels:



	* compatible: Currently supported value is (note the absence of the

	  AMBA markee):

		- "arm,coresight-replicator"

		- Coresight Non-configurable Replicator:

			"arm,coresight-static-replicator";

			"arm,coresight-replicator"; (OBSOLETE. For backward

				compatibility and will be removed)



		- Coresight Non-configurable Funnel:

			"arm,coresight-static-funnel";



	* port or ports: see "Graph bindings for Coresight" below.
@@ -169,7 +178,7 @@ Example: 
		/* non-configurable replicators don't show up on the

		 * AMBA bus.  As such no need to add "arm,primecell".

		 */

		compatible = "arm,coresight-replicator";

		compatible = "arm,coresight-static-replicator";



		out-ports {

			#address-cells = <1>;
@@ -200,8 +209,45 @@ Example: 
		};

	};



	funnel {

		/*

		 * non-configurable funnel don't show up on the AMBA

		 * bus.  As such no need to add "arm,primecell".

		 */

		compatible = "arm,coresight-static-funnel";

		clocks = <&crg_ctrl HI3660_PCLK>;

		clock-names = "apb_pclk";



		out-ports {

			port {

				combo_funnel_out: endpoint {

					remote-endpoint = <&top_funnel_in>;

				};

			};

		};



		in-ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				combo_funnel_in0: endpoint {

					remote-endpoint = <&cluster0_etf_out>;

				};

			};



			port@1 {

				reg = <1>;

				combo_funnel_in1: endpoint {

					remote-endpoint = <&cluster1_etf_out>;

				};

			};

		};

	};



	funnel@20040000 {

		compatible = "arm,coresight-funnel", "arm,primecell";

		compatible = "arm,coresight-dynamic-funnel", "arm,primecell";

		reg = <0 0x20040000 0 0x1000>;



		clocks = <&oscclk6a>;

Documentation/devicetree/bindings/gnss/u-blox.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 


- compatible	: Must be one of



			"u-blox,neo-6m"

			"u-blox,neo-8"

			"u-blox,neo-m8"