[PATCH v2 1/2] ARM: multi_v7_defconfig: Add ARCH_MXC

[PATCH v2 1/2] ARM: multi_v7_defconfig: Add ARCH_MXC

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

Let ARCH_MXC be covered by multi_v7_defconfig.

Allow booting mx6 via NFS.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Provide a more complete config that allows booting mx6 via NFS

 arch/arm/configs/multi_v7_defconfig |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 159f75f..df1e563 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -5,6 +5,8 @@ CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_XP=y
 CONFIG_ARCH_HIGHBANK=y
+CONFIG_ARCH_MXC=y
+CONFIG_SOC_IMX6Q=y
 CONFIG_ARCH_SOCFPGA=y
 # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set
 CONFIG_ARM_ERRATA_754322=y
@@ -17,18 +19,29 @@ CONFIG_ARM_APPENDED_DTB=y
 CONFIG_VFP=y
 CONFIG_NEON=y
 CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
 CONFIG_ATA=y
 CONFIG_SATA_HIGHBANK=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_CALXEDA_XGMAC=y
 CONFIG_SMSC911X=y
 CONFIG_STMMAC_ETH=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
 CONFIG_SERIO_AMBAKMI=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_IPMI_HANDLER=y
 CONFIG_IPMI_SI=y
-- 
1.7.9.5

[PATCH v2 2/2] mfd: Kconfig: Let MFD_SYSCON select REGMAP

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

Building multi_v7_defconfig for mx6 causes the following build error:

  CC      drivers/mfd/syscon.o
drivers/mfd/syscon.c:94: error: variable 'syscon_regmap_config' has initializer but incomplete type
drivers/mfd/syscon.c:95: error: unknown field 'reg_bits' specified in initializer
drivers/mfd/syscon.c:95: warning: excess elements in struct initializer
drivers/mfd/syscon.c:95: warning: (near initialization for 'syscon_regmap_config')
drivers/mfd/syscon.c:96: error: unknown field 'val_bits' specified in initializer
drivers/mfd/syscon.c:96: warning: excess elements in struct initializer
drivers/mfd/syscon.c:96: warning: (near initialization for 'syscon_regmap_config')
drivers/mfd/syscon.c:97: error: unknown field 'reg_stride' specified in initializer
drivers/mfd/syscon.c:97: warning: excess elements in struct initializer
drivers/mfd/syscon.c:97: warning: (near initialization for 'syscon_regmap_config')
drivers/mfd/syscon.c: In function 'syscon_probe':
drivers/mfd/syscon.c:124: error: invalid use of undefined type 'struct regmap_config'
drivers/mfd/syscon.c:125: error: implicit declaration of function 'devm_regmap_init_mmio'
drivers/mfd/syscon.c:126: warning: assignment makes pointer from integer without a cast

Fix it by selecting REGMAP option.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- No changes. Newly introduced in this series

 drivers/mfd/Kconfig |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index acab3ef..ef56515 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1030,6 +1030,7 @@ config MFD_SYSCON
 	bool "System Controller Register R/W Based on Regmap"
 	depends on OF
 	select REGMAP_MMIO
+	select REGMAP
 	help
 	  Select this option to enable accessing system control registers
 	  via regmap.
-- 
1.7.9.5

[PATCH v2 2/2] mfd: Kconfig: Let MFD_SYSCON select REGMAP

[Mark Brown]

On Thu, Oct 18, 2012 at 09:04:06PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Building multi_v7_defconfig for mx6 causes the following build error:

> Fix it by selecting REGMAP option.

No, this is silly - selecting MMIO ought to do the right thing.  There's
a patch queued for Linus which will resolve this.

[PATCH v2 1/2] ARM: multi_v7_defconfig: Add ARCH_MXC

[Rob Herring]

Adding Arnd and Olof.

On 10/18/2012 07:04 PM, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Let ARCH_MXC be covered by multi_v7_defconfig.
> 
> Allow booting mx6 via NFS.

Now we can start debating what should or shouldn't be in shared
defconfigs. :)

My intent with this defconfig was to only enable required options and
all drivers for platforms and leave features to their defaults. I don't
feel that strongly about it. We should have some general guideline here
so it's not a free for all. You can still have a defconfig for your
platform as well.

Rob

> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v1:
> - Provide a more complete config that allows booting mx6 via NFS
> 
>  arch/arm/configs/multi_v7_defconfig |   13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> index 159f75f..df1e563 100644
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@ -5,6 +5,8 @@ CONFIG_ARCH_MVEBU=y
>  CONFIG_MACH_ARMADA_370=y
>  CONFIG_MACH_ARMADA_XP=y
>  CONFIG_ARCH_HIGHBANK=y
> +CONFIG_ARCH_MXC=y
> +CONFIG_SOC_IMX6Q=y
>  CONFIG_ARCH_SOCFPGA=y
>  # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set
>  CONFIG_ARM_ERRATA_754322=y
> @@ -17,18 +19,29 @@ CONFIG_ARM_APPENDED_DTB=y
>  CONFIG_VFP=y
>  CONFIG_NEON=y
>  CONFIG_NET=y
> +CONFIG_PACKET=y
> +CONFIG_UNIX=y
> +CONFIG_INET=y
> +CONFIG_IP_PNP=y
> +CONFIG_IP_PNP_DHCP=y
>  CONFIG_ATA=y
>  CONFIG_SATA_HIGHBANK=y
>  CONFIG_NETDEVICES=y
>  CONFIG_NET_CALXEDA_XGMAC=y
>  CONFIG_SMSC911X=y
>  CONFIG_STMMAC_ETH=y
> +CONFIG_NFS_FS=y
> +CONFIG_NFS_V3_ACL=y
> +CONFIG_NFS_V4=y
> +CONFIG_ROOT_NFS=y
>  CONFIG_SERIO_AMBAKMI=y
>  CONFIG_SERIAL_8250=y
>  CONFIG_SERIAL_8250_CONSOLE=y
>  CONFIG_SERIAL_8250_DW=y
>  CONFIG_SERIAL_AMBA_PL011=y
>  CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
> +CONFIG_SERIAL_IMX=y
> +CONFIG_SERIAL_IMX_CONSOLE=y
>  CONFIG_SERIAL_OF_PLATFORM=y
>  CONFIG_IPMI_HANDLER=y
>  CONFIG_IPMI_SI=y
>