Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 09:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
09893ee845
linux/arch/arm/mach-at91
History
Linus Torvalds 09893ee845 ARM: More device tree support updates 
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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPcp12AAoJEIwa5zzehBx3c2oQAKkHhJFxYFaUSfAqUNQJtyLP
 ntNyjANchckGcmoGFRRn5q17leSW+GsPopeJF0uTSOq5xojrQJJnrfKCQmgTtdzt
 KiD9qJqF3bsM5PxdjkeQljiAirPZSKvyA6gZaPKozZb+NMk3ZMd3hYYi3j3EWR/c
 8C9HzwyuXUOKOQ1tHuQHEYnLAtcdVTpUnDGsQItD2Shw5H+AcoN1T00z6kWtXYoJ
 z/sFtBVvPxqozEEWbTEg2vm0XfT2ENlOIfHoOj+G2EfcVTjh4pSoD0TXwS11vjfX
 UEniGsdCSkQn0yKVuuLTNKy7BPkWXBUTxy6duIQMSs/57lgFEb9/+f5kgAol+Sdi
 OeUW4gYkZ8uAk2zOD4p1TGDZT/YHWQ2X3Wq2EhYNsYjZgbNCTlIIocet8jZ6Zfcm
 f7DdADS8ot8xFcZxMH7CFJ28cmEjhyGMSrMcrAq7HXrkX0ppFutF0CYkY/43uQ/h
 AGmP9wKi38PB1eXK44eAF25fRvT7ty7CiCBT88i8UZ3unj6raVbsGfqhvf5PbCki
 oX8dKFjPRRE4bj+8Si7LCTR00AIFMLxuftJw45L4syk+l6Y0y+b0HMBE3E/q7bbR
 dLBu3V/HHVMnuZv6vVgvI+dkZ9R6v2ychfoyKNh/AKvgXmr90diYbT0XAkcfSPk7
 +yy69EZA59UvLTxt9BmN
 =wiKV
 -----END PGP SIGNATURE-----

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
  ...
2012-03-28 12:34:33 -07:00
..
include/mach ARM: More device tree support updates 2012-03-28 12:34:33 -07:00
at91rm9200_devices.c Merge branches 'depends/irqdomain' and 'at91/base2+cleanup' into next/dt 2012-03-02 13:22:19 +00:00
at91rm9200_time.c ARM: at91/ST: remove not needed casts 2012-02-23 09:26:31 +01:00
at91rm9200.c ARM: at91/PMC: make register base soc independent 2012-02-23 14:57:57 +01:00
at91sam9_alt_reset.S ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
at91sam9g45_devices.c ARM: at91/tc: add device tree support to atmel_tclib 2012-03-01 13:38:48 +01:00
at91sam9g45_reset.S ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
at91sam9g45.c ARM: at91: dt: enable usb ehci for sam9g45 and sam9x5 2012-03-16 00:40:59 +08:00
at91sam9rl_devices.c ARM: at91/dma: remove platform data from DMA controller 2012-02-29 18:20:38 +01:00
at91sam9rl.c ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
at91sam9x5.c ARM: at91: dt: enable usb ehci for sam9g45 and sam9x5 2012-03-16 00:40:59 +08:00
at91sam926x_time.c ARM: at91/pit: add traces in case of error 2012-03-01 13:38:48 +01:00
at91sam9260_devices.c Merge branch 'at91-3.4-cleanup2+DT' of git://github.com/at91linux/linux-at91 into next/dt 2012-03-02 13:22:28 +00:00
at91sam9260.c ARM: at91: dt: enable usb ohci for sam9g20, sam9g45 amd sam9x5 2012-03-16 00:40:55 +08:00
at91sam9261_devices.c Merge branches 'depends/irqdomain' and 'at91/base2+cleanup' into next/dt 2012-03-02 13:22:19 +00:00
at91sam9261.c ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
at91sam9263_devices.c Merge branches 'depends/irqdomain' and 'at91/base2+cleanup' into next/dt 2012-03-02 13:22:19 +00:00
at91sam9263.c ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
at91x40_time.c ARM: at91/at91x40: remove use of at91_sys_read/write 2012-02-17 17:54:05 +01:00
at91x40.c ARM: at91/at91x40: remove use of at91_sys_read/write 2012-02-17 17:54:05 +01:00
board-1arm.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-afeb-9260v1.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-cam60.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-carmeva.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-cpu9krea.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-cpuat91.c ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
board-csb337.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-csb637.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-dt.c ARM: at91/dt: add specific DT soc init 2012-03-15 23:30:05 +08:00
board-eb01.c at91: fix map_io init usage 2011-05-25 23:04:34 +08:00
board-eb9200.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-ecbat91.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-eco920.c ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
board-flexibity.c ARM: at91: Add external RTC for Flexibity board 2012-02-03 13:45:17 +01:00
board-foxg20.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-gsia18s.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-kafa.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-kb9202.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-neocore926.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-pcontrol-g20.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-picotux200.c ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
board-qil-a9260.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-rm9200dk.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-rm9200ek.c ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
board-rsi-ews.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9-l9260.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-sam9g20ek.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-sam9m10g45ek.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-sam9rlek.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-sam9260ek.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-sam9261ek.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-sam9263ek.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-snapper9260.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-stamp9g20.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-usb-a926x.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-yl-9200.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
clock.c ARM: at91: add pmc DT support 2012-03-15 23:31:14 +08:00
clock.h at91: switch to CLKDEV_LOOKUP 2011-05-25 23:04:34 +08:00
cpuidle.c ARM: at91: implement the standby function for pm/cpuidle 2012-02-03 13:42:19 +01:00
generic.h ARM: at91: add pmc DT support 2012-03-15 23:31:14 +08:00
gpio.c ARM: at91/pio: add new PIO3 features 2012-03-01 13:38:50 +01:00
irq.c ARM: at91: AIC and GPIO IRQ device tree initialization 2012-03-01 13:29:03 +01:00
Kconfig ARM: at91: always enable sam9 restart 2012-03-15 23:31:18 +08:00
leds.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
Makefile ARM: at91: add sam9_smc.o to at91sam9x5 build 2012-03-01 13:38:49 +01:00
Makefile.boot ARM: at91: properly sort dtb files in Makefile.boot 2012-02-23 14:58:00 +01:00
pm_slowclock.S ARM: at91/PMC: make register base soc independent 2012-02-23 14:57:57 +01:00
pm.c ARM: at91: add ram controller DT support 2012-03-15 23:37:56 +08:00
pm.h ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
sam9_smc.c ARM: at91: add accessor to manage SMC 2012-02-13 18:31:36 +01:00
sam9_smc.h ARM: at91: add accessor to manage SMC 2012-02-13 18:31:36 +01:00
setup.c ARM: at91: add Shutdown Controller (SHDWC) DT support 2012-03-15 23:38:02 +08:00
soc.h ARM: at91: code removal of CAP9 SoC 2012-02-03 13:33:05 +01:00