diff options
| author | Scott Wood <scottwood@freescale.com> | 2007-10-02 10:55:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:54:03 -0700 |
| commit | 976de6a8c304dcc43e38efcb8a0bace7866b6242 (patch) | |
| tree | bae132693bbcfa65c03cf44c7db924fdebf13158 /include/linux/fs_enet_pd.h | |
| parent | 0d0d9c150c046cbd3e507adcfa2d78db82f1f452 (diff) | |
| download | op-kernel-dev-976de6a8c304dcc43e38efcb8a0bace7866b6242.zip op-kernel-dev-976de6a8c304dcc43e38efcb8a0bace7866b6242.tar.gz | |
fs_enet: Be an of_platform device when CONFIG_PPC_CPM_NEW_BINDING is set.
The existing OF glue code was crufty and broken. Rather than fix it, it
will be removed, and the ethernet driver now talks to the device tree
directly.
The old, non-CONFIG_PPC_CPM_NEW_BINDING code can go away once CPM
platforms are dropped from arch/ppc (which will hopefully be soon), and
existing arch/powerpc boards that I wasn't able to test on for this
patchset get converted (which should be even sooner).
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'include/linux/fs_enet_pd.h')
| -rw-r--r-- | include/linux/fs_enet_pd.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h index 815c6f9..9bc045b 100644 --- a/include/linux/fs_enet_pd.h +++ b/include/linux/fs_enet_pd.h @@ -120,6 +120,7 @@ struct fs_platform_info { u32 cp_page; /* CPM page */ u32 cp_block; /* CPM sblock */ + u32 cp_command; /* CPM page/sblock/mcn */ u32 clk_trx; /* some stuff for pins & mux configuration*/ u32 clk_rx; @@ -134,7 +135,11 @@ struct fs_platform_info { u32 device_flags; int phy_addr; /* the phy address (-1 no phy) */ +#ifdef CONFIG_PPC_CPM_NEW_BINDING + char bus_id[16]; +#else const char* bus_id; +#endif int phy_irq; /* the phy irq (if it exists) */ const struct fs_mii_bus_info *bus_info; |
