soc: keystone_serdes: create a separate SGMII SerDes driver

This patch split the Keystone II SGMII SerDes related code from
Ethernet driver and create a separate SGMII SerDes driver.
The SerDes driver can be used by others keystone subsystems
like PCI, sRIO, so move it to driver/soc/keystone directory.

Add soc specific drivers directory like in the Linux kernel.
It is going to be used by keysotone soc specific drivers.

Signed-off-by: Hao Zhang <hzhang@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>

diff --git a/arch/arm/include/asm/ti-common/keystone_serdes.h b/arch/arm/include/asm/ti-common/keystone_serdes.h
new file mode 100644 (file)
index 0000000..2e12b05
--- /dev/null
+++ b/arch/arm/include/asm/ti-common/keystone_serdes.h
@@ -0,0 +1,15 @@
+/*
+ * Texas Instruments Keystone SerDes driver
+ *
+ * (C) Copyright 2014
+ *     Texas Instruments Incorporated, <www.ti.com>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#ifndef __TI_KEYSTONE_SERDES_H__
+#define __TI_KEYSTONE_SERDES_H__
+
+void ks2_serdes_sgmii_156p25mhz_setup(void);
+
+#endif /* __TI_KEYSTONE_SERDES_H__ */

diff --git a/drivers/Makefile b/drivers/Makefile
index d8361d95fd15ea8dab26b6e408cb8d4fb17d0eeb..33227c8bd6de003d170962e7f7778ed1b091c460 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -19,3 +19,5 @@ obj-$(CONFIG_QE) += qe/
 obj-y += memory/
 obj-y += pwm/
 obj-y += input/
+# SOC specific infrastructure drivers.
+obj-y += soc/

diff --git a/drivers/net/keystone_net.c b/drivers/net/keystone_net.c
index 33197f95b9e620621a810e4b3f92878a990ad9db..63f33611cb6a77fc39f58b29c4a9a81246fe73be 100644 (file)
--- a/drivers/net/keystone_net.c
+++ b/drivers/net/keystone_net.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <asm/ti-common/keystone_nav.h>
 #include <asm/ti-common/keystone_net.h>
+#include <asm/ti-common/keystone_serdes.h>
 
 unsigned int emac_open;
 static unsigned int sys_has_mdio = 1;
@@ -38,6 +39,7 @@ struct rx_buff_desc net_rx_buffs = {
 };
 
 static void keystone2_eth_mdio_enable(void);
+static void keystone2_net_serdes_setup(void);
 
 static int gen_get_link_speed(int phy_addr);
 
@@ -406,7 +408,7 @@ static int keystone2_eth_open(struct eth_device *dev, bd_t *bis)
        sys_has_mdio =
                (eth_priv->sgmii_link_type == SGMII_LINK_MAC_PHY) ? 1 : 0;
 
-       sgmii_serdes_setup_156p25mhz();
+       keystone2_net_serdes_setup();
 
        if (sys_has_mdio)
                keystone2_eth_mdio_enable();
@@ -552,142 +554,7 @@ int keystone2_emac_initialize(struct eth_priv_t *eth_priv)
        return 0;
 }
 
