diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-15 15:33:08 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-15 15:33:08 +0100 |
| commit | cbc3e0f6d40bdea8f960e9f1aba1e9d5b836f01c (patch) | |
| tree | 9baac71a7b12c118c1945266dfa0b598ec1bec8e /arch | |
| parent | 958eaf4c9db390ec744985d94826f56df5702870 (diff) | |
| parent | 97d4ca970a591b0461df776b10206db33ee79beb (diff) | |
| download | barebox-cbc3e0f6d40bdea8f960e9f1aba1e9d5b836f01c.tar.gz barebox-cbc3e0f6d40bdea8f960e9f1aba1e9d5b836f01c.tar.xz | |
Merge branch 'delivery/at91_fixes' of git://git.jcrosoft.org/barebox
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/at91sam9x5ek/init.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9g45_devices.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/boards/at91sam9x5ek/init.c b/arch/arm/boards/at91sam9x5ek/init.c index 8cc119eb3e..f2302054fb 100644 --- a/arch/arm/boards/at91sam9x5ek/init.c +++ b/arch/arm/boards/at91sam9x5ek/init.c @@ -46,6 +46,7 @@ struct w1_gpio_platform_data w1_pdata = { .pin = AT91_PIN_PB18, + .ext_pullup_enable_pin = -EINVAL, .is_open_drain = 0, }; diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index c5f99b1523..d2746da9df 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -155,15 +155,15 @@ static struct i2c_gpio_platform_data pdata_i2c1 = { void at91_add_device_i2c(short i2c_id, struct i2c_board_info *devices, int nr_devices) { - struct i2c_gpio_platform_data *pdata = &pdata_i2c; + struct i2c_gpio_platform_data *pdata; i2c_register_board_info(i2c_id, devices, nr_devices); switch (i2c_id) { - case 0; + case 0: pdata = &pdata_i2c0; break; - case 1; + case 1: pdata = &pdata_i2c1; break; default: |