[brcm63xx] remove gpiodev, prefer sysfs gpio
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27284 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
42b46dbbd5
commit
fa61065873
|
@ -1,22 +0,0 @@
|
||||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
||||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
||||||
@@ -852,6 +852,10 @@ static struct platform_device mtd_dev =
|
|
||||||
.num_resources = ARRAY_SIZE(mtd_resources),
|
|
||||||
};
|
|
||||||
|
|
||||||
+static struct resource gpiodev_resource = {
|
|
||||||
+ .start = 0xFFFFFFFF,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static struct gpio_led_platform_data bcm63xx_led_data;
|
|
||||||
|
|
||||||
static struct platform_device bcm63xx_gpio_leds = {
|
|
||||||
@@ -916,6 +920,8 @@ int __init board_register_devices(void)
|
|
||||||
|
|
||||||
platform_device_register(&mtd_dev);
|
|
||||||
|
|
||||||
+ platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
|
|
||||||
+
|
|
||||||
bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
|
|
||||||
bcm63xx_led_data.leds = board.leds;
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||||
@@ -881,6 +881,7 @@ int __init board_register_devices(void)
|
@@ -877,6 +877,7 @@ int __init board_register_devices(void)
|
||||||
{
|
{
|
||||||
u32 val;
|
u32 val;
|
||||||
int button_count = 0;
|
int button_count = 0;
|
||||||
|
@ -8,9 +8,9 @@
|
||||||
|
|
||||||
if (board.has_uart0)
|
if (board.has_uart0)
|
||||||
bcm63xx_uart_register(0);
|
bcm63xx_uart_register(0);
|
||||||
@@ -922,7 +923,11 @@ int __init board_register_devices(void)
|
@@ -916,7 +917,11 @@ int __init board_register_devices(void)
|
||||||
|
|
||||||
platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
|
platform_device_register(&mtd_dev);
|
||||||
|
|
||||||
- bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
|
- bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
|
||||||
+ /* count number of LEDs defined by this device */
|
+ /* count number of LEDs defined by this device */
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct board_info __initdata board_rta1025w_16 = {
|
static struct board_info __initdata board_rta1025w_16 = {
|
||||||
@@ -909,6 +912,9 @@ int __init board_register_devices(void)
|
@@ -905,6 +908,9 @@ int __init board_register_devices(void)
|
||||||
if (board.has_dsp)
|
if (board.has_dsp)
|
||||||
bcm63xx_dsp_register(&board.dsp);
|
bcm63xx_dsp_register(&board.dsp);
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||||
@@ -915,6 +915,9 @@ int __init board_register_devices(void)
|
@@ -911,6 +911,9 @@ int __init board_register_devices(void)
|
||||||
if (board.has_udc0)
|
if (board.has_udc0)
|
||||||
bcm63xx_udc_register();
|
bcm63xx_udc_register();
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||||
@@ -918,6 +918,9 @@ int __init board_register_devices(void)
|
@@ -914,6 +914,9 @@ int __init board_register_devices(void)
|
||||||
if (board.num_devs)
|
if (board.num_devs)
|
||||||
platform_add_devices(board.devs, board.num_devs);
|
platform_add_devices(board.devs, board.num_devs);
|
||||||
|
|
||||||
|
|
|
@ -919,7 +919,7 @@
|
||||||
#include <board_bcm963xx.h>
|
#include <board_bcm963xx.h>
|
||||||
|
|
||||||
#define PFX "board_bcm963xx: "
|
#define PFX "board_bcm963xx: "
|
||||||
@@ -931,6 +932,8 @@ int __init board_register_devices(void)
|
@@ -927,6 +928,8 @@ int __init board_register_devices(void)
|
||||||
if (board.num_spis)
|
if (board.num_spis)
|
||||||
spi_register_board_info(board.spis, board.num_spis);
|
spi_register_board_info(board.spis, board.num_spis);
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -946,6 +935,18 @@ int __init board_register_devices(void)
|
@@ -942,6 +931,18 @@ int __init board_register_devices(void)
|
||||||
!board_get_mac_address(board.enet1.mac_addr))
|
!board_get_mac_address(board.enet1.mac_addr))
|
||||||
bcm63xx_enet_register(1, &board.enet1);
|
bcm63xx_enet_register(1, &board.enet1);
|
||||||
|
|
||||||
|
|
|
@ -95,7 +95,7 @@
|
||||||
|
|
||||||
/* dump cfe version */
|
/* dump cfe version */
|
||||||
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
|
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
|
||||||
@@ -2264,6 +2338,14 @@ int __init board_register_devices(void)
|
@@ -2260,6 +2334,14 @@ int __init board_register_devices(void)
|
||||||
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
|
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
|
||||||
val &= MPI_CSBASE_BASE_MASK;
|
val &= MPI_CSBASE_BASE_MASK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -2407,8 +2418,9 @@ int __init board_register_devices(void)
|
@@ -2403,8 +2414,9 @@ int __init board_register_devices(void)
|
||||||
if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
|
if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
|
||||||
memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||||
memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||||
|
|
|
@ -1,22 +0,0 @@
|
||||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
||||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
||||||
@@ -864,6 +864,10 @@ static struct platform_device mtd_dev =
|
|
||||||
.num_resources = ARRAY_SIZE(mtd_resources),
|
|
||||||
};
|
|
||||||
|
|
||||||
+static struct resource gpiodev_resource = {
|
|
||||||
+ .start = 0xFFFFFFFF,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static struct gpio_led_platform_data bcm63xx_led_data;
|
|
||||||
|
|
||||||
static struct platform_device bcm63xx_gpio_leds = {
|
|
||||||
@@ -928,6 +932,8 @@ int __init board_register_devices(void)
|
|
||||||
|
|
||||||
platform_device_register(&mtd_dev);
|
|
||||||
|
|
||||||
+ platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
|
|
||||||
+
|
|
||||||
bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
|
|
||||||
bcm63xx_led_data.leds = board.leds;
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||||
@@ -893,6 +893,7 @@ int __init board_register_devices(void)
|
@@ -889,6 +889,7 @@ int __init board_register_devices(void)
|
||||||
{
|
{
|
||||||
u32 val;
|
u32 val;
|
||||||
int button_count = 0;
|
int button_count = 0;
|
||||||
|
@ -8,9 +8,9 @@
|
||||||
|
|
||||||
if (board.has_uart0)
|
if (board.has_uart0)
|
||||||
bcm63xx_uart_register(0);
|
bcm63xx_uart_register(0);
|
||||||
@@ -934,7 +935,11 @@ int __init board_register_devices(void)
|
@@ -928,7 +929,11 @@ int __init board_register_devices(void)
|
||||||
|
|
||||||
platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
|
platform_device_register(&mtd_dev);
|
||||||
|
|
||||||
- bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
|
- bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
|
||||||
+ /* count number of LEDs defined by this device */
|
+ /* count number of LEDs defined by this device */
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct board_info __initdata board_rta1025w_16 = {
|
static struct board_info __initdata board_rta1025w_16 = {
|
||||||
@@ -921,6 +924,9 @@ int __init board_register_devices(void)
|
@@ -917,6 +920,9 @@ int __init board_register_devices(void)
|
||||||
if (board.has_dsp)
|
if (board.has_dsp)
|
||||||
bcm63xx_dsp_register(&board.dsp);
|
bcm63xx_dsp_register(&board.dsp);
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||||
@@ -927,6 +927,9 @@ int __init board_register_devices(void)
|
@@ -923,6 +923,9 @@ int __init board_register_devices(void)
|
||||||
if (board.has_udc0)
|
if (board.has_udc0)
|
||||||
bcm63xx_udc_register();
|
bcm63xx_udc_register();
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||||
@@ -930,6 +930,9 @@ int __init board_register_devices(void)
|
@@ -926,6 +926,9 @@ int __init board_register_devices(void)
|
||||||
if (board.num_devs)
|
if (board.num_devs)
|
||||||
platform_add_devices(board.devs, board.num_devs);
|
platform_add_devices(board.devs, board.num_devs);
|
||||||
|
|
||||||
|
|
|
@ -919,7 +919,7 @@
|
||||||
#include <board_bcm963xx.h>
|
#include <board_bcm963xx.h>
|
||||||
|
|
||||||
#define PFX "board_bcm963xx: "
|
#define PFX "board_bcm963xx: "
|
||||||
@@ -943,6 +944,8 @@ int __init board_register_devices(void)
|
@@ -939,6 +940,8 @@ int __init board_register_devices(void)
|
||||||
if (board.num_spis)
|
if (board.num_spis)
|
||||||
spi_register_board_info(board.spis, board.num_spis);
|
spi_register_board_info(board.spis, board.num_spis);
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -958,6 +946,19 @@ int __init board_register_devices(void)
|
@@ -954,6 +942,19 @@ int __init board_register_devices(void)
|
||||||
!board_get_mac_address(board.enet1.mac_addr))
|
!board_get_mac_address(board.enet1.mac_addr))
|
||||||
bcm63xx_enet_register(1, &board.enet1);
|
bcm63xx_enet_register(1, &board.enet1);
|
||||||
|
|
||||||
|
|
|
@ -95,7 +95,7 @@
|
||||||
|
|
||||||
/* dump cfe version */
|
/* dump cfe version */
|
||||||
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
|
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
|
||||||
@@ -2276,6 +2350,14 @@ int __init board_register_devices(void)
|
@@ -2272,6 +2346,14 @@ int __init board_register_devices(void)
|
||||||
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
|
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
|
||||||
val &= MPI_CSBASE_BASE_MASK;
|
val &= MPI_CSBASE_BASE_MASK;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue