Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci

* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (50 commits)
  davinci: fix remaining board support after io_pgoffst removal
  davinci: mityomapl138: make file local data static
  arm/davinci: remove duplicated include
  davinci: Initial support for Omapl138-Hawkboard
  davinci: MityDSP-L138/MityARM-1808 read MAC address from I2C Prom
  davinci: add tnetv107x touchscreen platform device
  input: add driver for tnetv107x touchscreen controller
  davinci: add keypad config for tnetv107x evm board
  davinci: add tnetv107x keypad platform device
  input: add driver for tnetv107x on-chip keypad controller
  net: davinci_emac: cleanup unused cpdma code
  net: davinci_emac: switch to new cpdma layer
  net: davinci_emac: separate out cpdma code
  net: davinci_emac: cleanup unused mdio emac code
  omap: cleanup unused davinci mdio arch code
  davinci: cleanup mdio arch code and switch to phy_id
  net: davinci_emac: switch to new mdio
  omap: add mdio platform devices
  davinci: add mdio platform devices
  net: davinci_emac: separate out davinci mdio
  ...

Fix up trivial conflict in drivers/input/keyboard/Kconfig (two entries
added next to each other - one from the davinci merge, one from the
input merge)

1 files changed, 13 insertions, 3 deletions

diff --git a/include/linux/davinci_emac.h b/include/linux/davinci_emac.h
index 7c930dba477c..5dd428532f79 100644
--- a/include/linux/davinci_emac.h
+++ b/include/linux/davinci_emac.h
@@ -14,16 +14,26 @@
 #include <linux/if_ether.h>
 #include <linux/memory.h>
 
+struct mdio_platform_data {
+        unsigned long           bus_freq;
+};
+
 struct emac_platform_data {
         char mac_addr[ETH_ALEN];
         u32 ctrl_reg_offset;
         u32 ctrl_mod_reg_offset;
         u32 ctrl_ram_offset;
         u32 hw_ram_addr;
-        u32 mdio_reg_offset;
         u32 ctrl_ram_size;
-        u32 phy_mask;
-        u32 mdio_max_freq;
+
+        /*
+         * phy_id can be one of the following:
+         *   - NULL             : use the first phy on the bus,
+         *   - ""               : force to 100/full, no mdio control
+         *   - "<bus>:<addr>"   : use the specified bus and phy
+         */
+        const char *phy_id;
+
         u8 rmii_en;
         u8 version;
         void (*interrupt_enable) (void);