Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1699516 > unrolled thread

[PATCH 1/3] sound: ASoC: tegra: Remove SoC-specific Kconfig depends and selects

Started byPaul Kocialkowski <contact@paulk.fr>
First post2017-07-30 13:30 +0200
Last post2017-07-31 12:30 +0200
Articles 6 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/3] sound: ASoC: tegra: Remove SoC-specific Kconfig depends and selects Paul Kocialkowski <contact@paulk.fr> - 2017-07-30 13:30 +0200
    [PATCH 2/3] ARM: configs: Add Tegra I2S interfaces to tegra_defconfig Paul Kocialkowski <contact@paulk.fr> - 2017-07-30 13:30 +0200
      Re: [PATCH 2/3] ARM: configs: Add Tegra I2S interfaces to  tegra_defconfig Thierry Reding <thierry.reding@gmail.com> - 2017-07-31 12:30 +0200
    [PATCH 3/3] ARM: configs: Add Tegra I2S interfaces to multi_v7_defconfig Paul Kocialkowski <contact@paulk.fr> - 2017-07-30 13:30 +0200
      Re: [PATCH 3/3] ARM: configs: Add Tegra I2S interfaces to  multi_v7_defconfig Thierry Reding <thierry.reding@gmail.com> - 2017-07-31 12:30 +0200
    Re: [PATCH 1/3] sound: ASoC: tegra: Remove SoC-specific Kconfig  depends and selects Thierry Reding <thierry.reding@gmail.com> - 2017-07-31 12:30 +0200

#1699516 — [PATCH 1/3] sound: ASoC: tegra: Remove SoC-specific Kconfig depends and selects

FromPaul Kocialkowski <contact@paulk.fr>
Date2017-07-30 13:30 +0200
Subject[PATCH 1/3] sound: ASoC: tegra: Remove SoC-specific Kconfig depends and selects
Message-ID<u8UA1-856-3@gated-at.bofh.it>
This removes the SoC-specific dependencies on the platform drivers,
as well as SoC-specific selections of platform drivers for the
machine drivers. The rationale behind this change is that the
dependencies are not actual build dependencies but run-time ones.

The previously listed SoCs were also incomplete: for instance, tegra124
uses the tegra30 platform drivers, which could not be built without
ARCH_TEGRA_3x_SOC set.

Descriptions of the tristates are also added to allow these options
to be set via defconfig/menuconfig.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 sound/soc/tegra/Kconfig | 42 ++++++++++++++----------------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index efbe8d4c019e..6875fc39a575 100644
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -9,8 +9,8 @@ config SND_SOC_TEGRA
 	  Say Y or M here if you want support for SoC audio on Tegra.
 
 config SND_SOC_TEGRA20_AC97
-	tristate
-	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC
+	tristate "Tegra20 AC97 interface"
+	depends on SND_SOC_TEGRA
 	select SND_SOC_AC97_BUS
 	select SND_SOC_TEGRA20_DAS
 	help
@@ -19,16 +19,16 @@ config SND_SOC_TEGRA20_AC97
 	  machine drivers to support below.
 
 config SND_SOC_TEGRA20_DAS
-	tristate
-	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC
+	tristate "Tegra20 DAS module"
+	depends on SND_SOC_TEGRA
 	help
 	  Say Y or M if you want to add support for the Tegra20 DAS module.
 	  You will also need to select the individual machine drivers to
 	  support below.
 
 config SND_SOC_TEGRA20_I2S
-	tristate
-	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC
+	tristate "Tegra20 I2S interface"
+	depends on SND_SOC_TEGRA
 	select SND_SOC_TEGRA20_DAS
 	help
 	  Say Y or M if you want to add support for codecs attached to the
@@ -36,8 +36,8 @@ config SND_SOC_TEGRA20_I2S
 	  machine drivers to support below.
 
 config SND_SOC_TEGRA20_SPDIF
-	tristate
-	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC
+	tristate "Tegra20 SPDIF interface"
+	depends on SND_SOC_TEGRA
 	default m
 	help
 	  Say Y or M if you want to add support for the Tegra20 SPDIF interface.
@@ -45,16 +45,16 @@ config SND_SOC_TEGRA20_SPDIF
 	  below.
 
 config SND_SOC_TEGRA30_AHUB
-	tristate
-	depends on SND_SOC_TEGRA && ARCH_TEGRA_3x_SOC
+	tristate "Tegra30 AHUB module"
+	depends on SND_SOC_TEGRA
 	help
-	  Say Y or M if you want to add support for the Tegra20 AHUB module.
+	  Say Y or M if you want to add support for the Tegra30 AHUB module.
 	  You will also need to select the individual machine drivers to
 	  support below.
 
 config SND_SOC_TEGRA30_I2S
