aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMugunthan V N2013-07-09 09:49:41 -0500
committerPraneeth Bajjuri2013-08-09 17:04:11 -0500
commitfa281337fddd04cdb58469fdfec339d47a252bfe (patch)
tree1edb6de6117df63a16f954614f8b190162dbafa5
parent7277c961ec4c2b08eaace2c148387e8b51abbfe1 (diff)
downloadkernel-audio-fa281337fddd04cdb58469fdfec339d47a252bfe.tar.gz
kernel-audio-fa281337fddd04cdb58469fdfec339d47a252bfe.tar.xz
kernel-audio-fa281337fddd04cdb58469fdfec339d47a252bfe.zip
drivers: net: cpsw: Add support for new CPSW IP version
The new IP version has a minor changes and the offsets are same as the previous version, so adding new IP version support in the driver. Change-Id: I19274d09b25be8acc3db3cdd74346aa79989f46a Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> [Added change-id for gerrit] Signed-off-by: Praveen Rao <prao@ti.com>
-rw-r--r--drivers/net/ethernet/ti/cpsw.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index b21b5c256bb2..d823ea84a894 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -81,6 +81,7 @@ do { \
81 81
82#define CPSW_VERSION_1 0x19010a 82#define CPSW_VERSION_1 0x19010a
83#define CPSW_VERSION_2 0x19010c 83#define CPSW_VERSION_2 0x19010c
84#define CPSW_VERSION_3 0x19010f
84 85
85#define HOST_PORT_NUM 0 86#define HOST_PORT_NUM 0
86#define SLIVER_SIZE 0x40 87#define SLIVER_SIZE 0x40
@@ -781,6 +782,7 @@ static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv)
781 slave_write(slave, TX_PRIORITY_MAPPING, CPSW1_TX_PRI_MAP); 782 slave_write(slave, TX_PRIORITY_MAPPING, CPSW1_TX_PRI_MAP);
782 break; 783 break;
783 case CPSW_VERSION_2: 784 case CPSW_VERSION_2:
785 case CPSW_VERSION_3:
784 slave_write(slave, TX_PRIORITY_MAPPING, CPSW2_TX_PRI_MAP); 786 slave_write(slave, TX_PRIORITY_MAPPING, CPSW2_TX_PRI_MAP);
785 break; 787 break;
786 } 788 }
@@ -1750,6 +1752,7 @@ static int cpsw_probe(struct platform_device *pdev)
1750 dma_params.desc_mem_phys = 0; 1752 dma_params.desc_mem_phys = 0;
1751 break; 1753 break;
1752 case CPSW_VERSION_2: 1754 case CPSW_VERSION_2:
1755 case CPSW_VERSION_3:
1753 priv->host_port_regs = ss_regs + CPSW2_HOST_PORT_OFFSET; 1756 priv->host_port_regs = ss_regs + CPSW2_HOST_PORT_OFFSET;
1754 priv->cpts->reg = ss_regs + CPSW2_CPTS_OFFSET; 1757 priv->cpts->reg = ss_regs + CPSW2_CPTS_OFFSET;
1755 dma_params.dmaregs = ss_regs + CPSW2_CPDMA_OFFSET; 1758 dma_params.dmaregs = ss_regs + CPSW2_CPDMA_OFFSET;