Merge git://git.denx.de/u-boot-marvell
- Some Kirkwood boards converted to DM_SPI by Chris - New Armada-385 SoC revision printed by Chris - Ethernet enable on mcbin by Baruch - Support 2 DRAM banks on Armada-8k boards by Baruch
This commit is contained in:
@@ -154,6 +154,12 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cpm_mdio {
|
||||
ge_phy: ethernet-phy@0 {
|
||||
reg = <0>;
|
||||
};
|
||||
};
|
||||
|
||||
&cpm_comphy {
|
||||
/*
|
||||
* CP0 Serdes Configuration:
|
||||
@@ -197,6 +203,16 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cps_ethernet {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cps_eth1 {
|
||||
status = "okay";
|
||||
phy = <&ge_phy>;
|
||||
phy-mode = "sgmii";
|
||||
};
|
||||
|
||||
&cps_pinctl {
|
||||
/*
|
||||
* MPP Bus:
|
||||
|
||||
@@ -261,6 +261,9 @@ int print_cpuinfo(void)
|
||||
case MV_88F68XX_A0_ID:
|
||||
puts("A0");
|
||||
break;
|
||||
case MV_88F68XX_B0_ID:
|
||||
puts("B0");
|
||||
break;
|
||||
default:
|
||||
printf("?? (%x)", revid);
|
||||
break;
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
/* A38x revisions */
|
||||
#define MV_88F68XX_Z1_ID 0x0
|
||||
#define MV_88F68XX_A0_ID 0x4
|
||||
#define MV_88F68XX_B0_ID 0xa
|
||||
|
||||
/* TCLK Core Clock definition */
|
||||
#ifndef CONFIG_SYS_TCLK
|
||||
|
||||
@@ -233,6 +233,7 @@
|
||||
/* A38x revisions */
|
||||
#define MV_88F68XX_Z1_ID 0x0
|
||||
#define MV_88F68XX_A0_ID 0x4
|
||||
#define MV_88F68XX_B0_ID 0xa
|
||||
/* A39x revisions */
|
||||
#define MV_88F69XX_Z1_ID 0x2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user