From mboxrd@z Thu Jan  1 00:00:00 1970
From: arnd@arndb.de (Arnd Bergmann)
Date: Tue, 06 Sep 2011 20:55:45 +0200
Subject: [PATCH 5/6] arm/imx6q: add device tree machine support
In-Reply-To: <1315303120-24203-6-git-send-email-shawn.guo@linaro.org>
References: <1315303120-24203-1-git-send-email-shawn.guo@linaro.org>
	<1315303120-24203-6-git-send-email-shawn.guo@linaro.org>
Message-ID: <26851240.8fI4nVmxXO@wuerfel>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Tuesday 06 September 2011 17:58:39 Shawn Guo wrote:

> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index 13e0301..3364b59 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -624,3 +624,16 @@ config MACH_VPR200
>  	  configurations for the board and its peripherals.
>  
>  endif
> +
> +if ARCH_MX6
> +comment "i.MX6 machines:"
> +
> +config MACH_IMX6Q
> +	bool "Support i.MX6 Quad platforms from device tree"
> +	select SOC_IMX6Q
> +	select USE_OF
> +	help
> +	  Include support for Freescale i.MX6 Quad based platforms
> +	  using the device tree for discovery
> +
> +endif

As we have done on zynq and prima2, I would suggest not to add multiple
machines types at all. You already have the intialization in a generic
imx6q file, it would be logical to get rid of the configuration entry
as well.

What you can still have is config options for optional drivers that
might be needed for one soc but not another.

	Arnd