Commit a6d4b685 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-next' into for-linus 



Pull 5.18 development branch

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents efb6402c 8a580a26

Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
      - const: nvidia,tegra30-hda

      - items:

          - enum:

              - nvidia,tegra234-hda

              - nvidia,tegra194-hda

              - nvidia,tegra186-hda

              - nvidia,tegra210-hda
@@ -41,9 +42,11 @@ properties: 
    maxItems: 1



  clocks:

    minItems: 2

    maxItems: 3



  clock-names:

    minItems: 2

    items:

      - const: hda

      - const: hda2hdmi

Documentation/sound/designs/control-names.rst

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ CHANNEL 
Front		front left/right channels

Surround	rear left/right in 4.0/5.1 surround

CLFE		C/LFE channels

Center		center cannel

Center		center channel

LFE		LFE channel

Side		side left/right for 7.1 surround

============	==================================================

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -388,11 +388,11 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

F:	drivers/acpi/arm64









ACPI I2C MULTI INSTANTIATE DRIVER









ACPI SERIAL MULTI INSTANTIATE DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









L:	platform-driver-x86@vger.kernel.org









S:	Maintained









F:	drivers/platform/x86/i2c-multi-instantiate.c









F:	drivers/platform/x86/serial-multi-instantiate.c

















ACPI PCC(Platform Communication Channel) MAILBOX DRIVER









M:	Sudeep Holla <sudeep.holla@arm.com>
































drivers/acpi/scan.c



+10
−6






























Original line number
Diff line number
Diff line







@@ -1734,17 +1734,21 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)







	bool is_serial_bus_slave = false;









	static const struct acpi_device_id ignore_serial_bus_ids[] = {









	/*









	 * These devices have multiple I2cSerialBus resources and an i2c-client









	 * must be instantiated for each, each with its own i2c_device_id.









	 * Normally we only instantiate an i2c-client for the first resource,









	 * using the ACPI HID as id. These special cases are handled by the









	 * drivers/platform/x86/i2c-multi-instantiate.c driver, which knows









	 * which i2c_device_id to use for each resource.









	 * These devices have multiple SerialBus resources and a client









	 * device must be instantiated for each of them, each with









	 * its own device id.









	 * Normally we only instantiate one client device for the first









	 * resource, using the ACPI HID as id. These special cases are handled









	 * by the drivers/platform/x86/serial-multi-instantiate.c driver, which









	 * knows which client device id to use for each resource.









	 */









		{"BSG1160", },









		{"BSG2150", },









		{"CSC3551", },









		{"INT33FE", },









		{"INT3515", },









		/* Non-conforming _HID for Cirrus Logic already released */









		{"CLSA0100", },









	/*









	 * HIDs of device with an UartSerialBusV2 resource for which userspace









	 * expects a regular tty cdev to be created (instead of the in kernel
































drivers/platform/x86/Kconfig



+6
−6






























Original line number
Diff line number
Diff line







@@ -990,16 +990,16 @@ config TOPSTAR_LAPTOP

















	  If you have a Topstar laptop, say Y or M here.



















config I2C_MULTI_INSTANTIATE









	tristate "I2C multi instantiate pseudo device driver"









	depends on I2C && ACPI









config SERIAL_MULTI_INSTANTIATE









	tristate "Serial bus multi instantiate pseudo device driver"









	depends on I2C && SPI && ACPI









	help









	  Some ACPI-based systems list multiple i2c-devices in a single ACPI









	  firmware-node. This driver will instantiate separate i2c-clients









	  Some ACPI-based systems list multiple devices in a single ACPI









	  firmware-node. This driver will instantiate separate clients









	  for each device in the firmware-node.



















	  To compile this driver as a module, choose M here: the module









	  will be called i2c-multi-instantiate.









	  will be called serial-multi-instantiate.



















config MLX_PLATFORM









	tristate "Mellanox Technologies platform support"