p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drivers: net: cpsw: remove platform data header file of cpsw 

CPSW driver no longer supports platform register as all the SoCs which has CPSW
are supporting DT only booting, so moving cpsw.h header file from platform
include to drivers/net/ethernet/ti

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Mugunthan V N 2013-08-19 17:47:40 +05:30 committed by David S. Miller
parent e837735ec4
commit dbe34724c0
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/ti/cpsw.c
View File

@ -34,9 +34,9 @@
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/platform_data/cpsw.h>
#include <linux/pinctrl/consumer.h> #include <linux/pinctrl/consumer.h>
#include "cpsw.h"
#include "cpsw_ale.h" #include "cpsw_ale.h"
#include "cpts.h" #include "cpts.h"
#include "davinci_cpdma.h" #include "davinci_cpdma.h"

12
include/linux/platform_data/cpsw.h → drivers/net/ethernet/ti/cpsw.h
View File

@ -1,11 +1,10 @@
/* /* Texas Instruments Ethernet Switch Driver
* Texas Instruments Ethernet Switch Driver
* *
* Copyright (C) 2012 Texas Instruments * Copyright (C) 2013 Texas Instruments
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License
* published by the Free Software Foundation version 2. * version 2 as published by the Free Software Foundation.
* *
* This program is distributed "as is" WITHOUT ANY WARRANTY of any * This program is distributed "as is" WITHOUT ANY WARRANTY of any
* kind, whether express or implied; without even the implied warranty * kind, whether express or implied; without even the implied warranty
@ -22,14 +21,13 @@ struct cpsw_slave_data {
int phy_if; int phy_if;
u8 mac_addr[ETH_ALEN]; u8 mac_addr[ETH_ALEN];
u16 dual_emac_res_vlan; /* Reserved VLAN for DualEMAC */ u16 dual_emac_res_vlan; /* Reserved VLAN for DualEMAC */
}; };
struct cpsw_platform_data { struct cpsw_platform_data {
struct cpsw_slave_data *slave_data;
u32 ss_reg_ofs; /* Subsystem control register offset */ u32 ss_reg_ofs; /* Subsystem control register offset */
u32 channels; /* number of cpdma channels (symmetric) */ u32 channels; /* number of cpdma channels (symmetric) */
u32 slaves; /* number of slave cpgmac ports */ u32 slaves; /* number of slave cpgmac ports */
struct cpsw_slave_data *slave_data;
u32 active_slave; /* time stamping, ethtool and SIOCGMIIPHY slave */ u32 active_slave; /* time stamping, ethtool and SIOCGMIIPHY slave */
u32 cpts_clock_mult; /* convert input clock ticks to nanoseconds */ u32 cpts_clock_mult; /* convert input clock ticks to nanoseconds */
u32 cpts_clock_shift; /* convert input clock ticks to nanoseconds */ u32 cpts_clock_shift; /* convert input clock ticks to nanoseconds */