diff options
author | Tom Rini <trini@konsulko.com> | 2018-11-30 11:20:03 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-11-30 11:20:03 -0500 |
commit | d814ff34a1ffb1e60059c964ad692c5c8fc8564b (patch) | |
tree | ade7957449a4c2c394ac07d1319b6f4873cf4dc6 /arch | |
parent | 6d4a3ff2649faa2cf2739e332557f256cc34831e (diff) | |
parent | d997ad034b6a2e840fefb8224bfd85391cafd71d (diff) |
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
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/dts/armada-8040-mcbin.dts | 16 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/cpu.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/include/mach/soc.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h | 1 |
4 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/dts/armada-8040-mcbin.dts b/arch/arm/dts/armada-8040-mcbin.dts index f912596c2c..7e8e2f707c 100644 --- a/arch/arm/dts/armada-8040-mcbin.dts +++ b/arch/arm/dts/armada-8040-mcbin.dts @@ -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: diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index 0d2d39878d..aa1be8ebab 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -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; diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index 6e2e14efe0..01577f469b 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -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 diff --git a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h index 50b2358266..365332d2b0 100644 --- a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h +++ b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h @@ -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 |