* [U-Boot] [PATCH v1 1/4] powerpc/ppc4xx: Add support for iocon fiber
2013-08-09 8:52 [U-Boot] [PATCH v1 0/4] Fixes on gdsys boards and some new functionality dirk.eibach at gdsys.cc
@ 2013-08-09 8:52 ` dirk.eibach at gdsys.cc
2013-08-09 8:52 ` [U-Boot] [PATCH v1 2/4] powerpc/ppc4xx: Add support for iocon-2 dirk.eibach at gdsys.cc
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: dirk.eibach at gdsys.cc @ 2013-08-09 8:52 UTC (permalink / raw)
To: u-boot
From: Dirk Eibach <dirk.eibach@gdsys.cc>
Add a new iocon flavor with fiber instead of copper connectivity.
Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
---
board/gdsys/405ep/iocon.c | 44 ++++++++++++++++++++++++++++++++++++--------
1 file changed, 36 insertions(+), 8 deletions(-)
diff --git a/board/gdsys/405ep/iocon.c b/board/gdsys/405ep/iocon.c
index 9f84fb1..f6502b3 100644
--- a/board/gdsys/405ep/iocon.c
+++ b/board/gdsys/405ep/iocon.c
@@ -44,6 +44,8 @@ enum {
HWVER_120 = 3,
HWVER_200 = 4,
HWVER_210 = 5,
+ HWVER_220 = 6,
+ HWVER_230 = 7,
};
enum {
@@ -74,6 +76,11 @@ enum {
};
enum {
+ CARRIER_SPEED_1G = 0,
+ CARRIER_SPEED_2_5G = 1,
+};
+
+enum {
MCFPGA_DONE = 1 << 0,
MCFPGA_INIT_N = 1 << 1,
MCFPGA_PROGRAM_N = 1 << 2,
@@ -168,8 +175,10 @@ static void print_fpga_info(unsigned int fpga)
unsigned feature_audio;
unsigned feature_sysclock;
unsigned feature_ramconfig;
+ unsigned feature_carrier_speed;
unsigned feature_carriers;
unsigned feature_video_channels;
+
int legacy = get_fpga_state(0) & FPGA_STATE_PLATFORM;
FPGA_GET_REG(0, versions, &versions);
@@ -182,6 +191,7 @@ static void print_fpga_info(unsigned int fpga)
feature_audio = (fpga_features & 0x0600) >> 9;
feature_sysclock = (fpga_features & 0x0180) >> 7;
feature_ramconfig = (fpga_features & 0x0060) >> 5;
+ feature_carrier_speed = fpga_features & (1<<4);
feature_carriers = (fpga_features & 0x000c) >> 2;
feature_video_channels = fpga_features & 0x0003;
@@ -237,6 +247,14 @@ static void print_fpga_info(unsigned int fpga)
printf(" HW-Ver 2.10,");
break;
+ case HWVER_220:
+ printf(" HW-Ver 2.20,");
+ break;
+
+ case HWVER_230:
+ printf(" HW-Ver 2.30,");
+ break;
+
default:
printf(" HW-Ver %d(not supported),",
hardware_version);
@@ -334,7 +352,8 @@ static void print_fpga_info(unsigned int fpga)
break;
}
- printf(", %d carrier(s)", feature_carriers);
+ printf(", %d carrier(s) %s", feature_carriers,
+ feature_carrier_speed ? "2.5Gbit/s" : "1Gbit/s");
printf(", %d video channel(s)\n", feature_video_channels);
}
@@ -345,6 +364,10 @@ int last_stage_init(void)
unsigned int k;
unsigned char mclink_controllers[] = { 0x24, 0x25, 0x26 };
int legacy = get_fpga_state(0) & FPGA_STATE_PLATFORM;
+ u16 fpga_features;
+ int feature_carrier_speed = fpga_features & (1<<4);
+
+ FPGA_GET_REG(0, fpga_features, &fpga_features);
print_fpga_info(0);
osd_probe(0);
@@ -366,7 +389,7 @@ int last_stage_init(void)
}
}
- if (!legacy) {
+ if (!legacy && (feature_carrier_speed == CARRIER_SPEED_1G)) {
miiphy_register(bb_miiphy_buses[0].name, bb_miiphy_read,
bb_miiphy_write);
if (!verify_88e1518(bb_miiphy_buses[0].name, 0)) {
@@ -389,14 +412,19 @@ int last_stage_init(void)
mclink_fpgacount = slaves;
for (k = 1; k <= slaves; ++k) {
+ FPGA_GET_REG(k, fpga_features, &fpga_features);
+ feature_carrier_speed = fpga_features & (1<<4);
+
print_fpga_info(k);
osd_probe(k);
- miiphy_register(bb_miiphy_buses[k].name,
- bb_miiphy_read, bb_miiphy_write);
- if (!verify_88e1518(bb_miiphy_buses[k].name, 0)) {
- printf("Fixup 88e1518 erratum on %s\n",
- bb_miiphy_buses[k].name);
- setup_88e1518(bb_miiphy_buses[k].name, 0);
+ if (feature_carrier_speed == CARRIER_SPEED_1G) {
+ miiphy_register(bb_miiphy_buses[k].name,
+ bb_miiphy_read, bb_miiphy_write);
+ if (!verify_88e1518(bb_miiphy_buses[k].name, 0)) {
+ printf("Fixup 88e1518 erratum on %s\n",
+ bb_miiphy_buses[k].name);
+ setup_88e1518(bb_miiphy_buses[k].name, 0);
+ }
}
}
--
1.8.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH v1 2/4] powerpc/ppc4xx: Add support for iocon-2
2013-08-09 8:52 [U-Boot] [PATCH v1 0/4] Fixes on gdsys boards and some new functionality dirk.eibach at gdsys.cc
2013-08-09 8:52 ` [U-Boot] [PATCH v1 1/4] powerpc/ppc4xx: Add support for iocon fiber dirk.eibach at gdsys.cc
@ 2013-08-09 8:52 ` dirk.eibach at gdsys.cc
2013-08-09 8:52 ` [U-Boot] [PATCH v1 3/4] powerpc/ppc4xx: Do full iocon PHY initialization in software dirk.eibach at gdsys.cc
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: dirk.eibach at gdsys.cc @ 2013-08-09 8:52 UTC (permalink / raw)
To: u-boot
From: Dirk Eibach <dirk.eibach@gdsys.cc>
Add a new iocon flavor with a second communiction port per channel.
Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
---
board/gdsys/405ep/iocon.c | 36 +++++++++++++++++++++++++-----------
1 file changed, 25 insertions(+), 11 deletions(-)
diff --git a/board/gdsys/405ep/iocon.c b/board/gdsys/405ep/iocon.c
index f6502b3..664b1e1 100644
--- a/board/gdsys/405ep/iocon.c
+++ b/board/gdsys/405ep/iocon.c
@@ -30,6 +30,8 @@ DECLARE_GLOBAL_DATA_PTR;
#define LATCH1_BASE (CONFIG_SYS_LATCH_BASE + 0x100)
#define LATCH2_BASE (CONFIG_SYS_LATCH_BASE + 0x200)
+#define MAX_MUX_CHANNELS 2
+
enum {
UNITTYPE_MAIN_SERVER = 0,
UNITTYPE_MAIN_USER = 1,
@@ -163,7 +165,7 @@ int checkboard(void)
return 0;
}
-static void print_fpga_info(unsigned int fpga)
+static void print_fpga_info(unsigned int fpga, bool rgmii2_present)
{
u16 versions;
u16 fpga_version;
@@ -260,6 +262,8 @@ static void print_fpga_info(unsigned int fpga)
hardware_version);
break;
}
+ if (rgmii2_present)
+ printf(" RGMII2,");
}
if (unit_type == UNITTYPE_VIDEO_USER) {
@@ -362,14 +366,19 @@ int last_stage_init(void)
{
int slaves;
unsigned int k;
+ unsigned int mux_ch;
unsigned char mclink_controllers[] = { 0x24, 0x25, 0x26 };
int legacy = get_fpga_state(0) & FPGA_STATE_PLATFORM;
u16 fpga_features;
int feature_carrier_speed = fpga_features & (1<<4);
+ bool ch0_rgmii2_present = false;
FPGA_GET_REG(0, fpga_features, &fpga_features);
- print_fpga_info(0);
+ if (!legacy)
+ ch0_rgmii2_present = !pca9698_get_value(0x20, 30);
+
+ print_fpga_info(0, ch0_rgmii2_present);
osd_probe(0);
/* wait for FPGA done */
@@ -392,10 +401,15 @@ int last_stage_init(void)
if (!legacy && (feature_carrier_speed == CARRIER_SPEED_1G)) {
miiphy_register(bb_miiphy_buses[0].name, bb_miiphy_read,
bb_miiphy_write);
- if (!verify_88e1518(bb_miiphy_buses[0].name, 0)) {
- printf("Fixup 88e1518 erratum on %s\n",
- bb_miiphy_buses[0].name);
- setup_88e1518(bb_miiphy_buses[0].name, 0);
+ for (mux_ch = 0; mux_ch < MAX_MUX_CHANNELS; ++mux_ch) {
+ if ((mux_ch == 1) && !ch0_rgmii2_present)
+ continue;
+
+ if (!verify_88e1518(bb_miiphy_buses[0].name, mux_ch)) {
+ printf("Fixup 88e1518 erratum on %s phy %u\n",
+ bb_miiphy_buses[0].name, mux_ch);
+ setup_88e1518(bb_miiphy_buses[0].name, mux_ch);
+ }
}
}
@@ -415,7 +429,7 @@ int last_stage_init(void)
FPGA_GET_REG(k, fpga_features, &fpga_features);
feature_carrier_speed = fpga_features & (1<<4);
- print_fpga_info(k);
+ print_fpga_info(k, false);
osd_probe(k);
if (feature_carrier_speed == CARRIER_SPEED_1G) {
miiphy_register(bb_miiphy_buses[k].name,
@@ -590,7 +604,7 @@ static int mii_delay(struct bb_miiphy_bus *bus)
struct bb_miiphy_bus bb_miiphy_buses[] = {
{
- .name = "trans1",
+ .name = "board0",
.init = mii_dummy_init,
.mdio_active = mii_mdio_active,
.mdio_tristate = mii_mdio_tristate,
@@ -601,7 +615,7 @@ struct bb_miiphy_bus bb_miiphy_buses[] = {
.priv = &fpga_mii[0],
},
{
- .name = "trans2",
+ .name = "board1",
.init = mii_dummy_init,
.mdio_active = mii_mdio_active,
.mdio_tristate = mii_mdio_tristate,
@@ -612,7 +626,7 @@ struct bb_miiphy_bus bb_miiphy_buses[] = {
.priv = &fpga_mii[1],
},
{
- .name = "trans3",
+ .name = "board2",
.init = mii_dummy_init,
.mdio_active = mii_mdio_active,
.mdio_tristate = mii_mdio_tristate,
@@ -623,7 +637,7 @@ struct bb_miiphy_bus bb_miiphy_buses[] = {
.priv = &fpga_mii[2],
},
{
- .name = "trans4",
+ .name = "board3",
.init = mii_dummy_init,
.mdio_active = mii_mdio_active,
.mdio_tristate = mii_mdio_tristate,
--
1.8.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH v1 3/4] powerpc/ppc4xx: Do full iocon PHY initialization in software
2013-08-09 8:52 [U-Boot] [PATCH v1 0/4] Fixes on gdsys boards and some new functionality dirk.eibach at gdsys.cc
2013-08-09 8:52 ` [U-Boot] [PATCH v1 1/4] powerpc/ppc4xx: Add support for iocon fiber dirk.eibach at gdsys.cc
2013-08-09 8:52 ` [U-Boot] [PATCH v1 2/4] powerpc/ppc4xx: Add support for iocon-2 dirk.eibach at gdsys.cc
@ 2013-08-09 8:52 ` dirk.eibach at gdsys.cc
2013-08-09 8:52 ` [U-Boot] [PATCH v1 4/4] powerpc/ppc4xx: Fix dlvision-10g reset gpio dirk.eibach at gdsys.cc
2013-08-19 8:35 ` [U-Boot] [PATCH v1 0/4] Fixes on gdsys boards and some new functionality Stefan Roese
4 siblings, 0 replies; 6+ messages in thread
From: dirk.eibach at gdsys.cc @ 2013-08-09 8:52 UTC (permalink / raw)
To: u-boot
From: Dirk Eibach <dirk.eibach@gdsys.cc>
Up to this point some PHY initialization was done from the FPGA
and some from u-boot.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH v1 4/4] powerpc/ppc4xx: Fix dlvision-10g reset gpio
2013-08-09 8:52 [U-Boot] [PATCH v1 0/4] Fixes on gdsys boards and some new functionality dirk.eibach at gdsys.cc
` (2 preceding siblings ...)
2013-08-09 8:52 ` [U-Boot] [PATCH v1 3/4] powerpc/ppc4xx: Do full iocon PHY initialization in software dirk.eibach at gdsys.cc
@ 2013-08-09 8:52 ` dirk.eibach at gdsys.cc
2013-08-19 8:35 ` [U-Boot] [PATCH v1 0/4] Fixes on gdsys boards and some new functionality Stefan Roese
4 siblings, 0 replies; 6+ messages in thread
From: dirk.eibach at gdsys.cc @ 2013-08-09 8:52 UTC (permalink / raw)
To: u-boot
From: Dirk Eibach <dirk.eibach@gdsys.cc>
Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
---
include/configs/dlvision-10g.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h
index a03c462..68e5246 100644
--- a/include/configs/dlvision-10g.h
+++ b/include/configs/dlvision-10g.h
@@ -18,7 +18,7 @@
* Include common defines/options for all AMCC eval boards
*/
#define CONFIG_HOSTNAME dlvsion-10g
-#define CONFIG_IDENT_STRING " dlvision-10g 0.04"
+#define CONFIG_IDENT_STRING " dlvision-10g 0.05"
#include "amcc-common.h"
#define CONFIG_BOARD_EARLY_INIT_F
@@ -131,7 +131,7 @@
#define CONFIG_SYS_LATCH0_RESET 0xffff
#define CONFIG_SYS_LATCH0_BOOT 0xffff
-#define CONFIG_SYS_LATCH1_RESET 0xffcf
+#define CONFIG_SYS_LATCH1_RESET 0xffbf
#define CONFIG_SYS_LATCH1_BOOT 0xffff
#define CONFIG_SYS_FPGA_NO_RFL_HI
--
1.8.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH v1 0/4] Fixes on gdsys boards and some new functionality
2013-08-09 8:52 [U-Boot] [PATCH v1 0/4] Fixes on gdsys boards and some new functionality dirk.eibach at gdsys.cc
` (3 preceding siblings ...)
2013-08-09 8:52 ` [U-Boot] [PATCH v1 4/4] powerpc/ppc4xx: Fix dlvision-10g reset gpio dirk.eibach at gdsys.cc
@ 2013-08-19 8:35 ` Stefan Roese
4 siblings, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2013-08-19 8:35 UTC (permalink / raw)
To: u-boot
On 09.08.2013 10:52, dirk.eibach at gdsys.cc wrote:
> From: Dirk Eibach <dirk.eibach@gdsys.cc>
>
>
> Since I will be on parental leave soon, Reinhard will probably take over
> maintaining this series at some point.
>
>
> Dirk Eibach (4):
> powerpc/ppc4xx: Add support for iocon fiber
> powerpc/ppc4xx: Add support for iocon-2
> powerpc/ppc4xx: Do full iocon PHY initialization in software
> powerpc/ppc4xx: Fix dlvision-10g reset gpio
>
> board/gdsys/405ep/iocon.c | 278 ++++++++++++++++++++++++++++++++---------
> include/configs/dlvision-10g.h | 4 +-
> 2 files changed, 224 insertions(+), 58 deletions(-)
Patch series applied to u-boot-ppc4xx/master.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 6+ messages in thread