bcm63xx: reorder patches

Reorder patches for a clearer distinction between the purposes of
the different patches.

SVN-Revision: 31127
v19.07.3_mercusys_ac12_duma
Jonas Gorski 12 years ago
parent 13b6ec1d05
commit 44d546290a

@ -9,7 +9,7 @@
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
@@ -296,6 +298,16 @@ static struct board_info __initdata boar
@@ -294,6 +296,16 @@ static struct board_info __initdata boar
.active_low = 1,
},
},
@ -26,7 +26,7 @@
};
static struct board_info __initdata board_96348gw = {
@@ -354,6 +366,16 @@ static struct board_info __initdata boar
@@ -352,6 +364,16 @@ static struct board_info __initdata boar
.active_low = 1,
},
},
@ -43,7 +43,7 @@
};
static struct board_info __initdata board_FAST2404 = {
@@ -852,12 +874,23 @@ static struct platform_device bcm63xx_gp
@@ -850,12 +872,23 @@ static struct platform_device bcm63xx_gp
.dev.platform_data = &bcm63xx_led_data,
};
@ -67,7 +67,7 @@
if (board.has_uart0)
bcm63xx_uart_register(0);
@@ -912,5 +945,16 @@ int __init board_register_devices(void)
@@ -904,5 +937,16 @@ int __init board_register_devices(void)
platform_device_register(&bcm63xx_gpio_leds);

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -891,6 +891,7 @@ int __init board_register_devices(void)
@@ -889,6 +889,7 @@ int __init board_register_devices(void)
{
u32 val;
int button_count = 0;
@ -8,7 +8,7 @@
if (board.has_uart0)
bcm63xx_uart_register(0);
@@ -940,7 +941,11 @@ int __init board_register_devices(void)
@@ -932,7 +933,11 @@ int __init board_register_devices(void)
platform_device_register(&mtd_dev);

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -932,6 +932,9 @@ int __init board_register_devices(void)
@@ -924,6 +924,9 @@ int __init board_register_devices(void)
}
#endif

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -935,6 +935,9 @@ int __init board_register_devices(void)
@@ -927,6 +927,9 @@ int __init board_register_devices(void)
if (board.num_devs)
platform_add_devices(board.devs, board.num_devs);

@ -1,8 +1,8 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -32,9 +32,13 @@
#include <bcm63xx_dev_usb_ehci.h>
#include <bcm63xx_dev_spi.h>
@@ -28,9 +28,13 @@
#include <bcm63xx_dev_dsp.h>
#include <bcm63xx_dev_pcmcia.h>
#include <board_bcm963xx.h>
+#include <bcm_tag.h>
@ -14,7 +14,7 @@
static struct bcm963xx_nvram nvram;
static unsigned int mac_addr_used;
static struct board_info board;
@@ -732,6 +736,29 @@ static int board_get_mac_address(u8 *mac
@@ -721,6 +725,29 @@ static int board_get_mac_address(u8 *mac
return 0;
}
@ -44,7 +44,7 @@
/*
* early init callback, read nvram data from flash and checksum it
*/
@@ -774,6 +801,11 @@ void __init board_prom_init(void)
@@ -762,6 +789,11 @@ void __init board_prom_init(void)
return;
}

@ -58,15 +58,15 @@ Subject: [PATCH 21/57] MIPS: BCM63XX: register ohci device.
obj-y += boards/
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -25,6 +25,7 @@
@@ -27,6 +27,7 @@
#include <bcm63xx_dev_enet.h>
#include <bcm63xx_dev_dsp.h>
#include <bcm63xx_dev_pcmcia.h>
+#include <bcm63xx_dev_usb_ohci.h>
#include <board_bcm963xx.h>
#include <bcm_tag.h>
#define PFX "board_bcm963xx: "
@@ -874,6 +875,9 @@ int __init board_register_devices(void)
@@ -940,6 +941,9 @@ int __init board_register_devices(void)
!board_get_mac_address(board.enet1.mac_addr))
bcm63xx_enet_register(1, &board.enet1);

