diff options
| -rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 7 | ||||
| -rw-r--r-- | include/asm-avr32/arch-at32ap/board.h | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index cb47afc9fffc..6302bfd58514 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c | |||
| @@ -990,7 +990,9 @@ static struct clk atmel_twi0_pclk = { | |||
| 990 | .index = 2, | 990 | .index = 2, |
| 991 | }; | 991 | }; |
| 992 | 992 | ||
| 993 | struct platform_device *__init at32_add_device_twi(unsigned int id) | 993 | struct platform_device *__init at32_add_device_twi(unsigned int id, |
| 994 | struct i2c_board_info *b, | ||
| 995 | unsigned int n) | ||
| 994 | { | 996 | { |
| 995 | struct platform_device *pdev; | 997 | struct platform_device *pdev; |
| 996 | 998 | ||
| @@ -1010,6 +1012,9 @@ struct platform_device *__init at32_add_device_twi(unsigned int id) | |||
| 1010 | 1012 | ||
| 1011 | atmel_twi0_pclk.dev = &pdev->dev; | 1013 | atmel_twi0_pclk.dev = &pdev->dev; |
| 1012 | 1014 | ||
| 1015 | if (b) | ||
| 1016 | i2c_register_board_info(id, b, n); | ||
| 1017 | |||
| 1013 | platform_device_add(pdev); | 1018 | platform_device_add(pdev); |
| 1014 | return pdev; | 1019 | return pdev; |
| 1015 | 1020 | ||
diff --git a/include/asm-avr32/arch-at32ap/board.h b/include/asm-avr32/arch-at32ap/board.h index 3fea2004f7db..a4e2d28bfb58 100644 --- a/include/asm-avr32/arch-at32ap/board.h +++ b/include/asm-avr32/arch-at32ap/board.h | |||
| @@ -66,7 +66,10 @@ struct platform_device *at32_add_device_pwm(u32 mask); | |||
| 66 | struct platform_device * | 66 | struct platform_device * |
| 67 | at32_add_device_ssc(unsigned int id, unsigned int flags); | 67 | at32_add_device_ssc(unsigned int id, unsigned int flags); |
| 68 | 68 | ||
| 69 | struct platform_device *at32_add_device_twi(unsigned int id); | 69 | struct i2c_board_info; |
| 70 | struct platform_device *at32_add_device_twi(unsigned int id, | ||
| 71 | struct i2c_board_info *b, | ||
| 72 | unsigned int n); | ||
| 70 | struct platform_device *at32_add_device_mci(unsigned int id); | 73 | struct platform_device *at32_add_device_mci(unsigned int id); |
| 71 | struct platform_device *at32_add_device_ac97c(unsigned int id); | 74 | struct platform_device *at32_add_device_ac97c(unsigned int id); |
| 72 | struct platform_device *at32_add_device_abdac(unsigned int id); | 75 | struct platform_device *at32_add_device_abdac(unsigned int id); |
