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

Commit 76770664 authored by David Woodhouse's avatar David Woodhouse Committed by David Woodhouse
Browse files

firmware: convert korg1212 driver to use firmware loader exclusively 



Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 59890f74

firmware/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE)) 
# accurate. In the latter case it doesn't matter -- it'll use $(fw-shipped-all).

# But be aware that the config file might not be included at all.



fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp



fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)

firmware/WHENCE

0 → 100644
+19 −0
Original line number Diff line number Diff line 
             **********

             * WHENCE *

             **********



This file attempts to document the origin and licensing information,

if known, for each piece of firmware distributed for use with the Linux

kernel.



--------------------------------------------------------------------------



Driver: korg1212 -- Korg 1212 IO audio device



File: korg/k1212.dsp



Licence: Unknown



Found in alsa-firmware package in hex form; no licensing information.



--------------------------------------------------------------------------

firmware/korg/k1212.dsp.ihex

0 → 100644
+987 −0

File added.

Preview size limit exceeded, changes collapsed.

sound/pci/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -734,7 +734,6 @@ config SND_INTEL8X0M 
config SND_KORG1212

	tristate "Korg 1212 IO"

	depends on SND

	select FW_LOADER if !SND_KORG1212_FIRMWARE_IN_KERNEL

	select SND_PCM

	help

	  Say Y here to include support for Korg 1212IO soundcards.
@@ -742,15 +741,6 @@ config SND_KORG1212 
	  To compile this driver as a module, choose M here: the module

	  will be called snd-korg1212.



config SND_KORG1212_FIRMWARE_IN_KERNEL

	bool "In-kernel firmware for Korg1212 driver"

	depends on SND_KORG1212

	default y

	help

	  Say Y here to include the static firmware built in the kernel

	  for the Korg1212 driver.  If you choose N here, you need to

	  install the firmware files from the alsa-firmware package.



config SND_MAESTRO3

	tristate "ESS Allegro/Maestro3"

	depends on SND

sound/pci/korg1212/korg1212-firmware.h

deleted100644 → 0
+0 −987

File deleted.

Preview size limit exceeded, changes collapsed.