From mboxrd@z Thu Jan  1 00:00:00 1970
From: York Sun <yorksun@freescale.com>
Date: Thu, 22 Jan 2015 18:25:11 -0600
Subject: [U-Boot] [PATCH 2/2] powerpc: mpc85xx: Add dummy gpio.h to
	enable CONFIG_OF_CONTROL
In-Reply-To: <1418192570-4057-1-git-send-email-ruchika.gupta@freescale.com>
References: <1418192570-4057-1-git-send-email-ruchika.gupta@freescale.com>
Message-ID: <54C194E7.30603@freescale.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de



On 12/10/2014 12:22 AM, Ruchika Gupta wrote:
> If CONFIG_OF_CONTROL is enabled, lib/fdtdec.c is compiled.
> It includes <asm/gpio.h> and then <asm/gpio.h> includes
> <asm/arch/gpio.h>.  As a result, all the SoCs that enable
> CONFIG_OF_CONTROL must have <asm/arch/gpio.h>.
> 
> The right fix would be to split the lib/fdtdec.c to remove
> dependency on GPIO.
> 
> This commit adds a dummy <asm/arch/gpio.h> to support OF_CONTROL
> for mpc85xx platform. A file mpc85xx_gpio.h exists in 
> arch/powerpc/include/asm. The defintions in that file conflict
> with the ones in asm-generic/gpio.h. Hence a dummy header file
> has been added. This will be removed after FDT-GPIO stuff is
> fixed correctly.
> 
> Signed-off-by: Ruchika Gupta <ruchika.gupta@freescale.com>
> ---

Applied to u-boot-mpc85xx master branch, awaiting upstream.

York