* [PATCH 0/5] ARM: at91: Calao USB-A926x switch completyl to dt and drop board file
@ 2013-05-26 15:30 Jean-Christophe PLAGNIOL-VILLARD
2013-05-26 15:33 ` [PATCH 1/5] ARM: at91: dt: usb-a9260: update shutdown controller Jean-Christophe PLAGNIOL-VILLARD
2013-05-31 20:56 ` [PATCH 0/5] ARM: at91: Calao USB-A926x switch completyl to dt and drop board file Nicolas Ferre
0 siblings, 2 replies; 7+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-26 15:30 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
The Follwing patch serie finish to swtich the Calao USB-A926x to DT
and drop the board file.
This is the first boards to be drop on at91
The following changes since commit 24577c1b3ebf3eab6465bb112a6265e87400163e:
ARM: at91: dt: sam9260: add i2c gpio pinctrl (2013-05-26 16:56:39 +0800)
are available in the git repository at:
git://github.com/at91linux/linux-at91.git j/for-3.11-calao-dt
for you to fetch changes up to c3ea1d2cc2f543ee0646a75890e1a7be5dd82c0b:
ARM: at91: drop non DT: Calao USB-A96x (2013-05-26 23:32:23 +0800)
----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (5):
ARM: at91: dt: usb-a9260: update shutdown controller
ARM: at91: dt: usb-a9263: update shutdown controller
ARM: at91: dt: usb-a9263: add dataflash support
ARM: at91: dt: add Calao USB-A9G20 low power version
ARM: at91: drop non DT: Calao USB-A96x
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/usb_a9260.dts | 9 ++++++
arch/arm/boot/dts/usb_a9263.dts | 14 +++++++++
arch/arm/boot/dts/usb_a9g20.dts | 18 +----------
arch/arm/boot/dts/usb_a9g20_common.dtsi | 27 ++++++++++++++++
arch/arm/boot/dts/usb_a9g20_lpw.dts | 31 ++++++++++++++++++
arch/arm/configs/at91_dt_defconfig | 2 ++
arch/arm/configs/at91sam9260_9g20_defconfig | 1 -
arch/arm/configs/at91sam9263_defconfig | 1 -
arch/arm/mach-at91/Kconfig.non_dt | 19 -----------
arch/arm/mach-at91/Makefile | 3 --
arch/arm/mach-at91/board-usb-a926x.c | 384 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
12 files changed, 85 insertions(+), 425 deletions(-)
create mode 100644 arch/arm/boot/dts/usb_a9g20_common.dtsi
create mode 100644 arch/arm/boot/dts/usb_a9g20_lpw.dts
delete mode 100644 arch/arm/mach-at91/board-usb-a926x.c
Best Regards,
J.
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/5] ARM: at91: dt: usb-a9260: update shutdown controller 2013-05-26 15:30 [PATCH 0/5] ARM: at91: Calao USB-A926x switch completyl to dt and drop board file Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-26 15:33 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-26 15:33 ` [PATCH 2/5] ARM: at91: dt: usb-a9263: " Jean-Christophe PLAGNIOL-VILLARD ` (3 more replies) 2013-05-31 20:56 ` [PATCH 0/5] ARM: at91: Calao USB-A926x switch completyl to dt and drop board file Nicolas Ferre 1 sibling, 4 replies; 7+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-26 15:33 UTC (permalink / raw) To: linux-arm-kernel enable rtt and wakeup button (5 msec low) Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: gregory hermant <gregory.hermant@calao-systems.com> --- arch/arm/boot/dts/usb_a9260.dts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/boot/dts/usb_a9260.dts b/arch/arm/boot/dts/usb_a9260.dts index a604107..de0c24f 100644 --- a/arch/arm/boot/dts/usb_a9260.dts +++ b/arch/arm/boot/dts/usb_a9260.dts @@ -20,4 +20,13 @@ memory { reg = <0x20000000 0x4000000>; }; + + ahb { + apb { + shdwc at fffffd10 { + atmel,wakeup-counter = <10>; + atmel,wakeup-rtt-timer; + }; + }; + }; }; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/5] ARM: at91: dt: usb-a9263: update shutdown controller 2013-05-26 15:33 ` [PATCH 1/5] ARM: at91: dt: usb-a9260: update shutdown controller Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-26 15:33 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-26 15:33 ` [PATCH 3/5] ARM: at91: dt: usb-a9263: add dataflash support Jean-Christophe PLAGNIOL-VILLARD ` (2 subsequent siblings) 3 siblings, 0 replies; 7+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-26 15:33 UTC (permalink / raw) To: linux-arm-kernel enable rtt and wakeup button (5 msec low) Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: gregory hermant <gregory.hermant@calao-systems.com> --- arch/arm/boot/dts/usb_a9263.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/usb_a9263.dts b/arch/arm/boot/dts/usb_a9263.dts index f8ec36c..e7eb9ae 100644 --- a/arch/arm/boot/dts/usb_a9263.dts +++ b/arch/arm/boot/dts/usb_a9263.dts @@ -47,6 +47,10 @@ status = "okay"; }; + shdwc at fffffd10 { + atmel,wakeup-counter = <10>; + atmel,wakeup-rtt-timer; + }; }; nand0: nand at 40000000 { -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/5] ARM: at91: dt: usb-a9263: add dataflash support 2013-05-26 15:33 ` [PATCH 1/5] ARM: at91: dt: usb-a9260: update shutdown controller Jean-Christophe PLAGNIOL-VILLARD 2013-05-26 15:33 ` [PATCH 2/5] ARM: at91: dt: usb-a9263: " Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-26 15:33 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-26 15:33 ` [PATCH 4/5] ARM: at91: dt: add Calao USB-A9G20 low power version Jean-Christophe PLAGNIOL-VILLARD 2013-05-26 15:33 ` [PATCH 5/5] ARM: at91: drop non DT: Calao USB-A96x Jean-Christophe PLAGNIOL-VILLARD 3 siblings, 0 replies; 7+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-26 15:33 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: gregory hermant <gregory.hermant@calao-systems.com> --- arch/arm/boot/dts/usb_a9263.dts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/usb_a9263.dts b/arch/arm/boot/dts/usb_a9263.dts index e7eb9ae..290e603 100644 --- a/arch/arm/boot/dts/usb_a9263.dts +++ b/arch/arm/boot/dts/usb_a9263.dts @@ -47,6 +47,16 @@ status = "okay"; }; + spi0: spi at fffa4000 { + cs-gpios = <&pioB 15 GPIO_ACTIVE_HIGH>; + status = "okay"; + mtd_dataflash at 0 { + compatible = "atmel,at45", "atmel,dataflash"; + reg = <0>; + spi-max-frequency = <15000000>; + }; + }; + shdwc at fffffd10 { atmel,wakeup-counter = <10>; atmel,wakeup-rtt-timer; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/5] ARM: at91: dt: add Calao USB-A9G20 low power version 2013-05-26 15:33 ` [PATCH 1/5] ARM: at91: dt: usb-a9260: update shutdown controller Jean-Christophe PLAGNIOL-VILLARD 2013-05-26 15:33 ` [PATCH 2/5] ARM: at91: dt: usb-a9263: " Jean-Christophe PLAGNIOL-VILLARD 2013-05-26 15:33 ` [PATCH 3/5] ARM: at91: dt: usb-a9263: add dataflash support Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-26 15:33 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-26 15:33 ` [PATCH 5/5] ARM: at91: drop non DT: Calao USB-A96x Jean-Christophe PLAGNIOL-VILLARD 3 siblings, 0 replies; 7+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-26 15:33 UTC (permalink / raw) To: linux-arm-kernel the low power version have a mmc-spi eanble mmc-spi and RV3029C2 RTC in at91_dt_defconfig Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: gregory hermant <gregory.hermant@calao-systems.com> --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/usb_a9g20.dts | 18 +----------- .../dts/{usb_a9g20.dts => usb_a9g20_common.dtsi} | 5 +--- arch/arm/boot/dts/usb_a9g20_lpw.dts | 31 ++++++++++++++++++++ arch/arm/configs/at91_dt_defconfig | 2 ++ 5 files changed, 36 insertions(+), 21 deletions(-) copy arch/arm/boot/dts/{usb_a9g20.dts => usb_a9g20_common.dtsi} (81%) create mode 100644 arch/arm/boot/dts/usb_a9g20_lpw.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b9f7121..f62d126 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -21,6 +21,7 @@ dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek_2mmc.dtb dtb-$(CONFIG_ARCH_AT91) += kizbox.dtb dtb-$(CONFIG_ARCH_AT91) += tny_a9g20.dtb dtb-$(CONFIG_ARCH_AT91) += usb_a9g20.dtb +dtb-$(CONFIG_ARCH_AT91) += usb_a9g20_lpw.dtb # sam9g45 dtb-$(CONFIG_ARCH_AT91) += at91sam9m10g45ek.dtb dtb-$(CONFIG_ARCH_AT91) += pm9g45.dtb diff --git a/arch/arm/boot/dts/usb_a9g20.dts b/arch/arm/boot/dts/usb_a9g20.dts index c979c06..ec77cf8 100644 --- a/arch/arm/boot/dts/usb_a9g20.dts +++ b/arch/arm/boot/dts/usb_a9g20.dts @@ -6,25 +6,9 @@ * Licensed under GPLv2 or later. */ /dts-v1/; -#include "at91sam9g20.dtsi" -#include "usb_a9260_common.dtsi" +#include "usb_a9g20_common.dtsi" / { model = "Calao USB A9G20"; compatible = "calao,usb-a9g20", "atmel,at91sam9g20", "atmel,at91sam9"; - - chosen { - bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs"; - }; - - memory { - reg = <0x20000000 0x4000000>; - }; - - i2c at 0 { - rv3029c2 at 56 { - compatible = "rv3029c2"; - reg = <0x56>; - }; - }; }; diff --git a/arch/arm/boot/dts/usb_a9g20.dts b/arch/arm/boot/dts/usb_a9g20_common.dtsi similarity index 81% copy from arch/arm/boot/dts/usb_a9g20.dts copy to arch/arm/boot/dts/usb_a9g20_common.dtsi index c979c06..0b3b361 100644 --- a/arch/arm/boot/dts/usb_a9g20.dts +++ b/arch/arm/boot/dts/usb_a9g20_common.dtsi @@ -5,14 +5,11 @@ * * Licensed under GPLv2 or later. */ -/dts-v1/; + #include "at91sam9g20.dtsi" #include "usb_a9260_common.dtsi" / { - model = "Calao USB A9G20"; - compatible = "calao,usb-a9g20", "atmel,at91sam9g20", "atmel,at91sam9"; - chosen { bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs"; }; diff --git a/arch/arm/boot/dts/usb_a9g20_lpw.dts b/arch/arm/boot/dts/usb_a9g20_lpw.dts new file mode 100644 index 0000000..f8cb1b9 --- /dev/null +++ b/arch/arm/boot/dts/usb_a9g20_lpw.dts @@ -0,0 +1,31 @@ +/* + * usb_a9g20_lpw.dts - Device Tree file for Caloa USB A9G20 Low Power board + * + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + * + * Licensed under GPLv2 or later. + */ +/dts-v1/; +#include "usb_a9g20_common.dtsi" + +/ { + model = "Calao USB A9G20 Low Power"; + compatible = "calao,usb-a9g20-lpw", "calao,usb-a9g20", "atmel,at91sam9g20", "atmel,at91sam9"; + + ahb { + apb { + spi1: spi at fffcc000 { + cs-gpios = <&pioB 3 GPIO_ACTIVE_HIGH>; + status = "okay"; + mmc-slot at 0 { + compatible = "mmc-spi-slot"; + reg = <0>; + voltage-ranges = <3200 3400>; + spi-max-frequency = <25000000>; + interrupt-parent = <&pioC>; + interrupts = <4 IRQ_TYPE_EDGE_BOTH>; + }; + }; + }; + }; +}; diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig index a8800d3..75fd842 100644 --- a/arch/arm/configs/at91_dt_defconfig +++ b/arch/arm/configs/at91_dt_defconfig @@ -161,6 +161,7 @@ CONFIG_USB_ATMEL_USBA=y CONFIG_USB_G_SERIAL=y CONFIG_MMC=y CONFIG_MMC_ATMELMCI=y +CONFIG_MMC_SPI=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y @@ -169,6 +170,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_RV3029C2=y CONFIG_RTC_DRV_AT91RM9200=y CONFIG_RTC_DRV_AT91SAM9=y CONFIG_DMADEVICES=y -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/5] ARM: at91: drop non DT: Calao USB-A96x 2013-05-26 15:33 ` [PATCH 1/5] ARM: at91: dt: usb-a9260: update shutdown controller Jean-Christophe PLAGNIOL-VILLARD ` (2 preceding siblings ...) 2013-05-26 15:33 ` [PATCH 4/5] ARM: at91: dt: add Calao USB-A9G20 low power version Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-26 15:33 ` Jean-Christophe PLAGNIOL-VILLARD 3 siblings, 0 replies; 7+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-26 15:33 UTC (permalink / raw) To: linux-arm-kernel as now we have full DT support of those board Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: gregory hermant <gregory.hermant@calao-systems.com> --- arch/arm/configs/at91sam9260_9g20_defconfig | 1 - arch/arm/configs/at91sam9263_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 19 -- arch/arm/mach-at91/Makefile | 3 - arch/arm/mach-at91/board-usb-a926x.c | 384 --------------------------- 5 files changed, 408 deletions(-) delete mode 100644 arch/arm/mach-at91/board-usb-a926x.c diff --git a/arch/arm/configs/at91sam9260_9g20_defconfig b/arch/arm/configs/at91sam9260_9g20_defconfig index f50c404..69b6928 100644 --- a/arch/arm/configs/at91sam9260_9g20_defconfig +++ b/arch/arm/configs/at91sam9260_9g20_defconfig @@ -15,7 +15,6 @@ CONFIG_MACH_AT91SAM9260EK=y CONFIG_MACH_CAM60=y CONFIG_MACH_SAM9_L9260=y CONFIG_MACH_AFEB9260=y -CONFIG_MACH_USB_A9260=y CONFIG_MACH_QIL_A9260=y CONFIG_MACH_CPU9260=y CONFIG_MACH_FLEXIBITY=y diff --git a/arch/arm/configs/at91sam9263_defconfig b/arch/arm/configs/at91sam9263_defconfig index 9d72ab6..e4002636 100644 --- a/arch/arm/configs/at91sam9263_defconfig +++ b/arch/arm/configs/at91sam9263_defconfig @@ -15,7 +15,6 @@ CONFIG_MODULE_UNLOAD=y CONFIG_ARCH_AT91=y CONFIG_ARCH_AT91SAM9263=y CONFIG_MACH_AT91SAM9263EK=y -CONFIG_MACH_USB_A9263=y CONFIG_MTD_AT91_DATAFLASH_CARD=y # CONFIG_ARM_THUMB is not set CONFIG_AEABI=y diff --git a/arch/arm/mach-at91/Kconfig.non_dt b/arch/arm/mach-at91/Kconfig.non_dt index 1a2abd8..6cd554a 100644 --- a/arch/arm/mach-at91/Kconfig.non_dt +++ b/arch/arm/mach-at91/Kconfig.non_dt @@ -183,12 +183,6 @@ config MACH_AFEB9260 <svn://194.85.238.22/home/users/george/svn/arm9eb> <http://groups.google.com/group/arm9fpga-evolution-board> -config MACH_USB_A9260 - bool "CALAO USB-A9260" - help - Select this if you are using a Calao Systems USB-A9260. - <http://www.calao-systems.com> - config MACH_QIL_A9260 bool "CALAO QIL-A9260 board" help @@ -264,13 +258,6 @@ config MACH_GSIA18S produced by GeoSIG Ltd company. This is an internet accelerograph. <http://www.geosig.com> -config MACH_USB_A9G20 - bool "CALAO USB-A9G20" - depends on ARCH_AT91SAM9G20 - help - Select this if you are using a Calao Systems USB-A9G20. - <http://www.calao-systems.com> - config MACH_SNAPPER_9260 bool "Bluewater Systems Snapper 9260/9G20 module" help @@ -316,12 +303,6 @@ config MACH_AT91SAM9263EK Select this if you are using Atmel's AT91SAM9263-EK Evaluation Kit. <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4057> -config MACH_USB_A9263 - bool "CALAO USB-A9263" - help - Select this if you are using a Calao Systems USB-A9263. - <http://www.calao-systems.com> - endif # ---------------------------------------------------------- diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index f4a5f79..d07bcfa 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -53,7 +53,6 @@ obj-$(CONFIG_MACH_RSI_EWS) += board-rsi-ews.o obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o obj-$(CONFIG_MACH_CAM60) += board-cam60.o obj-$(CONFIG_MACH_SAM9_L9260) += board-sam9-l9260.o -obj-$(CONFIG_MACH_USB_A9260) += board-usb-a926x.o obj-$(CONFIG_MACH_QIL_A9260) += board-qil-a9260.o obj-$(CONFIG_MACH_AFEB9260) += board-afeb-9260v1.o obj-$(CONFIG_MACH_CPU9260) += board-cpu9krea.o @@ -65,7 +64,6 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += board-sam9261ek.o # AT91SAM9263 board-specific support obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o -obj-$(CONFIG_MACH_USB_A9263) += board-usb-a926x.o # AT91SAM9RL board-specific support obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o @@ -78,7 +76,6 @@ obj-$(CONFIG_MACH_STAMP9G20) += board-stamp9g20.o obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o obj-$(CONFIG_MACH_PCONTROL_G20) += board-pcontrol-g20.o board-stamp9g20.o obj-$(CONFIG_MACH_GSIA18S) += board-gsia18s.o board-stamp9g20.o -obj-$(CONFIG_MACH_USB_A9G20) += board-usb-a926x.o # AT91SAM9260/AT91SAM9G20 board-specific support obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c deleted file mode 100644 index 2487d94..0000000 --- a/arch/arm/mach-at91/board-usb-a926x.c +++ /dev/null @@ -1,384 +0,0 @@ -/* - * linux/arch/arm/mach-at91/board-usb-a926x.c - * - * Copyright (C) 2005 SAN People - * Copyright (C) 2007 Atmel Corporation. - * Copyright (C) 2007 Calao-systems - * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> - * - * 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/types.h> -#include <linux/init.h> -#include <linux/mm.h> -#include <linux/module.h> -#include <linux/platform_device.h> -#include <linux/spi/spi.h> -#include <linux/gpio_keys.h> -#include <linux/gpio.h> -#include <linux/input.h> -#include <linux/spi/mmc_spi.h> - -#include <asm/setup.h> -#include <asm/mach-types.h> -#include <asm/irq.h> - -#include <asm/mach/arch.h> -#include <asm/mach/map.h> -#include <asm/mach/irq.h> - -#include <mach/hardware.h> -#include <mach/at91sam9_smc.h> - -#include "at91_aic.h" -#include "at91_shdwc.h" -#include "board.h" -#include "sam9_smc.h" -#include "generic.h" - - -static void __init ek_init_early(void) -{ - /* Initialize processor: 12.00 MHz crystal */ - at91_initialize(12000000); -} - -/* - * USB Host port - */ -static struct at91_usbh_data __initdata ek_usbh_data = { - .ports = 2, - .vbus_pin = {-EINVAL, -EINVAL}, - .overcurrent_pin= {-EINVAL, -EINVAL}, -}; - -/* - * USB Device port - */ -static struct at91_udc_data __initdata ek_udc_data = { - .vbus_pin = AT91_PIN_PB11, - .pullup_pin = -EINVAL, /* pull-up driven by UDC */ -}; - -static void __init ek_add_device_udc(void) -{ - if (machine_is_usb_a9260() || machine_is_usb_a9g20()) - ek_udc_data.vbus_pin = AT91_PIN_PC5; - - at91_add_device_udc(&ek_udc_data); -} - -#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) -#define MMC_SPI_CARD_DETECT_INT AT91_PIN_PC4 -static int at91_mmc_spi_init(struct device *dev, - irqreturn_t (*detect_int)(int, void *), void *data) -{ - /* Configure Interrupt pin as input, no pull-up */ - at91_set_gpio_input(MMC_SPI_CARD_DETECT_INT, 0); - return request_irq(gpio_to_irq(MMC_SPI_CARD_DETECT_INT), detect_int, - IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, - "mmc-spi-detect", data); -} - -static void at91_mmc_spi_exit(struct device *dev, void *data) -{ - free_irq(gpio_to_irq(MMC_SPI_CARD_DETECT_INT), data); -} - -static struct mmc_spi_platform_data at91_mmc_spi_pdata = { - .init = at91_mmc_spi_init, - .exit = at91_mmc_spi_exit, - .detect_delay = 100, /* msecs */ -}; -#endif - -/* - * SPI devices. - */ -static struct spi_board_info usb_a9263_spi_devices[] = { - { /* DataFlash chip */ - .modalias = "mtd_dataflash", - .chip_select = 0, - .max_speed_hz = 15 * 1000 * 1000, - .bus_num = 0, - } -}; - -static struct spi_board_info usb_a9g20_spi_devices[] = { -#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) - { - .modalias = "mmc_spi", - .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */ - .bus_num = 1, - .chip_select = 0, - .platform_data = &at91_mmc_spi_pdata, - .mode = SPI_MODE_3, - }, -#endif -}; - -static void __init ek_add_device_spi(void) -{ - if (machine_is_usb_a9263()) - at91_add_device_spi(usb_a9263_spi_devices, ARRAY_SIZE(usb_a9263_spi_devices)); - else if (machine_is_usb_a9g20()) - at91_add_device_spi(usb_a9g20_spi_devices, ARRAY_SIZE(usb_a9g20_spi_devices)); -} - -/* - * MACB Ethernet device - */ -static struct macb_platform_data __initdata ek_macb_data = { - .phy_irq_pin = AT91_PIN_PE31, - .is_rmii = 1, -}; - -static void __init ek_add_device_eth(void) -{ - if (machine_is_usb_a9260() || machine_is_usb_a9g20()) - ek_macb_data.phy_irq_pin = AT91_PIN_PA31; - - at91_add_device_eth(&ek_macb_data); -} - -/* - * NAND flash - */ -static struct mtd_partition __initdata ek_nand_partition[] = { - { - .name = "barebox", - .offset = 0, - .size = 3 * SZ_128K, - }, { - .name = "bareboxenv", - .offset = MTDPART_OFS_NXTBLK, - .size = SZ_128K, - }, { - .name = "bareboxenv2", - .offset = MTDPART_OFS_NXTBLK, - .size = SZ_128K, - }, { - .name = "oftree", - .offset = MTDPART_OFS_NXTBLK, - .size = SZ_128K, - }, { - .name = "kernel", - .offset = MTDPART_OFS_NXTBLK, - .size = 4 * SZ_1M, - }, { - .name = "rootfs", - .offset = MTDPART_OFS_NXTBLK, - .size = 120 * SZ_1M, - }, { - .name = "data", - .offset = MTDPART_OFS_NXTBLK, - .size = MTDPART_SIZ_FULL, - } -}; - -static struct atmel_nand_data __initdata ek_nand_data = { - .ale = 21, - .cle = 22, - .det_pin = -EINVAL, - .rdy_pin = AT91_PIN_PA22, - .enable_pin = AT91_PIN_PD15, - .ecc_mode = NAND_ECC_SOFT, - .on_flash_bbt = 1, - .parts = ek_nand_partition, - .num_parts = ARRAY_SIZE(ek_nand_partition), -}; - -static struct sam9_smc_config __initdata usb_a9260_nand_smc_config = { - .ncs_read_setup = 0, - .nrd_setup = 1, - .ncs_write_setup = 0, - .nwe_setup = 1, - - .ncs_read_pulse = 3, - .nrd_pulse = 3, - .ncs_write_pulse = 3, - .nwe_pulse = 3, - - .read_cycle = 5, - .write_cycle = 5, - - .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8, - .tdf_cycles = 2, -}; - -static struct sam9_smc_config __initdata usb_a9g20_nand_smc_config = { - .ncs_read_setup = 0, - .nrd_setup = 2, - .ncs_write_setup = 0, - .nwe_setup = 2, - - .ncs_read_pulse = 4, - .nrd_pulse = 4, - .ncs_write_pulse = 4, - .nwe_pulse = 4, - - .read_cycle = 7, - .write_cycle = 7, - - .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8, - .tdf_cycles = 3, -}; - -static void __init ek_add_device_nand(void) -{ - if (machine_is_usb_a9260() || machine_is_usb_a9g20()) { - ek_nand_data.rdy_pin = AT91_PIN_PC13; - ek_nand_data.enable_pin = AT91_PIN_PC14; - } - - /* configure chip-select 3 (NAND) */ - if (machine_is_usb_a9g20()) - sam9_smc_configure(0, 3, &usb_a9g20_nand_smc_config); - else - sam9_smc_configure(0, 3, &usb_a9260_nand_smc_config); - - at91_add_device_nand(&ek_nand_data); -} - - -/* - * GPIO Buttons - */ -#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) -static struct gpio_keys_button ek_buttons[] = { - { /* USER PUSH BUTTON */ - .code = KEY_ENTER, - .gpio = AT91_PIN_PB10, - .active_low = 1, - .desc = "user_pb", - .wakeup = 1, - } -}; - -static struct gpio_keys_platform_data ek_button_data = { - .buttons = ek_buttons, - .nbuttons = ARRAY_SIZE(ek_buttons), -}; - -static struct platform_device ek_button_device = { - .name = "gpio-keys", - .id = -1, - .num_resources = 0, - .dev = { - .platform_data = &ek_button_data, - } -}; - -static void __init ek_add_device_buttons(void) -{ - at91_set_GPIO_periph(AT91_PIN_PB10, 1); /* user push button, pull up enabled */ - at91_set_deglitch(AT91_PIN_PB10, 1); - - platform_device_register(&ek_button_device); -} -#else -static void __init ek_add_device_buttons(void) {} -#endif - -/* - * LEDs - */ -static struct gpio_led ek_leds[] = { - { /* user_led (green) */ - .name = "user_led", - .gpio = AT91_PIN_PB21, - .active_low = 1, - .default_trigger = "heartbeat", - } -}; - -static struct i2c_board_info __initdata ek_i2c_devices[] = { - { - I2C_BOARD_INFO("rv3029c2", 0x56), - }, -}; - -static void __init ek_add_device_leds(void) -{ - if (machine_is_usb_a9260() || machine_is_usb_a9g20()) - ek_leds[0].active_low = 0; - - at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds)); -} - -static void __init ek_board_init(void) -{ - /* Serial */ - /* DBGU on ttyS0. (Rx & Tx only) */ - at91_register_uart(0, 0, 0); - at91_add_device_serial(); - /* USB Host */ - at91_add_device_usbh(&ek_usbh_data); - /* USB Device */ - ek_add_device_udc(); - /* SPI */ - ek_add_device_spi(); - /* Ethernet */ - ek_add_device_eth(); - /* NAND */ - ek_add_device_nand(); - /* Push Buttons */ - ek_add_device_buttons(); - /* LEDs */ - ek_add_device_leds(); - - if (machine_is_usb_a9g20()) { - /* I2C */ - at91_add_device_i2c(ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices)); - } else { - /* I2C */ - at91_add_device_i2c(NULL, 0); - /* shutdown controller, wakeup button (5 msec low) */ - at91_shdwc_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10) - | AT91_SHDW_WKMODE0_LOW - | AT91_SHDW_RTTWKEN); - } -} - -MACHINE_START(USB_A9263, "CALAO USB_A9263") - /* Maintainer: calao-systems */ - .init_time = at91sam926x_pit_init, - .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, - .init_early = ek_init_early, - .init_irq = at91_init_irq_default, - .init_machine = ek_board_init, -MACHINE_END - -MACHINE_START(USB_A9260, "CALAO USB_A9260") - /* Maintainer: calao-systems */ - .init_time = at91sam926x_pit_init, - .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, - .init_early = ek_init_early, - .init_irq = at91_init_irq_default, - .init_machine = ek_board_init, -MACHINE_END - -MACHINE_START(USB_A9G20, "CALAO USB_A92G0") - /* Maintainer: Jean-Christophe PLAGNIOL-VILLARD */ - .init_time = at91sam926x_pit_init, - .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, - .init_early = ek_init_early, - .init_irq = at91_init_irq_default, - .init_machine = ek_board_init, -MACHINE_END -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 0/5] ARM: at91: Calao USB-A926x switch completyl to dt and drop board file 2013-05-26 15:30 [PATCH 0/5] ARM: at91: Calao USB-A926x switch completyl to dt and drop board file Jean-Christophe PLAGNIOL-VILLARD 2013-05-26 15:33 ` [PATCH 1/5] ARM: at91: dt: usb-a9260: update shutdown controller Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-31 20:56 ` Nicolas Ferre 1 sibling, 0 replies; 7+ messages in thread From: Nicolas Ferre @ 2013-05-31 20:56 UTC (permalink / raw) To: linux-arm-kernel On 26/05/2013 17:30, Jean-Christophe PLAGNIOL-VILLARD : > Hi, > > The Follwing patch serie finish to swtich the Calao USB-A926x to DT > and drop the board file. > > This is the first boards to be drop on at91 > > The following changes since commit 24577c1b3ebf3eab6465bb112a6265e87400163e: > > ARM: at91: dt: sam9260: add i2c gpio pinctrl (2013-05-26 16:56:39 +0800) > > are available in the git repository at: > > git://github.com/at91linux/linux-at91.git j/for-3.11-calao-dt Whole series added to the at91-3.11-dt branch. Thanks for this move forward! Bye, > for you to fetch changes up to c3ea1d2cc2f543ee0646a75890e1a7be5dd82c0b: > > ARM: at91: drop non DT: Calao USB-A96x (2013-05-26 23:32:23 +0800) > > ---------------------------------------------------------------- > Jean-Christophe PLAGNIOL-VILLARD (5): > ARM: at91: dt: usb-a9260: update shutdown controller > ARM: at91: dt: usb-a9263: update shutdown controller > ARM: at91: dt: usb-a9263: add dataflash support > ARM: at91: dt: add Calao USB-A9G20 low power version > ARM: at91: drop non DT: Calao USB-A96x > > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/usb_a9260.dts | 9 ++++++ > arch/arm/boot/dts/usb_a9263.dts | 14 +++++++++ > arch/arm/boot/dts/usb_a9g20.dts | 18 +---------- > arch/arm/boot/dts/usb_a9g20_common.dtsi | 27 ++++++++++++++++ > arch/arm/boot/dts/usb_a9g20_lpw.dts | 31 ++++++++++++++++++ > arch/arm/configs/at91_dt_defconfig | 2 ++ > arch/arm/configs/at91sam9260_9g20_defconfig | 1 - > arch/arm/configs/at91sam9263_defconfig | 1 - > arch/arm/mach-at91/Kconfig.non_dt | 19 ----------- > arch/arm/mach-at91/Makefile | 3 -- > arch/arm/mach-at91/board-usb-a926x.c | 384 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ > 12 files changed, 85 insertions(+), 425 deletions(-) > create mode 100644 arch/arm/boot/dts/usb_a9g20_common.dtsi > create mode 100644 arch/arm/boot/dts/usb_a9g20_lpw.dts > delete mode 100644 arch/arm/mach-at91/board-usb-a926x.c > > Best Regards, > J. > -- Nicolas Ferre ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-05-31 20:56 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-05-26 15:30 [PATCH 0/5] ARM: at91: Calao USB-A926x switch completyl to dt and drop board file Jean-Christophe PLAGNIOL-VILLARD 2013-05-26 15:33 ` [PATCH 1/5] ARM: at91: dt: usb-a9260: update shutdown controller Jean-Christophe PLAGNIOL-VILLARD 2013-05-26 15:33 ` [PATCH 2/5] ARM: at91: dt: usb-a9263: " Jean-Christophe PLAGNIOL-VILLARD 2013-05-26 15:33 ` [PATCH 3/5] ARM: at91: dt: usb-a9263: add dataflash support Jean-Christophe PLAGNIOL-VILLARD 2013-05-26 15:33 ` [PATCH 4/5] ARM: at91: dt: add Calao USB-A9G20 low power version Jean-Christophe PLAGNIOL-VILLARD 2013-05-26 15:33 ` [PATCH 5/5] ARM: at91: drop non DT: Calao USB-A96x Jean-Christophe PLAGNIOL-VILLARD 2013-05-31 20:56 ` [PATCH 0/5] ARM: at91: Calao USB-A926x switch completyl to dt and drop board file Nicolas Ferre
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.