net: keystone_serdes: add keystone K2L SoC support

Keystone2 Lamar SoC uses the same keystone SerDes driver.
All Keystone2 EVM boards currently use SerDes driver, so move
CONFIG_TI_KEYSTONE_SERDES to common configuration file.

Acked-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>

diff --git a/arch/arm/include/asm/arch-keystone/hardware-k2l.h b/arch/arm/include/asm/arch-keystone/hardware-k2l.h
index 05532ada70d0d21d6beaa5c5ca6209b111a00f83..da448fd98913f62204ffa7c6dee607fd7fc8508b 100644 (file)
--- a/arch/arm/include/asm/arch-keystone/hardware-k2l.h
+++ b/arch/arm/include/asm/arch-keystone/hardware-k2l.h
@@ -84,6 +84,10 @@
 /* OSR memory size */
 #define KS2_OSR_SIZE                   0x100000
 
+/* SGMII SerDes */
+#define KS2_SGMII_SERDES2_BASE         0x02320000
+#define KS2_LANES_PER_SGMII_SERDES     2
+
 /* Number of DSP cores */
 #define KS2_NUM_DSPS                   4
 

diff --git a/drivers/net/keystone_net.c b/drivers/net/keystone_net.c
index c8681d02234b3b7d692d57c416328d83ce72790e..83eeedae173fee270babc8c999a1e76cb0bf3068 100644 (file)
--- a/drivers/net/keystone_net.c
+++ b/drivers/net/keystone_net.c
@@ -582,7 +582,7 @@ static void keystone2_net_serdes_setup(void)
                        &ks2_serdes_sgmii_156p25mhz,
                        CONFIG_KSNET_SERDES_LANES_PER_SGMII);
 
-#ifdef CONFIG_SOC_K2E
+#if defined(CONFIG_SOC_K2E) || defined(CONFIG_SOC_K2L)
        ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII2_BASE,
                        &ks2_serdes_sgmii_156p25mhz,
                        CONFIG_KSNET_SERDES_LANES_PER_SGMII);

diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index 7c8065ad187e8bc5ed9fac5b19e08ed9c5d8a50d..c79d50cb16c450e23eb3e3f1b0522f9d2f5ffc8a 100644 (file)
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -42,7 +42,4 @@
 #define CONFIG_KSNET_CPSW_NUM_PORTS    9
 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
-/* SerDes */
-#define CONFIG_TI_KEYSTONE_SERDES
-
 #endif /* __CONFIG_K2E_EVM_H */

diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index 034cbfd4d7815ec283cf4fbeab64fe2fdd40ef13..45bd72d2de8253e0fdb429760b6b617742bcf67d 100644 (file)
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -41,7 +41,4 @@
 #define CONFIG_KSNET_NETCP_V1_0
 #define CONFIG_KSNET_CPSW_NUM_PORTS    5
 
-/* SerDes */
-#define CONFIG_TI_KEYSTONE_SERDES
-
 #endif /* __CONFIG_K2HK_EVM_H */

diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h
index b0c91d8dcb599a6f91ff0b32ba4b968e68aed0cb..7f44ea4143b8a0ce8a7472a0446fe367e1ebd791 100644 (file)
--- a/include/configs/ks2_evm.h
+++ b/include/configs/ks2_evm.h
@@ -140,6 +140,9 @@
 #define CONFIG_KSNET_SERDES_SGMII2_BASE                KS2_SGMII_SERDES2_BASE
 #define CONFIG_KSNET_SERDES_LANES_PER_SGMII    KS2_LANES_PER_SGMII_SERDES
 
+/* SerDes */
+#define CONFIG_TI_KEYSTONE_SERDES
+
 /* AEMIF */
 #define CONFIG_TI_AEMIF
 #define CONFIG_AEMIF_CNTRL_BASE                KS2_AEMIF_CNTRL_BASE