Commit 90733530 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

Merge branch 'v5.1/eeprom-for-bartosz' of... 

Merge branch 'v5.1/eeprom-for-bartosz' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into at24/for-next
parents d1393711 e430685f

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

+5 −8
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/platform_device.h>

#include <linux/i2c.h>

#include <linux/platform_data/pcf857x.h>

#include <linux/platform_data/at24.h>

#include <linux/property.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/spi/spi.h>
@@ -457,12 +457,9 @@ static struct nvmem_cell_lookup da830_evm_nvmem_cell_lookup = { 
	.con_id		= "mac-address",

};



static struct at24_platform_data da830_evm_i2c_eeprom_info = {

	.byte_len	= SZ_256K / 8,

	.page_size	= 64,

	.flags		= AT24_FLAG_ADDR16,

	.setup		= davinci_get_mac_addr,

	.context	= (void *)0x7f00,

static const struct property_entry da830_evm_i2c_eeprom_properties[] = {

	PROPERTY_ENTRY_U32("pagesize", 64),

	{ }

};



static int __init da830_evm_ui_expander_setup(struct i2c_client *client,
@@ -496,7 +493,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),

		.platform_data	= &da830_evm_i2c_eeprom_info,

		.properties = da830_evm_i2c_eeprom_properties,

	},

	{

		I2C_BOARD_INFO("tlv320aic3x", 0x18),

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

+0 −28
Original line number Diff line number Diff line
@@ -150,32 +150,6 @@ static struct spi_board_info da850evm_spi_info[] = { 
	},

};



#ifdef CONFIG_MTD

static void da850_evm_m25p80_notify_add(struct mtd_info *mtd)

{

	char *mac_addr = davinci_soc_info.emac_pdata->mac_addr;

	size_t retlen;



	if (!strcmp(mtd->name, "MAC-Address")) {

		mtd_read(mtd, 0, ETH_ALEN, &retlen, mac_addr);

		if (retlen == ETH_ALEN)

			pr_info("Read MAC addr from SPI Flash: %pM\n",

				mac_addr);

	}

}



static struct mtd_notifier da850evm_spi_notifier = {

	.add	= da850_evm_m25p80_notify_add,

};



static void da850_evm_setup_mac_addr(void)

{

	register_mtd_user(&da850evm_spi_notifier);

}

#else

static void da850_evm_setup_mac_addr(void) { }

#endif



static struct mtd_partition da850_evm_norflash_partition[] = {

	{

		.name           = "bootloaders + env",
@@ -1494,8 +1468,6 @@ static __init void da850_evm_init(void) 
	if (ret)

		pr_warn("%s: SATA registration failed: %d\n", __func__, ret);



	da850_evm_setup_mac_addr();



	ret = da8xx_register_rproc();

	if (ret)

		pr_warn("%s: dsp/rproc registration failed: %d\n",

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

+5 −8
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/i2c.h>

#include <linux/io.h>

#include <linux/clk.h>

#include <linux/platform_data/at24.h>

#include <linux/property.h>

#include <linux/leds.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>
@@ -225,18 +225,15 @@ static struct nvmem_cell_lookup davinci_nvmem_cell_lookup = { 
	.con_id		= "mac-address",

};



static struct at24_platform_data eeprom_info = {

	.byte_len       = (256*1024) / 8,

	.page_size      = 64,

	.flags          = AT24_FLAG_ADDR16,

	.setup          = davinci_get_mac_addr,

	.context	= (void *)0x7f00,

static const struct property_entry eeprom_properties[] = {

	PROPERTY_ENTRY_U32("pagesize", 64),

	{ }

};



static struct i2c_board_info i2c_info[] = {

	{

		I2C_BOARD_INFO("24c256", 0x50),

		.platform_data	= &eeprom_info,

		.properties = eeprom_properties,

	},

	{

		I2C_BOARD_INFO("tlv320aic3x", 0x18),

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

+5 −8
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
#include <linux/gpio/machine.h>

#include <linux/i2c.h>

#include <linux/platform_data/pcf857x.h>

#include <linux/platform_data/at24.h>

#include <linux/platform_data/gpio-davinci.h>

#include <linux/property.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/rawnand.h>

#include <linux/mtd/partitions.h>
@@ -532,12 +532,9 @@ static struct nvmem_cell_lookup dm644evm_nvmem_cell_lookup = { 
	.con_id		= "mac-address",

};



static struct at24_platform_data eeprom_info = {

	.byte_len	= (256*1024) / 8,

	.page_size	= 64,

	.flags		= AT24_FLAG_ADDR16,

	.setup          = davinci_get_mac_addr,

	.context	= (void *)0x7f00,

static const struct property_entry eeprom_properties[] = {

	PROPERTY_ENTRY_U32("pagesize", 64),

	{ }

};



/*
@@ -647,7 +644,7 @@ static struct i2c_board_info __initdata i2c_info[] = { 
	},

	{

		I2C_BOARD_INFO("24c256", 0x50),

		.platform_data	= &eeprom_info,

		.properties = eeprom_properties,

	},

	{

		I2C_BOARD_INFO("tlv320aic33", 0x1b),

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

+5 −8
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/gpio.h>

#include <linux/platform_device.h>

#include <linux/i2c.h>

#include <linux/platform_data/at24.h>

#include <linux/property.h>

#include <linux/platform_data/pcf857x.h>

#include <linux/platform_data/ti-aemif.h>
@@ -364,12 +364,9 @@ static struct nvmem_cell_lookup dm646x_evm_nvmem_cell_lookup = { 
	.con_id		= "mac-address",

};



static struct at24_platform_data eeprom_info = {

	.byte_len       = (256*1024) / 8,

	.page_size      = 64,

	.flags          = AT24_FLAG_ADDR16,

	.setup          = davinci_get_mac_addr,

	.context	= (void *)0x7f00,

static const struct property_entry eeprom_properties[] = {

	PROPERTY_ENTRY_U32("pagesize", 64),

	{ }

};

#endif
@@ -440,7 +437,7 @@ static void evm_init_cpld(void) 
static struct i2c_board_info __initdata i2c_info[] =  {

	{

		I2C_BOARD_INFO("24c256", 0x50),

		.platform_data  = &eeprom_info,

		.properties  = eeprom_properties,

	},

	{

		I2C_BOARD_INFO("pcf8574a", 0x38),

CRA Git | Maintained and supported by SUSTech CRA and CCSE