-	tristate
-	depends on SND_SOC_TEGRA && ARCH_TEGRA_3x_SOC
+	tristate "Tegra30 I2S interface"
+	depends on SND_SOC_TEGRA
 	select SND_SOC_TEGRA30_AHUB
 	help
 	  Say Y or M if you want to add support for codecs attached to the
@@ -64,8 +64,6 @@ config SND_SOC_TEGRA30_I2S
 config SND_SOC_TEGRA_RT5640
 	tristate "SoC Audio support for Tegra boards using an RT5640 codec"
 	depends on SND_SOC_TEGRA && I2C && GPIOLIB
-	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC
-	select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC
 	select SND_SOC_RT5640
 	help
 	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -74,8 +72,6 @@ config SND_SOC_TEGRA_RT5640
 config SND_SOC_TEGRA_WM8753
 	tristate "SoC Audio support for Tegra boards using a WM8753 codec"
 	depends on SND_SOC_TEGRA && I2C && GPIOLIB
-	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC
-	select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC
 	select SND_SOC_WM8753
 	help
 	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -84,8 +80,6 @@ config SND_SOC_TEGRA_WM8753
 config SND_SOC_TEGRA_WM8903
 	tristate "SoC Audio support for Tegra boards using a WM8903 codec"
 	depends on SND_SOC_TEGRA && I2C && GPIOLIB
-	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC
-	select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC
 	select SND_SOC_WM8903
 	help
 	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -94,7 +88,7 @@ config SND_SOC_TEGRA_WM8903
 
 config SND_SOC_TEGRA_WM9712
 	tristate "SoC Audio support for Tegra boards using a WM9712 codec"
-	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC && GPIOLIB
+	depends on SND_SOC_TEGRA && GPIOLIB
 	select SND_SOC_TEGRA20_AC97
 	select SND_SOC_WM9712
 	help
@@ -104,7 +98,6 @@ config SND_SOC_TEGRA_WM9712
 config SND_SOC_TEGRA_TRIMSLICE
 	tristate "SoC Audio support for TrimSlice board"
 	depends on SND_SOC_TEGRA && I2C
-	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC
 	select SND_SOC_TLV320AIC23_I2C
 	help
 	  Say Y or M here if you want to add support for SoC audio on the
@@ -113,7 +106,6 @@ config SND_SOC_TEGRA_TRIMSLICE
 config SND_SOC_TEGRA_ALC5632
 	tristate "SoC Audio support for Tegra boards using an ALC5632 codec"
 	depends on SND_SOC_TEGRA && I2C && GPIOLIB
-	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC
 	select SND_SOC_ALC5632
 	help
 	  Say Y or M here if you want to add support for SoC audio on the
@@ -122,8 +114,6 @@ config SND_SOC_TEGRA_ALC5632
 config SND_SOC_TEGRA_MAX98090
 	tristate "SoC Audio support for Tegra boards using a MAX98090 codec"
 	depends on SND_SOC_TEGRA && I2C && GPIOLIB
-	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC
-	select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC
 	select SND_SOC_MAX98090
 	help
 	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -132,8 +122,6 @@ config SND_SOC_TEGRA_MAX98090
 config SND_SOC_TEGRA_RT5677
 	tristate "SoC Audio support for Tegra boards using a RT5677 codec"
 	depends on SND_SOC_TEGRA && I2C && GPIOLIB
-	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC
-	select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC
 	select SND_SOC_RT5677
 	help
 	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -142,8 +130,6 @@ config SND_SOC_TEGRA_RT5677
 config SND_SOC_TEGRA_SGTL5000
 	tristate "SoC Audio support for Tegra boards using a SGTL5000 codec"
 	depends on SND_SOC_TEGRA && I2C && GPIOLIB
-	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC
-	select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC
 	select SND_SOC_SGTL5000
 	help
 	  Say Y or M here if you want to add support for SoC audio on Tegra
-- 
2.13.3

[toc] | [next] | [standalone]

#1699517 — [PATCH 2/3] ARM: configs: Add Tegra I2S interfaces to tegra_defconfig

FromPaul Kocialkowski <contact@paulk.fr>
Date2017-07-30 13:30 +0200
Subject[PATCH 2/3] ARM: configs: Add Tegra I2S interfaces to tegra_defconfig
Message-ID<u8UA1-856-5@gated-at.bofh.it>
In reply to#1699516
This selects both the Tegra20 and Tegra30 I2S interfaces (that were
previously auto-selected by Kconfig but are not anymore) to
tegra_defconfig, as built-ins.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 arch/arm/configs/tegra_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index f0efc854b5a2..fe1275aa067e 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -202,6 +202,8 @@ CONFIG_SND_HDA_CODEC_HDMI=y
 # CONFIG_SND_USB is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_TEGRA=y
+CONFIG_SND_SOC_TEGRA20_I2S=y
+CONFIG_SND_SOC_TEGRA30_I2S=y
 CONFIG_SND_SOC_TEGRA_RT5640=y
 CONFIG_SND_SOC_TEGRA_WM8753=y
 CONFIG_SND_SOC_TEGRA_WM8903=y
