[PATCH] Remove keyboard pin definition for snowball

[Lee Jones]

On 13/02/12 13:49, Philippe Langlais wrote:
> FYI, I have already applied this patch on IK and made changes to take
> into account these problems.
> See commit 4d298a7: "ux500: Remove keyboard pin definition for snowball"

Good work.

> On 02/13/2012 02:45 PM, Lee Jones wrote:
>> On 18/01/12 14:28, Benn Porscke wrote:
>>> From: Benn Pörscke<benn.porscke at stericsson.com>
>>>
>>> Interfered with CG2900
>>>
>>> Signed-off-by: Benn Pörscke<benn.porscke at stericsson.com>
>>> ---
>>>   arch/arm/mach-ux500/board-mop500-pins.c |    8 +++++++-
>>>   1 files changed, 7 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-ux500/board-mop500-pins.c
>>> b/arch/arm/mach-ux500/board-mop500-pins.c
>>> index 276305e..40ee0c0 100644
>>> --- a/arch/arm/mach-ux500/board-mop500-pins.c
>>> +++ b/arch/arm/mach-ux500/board-mop500-pins.c
>>> @@ -428,7 +428,6 @@ static struct ux500_pin_lookup mop500_pins[] = {
>>>       PIN_LOOKUP("nmk-i2c.1",&mop500_pins_i2c1),
>>>       PIN_LOOKUP("nmk-i2c.2",&mop500_pins_i2c2),
>>>       PIN_LOOKUP("nmk-i2c.3",&mop500_pins_i2c3),
>>> -    PIN_LOOKUP("ske",&mop500_pins_ske),
>>>       PIN_LOOKUP("sdi0",&mop500_pins_sdi0),
>>>       PIN_LOOKUP("sdi1",&mop500_pins_sdi1),
>>>       PIN_LOOKUP("sdi2",&mop500_pins_sdi2),
>>> @@ -437,6 +436,10 @@ static struct ux500_pin_lookup mop500_pins[] = {
>>>       PIN_LOOKUP("spi2",&mop500_pins_spi2),
>>>   };
>>>
>>> +static struct ux500_pin_lookup mop500_ske_pins[] = {
>>> +    PIN_LOOKUP("ske",&mop500_pins_ske),
>>> +};
>>> +
>>>   /*
>>>    * Sleep pin configuration for u8500 platform.
>>>    * If another HW is used the GPIO's must be configured
>>> @@ -940,6 +943,9 @@ void __init mop500_pins_init(void)
>>>
>>>       ux500_pins_add(mop500_pins, ARRAY_SIZE(mop500_pins));
>>>
>>> +    if (!machine_is_snowball())
>>> +        ux500_pins_add(mop500_ske_pins, ARRAY_SIZE(mop500_ske_pins));
>>> +
>> NAK: machine_is_<board>  will not be accepted upstream. Even if it is, it
>> will increase the difficulty off our future refactoring effort.
>>
>> Please use the<board>_pins_init functions instead.
>>
>>>       switch (pinsfor) {
>>>       case PINS_FOR_U9500:
>>>           nmk_config_pins(u9500_pins, ARRAY_SIZE(u9500_pins));
>> Kind regards,
>> Lee
>>


-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog