History

Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull "ARM: More device tree support updates" from Olof Johansson: "This branch contains a number of updates for device tree support on several ARM platforms, in particular: * AT91 continues the device tree conversion adding support for a number of on-chip drivers and other functionality * ux500 adds probing of some of the core SoC blocks through device tree * Initial device tree support for ST SPEAr600 platforms * kirkwood continues the conversion to device-tree probing" Manually merge arch/arm/mach-ux500/Kconfig due to MACH_U8500 rename, and drivers/usb/gadget/at91_udc.c due to header file include cleanups. Also do an "evil merge" for the MACH_U8500 config option rename that the affected RMI4 touchscreen driver in staging. It's called MACH_MOP500 now, and it was missed during previous merges. * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits) ARM: SPEAr600: Add device-tree support to SPEAr600 boards ARM: ux500: Provide local timer support for Device Tree ARM: ux500: Enable PL022 SSP Controller in Device Tree ARM: ux500: Enable PL310 Level 2 Cache Controller in Device Tree ARM: ux500: Enable PL011 AMBA UART Controller for Device Tree ARM: ux500: Enable Cortex-A9 GIC (Generic Interrupt Controller) in Device Tree ARM: ux500: db8500: list most devices in the snowball device tree ARM: ux500: split dts file for snowball into generic part ARM: ux500: combine the board init functions for DT boot ARM: ux500: Initial Device Tree support for Snowball ARM: ux500: CONFIG: Enable Device Tree support for future endeavours ARM: kirkwood: use devicetree for rtc-mv ARM: kirkwood: rtc-mv devicetree bindings ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0 ARM: kirkwood: fdt: facilitate new boards during fdt migration ARM: kirkwood: fdt: absorb kirkwood_init() ARM: kirkwood: fdt: use mrvl ticker symbol ARM: orion: wdt: use resource vice direct access ARM: Kirkwood: Remove tclk from kirkwood_asoc_platform_data. ARM: orion: spi: remove enable_clock_fix which is not used ...

Linus Torvalds committed 14 years ago

Commit 09893ee2 parents 4bb2d10 7d1206b96 files · +2536 −555Browse files

Showing the changes to include/linux/platform_data (1 of 96 files). Show all

Unified · Split

include/linux/platform_data/atmel.h+27−0
@@ -0,0 +1,27 @@
1+/*
2+ * atmel platform data
3+ *
4+ * GPL v2 Only
5+ */
6+
7+#ifndef __ATMEL_NAND_H__
8+#define __ATMEL_NAND_H__
9+
10+#include <linux/mtd/nand.h>
11+
12+ /* NAND / SmartMedia */
13+struct atmel_nand_data {
14+ int enable_pin; /* chip enable */
15+ int det_pin; /* card detect */
16+ int rdy_pin; /* ready/busy */
17+ u8 rdy_pin_active_low; /* rdy_pin value is inverted */
18+ u8 ale; /* address line number connected to ALE */
19+ u8 cle; /* address line number connected to CLE */
20+ u8 bus_width_16; /* buswidth is 16 bit */
21+ u8 ecc_mode; /* ecc mode */
22+ u8 on_flash_bbt; /* bbt on flash */
23+ struct mtd_partition *parts;
24+ unsigned int num_parts;
25+};
26+
27+#endif /* __ATMEL_NAND_H__ */