target/linux/bcm27xx/patches-6.1/950-0896-ASoC-bcm-Remove-dependency-on-BCM2835-I2S.patch

   1 From f476db1b71e8b82e5299168f963a2fefb7a395e2 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Fri, 1 Sep 2023 14:07:48 +0100
   4 Subject: [PATCH] ASoC: bcm: Remove dependency on BCM2835 I2S
   5
   6 These soundcard drivers don't rely on a specific I2S interface, so
   7 remove the dependency declarations.
   8
   9 See: https://github.com/raspberrypi/linux-2712/issues/111
  10
  11 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  12 ---
  13  sound/soc/bcm/Kconfig | 40 +---------------------------------------
  14  1 file changed, 1 insertion(+), 39 deletions(-)
  15
  16 --- a/sound/soc/bcm/Kconfig
  17 +++ b/sound/soc/bcm/Kconfig
  18 @@ -29,13 +29,11 @@ config SND_BCM63XX_I2S_WHISTLER
  19
  20  config SND_BCM2708_SOC_CHIPDIP_DAC
  21           tristate "Support for the ChipDip DAC"
  22 -         depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
  23           help
  24            Say Y or M if you want to add support for the ChipDip DAC soundcard
  25
  26  config SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD
  27         tristate "Support for Google voiceHAT soundcard"
  28 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
  29         select SND_SOC_VOICEHAT
  30         select SND_RPI_SIMPLE_SOUNDCARD
  31         help
  32 @@ -43,7 +41,6 @@ config SND_BCM2708_SOC_GOOGLEVOICEHAT_SO
  33
  34  config SND_BCM2708_SOC_HIFIBERRY_DAC
  35          tristate "Support for HifiBerry DAC"
  36 -        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
  37          select SND_SOC_PCM5102A
  38          select SND_RPI_SIMPLE_SOUNDCARD
  39          help
  40 @@ -51,7 +48,6 @@ config SND_BCM2708_SOC_HIFIBERRY_DAC
  41
  42  config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
  43          tristate "Support for HifiBerry DAC+"
  44 -        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
  45          select SND_SOC_PCM512x
  46          select SND_SOC_TPA6130A2
  47          select COMMON_CLK_HIFIBERRY_DACPRO
  48 @@ -60,7 +56,6 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
  49
  50  config SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD
  51          tristate "Support for HifiBerry DAC+ HD"
  52 -        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
  53          select SND_SOC_PCM179X_I2C
  54          select COMMON_CLK_HIFIBERRY_DACPLUSHD
  55          help
  56 @@ -68,7 +63,6 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
  57
  58  config SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC
  59          tristate "Support for HifiBerry DAC+ADC"
  60 -        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
  61          select SND_SOC_PCM512x_I2C
  62         select SND_SOC_DMIC
  63          select COMMON_CLK_HIFIBERRY_DACPRO
  64 @@ -77,7 +71,6 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
  65
  66  config SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO
  67          tristate "Support for HifiBerry DAC+ADC PRO"
  68 -        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
  69          select SND_SOC_PCM512x_I2C
  70          select SND_SOC_PCM186X_I2C
  71          select SND_SOC_TPA6130A2
  72 @@ -87,29 +80,25 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
  73
  74  config SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP
  75          tristate "Support for HifiBerry DAC+DSP"
  76 -        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
  77         select SND_RPI_SIMPLE_SOUNDCARD
  78          help
  79           Say Y or M if you want to add support for HifiBerry DSP-DAC.
  80
  81  config SND_BCM2708_SOC_HIFIBERRY_DIGI
  82          tristate "Support for HifiBerry Digi"
  83 -        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
  84          select SND_SOC_WM8804
  85          help
  86           Say Y or M if you want to add support for HifiBerry Digi S/PDIF output board.
  87
  88  config SND_BCM2708_SOC_HIFIBERRY_AMP
  89          tristate "Support for the HifiBerry Amp"
  90 -        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
  91          select SND_SOC_TAS5713
  92          select SND_RPI_SIMPLE_SOUNDCARD
  93          help
  94           Say Y or M if you want to add support for the HifiBerry Amp amplifier board.
  95
  96 - config SND_BCM2708_SOC_PIFI_40
  97 +config SND_BCM2708_SOC_PIFI_40
  98           tristate "Support for the PiFi-40 amp"
  99 -         depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 100           select SND_SOC_TAS571X
 101           select SND_PIFI_40
 102           help
 103 @@ -117,7 +106,6 @@ config SND_BCM2708_SOC_HIFIBERRY_AMP
 104
 105  config SND_BCM2708_SOC_RPI_CIRRUS
 106          tristate "Support for Cirrus Logic Audio Card"
 107 -        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 108          select SND_SOC_WM5102
 109          select SND_SOC_WM8804
 110          help
 111 @@ -126,7 +114,6 @@ config SND_BCM2708_SOC_RPI_CIRRUS
 112
 113  config SND_BCM2708_SOC_RPI_DAC
 114          tristate "Support for RPi-DAC"
 115 -        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 116          select SND_SOC_PCM1794A
 117          select SND_RPI_SIMPLE_SOUNDCARD
 118          help
 119 @@ -134,14 +121,12 @@ config SND_BCM2708_SOC_RPI_DAC
 120
 121  config SND_BCM2708_SOC_RPI_PROTO
 122         tristate "Support for Rpi-PROTO"
 123 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 124         select SND_SOC_WM8731_I2C
 125         help
 126           Say Y or M if you want to add support for Audio Codec Board PROTO (WM8731).
 127
 128  config SND_BCM2708_SOC_JUSTBOOM_BOTH
 129         tristate "Support for simultaneous JustBoom Digi and JustBoom DAC"
 130 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 131         select SND_SOC_WM8804
 132         select SND_SOC_PCM512x
 133         help
 134 @@ -153,14 +138,12 @@ config SND_BCM2708_SOC_JUSTBOOM_BOTH
 135
 136  config SND_BCM2708_SOC_JUSTBOOM_DAC
 137         tristate "Support for JustBoom DAC"
 138 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 139         select SND_SOC_PCM512x
 140         help
 141           Say Y or M if you want to add support for JustBoom DAC.
 142
 143  config SND_BCM2708_SOC_JUSTBOOM_DIGI
 144         tristate "Support for JustBoom Digi"
 145 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 146         select SND_SOC_WM8804
 147          select SND_RPI_WM8804_SOUNDCARD
 148         help
 149 @@ -168,21 +151,18 @@ config SND_BCM2708_SOC_JUSTBOOM_DIGI
 150
 151  config SND_BCM2708_SOC_IQAUDIO_CODEC
 152         tristate "Support for IQaudIO-CODEC"
 153 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 154         select SND_SOC_DA7213
 155         help
 156           Say Y or M if you want to add support for IQaudIO-CODEC.
 157
 158  config SND_BCM2708_SOC_IQAUDIO_DAC
 159         tristate "Support for IQaudIO-DAC"
 160 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 161         select SND_SOC_PCM512x_I2C
 162         help
 163           Say Y or M if you want to add support for IQaudIO-DAC.
 164
 165  config SND_BCM2708_SOC_IQAUDIO_DIGI
 166         tristate "Support for IQAudIO Digi"
 167 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 168         select SND_SOC_WM8804
 169         select SND_RPI_WM8804_SOUNDCARD
 170         help
 171 @@ -190,14 +170,12 @@ config SND_BCM2708_SOC_IQAUDIO_DIGI
 172
 173  config SND_BCM2708_SOC_I_SABRE_Q2M
 174          tristate "Support for Audiophonics I-Sabre Q2M DAC"
 175 -        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 176          select SND_SOC_I_SABRE_CODEC
 177          help
 178          Say Y or M if you want to add support for Audiophonics I-SABRE Q2M DAC
 179
 180  config SND_BCM2708_SOC_ADAU1977_ADC
 181         tristate "Support for ADAU1977 ADC"
 182 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 183         select SND_SOC_ADAU1977_I2C
 184         select SND_RPI_SIMPLE_SOUNDCARD
 185         help
 186 @@ -205,35 +183,30 @@ config SND_BCM2708_SOC_ADAU1977_ADC
 187
 188  config SND_AUDIOINJECTOR_PI_SOUNDCARD
 189         tristate "Support for audioinjector.net Pi add on soundcard"
 190 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 191         select SND_SOC_WM8731_I2C
 192         help
 193           Say Y or M if you want to add support for audioinjector.net Pi Hat
 194
 195  config SND_AUDIOINJECTOR_OCTO_SOUNDCARD
 196         tristate "Support for audioinjector.net Octo channel (Hat) soundcard"
 197 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 198         select SND_SOC_CS42XX8_I2C
 199         help
 200           Say Y or M if you want to add support for audioinjector.net octo add on
 201
 202  config SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD
 203         tristate "Support for audioinjector.net isolated DAC and ADC soundcard"
 204 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 205         select SND_SOC_CS4271_I2C
 206         help
 207           Say Y or M if you want to add support for audioinjector.net isolated soundcard
 208
 209  config SND_AUDIOSENSE_PI
 210         tristate "Support for AudioSense Add-On Soundcard"
 211 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 212         select SND_SOC_TLV320AIC32X4_I2C
 213         help
 214           Say Y or M if you want to add support for tlv320aic32x4 add-on
 215
 216  config SND_DIGIDAC1_SOUNDCARD
 217          tristate "Support for Red Rocks Audio DigiDAC1"
 218 -        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 219          select SND_SOC_WM8804
 220          select SND_SOC_WM8741
 221          help
 222 @@ -241,35 +214,30 @@ config SND_DIGIDAC1_SOUNDCARD
 223
 224  config SND_BCM2708_SOC_DIONAUDIO_LOCO
 225         tristate "Support for Dion Audio LOCO DAC-AMP"
 226 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 227         select SND_SOC_PCM5102a
 228         help
 229           Say Y or M if you want to add support for Dion Audio LOCO.
 230
 231  config SND_BCM2708_SOC_DIONAUDIO_LOCO_V2
 232         tristate "Support for Dion Audio LOCO-V2 DAC-AMP"
 233 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 234         select SND_SOC_PCM5122
 235         help
 236           Say Y or M if you want to add support for Dion Audio LOCO-V2.
 237
 238  config SND_BCM2708_SOC_ALLO_PIANO_DAC
 239         tristate "Support for Allo Piano DAC"
 240 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 241         select SND_SOC_PCM512x_I2C
 242         help
 243           Say Y or M if you want to add support for Allo Piano DAC.
 244
 245  config SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS
 246         tristate "Support for Allo Piano DAC Plus"
 247 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 248         select SND_SOC_PCM512x_I2C
 249         help
 250           Say Y or M if you want to add support for Allo Piano DAC Plus.
 251
 252  config SND_BCM2708_SOC_ALLO_BOSS_DAC
 253         tristate "Support for Allo Boss DAC"
 254 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 255         select SND_SOC_PCM512x_I2C
 256         select COMMON_CLK_HIFIBERRY_DACPRO
 257         help
 258 @@ -277,7 +245,6 @@ config SND_BCM2708_SOC_ALLO_BOSS_DAC
 259
 260  config SND_BCM2708_SOC_ALLO_BOSS2_DAC
 261         tristate "Support for Allo Boss2 DAC"
 262 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 263         depends on I2C
 264         select REGMAP_I2C
 265         select SND_AUDIO_GRAPH_CARD
 266 @@ -286,7 +253,6 @@ config SND_BCM2708_SOC_ALLO_BOSS2_DAC
 267
 268  config SND_BCM2708_SOC_ALLO_DIGIONE
 269         tristate "Support for Allo DigiOne"
 270 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 271         select SND_SOC_WM8804
 272         select SND_RPI_WM8804_SOUNDCARD
 273         help
 274 @@ -294,7 +260,6 @@ config SND_BCM2708_SOC_ALLO_DIGIONE
 275
 276  config SND_BCM2708_SOC_ALLO_KATANA_DAC
 277         tristate "Support for Allo Katana DAC"
 278 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 279         depends on I2C
 280         select REGMAP_I2C
 281         select SND_AUDIO_GRAPH_CARD
 282 @@ -303,14 +268,12 @@ config SND_BCM2708_SOC_ALLO_KATANA_DAC
 283
 284  config SND_BCM2708_SOC_FE_PI_AUDIO
 285         tristate "Support for Fe-Pi-Audio"
 286 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 287         select SND_SOC_SGTL5000
 288         help
 289           Say Y or M if you want to add support for Fe-Pi-Audio.
 290
 291  config SND_PISOUND
 292         tristate "Support for Blokas Labs pisound"
 293 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 294         select SND_RAWMIDI
 295         help
 296           Say Y or M if you want to add support for Blokas Labs pisound.
 297 @@ -328,7 +291,6 @@ config SND_RPI_WM8804_SOUNDCARD
 298
 299  config SND_DACBERRY400
 300         tristate "Support for DACBERRY400 Soundcard"
 301 -       depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 302         select SND_SOC_TLV320AIC3X_I2C
 303         help
 304           Say Y or M if you want to add support for tlv320aic3x add-on