-- 
2.13.3

[toc] | [prev] | [next] | [standalone]

#1699906 — Re: [PATCH 2/3] ARM: configs: Add Tegra I2S interfaces to tegra_defconfig

FromThierry Reding <thierry.reding@gmail.com>
Date2017-07-31 12:30 +0200
SubjectRe: [PATCH 2/3] ARM: configs: Add Tegra I2S interfaces to tegra_defconfig
Message-ID<u9g7v-54B-9@gated-at.bofh.it>
In reply to#1699517

[Multipart message — attachments visible in raw view] — view raw

On Sun, Jul 30, 2017 at 01:22:19PM +0200, Paul Kocialkowski wrote:
> This selects both the Tegra20 and Tegra30 I2S interfaces (that were
> previously auto-selected by Kconfig but are not anymore) to
> tegra_defconfig, as built-ins.
> 
> Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
> ---
>  arch/arm/configs/tegra_defconfig | 2 ++
>  1 file changed, 2 insertions(+)

Applied, thanks.

Thierry

[toc] | [prev] | [next] | [standalone]

#1699518 — [PATCH 3/3] ARM: configs: Add Tegra I2S interfaces to multi_v7_defconfig

FromPaul Kocialkowski <contact@paulk.fr>
Date2017-07-30 13:30 +0200
Subject[PATCH 3/3] ARM: configs: Add Tegra I2S interfaces to multi_v7_defconfig
Message-ID<u8UA1-856-7@gated-at.bofh.it>
In reply to#1699516
This selects both the Tegra20 and Tegra30 I2S interfaces (that were
previously auto-selected by Kconfig but are not anymore) to
multi_v7_defconfig, as modules.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 arch/arm/configs/multi_v7_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 4d19c1b4b8e7..626cecdada61 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -653,6 +653,8 @@ CONFIG_SND_SOC_RCAR=m
 CONFIG_SND_SOC_RSRC_CARD=m
 CONFIG_SND_SUN4I_CODEC=m
 CONFIG_SND_SOC_TEGRA=m
+CONFIG_SND_SOC_TEGRA20_I2S=m
+CONFIG_SND_SOC_TEGRA30_I2S=m
 CONFIG_SND_SOC_TEGRA_RT5640=m
 CONFIG_SND_SOC_TEGRA_WM8753=m
 CONFIG_SND_SOC_TEGRA_WM8903=m
-- 
2.13.3

[toc] | [prev] | [next] | [standalone]

#1699911 — Re: [PATCH 3/3] ARM: configs: Add Tegra I2S interfaces to multi_v7_defconfig

FromThierry Reding <thierry.reding@gmail.com>
Date2017-07-31 12:30 +0200
SubjectRe: [PATCH 3/3] ARM: configs: Add Tegra I2S interfaces to multi_v7_defconfig
Message-ID<u9g7w-54B-27@gated-at.bofh.it>
In reply to#1699518

[Multipart message — attachments visible in raw view] — view raw

On Sun, Jul 30, 2017 at 01:22:20PM +0200, Paul Kocialkowski wrote:
> This selects both the Tegra20 and Tegra30 I2S interfaces (that were
> previously auto-selected by Kconfig but are not anymore) to
> multi_v7_defconfig, as modules.
> 
> Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
> ---
>  arch/arm/configs/multi_v7_defconfig | 2 ++
>  1 file changed, 2 insertions(+)

Applied, thanks.

Thierry

[toc] | [prev] | [next] | [standalone]

#1699913 — Re: [PATCH 1/3] sound: ASoC: tegra: Remove SoC-specific Kconfig depends and selects

FromThierry Reding <thierry.reding@gmail.com>
Date2017-07-31 12:30 +0200
SubjectRe: [PATCH 1/3] sound: ASoC: tegra: Remove SoC-specific Kconfig depends and selects
Message-ID<u9g7y-54B-43@gated-at.bofh.it>
In reply to#1699516

[Multipart message — attachments visible in raw view] — view raw

On Sun, Jul 30, 2017 at 01:22:18PM +0200, Paul Kocialkowski wrote:
> This removes the SoC-specific dependencies on the platform drivers,
> as well as SoC-specific selections of platform drivers for the
> machine drivers. The rationale behind this change is that the
> dependencies are not actual build dependencies but run-time ones.
> 
> The previously listed SoCs were also incomplete: for instance, tegra124
> uses the tegra30 platform drivers, which could not be built without
> ARCH_TEGRA_3x_SOC set.
> 
> Descriptions of the tristates are also added to allow these options
> to be set via defconfig/menuconfig.
> 
> Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
> ---
>  sound/soc/tegra/Kconfig | 42 ++++++++++++++----------------------------
>  1 file changed, 14 insertions(+), 28 deletions(-)

Acked-by: Thierry Reding <treding@nvidia.com>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web