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

Commit e252d4c3 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branches 'at91-fixes' and 'pxa-fixes'

parents 98aa6864 e7032700 008f6d2a

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ S: Maintained 


ARM/ATMEL AT91RM9200 ARM ARCHITECTURE

P:      Andrew Victor

M:      andrew@sanpeople.com

M:      linux@maxim.org.za

L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

W:      http://maxim.org.za/at91_26.html

S:      Maintained

arch/arm/mach-at91/at91rm9200_devices.c

+38 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <asm/mach/map.h>



#include <linux/platform_device.h>

#include <linux/i2c-gpio.h>



#include <asm/arch/board.h>

#include <asm/arch/gpio.h>
@@ -435,7 +436,40 @@ void __init at91_add_device_nand(struct at91_nand_data *data) {} 
 *  TWI (i2c)

 * -------------------------------------------------------------------- */



#if defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE)

/*

 * Prefer the GPIO code since the TWI controller isn't robust

 * (gets overruns and underruns under load) and can only issue

 * repeated STARTs in one scenario (the driver doesn't yet handle them).

 */

#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)



static struct i2c_gpio_platform_data pdata = {

	.sda_pin		= AT91_PIN_PA25,

	.sda_is_open_drain	= 1,

	.scl_pin		= AT91_PIN_PA26,

	.scl_is_open_drain	= 1,

	.udelay			= 2,		/* ~100 kHz */

};



static struct platform_device at91rm9200_twi_device = {

	.name			= "i2c-gpio",

	.id			= -1,

	.dev.platform_data	= &pdata,

};



void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)

{

	at91_set_GPIO_periph(AT91_PIN_PA25, 1);		/* TWD (SDA) */

	at91_set_multi_drive(AT91_PIN_PA25, 1);



	at91_set_GPIO_periph(AT91_PIN_PA26, 1);		/* TWCK (SCL) */

	at91_set_multi_drive(AT91_PIN_PA26, 1);



	i2c_register_board_info(0, devices, nr_devices);

	platform_device_register(&at91rm9200_twi_device);

}



#elif defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE)



static struct resource twi_resources[] = {

	[0] = {
@@ -457,7 +491,7 @@ static struct platform_device at91rm9200_twi_device = { 
	.num_resources	= ARRAY_SIZE(twi_resources),

};



void __init at91_add_device_i2c(void)

void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)

{

	/* pins used for TWI interface */

	at91_set_A_periph(AT91_PIN_PA25, 0);		/* TWD */
@@ -466,10 +500,11 @@ void __init at91_add_device_i2c(void) 
	at91_set_A_periph(AT91_PIN_PA26, 0);		/* TWCK */

	at91_set_multi_drive(AT91_PIN_PA26, 1);



	i2c_register_board_info(0, devices, nr_devices);

	platform_device_register(&at91rm9200_twi_device);

}

#else

void __init at91_add_device_i2c(void) {}

void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) {}

#endif

arch/arm/mach-at91/at91sam9260_devices.c

+39 −3
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <asm/mach/map.h>



#include <linux/platform_device.h>

#include <linux/i2c-gpio.h>



#include <asm/arch/board.h>

#include <asm/arch/gpio.h>
@@ -352,7 +353,41 @@ void __init at91_add_device_nand(struct at91_nand_data *data) {} 
 *  TWI (i2c)

 * -------------------------------------------------------------------- */



#if defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE)

/*

 * Prefer the GPIO code since the TWI controller isn't robust

 * (gets overruns and underruns under load) and can only issue

 * repeated STARTs in one scenario (the driver doesn't yet handle them).

 */



#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)



static struct i2c_gpio_platform_data pdata = {

	.sda_pin		= AT91_PIN_PA23,

	.sda_is_open_drain	= 1,

	.scl_pin		= AT91_PIN_PA24,

	.scl_is_open_drain	= 1,

	.udelay			= 2,		/* ~100 kHz */

};



static struct platform_device at91sam9260_twi_device = {

	.name			= "i2c-gpio",

	.id			= -1,

	.dev.platform_data	= &pdata,

};



void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)

{

	at91_set_GPIO_periph(AT91_PIN_PA23, 1);		/* TWD (SDA) */

	at91_set_multi_drive(AT91_PIN_PA23, 1);



	at91_set_GPIO_periph(AT91_PIN_PA24, 1);		/* TWCK (SCL) */

	at91_set_multi_drive(AT91_PIN_PA24, 1);



	i2c_register_board_info(0, devices, nr_devices);

	platform_device_register(&at91sam9260_twi_device);

}



#elif defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE)



static struct resource twi_resources[] = {

	[0] = {
@@ -374,7 +409,7 @@ static struct platform_device at91sam9260_twi_device = { 
	.num_resources	= ARRAY_SIZE(twi_resources),

};



void __init at91_add_device_i2c(void)

void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)

{

	/* pins used for TWI interface */

	at91_set_A_periph(AT91_PIN_PA23, 0);		/* TWD */
@@ -383,10 +418,11 @@ void __init at91_add_device_i2c(void) 
	at91_set_A_periph(AT91_PIN_PA24, 0);		/* TWCK */

	at91_set_multi_drive(AT91_PIN_PA24, 1);



	i2c_register_board_info(0, devices, nr_devices);

	platform_device_register(&at91sam9260_twi_device);

}

#else

void __init at91_add_device_i2c(void) {}

void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) {}

