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

Commit 302090a6 authored by Bo Shen's avatar Bo Shen Committed by Nicolas Ferre
Browse files

ARM: at91/i2c: change id to let i2c-at91 work 



The i2c core driver will turn the platform device ID to busnum
When using platfrom device ID as -1, it means dynamically assigned
the busnum. When writing code, we need to make sure the busnum,
and call i2c_register_board_info(int busnum, ...) to register device
if using -1, we do not know the value of busnum

In order to solve this issue, set the platform device ID as a fix number
Here using 0 to match the busnum used in i2c_regsiter_board_info()

Signed-off-by: default avatarBo Shen <voice.shen@atmel.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
parent 7840487c

arch/arm/mach-at91/at91rm9200.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),

	CLKDEV_CON_DEV_ID(NULL, "i2c-at91rm9200", &twi_clk),

	CLKDEV_CON_DEV_ID(NULL, "i2c-at91rm9200.0", &twi_clk),

	/* fake hclk clock */

	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),

	CLKDEV_CON_ID("pioA", &pioA_clk),

arch/arm/mach-at91/at91rm9200_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static struct resource twi_resources[] = { 


static struct platform_device at91rm9200_twi_device = {

	.name		= "i2c-at91rm9200",

	.id		= -1,

	.id		= 0,

	.resource	= twi_resources,

	.num_resources	= ARRAY_SIZE(twi_resources),

};

arch/arm/mach-at91/at91sam9260.c

+2 −2
Original line number Diff line number Diff line
@@ -211,8 +211,8 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk),

	CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk),

	CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260", &twi_clk),

	CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20", &twi_clk),

	CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260.0", &twi_clk),

	CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi_clk),

	/* more usart lookup table for DT entries */

	CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck),

	CLKDEV_CON_DEV_ID("usart", "fffb0000.serial", &usart0_clk),

arch/arm/mach-at91/at91sam9260_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static struct resource twi_resources[] = { 
};



static struct platform_device at91sam9260_twi_device = {

	.id		= -1,

	.id		= 0,

	.resource	= twi_resources,

	.num_resources	= ARRAY_SIZE(twi_resources),

};

arch/arm/mach-at91/at91sam9261.c

+2 −2
Original line number Diff line number Diff line
@@ -178,8 +178,8 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),

	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0),

	CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9261", &twi_clk),

	CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10", &twi_clk),

	CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9261.0", &twi_clk),

	CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10.0", &twi_clk),

	CLKDEV_CON_ID("pioA", &pioA_clk),

	CLKDEV_CON_ID("pioB", &pioB_clk),

	CLKDEV_CON_ID("pioC", &pioC_clk),