Merge commit '949bdcc8a97c' into omap-for-v4.19/dt

[sfrench/cifs-2.6.git] / arch / arm / mach-imx / mach-vpr200.c

diff --git a/arch/arm/mach-imx/mach-vpr200.c b/arch/arm/mach-imx/mach-vpr200.c
index 5ff154c9a08626fa179983d0361a2ec22a7aa6c7..da3336aaa4c53758f86a84501f1d3137fae76cdd 100644 (file)
--- a/arch/arm/mach-imx/mach-vpr200.c
+++ b/arch/arm/mach-imx/mach-vpr200.c
@@ -29,7 +29,6 @@
 #include <asm/mach/time.h>
 
 #include <linux/i2c.h>
-#include <linux/platform_data/at24.h>
 #include <linux/mfd/mc13xxx.h>
 
 #include "common.h"
@@ -145,15 +144,9 @@ static const struct imxi2c_platform_data vpr200_i2c0_data __initconst = {
        .bitrate = 50000,
 };
 
-static struct at24_platform_data vpr200_eeprom = {
-       .byte_len = 2048 / 8,
-       .page_size = 1,
-};
-
 static struct i2c_board_info vpr200_i2c_devices[] = {
        {
-               I2C_BOARD_INFO("at24", 0x50), /* E0=0, E1=0, E2=0 */
-               .platform_data = &vpr200_eeprom,
+               I2C_BOARD_INFO("24c02", 0x50), /* E0=0, E1=0, E2=0 */
        }, {
                I2C_BOARD_INFO("mc13892", 0x08),
                .platform_data = &vpr200_pmic,