#endif

arch/arm/mach-at91/at91sam9261_devices.c

+39 −3
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 
#include <asm/mach/map.h>



#include <linux/platform_device.h>

#include <linux/i2c-gpio.h>



#include <linux/fb.h>

#include <video/atmel_lcdc.h>



#include <asm/arch/board.h>
@@ -275,7 +277,40 @@ void __init at91_add_device_nand(struct at91_nand_data *data) {} 
 *  TWI (i2c)

 * -------------------------------------------------------------------- */



#if defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE)

/*

 * Prefer the GPIO code since the TWI controller isn't robust

 * (gets overruns and underruns under load) and can only issue

 * repeated STARTs in one scenario (the driver doesn't yet handle them).

 */

#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)



static struct i2c_gpio_platform_data pdata = {

	.sda_pin		= AT91_PIN_PA7,

	.sda_is_open_drain	= 1,

	.scl_pin		= AT91_PIN_PA8,

	.scl_is_open_drain	= 1,

	.udelay			= 2,		/* ~100 kHz */

};



static struct platform_device at91sam9261_twi_device = {

	.name			= "i2c-gpio",

	.id			= -1,

	.dev.platform_data	= &pdata,

};



void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)

{

	at91_set_GPIO_periph(AT91_PIN_PA7, 1);		/* TWD (SDA) */

	at91_set_multi_drive(AT91_PIN_PA7, 1);



	at91_set_GPIO_periph(AT91_PIN_PA8, 1);		/* TWCK (SCL) */

	at91_set_multi_drive(AT91_PIN_PA8, 1);



	i2c_register_board_info(0, devices, nr_devices);

	platform_device_register(&at91sam9261_twi_device);

}



#elif defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE)



static struct resource twi_resources[] = {

	[0] = {
@@ -297,7 +332,7 @@ static struct platform_device at91sam9261_twi_device = { 
	.num_resources	= ARRAY_SIZE(twi_resources),

};



void __init at91_add_device_i2c(void)

void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)

{

	/* pins used for TWI interface */

	at91_set_A_periph(AT91_PIN_PA7, 0);		/* TWD */
@@ -306,10 +341,11 @@ void __init at91_add_device_i2c(void) 
	at91_set_A_periph(AT91_PIN_PA8, 0);		/* TWCK */

	at91_set_multi_drive(AT91_PIN_PA8, 1);



	i2c_register_board_info(0, devices, nr_devices);

	platform_device_register(&at91sam9261_twi_device);

}

#else

void __init at91_add_device_i2c(void) {}

void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) {}

#endif

arch/arm/mach-at91/at91sam9263_devices.c

+39 −3
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ 
#include <asm/mach/map.h>



#include <linux/platform_device.h>

#include <linux/i2c-gpio.h>



#include <linux/fb.h>

#include <video/atmel_lcdc.h>



#include <asm/arch/board.h>
@@ -421,7 +423,40 @@ void __init at91_add_device_nand(struct at91_nand_data *data) {} 
 *  TWI (i2c)

 * -------------------------------------------------------------------- */



#if defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE)

/*

 * Prefer the GPIO code since the TWI controller isn't robust

 * (gets overruns and underruns under load) and can only issue

 * repeated STARTs in one scenario (the driver doesn't yet handle them).

 */

#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)



static struct i2c_gpio_platform_data pdata = {

	.sda_pin		= AT91_PIN_PB4,

	.sda_is_open_drain	= 1,

	.scl_pin		= AT91_PIN_PB5,

	.scl_is_open_drain	= 1,

	.udelay			= 2,		/* ~100 kHz */

};



static struct platform_device at91sam9263_twi_device = {

	.name			= "i2c-gpio",

	.id			= -1,

	.dev.platform_data	= &pdata,

};



void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)

{

	at91_set_GPIO_periph(AT91_PIN_PB4, 1);		/* TWD (SDA) */

	at91_set_multi_drive(AT91_PIN_PB4, 1);



	at91_set_GPIO_periph(AT91_PIN_PB5, 1);		/* TWCK (SCL) */

	at91_set_multi_drive(AT91_PIN_PB5, 1);



	i2c_register_board_info(0, devices, nr_devices);

	platform_device_register(&at91sam9263_twi_device);

}



#elif defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE)



static struct resource twi_resources[] = {

	[0] = {
@@ -443,7 +478,7 @@ static struct platform_device at91sam9263_twi_device = { 
	.num_resources	= ARRAY_SIZE(twi_resources),

};



void __init at91_add_device_i2c(void)

void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)

{

	/* pins used for TWI interface */

	at91_set_A_periph(AT91_PIN_PB4, 0);		/* TWD */
@@ -452,10 +487,11 @@ void __init at91_add_device_i2c(void) 
	at91_set_A_periph(AT91_PIN_PB5, 0);		/* TWCK */

	at91_set_multi_drive(AT91_PIN_PB5, 1);



	i2c_register_board_info(0, devices, nr_devices);

	platform_device_register(&at91sam9263_twi_device);

}

#else

void __init at91_add_device_i2c(void) {}

void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) {}

#endif