summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhoronzhuk, Ivan <ivan.khoronzhuk@ti.com>2014-10-17 21:01:14 +0300
committerTom Rini <trini@ti.com>2014-10-23 11:27:29 -0400
commitff11c7697cee84d03e8020cc6198554550cd3ea2 (patch)
tree95e5de722b8955da637a9483308951851961a780
parent3c61502aad85e8b25b75e349dfd5a5a7eee22301 (diff)
downloadu-boot-imx-ff11c7697cee84d03e8020cc6198554550cd3ea2.zip
u-boot-imx-ff11c7697cee84d03e8020cc6198554550cd3ea2.tar.gz
u-boot-imx-ff11c7697cee84d03e8020cc6198554550cd3ea2.tar.bz2
net: keystone_net: add Keystone2 K2E SoC support
The Keystone2 Edison SoC uses the same keystone net driver. This patch adds opportunity to use it by K2E SoCs. Acked-by: Vitaly Andrianov <vitalya@ti.com> Acked-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
-rw-r--r--arch/arm/include/asm/arch-keystone/hardware-k2e.h3
-rw-r--r--drivers/net/keystone_net.c5
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-keystone/hardware-k2e.h b/arch/arm/include/asm/arch-keystone/hardware-k2e.h
index 1d6fd11..9512756 100644
--- a/arch/arm/include/asm/arch-keystone/hardware-k2e.h
+++ b/arch/arm/include/asm/arch-keystone/hardware-k2e.h
@@ -61,4 +61,7 @@
#define KS2_NETCP_PDMA_RX_RCV_QUEUE 4002
#define KS2_NETCP_PDMA_TX_SND_QUEUE 896
+/* NETCP */
+#define KS2_NETCP_BASE 0x24000000
+
#endif
diff --git a/drivers/net/keystone_net.c b/drivers/net/keystone_net.c
index 43c263e..1186188 100644
--- a/drivers/net/keystone_net.c
+++ b/drivers/net/keystone_net.c
@@ -289,6 +289,11 @@ int mac_sl_config(u_int16_t port, struct mac_sl_cfg *cfg)
writel(cfg->max_rx_len, DEVICE_EMACSL_BASE(port) + CPGMACSL_REG_MAXLEN);
writel(cfg->ctl, DEVICE_EMACSL_BASE(port) + CPGMACSL_REG_CTL);
+#ifdef CONFIG_K2E_EVM
+ /* Map RX packet flow priority to 0 */
+ writel(0, DEVICE_EMACSL_BASE(port) + CPGMACSL_REG_RX_PRI_MAP);
+#endif
+
return ret;
}