Skip to contentSkip to conversation

ARM: imx: Remove CONFIG_USB_PHY selection from defconfig

PATCH New Fabio Estevam 2 participants 4 messages Aug 12, 2013 – Aug 14, 2013

Subsystems (2)
Arm (32-bit) Arm i.MX and Layerscape
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/2 ARM: imx: Remove CONFIG_USB_PHY selection from defconfig

From: Fabio Estevam <[email protected]>

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 <[email protected]>
---
 arch/arm/configs/imx_v6_v7_defconfig | 1 -
 arch/arm/configs/mxs_defconfig       | 1 -
 2 files changed, 2 deletions(-)
arch/arm/configs/imx_v6_v7_defconfig +0 -1
index 577f054..c2c024f 100644
@@ -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
arch/arm/configs/mxs_defconfig +0 -1
index 4555c02..a9fb093 100644
@@ -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
Signature · 1 line
1.8.1.2
author reviewer
#1 lore raw

PATCH 2/2 ARM: imx: Re-select CONFIG_SND_SOC_IMX_MC13783 option

From: Fabio Estevam <[email protected]>

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 <[email protected]>

---

 arch/arm/configs/imx_v4_v5_defconfig | 1 +
 arch/arm/configs/imx_v6_v7_defconfig | 1 +
 2 files changed, 2 insertions(+)
arch/arm/configs/imx_v4_v5_defconfig +1 -0
index 6cc94a7..e958ebe 100644
@@ -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
arch/arm/configs/imx_v6_v7_defconfig +1 -0
index c2c024f..402f282 100644
@@ -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
Signature · 1 line
1.8.1.2
Applied
#2 lore raw

PATCH 2/2 ARM: imx: Re-select CONFIG_SND_SOC_IMX_MC13783 option

Quoted 11 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

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 <[email protected]>

Applied, thanks

#3 lore raw

PATCH 1/2 ARM: imx: Remove CONFIG_USB_PHY selection from defconfig

In reply to Fabio Estevam
Quoted 10 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

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 <[email protected]>
---
 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