Commit 479f18cc authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge tag 'i2c-host-6.11' of... 

Merge tag 'i2c-host-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-mergewindow

This release includes significant updates, with the primary
change being the renaming from "master/slave" to
"controller/target" to adhere to I2C v7 and SMBus 3.2 standards.

New Support:

 - Added support for Intel Arrow Lake-H.
 - Added I2C support in the Arioha SoC by linking the Mediatek
   I2C controller.

Cleanups:

 - Added the MODULE_DESCRIPTION() macro, resolving a modpost
   warning in the ALi 1563 Southbridge driver.
 - Constified the regmap_config declaration in the i2c-designware
   driver.
 - Improved the coding style in the Renesas R-Car driver by
   removing unnecessary semicolons after brackets.

General improvements:

 - In the OMAP device, replaced NOIRQ_SYSTEM_SLEEP_PM_OPS with
   RUNTIME_PM_OPS to enable waking up the controller during
   suspend() before suspend_noirq() kicks in.
 - Improved logging in the Xilinx driver.
 - Added a warning (WARN()) in the Renesas R-Car driver for
   spurious interrupts.

DTS Changes:

 - Removed address-cell and size-cell from the Atmel at91sam,
   nVidia Tegra 20, and Samsung S3c2410 devices.
 - Fixed Texas Instruments OMAP4 I2C controller to comply with
   the i2c-controller.yaml schema.
 - Improved indentation in DTS examples for several I2C devices.
 - Converted the NXP LPC1788 binding to the dt-schema.
 - Added documentation for the compatible string
   thead,th1520-i2c.
 - Added the "power-domains" property for the Meson I2C driver.
parents 500c20fe ab1c7ea4

CREDITS

+7 −1
Original line number Diff line number Diff line
@@ -1214,6 +1214,10 @@ D: UDF filesystem 
S: (ask for current address)

S: USA



N: Larry Finger

E: Larry.Finger@lwfinger.net

D: Maintainer of wireless drivers, too many to list here



N: Jürgen Fischer

E: fischer@norbit.de

D: Author of Adaptec AHA-152x SCSI driver
@@ -3146,9 +3150,11 @@ S: Triftstra=DFe 55 
S: 13353 Berlin

S: Germany



N: Gustavo Pimental

N: Gustavo Pimentel

E: gustavo.pimentel@synopsys.com

D: PCI driver for Synopsys DesignWare

D: Synopsys DesignWare eDMA driver

D: Synopsys DesignWare xData traffic generator



N: Emanuel Pirker

E: epirker@edu.uni-klu.ac.at

Documentation/admin-guide/kernel-parameters.txt

+0 −19
Original line number Diff line number Diff line
@@ -788,25 +788,6 @@ 
			Documentation/networking/netconsole.rst for an

			alternative.



		<DEVNAME>:<n>.<n>[,options]

			Use the specified serial port on the serial core bus.

			The addressing uses DEVNAME of the physical serial port

			device, followed by the serial core controller instance,

			and the serial port instance. The options are the same

			as documented for the ttyS addressing above.



			The mapping of the serial ports to the tty instances

			can be viewed with:



			$ ls -d /sys/bus/serial-base/devices/*:*.*/tty/*

			/sys/bus/serial-base/devices/00:04:0.0/tty/ttyS0



			In the above example, the console can be addressed with

			console=00:04:0.0. Note that a console addressed this

			way will only get added when the related device driver

			is ready. The use of an earlycon parameter in addition to

			the console may be desired for console output early on.



		uart[8250],io,<addr>[,options]

		uart[8250],mmio,<addr>[,options]

		uart[8250],mmio16,<addr>[,options]

Documentation/arch/riscv/cmodx.rst

+2 −2
Original line number Diff line number Diff line
@@ -62,10 +62,10 @@ cmodx.c:: 
		printf("Value before cmodx: %d\n", value);



		// Call prctl before first fence.i is called inside modify_instruction

		prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX_ON, PR_RISCV_CTX_SW_FENCEI, PR_RISCV_SCOPE_PER_PROCESS);

		prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX, PR_RISCV_CTX_SW_FENCEI_ON, PR_RISCV_SCOPE_PER_PROCESS);

		modify_instruction();

		// Call prctl after final fence.i is called in process

		prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX_OFF, PR_RISCV_CTX_SW_FENCEI, PR_RISCV_SCOPE_PER_PROCESS);

		prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX, PR_RISCV_CTX_SW_FENCEI_OFF, PR_RISCV_SCOPE_PER_PROCESS);



		value = get_value();

		printf("Value after cmodx: %d\n", value);

Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ properties: 
  clocks:

    minItems: 1



  power-domains:

    maxItems: 1



required:

  - compatible

  - reg

Documentation/devicetree/bindings/i2c/atmel,at91sam-i2c.yaml

+2 −8
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
              - microchip,sam9x60-i2c

      - items:

          - enum:

              - microchip,sama7d65-i2c

              - microchip,sama7g5-i2c

              - microchip,sam9x7-i2c

          - const: microchip,sam9x60-i2c
@@ -36,12 +37,6 @@ properties: 
  interrupts:

    maxItems: 1



  "#address-cells":

    const: 1



  "#size-cells":

    const: 0



  clocks:

    maxItems: 1
@@ -72,8 +67,6 @@ required: 
  - compatible

  - reg

  - interrupts

  - "#address-cells"

  - "#size-cells"

  - clocks



allOf:
@@ -86,6 +79,7 @@ allOf: 
              - atmel,sama5d4-i2c

              - atmel,sama5d2-i2c

              - microchip,sam9x60-i2c

              - microchip,sama7d65-i2c

              - microchip,sama7g5-i2c

    then:

      properties: