aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2013-11-15 09:50:06 -0500
committerNicolas Ferre <nicolas.ferre@atmel.com>2013-12-19 11:27:30 -0500
commite91a5555df5883bbc204b0e1f8e0489d3f7f3f2e (patch)
tree9fbd5a6cb36ef44b8eb8dd76b8951afc205be460
parent7736c715d08a53ad89d17b63b8f5124adce39f67 (diff)
ARM: at91: switch Calao QIL-A9260 board to DT
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> [nicolas.ferre@atmel.com: typo, nodes in address ascending order, shrink cmdline] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat
-rw-r--r--arch/arm/boot/dts/Makefile1
-rw-r--r--arch/arm/boot/dts/at91-qil_a9260.dts185
-rw-r--r--arch/arm/configs/at91sam9260_9g20_defconfig1
-rw-r--r--arch/arm/mach-at91/Kconfig.non_dt6
-rw-r--r--arch/arm/mach-at91/Makefile1
-rw-r--r--arch/arm/mach-at91/board-qil-a9260.c266
6 files changed, 186 insertions, 274 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d57c1a65b24f..36e0d06d3efa 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb
6dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb 6dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb
7# sam9260 7# sam9260
8dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb 8dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb
9dtb-$(CONFIG_ARCH_AT91) += at91-qil_a9260.dtb
9dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb 10dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb
10dtb-$(CONFIG_ARCH_AT91) += ethernut5.dtb 11dtb-$(CONFIG_ARCH_AT91) += ethernut5.dtb
11dtb-$(CONFIG_ARCH_AT91) += evk-pro3.dtb 12dtb-$(CONFIG_ARCH_AT91) += evk-pro3.dtb
diff --git a/arch/arm/boot/dts/at91-qil_a9260.dts b/arch/arm/boot/dts/at91-qil_a9260.dts
new file mode 100644
index 000000000000..5576ae8786c0
--- /dev/null
+++ b/arch/arm/boot/dts/at91-qil_a9260.dts
@@ -0,0 +1,185 @@
1/*
2 * at91-qil_a9260.dts - Device Tree file for Calao QIL A9260 board
3 *
4 * Copyright (C) 2011-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
5 *
6 * Licensed under GPLv2.
7 */
8/dts-v1/;
9#include "at91sam9260.dtsi"
10/ {
11 model = "Calao QIL A9260";
12 compatible = "calao,qil-a9260", "atmel,at91sam9260", "atmel,at91sam9";
13
14 chosen {
15 bootargs = "console=ttyS0,115200";
16 };
17
18 memory {
19 reg = <0x20000000 0x4000000>;
20 };
21
22 clocks {
23 #address-cells = <1>;
24 #size-cells = <1>;
25 ranges;
26
27 main_clock: clock@0 {
28 compatible = "atmel,osc", "fixed-clock";
29 clock-frequency = <12000000>;
30 };
31 };
32
33 ahb {
34 apb {
35 usb1: gadget@fffa4000 {
36 atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
37 status = "okay";
38 };
39
40 mmc0: mmc@fffa8000 {
41 pinctrl-0 = <
42 &pinctrl_mmc0_clk
43 &pinctrl_mmc0_slot0_cmd_dat0
44 &pinctrl_mmc0_slot0_dat1_3>;
45 status = "okay";
46 slot@0 {
47 reg = <0>;
48 bus-width = <4>;
49 };
50 };
51
52 usart0: serial@fffb0000 {
53 pinctrl-0 =
54 <&pinctrl_usart0
55 &pinctrl_usart0_rts
56 &pinctrl_usart0_cts
57 &pinctrl_usart0_dtr_dsr
58 &pinctrl_usart0_dcd
59 &pinctrl_usart0_ri>;
60 status = "okay";
61 };
62
63 usart1: serial@fffb4000 {
64 pinctrl-0 =
65 <&pinctrl_usart1
66 &pinctrl_usart1_rts
67 &pinctrl_usart1_cts>;
68 status = "okay";
69 };
70
71 usart2: serial@fffb8000 {
72 pinctrl-0 =
73 <&pinctrl_usart2
74 &pinctrl_usart2_rts
75 &pinctrl_usart2_cts>;
76 status = "okay";
77 };
78
79 macb0: ethernet@fffc4000 {
80 phy-mode = "rmii";
81 status = "okay";
82 };
83
84 spi0: spi@fffc8000 {
85 status = "okay";
86 cs-gpios = <&pioA 3 GPIO_ACTIVE_HIGH>;
87
88 m41t94@0 {
89 compatible = "st,m41t94";
90 reg = <0>;
91 spi-max-frequency = <1000000>;
92 };
93
94 };
95
96 dbgu: serial@fffff200 {
97 status = "okay";
98 };
99
100 shdwc@fffffd10 {
101 atmel,wakeup-counter = <10>;
102 atmel,wakeup-rtt-timer;
103 };
104 };
105
106 usb0: ohci@00500000 {
107 num-ports = <2>;
108 status = "okay";
109 };
110
111 nand0: nand@40000000 {
112 nand-bus-width = <8>;
113 nand-ecc-mode = "soft";
114 nand-on-flash-bbt;
115 status = "okay";
116
117 at91bootstrap@0 {
118 label = "at91bootstrap";
119 reg = <0x0 0x20000>;
120 };
121
122 barebox@20000 {
123 label = "barebox";
124 reg = <0x20000 0x40000>;
125 };
126
127 bareboxenv@60000 {
128 label = "bareboxenv";
129 reg = <0x60000 0x20000>;
130 };
131
132 bareboxenv2@80000 {
133 label = "bareboxenv2";
134 reg = <0x80000 0x20000>;
135 };
136
137 oftree@a0000 {
138 label = "oftree";
139 reg = <0xa0000 0x20000>;
140 };
141
142 kernel@c0000 {
143 label = "kernel";
144 reg = <0xc0000 0x400000>;
145 };
146
147 rootfs@4c0000 {
148 label = "rootfs";
149 reg = <0x4c0000 0x7800000>;
150 };
151
152 data@7cc0000 {
153 label = "data";
154 reg = <0x7cc0000 0x8340000>;
155 };
156 };
157 };
158
159 leds {
160 compatible = "gpio-leds";
161
162 user_led {
163 label = "user_led";
164 gpios = <&pioB 21 GPIO_ACTIVE_HIGH>;
165 linux,default-trigger = "heartbeat";
166 };
167 };
168
169 gpio_keys {
170 compatible = "gpio-keys";
171 #address-cells = <1>;
172 #size-cells = <0>;
173
174 user_pb {
175 label = "user_pb";
176 gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
177 linux,code = <28>;
178 gpio-key,wakeup;
179 };
180 };
181
182 i2c@0 {
183 status = "okay";
184 };
185};
diff --git a/arch/arm/configs/at91sam9260_9g20_defconfig b/arch/arm/configs/at91sam9260_9g20_defconfig
index 69b6928d3d9d..9c4afd3fa63b 100644
--- a/arch/arm/configs/at91sam9260_9g20_defconfig
+++ b/arch/arm/configs/at91sam9260_9g20_defconfig
@@ -15,7 +15,6 @@ CONFIG_MACH_AT91SAM9260EK=y
15CONFIG_MACH_CAM60=y 15CONFIG_MACH_CAM60=y
16CONFIG_MACH_SAM9_L9260=y 16CONFIG_MACH_SAM9_L9260=y
17CONFIG_MACH_AFEB9260=y 17CONFIG_MACH_AFEB9260=y
18CONFIG_MACH_QIL_A9260=y
19CONFIG_MACH_CPU9260=y 18CONFIG_MACH_CPU9260=y
20CONFIG_MACH_FLEXIBITY=y 19CONFIG_MACH_FLEXIBITY=y
21CONFIG_MACH_AT91SAM9G20EK=y 20CONFIG_MACH_AT91SAM9G20EK=y
diff --git a/arch/arm/mach-at91/Kconfig.non_dt b/arch/arm/mach-at91/Kconfig.non_dt
index b736b571e882..091caa021977 100644
--- a/arch/arm/mach-at91/Kconfig.non_dt
+++ b/arch/arm/mach-at91/Kconfig.non_dt
@@ -182,12 +182,6 @@ config MACH_AFEB9260
182 <svn://194.85.238.22/home/users/george/svn/arm9eb> 182 <svn://194.85.238.22/home/users/george/svn/arm9eb>
183 <http://groups.google.com/group/arm9fpga-evolution-board> 183 <http://groups.google.com/group/arm9fpga-evolution-board>
184 184
185config MACH_QIL_A9260
186 bool "CALAO QIL-A9260 board"
187 help
188 Select this if you are using a Calao Systems QIL-A9260 Board.
189 <http://www.calao-systems.com>
190
191config MACH_CPU9260 185config MACH_CPU9260
192 bool "Eukrea CPU9260 board" 186 bool "Eukrea CPU9260 board"
193 help 187 help
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 705b38a179ec..78e9cec282f4 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -52,7 +52,6 @@ obj-$(CONFIG_MACH_RSI_EWS) += board-rsi-ews.o
52obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o 52obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
53obj-$(CONFIG_MACH_CAM60) += board-cam60.o 53obj-$(CONFIG_MACH_CAM60) += board-cam60.o
54obj-$(CONFIG_MACH_SAM9_L9260) += board-sam9-l9260.o 54obj-$(CONFIG_MACH_SAM9_L9260) += board-sam9-l9260.o
55obj-$(CONFIG_MACH_QIL_A9260) += board-qil-a9260.o
56obj-$(CONFIG_MACH_AFEB9260) += board-afeb-9260v1.o 55obj-$(CONFIG_MACH_AFEB9260) += board-afeb-9260v1.o
57obj-$(CONFIG_MACH_CPU9260) += board-cpu9krea.o 56obj-$(CONFIG_MACH_CPU9260) += board-cpu9krea.o
58obj-$(CONFIG_MACH_FLEXIBITY) += board-flexibity.o 57obj-$(CONFIG_MACH_FLEXIBITY) += board-flexibity.o
diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c
deleted file mode 100644
index aa3bc9b0f150..000000000000
--- a/arch/arm/mach-at91/board-qil-a9260.c
+++ /dev/null
@@ -1,266 +0,0 @@
1/*
2 * linux/arch/arm/mach-at91/board-qil-a9260.c
3 *
4 * Copyright (C) 2005 SAN People
5 * Copyright (C) 2006 Atmel
6 * Copyright (C) 2007 Calao-systems
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21 */
22
23#include <linux/types.h>
24#include <linux/gpio.h>
25#include <linux/init.h>
26#include <linux/mm.h>
27#include <linux/module.h>
28#include <linux/platform_device.h>
29#include <linux/spi/spi.h>
30#include <linux/gpio_keys.h>
31#include <linux/input.h>
32#include <linux/clk.h>
33
34#include <asm/setup.h>
35#include <asm/mach-types.h>
36#include <asm/irq.h>
37
38#include <asm/mach/arch.h>
39#include <asm/mach/map.h>
40#include <asm/mach/irq.h>
41
42#include <mach/hardware.h>
43#include <mach/at91sam9_smc.h>
44
45#include "at91_aic.h"
46#include "at91_shdwc.h"
47#include "board.h"
48#include "sam9_smc.h"
49#include "generic.h"
50
51
52static void __init ek_init_early(void)
53{
54 /* Initialize processor: 12.000 MHz crystal */
55 at91_initialize(12000000);
56}
57
58/*
59 * USB Host port
60 */
61static struct at91_usbh_data __initdata ek_usbh_data = {
62 .ports = 2,
63 .vbus_pin = {-EINVAL, -EINVAL},
64 .overcurrent_pin= {-EINVAL, -EINVAL},
65};
66
67/*
68 * USB Device port
69 */
70static struct at91_udc_data __initdata ek_udc_data = {
71 .vbus_pin = AT91_PIN_PC5,
72 .pullup_pin = -EINVAL, /* pull-up driven by UDC */
73};
74
75/*
76 * SPI devices.
77 */
78static struct spi_board_info ek_spi_devices[] = {
79#if defined(CONFIG_RTC_DRV_M41T94)
80 { /* M41T94 RTC */
81 .modalias = "m41t94",
82 .chip_select = 0,
83 .max_speed_hz = 1 * 1000 * 1000,
84 .bus_num = 0,
85 }
86#endif
87};
88
89/*
90 * MACB Ethernet device
91 */
92static struct macb_platform_data __initdata ek_macb_data = {
93 .phy_irq_pin = AT91_PIN_PA31,
94 .is_rmii = 1,
95};
96
97/*
98 * NAND flash
99 */
100static struct mtd_partition __initdata ek_nand_partition[] = {
101 {
102 .name = "Uboot & Kernel",
103 .offset = 0,
104 .size = SZ_16M,
105 },
106 {
107 .name = "Root FS",
108 .offset = MTDPART_OFS_NXTBLK,
109 .size = 120 * SZ_1M,
110 },
111 {
112 .name = "FS",
113 .offset = MTDPART_OFS_NXTBLK,
114 .size = 120 * SZ_1M,
115 },
116};
117
118static struct atmel_nand_data __initdata ek_nand_data = {
119 .ale = 21,
120 .cle = 22,
121 .det_pin = -EINVAL,
122 .rdy_pin = AT91_PIN_PC13,
123 .enable_pin = AT91_PIN_PC14,
124 .ecc_mode = NAND_ECC_SOFT,
125 .on_flash_bbt = 1,
126 .parts = ek_nand_partition,
127 .num_parts = ARRAY_SIZE(ek_nand_partition),
128};
129
130static struct sam9_smc_config __initdata ek_nand_smc_config = {
131 .ncs_read_setup = 0,
132 .nrd_setup = 1,
133 .ncs_write_setup = 0,
134 .nwe_setup = 1,
135
136 .ncs_read_pulse = 3,
137 .nrd_pulse = 3,
138 .ncs_write_pulse = 3,
139 .nwe_pulse = 3,
140
141 .read_cycle = 5,
142 .write_cycle = 5,
143
144 .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8,
145 .tdf_cycles = 2,
146};
147
148static void __init ek_add_device_nand(void)
149{
150 /* configure chip-select 3 (NAND) */
151 sam9_smc_configure(0, 3, &ek_nand_smc_config);
152
153 at91_add_device_nand(&ek_nand_data);
154}
155
156/*
157 * MCI (SD/MMC)
158 */
159static struct mci_platform_data __initdata ek_mci0_data = {
160 .slot[0] = {
161 .bus_width = 4,
162 .detect_pin = -EINVAL,
163 .wp_pin = -EINVAL,
164 },
165};
166
167/*
168 * GPIO Buttons
169 */
170#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
171static struct gpio_keys_button ek_buttons[] = {
172 { /* USER PUSH BUTTON */
173 .code = KEY_ENTER,
174 .gpio = AT91_PIN_PB10,
175 .active_low = 1,
176 .desc = "user_pb",
177 .wakeup = 1,
178 }
179};
180
181static struct gpio_keys_platform_data ek_button_data = {
182 .buttons = ek_buttons,
183 .nbuttons = ARRAY_SIZE(ek_buttons),
184};
185
186static struct platform_device ek_button_device = {
187 .name = "gpio-keys",
188 .id = -1,
189 .num_resources = 0,
190 .dev = {
191 .platform_data = &ek_button_data,
192 }
193};
194
195static void __init ek_add_device_buttons(void)
196{
197 at91_set_GPIO_periph(AT91_PIN_PB10, 1); /* user push button, pull up enabled */
198 at91_set_deglitch(AT91_PIN_PB10, 1);
199
200 platform_device_register(&ek_button_device);
201}
202#else
203static void __init ek_add_device_buttons(void) {}
204#endif
205
206/*
207 * LEDs
208 */
209static struct gpio_led ek_leds[] = {
210 { /* user_led (green) */
211 .name = "user_led",
212 .gpio = AT91_PIN_PB21,
213 .active_low = 0,
214 .default_trigger = "heartbeat",
215 }
216};
217
218static void __init ek_board_init(void)
219{
220 /* Serial */
221 /* DBGU on ttyS0. (Rx & Tx only) */
222 at91_register_uart(0, 0, 0);
223
224 /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
225 at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
226 | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
227 | ATMEL_UART_RI);
228
229 /* USART1 on ttyS2. (Rx, Tx, CTS, RTS) */
230 at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
231
232 /* USART2 on ttyS3. (Rx, Tx, CTS, RTS) */
233 at91_register_uart(AT91SAM9260_ID_US2, 3, ATMEL_UART_CTS | ATMEL_UART_RTS);
234 at91_add_device_serial();
235 /* USB Host */
236 at91_add_device_usbh(&ek_usbh_data);
237 /* USB Device */
238 at91_add_device_udc(&ek_udc_data);
239 /* SPI */
240 at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
241 /* NAND */
242 ek_add_device_nand();
243 /* I2C */
244 at91_add_device_i2c(NULL, 0);
245 /* Ethernet */
246 at91_add_device_eth(&ek_macb_data);
247 /* MMC */
248 at91_add_device_mci(0, &ek_mci0_data);
249 /* Push Buttons */
250 ek_add_device_buttons();
251 /* LEDs */
252 at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
253 /* shutdown controller, wakeup button (5 msec low) */
254 at91_shdwc_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10) | AT91_SHDW_WKMODE0_LOW
255 | AT91_SHDW_RTTWKEN);
256}
257
258MACHINE_START(QIL_A9260, "CALAO QIL_A9260")
259 /* Maintainer: calao-systems */
260 .init_time = at91sam926x_pit_init,
261 .map_io = at91_map_io,
262 .handle_irq = at91_aic_handle_irq,
263 .init_early = ek_init_early,
264 .init_irq = at91_init_irq_default,
265 .init_machine = ek_board_init,
266MACHINE_END
generated by cgit v1.2.2 (git 2.25.0) at 2026-02-25 11:58:31 -0500