Skip to content

Commit 1b8c9cb

Browse files
gscuikuba-moo
authored andcommitted
MIPS: Remove the obsoleted code for include/linux/mv643xx.h
Most of the drivers which used this header have been deleted, most of these code is obsoleted, move the only defines that are actually used into arch/powerpc/platforms/chrp/pegasos_eth.c and delete the file completely. Signed-off-by: Gaosheng Cui <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 158135d commit 1b8c9cb

File tree

3 files changed

+5
-924
lines changed

3 files changed

+5
-924
lines changed

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13593,7 +13593,6 @@ M: Sebastian Hesselbarth <[email protected]>
1359313593
1359413594
S: Maintained
1359513595
F: drivers/net/ethernet/marvell/mv643xx_eth.*
13596-
F: include/linux/mv643xx.h
1359713596

1359813597
MARVELL MV88X3310 PHY DRIVER
1359913598
M: Russell King <[email protected]>

arch/powerpc/platforms/chrp/pegasos_eth.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/ioport.h>
1515
#include <linux/device.h>
1616
#include <linux/platform_device.h>
17-
#include <linux/mv643xx.h>
17+
#include <linux/mv643xx_eth.h>
1818
#include <linux/pci.h>
1919

2020
#define PEGASOS2_MARVELL_REGBASE (0xf1000000)
@@ -25,12 +25,15 @@
2525
#define PEGASOS2_SRAM_BASE_ETH_PORT0 (PEGASOS2_SRAM_BASE)
2626
#define PEGASOS2_SRAM_BASE_ETH_PORT1 (PEGASOS2_SRAM_BASE_ETH_PORT0 + (PEGASOS2_SRAM_SIZE / 2) )
2727

28-
2928
#define PEGASOS2_SRAM_RXRING_SIZE (PEGASOS2_SRAM_SIZE/4)
3029
#define PEGASOS2_SRAM_TXRING_SIZE (PEGASOS2_SRAM_SIZE/4)
3130

3231
#undef BE_VERBOSE
3332

33+
#define MV64340_BASE_ADDR_ENABLE 0x278
34+
#define MV64340_INTEGRATED_SRAM_BASE_ADDR 0x268
35+
#define MV64340_SRAM_CONFIG 0x380
36+
3437
static struct resource mv643xx_eth_shared_resources[] = {
3538
[0] = {
3639
.name = "ethernet shared base",

0 commit comments

Comments
 (0)