Re: 5088/3: the SPI dependency

[Dmitry Baryshkov <dbaryshkov@xxxxxxxxx>]

Russell King - ARM Linux wrote:

> Since we are over a week into the merge window, and I see no sign of the
> SPI tree merging, it's time to make a decision on what to do about the
> outstanding changes in my tree which depend on the SPI tree having been
> merged first (iow, the presence of linux/spi/max7301.h.)

What about applying this patch:

>From f85dc6f35fac528b40a839a2ab9874b5023280f9 Mon Sep 17 00:00:00 2001
From: Dmitry Baryshkov <dbaryshkov@xxxxxxxxx>
Date: Mon, 21 Jul 2008 15:20:09 +0400
Subject: [PATCH] pcm027: fix compilation w/o max7301 gpio expander

Currently pcm027 is broken as MAX7301 support didn't hit the mainline.
Compile support for MAX7301 if it's selected to compilation to overcome
this problem.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@xxxxxxxxx>
---
 arch/arm/mach-pxa/pcm027.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c
index 377f3be..99c771a 100644
--- a/arch/arm/mach-pxa/pcm027.c
+++ b/arch/arm/mach-pxa/pcm027.c
@@ -19,12 +19,17 @@
  *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation.
  */
+#if defined(GPIO_MAX7301) || defined(GPIO_MAX7301_MODULE)
+#define HAVE_MAX7301
+#endif
 
 #include <linux/irq.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
 #include <linux/spi/spi.h>
+#ifdef HAVE_MAX7301
 #include <linux/spi/max7301.h>
+#endif
 #include <linux/leds.h>
 
 #include <asm/mach-types.h>
@@ -117,12 +122,15 @@ static struct pxa2xx_spi_master pxa_ssp_master_info 
= {
 	.num_chipselect	= 1,
 };
 
+#ifdef HAVE_MAX7301
 static struct max7301_platform_data max7301_info = {
 	.base = -1,
 };
+#endif
 
 /* bus_num must match id in pxa2xx_set_spi_info() call */
 static struct spi_board_info spi_board_info[] __initdata = {
+#ifdef HAVE_MAX7301
 	{
 		.modalias	= "max7301",
 		.platform_data	= &max7301_info,
@@ -131,6 +139,7 @@ static struct spi_board_info spi_board_info[] 
__initdata = {
 		.chip_select	= 0,
 		.mode		= SPI_MODE_0,
 	},
+#endif
 };
 
 /*
-- 
1.5.6.2


-- 
With best wishes
Dmitry



-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php