[Meego-kernel] [PATCH] change ifx device name to match with ifx device name defined in

[Chris Leech]

On 10/04/2010 09:09 PM, Mai, Leonard wrote:
> Hello Arjan,
>
> Attached is the new patch that would address your concern about the compatibility issue. This patch is for submission to MeeGo.
>
>> From c16ca63212970363ed7bc014cc1fa5c611282531 Mon Sep 17 00:00:00 2001
> From: Leonard D Mai<leonard.mai at intel.com>
> Date: Mon, 4 Oct 2010 20:36:08 -0700
> Subject: [PATCH] change ifx device name to match with ifx device name defined in SFI table
>
> Medfield Integrated FW v0.16+ has IFX device name change from "spi_ifx_modem"
> to "spi_6260_modem" in the SFI table. This change is needed to match with
> Integrated FW's to allow ifx_modem driver to load properly.
>
> Signed-off-by: Leonard D Mai<leonard.mai at intel.com>
> ---
>   arch/x86/kernel/mrst.c |    1 +
>   1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/arch/x86/kernel/mrst.c b/arch/x86/kernel/mrst.c
> index 8864e93..fcc6797 100644
> --- a/arch/x86/kernel/mrst.c
> +++ b/arch/x86/kernel/mrst.c
> @@ -1039,6 +1039,7 @@ static const struct devs_id device_ids[] = {
>   	{"spi_opt_modem", SFI_DEV_TYPE_SPI, 0,&opt_modem_platform_data},
>   	{"spi_emp_modem", SFI_DEV_TYPE_SPI, 0,&emp_modem_platform_data},
>   	{"spi_ifx_modem", SFI_DEV_TYPE_SPI, 0,&ifx_mdm_platform_data},
> +	{"spi_6260_modem", SFI_DEV_TYPE_SPI, 0,&ifx_mdm_platform_data},
>   	{"spi_ifx_gps", SFI_DEV_TYPE_SPI, 0,&ifx_gps_platform_data},
>   	{"cptm1217", SFI_DEV_TYPE_I2C, 0,&cp_tm1217_platform_data},
>   	{"spi_max3111", SFI_DEV_TYPE_SPI, 0,&max3111_platform_data},

If I'm not mistaken, this patch needs to be matched with "[PATCH 05/12] 
ifx_spi: Changes to support multiple modems on the MID platform" from 
Russ Gorby.  Actually, I think they should be merged into a single patch 
to ensure that the platform support and the ifx6x60 driver are updated 
at the same time.

The firmware compatibility issues need to be taken into account in both 
as well.  The ifx6x60 patch removes the "spi_ifx_modem" identifier, so 
that needs to be added back (or the platform code could translate that 
SFI identifier into one of the new names when creating the SPI device?). 
  It also adds an "spi_6160_modem" identifier that is missing from this 
platform patch.

As for the timing of killing off the old name, I've been bringing up 
devices with a firmware build from 2010/9/1 because I was told that it's 
still the recommended customer firmware right now.  It still uses 
spi_ifx_modem (on hardware with either 6160 or 6260 I believe).

- Chris