@ -41,15 +41,15 @@ Subject: [PATCH 23/57] MIPS: BCM63XX: register ehci device.
obj-y += boards/
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -26,6 +26,7 @@
@@ -28,6 +28,7 @@
#include <bcm63xx_dev_dsp.h>
#include <bcm63xx_dev_pcmcia.h>
#include <bcm63xx_dev_usb_ohci.h>
+#include <bcm63xx_dev_usb_ehci.h>
#include <board_bcm963xx.h>
#include <bcm_tag.h>
#define PFX "board_bcm963xx: "
@@ -875,6 +876,9 @@ int __init board_register_devices(void)
@@ -941,6 +942,9 @@ int __init board_register_devices(void)
!board_get_mac_address(board.enet1.mac_addr))
bcm63xx_enet_register(1, &board.enet1);

@ -12,7 +12,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -818,7 +818,7 @@ static struct mtd_partition mtd_partitio
@@ -872,7 +872,7 @@ static struct mtd_partition mtd_partitio
}
};

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -821,6 +821,8 @@ void __init board_prom_init(void)
@@ -844,6 +844,8 @@ void __init board_prom_init(void)
if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G3_EXT_MII |
GPIO_MODE_6348_G0_EXT_MII;

@ -885,15 +885,15 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -30,6 +30,7 @@
@@ -29,6 +29,7 @@
#include <bcm63xx_dev_pcmcia.h>
#include <bcm63xx_dev_usb_ohci.h>
#include <bcm63xx_dev_usb_ehci.h>
+#include <bcm63xx_dev_spi.h>
#include <board_bcm963xx.h>
#include <bcm_tag.h>
#define PFX "board_bcm963xx: "
@@ -949,6 +950,8 @@ int __init board_register_devices(void)
@@ -972,6 +973,8 @@ int __init board_register_devices(void)
if (board.num_spis)
spi_register_board_info(board.spis, board.num_spis);

