Commit 9b838a3c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'tags/sound-sdw-kconfig-fixes' into for-linus 

ALSA/ASoC/SOF/SoundWire: fix Kconfig issues

In January, Intel kbuild bot and Arnd Bergmann reported multiple
issues with randconfig. This patchset builds on Arnd's suggestions to

a) expose ACPI and PCI devices in separate modules, while sof-acpi-dev
and sof-pci-dev become helpers. This will result in minor changes
required for developers/testers, i.e. modprobe snd-sof-pci will no
longer result in a probe. The SOF CI was already updated to deal with
this module dependency change and introduction of new modules.

b) Fix SOF/SoundWire/DSP_config dependencies by moving the code
required to detect SoundWire presence in ACPI tables to sound/hda.

Link: https://lore.kernel.org/r/20210302003125.1178419-1-pierre-louis.bossart@linux.intel.com
parents a864e8f1 ffd7e705

.clang-format

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ ForEachMacros: 
  - 'css_for_each_child'

  - 'css_for_each_descendant_post'

  - 'css_for_each_descendant_pre'

  - 'cxl_for_each_cmd'

  - 'device_for_each_child_node'

  - 'dma_fence_chain_for_each'

  - 'do_for_each_ftrace_op'

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
*.c.[012]*.*

*.dt.yaml

*.dtb

*.dtbo

*.dtb.S

*.dwo

*.elf
@@ -41,6 +42,7 @@ 
*.so.dbg

*.su

*.symtypes

*.symversions

*.tab.[ch]

*.tar

*.xz

.mailmap

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ Juha Yrjola <at solidboot.com> 
Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>

Kamil Konieczny <k.konieczny@samsung.com> <k.konieczny@partner.samsung.com>

Kay Sievers <kay.sievers@vrfy.org>

Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>

Kees Cook <keescook@chromium.org> <keescook@google.com>
@@ -238,6 +237,7 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com> 
Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Miguel Ojeda <ojeda@kernel.org> <miguel.ojeda.sandonis@gmail.com>

Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>

Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>

Mike Rapoport <rppt@kernel.org> <rppt@linux.ibm.com>

CREDITS

+7 −10
Original line number Diff line number Diff line
@@ -1244,10 +1244,10 @@ S: 80050-430 - Curitiba - Paraná 
S: Brazil



N: Oded Gabbay

E: oded.gabbay@gmail.com

D: HabanaLabs and AMD KFD maintainer

S: 12 Shraga Raphaeli

S: Petah-Tikva, 4906418

E: ogabbay@kernel.org

D: HabanaLabs maintainer

S: 29 Duchifat St.

S: Ra'anana 4372029

S: Israel



N: Kumar Gala
@@ -2841,14 +2841,11 @@ S: Subiaco, 6008 
S: Perth, Western Australia

S: Australia



N: Miguel Ojeda Sandonis

E: miguel.ojeda.sandonis@gmail.com

W: http://miguelojeda.es

W: http://jair.lab.fi.uva.es/~migojed/

N: Miguel Ojeda

E: ojeda@kernel.org

W: https://ojeda.dev

D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers.

D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*)

S: C/ Mieses 20, 9-B

S: Valladolid 47009

S: Spain



N: Peter Oruba

Documentation/ABI/stable/sysfs-bus-fsl-mc

0 → 100644
+19 −0
Original line number Diff line number Diff line 
What:		/sys/bus/fsl-mc/rescan

Date:		January 2021

KernelVersion:	5.12

Contact:	Ioana Ciornei <ioana.ciornei@nxp.com>

Description:	Writing a non-zero value to this attribute will

		force a rescan of fsl-mc bus in the system and

		synchronize the objects under fsl-mc bus and the

		Management Complex firmware.

Users:		Userspace drivers and management tools



What:		/sys/bus/fsl-mc/autorescan

Date:		January 2021

KernelVersion:	5.12

Contact:	Ioana Ciornei <ioana.ciornei@nxp.com>

Description:	Writing a zero value to this attribute will

		disable the DPRC IRQs on which automatic rescan

		of the fsl-mc bus is performed. A non-zero value

		will enable the DPRC IRQs.

Users:		Userspace drivers and management tools