All of lore.kernel.org
 help / color / mirror / Atom feed
From: Codrin Ciubotariu <codrin.ciubotariu@freescale.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 03/11] arch/powerpc: Add SGMII support for the L2 Switch ports
Date: Mon, 12 Jan 2015 14:08:31 +0200	[thread overview]
Message-ID: <1421064519-6248-4-git-send-email-codrin.ciubotariu@freescale.com> (raw)
In-Reply-To: <1421064519-6248-1-git-send-email-codrin.ciubotariu@freescale.com>

Some Freescale SoCs like T1020 and T1040 have an integrated
L2 Switch. The L2 Switch ports may be connected to Ethernet PHYs
over SGMII and QSGMII.

Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@freescale.com>
---

Changes for v2:
	- split a bug fix regarding Freescale SerDes protocols
	into a different patch;

Changes for v3: Removed "Change-id" line from comment;

 arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 6 ++++++
 arch/powerpc/cpu/mpc85xx/t1040_serdes.c        | 8 ++++----
 arch/powerpc/include/asm/fsl_serdes.h          | 6 ++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
index c7d9622..acb1353 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
@@ -78,6 +78,12 @@ static const char *serdes_prtcl_str[] = {
 	[INTERLAKEN] = "INTERLAKEN",
 	[QSGMII_SW1_A] = "QSGMII_SW1_A",
 	[QSGMII_SW1_B] = "QSGMII_SW1_B",
+	[SGMII_SW1_MAC1] = "SGMII_SW1_MAC1",
+	[SGMII_SW1_MAC2] = "SGMII_SW1_MAC2",
+	[SGMII_SW1_MAC3] = "SGMII_SW1_MAC3",
+	[SGMII_SW1_MAC4] = "SGMII_SW1_MAC4",
+	[SGMII_SW1_MAC5] = "SGMII_SW1_MAC5",
+	[SGMII_SW1_MAC6] = "SGMII_SW1_MAC6",
 };
 #endif
 
diff --git a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
index d86bb27..d5dccd5 100644
--- a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
@@ -33,10 +33,10 @@ static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
 		PCIE2, PCIE2, SGMII_FM1_DTSEC4, SGMII_FM1_DTSEC5},
 	[0x87] = {PCIE1, SGMII_FM1_DTSEC3, SGMII_FM1_DTSEC1, SGMII_FM1_DTSEC2,
 		PCIE2, PCIE3, PCIE4, SGMII_FM1_DTSEC5},
-	[0x89] = {PCIE1, QSGMII_SW1_A, QSGMII_SW1_A, QSGMII_SW1_A,
-		PCIE2, PCIE3, QSGMII_SW1_B, SATA1},
-	[0x8D] = {PCIE1, QSGMII_SW1_A, QSGMII_SW1_A, QSGMII_SW1_A,
-		PCIE2, QSGMII_SW1_B, QSGMII_SW1_B, QSGMII_SW1_B},
+	[0x89] = {PCIE1, SGMII_SW1_MAC3, SGMII_SW1_MAC1, SGMII_SW1_MAC2,
+		PCIE2, PCIE3, SGMII_SW1_MAC4, SATA1},
+	[0x8D] = {PCIE1, SGMII_SW1_MAC3, SGMII_SW1_MAC1, SGMII_SW1_MAC2,
+		PCIE2, SGMII_SW1_MAC6, SGMII_SW1_MAC4, SGMII_SW1_MAC5},
 	[0x8F] = {PCIE1, SGMII_FM1_DTSEC3, SGMII_FM1_DTSEC1, SGMII_FM1_DTSEC2,
 		AURORA, NONE, SGMII_FM1_DTSEC4, SGMII_FM1_DTSEC5},
 	[0xA5] = {PCIE1, SGMII_FM1_DTSEC3, SGMII_FM1_DTSEC1, SGMII_FM1_DTSEC2,
diff --git a/arch/powerpc/include/asm/fsl_serdes.h b/arch/powerpc/include/asm/fsl_serdes.h
index 2dd32c2..45e248e 100644
--- a/arch/powerpc/include/asm/fsl_serdes.h
+++ b/arch/powerpc/include/asm/fsl_serdes.h
@@ -87,6 +87,12 @@ enum srds_prtcl {
 	SGMII_2500_FM2_DTSEC6,
 	SGMII_2500_FM2_DTSEC9,
 	SGMII_2500_FM2_DTSEC10,
+	SGMII_SW1_MAC1,
+	SGMII_SW1_MAC2,
+	SGMII_SW1_MAC3,
+	SGMII_SW1_MAC4,
+	SGMII_SW1_MAC5,
+	SGMII_SW1_MAC6,
 	SERDES_PRCTL_COUNT	/* Keep this item the last one */
 };
 
-- 
1.7.11.7

  parent reply	other threads:[~2015-01-12 12:08 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-12 12:08 [U-Boot] [PATCH v3 00/11] Add driver for VSC9953 Ethernet Switch Codrin Ciubotariu
2015-01-12 12:08 ` [U-Boot] [PATCH v3 01/11] net/fm: Fix error when FMAN MAC has no PHY Codrin Ciubotariu
2015-01-23  0:37   ` York Sun
2015-01-12 12:08 ` [U-Boot] [PATCH v3 02/11] arch/powerpc: Fix mapping of Freescale SerDes protocols Codrin Ciubotariu
2015-01-23  0:38   ` York Sun
2015-01-12 12:08 ` Codrin Ciubotariu [this message]
2015-01-23  0:39   ` [U-Boot] [PATCH v3 03/11] arch/powerpc: Add SGMII support for the L2 Switch ports York Sun
2015-01-12 12:08 ` [U-Boot] [PATCH v3 04/11] net/fm: Enable FMAN ports if l2switch ports are connected over SGMII Codrin Ciubotariu
2015-01-23  0:39   ` York Sun
2015-01-12 12:08 ` [U-Boot] [PATCH v3 05/11] net/vsc9953: Add driver for Vitesse VSC9953 L2 Switch IP Codrin Ciubotariu
2015-01-15 20:59   ` York Sun
2015-01-15 21:02   ` York Sun
2015-01-15 21:42   ` Joe Hershberger
2015-01-23  0:40   ` York Sun
2015-01-12 12:08 ` [U-Boot] [PATCH v3 06/11] arch/powerpc: Enable VSC9953 driver on T1040 and T1020 Codrin Ciubotariu
2015-01-15 21:26   ` York Sun
2015-01-12 12:08 ` [U-Boot] [PATCH v3 07/11] board/T1040qds: Fix lane-to-slot mapping for SerDes protocol 0x89 Codrin Ciubotariu
2015-01-23  0:42   ` York Sun
2015-01-12 12:08 ` [U-Boot] [PATCH v3 08/11] board/T1040qds: T1040 FMAN ports FM1@DTSEC1 and FM1@DTSEC2 have no PHYs Codrin Ciubotariu
2015-01-23  0:42   ` York Sun
2015-01-12 12:08 ` [U-Boot] [PATCH v3 09/11] board/T104xrdb: " Codrin Ciubotariu
2015-01-23  0:43   ` York Sun
2015-01-12 12:08 ` [U-Boot] [PATCH v3 10/11] board/T1040qds: Add VSC9953 support for T1040qds board Codrin Ciubotariu
2015-01-12 12:08 ` [U-Boot] [PATCH v3 11/11] board/T1040rdb: Add VSC9953 support for T1040rdb board Codrin Ciubotariu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1421064519-6248-4-git-send-email-codrin.ciubotariu@freescale.com \
    --to=codrin.ciubotariu@freescale.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.