Merge tag 'v3.13-rc4' into next

Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.

2 files changed, 2 insertions, 55 deletions

diff --git a/include/linux/i2c/at24.h b/include/linux/i2c/at24.h
deleted file mode 100644
index 285025a9cdc9..000000000000
--- a/include/linux/i2c/at24.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * at24.h - platform_data for the at24 (generic eeprom) driver
- * (C) Copyright 2008 by Pengutronix
- * (C) Copyright 2012 by Wolfram Sang
- * same license as the driver
- */
-
-#ifndef _LINUX_AT24_H
-#define _LINUX_AT24_H
-
-#include <linux/types.h>
-#include <linux/memory.h>
-
-/**
- * struct at24_platform_data - data to set up at24 (generic eeprom) driver
- * @byte_len: size of eeprom in byte
- * @page_size: number of byte which can be written in one go
- * @flags: tunable options, check AT24_FLAG_* defines
- * @setup: an optional callback invoked after eeprom is probed; enables kernel
-        code to access eeprom via memory_accessor, see example
- * @context: optional parameter passed to setup()
- *
- * If you set up a custom eeprom type, please double-check the parameters.
- * Especially page_size needs extra care, as you risk data loss if your value
- * is bigger than what the chip actually supports!
- *
- * An example in pseudo code for a setup() callback:
- *
- * void get_mac_addr(struct memory_accessor *mem_acc, void *context)
- * {
- *      u8 *mac_addr = ethernet_pdata->mac_addr;
- *      off_t offset = context;
- *
- *      // Read MAC addr from EEPROM
- *      if (mem_acc->read(mem_acc, mac_addr, offset, ETH_ALEN) == ETH_ALEN)
- *              pr_info("Read MAC addr from EEPROM: %pM\n", mac_addr);
- * }
- *
- * This function pointer and context can now be set up in at24_platform_data.
- */
-
-struct at24_platform_data {
-        u32             byte_len;               /* size (sum of all addr) */
-        u16             page_size;              /* for writes */
-        u8              flags;
-#define AT24_FLAG_ADDR16        0x80    /* address pointer is 16 bit */
-#define AT24_FLAG_READONLY      0x40    /* sysfs-entry will be read-only */
-#define AT24_FLAG_IRUGO         0x20    /* sysfs-entry will be world-readable */
-#define AT24_FLAG_TAKE8ADDR     0x10    /* take always 8 addresses (24c00) */
-
-        void            (*setup)(struct memory_accessor *, void *context);
-        void            *context;
-};
-
-#endif /* _LINUX_AT24_H */
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 81cbbdb96aae..673a3ce67f31 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -26,6 +26,7 @@
 #define __TWL_H_
 
 #include <linux/types.h>
+#include <linux/phy/phy.h>
 #include <linux/input/matrix_keypad.h>
 
 /*
@@ -615,6 +616,7 @@ enum twl4030_usb_mode {
 struct twl4030_usb_data {
         enum twl4030_usb_mode   usb_mode;
         unsigned long           features;
+        struct phy_init_data    *init_data;
 
         int             (*phy_init)(struct device *dev);
         int             (*phy_exit)(struct device *dev);