ARM: at91: DT: switch C board to DT
Subsystems (5)
cover ARM: at91: DT: switch C board to DT
Hi,
As we have now enough DT support we can start to drop C board support for some boards
Here is the first batch of boards (10) droping.
The following changes since commit 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52:
Linux 3.12 (2013-11-03 15:41:51 -0800)
are available in the git repository at:
git://github.com/at91linux/linux-at91.git j/for-3.14-dt-switch
for you to fetch changes up to 10dd7da058bcb77db271d0ed023fe5dc5be0f75d:
ARM: at91: switch Calao QIL-A9260 board to DT (2013-11-15 05:06:39 +0800)
----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (11):
ARM: at91: dt: at91rm9200ek: add emac and nor flash support
ARM: at91: switch 1arm to DT
ARM: at91: switch carmeva to DT
ARM: at91: switch kafa board to DT
ARM: at91: switch flexibity to DT
ARM: at91: switch RSI EWS board to DT
ARM: at91: switch Picotux 200 board to DT
ARM: at91: switch ecbat91 board to DT
ARM: at91: switch kb9202 board to DT
ARM: at91: switch csb637 board to DT
ARM: at91: switch Calao QIL-A9260 board to DT
arch/arm/boot/dts/Makefile | 10 +++++++ arch/arm/boot/dts/at91-1arm.dts | 70 ++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-carmeva.dts | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-csb637.dts | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-ecbat91.dts | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-flexibity.dts | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-kafa.dts | 79 +++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-kb9202.dts | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-picotux-200.dts | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-qil_a9260.dts | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-rsi-ews.dts | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91rm9200ek.dts | 34 +++++++++++++++++++++ arch/arm/configs/at91rm9200_defconfig | 7 ----- arch/arm/configs/at91sam9260_9g20_defconfig | 2 -- arch/arm/mach-at91/Kconfig.non_dt | 60 ------------------------------------- arch/arm/mach-at91/Makefile | 10 ------- arch/arm/mach-at91/board-1arm.c | 99 -------------------------------------------------------------- arch/arm/mach-at91/board-carmeva.c | 166 ------------------------------------------------------------------------------------------------------- arch/arm/mach-at91/board-csb637.c | 141 --------------------------------------------------------------------------------------- arch/arm/mach-at91/board-ecbat91.c | 190 ---------------------------------------------------------------------------------------------------------------------- arch/arm/mach-at91/board-flexibity.c | 168 -------------------------------------------------------------------------------------------------------- arch/arm/mach-at91/board-kafa.c | 112 ---------------------------------------------------------------------- arch/arm/mach-at91/board-kb9202.c | 158 -------------------------------------------------------------------------------------------------- arch/arm/mach-at91/board-picotux200.c | 128 ------------------------------------------------------------------------------- arch/arm/mach-at91/board-qil-a9260.c | 266 --------------------------------------------------------------------------------------------------------------------------------------------------------------------- arch/arm/mach-at91/board-rsi-ews.c | 231 ----------------------------------------------------------------------------------------------------------------------------------------------- 26 files changed, 1293 insertions(+), 1738 deletions(-) create mode 100644 arch/arm/boot/dts/at91-1arm.dts create mode 100644 arch/arm/boot/dts/at91-carmeva.dts create mode 100644 arch/arm/boot/dts/at91-csb637.dts create mode 100644 arch/arm/boot/dts/at91-ecbat91.dts create mode 100644 arch/arm/boot/dts/at91-flexibity.dts create mode 100644 arch/arm/boot/dts/at91-kafa.dts create mode 100644 arch/arm/boot/dts/at91-kb9202.dts create mode 100644 arch/arm/boot/dts/at91-picotux-200.dts create mode 100644 arch/arm/boot/dts/at91-qil_a9260.dts create mode 100644 arch/arm/boot/dts/at91-rsi-ews.dts delete mode 100644 arch/arm/mach-at91/board-1arm.c delete mode 100644 arch/arm/mach-at91/board-carmeva.c delete mode 100644 arch/arm/mach-at91/board-csb637.c delete mode 100644 arch/arm/mach-at91/board-ecbat91.c delete mode 100644 arch/arm/mach-at91/board-flexibity.c delete mode 100644 arch/arm/mach-at91/board-kafa.c delete mode 100644 arch/arm/mach-at91/board-kb9202.c delete mode 100644 arch/arm/mach-at91/board-picotux200.c delete mode 100644 arch/arm/mach-at91/board-qil-a9260.c delete mode 100644 arch/arm/mach-at91/board-rsi-ews.c
Best Regards,
J.
PATCH 1/11 ARM: at91: dt: at91rm9200ek: add emac and nor flash support
--- arch/arm/boot/dts/at91rm9200ek.dts | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
arch/arm/boot/dts/at91rm9200ek.dts +34 -0
@@ -63,12 +63,46 @@ reg = <0>; }; }; + + macb0: ethernet at fffbc000 { + phy-mode = "rmii"; + status = "okay"; + }; }; usb0: ohci at 00300000 { num-ports = <2>; status = "okay"; }; + + nor_flash at 10000000 { + compatible = "cfi-flash"; + reg = <0x10000000 0x800000>; + linux,mtd-name = "physmap-flash.0"; + bank-width = <2>; + #address-cells = <1>; + #size-cells = <1>; + + barebox at 0 { + label = "barebox"; + reg = <0x00000 0x40000>; + }; + + bareboxenv at 40000 { + label = "bareboxenv"; + reg = <0x40000 0x10000>; + }; + + kernel at 50000 { + label = "kernel"; + reg = <0x50000 0x300000>; + }; + + root at 350000 { + label = "root"; + reg = <0x350000 0x4B0000>; + }; + }; }; leds {
Signature · 1 line
1.8.4.rc3
PATCH 2/11 ARM: at91: switch 1arm to DT
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-1arm.dts | 70 +++++++++++++++++++++++++ arch/arm/configs/at91rm9200_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 6 --- arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-1arm.c | 99 ----------------------------------- 6 files changed, 71 insertions(+), 107 deletions(-) create mode 100644 arch/arm/boot/dts/at91-1arm.dts delete mode 100644 arch/arm/mach-at91/board-1arm.c
arch/arm/boot/dts/Makefile +1 -0
@@ -3,6 +3,7 @@ ifeq ($(CONFIG_OF),y) # Keep at91 dtb files sorted alphabetically for each SoC # rm9200 dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-1arm.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb # sam9260 dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb
arch/arm/boot/dts/at91-1arm.dts new file +70 -0
70 lines not on this page · raw message
arch/arm/configs/at91rm9200_defconfig +0 -1
@@ -17,7 +17,6 @@ CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_AT91=y CONFIG_ARCH_AT91RM9200=y -CONFIG_MACH_ONEARM=y CONFIG_MACH_AT91RM9200EK=y CONFIG_MACH_CSB337=y CONFIG_MACH_CSB637=y
arch/arm/mach-at91/Kconfig.non_dt +0 -6
@@ -56,12 +56,6 @@ if ARCH_AT91RM9200 comment "AT91RM9200 Board Type" -config MACH_ONEARM - bool "Ajeco 1ARM Single Board Computer" - help - Select this if you are using Ajeco's 1ARM Single Board Computer. - <http://www.ajeco.fi/> - config MACH_AT91RM9200EK bool "Atmel AT91RM9200-EK Evaluation Kit" select HAVE_AT91_DATAFLASH_CARD
arch/arm/mach-at91/Makefile +0 -1
@@ -33,7 +33,6 @@ obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45_devices.o obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o # AT91RM9200 board-specific support -obj-$(CONFIG_MACH_ONEARM) += board-1arm.o obj-$(CONFIG_MACH_AT91RM9200EK) += board-rm9200ek.o obj-$(CONFIG_MACH_CSB337) += board-csb337.o obj-$(CONFIG_MACH_CSB637) += board-csb637.o
arch/arm/mach-at91/board-1arm.c deleted +0 -99
99 lines not on this page · raw message
Signature · 1 line
1.8.4.rc3
PATCH 2/11 ARM: at91: switch 1arm to DT
Quoted 77 lines · Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Nicolas Ferre <[email protected]>--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-1arm.dts | 70 +++++++++++++++++++++++++ arch/arm/configs/at91rm9200_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 6 --- arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-1arm.c | 99 ----------------------------------- 6 files changed, 71 insertions(+), 107 deletions(-)create mode 100644
arch/arm/boot/dts/at91-1arm.dtsdelete mode 100644arch/arm/mach-at91/board-1arm.carch/arm/boot/dts/Makefile +1
-0@@ -3,6 +3,7 @@ ifeq ($(CONFIG_OF),y) # Keep at91 dtb files sorted alphabetically for each SoC # rm9200 dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-1arm.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb # sam9260 dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtbarch/arm/boot/dts/at91-1arm.dts new file +46
-0@@ -0,0 +1,70 @@ +/* + * at91-1arm.dts - Device Tree file for Ajeco 1ARM single board computer + * + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> + * + * Licensed under GPLv2 only + */ +/dts-v1/; +#include "at91rm9200_pqfp.dtsi" + +/ { + model = "Ajeco 1ARM single board computer"; + compatible = "ajeco,1arm", "atmel,at91rm9200-pqfp", "atmel,at91rm9200"; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + main_clock: clock at 0 { + compatible = "atmel,osc", "fixed-clock"; + clock-frequency = <18432000>; + }; + }; + + ahb { + apb { + dbgu: serial at fffff200 { + status = "okay"; + }; + + usart0: serial at fffc0000 { + pinctrl-0 = + <&pinctrl_uart0 + &pinctrl_uart0_rts + &pinctrl_uart0_cts>; + + status = "okay"; + }; + + usart1: serial at fffc4000 { + pinctrl-0 = + <&pinctrl_uart1 + &pinctrl_uart1_rts + &pinctrl_uart1_cts + &pinctrl_uart1_dtr_dsr
arch/arm/boot/dts/at91-1arm.dts line 56
Quoted 10 lines
arch/arm/boot/dts/at91-1arm.dts new file +10
-0+ &pinctrl_uart1_dcd + &pinctrl_uart1_ri>; + status = "okay"; + }; + + macb0: ethernet at fffbc000 { + phy-mode = "rmii"; + /* phy irq PC4 */ + status = "okay"; + };
Could you add a phy node in macb0 node (see
https://lkml.org/lkml/2013/8/28/183) ?
In this node you can describe phy irq and even phy id (if it is hardcoded).
The same goes for all rm9200 boards except rm9200ek (I already posted a series for this one).
Best Regards,
Boris
Quoted 161 lines
arch/arm/boot/dts/at91-1arm.dts new file +14
-0+ + usb1: gadget at fffb0000 { + atmel,vbus-gpio = <&pioC 2 0>; + atmel,pullup-gpio = <&pioC 3 0>; + status = "okay"; + }; + }; + + usb0: ohci at 00300000 { + num-ports = <1>; + status = "okay"; + }; + }; +};arch/arm/configs/at91rm9200_defconfig +0
-1@@ -17,7 +17,6 @@ CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_AT91=y CONFIG_ARCH_AT91RM9200=y -CONFIG_MACH_ONEARM=y CONFIG_MACH_AT91RM9200EK=y CONFIG_MACH_CSB337=y CONFIG_MACH_CSB637=yarch/arm/mach-at91/Kconfig.non_dt +0
-6@@ -56,12 +56,6 @@ if ARCH_AT91RM9200 comment "AT91RM9200 Board Type" -config MACH_ONEARM - bool "Ajeco 1ARM Single Board Computer" - help - Select this if you are using Ajeco's 1ARM Single Board Computer. - <http://www.ajeco.fi/> - config MACH_AT91RM9200EK bool "Atmel AT91RM9200-EK Evaluation Kit" select HAVE_AT91_DATAFLASH_CARDarch/arm/mach-at91/Makefile +0
-1@@ -33,7 +33,6 @@ obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45_devices.o obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o # AT91RM9200 board-specific support -obj-$(CONFIG_MACH_ONEARM) += board-1arm.o obj-$(CONFIG_MACH_AT91RM9200EK) += board-rm9200ek.o obj-$(CONFIG_MACH_CSB337) += board-csb337.o obj-$(CONFIG_MACH_CSB637) += board-csb637.oarch/arm/mach-at91/board-1arm.c deleted +0
-99@@ -1,99 +0,0 @@ -/* -* linux/arch/arm/mach-at91/board-1arm.c -* -* Copyright (C) 2005 SAN People -* -* 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/gpio.h> -#include <linux/init.h> -#include <linux/mm.h> -#include <linux/module.h> -#include <linux/platform_device.h> - -#include <mach/hardware.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/cpu.h> - -#include "at91_aic.h" -#include "board.h" -#include "generic.h" - - -static void __init onearm_init_early (void ) -{ -/* Set cpu type: PQFP */ -at91rm9200_set_type (ARCH_REVISON_9200_PQFP ); - -/* Initialize processor: 18.432 MHz crystal */ -at91_initialize (18432000 ); -} - -static struct macb_platform_data __initdata onearm_eth_data = { - .phy_irq_pin =AT91_PIN_PC4 , - .is_rmii =1 , -}; - -static struct at91_usbh_data __initdata onearm_usbh_data = { - .ports =1 , - .vbus_pin = {-EINVAL , -EINVAL }, - .overcurrent_pin= {-EINVAL , -EINVAL }, -}; - -static struct at91_udc_data __initdata onearm_udc_data = { - .vbus_pin =AT91_PIN_PC2 , - .pullup_pin =AT91_PIN_PC3 , -}; - -static void __init onearm_board_init (void ) -{ -/* Serial */ -/* DBGU on ttyS0. (Rx & Tx only) */ -at91_register_uart (0 ,0 ,0 ); - -/* USART0 on ttyS1 (Rx, Tx, CTS, RTS) */ -at91_register_uart (AT91RM9200_ID_US0 ,1 ,ATMEL_UART_CTS |ATMEL_UART_RTS ); - -/* USART1 on ttyS2 (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ -at91_register_uart (AT91RM9200_ID_US1 ,2 ,ATMEL_UART_CTS |ATMEL_UART_RTS - |ATMEL_UART_DTR |ATMEL_UART_DSR |ATMEL_UART_DCD - |ATMEL_UART_RI ); -at91_add_device_serial (); -/* Ethernet */ -at91_add_device_eth (&onearm_eth_data); -/* USB Host */ -at91_add_device_usbh (&onearm_usbh_data); -/* USB Device */ -at91_add_device_udc (&onearm_udc_data); -} - -MACHINE_START (ONEARM ,"Ajeco 1ARM single board computer" ) -/* Maintainer: Lennert Buytenhek <[email protected]> */ - .init_time = at91rm9200_timer_init, - .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, - .init_early = onearm_init_early, - .init_irq = at91_init_irq_default, - .init_machine = onearm_board_init, -MACHINE_END
PATCH 2/11 ARM: at91: switch 1arm to DT
Quoted 94 lines · boris brezillon
Quoted 77 lines · Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Nicolas Ferre <[email protected]>--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-1arm.dts | 70 +++++++++++++++++++++++++ arch/arm/configs/at91rm9200_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 6 --- arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-1arm.c | 99 ----------------------------------- 6 files changed, 71 insertions(+), 107 deletions(-) create mode 100644 arch/arm/boot/dts/at91-1arm.dts delete mode 100644 arch/arm/mach-at91/board-1arm.carch/arm/boot/dts/Makefile +1
-0@@ -3,6 +3,7 @@ ifeq ($(CONFIG_OF),y) # Keep at91 dtb files sorted alphabetically for each SoC # rm9200 dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-1arm.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb # sam9260 dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtbarch/arm/boot/dts/at91-1arm.dts new file +46
-0@@ -0,0 +1,70 @@ +/* + * at91-1arm.dts - Device Tree file for Ajeco 1ARM single board computer + * + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> + * + * Licensed under GPLv2 only + */ +/dts-v1/; +#include "at91rm9200_pqfp.dtsi" + +/ { + model = "Ajeco 1ARM single board computer"; + compatible = "ajeco,1arm", "atmel,at91rm9200-pqfp", "atmel,at91rm9200"; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + main_clock: clock at 0 { + compatible = "atmel,osc", "fixed-clock"; + clock-frequency = <18432000>; + }; + }; + + ahb { + apb { + dbgu: serial at fffff200 { + status = "okay"; + }; + + usart0: serial at fffc0000 { + pinctrl-0 = + <&pinctrl_uart0 + &pinctrl_uart0_rts + &pinctrl_uart0_cts>; + + status = "okay"; + }; + + usart1: serial at fffc4000 { + pinctrl-0 = + <&pinctrl_uart1 + &pinctrl_uart1_rts + &pinctrl_uart1_cts + &pinctrl_uart1_dtr_dsrarch/arm/boot/dts/at91-1arm.dts line 56
Quoted 10 lines
arch/arm/boot/dts/at91-1arm.dts new file +10
-0+ &pinctrl_uart1_dcd + &pinctrl_uart1_ri>; + status = "okay"; + }; + + macb0: ethernet at fffbc000 { + phy-mode = "rmii"; + /* phy irq PC4 */ + status = "okay"; + };Could you add a phy node in macb0 node (see
https://lkml.org/lkml/2013/8/28/183) ?
In this node you can describe phy irq and even phy id (if it is hardcoded).
Quoted 2 lines
The same goes for all rm9200 boards except rm9200ek (I already posted a series for this one).
I did not do this as this code was never tested on those board as the driver was not supporting it so as I can not test it I do not want to do it
Best Regards,
J.
PATCH 2/11 ARM: at91: switch 1arm to DT
Quoted 94 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 93 lines · boris brezillon
Quoted 77 lines · Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Nicolas Ferre <[email protected]>--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-1arm.dts | 70 +++++++++++++++++++++++++ arch/arm/configs/at91rm9200_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 6 --- arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-1arm.c | 99 ----------------------------------- 6 files changed, 71 insertions(+), 107 deletions(-)create mode 100644
arch/arm/boot/dts/at91-1arm.dtsdelete mode 100644arch/arm/mach-at91/board-1arm.carch/arm/boot/dts/Makefile +1
-0@@ -3,6 +3,7 @@ ifeq ($(CONFIG_OF),y) # Keep at91 dtb files sorted alphabetically for each SoC # rm9200 dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-1arm.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb # sam9260 dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtbarch/arm/boot/dts/at91-1arm.dts new file +46
-0@@ -0,0 +1,70 @@ +/* + * at91-1arm.dts - Device Tree file for Ajeco 1ARM single board computer + * + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> + * + * Licensed under GPLv2 only + */ +/dts-v1/; +#include "at91rm9200_pqfp.dtsi" + +/ { + model = "Ajeco 1ARM single board computer"; + compatible = "ajeco,1arm", "atmel,at91rm9200-pqfp", "atmel,at91rm9200"; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + main_clock: clock at 0 { + compatible = "atmel,osc", "fixed-clock"; + clock-frequency = <18432000>; + }; + }; + + ahb { + apb { + dbgu: serial at fffff200 { + status = "okay"; + }; + + usart0: serial at fffc0000 { + pinctrl-0 = + <&pinctrl_uart0 + &pinctrl_uart0_rts + &pinctrl_uart0_cts>; + + status = "okay"; + }; + + usart1: serial at fffc4000 { + pinctrl-0 = + <&pinctrl_uart1 + &pinctrl_uart1_rts + &pinctrl_uart1_cts + &pinctrl_uart1_dtr_dsrarch/arm/boot/dts/at91-1arm.dts line 56
Quoted 10 lines
arch/arm/boot/dts/at91-1arm.dts new file +10
-0+ &pinctrl_uart1_dcd + &pinctrl_uart1_ri>; + status = "okay"; + }; + + macb0: ethernet at fffbc000 { + phy-mode = "rmii"; + /* phy irq PC4 */ + status = "okay"; + };Could you add a phy node in macb0 node (see
https://lkml.org/lkml/2013/8/28/183) ?
In this node you can describe phy irq and even phy id (if it is hardcoded).
Quoted 4 lines
Quoted 2 lines
The same goes for all rm9200 boards except rm9200ek (I already posted a series for this one).
I did not do this as this code was never tested on those board as the driver was not supporting it so as I can not test it I do not want to do it
How could this be a valid argument ?
I'm not telling that this should be mainlined without any tests, but IMHO dropping
new features because we don't have time to test it is not a good approach.
Moreover, the non-dt versions of these boards provide phy irq functionality and I think
we should at least provide the same level of functionality when migrating to dt.
I implemented the phy dt definition support for macb (and implicitely for at91_ether) ethernet drivers, and I think this should be used for all new dt boards.
Anyway, this is not my decision, and let at91 maintainers (including you) decide wether
this should be dropped for this version.
Best Regards,
Boris
Quoted 3 lines
Best Regards,
J.
PATCH 2/11 ARM: at91: switch 1arm to DT
Quoted 97 lines · boris brezillon
Quoted 96 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 95 lines · boris brezillon
Quoted 77 lines · Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Nicolas Ferre <[email protected]>--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-1arm.dts | 70 +++++++++++++++++++++++++ arch/arm/configs/at91rm9200_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 6 --- arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-1arm.c | 99 ----------------------------------- 6 files changed, 71 insertions(+), 107 deletions(-) create mode 100644 arch/arm/boot/dts/at91-1arm.dts delete mode 100644 arch/arm/mach-at91/board-1arm.carch/arm/boot/dts/Makefile +1
-0@@ -3,6 +3,7 @@ ifeq ($(CONFIG_OF),y) # Keep at91 dtb files sorted alphabetically for each SoC # rm9200 dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-1arm.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb # sam9260 dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtbarch/arm/boot/dts/at91-1arm.dts new file +46
-0@@ -0,0 +1,70 @@ +/* + * at91-1arm.dts - Device Tree file for Ajeco 1ARM single board computer + * + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> + * + * Licensed under GPLv2 only + */ +/dts-v1/; +#include "at91rm9200_pqfp.dtsi" + +/ { + model = "Ajeco 1ARM single board computer"; + compatible = "ajeco,1arm", "atmel,at91rm9200-pqfp", "atmel,at91rm9200"; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + main_clock: clock at 0 { + compatible = "atmel,osc", "fixed-clock"; + clock-frequency = <18432000>; + }; + }; + + ahb { + apb { + dbgu: serial at fffff200 { + status = "okay"; + }; + + usart0: serial at fffc0000 { + pinctrl-0 = + <&pinctrl_uart0 + &pinctrl_uart0_rts + &pinctrl_uart0_cts>; + + status = "okay"; + }; + + usart1: serial at fffc4000 { + pinctrl-0 = + <&pinctrl_uart1 + &pinctrl_uart1_rts + &pinctrl_uart1_cts + &pinctrl_uart1_dtr_dsrarch/arm/boot/dts/at91-1arm.dts line 56
Quoted 10 lines
arch/arm/boot/dts/at91-1arm.dts new file +10
-0+ &pinctrl_uart1_dcd + &pinctrl_uart1_ri>; + status = "okay"; + }; + + macb0: ethernet at fffbc000 { + phy-mode = "rmii"; + /* phy irq PC4 */ + status = "okay"; + };Could you add a phy node in macb0 node (see
https://lkml.org/lkml/2013/8/28/183) ?
In this node you can describe phy irq and even phy id (if it is hardcoded).The same goes for all rm9200 boards except rm9200ek (I already posted a series for this one).
Quoted 7 lines
Quoted 2 lines
I did not do this as this code was never tested on those board as the driver was not supporting it so as I can not test it I do not want to do it
How could this be a valid argument ?
I'm not telling that this should be mainlined without any tests, but IMHO dropping
new features because we don't have time to test it is not a good approach.
execpt here the board code was never tested as when the board was merged the cadence driver did NOT support phy IRQ so I can garanti it will work
so I do not prodive the DT support if the board maintainer care about its board it will fix it
Quoted 9 lines
Moreover, the non-dt versions of these boards provide phy irq functionality and I think
we should at least provide the same level of functionality when migrating to dt.I implemented the phy dt definition support for macb (and implicitely for
at91_ether) ethernet drivers, and I think this should be used for all new dt boards.
If you want to use it and work on the HW
here I'm note sure so I play safe
Best Regards,
J.
PATCH 2/11 ARM: at91: switch 1arm to DT
In reply to Jean-Christophe PLAGNIOL-VILLARDQuoted 81 lines · Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Nicolas Ferre <[email protected]>--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-1arm.dts | 70 +++++++++++++++++++++++++ arch/arm/configs/at91rm9200_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 6 --- arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-1arm.c | 99 ----------------------------------- 6 files changed, 71 insertions(+), 107 deletions(-)create mode 100644
arch/arm/boot/dts/at91-1arm.dtsdelete mode 100644arch/arm/mach-at91/board-1arm.carch/arm/boot/dts/Makefile +1
-0@@ -3,6 +3,7 @@ ifeq ($(CONFIG_OF),y) # Keep at91 dtb files sorted alphabetically for each SoC # rm9200 dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-1arm.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb # sam9260 dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtbarch/arm/boot/dts/at91-1arm.dts new file +50
-0@@ -0,0 +1,70 @@ +/* + * at91-1arm.dts - Device Tree file for Ajeco 1ARM single board computer + * + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> + * + * Licensed under GPLv2 only + */ +/dts-v1/; +#include "at91rm9200_pqfp.dtsi" + +/ { + model = "Ajeco 1ARM single board computer"; + compatible = "ajeco,1arm", "atmel,at91rm9200-pqfp", "atmel,at91rm9200"; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + main_clock: clock at 0 { + compatible = "atmel,osc", "fixed-clock"; + clock-frequency = <18432000>; + }; + }; + + ahb { + apb { + dbgu: serial at fffff200 { + status = "okay"; + }; + + usart0: serial at fffc0000 { + pinctrl-0 = + <&pinctrl_uart0 + &pinctrl_uart0_rts + &pinctrl_uart0_cts>; + + status = "okay"; + }; + + usart1: serial at fffc4000 { + pinctrl-0 = + <&pinctrl_uart1 + &pinctrl_uart1_rts + &pinctrl_uart1_cts + &pinctrl_uart1_dtr_dsr + &pinctrl_uart1_dcd + &pinctrl_uart1_ri>; + status = "okay"; + };
arch/arm/boot/dts/at91-1arm.dts line 60
Quoted 10 lines
arch/arm/boot/dts/at91-1arm.dts new file +10
-0+ + macb0: ethernet at fffbc000 { + phy-mode = "rmii"; + /* phy irq PC4 */ + status = "okay"; + }; + + usb1: gadget at fffb0000 { + atmel,vbus-gpio = <&pioC 2 0>; + atmel,pullup-gpio = <&pioC 3 0>;
Shouldn't you use GPIO_ACTIVE_HIGH macro instead of the plain 0 value (as done in other dts files) ?
Quoted 157 lines
arch/arm/boot/dts/at91-1arm.dts new file +10
-0+ status = "okay"; + }; + }; + + usb0: ohci at 00300000 { + num-ports = <1>; + status = "okay"; + }; + }; +};arch/arm/configs/at91rm9200_defconfig +0
-1@@ -17,7 +17,6 @@ CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_AT91=y CONFIG_ARCH_AT91RM9200=y -CONFIG_MACH_ONEARM=y CONFIG_MACH_AT91RM9200EK=y CONFIG_MACH_CSB337=y CONFIG_MACH_CSB637=yarch/arm/mach-at91/Kconfig.non_dt +0
-6@@ -56,12 +56,6 @@ if ARCH_AT91RM9200 comment "AT91RM9200 Board Type" -config MACH_ONEARM - bool "Ajeco 1ARM Single Board Computer" - help - Select this if you are using Ajeco's 1ARM Single Board Computer. - <http://www.ajeco.fi/> - config MACH_AT91RM9200EK bool "Atmel AT91RM9200-EK Evaluation Kit" select HAVE_AT91_DATAFLASH_CARDarch/arm/mach-at91/Makefile +0
-1@@ -33,7 +33,6 @@ obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45_devices.o obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o # AT91RM9200 board-specific support -obj-$(CONFIG_MACH_ONEARM) += board-1arm.o obj-$(CONFIG_MACH_AT91RM9200EK) += board-rm9200ek.o obj-$(CONFIG_MACH_CSB337) += board-csb337.o obj-$(CONFIG_MACH_CSB637) += board-csb637.oarch/arm/mach-at91/board-1arm.c deleted +0
-99@@ -1,99 +0,0 @@ -/* -* linux/arch/arm/mach-at91/board-1arm.c -* -* Copyright (C) 2005 SAN People -* -* 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/gpio.h> -#include <linux/init.h> -#include <linux/mm.h> -#include <linux/module.h> -#include <linux/platform_device.h> - -#include <mach/hardware.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/cpu.h> - -#include "at91_aic.h" -#include "board.h" -#include "generic.h" - - -static void __init onearm_init_early (void ) -{ -/* Set cpu type: PQFP */ -at91rm9200_set_type (ARCH_REVISON_9200_PQFP ); - -/* Initialize processor: 18.432 MHz crystal */ -at91_initialize (18432000 ); -} - -static struct macb_platform_data __initdata onearm_eth_data = { - .phy_irq_pin =AT91_PIN_PC4 , - .is_rmii =1 , -}; - -static struct at91_usbh_data __initdata onearm_usbh_data = { - .ports =1 , - .vbus_pin = {-EINVAL , -EINVAL }, - .overcurrent_pin= {-EINVAL , -EINVAL }, -}; - -static struct at91_udc_data __initdata onearm_udc_data = { - .vbus_pin =AT91_PIN_PC2 , - .pullup_pin =AT91_PIN_PC3 , -}; - -static void __init onearm_board_init (void ) -{ -/* Serial */ -/* DBGU on ttyS0. (Rx & Tx only) */ -at91_register_uart (0 ,0 ,0 ); - -/* USART0 on ttyS1 (Rx, Tx, CTS, RTS) */ -at91_register_uart (AT91RM9200_ID_US0 ,1 ,ATMEL_UART_CTS |ATMEL_UART_RTS ); - -/* USART1 on ttyS2 (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ -at91_register_uart (AT91RM9200_ID_US1 ,2 ,ATMEL_UART_CTS |ATMEL_UART_RTS - |ATMEL_UART_DTR |ATMEL_UART_DSR |ATMEL_UART_DCD - |ATMEL_UART_RI ); -at91_add_device_serial (); -/* Ethernet */ -at91_add_device_eth (&onearm_eth_data); -/* USB Host */ -at91_add_device_usbh (&onearm_usbh_data); -/* USB Device */ -at91_add_device_udc (&onearm_udc_data); -} - -MACHINE_START (ONEARM ,"Ajeco 1ARM single board computer" ) -/* Maintainer: Lennert Buytenhek <[email protected]> */ - .init_time = at91rm9200_timer_init, - .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, - .init_early = onearm_init_early, - .init_irq = at91_init_irq_default, - .init_machine = onearm_board_init, -MACHINE_END
PATCH 3/11 ARM: at91: switch carmeva to DT
In reply to Jean-Christophe PLAGNIOL-VILLARD--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-carmeva.dts | 150 ++++++++++++++++++++++++++++++ arch/arm/configs/at91rm9200_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 6 -- arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-carmeva.c | 166 ---------------------------------- 6 files changed, 151 insertions(+), 174 deletions(-) create mode 100644 arch/arm/boot/dts/at91-carmeva.dts delete mode 100644 arch/arm/mach-at91/board-carmeva.c
arch/arm/boot/dts/Makefile +1 -0
@@ -4,6 +4,7 @@ ifeq ($(CONFIG_OF),y) # rm9200 dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb dtb-$(CONFIG_ARCH_AT91) += at91-1arm.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-carmeva.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb # sam9260 dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb
arch/arm/boot/dts/at91-carmeva.dts new file +150 -0
150 lines not on this page · raw message
arch/arm/configs/at91rm9200_defconfig +0 -1
@@ -20,7 +20,6 @@ CONFIG_ARCH_AT91RM9200=y CONFIG_MACH_AT91RM9200EK=y CONFIG_MACH_CSB337=y CONFIG_MACH_CSB637=y -CONFIG_MACH_CARMEVA=y CONFIG_MACH_ATEB9200=y CONFIG_MACH_KB9200=y CONFIG_MACH_PICOTUX2XX=y
arch/arm/mach-at91/Kconfig.non_dt +0 -6
@@ -75,12 +75,6 @@ config MACH_CSB637 Select this if you are using Cogent's CSB637 board. <http://www.cogcomp.com/csb_csb637.htm> -config MACH_CARMEVA - bool "Conitec ARM&EVA" - help - Select this if you are using Conitec's AT91RM9200-MCU-Module. - <http://www.conitec.net/english/linuxboard.php> - config MACH_ATEB9200 bool "Embest ATEB9200" help
arch/arm/mach-at91/Makefile +0 -1
@@ -36,7 +36,6 @@ obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o obj-$(CONFIG_MACH_AT91RM9200EK) += board-rm9200ek.o obj-$(CONFIG_MACH_CSB337) += board-csb337.o obj-$(CONFIG_MACH_CSB637) += board-csb637.o -obj-$(CONFIG_MACH_CARMEVA) += board-carmeva.o obj-$(CONFIG_MACH_KB9200) += board-kb9202.o obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o obj-$(CONFIG_MACH_KAFA) += board-kafa.o
arch/arm/mach-at91/board-carmeva.c deleted +0 -166
166 lines not on this page · raw message
Signature · 1 line
1.8.4.rc3
PATCH 4/11 ARM: at91: switch kafa board to DT
In reply to Jean-Christophe PLAGNIOL-VILLARD--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-kafa.dts | 79 ++++++++++++++++++++++++ arch/arm/configs/at91rm9200_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 5 -- arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-kafa.c | 112 ---------------------------------- 6 files changed, 80 insertions(+), 119 deletions(-) create mode 100644 arch/arm/boot/dts/at91-kafa.dts delete mode 100644 arch/arm/mach-at91/board-kafa.c
arch/arm/boot/dts/Makefile +1 -0
@@ -5,6 +5,7 @@ ifeq ($(CONFIG_OF),y) dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb dtb-$(CONFIG_ARCH_AT91) += at91-1arm.dtb dtb-$(CONFIG_ARCH_AT91) += at91-carmeva.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-kafa.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb # sam9260 dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb
arch/arm/boot/dts/at91-kafa.dts new file +79 -0
79 lines not on this page · raw message
arch/arm/configs/at91rm9200_defconfig +0 -1
@@ -23,7 +23,6 @@ CONFIG_MACH_CSB637=y CONFIG_MACH_ATEB9200=y CONFIG_MACH_KB9200=y CONFIG_MACH_PICOTUX2XX=y -CONFIG_MACH_KAFA=y CONFIG_MACH_ECBAT91=y CONFIG_MACH_YL9200=y CONFIG_MACH_CPUAT91=y
arch/arm/mach-at91/Kconfig.non_dt +0 -5
@@ -93,11 +93,6 @@ config MACH_PICOTUX2XX Select this if you are using a picotux 200. <http://www.picotux.com/> -config MACH_KAFA - bool "Sperry-Sun KAFA board" - help - Select this if you are using Sperry-Sun's KAFA board. - config MACH_ECBAT91 bool "emQbit ECB_AT91 SBC" select HAVE_AT91_DATAFLASH_CARD
arch/arm/mach-at91/Makefile +0 -1
@@ -38,7 +38,6 @@ obj-$(CONFIG_MACH_CSB337) += board-csb337.o obj-$(CONFIG_MACH_CSB637) += board-csb637.o obj-$(CONFIG_MACH_KB9200) += board-kb9202.o obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o -obj-$(CONFIG_MACH_KAFA) += board-kafa.o obj-$(CONFIG_MACH_PICOTUX2XX) += board-picotux200.o obj-$(CONFIG_MACH_ECBAT91) += board-ecbat91.o obj-$(CONFIG_MACH_YL9200) += board-yl-9200.o
arch/arm/mach-at91/board-kafa.c deleted +0 -112
112 lines not on this page · raw message
Signature · 1 line
1.8.4.rc3
PATCH 5/11 ARM: at91: switch flexibity to DT
In reply to Jean-Christophe PLAGNIOL-VILLARD--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-flexibity.dts | 144 ++++++++++++++++++++++++ arch/arm/configs/at91sam9260_9g20_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 6 - arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-flexibity.c | 168 ---------------------------- 6 files changed, 145 insertions(+), 176 deletions(-) create mode 100644 arch/arm/boot/dts/at91-flexibity.dts delete mode 100644 arch/arm/mach-at91/board-flexibity.c
arch/arm/boot/dts/Makefile +1 -0
@@ -5,6 +5,7 @@ ifeq ($(CONFIG_OF),y) dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb dtb-$(CONFIG_ARCH_AT91) += at91-1arm.dtb dtb-$(CONFIG_ARCH_AT91) += at91-carmeva.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-flexibity.dtb dtb-$(CONFIG_ARCH_AT91) += at91-kafa.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb # sam9260
arch/arm/boot/dts/at91-flexibity.dts new file +144 -0
144 lines not on this page · raw message
arch/arm/configs/at91sam9260_9g20_defconfig +0 -1
@@ -17,7 +17,6 @@ CONFIG_MACH_SAM9_L9260=y CONFIG_MACH_AFEB9260=y CONFIG_MACH_QIL_A9260=y CONFIG_MACH_CPU9260=y -CONFIG_MACH_FLEXIBITY=y CONFIG_MACH_AT91SAM9G20EK=y CONFIG_MACH_AT91SAM9G20EK_2MMC=y CONFIG_MACH_CPU9G20=y
arch/arm/mach-at91/Kconfig.non_dt +0 -6
@@ -171,12 +171,6 @@ config MACH_CPU9260 Select this if you are using a Eukrea Electromatique's CPU9260 Board <http://www.eukrea.com/> -config MACH_FLEXIBITY - bool "Flexibity Connect board" - help - Select this if you are using Flexibity Connect board - <http://www.flexibity.com> - comment "AT91SAM9G20 Board Type" config MACH_AT91SAM9G20EK
arch/arm/mach-at91/Makefile +0 -1
@@ -52,7 +52,6 @@ obj-$(CONFIG_MACH_SAM9_L9260) += board-sam9-l9260.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 -obj-$(CONFIG_MACH_FLEXIBITY) += board-flexibity.o # AT91SAM9261 board-specific support obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o
arch/arm/mach-at91/board-flexibity.c deleted +0 -168
168 lines not on this page · raw message
Signature · 1 line
1.8.4.rc3
PATCH 6/11 ARM: at91: switch RSI EWS board to DT
In reply to Jean-Christophe PLAGNIOL-VILLARD--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-rsi-ews.dts | 175 ++++++++++++++++++++++++++++ arch/arm/mach-at91/Kconfig.non_dt | 6 - arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-rsi-ews.c | 231 ------------------------------------- 5 files changed, 176 insertions(+), 238 deletions(-) create mode 100644 arch/arm/boot/dts/at91-rsi-ews.dts delete mode 100644 arch/arm/mach-at91/board-rsi-ews.c
arch/arm/boot/dts/Makefile +1 -0
@@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_AT91) += at91-1arm.dtb dtb-$(CONFIG_ARCH_AT91) += at91-carmeva.dtb dtb-$(CONFIG_ARCH_AT91) += at91-flexibity.dtb dtb-$(CONFIG_ARCH_AT91) += at91-kafa.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-rsi-ews.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb # sam9260 dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb
arch/arm/boot/dts/at91-rsi-ews.dts new file +175 -0
175 lines not on this page · raw message
arch/arm/mach-at91/Kconfig.non_dt +0 -6
@@ -115,12 +115,6 @@ config MACH_ECO920 bool "eco920" help Select this if you are using the eco920 board - -config MACH_RSI_EWS - bool "RSI Embedded Webserver" - depends on ARCH_AT91RM9200 - help - Select this if you are using RSIs EWS board. endif # ----------------------------------------------------------
arch/arm/mach-at91/Makefile +0 -1
@@ -43,7 +43,6 @@ obj-$(CONFIG_MACH_ECBAT91) += board-ecbat91.o obj-$(CONFIG_MACH_YL9200) += board-yl-9200.o obj-$(CONFIG_MACH_CPUAT91) += board-cpuat91.o obj-$(CONFIG_MACH_ECO920) += board-eco920.o -obj-$(CONFIG_MACH_RSI_EWS) += board-rsi-ews.o # AT91SAM9260 board-specific support obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
arch/arm/mach-at91/board-rsi-ews.c deleted +0 -231
231 lines not on this page · raw message
Signature · 1 line
1.8.4.rc3
PATCH 7/11 ARM: at91: switch Picotux 200 board to DT
In reply to Jean-Christophe PLAGNIOL-VILLARD--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-picotux-200.dts | 93 ++++++++++++++++++++++++ arch/arm/configs/at91rm9200_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 6 -- arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-picotux200.c | 128 --------------------------------- 6 files changed, 94 insertions(+), 136 deletions(-) create mode 100644 arch/arm/boot/dts/at91-picotux-200.dts delete mode 100644 arch/arm/mach-at91/board-picotux200.c
arch/arm/boot/dts/Makefile +1 -0
@@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_AT91) += at91-1arm.dtb dtb-$(CONFIG_ARCH_AT91) += at91-carmeva.dtb dtb-$(CONFIG_ARCH_AT91) += at91-flexibity.dtb dtb-$(CONFIG_ARCH_AT91) += at91-kafa.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-picotux-200.dtb dtb-$(CONFIG_ARCH_AT91) += at91-rsi-ews.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb # sam9260
arch/arm/boot/dts/at91-picotux-200.dts new file +93 -0
93 lines not on this page · raw message
arch/arm/configs/at91rm9200_defconfig +0 -1
@@ -22,7 +22,6 @@ CONFIG_MACH_CSB337=y CONFIG_MACH_CSB637=y CONFIG_MACH_ATEB9200=y CONFIG_MACH_KB9200=y -CONFIG_MACH_PICOTUX2XX=y CONFIG_MACH_ECBAT91=y CONFIG_MACH_YL9200=y CONFIG_MACH_CPUAT91=y
arch/arm/mach-at91/Kconfig.non_dt +0 -6
@@ -87,12 +87,6 @@ config MACH_KB9200 Select this if you are using KwikByte's KB920x board. <http://www.kwikbyte.com/KB9202.html> -config MACH_PICOTUX2XX - bool "picotux 200" - help - Select this if you are using a picotux 200. - <http://www.picotux.com/> - config MACH_ECBAT91 bool "emQbit ECB_AT91 SBC" select HAVE_AT91_DATAFLASH_CARD
arch/arm/mach-at91/Makefile +0 -1
@@ -38,7 +38,6 @@ obj-$(CONFIG_MACH_CSB337) += board-csb337.o obj-$(CONFIG_MACH_CSB637) += board-csb637.o obj-$(CONFIG_MACH_KB9200) += board-kb9202.o obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o -obj-$(CONFIG_MACH_PICOTUX2XX) += board-picotux200.o obj-$(CONFIG_MACH_ECBAT91) += board-ecbat91.o obj-$(CONFIG_MACH_YL9200) += board-yl-9200.o obj-$(CONFIG_MACH_CPUAT91) += board-cpuat91.o
arch/arm/mach-at91/board-picotux200.c deleted +0 -128
128 lines not on this page · raw message
Signature · 1 line
1.8.4.rc3
PATCH 8/11 ARM: at91: switch ecbat91 board to DT
In reply to Jean-Christophe PLAGNIOL-VILLARD--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-ecbat91.dts | 135 ++++++++++++++++++++++++ arch/arm/configs/at91rm9200_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 7 -- arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-ecbat91.c | 190 ---------------------------------- 6 files changed, 136 insertions(+), 199 deletions(-) create mode 100644 arch/arm/boot/dts/at91-ecbat91.dts delete mode 100644 arch/arm/mach-at91/board-ecbat91.c
arch/arm/boot/dts/Makefile +1 -0
@@ -5,6 +5,7 @@ ifeq ($(CONFIG_OF),y) dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb dtb-$(CONFIG_ARCH_AT91) += at91-1arm.dtb dtb-$(CONFIG_ARCH_AT91) += at91-carmeva.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-ecbat91.dtb dtb-$(CONFIG_ARCH_AT91) += at91-flexibity.dtb dtb-$(CONFIG_ARCH_AT91) += at91-kafa.dtb dtb-$(CONFIG_ARCH_AT91) += at91-picotux-200.dtb
arch/arm/boot/dts/at91-ecbat91.dts new file +135 -0
135 lines not on this page · raw message
arch/arm/configs/at91rm9200_defconfig +0 -1
@@ -22,7 +22,6 @@ CONFIG_MACH_CSB337=y CONFIG_MACH_CSB637=y CONFIG_MACH_ATEB9200=y CONFIG_MACH_KB9200=y -CONFIG_MACH_ECBAT91=y CONFIG_MACH_YL9200=y CONFIG_MACH_CPUAT91=y CONFIG_MACH_ECO920=y
arch/arm/mach-at91/Kconfig.non_dt +0 -7
@@ -87,13 +87,6 @@ config MACH_KB9200 Select this if you are using KwikByte's KB920x board. <http://www.kwikbyte.com/KB9202.html> -config MACH_ECBAT91 - bool "emQbit ECB_AT91 SBC" - select HAVE_AT91_DATAFLASH_CARD - help - Select this if you are using emQbit's ECB_AT91 board. - <http://wiki.emqbit.com/free-ecb-at91> - config MACH_YL9200 bool "ucDragon YL-9200" help
arch/arm/mach-at91/Makefile +0 -1
@@ -38,7 +38,6 @@ obj-$(CONFIG_MACH_CSB337) += board-csb337.o obj-$(CONFIG_MACH_CSB637) += board-csb637.o obj-$(CONFIG_MACH_KB9200) += board-kb9202.o obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o -obj-$(CONFIG_MACH_ECBAT91) += board-ecbat91.o obj-$(CONFIG_MACH_YL9200) += board-yl-9200.o obj-$(CONFIG_MACH_CPUAT91) += board-cpuat91.o obj-$(CONFIG_MACH_ECO920) += board-eco920.o
arch/arm/mach-at91/board-ecbat91.c deleted +0 -190
190 lines not on this page · raw message
Signature · 1 line
1.8.4.rc3
PATCH 9/11 ARM: at91: switch kb9202 board to DT
In reply to Jean-Christophe PLAGNIOL-VILLARD--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-kb9202.dts | 135 +++++++++++++++++++++++++++++ arch/arm/configs/at91rm9200_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 6 -- arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-kb9202.c | 158 ---------------------------------- 6 files changed, 136 insertions(+), 166 deletions(-) create mode 100644 arch/arm/boot/dts/at91-kb9202.dts delete mode 100644 arch/arm/mach-at91/board-kb9202.c
arch/arm/boot/dts/Makefile +1 -0
@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_AT91) += at91-carmeva.dtb dtb-$(CONFIG_ARCH_AT91) += at91-ecbat91.dtb dtb-$(CONFIG_ARCH_AT91) += at91-flexibity.dtb dtb-$(CONFIG_ARCH_AT91) += at91-kafa.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-kb9202.dtb dtb-$(CONFIG_ARCH_AT91) += at91-picotux-200.dtb dtb-$(CONFIG_ARCH_AT91) += at91-rsi-ews.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb
arch/arm/boot/dts/at91-kb9202.dts new file +135 -0
135 lines not on this page · raw message
arch/arm/configs/at91rm9200_defconfig +0 -1
@@ -21,7 +21,6 @@ CONFIG_MACH_AT91RM9200EK=y CONFIG_MACH_CSB337=y CONFIG_MACH_CSB637=y CONFIG_MACH_ATEB9200=y -CONFIG_MACH_KB9200=y CONFIG_MACH_YL9200=y CONFIG_MACH_CPUAT91=y CONFIG_MACH_ECO920=y
arch/arm/mach-at91/Kconfig.non_dt +0 -6
@@ -81,12 +81,6 @@ config MACH_ATEB9200 Select this if you are using Embest's ATEB9200 board. <http://www.embedinfo.com/english/product/ATEB9200.asp> -config MACH_KB9200 - bool "KwikByte KB920x" - help - Select this if you are using KwikByte's KB920x board. - <http://www.kwikbyte.com/KB9202.html> - config MACH_YL9200 bool "ucDragon YL-9200" help
arch/arm/mach-at91/Makefile +0 -1
@@ -36,7 +36,6 @@ obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o obj-$(CONFIG_MACH_AT91RM9200EK) += board-rm9200ek.o obj-$(CONFIG_MACH_CSB337) += board-csb337.o obj-$(CONFIG_MACH_CSB637) += board-csb637.o -obj-$(CONFIG_MACH_KB9200) += board-kb9202.o obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o obj-$(CONFIG_MACH_YL9200) += board-yl-9200.o obj-$(CONFIG_MACH_CPUAT91) += board-cpuat91.o
arch/arm/mach-at91/board-kb9202.c deleted +0 -158
158 lines not on this page · raw message
Signature · 1 line
1.8.4.rc3
PATCH 10/11 ARM: at91: switch csb637 board to DT
In reply to Jean-Christophe PLAGNIOL-VILLARD--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-csb637.dts | 83 ++++++++++++++++++++ arch/arm/configs/at91rm9200_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 6 -- arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-csb637.c | 141 ---------------------------------- 6 files changed, 84 insertions(+), 149 deletions(-) create mode 100644 arch/arm/boot/dts/at91-csb637.dts delete mode 100644 arch/arm/mach-at91/board-csb637.c
arch/arm/boot/dts/Makefile +1 -0
@@ -5,6 +5,7 @@ ifeq ($(CONFIG_OF),y) dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb dtb-$(CONFIG_ARCH_AT91) += at91-1arm.dtb dtb-$(CONFIG_ARCH_AT91) += at91-carmeva.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-csb637.dtb dtb-$(CONFIG_ARCH_AT91) += at91-ecbat91.dtb dtb-$(CONFIG_ARCH_AT91) += at91-flexibity.dtb dtb-$(CONFIG_ARCH_AT91) += at91-kafa.dtb
arch/arm/boot/dts/at91-csb637.dts new file +83 -0
83 lines not on this page · raw message
arch/arm/configs/at91rm9200_defconfig +0 -1
@@ -19,7 +19,6 @@ CONFIG_ARCH_AT91=y CONFIG_ARCH_AT91RM9200=y CONFIG_MACH_AT91RM9200EK=y CONFIG_MACH_CSB337=y -CONFIG_MACH_CSB637=y CONFIG_MACH_ATEB9200=y CONFIG_MACH_YL9200=y CONFIG_MACH_CPUAT91=y
arch/arm/mach-at91/Kconfig.non_dt +0 -6
@@ -69,12 +69,6 @@ config MACH_CSB337 Select this if you are using Cogent's CSB337 board. <http://www.cogcomp.com/csb_csb337.htm> -config MACH_CSB637 - bool "Cogent CSB637" - help - Select this if you are using Cogent's CSB637 board. - <http://www.cogcomp.com/csb_csb637.htm> - config MACH_ATEB9200 bool "Embest ATEB9200" help
arch/arm/mach-at91/Makefile +0 -1
@@ -35,7 +35,6 @@ obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o # AT91RM9200 board-specific support obj-$(CONFIG_MACH_AT91RM9200EK) += board-rm9200ek.o obj-$(CONFIG_MACH_CSB337) += board-csb337.o -obj-$(CONFIG_MACH_CSB637) += board-csb637.o obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o obj-$(CONFIG_MACH_YL9200) += board-yl-9200.o obj-$(CONFIG_MACH_CPUAT91) += board-cpuat91.o
arch/arm/mach-at91/board-csb637.c deleted +0 -141
141 lines not on this page · raw message
Signature · 1 line
1.8.4.rc3
PATCH 11/11 ARM: at91: switch Calao QIL-A9260 board to DT
In reply to Jean-Christophe PLAGNIOL-VILLARD--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-qil_a9260.dts | 185 +++++++++++++++++++ arch/arm/configs/at91sam9260_9g20_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 6 - arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-qil-a9260.c | 266 ---------------------------- 6 files changed, 186 insertions(+), 274 deletions(-) create mode 100644 arch/arm/boot/dts/at91-qil_a9260.dts delete mode 100644 arch/arm/mach-at91/board-qil-a9260.c
arch/arm/boot/dts/Makefile +1 -0
@@ -15,6 +15,7 @@ dtb-$(CONFIG_ARCH_AT91) += at91-rsi-ews.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb # sam9260 dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-qil_a9260.dtb dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb dtb-$(CONFIG_ARCH_AT91) += ethernut5.dtb dtb-$(CONFIG_ARCH_AT91) += evk-pro3.dtb
arch/arm/boot/dts/at91-qil_a9260.dts new file +185 -0
185 lines not on this page · raw message
arch/arm/configs/at91sam9260_9g20_defconfig +0 -1
@@ -15,7 +15,6 @@ CONFIG_MACH_AT91SAM9260EK=y CONFIG_MACH_CAM60=y CONFIG_MACH_SAM9_L9260=y CONFIG_MACH_AFEB9260=y -CONFIG_MACH_QIL_A9260=y CONFIG_MACH_CPU9260=y CONFIG_MACH_AT91SAM9G20EK=y CONFIG_MACH_AT91SAM9G20EK_2MMC=y
arch/arm/mach-at91/Kconfig.non_dt +0 -6
@@ -128,12 +128,6 @@ config MACH_AFEB9260 <svn://194.85.238.22/home/users/george/svn/arm9eb> <http://groups.google.com/group/arm9fpga-evolution-board> -config MACH_QIL_A9260 - bool "CALAO QIL-A9260 board" - help - Select this if you are using a Calao Systems QIL-A9260 Board. - <http://www.calao-systems.com> - config MACH_CPU9260 bool "Eukrea CPU9260 board" help
arch/arm/mach-at91/Makefile +0 -1
@@ -44,7 +44,6 @@ obj-$(CONFIG_MACH_ECO920) += board-eco920.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_QIL_A9260) += board-qil-a9260.o obj-$(CONFIG_MACH_AFEB9260) += board-afeb-9260v1.o obj-$(CONFIG_MACH_CPU9260) += board-cpu9krea.o
arch/arm/mach-at91/board-qil-a9260.c deleted +0 -266
266 lines not on this page · raw message
Signature · 1 line
1.8.4.rc3
PATCH 11/11 ARM: at91: switch Calao QIL-A9260 board to DT
On 15/11/2013 15:50, Jean-Christophe PLAGNIOL-VILLARD :
Quoted 2 lines
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Nicolas Ferre <[email protected]>
I corrected several errors: for other patches please check that the same errors are not applying:
- typo in file header: s/Caloa/Calao/
- DT nodes in address ascending order
- incomplete command line:
1/ no "mem" parameter, please
2/ ubi rootfs specification parameters not complete
- node addresses for MTD partitions not aligned with node name (I mean, part after the @)
I will not do the same for other patches. So if you identify such errors, please correct them...
Bye,
Quoted 528 lines
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-qil_a9260.dts | 185 +++++++++++++++++++ arch/arm/configs/at91sam9260_9g20_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 6 - arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-qil-a9260.c | 266 ---------------------------- 6 files changed, 186 insertions(+), 274 deletions(-) create mode 100644 arch/arm/boot/dts/at91-qil_a9260.dts delete mode 100644 arch/arm/mach-at91/board-qil-a9260.carch/arm/boot/dts/Makefile +1
-0@@ -15,6 +15,7 @@ dtb-$(CONFIG_ARCH_AT91) += at91-rsi-ews.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb # sam9260 dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-qil_a9260.dtb dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb dtb-$(CONFIG_ARCH_AT91) += ethernut5.dtb dtb-$(CONFIG_ARCH_AT91) += evk-pro3.dtbarch/arm/boot/dts/at91-qil_a9260.dts new file +185
-0@@ -0,0 +1,185 @@ +/* + * at91-qil_a9260.dts - Device Tree file for Caloa QIL A9260 board + * + * Copyright (C) 2011-2013 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> + * + * Licensed under GPLv2. + */ +/dts-v1/; +#include "at91sam9260.dtsi" +/ { + model = "Calao QIL A9260"; + compatible = "calao,qil-a9260", "atmel,at91sam9260", "atmel,at91sam9"; + + chosen { + bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs"; + }; + + memory { + reg = <0x20000000 0x4000000>; + }; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + main_clock: clock at 0 { + compatible = "atmel,osc", "fixed-clock"; + clock-frequency = <12000000>; + }; + }; + + ahb { + apb { + shdwc at fffffd10 { + atmel,wakeup-counter = <10>; + atmel,wakeup-rtt-timer; + }; + + dbgu: serial at fffff200 { + status = "okay"; + }; + + usart0: serial at fffb0000 { + pinctrl-0 = + <&pinctrl_usart0 + &pinctrl_usart0_rts + &pinctrl_usart0_cts + &pinctrl_usart0_dtr_dsr + &pinctrl_usart0_dcd + &pinctrl_usart0_ri>; + status = "okay"; + }; + + usart1: serial at fffb4000 { + pinctrl-0 = + <&pinctrl_usart1 + &pinctrl_usart1_rts + &pinctrl_usart1_cts>; + status = "okay"; + }; + + usart2: serial at fffb8000 { + pinctrl-0 = + <&pinctrl_usart2 + &pinctrl_usart2_rts + &pinctrl_usart2_cts>; + status = "okay"; + }; + + macb0: ethernet at fffc4000 { + phy-mode = "rmii"; + status = "okay"; + }; + + usb1: gadget at fffa4000 { + atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; + status = "okay"; + }; + + spi0: spi at fffc8000 { + status = "okay"; + cs-gpios = <&pioA 3 GPIO_ACTIVE_HIGH>; + + m41t94 at 0 { + compatible = "st,m41t94"; + reg = <0>; + spi-max-frequency = <1000000>; + }; + + }; + + mmc0: mmc at fffa8000 { + pinctrl-0 = < + &pinctrl_mmc0_clk + &pinctrl_mmc0_slot0_cmd_dat0 + &pinctrl_mmc0_slot0_dat1_3>; + status = "okay"; + slot at 0 { + reg = <0>; + bus-width = <4>; + }; + }; + }; + + nand0: nand at 40000000 { + nand-bus-width = <8>; + nand-ecc-mode = "soft"; + nand-on-flash-bbt; + status = "okay"; + + at91bootstrap at 0 { + label = "at91bootstrap"; + reg = <0x0 0x20000>; + }; + + barebox at 20000 { + label = "barebox"; + reg = <0x20000 0x40000>; + }; + + bareboxenv at 60000 { + label = "bareboxenv"; + reg = <0x60000 0x20000>; + }; + + bareboxenv2 at 80000 { + label = "bareboxenv2"; + reg = <0x80000 0x20000>; + }; + + oftree at 80000 { + label = "oftree"; + reg = <0xa0000 0x20000>; + }; + + kernel at a0000 { + label = "kernel"; + reg = <0xc0000 0x400000>; + }; + + rootfs at 4a0000 { + label = "rootfs"; + reg = <0x4c0000 0x7800000>; + }; + + data at 7ca0000 { + label = "data"; + reg = <0x7cc0000 0x8340000>; + }; + }; + + usb0: ohci at 00500000 { + num-ports = <2>; + status = "okay"; + }; + }; + + leds { + compatible = "gpio-leds"; + + user_led { + label = "user_led"; + gpios = <&pioB 21 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + }; + }; + + gpio_keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + + user_pb { + label = "user_pb"; + gpios = <&pioB 10 GPIO_ACTIVE_LOW>; + linux,code = <28>; + gpio-key,wakeup; + }; + }; + + i2c at 0 { + status = "okay"; + }; +};arch/arm/configs/at91sam9260_9g20_defconfig +0
-1@@ -15,7 +15,6 @@ CONFIG_MACH_AT91SAM9260EK=y CONFIG_MACH_CAM60=y CONFIG_MACH_SAM9_L9260=y CONFIG_MACH_AFEB9260=y -CONFIG_MACH_QIL_A9260=y CONFIG_MACH_CPU9260=y CONFIG_MACH_AT91SAM9G20EK=y CONFIG_MACH_AT91SAM9G20EK_2MMC=yarch/arm/mach-at91/Kconfig.non_dt +0
-6@@ -128,12 +128,6 @@ config MACH_AFEB9260 <svn://194.85.238.22/home/users/george/svn/arm9eb> <http://groups.google.com/group/arm9fpga-evolution-board> -config MACH_QIL_A9260 - bool "CALAO QIL-A9260 board" - help - Select this if you are using a Calao Systems QIL-A9260 Board. - <http://www.calao-systems.com> - config MACH_CPU9260 bool "Eukrea CPU9260 board" helparch/arm/mach-at91/Makefile +0
-1@@ -44,7 +44,6 @@ obj-$(CONFIG_MACH_ECO920) += board-eco920.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_QIL_A9260) += board-qil-a9260.o obj-$(CONFIG_MACH_AFEB9260) += board-afeb-9260v1.o obj-$(CONFIG_MACH_CPU9260) += board-cpu9krea.oarch/arm/mach-at91/board-qil-a9260.c deleted +0
-266@@ -1,266 +0,0 @@ -/* -* linux/arch/arm/mach-at91/board-qil-a9260.c -* -* Copyright (C) 2005 SAN People -* Copyright (C) 2006 Atmel -* Copyright (C) 2007 Calao-systems -* -* 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/gpio.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/input.h> -#include <linux/clk.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.000 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_PC5 , - .pullup_pin = -EINVAL ,/* pull-up driven by UDC */ -}; - -/* -* SPI devices. -*/ -static struct spi_board_info ek_spi_devices[] = { -#if defined(CONFIG_RTC_DRV_M41T94 ) - {/* M41T94 RTC */ - .modalias = "m41t94", - .chip_select = 0, - .max_speed_hz = 1 * 1000 * 1000, - .bus_num = 0, - } -#endif -}; - -/* -* MACB Ethernet device -*/ -static struct macb_platform_data __initdata ek_macb_data = { - .phy_irq_pin =AT91_PIN_PA31 , - .is_rmii =1 , -}; - -/* -* NAND flash -*/ -static struct mtd_partition __initdata ek_nand_partition[] = { - { - .name ="Uboot & Kernel" , - .offset =0 , - .size =SZ_16M , - }, - { - .name ="Root FS" , - .offset =MTDPART_OFS_NXTBLK , - .size =120 *SZ_1M , - }, - { - .name ="FS" , - .offset =MTDPART_OFS_NXTBLK , - .size =120 *SZ_1M , - }, -}; - -static struct atmel_nand_data __initdata ek_nand_data = { - .ale =21 , - .cle =22 , - .det_pin = -EINVAL , - .rdy_pin =AT91_PIN_PC13 , - .enable_pin =AT91_PIN_PC14 , - .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 ek_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 void __init ek_add_device_nand (void ) -{ -/* configure chip-select 3 (NAND) */ -sam9_smc_configure (0 ,3 , &ek_nand_smc_config); - -at91_add_device_nand (&ek_nand_data); -} - -/* -* MCI (SD/MMC) -*/ -static struct mci_platform_data __initdata ek_mci0_data = { - .slot[0 ] = { - .bus_width =4 , - .detect_pin = -EINVAL , - .wp_pin = -EINVAL , - }, -}; - -/* -* 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 =0 , - .default_trigger ="heartbeat" , - } -}; - -static void __init ek_board_init (void ) -{ -/* Serial */ -/* DBGU on ttyS0. (Rx & Tx only) */ -at91_register_uart (0 ,0 ,0 ); - -/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ -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) */ -at91_register_uart (AT91SAM9260_ID_US1 ,2 ,ATMEL_UART_CTS |ATMEL_UART_RTS ); - -/* USART2 on ttyS3. (Rx, Tx, CTS, RTS) */ -at91_register_uart (AT91SAM9260_ID_US2 ,3 ,ATMEL_UART_CTS |ATMEL_UART_RTS ); -at91_add_device_serial (); -/* USB Host */ -at91_add_device_usbh (&ek_usbh_data); -/* USB Device */ -at91_add_device_udc (&ek_udc_data); -/* SPI */ -at91_add_device_spi (ek_spi_devices,ARRAY_SIZE (ek_spi_devices)); -/* NAND */ -ek_add_device_nand (); -/* I2C */ -at91_add_device_i2c (NULL ,0 ); -/* Ethernet */ -at91_add_device_eth (&ek_macb_data); -/* MMC */ -at91_add_device_mci (0 , &ek_mci0_data); -/* Push Buttons */ -ek_add_device_buttons (); -/* LEDs */ -at91_gpio_leds (ek_leds,ARRAY_SIZE (ek_leds)); -/* 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 (QIL_A9260 ,"CALAO QIL_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
Signature · 1 line
Nicolas Ferre
PATCH v2 11/11 ARM: at91: switch Calao QIL-A9260 board to DT
In reply to Jean-Christophe PLAGNIOL-VILLARDFrom: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-qil_a9260.dts | 185 +++++++++++++++++++ arch/arm/configs/at91sam9260_9g20_defconfig | 1 - arch/arm/mach-at91/Kconfig.non_dt | 6 - arch/arm/mach-at91/Makefile | 1 - arch/arm/mach-at91/board-qil-a9260.c | 266 ---------------------------- 6 files changed, 186 insertions(+), 274 deletions(-) create mode 100644 arch/arm/boot/dts/at91-qil_a9260.dts delete mode 100644 arch/arm/mach-at91/board-qil-a9260.c
arch/arm/boot/dts/Makefile +1 -0
@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb # sam9260 dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb +dtb-$(CONFIG_ARCH_AT91) += at91-qil_a9260.dtb dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb dtb-$(CONFIG_ARCH_AT91) += ethernut5.dtb dtb-$(CONFIG_ARCH_AT91) += evk-pro3.dtb
arch/arm/boot/dts/at91-qil_a9260.dts new file +185 -0
185 lines not on this page · raw message
arch/arm/configs/at91sam9260_9g20_defconfig +0 -1
@@ -15,7 +15,6 @@ CONFIG_MACH_AT91SAM9260EK=y CONFIG_MACH_CAM60=y CONFIG_MACH_SAM9_L9260=y CONFIG_MACH_AFEB9260=y -CONFIG_MACH_QIL_A9260=y CONFIG_MACH_CPU9260=y CONFIG_MACH_FLEXIBITY=y CONFIG_MACH_AT91SAM9G20EK=y
arch/arm/mach-at91/Kconfig.non_dt +0 -6
@@ -182,12 +182,6 @@ config MACH_AFEB9260 <svn://194.85.238.22/home/users/george/svn/arm9eb> <http://groups.google.com/group/arm9fpga-evolution-board> -config MACH_QIL_A9260 - bool "CALAO QIL-A9260 board" - help - Select this if you are using a Calao Systems QIL-A9260 Board. - <http://www.calao-systems.com> - config MACH_CPU9260 bool "Eukrea CPU9260 board" help
arch/arm/mach-at91/Makefile +0 -1
@@ -52,7 +52,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_QIL_A9260) += board-qil-a9260.o obj-$(CONFIG_MACH_AFEB9260) += board-afeb-9260v1.o obj-$(CONFIG_MACH_CPU9260) += board-cpu9krea.o obj-$(CONFIG_MACH_FLEXIBITY) += board-flexibity.o
arch/arm/mach-at91/board-qil-a9260.c deleted +0 -266
266 lines not on this page · raw message
Signature · 1 line
1.8.2.2
PATCH 1/11 ARM: at91: dt: at91rm9200ek: add emac and nor flash support
In reply to Jean-Christophe PLAGNIOL-VILLARDHello Jean-Christophe,
Quoted 11 lines · Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Nicolas Ferre <[email protected]>--- arch/arm/boot/dts/at91rm9200ek.dts | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)arch/arm/boot/dts/at91rm9200ek.dts +0
-0
arch/arm/boot/dts/at91rm9200ek.dts line 70
Quoted 8 lines
arch/arm/boot/dts/at91rm9200ek.dts +5
-0@@ -63,12 +63,46 @@ reg = <0>; }; }; + + macb0: ethernet at fffbc000 { + phy-mode = "rmii"; + status = "okay"; + };
This one is already defined abone usb gadget node (see
https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/arch/arm/boot/dts/at91rm9200ek.dts?id=refs/tags/next-20131115).
Best Regards,
Boris
Quoted 39 lines
arch/arm/boot/dts/at91rm9200ek.dts +29
-0}; usb0: ohci at 00300000 { num-ports = <2>; status = "okay"; }; + + nor_flash at 10000000 { + compatible = "cfi-flash"; + reg = <0x10000000 0x800000>; + linux,mtd-name = "physmap-flash.0"; + bank-width = <2>; + #address-cells = <1>; + #size-cells = <1>; + + barebox at 0 { + label = "barebox"; + reg = <0x00000 0x40000>; + }; + + bareboxenv at 40000 { + label = "bareboxenv"; + reg = <0x40000 0x10000>; + }; + + kernel at 50000 { + label = "kernel"; + reg = <0x50000 0x300000>; + }; + + root at 350000 { + label = "root"; + reg = <0x350000 0x4B0000>; + }; + }; }; leds {
cover ARM: at91: DT: switch C board to DT
In reply to Jean-Christophe PLAGNIOL-VILLARDOn 15/11/2013 15:38, Jean-Christophe PLAGNIOL-VILLARD :
Quoted 19 lines
Hi,
As we have now enough DT support we can start to drop C board support for some boards
Here is the first batch of boards (10) droping.
The following changes since commit
5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52:Linux 3.12 (2013-11-03 15:41:51 -0800)are available in the git repository at:
git://github.com/at91linux/linux-at91.git j/for-3.14-dt-switchfor you to fetch changes up to
10dd7da058bcb77db271d0ed023fe5dc5be0f75d:ARM: at91: switch Calao QIL-A9260 board to DT (2013-11-15 05:06:39 +0800)
Quoted 13 lines
----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (11):
ARM: at91: dt: at91rm9200ek: add emac and nor flash support
ARM: at91: switch 1arm to DT
ARM: at91: switch carmeva to DT
ARM: at91: switch kafa board to DT
ARM: at91: switch flexibity to DT
ARM: at91: switch RSI EWS board to DT
ARM: at91: switch Picotux 200 board to DT
ARM: at91: switch ecbat91 board to DT
ARM: at91: switch kb9202 board to DT
ARM: at91: switch csb637 board to DT
ARM: at91: switch Calao QIL-A9260 board to DT
Hi,
I didn't have any feedback from any of the board maintainers. Maybe it is because they were not in copy of this email.
So I try to collect email addresses and send a heads up with this email...
Jean-Christophe, as I know that you are maintainer for Calao, I take this patch only for the moment (and the EK related patch).
Best regards,
Quoted 52 lines
arch/arm/boot/dts/Makefile | 10 +++++++ arch/arm/boot/dts/at91-1arm.dts | 70 ++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-carmeva.dts | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-csb637.dts | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-ecbat91.dts | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-flexibity.dts | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-kafa.dts | 79 +++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-kb9202.dts | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-picotux-200.dts | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-qil_a9260.dts | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-rsi-ews.dts | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91rm9200ek.dts | 34 +++++++++++++++++++++ arch/arm/configs/at91rm9200_defconfig | 7 ----- arch/arm/configs/at91sam9260_9g20_defconfig | 2 -- arch/arm/mach-at91/Kconfig.non_dt | 60 ------------------------------------- arch/arm/mach-at91/Makefile | 10 ------- arch/arm/mach-at91/board-1arm.c | 99 -------------------------------------------------------------- arch/arm/mach-at91/board-carmeva.c | 166 ------------------------------------------------------------------------------------------------------- arch/arm/mach-at91/board-csb637.c | 141 --------------------------------------------------------------------------------------- arch/arm/mach-at91/board-ecbat91.c | 190 ---------------------------------------------------------------------------------------------------------------------- arch/arm/mach-at91/board-flexibity.c | 168 -------------------------------------------------------------------------------------------------------- arch/arm/mach-at91/board-kafa.c | 112 ---------------------------------------------------------------------- arch/arm/mach-at91/board-kb9202.c | 158 -------------------------------------------------------------------------------------------------- arch/arm/mach-at91/board-picotux200.c | 128 ------------------------------------------------------------------------------- arch/arm/mach-at91/board-qil-a9260.c | 266 --------------------------------------------------------------------------------------------------------------------------------------------------------------------- arch/arm/mach-at91/board-rsi-ews.c | 231 ----------------------------------------------------------------------------------------------------------------------------------------------- 26 files changed, 1293 insertions(+), 1738 deletions(-)create mode 100644
arch/arm/boot/dts/at91-1arm.dtscreate mode 100644arch/arm/boot/dts/at91-carmeva.dtscreate mode 100644arch/arm/boot/dts/at91-csb637.dtscreate mode 100644arch/arm/boot/dts/at91-ecbat91.dtscreate mode 100644arch/arm/boot/dts/at91-flexibity.dtscreate mode 100644arch/arm/boot/dts/at91-kafa.dtscreate mode 100644arch/arm/boot/dts/at91-kb9202.dtscreate mode 100644arch/arm/boot/dts/at91-picotux-200.dtscreate mode 100644arch/arm/boot/dts/at91-qil_a9260.dtscreate mode 100644arch/arm/boot/dts/at91-rsi-ews.dtsdelete mode 100644arch/arm/mach-at91/board-1arm.cdelete mode 100644arch/arm/mach-at91/board-carmeva.cdelete mode 100644arch/arm/mach-at91/board-csb637.cdelete mode 100644arch/arm/mach-at91/board-ecbat91.cdelete mode 100644arch/arm/mach-at91/board-flexibity.cdelete mode 100644arch/arm/mach-at91/board-kafa.cdelete mode 100644arch/arm/mach-at91/board-kb9202.cdelete mode 100644arch/arm/mach-at91/board-picotux200.cdelete mode 100644arch/arm/mach-at91/board-qil-a9260.cdelete mode 100644arch/arm/mach-at91/board-rsi-ews.cBest Regards,
J.
Signature · 1 line
Nicolas Ferre