@ -1,7 +1,7 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -487,6 +487,55 @@ static struct board_info __initdata boar
}
@@ -129,6 +129,55 @@ static struct board_info __initdata boar
},
},
};
+
@ -56,7 +56,7 @@
#endif
/*
@@ -751,6 +800,7 @@ static const struct board_info __initdat
@@ -637,6 +686,7 @@ static const struct board_info __initdat
&board_DV201AMR,
&board_96348gw_a,
&board_rta1025w_16,

@ -1,16 +1,16 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -18,6 +18,9 @@
@@ -17,6 +17,9 @@
#include <linux/ssb/ssb.h>
#include <linux/gpio_buttons.h>
#include <linux/input.h>
#include <linux/export.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_gpio.h>
+#include <linux/spi/74x164.h>
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
@@ -39,6 +42,12 @@
@@ -38,6 +41,12 @@
#define CFE_OFFSET_64K 0x10000
#define CFE_OFFSET_128K 0x20000
@ -23,7 +23,7 @@
static struct bcm963xx_nvram nvram;
static unsigned int mac_addr_used;
static struct board_info board;
@@ -778,6 +787,496 @@ static struct board_info __initdata boar
@@ -664,6 +673,496 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
@ -520,7 +520,7 @@
#endif
/*
@@ -808,9 +1307,30 @@ static const struct board_info __initdat
@@ -694,9 +1193,30 @@ static const struct board_info __initdat
&board_96358vw2,
&board_AGPFS0,
&board_DWVS0,
@ -551,7 +551,7 @@
/*
* Register a sane SPROMv2 to make the on-board
* bcm4318 WLAN work
@@ -962,6 +1482,9 @@ void __init board_prom_init(void)
@@ -847,6 +1367,9 @@ void __init board_prom_init(void)
boardid_fixup(boot_addr);
}

@ -1,8 +1,8 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -146,6 +146,38 @@ static struct board_info __initdata boar
},
},
@@ -199,6 +199,38 @@ static struct board_info __initdata boar
.has_uart0 = 1,
};
+
+static struct board_info __initdata board_96338w2_e7t = {
@ -39,7 +39,7 @@
#endif
/*
@@ -1286,6 +1318,7 @@ static const struct board_info __initdat
@@ -1172,6 +1204,7 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
&board_96338w,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -683,6 +683,98 @@ static struct board_info __initdata boar
@@ -662,6 +662,98 @@ static struct board_info __initdata boar
},
};
@ -99,7 +99,7 @@
static struct board_info __initdata board_AGPFS0 = {
.name = "AGPF-S0",
.expected_cpu_id = 0x6358,
@@ -1339,6 +1431,7 @@ static const struct board_info __initdat
@@ -1225,6 +1317,7 @@ static const struct board_info __initdat
&board_96358vw,
&board_96358vw2,
&board_AGPFS0,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -912,6 +912,59 @@ static struct board_info __initdata boar
@@ -798,6 +798,59 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
@ -60,7 +60,7 @@
struct spi_gpio_platform_data nb4_spi_gpio_data = {
.sck = NB4_SPI_GPIO_CLK,
.mosi = NB4_SPI_GPIO_MOSI,
@@ -1433,6 +1486,7 @@ static const struct board_info __initdat
@@ -1319,6 +1372,7 @@ static const struct board_info __initdat
&board_AGPFS0,
&board_CPVA642,
&board_DWVS0,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -577,6 +577,67 @@ static struct board_info __initdata boar
@@ -187,6 +187,67 @@ static struct board_info __initdata boar
},
};
@ -68,7 +68,7 @@
#endif
/*
@@ -1478,6 +1539,7 @@ static const struct board_info __initdat
@@ -1364,6 +1425,7 @@ static const struct board_info __initdat
&board_96348gw_a,
&board_rta1025w_16,
&board_96348_D4PW,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -432,6 +432,112 @@ static struct board_info __initdata boar
@@ -534,6 +534,112 @@ static struct board_info __initdata boar
},
};
@ -113,7 +113,7 @@
static struct board_info __initdata board_FAST2404 = {
.name = "F@ST2404",
.expected_cpu_id = 0x6348,
@@ -1532,6 +1638,8 @@ static const struct board_info __initdat
@@ -1418,6 +1524,8 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
&board_96348gw,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -744,6 +744,76 @@ static struct board_info __initdata boar
@@ -248,6 +248,76 @@ static struct board_info __initdata boar
},
};
@ -77,7 +77,7 @@
#endif
/*
@@ -1648,6 +1718,7 @@ static const struct board_info __initdat
@@ -1534,6 +1604,7 @@ static const struct board_info __initdat
&board_rta1025w_16,
&board_96348_D4PW,
&board_spw500v,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1691,6 +1691,81 @@ static struct board_info __initdata boar
@@ -1577,6 +1577,81 @@ static struct board_info __initdata boar
.spis = nb4_spi_devices,
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
@ -82,7 +82,7 @@
#endif
/*
@@ -1733,6 +1808,7 @@ static const struct board_info __initdat
@@ -1619,6 +1694,7 @@ static const struct board_info __initdat
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -178,6 +178,43 @@ static struct board_info __initdata boar
@@ -362,6 +362,43 @@ static struct board_info __initdata boar
},
},
};
@ -44,7 +44,7 @@
#endif
/*
@@ -1776,6 +1813,7 @@ static const struct board_info __initdat
@@ -1662,6 +1699,7 @@ static const struct board_info __initdat
&board_96338gw,
&board_96338w,
&board_96338w2_e7t,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1803,6 +1803,72 @@ static struct board_info __initdata boar
@@ -1689,6 +1689,72 @@ static struct board_info __initdata boar
},
},
};
@ -73,7 +73,7 @@
#endif
/*
@@ -1847,6 +1913,7 @@ static const struct board_info __initdat
@@ -1733,6 +1799,7 @@ static const struct board_info __initdat
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
&board_HW553,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -851,6 +851,63 @@ static struct board_info __initdata boar
@@ -318,6 +318,63 @@ static struct board_info __initdata boar
},
};
@ -64,7 +64,7 @@
#endif
/*
@@ -1898,6 +1955,7 @@ static const struct board_info __initdat
@@ -1784,6 +1841,7 @@ static const struct board_info __initdat
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
@ -72,7 +72,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
@@ -2051,6 +2109,22 @@ void __init board_prom_init(void)
@@ -1937,6 +1995,22 @@ void __init board_prom_init(void)
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK;
boot_addr = (u8 *)KSEG1ADDR(val);
@ -95,7 +95,7 @@
/* dump cfe version */
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
@@ -2269,6 +2343,13 @@ int __init board_register_devices(void)
@@ -2154,6 +2228,13 @@ int __init board_register_devices(void)
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK;

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -401,6 +401,62 @@ static struct board_info __initdata boar
@@ -630,6 +630,62 @@ static struct board_info __initdata boar
},
};
@ -63,7 +63,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
@@ -1956,6 +2012,7 @@ static const struct board_info __initdat
@@ -1842,6 +1898,7 @@ static const struct board_info __initdat
&board_spw500v,
&board_96348sv,
&board_V2500V_BB,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -457,6 +457,49 @@ static struct board_info __initdata boar
@@ -686,6 +686,49 @@ static struct board_info __initdata boar
};
@ -50,7 +50,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
@@ -2013,6 +2056,7 @@ static const struct board_info __initdat
@@ -1899,6 +1942,7 @@ static const struct board_info __initdat
&board_96348sv,
&board_V2500V_BB,
&board_V2110,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1325,6 +1325,8 @@ static struct board_info __initdata boar
@@ -1211,6 +1211,8 @@ static struct board_info __initdata boar
.name = "DWV-S0",
.expected_cpu_id = 0x6358,
@ -9,7 +9,7 @@
.has_enet0 = 1,
.has_enet1 = 1,
.has_pci = 1,
@@ -1340,6 +1342,7 @@ static struct board_info __initdata boar
@@ -1226,6 +1228,7 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1007,6 +1007,67 @@ static struct board_info __initdata boar
@@ -375,6 +375,67 @@ static struct board_info __initdata boar
},
};
@ -68,7 +68,7 @@
#endif
/*
@@ -2060,6 +2121,7 @@ static const struct board_info __initdat
@@ -1946,6 +2007,7 @@ static const struct board_info __initdat
&board_V2500V_BB,
&board_V2110,
&board_ct536_ct5621,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -702,6 +702,7 @@ static struct board_info __initdata boar
@@ -992,6 +992,7 @@ static struct board_info __initdata boar
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1069,6 +1069,42 @@ static struct board_info __initdata boar
@@ -436,6 +436,42 @@ static struct board_info __initdata boar
},
};
@ -43,7 +43,7 @@
#endif
/*
@@ -2123,6 +2159,7 @@ static const struct board_info __initdat
@@ -2009,6 +2045,7 @@ static const struct board_info __initdat
&board_V2110,
&board_ct536_ct5621,
&board_96348A_122,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -601,6 +601,99 @@ static struct board_info __initdata boar
@@ -1303,6 +1303,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -473,6 +473,19 @@ static struct board_info __initdata boar
@@ -1083,6 +1083,19 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -335,6 +335,17 @@ static struct board_info __initdata boar
@@ -661,6 +661,17 @@ static struct board_info __initdata boar
.active_low = 1,
},
},

@ -5,10 +5,10 @@
#include <linux/gpio_buttons.h>
#include <linux/input.h>
+#include <linux/export.h>
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
@@ -38,6 +39,13 @@ static unsigned int mac_addr_used;
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
#include <linux/spi/74x164.h>
@@ -52,6 +53,13 @@ static unsigned int mac_addr_used;
static struct board_info board;
/*
@ -22,7 +22,7 @@
* known 6338 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6338
@@ -749,6 +757,7 @@ void __init board_prom_init(void)
@@ -2344,6 +2352,7 @@ void __init board_prom_init(void)
/* extract nvram data */
memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram));
Loading…
Cancel
Save