diff options
author | Tom Rini <trini@konsulko.com> | 2022-08-08 15:04:56 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-08-08 15:04:56 -0400 |
commit | ae0e1d68a94a1d0e9e3b22a254312da9c9a7c01f (patch) | |
tree | f364eb6eecd8211f8aac5190fdfa83cad5e46962 /arch/powerpc | |
parent | 56edbb5eafc53cd7b34cd231ec11c7e5eb576c9f (diff) | |
parent | 5bd4f31fea36cf4106d6314efd33ba49efcaeded (diff) |
Merge branch '2022-08-08-networking-updates'
After checking with Ramon, take a number of reviewed network patches.
This includes:
- A number of dwc_eth_qos updates, mpc8xx_fec DM migration, NPCM7xx EMAC
driver.
- Other assorted minor updates
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/cpu/mpc8xx/cpu.c | 12 | ||||
-rw-r--r-- | arch/powerpc/dts/mcr3000.dts | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 6d16ed084e6..0ccb9f6df6f 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -266,15 +266,3 @@ unsigned long get_tbclk(void) return oscclk / 16; } - -/* - * Initializes on-chip ethernet controllers. - * to override, implement board_eth_init() - */ -int cpu_eth_init(struct bd_info *bis) -{ -#if defined(CONFIG_MPC8XX_FEC) - fec_initialize(bis); -#endif - return 0; -} diff --git a/arch/powerpc/dts/mcr3000.dts b/arch/powerpc/dts/mcr3000.dts index 5abf111dc5f..5f32d8a2e55 100644 --- a/arch/powerpc/dts/mcr3000.dts +++ b/arch/powerpc/dts/mcr3000.dts @@ -16,6 +16,10 @@ compatible = "fsl,pq1-smc"; }; + FEC: fec@0 { + compatible = "fsl,pq1-fec1"; + }; + chosen { stdout-path = &SERIAL; }; |