diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-03-12 20:21:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-12 16:20:45 -0700 |
| commit | 2d798a3f20ae992b0b69a2b68c04ada397c32ed4 (patch) | |
| tree | a8eb78bbbcbf2f2ff7cb1b4f1d07979ad2aaee56 /arch/arm/mach-ixp4xx | |
| parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) | |
| download | linux-stable-2d798a3f20ae992b0b69a2b68c04ada397c32ed4.tar.gz linux-stable-2d798a3f20ae992b0b69a2b68c04ada397c32ed4.tar.bz2 linux-stable-2d798a3f20ae992b0b69a2b68c04ada397c32ed4.zip | |
ARM: w1-gpio: fix erroneous gpio requests
Fix regression introduced by commit d2323cf773 ("onewire: w1-gpio: add
ext_pullup_enable pin in platform data") which added a gpio entry to the
platform data, but did not add the required initialisers to the board
files using it. Consequently, the driver would request gpio 0 at probe,
which could break other uses of the corresponding pin.
On AT91 requesting gpio 0 changes the pin muxing for PIOA0, which, for
instance, breaks SPI0 on at91sam9g20.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-ixp4xx')
| -rw-r--r-- | arch/arm/mach-ixp4xx/vulcan-setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/vulcan-setup.c b/arch/arm/mach-ixp4xx/vulcan-setup.c index d42730a1d4ab..d599e354ca57 100644 --- a/arch/arm/mach-ixp4xx/vulcan-setup.c +++ b/arch/arm/mach-ixp4xx/vulcan-setup.c @@ -163,6 +163,7 @@ static struct platform_device vulcan_max6369 = { static struct w1_gpio_platform_data vulcan_w1_gpio_pdata = { .pin = 14, + .ext_pullup_enable_pin = -EINVAL, }; static struct platform_device vulcan_w1_gpio = { |