-void sgmii_serdes_setup_156p25mhz(void)
+static void keystone2_net_serdes_setup(void)
 {
-       unsigned int cnt;
-
-       /*
-        * configure Serializer/Deserializer (SerDes) hardware. SerDes IP
-        * hardware vendor published only register addresses and their values
-        * to be used for configuring SerDes. So had to use hardcoded values
-        * below.
-        */
-       clrsetbits_le32(0x0232a000, 0xffff0000, 0x00800000);
-       clrsetbits_le32(0x0232a014, 0x0000ffff, 0x00008282);
-       clrsetbits_le32(0x0232a060, 0x00ffffff, 0x00142438);
-       clrsetbits_le32(0x0232a064, 0x00ffff00, 0x00c3c700);
-       clrsetbits_le32(0x0232a078, 0x0000ff00, 0x0000c000);
-
-       clrsetbits_le32(0x0232a204, 0xff0000ff, 0x38000080);
-       clrsetbits_le32(0x0232a208, 0x000000ff, 0x00000000);
-       clrsetbits_le32(0x0232a20c, 0xff000000, 0x02000000);
-       clrsetbits_le32(0x0232a210, 0xff000000, 0x1b000000);
-       clrsetbits_le32(0x0232a214, 0x0000ffff, 0x00006fb8);
-       clrsetbits_le32(0x0232a218, 0xffff00ff, 0x758000e4);
-       clrsetbits_le32(0x0232a2ac, 0x0000ff00, 0x00004400);
-       clrsetbits_le32(0x0232a22c, 0x00ffff00, 0x00200800);
-       clrsetbits_le32(0x0232a280, 0x00ff00ff, 0x00820082);
-       clrsetbits_le32(0x0232a284, 0xffffffff, 0x1d0f0385);
-
-       clrsetbits_le32(0x0232a404, 0xff0000ff, 0x38000080);
-       clrsetbits_le32(0x0232a408, 0x000000ff, 0x00000000);
-       clrsetbits_le32(0x0232a40c, 0xff000000, 0x02000000);
-       clrsetbits_le32(0x0232a410, 0xff000000, 0x1b000000);
-       clrsetbits_le32(0x0232a414, 0x0000ffff, 0x00006fb8);
-       clrsetbits_le32(0x0232a418, 0xffff00ff, 0x758000e4);
-       clrsetbits_le32(0x0232a4ac, 0x0000ff00, 0x00004400);
-       clrsetbits_le32(0x0232a42c, 0x00ffff00, 0x00200800);
-       clrsetbits_le32(0x0232a480, 0x00ff00ff, 0x00820082);
-       clrsetbits_le32(0x0232a484, 0xffffffff, 0x1d0f0385);
-
-       clrsetbits_le32(0x0232a604, 0xff0000ff, 0x38000080);
-       clrsetbits_le32(0x0232a608, 0x000000ff, 0x00000000);
-       clrsetbits_le32(0x0232a60c, 0xff000000, 0x02000000);
-       clrsetbits_le32(0x0232a610, 0xff000000, 0x1b000000);
-       clrsetbits_le32(0x0232a614, 0x0000ffff, 0x00006fb8);
-       clrsetbits_le32(0x0232a618, 0xffff00ff, 0x758000e4);
-       clrsetbits_le32(0x0232a6ac, 0x0000ff00, 0x00004400);
-       clrsetbits_le32(0x0232a62c, 0x00ffff00, 0x00200800);
-       clrsetbits_le32(0x0232a680, 0x00ff00ff, 0x00820082);
-       clrsetbits_le32(0x0232a684, 0xffffffff, 0x1d0f0385);
-
-       clrsetbits_le32(0x0232a804, 0xff0000ff, 0x38000080);
-       clrsetbits_le32(0x0232a808, 0x000000ff, 0x00000000);
-       clrsetbits_le32(0x0232a80c, 0xff000000, 0x02000000);
-       clrsetbits_le32(0x0232a810, 0xff000000, 0x1b000000);
-       clrsetbits_le32(0x0232a814, 0x0000ffff, 0x00006fb8);
-       clrsetbits_le32(0x0232a818, 0xffff00ff, 0x758000e4);
-       clrsetbits_le32(0x0232a8ac, 0x0000ff00, 0x00004400);
-       clrsetbits_le32(0x0232a82c, 0x00ffff00, 0x00200800);
-       clrsetbits_le32(0x0232a880, 0x00ff00ff, 0x00820082);
-       clrsetbits_le32(0x0232a884, 0xffffffff, 0x1d0f0385);
-
-       clrsetbits_le32(0x0232aa00, 0x0000ff00, 0x00000800);
-       clrsetbits_le32(0x0232aa08, 0xffff0000, 0x38a20000);
-       clrsetbits_le32(0x0232aa30, 0x00ffff00, 0x008a8a00);
-       clrsetbits_le32(0x0232aa84, 0x0000ff00, 0x00000600);
-       clrsetbits_le32(0x0232aa94, 0xff000000, 0x10000000);
-       clrsetbits_le32(0x0232aaa0, 0xff000000, 0x81000000);
-       clrsetbits_le32(0x0232aabc, 0xff000000, 0xff000000);
-       clrsetbits_le32(0x0232aac0, 0x000000ff, 0x0000008b);
-       clrsetbits_le32(0x0232ab08, 0xffff0000, 0x583f0000);
-       clrsetbits_le32(0x0232ab0c, 0x000000ff, 0x0000004e);
-       clrsetbits_le32(0x0232a000, 0x000000ff, 0x00000003);
-       clrsetbits_le32(0x0232aa00, 0x000000ff, 0x0000005f);
-
-       clrsetbits_le32(0x0232aa48, 0x00ffff00, 0x00fd8c00);
-       clrsetbits_le32(0x0232aa54, 0x00ffffff, 0x002fec72);
-       clrsetbits_le32(0x0232aa58, 0xffffff00, 0x00f92100);
-       clrsetbits_le32(0x0232aa5c, 0xffffffff, 0x00040060);
-       clrsetbits_le32(0x0232aa60, 0xffffffff, 0x00008000);
-       clrsetbits_le32(0x0232aa64, 0xffffffff, 0x0c581220);
-       clrsetbits_le32(0x0232aa68, 0xffffffff, 0xe13b0602);
-       clrsetbits_le32(0x0232aa6c, 0xffffffff, 0xb8074cc1);
-       clrsetbits_le32(0x0232aa70, 0xffffffff, 0x3f02e989);
-       clrsetbits_le32(0x0232aa74, 0x000000ff, 0x00000001);
-       clrsetbits_le32(0x0232ab20, 0x00ff0000, 0x00370000);
-       clrsetbits_le32(0x0232ab1c, 0xff000000, 0x37000000);
-       clrsetbits_le32(0x0232ab20, 0x000000ff, 0x0000005d);
-
-       /*Bring SerDes out of Reset if SerDes is Shutdown & is in Reset Mode*/
-       clrbits_le32(0x0232a010, 1 << 28);
-
-       /* Enable TX and RX via the LANExCTL_STS 0x0000 + x*4 */
-       clrbits_le32(0x0232a228, 1 << 29);
-       writel(0xF800F8C0, 0x0232bfe0);
-       clrbits_le32(0x0232a428, 1 << 29);
-       writel(0xF800F8C0, 0x0232bfe4);
-       clrbits_le32(0x0232a628, 1 << 29);
-       writel(0xF800F8C0, 0x0232bfe8);
-       clrbits_le32(0x0232a828, 1 << 29);
-       writel(0xF800F8C0, 0x0232bfec);
-
-       /*Enable pll via the pll_ctrl 0x0014*/
-       writel(0xe0000000, 0x0232bff4)
-               ;
-
-       /*Waiting for SGMII Serdes PLL lock.*/
-       for (cnt = 10000; cnt > 0 && ((readl(0x02090114) & 0x10) == 0); cnt--)
-               ;
-
-       for (cnt = 10000; cnt > 0 && ((readl(0x02090214) & 0x10) == 0); cnt--)
-               ;
-
-       for (cnt = 10000; cnt > 0 && ((readl(0x02090414) & 0x10) == 0); cnt--)
-               ;
-
-       for (cnt = 10000; cnt > 0 && ((readl(0x02090514) & 0x10) == 0); cnt--)
-               ;
-
-       udelay(45000);
-}
-
-void sgmii_serdes_shutdown(void)
-{
-       /*
-        * shutdown SerDes hardware. SerDes hardware vendor published only
-        * register addresses and their values. So had to use hardcoded
-        * values below.
-        */
-       clrbits_le32(0x0232bfe0, 3 << 29 | 3 << 13);
-       setbits_le32(0x02320228, 1 << 29);
-       clrbits_le32(0x0232bfe4, 3 << 29 | 3 << 13);
-       setbits_le32(0x02320428, 1 << 29);
-       clrbits_le32(0x0232bfe8, 3 << 29 | 3 << 13);
-       setbits_le32(0x02320628, 1 << 29);
-       clrbits_le32(0x0232bfec, 3 << 29 | 3 << 13);
-       setbits_le32(0x02320828, 1 << 29);
-
-       clrbits_le32(0x02320034, 3 << 29);
-       setbits_le32(0x02320010, 1 << 28);
+       ks2_serdes_sgmii_156p25mhz_setup();
 }

diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
new file mode 100644 (file)
index 0000000..3d4baa5
--- /dev/null
+++ b/drivers/soc/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the U-boot SOC specific device drivers.
+#
+
+obj-$(CONFIG_ARCH_KEYSTONE)    += keystone/

diff --git a/drivers/soc/keystone/Makefile b/drivers/soc/keystone/Makefile
new file mode 100644 (file)
index 0000000..c000eca
--- /dev/null
+++ b/drivers/soc/keystone/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_TI_KEYSTONE_SERDES) += keystone_serdes.o

diff --git a/drivers/soc/keystone/keystone_serdes.c b/drivers/soc/keystone/keystone_serdes.c
new file mode 100644 (file)
index 0000000..dc4e78d
--- /dev/null
+++ b/drivers/soc/keystone/keystone_serdes.c
@@ -0,0 +1,127 @@
+/*
+ * TI serdes driver for keystone2.
+ *
+ * (C) Copyright 2014
+ *     Texas Instruments Incorporated, <www.ti.com>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+
+void ks2_serdes_sgmii_156p25mhz_setup(void)
+{
+       unsigned int cnt;
+
+       /*
+        * configure Serializer/Deserializer (SerDes) hardware. SerDes IP
+        * hardware vendor published only register addresses and their values
+        * to be used for configuring SerDes. So had to use hardcoded values
+        * below.
+        */
+       clrsetbits_le32(0x0232a000, 0xffff0000, 0x00800000);
+       clrsetbits_le32(0x0232a014, 0x0000ffff, 0x00008282);
+       clrsetbits_le32(0x0232a060, 0x00ffffff, 0x00142438);
+       clrsetbits_le32(0x0232a064, 0x00ffff00, 0x00c3c700);
+       clrsetbits_le32(0x0232a078, 0x0000ff00, 0x0000c000);
+
+       clrsetbits_le32(0x0232a204, 0xff0000ff, 0x38000080);
+       clrsetbits_le32(0x0232a208, 0x000000ff, 0x00000000);
+       clrsetbits_le32(0x0232a20c, 0xff000000, 0x02000000);
+       clrsetbits_le32(0x0232a210, 0xff000000, 0x1b000000);
+       clrsetbits_le32(0x0232a214, 0x0000ffff, 0x00006fb8);
+       clrsetbits_le32(0x0232a218, 0xffff00ff, 0x758000e4);
+       clrsetbits_le32(0x0232a2ac, 0x0000ff00, 0x00004400);
+       clrsetbits_le32(0x0232a22c, 0x00ffff00, 0x00200800);
+       clrsetbits_le32(0x0232a280, 0x00ff00ff, 0x00820082);
+       clrsetbits_le32(0x0232a284, 0xffffffff, 0x1d0f0385);
+
+       clrsetbits_le32(0x0232a404, 0xff0000ff, 0x38000080);
+       clrsetbits_le32(0x0232a408, 0x000000ff, 0x00000000);
+       clrsetbits_le32(0x0232a40c, 0xff000000, 0x02000000);
+       clrsetbits_le32(0x0232a410, 0xff000000, 0x1b000000);
+       clrsetbits_le32(0x0232a414, 0x0000ffff, 0x00006fb8);
+       clrsetbits_le32(0x0232a418, 0xffff00ff, 0x758000e4);
+       clrsetbits_le32(0x0232a4ac, 0x0000ff00, 0x00004400);
+       clrsetbits_le32(0x0232a42c, 0x00ffff00, 0x00200800);
+       clrsetbits_le32(0x0232a480, 0x00ff00ff, 0x00820082);
+       clrsetbits_le32(0x0232a484, 0xffffffff, 0x1d0f0385);
+
+       clrsetbits_le32(0x0232a604, 0xff0000ff, 0x38000080);
+       clrsetbits_le32(0x0232a608, 0x000000ff, 0x00000000);
+       clrsetbits_le32(0x0232a60c, 0xff000000, 0x02000000);
+       clrsetbits_le32(0x0232a610, 0xff000000, 0x1b000000);
+       clrsetbits_le32(0x0232a614, 0x0000ffff, 0x00006fb8);
+       clrsetbits_le32(0x0232a618, 0xffff00ff, 0x758000e4);
+       clrsetbits_le32(0x0232a6ac, 0x0000ff00, 0x00004400);
+       clrsetbits_le32(0x0232a62c, 0x00ffff00, 0x00200800);
+       clrsetbits_le32(0x0232a680, 0x00ff00ff, 0x00820082);
+       clrsetbits_le32(0x0232a684, 0xffffffff, 0x1d0f0385);
+
+       clrsetbits_le32(0x0232a804, 0xff0000ff, 0x38000080);
+       clrsetbits_le32(0x0232a808, 0x000000ff, 0x00000000);
+       clrsetbits_le32(0x0232a80c, 0xff000000, 0x02000000);
+       clrsetbits_le32(0x0232a810, 0xff000000, 0x1b000000);
+       clrsetbits_le32(0x0232a814, 0x0000ffff, 0x00006fb8);
+       clrsetbits_le32(0x0232a818, 0xffff00ff, 0x758000e4);
+       clrsetbits_le32(0x0232a8ac, 0x0000ff00, 0x00004400);
+       clrsetbits_le32(0x0232a82c, 0x00ffff00, 0x00200800);
+       clrsetbits_le32(0x0232a880, 0x00ff00ff, 0x00820082);
+       clrsetbits_le32(0x0232a884, 0xffffffff, 0x1d0f0385);
+
+       clrsetbits_le32(0x0232aa00, 0x0000ff00, 0x00000800);
+       clrsetbits_le32(0x0232aa08, 0xffff0000, 0x38a20000);
+       clrsetbits_le32(0x0232aa30, 0x00ffff00, 0x008a8a00);
+       clrsetbits_le32(0x0232aa84, 0x0000ff00, 0x00000600);
+       clrsetbits_le32(0x0232aa94, 0xff000000, 0x10000000);
+       clrsetbits_le32(0x0232aaa0, 0xff000000, 0x81000000);
+       clrsetbits_le32(0x0232aabc, 0xff000000, 0xff000000);
+       clrsetbits_le32(0x0232aac0, 0x000000ff, 0x0000008b);
+       clrsetbits_le32(0x0232ab08, 0xffff0000, 0x583f0000);
+       clrsetbits_le32(0x0232ab0c, 0x000000ff, 0x0000004e);
+       clrsetbits_le32(0x0232a000, 0x000000ff, 0x00000003);
+       clrsetbits_le32(0x0232aa00, 0x000000ff, 0x0000005f);
+
+       clrsetbits_le32(0x0232aa48, 0x00ffff00, 0x00fd8c00);
+       clrsetbits_le32(0x0232aa54, 0x00ffffff, 0x002fec72);
+       clrsetbits_le32(0x0232aa58, 0xffffff00, 0x00f92100);
+       clrsetbits_le32(0x0232aa5c, 0xffffffff, 0x00040060);
+       clrsetbits_le32(0x0232aa60, 0xffffffff, 0x00008000);
+       clrsetbits_le32(0x0232aa64, 0xffffffff, 0x0c581220);
+       clrsetbits_le32(0x0232aa68, 0xffffffff, 0xe13b0602);
+       clrsetbits_le32(0x0232aa6c, 0xffffffff, 0xb8074cc1);
+       clrsetbits_le32(0x0232aa70, 0xffffffff, 0x3f02e989);
+       clrsetbits_le32(0x0232aa74, 0x000000ff, 0x00000001);
+       clrsetbits_le32(0x0232ab20, 0x00ff0000, 0x00370000);
+       clrsetbits_le32(0x0232ab1c, 0xff000000, 0x37000000);
+       clrsetbits_le32(0x0232ab20, 0x000000ff, 0x0000005d);
+
+       /*Bring SerDes out of Reset if SerDes is Shutdown & is in Reset Mode*/
+       clrbits_le32(0x0232a010, 1 << 28);
+
+       /* Enable TX and RX via the LANExCTL_STS 0x0000 + x*4 */
+       clrbits_le32(0x0232a228, 1 << 29);
+       writel(0xF800F8C0, 0x0232bfe0);
+       clrbits_le32(0x0232a428, 1 << 29);
+       writel(0xF800F8C0, 0x0232bfe4);
+       clrbits_le32(0x0232a628, 1 << 29);
+       writel(0xF800F8C0, 0x0232bfe8);
+       clrbits_le32(0x0232a828, 1 << 29);
+       writel(0xF800F8C0, 0x0232bfec);
+
+       /*Enable pll via the pll_ctrl 0x0014*/
+       writel(0xe0000000, 0x0232bff4)
+               ;
+
+       /*Waiting for SGMII Serdes PLL lock.*/
+       for (cnt = 10000; cnt > 0 && ((readl(0x02090114) & 0x10) == 0); cnt--)
+               ;
+       for (cnt = 10000; cnt > 0 && ((readl(0x02090214) & 0x10) == 0); cnt--)
+               ;
+       for (cnt = 10000; cnt > 0 && ((readl(0x02090414) & 0x10) == 0); cnt--)
+               ;
+       for (cnt = 10000; cnt > 0 && ((readl(0x02090514) & 0x10) == 0); cnt--)
+               ;
+
+       udelay(45000);
+}

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