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

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

Pull char/misc and other driver subsystem updates from Greg KH:
 "Here is the big set of char/misc and a number of other driver
  subsystem updates for 6.9-rc1. Included in here are:

   - IIO driver updates, loads of new ones and evolution of existing ones

   - coresight driver updates

   - const cleanups for many driver subsystems

   - speakup driver additions

   - platform remove callback void cleanups

   - mei driver updates

   - mhi driver updates

   - cdx driver updates for MSI interrupt handling

   - nvmem driver updates

   - other smaller driver updates and cleanups, full details in the
    shortlog

  All of these have been in linux-next for a long time with no reported
  issue, other than a build warning for the speakup driver"

The build warning hits clang and is a gcc (and C23) extension, and is
fixed up in the merge.

Link: https://lore.kernel.org/all/20240321134831.GA2762840@dev-arch.thelio-3990X/

* tag 'char-misc-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (279 commits)
  binder: remove redundant variable page_addr
  uio_dmem_genirq: UIO_MEM_DMA_COHERENT conversion
  uio_pruss: UIO_MEM_DMA_COHERENT conversion
  cnic,bnx2,bnx2x: use UIO_MEM_DMA_COHERENT
  uio: introduce UIO_MEM_DMA_COHERENT type
  cdx: add MSI support for CDX bus
  pps: use cflags-y instead of EXTRA_CFLAGS
  speakup: Add /dev/synthu device
  speakup: Fix 8bit characters from direct synth
  parport: sunbpp: Convert to platform remove callback returning void
  parport: amiga: Convert to platform remove callback returning void
  char: xillybus: Convert to platform remove callback returning void
  vmw_balloon: change maintainership
  MAINTAINERS: change the maintainer for hpilo driver
  char: xilinx_hwicap: Fix NULL vs IS_ERR() bug
  hpet: remove hpets::hp_clocksource
  platform: goldfish: move the separate 'default' propery for CONFIG_GOLDFISH
  char: xilinx_hwicap: drop casting to void in dev_set_drvdata
  greybus: move is_gb_* functions out of greybus.h
  greybus: Remove usage of the deprecated ida_simple_xx() API
  ...
parents 0a59b3f4 367b3560

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -439,6 +439,8 @@ Mukesh Ojha <quic_mojha@quicinc.com> <mojha@codeaurora.org> 
Muna Sinada <quic_msinada@quicinc.com> <msinada@codeaurora.org>

Murali Nalajala <quic_mnalajal@quicinc.com> <mnalajal@codeaurora.org>

Mythri P K <mythripk@ti.com>

Nadav Amit <nadav.amit@gmail.com> <namit@vmware.com>

Nadav Amit <nadav.amit@gmail.com> <namit@cs.technion.ac.il>

Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>

Naoya Horiguchi <naoya.horiguchi@nec.com> <n-horiguchi@ah.jp.nec.com>

Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>

Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm

+87 −0
Original line number Diff line number Diff line
@@ -170,3 +170,90 @@ Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_t 
Description:

		(RW) Set/Get the MSR(mux select register) for the DSB subunit

		TPDM.



What:		/sys/bus/coresight/devices/<tpdm-name>/cmb_mode

Date:		January 2024

KernelVersion	6.9

Contact:	Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>

Description:	(Write) Set the data collection mode of CMB tpdm. Continuous

		change creates CMB data set elements on every CMBCLK edge.

		Trace-on-change creates CMB data set elements only when a new

		data set element differs in value from the previous element

		in a CMB data set.



		Accepts only one of the 2 values -  0 or 1.

		0 : Continuous CMB collection mode.

		1 : Trace-on-change CMB collection mode.



What:		/sys/bus/coresight/devices/<tpdm-name>/cmb_trig_patt/xpr[0:1]

Date:		January 2024

KernelVersion	6.9

Contact:	Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>

Description:

		(RW) Set/Get the value of the trigger pattern for the CMB

		subunit TPDM.



What:		/sys/bus/coresight/devices/<tpdm-name>/cmb_trig_patt/xpmr[0:1]

Date:		January 2024

KernelVersion	6.9

Contact:	Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>

Description:

		(RW) Set/Get the mask of the trigger pattern for the CMB

		subunit TPDM.



What:		/sys/bus/coresight/devices/<tpdm-name>/dsb_patt/tpr[0:1]

Date:		January 2024

KernelVersion	6.9

Contact:	Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>

Description:

		(RW) Set/Get the value of the pattern for the CMB subunit TPDM.



What:		/sys/bus/coresight/devices/<tpdm-name>/dsb_patt/tpmr[0:1]

Date:		January 2024

KernelVersion	6.9

Contact:	Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>

Description:

		(RW) Set/Get the mask of the pattern for the CMB subunit TPDM.



