* [PATCH 1/2] ARM: imx: Remove CONFIG_USB_PHY selection from defconfig
@ 2013-08-12 11:55 Fabio Estevam
2013-08-12 11:55 ` [PATCH 2/2] ARM: imx: Re-select CONFIG_SND_SOC_IMX_MC13783 option Fabio Estevam
2013-08-14 3:55 ` [PATCH 1/2] ARM: imx: Remove CONFIG_USB_PHY selection from defconfig Shawn Guo
0 siblings, 2 replies; 4+ messages in thread
From: Fabio Estevam @ 2013-08-12 11:55 UTC (permalink / raw)
To: linux-arm-kernel
From: Fabio Estevam <fabio.estevam@freescale.com>
Since commit 052a11d1 (usb: phy: make PHY driver selection possible by
controller drivers), CONFIG_USB_PHY is selected via drivers/usb/phy/Kconfig, so
there is no need to select it via defconfig anymore.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
arch/arm/configs/imx_v6_v7_defconfig | 1 -
arch/arm/configs/mxs_defconfig | 1 -
2 files changed, 2 deletions(-)
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 577f054..c2c024f 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -194,7 +194,6 @@ CONFIG_USB_EHCI_MXC=y
CONFIG_USB_STORAGE=y
CONFIG_USB_CHIPIDEA=y
CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_PHY=y
CONFIG_NOP_USB_XCEIV=y
CONFIG_USB_MXS_PHY=y
CONFIG_MMC=y
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index 4555c02..a9fb093 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -116,7 +116,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_CHIPIDEA=y
CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_PHY=y
CONFIG_USB_MXS_PHY=y
CONFIG_MMC=y
CONFIG_MMC_UNSAFE_RESUME=y
--
1.8.1.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: imx: Re-select CONFIG_SND_SOC_IMX_MC13783 option
2013-08-12 11:55 [PATCH 1/2] ARM: imx: Remove CONFIG_USB_PHY selection from defconfig Fabio Estevam
@ 2013-08-12 11:55 ` Fabio Estevam
2013-08-14 3:57 ` Shawn Guo
2013-08-14 3:55 ` [PATCH 1/2] ARM: imx: Remove CONFIG_USB_PHY selection from defconfig Shawn Guo
1 sibling, 1 reply; 4+ messages in thread
From: Fabio Estevam @ 2013-08-12 11:55 UTC (permalink / raw)
To: linux-arm-kernel
From: Fabio Estevam <fabio.estevam@freescale.com>
Commit 02502da45 (ASoC: imx-mc13783: Depend on ARCH_ARM) caused the selection of
CONFIG_SND_SOC_IMX_MC13783 to be impossible due to a wrong dependency, which
caused CONFIG_SND_SOC_IMX_MC13783 to be removed after the defconfigs cleanups.
The original selection problem has been fixed by 9f19de649f (ASoC: imx-mc13783:
Make SND_SOC_IMX_MC13783 visible again), so it is possible to select
CONFIG_SND_SOC_IMX_MC13783 again as originally done.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
arch/arm/configs/imx_v4_v5_defconfig | 1 +
arch/arm/configs/imx_v6_v7_defconfig | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 6cc94a7..e958ebe 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -146,6 +146,7 @@ CONFIG_SND_SOC_MX27VIS_AIC32X4=y
CONFIG_SND_SOC_PHYCORE_AC97=y
CONFIG_SND_SOC_EUKREA_TLV320=y
CONFIG_SND_SOC_IMX_SGTL5000=y
+CONFIG_SND_SOC_IMX_MC13783=y
CONFIG_USB_HID=m
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index c2c024f..402f282 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -188,6 +188,7 @@ CONFIG_SND_SOC_PHYCORE_AC97=y
CONFIG_SND_SOC_EUKREA_TLV320=y
CONFIG_SND_SOC_IMX_WM8962=y
CONFIG_SND_SOC_IMX_SGTL5000=y
+CONFIG_SND_SOC_IMX_MC13783=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_MXC=y
--
1.8.1.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: imx: Re-select CONFIG_SND_SOC_IMX_MC13783 option
2013-08-12 11:55 ` [PATCH 2/2] ARM: imx: Re-select CONFIG_SND_SOC_IMX_MC13783 option Fabio Estevam
@ 2013-08-14 3:57 ` Shawn Guo
0 siblings, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2013-08-14 3:57 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Aug 12, 2013 at 08:55:53AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> Commit 02502da45 (ASoC: imx-mc13783: Depend on ARCH_ARM) caused the selection of
> CONFIG_SND_SOC_IMX_MC13783 to be impossible due to a wrong dependency, which
> caused CONFIG_SND_SOC_IMX_MC13783 to be removed after the defconfigs cleanups.
>
> The original selection problem has been fixed by 9f19de649f (ASoC: imx-mc13783:
> Make SND_SOC_IMX_MC13783 visible again), so it is possible to select
> CONFIG_SND_SOC_IMX_MC13783 again as originally done.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Applied, thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] ARM: imx: Remove CONFIG_USB_PHY selection from defconfig
2013-08-12 11:55 [PATCH 1/2] ARM: imx: Remove CONFIG_USB_PHY selection from defconfig Fabio Estevam
2013-08-12 11:55 ` [PATCH 2/2] ARM: imx: Re-select CONFIG_SND_SOC_IMX_MC13783 option Fabio Estevam
@ 2013-08-14 3:55 ` Shawn Guo
1 sibling, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2013-08-14 3:55 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Aug 12, 2013 at 08:55:52AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> Since commit 052a11d1 (usb: phy: make PHY driver selection possible by
> controller drivers), CONFIG_USB_PHY is selected via drivers/usb/phy/Kconfig, so
> there is no need to select it via defconfig anymore.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> arch/arm/configs/imx_v6_v7_defconfig | 1 -
> arch/arm/configs/mxs_defconfig | 1 -
Please split it to avoid conflict between imx an mxs branches.
Shawn
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-08-14 3:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-12 11:55 [PATCH 1/2] ARM: imx: Remove CONFIG_USB_PHY selection from defconfig Fabio Estevam
2013-08-12 11:55 ` [PATCH 2/2] ARM: imx: Re-select CONFIG_SND_SOC_IMX_MC13783 option Fabio Estevam
2013-08-14 3:57 ` Shawn Guo
2013-08-14 3:55 ` [PATCH 1/2] ARM: imx: Remove CONFIG_USB_PHY selection from defconfig Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).