Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 040b28fc authored by Ben Nizette's avatar Ben Nizette Committed by Haavard Skinnemoen
Browse files

avr32: pass i2c board info through at32_add_device_twi 



New-style I2C drivers require that motherboard-mounted I2C devices are
registered with the I2C core, typically at arch_initcall time.  This
can be done nice and neat by passing the struct i2c_board_info[]
through at32_add_device_twi just like we do for the SPI board info.

While we've got the hood up, remove a duplicate declaration of
at32_add_device_twi() in board.h.

[hskinnemoen@atmel.com: add missing i2c_board_info forward-declaration]
Signed-Off-By: default avatarBen Nizette <bn@niasdigital.com>
Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
parent e573ebb0

arch/avr32/mach-at32ap/at32ap700x.c

+6 −1
Original line number Diff line number Diff line
@@ -990,7 +990,9 @@ static struct clk atmel_twi0_pclk = { 
	.index		= 2,

};



struct platform_device *__init at32_add_device_twi(unsigned int id)

struct platform_device *__init at32_add_device_twi(unsigned int id,

						    struct i2c_board_info *b,

						    unsigned int n)

{

	struct platform_device *pdev;
@@ -1010,6 +1012,9 @@ struct platform_device *__init at32_add_device_twi(unsigned int id) 


	atmel_twi0_pclk.dev = &pdev->dev;



	if (b)

		i2c_register_board_info(id, b, n);



	platform_device_add(pdev);

	return pdev;

include/asm-avr32/arch-at32ap/board.h

+4 −1
Original line number Diff line number Diff line
@@ -66,7 +66,10 @@ struct platform_device *at32_add_device_pwm(u32 mask); 
struct platform_device *

at32_add_device_ssc(unsigned int id, unsigned int flags);



struct platform_device *at32_add_device_twi(unsigned int id);

struct i2c_board_info;

struct platform_device *at32_add_device_twi(unsigned int id,

					    struct i2c_board_info *b,

					    unsigned int n);

struct platform_device *at32_add_device_mci(unsigned int id);

struct platform_device *at32_add_device_ac97c(unsigned int id);

struct platform_device *at32_add_device_abdac(unsigned int id);