Browse Source

move device registration function prototypes into a separate header file

SVN-Revision: 14635
Gabor Juhos 17 years ago
parent
commit
f7cf3b2a68

+ 3 - 2
target/linux/ar71xx/files/arch/mips/ar71xx/devices.c

@@ -1,7 +1,7 @@
 /*
  *  Atheros AR71xx SoC platform devices
  *
- *  Copyright (C) 2008 Gabor Juhos <[email protected]>
+ *  Copyright (C) 2008-2009 Gabor Juhos <[email protected]>
  *  Copyright (C) 2008 Imre Kaloz <[email protected]>
  *
  *  Parts of this file are based on Atheros' 2.6.15 BSP
@@ -21,7 +21,8 @@
 #include <linux/ath9k_platform.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 static u8 ar71xx_mac_base[ETH_ALEN] __initdata;
 

+ 51 - 0
target/linux/ar71xx/files/arch/mips/ar71xx/devices.h

@@ -0,0 +1,51 @@
+/*
+ *  Atheros AR71xx SoC device definitions
+ *
+ *  Copyright (C) 2008-2009 Gabor Juhos <[email protected]>
+ *  Copyright (C) 2008 Imre Kaloz <[email protected]>
+ *
+ *  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 <asm/mach-ar71xx/platform.h>
+#include <linux/leds.h>
+#include <linux/gpio_buttons.h>
+
+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 */

+ 3 - 2
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c

@@ -1,7 +1,7 @@
 /*
  *  Atheros AP83 board support
  *
- *  Copyright (C) 2008 Gabor Juhos <[email protected]>
+ *  Copyright (C) 2008-2009 Gabor Juhos <[email protected]>
  *  Copyright (C) 2008 Imre Kaloz <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -15,7 +15,8 @@
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 #define AP83_GPIO_LED_WLAN	6
 #define AP83_GPIO_LED_POWER	14

+ 3 - 2
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 <[email protected]>
+ *  Copyright (C) 2008-2009 Gabor Juhos <[email protected]>
  *  Copyright (C) 2008 Imre Kaloz <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -19,7 +19,8 @@
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 static struct spi_board_info aw_nr580_spi_info[] = {
 	{

+ 2 - 1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c

@@ -18,7 +18,8 @@
 #include <asm/mips_machine.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 #define MZK_W04NU_GPIO_LED_USB		0
 #define MZK_W04NU_GPIO_LED_STATUS	1

+ 3 - 2
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 <[email protected]>
+ *  Copyright (C) 2008-2009 Gabor Juhos <[email protected]>
  *  Copyright (C) 2008 Imre Kaloz <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -18,7 +18,8 @@
 #include <asm/mips_machine.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition mzk_w300nh_partitions[] = {

+ 3 - 2
target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c

@@ -1,7 +1,7 @@
 /*
  *  Atheros PB42 board support
  *
- *  Copyright (C) 2008 Gabor Juhos <[email protected]>
+ *  Copyright (C) 2008-2009 Gabor Juhos <[email protected]>
  *  Copyright (C) 2008 Imre Kaloz <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -17,7 +17,8 @@
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 static struct spi_board_info pb42_spi_info[] = {
 	{

+ 2 - 1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c

@@ -20,7 +20,8 @@
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 #define RB4XX_GPIO_USER_LED	4
 #define RB4XX_GPIO_RESET_SWITCH	7

+ 2 - 1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c

@@ -19,7 +19,8 @@
 #include <asm/mips_machine.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 #define TEW_632BRP_GPIO_LED_STATUS	1
 #define TEW_632BRP_GPIO_LED_WPS		3

+ 2 - 1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c

@@ -18,7 +18,8 @@
 #include <asm/mips_machine.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 #define TL_WR941ND_GPIO_LED_SYSTEM	2
 #define TL_WR941ND_GPIO_LED_QSS		5

+ 3 - 2
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c

@@ -1,7 +1,7 @@
 /*
  *  Ubiquiti RouterStation support
  *
- *  Copyright (C) 2008 Gabor Juhos <[email protected]>
+ *  Copyright (C) 2008-2009 Gabor Juhos <[email protected]>
  *  Copyright (C) 2008 Imre Kaloz <[email protected]>
  *  Copyright (C) 2008 Ubiquiti <[email protected]>
  *
@@ -18,7 +18,8 @@
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 #define UBNT_RS_GPIO_LED_RF	2
 #define UBNT_RS_GPIO_SW4	8

+ 3 - 2
target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c

@@ -1,7 +1,7 @@
 /*
  *  NETGEAR WNR2000 board support
  *
- *  Copyright (C) 2008 Gabor Juhos <[email protected]>
+ *  Copyright (C) 2008-2009 Gabor Juhos <[email protected]>
  *  Copyright (C) 2008 Imre Kaloz <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -18,7 +18,8 @@
 #include <asm/mips_machine.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wnr2000_partitions[] = {

+ 3 - 2
target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c

@@ -1,7 +1,7 @@
 /*
  *  Compex WP543 board support
  *
- *  Copyright (C) 2008 Gabor Juhos <[email protected]>
+ *  Copyright (C) 2008-2009 Gabor Juhos <[email protected]>
  *  Copyright (C) 2008 Imre Kaloz <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -19,7 +19,8 @@
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 #define WP543_GPIO_SW6		2
 #define WP543_GPIO_LED_1	3

+ 2 - 1
target/linux/ar71xx/files/arch/mips/ar71xx/prom.c

@@ -19,7 +19,8 @@
 #include <asm/fw/myloader/myloader.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 struct board_rec {
 	char		*name;

+ 2 - 1
target/linux/ar71xx/files/arch/mips/ar71xx/setup.c

@@ -27,7 +27,8 @@
 
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 #define AR71XX_SYS_TYPE_LEN	64
 #define AR71XX_BASE_FREQ	40000000

+ 2 - 36
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 <[email protected]>
+ *  Copyright (C) 2008-2009 Gabor Juhos <[email protected]>
  *  Copyright (C) 2008 Imre Kaloz <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -16,8 +16,6 @@
 #include <linux/skbuff.h>
 #include <linux/phy.h>
 #include <linux/spi/spi.h>
-#include <linux/leds.h>
-#include <linux/gpio_buttons.h>
 
 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 */