mach-at91: Support for gms board added
PATCH v3 1/1 mach-at91: Support for gms board added
Code for the Stamp9G20 SoM separated into the board-stamp9g20.c, and following files correspond to carrier boards for Stamp9G20:
* carrier-board-gms.c - "GMS", Seismograph from GeoSIG.
* carrier-board-panelcardevb.c - "Panel Card EVB", Taskit's eval. board.
* carrier-board-portuxg20.c - "Portux G20", derivative from Stamp9G20.
* carrier-board-pcontrol_g20.c - "Pcontrol G20", PORTNER-Elektronik. .
All stuff specific to carrier board encapsulated into functions:
* carrier_board_map_io()
* carrier_board_init()
which used in the board-stamp9g20.c
.
There is only one choice for Stamp9G20 carrier board from:
* CONFIG_CARRIERBOARD_GMS
* CONFIG_CARRIERBOARD_PANELCARDEVB
* CONFIG_CARRIERBOARD_PCONTROL_G20
* CONFIG_CARRIERBOARD_PORTUXG20
--- arch/arm/configs/gms_defconfig | 148 ++++++ arch/arm/configs/pcontrol_g20_defconfig | 3 +- arch/arm/configs/portuxg20_defconfig | 129 ++++++ arch/arm/configs/stamp9g20_defconfig | 2 +- arch/arm/mach-at91/Kconfig | 46 ++- arch/arm/mach-at91/Makefile | 8 +- arch/arm/mach-at91/board-pcontrol-g20.c | 322 ------------- arch/arm/mach-at91/board-stamp9g20.c | 201 +------- arch/arm/mach-at91/carrier-board-gms.c | 556 +++++++++++++++++++++++ arch/arm/mach-at91/carrier-board-panelcardevb.c | 96 ++++ arch/arm/mach-at91/carrier-board-pcontrol-g20.c | 208 +++++++++ arch/arm/mach-at91/carrier-board-portuxg20.c | 121 +++++ arch/arm/mach-at91/generic.h | 3 + arch/arm/mach-at91/include/mach/gms.h | 33 ++ 14 files changed, 1366 insertions(+), 510 deletions(-) create mode 100644 arch/arm/configs/gms_defconfig create mode 100644 arch/arm/configs/portuxg20_defconfig delete mode 100644 arch/arm/mach-at91/board-pcontrol-g20.c create mode 100644 arch/arm/mach-at91/carrier-board-gms.c create mode 100644 arch/arm/mach-at91/carrier-board-panelcardevb.c create mode 100644 arch/arm/mach-at91/carrier-board-pcontrol-g20.c create mode 100644 arch/arm/mach-at91/carrier-board-portuxg20.c create mode 100644 arch/arm/mach-at91/include/mach/gms.h
arch/arm/configs/gms_defconfig new file +148 -0
@@ -0,0 +1,148 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_BLK_DEV_INITRD=y +CONFIG_SLAB=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_ARCH_AT91=y +CONFIG_ARCH_AT91SAM9G20=y +CONFIG_MACH_STAMP9G20=y +CONFIG_CARRIERBOARD_GMS=y +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y +CONFIG_AT91_SLOW_CLOCK=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y +CONFIG_AEABI=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" +CONFIG_KEXEC=y +CONFIG_CPU_IDLE=y +CONFIG_PM=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_NETFILTER=y +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m +CONFIG_CFG80211=y +CONFIG_LIB80211=y +CONFIG_MAC80211=y +CONFIG_MAC80211_LEDS=y +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_MTD=y +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_DATAFLASH=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ATMEL=y +CONFIG_MTD_UBI=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_MISC_DEVICES=y +CONFIG_EEPROM_AT24=y +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_MULTI_LUN=y +CONFIG_ATA=y +CONFIG_PATA_AT91=y +CONFIG_NETDEVICES=y +CONFIG_NET_ETHERNET=y +CONFIG_MACB=y +CONFIG_RTL8187=m +CONFIG_RT2X00=y +CONFIG_RT2500USB=y +CONFIG_RT73USB=y +CONFIG_RT2800USB=y +CONFIG_PPP=y +CONFIG_PPP_ASYNC=y +CONFIG_PPP_DEFLATE=y +CONFIG_PPP_BSDCOMP=y +CONFIG_PPP_MPPE=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 +CONFIG_INPUT_EVDEV=y +CONFIG_KEYBOARD_GPIO=y +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_GPIO=y +CONFIG_SPI=y +CONFIG_SPI_ATMEL=y +CONFIG_SPI_SPIDEV=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_PCF857X=y +CONFIG_W1=y +CONFIG_W1_MASTER_GPIO=y +CONFIG_W1_SLAVE_DS2431=y +CONFIG_USB=y +CONFIG_USB_DEVICEFS=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_ACM=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_USB_ETH=y +CONFIG_MMC=y +CONFIG_MMC_ATMELMCI=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_AT91SAM9=y +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +CONFIG_EXT4_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_SUMMARY=y +CONFIG_UBIFS_FS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_UTF8=y
arch/arm/configs/pcontrol_g20_defconfig +2 -1
@@ -23,7 +23,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_DEFAULT_DEADLINE=y CONFIG_ARCH_AT91=y CONFIG_ARCH_AT91SAM9G20=y -CONFIG_MACH_PCONTROL_G20=y +CONFIG_MACH_STAMP9G20=y +CONFIG_CARRIERBOARD_PCONTROL_G20=y CONFIG_AT91_PROGRAMMABLE_CLOCKS=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y
arch/arm/configs/portuxg20_defconfig new file +129 -0
129 lines not on this page · raw message
arch/arm/configs/stamp9g20_defconfig +1 -1
@@ -13,8 +13,8 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_IOSCHED_DEADLINE is not set CONFIG_ARCH_AT91=y CONFIG_ARCH_AT91SAM9G20=y -CONFIG_MACH_PORTUXG20=y CONFIG_MACH_STAMP9G20=y +CONFIG_CARRIERBOARD_PANELCARDEVB=y CONFIG_AT91_PROGRAMMABLE_CLOCKS=y CONFIG_AT91_SLOW_CLOCK=y CONFIG_NO_HZ=y
arch/arm/mach-at91/Kconfig +38 -8
62 lines not on this page · raw message
arch/arm/mach-at91/Makefile +6 -2
@@ -64,8 +64,6 @@ obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o obj-$(CONFIG_MACH_CPU9G20) += board-cpu9krea.o obj-$(CONFIG_MACH_STAMP9G20) += board-stamp9g20.o -obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o -obj-$(CONFIG_MACH_PCONTROL_G20) += board-pcontrol-g20.o # AT91SAM9260/AT91SAM9G20 board-specific support obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o
@@ -90,6 +88,12 @@ obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_AT91_SLOW_CLOCK) += pm_slowclock.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o +# Carrier Boards +obj-$(CONFIG_CARRIERBOARD_GMS) += carrier-board-gms.o +obj-$(CONFIG_CARRIERBOARD_PANELCARDEVB) += carrier-board-panelcardevb.o +obj-$(CONFIG_CARRIERBOARD_PORTUXG20) += carrier-board-portuxg20.o +obj-$(CONFIG_CARRIERBOARD_PCONTROL_G20) += carrier-board-pcontrol-g20.o + ifeq ($(CONFIG_PM_DEBUG),y) CFLAGS_pm.o += -DDEBUG endif
arch/arm/mach-at91/board-pcontrol-g20.c deleted +0 -322
322 lines not on this page · raw message
arch/arm/mach-at91/board-stamp9g20.c +25 -176
271 lines not on this page · raw message
arch/arm/mach-at91/carrier-board-gms.c new file +556 -0
556 lines not on this page · raw message
arch/arm/mach-at91/carrier-board-panelcardevb.c new file +96 -0
96 lines not on this page · raw message
arch/arm/mach-at91/carrier-board-pcontrol-g20.c new file +208 -0
208 lines not on this page · raw message
arch/arm/mach-at91/carrier-board-portuxg20.c new file +121 -0
121 lines not on this page · raw message
arch/arm/mach-at91/generic.h +3 -0
@@ -63,3 +63,6 @@ extern void __init at91_gpio_irq_setup(void);extern void (*at91_arch_reset)(void );extern int at91_extern_irq; + +extern void __init carrier_board_map_io (void ); +extern void __init carrier_board_init (void );
arch/arm/mach-at91/include/mach/gms.h new file +33 -0
@@ -0,0 +1,33 @@ +/* Buttons */ +#define GPIO_TRIG_NET_IN AT91_PIN_PB21 +#define GPIO_CARD_UNMOUNT_0 AT91_PIN_PB13 +#define GPIO_CARD_UNMOUNT_1 AT91_PIN_PB12 +#define GPIO_KEY_POWER AT91_PIN_PA25 + +/* PCF8574 0x20 GPIO - U1 on the GS_IA18-CB_V3 board */ +#define GS_IA18_S_PCF_GPIO_BASE0 NR_BUILTIN_GPIO +#define PCF_GPIO_HDC_POWER (GS_IA18_S_PCF_GPIO_BASE0 + 0) +#define PCF_GPIO_WIFI_SETUP (GS_IA18_S_PCF_GPIO_BASE0 + 1) +#define PCF_GPIO_WIFI_ENABLE (GS_IA18_S_PCF_GPIO_BASE0 + 2) +#define PCF_GPIO_WIFI_RESET (GS_IA18_S_PCF_GPIO_BASE0 + 3) +#define PCF_GPIO_ETH_DETECT 4/* this is a GPI */ +#define PCF_GPIO_GPS_SETUP (GS_IA18_S_PCF_GPIO_BASE0 + 5) +#define PCF_GPIO_GPS_STANDBY (GS_IA18_S_PCF_GPIO_BASE0 + 6) +#define PCF_GPIO_GPS_POWER (GS_IA18_S_PCF_GPIO_BASE0 + 7) + +/* PCF8574 0x22 GPIO - U1 on the GS_2G_OPT1-A_V0 board (Alarm) */ +#define GS_IA18_S_PCF_GPIO_BASE1 (GS_IA18_S_PCF_GPIO_BASE0 + 8) +#define PCF_GPIO_ALARM1 (GS_IA18_S_PCF_GPIO_BASE1 + 0) +#define PCF_GPIO_ALARM2 (GS_IA18_S_PCF_GPIO_BASE1 + 1) +#define PCF_GPIO_ALARM3 (GS_IA18_S_PCF_GPIO_BASE1 + 2) +#define PCF_GPIO_ALARM4 (GS_IA18_S_PCF_GPIO_BASE1 + 3) +/* bits 4, 5, 6 not used */ +#define PCF_GPIO_ALARM_V_RELAY_ON (GS_IA18_S_PCF_GPIO_BASE1 + 7) + +/* PCF8574 0x24 GPIO U1 on the GS_2G-OPT23-A_V0 board (Modem) */ +#define GS_IA18_S_PCF_GPIO_BASE2 (GS_IA18_S_PCF_GPIO_BASE1 + 8) +#define PCF_GPIO_MODEM_POWER (GS_IA18_S_PCF_GPIO_BASE2 + 0) +#define PCF_GPIO_MODEM_RESET (GS_IA18_S_PCF_GPIO_BASE2 + 3) +/* bits 1, 2, 4, 5 not used */ +#define PCF_GPIO_TRX_RESET (GS_IA18_S_PCF_GPIO_BASE2 + 6) +/* bit 7 not used */
Signature · 1 line
1.7.0.4
Quoted 9 lines · Igor Plyatov
Code for the Stamp9G20 SoM separated into the
board-stamp9g20.c, and following files correspond to carrier boards for Stamp9G20:
*carrier-board-gms.c- "GMS", Seismograph from GeoSIG.
*carrier-board-panelcardevb.c- "Panel Card EVB", Taskit's eval. board.
*carrier-board-portuxg20.c- "Portux G20", derivative from Stamp9G20.
*carrier-board-pcontrol_g20.c- "Pcontrol G20", PORTNER-Elektronik. .
All stuff specific to carrier board encapsulated into functions:
*carrier_board_map_io()
Quoted 8 lines
*
carrier_board_init()
which used in theboard-stamp9g20.c
.
There is only one choice for Stamp9G20 carrier board from:
*CONFIG_CARRIERBOARD_GMS
*CONFIG_CARRIERBOARD_PANELCARDEVB
*CONFIG_CARRIERBOARD_PCONTROL_G20
*CONFIG_CARRIERBOARD_PORTUXG20
It is useful to be able to build multiple boards into a single kernel.
Quoted 25 lines
arch/arm/mach-at91/carrier-board-gms.c new file +22
-0@@ -0,0 +1,556 @@ +/* +* Copyright (C) 2010 Christian Glindkamp <[email protected]> +* taskit GmbH +* 2010 Igor Plyatov <[email protected]> +* GeoSIG Ltd +* +* 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 +*/ + +#include <linux/platform_device.h>
arch/arm/mach-at91/carrier-board-gms.c line 32
Quoted 10 lines
arch/arm/mach-at91/carrier-board-gms.c new file +10
-0+#include <linux/gpio.h> +#include <linux/gpio_keys.h> +#include <linux/input.h> +#include <linux/i2c/pcf857x.h> + +#include <mach/board.h> +#include <mach/gms.h> + +void __init carrier_board_map_io (void ) +{
This approach won't work. If you have more than one carrier board compiled into your kernel then you will get multiple definition errors. The name carrier_board_map_io is also way too generic.
The better approach would be to do this the other way so that the carrier board calls the SoM map_io function.
Quoted 22 lines
arch/arm/mach-at91/carrier-board-gms.c new file +22
-0+/* +* USART0 on ttyS1 (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI). +* Used for Internal Analog Modem. +*/ +at91_register_uart (AT91SAM9260_ID_US0 ,1 , +ATMEL_UART_CTS |ATMEL_UART_RTS + |ATMEL_UART_DTR |ATMEL_UART_DSR + |ATMEL_UART_DCD |ATMEL_UART_RI ); +/* +* USART1 on ttyS2 (Rx, Tx, CTS, RTS). +* Used for GPS or WiFi or Data stream. +*/ +at91_register_uart (AT91SAM9260_ID_US1 ,2 , +ATMEL_UART_CTS |ATMEL_UART_RTS ); +/* +* USART2 on ttyS3 (Rx, Tx, CTS, RTS). +* Used for External Modem. +*/ +at91_register_uart (AT91SAM9260_ID_US2 ,3 , +ATMEL_UART_CTS |ATMEL_UART_RTS ); +/* +* USART3 on ttyS4 (Rx, Tx, RTS).
arch/arm/mach-at91/carrier-board-gms.c line 64
Quoted 10 lines
arch/arm/mach-at91/carrier-board-gms.c new file +10
-0+* Used for RS-485. +*/ +at91_register_uart (AT91SAM9260_ID_US3 ,4 ,ATMEL_UART_RTS ); + +/* +* USART4 on ttyS5 (Rx, Tx). +* Used for TRX433 Radio Module. +*/ +at91_register_uart (AT91SAM9260_ID_US4 ,5 ,0 ); +}
~Ryan
Signature · 7 lines
Bluewater Systems Ltd - ARM Technology Solution Centre Ryan Mallon 5 Amuri Park, 404 Barbadoes St [email protected] PO Box 13 889, Christchurch 8013 http://www.bluewatersys.com New Zealand Phone: +64 3 3779127 Freecall: Australia 1800 148 751 Fax: +64 3 3779135 USA 1800 261 2934