Commit 95e272dc authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Wolfram Sang
Browse files

ARM: davinci: Constify the software nodes 



Additional device properties are always just a part of a
software fwnode. If the device properties are constant, the
software node can also be constant.

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 714638e0

arch/arm/mach-davinci/board-da830-evm.c

+5 −1
Original line number Diff line number Diff line
@@ -454,6 +454,10 @@ static const struct property_entry da830_evm_i2c_eeprom_properties[] = { 
	{ }

};



static const struct software_node da830_evm_i2c_eeprom_node = {

	.properties = da830_evm_i2c_eeprom_properties,

};



static int __init da830_evm_ui_expander_setup(struct i2c_client *client,

		int gpio, unsigned ngpio, void *context)

{
@@ -485,7 +489,7 @@ static struct pcf857x_platform_data __initdata da830_evm_ui_expander_info = { 
static struct i2c_board_info __initdata da830_evm_i2c_devices[] = {

	{

		I2C_BOARD_INFO("24c256", 0x50),

		.properties = da830_evm_i2c_eeprom_properties,

		.swnode = &da830_evm_i2c_eeprom_node,

	},

	{

		I2C_BOARD_INFO("tlv320aic3x", 0x18),

arch/arm/mach-davinci/board-dm365-evm.c

+5 −1
Original line number Diff line number Diff line
@@ -232,10 +232,14 @@ static const struct property_entry eeprom_properties[] = { 
	{ }

};



static const struct software_node eeprom_node = {

	.properties = eeprom_properties,

};



static struct i2c_board_info i2c_info[] = {

	{

		I2C_BOARD_INFO("24c256", 0x50),

		.properties = eeprom_properties,

		.swnode = &eeprom_node,

	},

	{

		I2C_BOARD_INFO("tlv320aic3x", 0x18),

arch/arm/mach-davinci/board-dm644x-evm.c

+5 −1
Original line number Diff line number Diff line
@@ -541,6 +541,10 @@ static const struct property_entry eeprom_properties[] = { 
	{ }

};



static const struct software_node eeprom_node = {

	.properties = eeprom_properties,

};



/*

 * MSP430 supports RTC, card detection, input from IR remote, and

 * a bit more.  It triggers interrupts on GPIO(7) from pressing
@@ -647,7 +651,7 @@ static struct i2c_board_info __initdata i2c_info[] = { 
	},

	{

		I2C_BOARD_INFO("24c256", 0x50),

		.properties = eeprom_properties,

		.swnode = &eeprom_node,

	},

	{

		I2C_BOARD_INFO("tlv320aic33", 0x1b),

arch/arm/mach-davinci/board-dm646x-evm.c

+5 −1
Original line number Diff line number Diff line
@@ -362,6 +362,10 @@ static const struct property_entry eeprom_properties[] = { 
	PROPERTY_ENTRY_U32("pagesize", 64),

	{ }

};



static const struct software_node eeprom_node = {

	.properties = eeprom_properties,

};

#endif



static u8 dm646x_iis_serializer_direction[] = {
@@ -430,7 +434,7 @@ static void evm_init_cpld(void) 
static struct i2c_board_info __initdata i2c_info[] =  {

	{

		I2C_BOARD_INFO("24c256", 0x50),

		.properties  = eeprom_properties,

		.swnode = &eeprom_node,

	},

	{

		I2C_BOARD_INFO("pcf8574a", 0x38),

arch/arm/mach-davinci/board-mityomapl138.c

+5 −1
Original line number Diff line number Diff line
@@ -197,6 +197,10 @@ static const struct property_entry mityomapl138_fd_chip_properties[] = { 
	{ }

};



static const struct software_node mityomapl138_fd_chip_node = {

	.properties = mityomapl138_fd_chip_properties,

};



static struct davinci_i2c_platform_data mityomap_i2c_0_pdata = {

	.bus_freq	= 100,	/* kHz */

	.bus_delay	= 0,	/* usec */
@@ -323,7 +327,7 @@ static struct i2c_board_info __initdata mityomap_tps65023_info[] = { 
	},

	{

		I2C_BOARD_INFO("24c02", 0x50),

		.properties = mityomapl138_fd_chip_properties,

		.swnode = &mityomapl138_fd_chip_node,

	},

};