diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c index 6a29fc46a0..418af2e788 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c @@ -1,7 +1,7 @@ /* * Atheros AR71xx SoC platform devices * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2009 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * Parts of this file are based on Atheros' 2.6.15 BSP @@ -21,7 +21,8 @@ #include #include -#include + +#include "devices.h" static u8 ar71xx_mac_base[ETH_ALEN] __initdata; diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h new file mode 100644 index 0000000000..eceb780cc7 --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h @@ -0,0 +1,51 @@ +/* + * Atheros AR71xx SoC device definitions + * + * Copyright (C) 2008-2009 Gabor Juhos + * Copyright (C) 2008 Imre Kaloz + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#ifndef __AR71XX_DEVICES_H +#define __AR71XX_DEVICES_H + +#include +#include +#include + +void ar71xx_add_device_spi(struct ar71xx_spi_platform_data *pdata, + struct spi_board_info const *info, + unsigned n) __init; + +void ar71xx_set_mac_base(unsigned char *mac) __init; +void ar71xx_parse_mac_addr(char *mac_str) __init; + +extern struct ag71xx_platform_data ar71xx_eth0_data; +extern struct ag71xx_platform_data ar71xx_eth1_data; +void ar71xx_add_device_eth(unsigned int id) __init; + +void ar71xx_add_device_mdio(u32 phy_mask) __init; + +void ar71xx_add_device_leds_gpio(int id, + unsigned num_leds, + struct gpio_led *leds) __init; + +void ar71xx_add_device_gpio_buttons(int id, + unsigned poll_interval, + unsigned nbuttons, + struct gpio_button *buttons) __init; + +#ifdef CONFIG_AR71XX_EARLY_SERIAL +static inline void ar71xx_add_device_uart(void) {} +#else +void ar71xx_add_device_uart(void) __init; +#endif + +void ar71xx_add_device_wdt(void) __init; + +void ar91xx_add_device_wmac(void) __init; + +#endif /* __AR71XX_DEVICES_H */ diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c index 13fe719069..1ae987de94 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c @@ -1,7 +1,7 @@ /* * Atheros AP83 board support * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2009 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * This program is free software; you can redistribute it and/or modify it @@ -15,7 +15,8 @@ #include #include #include -#include + +#include "devices.h" #define AP83_GPIO_LED_WLAN 6 #define AP83_GPIO_LED_POWER 14 diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c index d1e224429f..c8a37bfe1d 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c @@ -1,7 +1,7 @@ /* * AzureWave AW-NR580 board support * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2009 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * This program is free software; you can redistribute it and/or modify it @@ -19,7 +19,8 @@ #include #include #include -#include + +#include "devices.h" static struct spi_board_info aw_nr580_spi_info[] = { { diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c index 8af640ec7d..acce733ebe 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c @@ -18,7 +18,8 @@ #include #include -#include + +#include "devices.h" #define MZK_W04NU_GPIO_LED_USB 0 #define MZK_W04NU_GPIO_LED_STATUS 1 diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c index 2f429be67f..2e9d3bc6e7 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c @@ -1,7 +1,7 @@ /* * Planex MZK-W300NH board support * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2009 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * This program is free software; you can redistribute it and/or modify it @@ -18,7 +18,8 @@ #include #include -#include + +#include "devices.h" #ifdef CONFIG_MTD_PARTITIONS static struct mtd_partition mzk_w300nh_partitions[] = { diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c index 0379692d7a..a9543fe192 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c @@ -1,7 +1,7 @@ /* * Atheros PB42 board support * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2009 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * This program is free software; you can redistribute it and/or modify it @@ -17,7 +17,8 @@ #include #include #include -#include + +#include "devices.h" static struct spi_board_info pb42_spi_info[] = { { diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c index ec3ac0497d..7241929a73 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c @@ -20,7 +20,8 @@ #include #include #include -#include + +#include "devices.h" #define RB4XX_GPIO_USER_LED 4 #define RB4XX_GPIO_RESET_SWITCH 7 diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c index fa852898e9..8235a6dd0f 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c @@ -19,7 +19,8 @@ #include #include -#include + +#include "devices.h" #define TEW_632BRP_GPIO_LED_STATUS 1 #define TEW_632BRP_GPIO_LED_WPS 3 diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c index e5ccd925d7..0809b6803d 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c @@ -18,7 +18,8 @@ #include #include -#include + +#include "devices.h" #define TL_WR941ND_GPIO_LED_SYSTEM 2 #define TL_WR941ND_GPIO_LED_QSS 5 diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c index 0cb4181c80..85fa27e081 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c @@ -1,7 +1,7 @@ /* * Ubiquiti RouterStation support * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2009 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * Copyright (C) 2008 Ubiquiti * @@ -18,7 +18,8 @@ #include #include #include -#include + +#include "devices.h" #define UBNT_RS_GPIO_LED_RF 2 #define UBNT_RS_GPIO_SW4 8 diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c index ce8bdd24d3..c38e40a591 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c @@ -1,7 +1,7 @@ /* * NETGEAR WNR2000 board support * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2009 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * This program is free software; you can redistribute it and/or modify it @@ -18,7 +18,8 @@ #include #include -#include + +#include "devices.h" #ifdef CONFIG_MTD_PARTITIONS static struct mtd_partition wnr2000_partitions[] = { diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c index 52959017cb..067f0cedd1 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c @@ -1,7 +1,7 @@ /* * Compex WP543 board support * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2009 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * This program is free software; you can redistribute it and/or modify it @@ -19,7 +19,8 @@ #include #include #include -#include + +#include "devices.h" #define WP543_GPIO_SW6 2 #define WP543_GPIO_LED_1 3 diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c index 420985e461..4786badf12 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c @@ -19,7 +19,8 @@ #include #include -#include + +#include "devices.h" struct board_rec { char *name; diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c index 40b11782df..6c6cde82b3 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c @@ -27,7 +27,8 @@ #include #include -#include + +#include "devices.h" #define AR71XX_SYS_TYPE_LEN 64 #define AR71XX_BASE_FREQ 40000000 diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h index 20d83bb748..a3448f5a8b 100644 --- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h +++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h @@ -1,7 +1,7 @@ /* - * Atheros AR71xx SoC specific platform definitions + * Atheros AR71xx SoC specific platform data definitions * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2009 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * This program is free software; you can redistribute it and/or modify it @@ -16,8 +16,6 @@ #include #include #include -#include -#include struct ag71xx_platform_data { phy_interface_t phy_if_mode; @@ -52,36 +50,4 @@ struct ar71xx_spi_platform_data { #define AR71XX_SPI_CS_INACTIVE 0 #define AR71XX_SPI_CS_ACTIVE 1 -extern void ar71xx_add_device_spi(struct ar71xx_spi_platform_data *pdata, - struct spi_board_info const *info, - unsigned n) __init; - -extern void ar71xx_set_mac_base(unsigned char *mac) __init; -extern void ar71xx_parse_mac_addr(char *mac_str) __init; - -extern struct ag71xx_platform_data ar71xx_eth0_data; -extern struct ag71xx_platform_data ar71xx_eth1_data; -extern void ar71xx_add_device_eth(unsigned int id) __init; - -extern void ar71xx_add_device_mdio(u32 phy_mask) __init; - -extern void ar71xx_add_device_leds_gpio(int id, - unsigned num_leds, - struct gpio_led *leds) __init; - -extern void ar71xx_add_device_gpio_buttons(int id, - unsigned poll_interval, - unsigned nbuttons, - struct gpio_button *buttons) __init; - -#ifdef CONFIG_AR71XX_EARLY_SERIAL -static inline void ar71xx_add_device_uart(void) {} -#else -extern void ar71xx_add_device_uart(void) __init; -#endif - -extern void ar71xx_add_device_wdt(void) __init; - -extern void ar91xx_add_device_wmac(void) __init; - #endif /* __ASM_MACH_AR71XX_PLATFORM_H */