Messages in this thread |  | | Date | Mon, 25 Mar 2013 16:45:42 +0100 | From | Lars-Peter Clausen <> | Subject | Re: [PATCH] Blackfin: bf537: rename "CONFIG_ADT7310" and friends |
| |
On 03/25/2013 04:22 PM, Guenter Roeck wrote: > On Mon, Mar 25, 2013 at 12:43:51PM +0100, Paul Bolle wrote: >> The Kconfig symbol ADT7310 got removed in commit >> 2b0c856ad9571013db8fc369194b7108dff3c18e ("staging:iio: Consolidate >> adt7310 and adt7410 driver"). That commit did not touch the references >> to CONFIG_ADT7310 and CONFIG_ADT7310_MODULE in the BF537-STAMP code. >> Convert these now, to their ADT7410 equivalents. >> >> Signed-off-by: Paul Bolle <pebolle@tiscali.nl> >> --- >> 0) Untested. This took a bit of guesswork. I guessed that multiple AD >> drivers can be enabled at the same time in this code. And I also guessed >> that the "adt7310" modalias is still correct. >> >> 1) If this passes testing it could go in stable (3.8.y). >> >> arch/blackfin/mach-bf537/boards/stamp.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c >> index 95114ed..23bb55d 100644 >> --- a/arch/blackfin/mach-bf537/boards/stamp.c >> +++ b/arch/blackfin/mach-bf537/boards/stamp.c >> @@ -700,7 +700,7 @@ static struct bfin5xx_spi_chip ad7816_spi_chip_info = { >> }; >> #endif >> >> -#if defined(CONFIG_ADT7310) || defined(CONFIG_ADT7310_MODULE) >> +#if defined(CONFIG_ADT7410) || defined(CONFIG_ADT7410_MODULE) > > It might be easier and more future-proof to just drop the conditional. > If the driver isn't there, it won't be loaded anyway. It would also make > back-porting much easier. > > Guenter
The situation is unfortunately really messy. The issue is that these are add-on board and the same SPI chip select pin is used for multiple devices. If we add the spi_board_info for all devices unconditionally the SPI core will scream at us because we tried to register multiple devices with the same chip select pin and none of the devices gets actually registered.
- Lars
|  |