[U-Boot] [PATCH 2/2] powerpc: mpc85xx: Add dummy gpio.h to enable CONFIG_OF_CONTROL

[U-Boot] [PATCH 2/2] powerpc: mpc85xx: Add dummy gpio.h to enable CONFIG_OF_CONTROL

[Ruchika Gupta]

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>
---
 arch/powerpc/include/asm/arch-mpc85xx/gpio.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 arch/powerpc/include/asm/arch-mpc85xx/gpio.h

diff --git a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
new file mode 100644
index 0000000..8beed30
--- /dev/null
+++ b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/*
+ * Dummy header file to enable CONFIG_OF_CONTROL.
+ * If CONFIG_OF_CONTROL is enabled, lib/fdtdec.c is compiled.
+ * It includes <asm/arch/gpio.h> via <asm/gpio.h>, so those SoCs that enable
+ * OF_CONTROL must have arch/gpio.h.
+ */
+
+#ifndef __ASM_ARCH_MX85XX_GPIO_H
+#define __ASM_ARCH_MX85XX_GPIO_H
+
+#endif
-- 
1.8.1.4

[U-Boot] [PATCH 2/2] powerpc: mpc85xx: Add dummy gpio.h to enable CONFIG_OF_CONTROL

[York Sun]

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