q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/arm/mach-at91
History
Olof Johansson ae0b82504e Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 
* 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: (234 commits)
  ARM: shmobile: remove additional __io() macro use
  ARM: mach-shmobile: default to no earlytimer
  ARM: mach-shmobile: r8a7779 and Marzen timer rework
  ARM: mach-shmobile: r8a7740 and Bonito timer rework
  ARM: mach-shmobile: sh73a0, AG5EVM and Kota2 timer rework
  ARM: mach-shmobile: sh7372, AP4EVB and Mackerel timer rework
  ARM: mach-shmobile: sh7377 and G4EVM timer rework
  ARM: mach-shmobile: sh7367 and G3EVM timer rework
  ARM: mach-shmobile: add shmobile_earlytimer_init()
  ARM: mach-shmobile: Move sh7372 AP4EVB external clk setup
  ARM: mach-shmobile: Move sh7372 Mackerel external clk setup
  ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()
  ARM: mach-shmobile: r8a7779 L2 cache support
  ARM: mach-shmobile: r8a7779 map_io and init_early update
  ARM: mach-shmobile: r8a7740 map_io and init_early update
  ARM: mach-shmobile: sh73a0 map_io and init_early update
  ARM: mach-shmobile: sh7372 map_io and init_early update
  ARM: mach-shmobile: sh7377 map_io and init_early update
  ARM: mach-shmobile: sh7367 map_io and init_early update
  sh: remove clk_ops
  ...

  (includes an update to v3.3-rc7)

Conflicts:
	arch/arm/mach-omap2/id.c
2012-03-13 17:38:09 -07:00
..
include/mach Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc 2012-02-28 12:33:46 +00:00
at91rm9200.c ARM: mach-at91: move special idle code out of line 2012-01-20 18:55:10 -05:00
at91rm9200_devices.c ARM: at91: USB AT91 gadget registration for module 2012-02-13 16:46:41 +01:00
at91rm9200_time.c ARM: at91: define CLOCK_TICK_RATE to bogus value except A91X40 2011-11-28 22:50:37 +08:00
at91sam9_alt_reset.S ARM: at91: make rstc soc independent 2012-01-20 17:22:38 +01:00
at91sam9g45.c Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base 2012-02-03 12:32:26 +01:00
at91sam9g45_devices.c ARM: at91/dma: DMA controller registering with DT support 2012-02-29 18:20:39 +01:00
at91sam9g45_reset.S ARM: at91: Fix at91sam9g45 and at91cap9 reset 2012-01-20 17:22:50 +01:00
at91sam9rl.c Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base 2012-02-03 12:32:26 +01:00
at91sam9rl_devices.c ARM: at91/dma: remove platform data from DMA controller 2012-02-29 18:20:38 +01:00
at91sam9x5.c ARM: at91/at91sam9x5: SoC basic support 2012-02-03 15:36:40 +01:00
at91sam926x_time.c ARM: at91: make pit register base soc independent 2011-11-28 22:50:38 +08:00
at91sam9260.c Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base 2012-02-03 12:32:26 +01:00
at91sam9260_devices.c ARM: at91: drop ide driver in favor of the pata one 2012-02-13 18:31:37 +01:00
at91sam9261.c Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base 2012-02-03 12:32:26 +01:00
at91sam9261_devices.c ARM: at91: USB AT91 gadget registration for module 2012-02-13 16:46:41 +01:00
at91sam9263.c Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base 2012-02-03 12:32:26 +01:00
at91sam9263_devices.c ARM: at91: drop ide driver in favor of the pata one 2012-02-13 18:31:37 +01:00
at91x40.c ARM: mach-at91: move special idle code out of line 2012-01-20 18:55:10 -05:00
at91x40_time.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +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 ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-cam60.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-carmeva.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-cpu9krea.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-cpuat91.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00: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/at91sam9x5: SoC basic support 2012-02-03 15:36:40 +01: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/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-flexibity.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00: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 ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-neocore926.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00: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/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-qil-a9260.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-rm9200dk.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-rm9200ek.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00: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 ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9g20ek.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9m10g45ek.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9rlek.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9260ek.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9261ek.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9263ek.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-snapper9260.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-stamp9g20.c arm/at91: fix build of stamp9g20 2011-12-21 13:57:43 -08:00
board-usb-a926x.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-yl-9200.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
clock.c ARM: at91/at91sam9x5: clock management for at91sam9x5 chip family 2012-02-03 15:36:39 +01:00
clock.h at91: switch to CLKDEV_LOOKUP 2011-05-25 23:04:34 +08:00
cpuidle.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 2011-11-07 10:13:52 -08:00
generic.h ARM: at91: code removal of CAP9 SoC 2012-02-03 13:33:05 +01:00
gpio.c ARM: at91/gpio: fix display of number of irq setuped 2011-11-29 15:46:19 +00:00
irq.c ARM: at91: make aic soc independent 2011-11-28 22:50:39 +08:00
Kconfig ARM: at91/at91sam9x5: Configuration and Makefile 2012-02-03 15:36:40 +01: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/at91sam9x5: Configuration and Makefile 2012-02-03 15:36:40 +01:00
Makefile.boot ARM: at91: code removal of CAP9 SoC 2012-02-03 13:33:05 +01:00
pm.c ARM: at91: code removal of CAP9 SoC 2012-02-03 13:33:05 +01:00
pm.h ARM: at91: code removal of CAP9 SoC 2012-02-03 13:33:05 +01:00
pm_slowclock.S ARM: at91: code removal of CAP9 SoC 2012-02-03 13:33:05 +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: code removal of CAP9 SoC 2012-02-03 13:33:05 +01:00
soc.h ARM: at91: code removal of CAP9 SoC 2012-02-03 13:33:05 +01:00