What:		/sys/bus/coresight/devices/<tpdm-name>/cmb_patt/enable_ts

Date:		January 2024

KernelVersion	6.9

Contact:	Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>

Description:

		(Write) Set the pattern timestamp of CMB tpdm. Read

		the pattern timestamp of CMB tpdm.



		Accepts only one of the 2 values -  0 or 1.

		0 : Disable CMB pattern timestamp.

		1 : Enable CMB pattern timestamp.



What:		/sys/bus/coresight/devices/<tpdm-name>/cmb_trig_ts

Date:		January 2024

KernelVersion	6.9

Contact:	Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>

Description:

		(RW) Set/Get the trigger timestamp of the CMB for tpdm.



		Accepts only one of the 2 values -  0 or 1.

		0 : Set the CMB trigger type to false

		1 : Set the CMB trigger type to true



What:		/sys/bus/coresight/devices/<tpdm-name>/cmb_ts_all

Date:		January 2024

KernelVersion	6.9

Contact:	Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>

Description:

		(RW) Read or write the status of timestamp upon all interface.

		Only value 0 and 1  can be written to this node. Set this node to 1 to requeset

		timestamp to all trace packet.

		Accepts only one of the 2 values -  0 or 1.

		0 : Disable the timestamp of all trace packets.

		1 : Enable the timestamp of all trace packets.



What:		/sys/bus/coresight/devices/<tpdm-name>/cmb_msr/msr[0:31]

Date:		January 2024

KernelVersion	6.9

Contact:	Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>

Description:

		(RW) Set/Get the MSR(mux select register) for the CMB subunit

		TPDM.

Documentation/ABI/testing/sysfs-bus-iio-adc-pac1934

0 → 100644
+9 −0
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/in_shunt_resistorY

KernelVersion:	6.7

Contact:	linux-iio@vger.kernel.org

Description:

		The value of the shunt resistor may be known only at runtime

		and set by a client application. This attribute allows to

		set its value in micro-ohms. X is the IIO index of the device.

		Y is the channel number. The value is used to calculate

		current, power and accumulated energy.

Documentation/devicetree/bindings/arm/qcom,coresight-tpdm.yaml

+37 −3
Original line number Diff line number Diff line
@@ -44,14 +44,21 @@ properties: 
    minItems: 1

    maxItems: 2



  qcom,dsb-element-size:

  qcom,dsb-element-bits:

    description:

      Specifies the DSB(Discrete Single Bit) element size supported by

      the monitor. The associated aggregator will read this size before it

      is enabled. DSB element size currently only supports 32-bit and 64-bit.

    $ref: /schemas/types.yaml#/definitions/uint8

    enum: [32, 64]



  qcom,cmb-element-bits:

    description:

      Specifies the CMB(Continuous Multi-Bit) element size supported by

      the monitor. The associated aggregator will read this size before it

      is enabled. CMB element size currently only supports 8-bit, 32-bit

      and 64-bit.

    enum: [8, 32, 64]



  qcom,dsb-msrs-num:

    description:

      Specifies the number of DSB(Discrete Single Bit) MSR(mux select register)
@@ -61,6 +68,15 @@ properties: 
    minimum: 0

    maximum: 32



  qcom,cmb-msrs-num:

    description:

      Specifies the number of CMB MSR(mux select register) registers supported

      by the monitor. If this property is not configured or set to 0, it means

      this TPDM doesn't support CMB MSR.

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 32



  clocks:

    maxItems: 1
@@ -94,7 +110,7 @@ examples: 
      compatible = "qcom,coresight-tpdm", "arm,primecell";

      reg = <0x0684c000 0x1000>;



      qcom,dsb-element-size = /bits/ 8 <32>;

      qcom,dsb-element-bits = <32>;

      qcom,dsb-msrs-num = <16>;



      clocks = <&aoss_qmp>;
@@ -110,4 +126,22 @@ examples: 
      };

    };



    tpdm@6c29000 {

      compatible = "qcom,coresight-tpdm", "arm,primecell";

      reg = <0x06c29000 0x1000>;



      qcom,cmb-element-bits = <64>;

      qcom,cmb-msrs-num = <32>;



      clocks = <&aoss_qmp>;

      clock-names = "apb_pclk";



      out-ports {

        port {

          tpdm_ipcc_out_funnel_center: endpoint {

            remote-endpoint = <&funnel_center_in_tpdm_ipcc>;

          };

        };

      };

    };

...

Documentation/devicetree/bindings/iio/adc/adc.yaml

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ properties: 
    maxItems: 1



  label:

    $ref: /schemas/types.yaml#/definitions/string

    description: Unique name to identify which channel this is.



  bipolar: