Skip to contentSkip to conversation

ARM: at91: Calao USB-A926x switch completyl to dt and drop board file

PATCH New Jean-Christophe PLAGNIOL-VILLARD 2 participants 7 messages May 26, 2013 – May 31, 2013

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

cover ARM: at91: Calao USB-A926x switch completyl to dt and drop board file

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.

#1 lore raw

PATCH 1/5 ARM: at91: dt: usb-a9260: update shutdown controller

enable rtt and wakeup button (5 msec low)

---
 arch/arm/boot/dts/usb_a9260.dts |    9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm/boot/dts/usb_a9260.dts +9 -0
index a604107..de0c24f 100644
@@ -20,4 +20,13 @@
 	memory {
 		reg = <0x20000000 0x4000000>;
 	};
+
+	ahb {
+		apb {
+			shdwc at fffffd10 {
+				atmel,wakeup-counter = <10>;
+				atmel,wakeup-rtt-timer;
+			};
+		};
+	};
 };
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/5 ARM: at91: dt: usb-a9263: update shutdown controller

enable rtt and wakeup button (5 msec low)

---
 arch/arm/boot/dts/usb_a9263.dts |    4 ++++
 1 file changed, 4 insertions(+)
arch/arm/boot/dts/usb_a9263.dts +4 -0
index f8ec36c..e7eb9ae 100644
@@ -47,6 +47,10 @@
 				status = "okay";
 			};
 
+			shdwc at fffffd10 {
+				atmel,wakeup-counter = <10>;
+				atmel,wakeup-rtt-timer;
+			};
 		};
 
 		nand0: nand at 40000000 {
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH 3/5 ARM: at91: dt: usb-a9263: add dataflash support

In reply to Jean-Christophe PLAGNIOL-VILLARD
---
 arch/arm/boot/dts/usb_a9263.dts |   10 ++++++++++
 1 file changed, 10 insertions(+)
arch/arm/boot/dts/usb_a9263.dts +10 -0
index e7eb9ae..290e603 100644
@@ -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;
Signature · 1 line
1.7.10.4
#4 lore raw

PATCH 4/5 ARM: at91: dt: add Calao USB-A9G20 low power version

In reply to Jean-Christophe PLAGNIOL-VILLARD

the low power version have a mmc-spi

eanble mmc-spi and RV3029C2 RTC in at91_dt_defconfig

---
 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
arch/arm/boot/dts/Makefile +1 -0
index b9f7121..f62d126 100644
@@ -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
arch/arm/boot/dts/usb_a9g20.dts +1 -17
index c979c06..ec77cf8 100644
@@ -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>;
-		};
-	};
 };
arch/arm/boot/dts/usb_a9g20_common.dtsi renamed from arch/arm/boot/dts/usb_a9g20.dts +1 -4
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
@@ -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";
 	};
arch/arm/boot/dts/usb_a9g20_lpw.dts new file +31 -0
new file mode 100644
index 0000000..f8cb1b9
@@ -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 <[email protected]>
+ *
+ * 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>;
+				};
+			};
+		};
+	};
+};
arch/arm/configs/at91_dt_defconfig +2 -0
index a8800d3..75fd842 100644
@@ -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
Signature · 1 line
1.7.10.4
#5 lore raw

PATCH 5/5 ARM: at91: drop non DT: Calao USB-A96x

In reply to Jean-Christophe PLAGNIOL-VILLARD

as now we have full DT support of those board

---
 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
arch/arm/configs/at91sam9260_9g20_defconfig +0 -1
index f50c404..69b6928 100644
@@ -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
arch/arm/configs/at91sam9263_defconfig +0 -1
index 9d72ab6..e4002636 100644
@@ -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
arch/arm/mach-at91/Kconfig.non_dt +0 -19
index 1a2abd8..6cd554a 100644
@@ -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
 
 # ----------------------------------------------------------
arch/arm/mach-at91/Makefile +0 -3
index f4a5f79..d07bcfa 100644
@@ -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
arch/arm/mach-at91/board-usb-a926x.c deleted +0 -384

384 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#6 lore raw

cover ARM: at91: Calao USB-A926x switch completyl to dt and drop board file

In reply to Jean-Christophe PLAGNIOL-VILLARD

On 26/05/2013 17:30, Jean-Christophe PLAGNIOL-VILLARD :

Quoted 7 lines

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

Quoted 7 lines

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,

Quoted 32 lines

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.

Signature · 1 line
Nicolas Ferre