at91: add cpu devices common api

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

3 files changed, 57 insertions, 34 deletions

diff --git a/include/asm-arm/arch-at91/atmel_nand.h b/include/asm-arm/arch-at91/atmel_nand.h
deleted file mode 100644
index 0c0fbd0ee0..0000000000
--- a/include/asm-arm/arch-at91/atmel_nand.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __ASM_ARCH_NAND_H
-#define __ASM_ARCH_NAND_H
-
-#include <linux/mtd/mtd.h>
-
-void atmel_nand_load_image(void *dest, int size, int pagesize, int blocksize);
-
- /* NAND / SmartMedia */
-struct atmel_nand_data {
-	void __iomem	*ecc_base;
-	u8		enable_pin;	/* chip enable */
-	u8		det_pin;	/* card detect */
-	u8		rdy_pin;	/* ready/busy */
-	u8		ale;		/* address line number connected to ALE */
-	u8		cle;		/* address line number connected to CLE */
-	u8		bus_width_16;	/* buswidth is 16 bit */
-	u8		ecc_mode;	/* NAND_ECC_* */
-};
-
-#endif /* __ASM_ARCH_NAND_H */
-
diff --git a/include/asm-arm/arch-at91/board.h b/include/asm-arm/arch-at91/board.h
new file mode 100644
index 0000000000..915acdbb9e
--- /dev/null
+++ b/include/asm-arm/arch-at91/board.h
@@ -0,0 +1,57 @@
+/*
+ * [origin Linux: arch/arm/mach-at91/include/mach/board.h]
+ *
+ *  Copyright (C) 2005 HP Labs
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __ASM_ARCH_BOARD_H
+#define __ASM_ARCH_BOARD_H
+
+#include <linux/mtd/mtd.h>
+
+void atmel_nand_load_image(void *dest, int size, int pagesize, int blocksize);
+
+ /* NAND / SmartMedia */
+struct atmel_nand_data {
+	void __iomem	*ecc_base;
+	u8		enable_pin;	/* chip enable */
+	u8		det_pin;	/* card detect */
+	u8		rdy_pin;	/* ready/busy */
+	u8		ale;		/* address line number connected to ALE */
+	u8		cle;		/* address line number connected to CLE */
+	u8		bus_width_16;	/* buswidth is 16 bit */
+	u8		ecc_mode;	/* NAND_ECC_* */
+};
+
+void at91_add_device_nand(struct atmel_nand_data *data);
+
+#define AT91SAM_ETHER_MII		(0 << 0)
+#define AT91SAM_ETHER_RMII		(1 << 0)
+#define AT91SAM_ETHER_FORCE_LINK	(1 << 1)
+
+struct at91_ether_platform_data {
+	unsigned int flags;
+	int phy_addr;
+};
+
+void at91_add_device_eth(struct at91_ether_platform_data *data);
+
+void at91_add_device_sdram(u32 size);
+
+void at91_register_uart(unsigned id);
+
+#endif
diff --git a/include/asm-arm/arch-at91/ether.h b/include/asm-arm/arch-at91/ether.h
deleted file mode 100644
index 2f7c9d0e36..0000000000
--- a/include/asm-arm/arch-at91/ether.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __AT91SAM_ETHER_H
-#define __AT91SAM_ETHER_H
-
-#define AT91SAM_ETHER_MII		(0 << 0)
-#define AT91SAM_ETHER_RMII		(1 << 0)
-#define AT91SAM_ETHER_FORCE_LINK	(1 << 1)
-
-struct at91sam_ether_platform_data {
-	unsigned int flags;
-	int phy_addr;
-};
-
-#endif /* __AT91SAM_ETHER_H */