Merge branch 'at91-3.4-base+9x5' of git://github.com/at91linux/linux-at91 into next/soc

Browse source

* 'at91-3.4-base+9x5' of git://github.com/at91linux/linux-at91:
  ARM: at91/at91sam9x5: Device tree definition files
  ARM: at91/at91sam9x5: SoC basic support
  ARM: at91/at91sam9x5: Configuration and Makefile
  ARM: at91/at91sam9x5: clock management for at91sam9x5 chip family
  ARM: at91/at91sam9x5: PMC header file
  ARM: at91/at91sam9x5: overall definition
  ARM: at91: code removal of CAP9 SoC

Conflicts:
	arch/arm/mach-at91/at91cap9.c

...

This commit is contained in:

Olof Johansson 2012-02-07 15:19:08 -08:00

parent 0d167e0dd3 467f1cf504

commit e69128b947

33 changed files with 864 additions and 2621 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

14

Documentation/feature-removal-schedule.txt

View file

2

arch/arm/Kconfig

View file

2

arch/arm/Kconfig.debug

View file

37

arch/arm/boot/dts/at91sam9g25ek.dts

View file

172

arch/arm/boot/dts/at91sam9x5.dtsi

View file

14

arch/arm/boot/dts/at91sam9x5cm.dtsi

View file

108

arch/arm/configs/at91cap9_defconfig

View file

23

arch/arm/mach-at91/Kconfig

View file

5

arch/arm/mach-at91/Makefile

View file

6

arch/arm/mach-at91/Makefile.boot

View file

404

arch/arm/mach-at91/at91cap9.c

View file

1273

arch/arm/mach-at91/at91cap9_devices.c

View file

373

arch/arm/mach-at91/at91sam9x5.c

View file

396

arch/arm/mach-at91/board-cap9adk.c

View file

1

arch/arm/mach-at91/board-dt.c

View file

88

arch/arm/mach-at91/clock.c

View file

1

arch/arm/mach-at91/generic.h

View file

72

arch/arm/mach-at91/include/mach/at91_pmc.h

View file

122

arch/arm/mach-at91/include/mach/at91cap9.h

View file

137

arch/arm/mach-at91/include/mach/at91cap9_matrix.h

View file

10

arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h

View file

80

arch/arm/mach-at91/include/mach/at91sam9x5.h

View file

53

arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h

View file

21

arch/arm/mach-at91/include/mach/cpu.h

View file

6

arch/arm/mach-at91/include/mach/hardware.h

View file

5

arch/arm/mach-at91/pm.c

View file

18

arch/arm/mach-at91/pm.h

View file

12

arch/arm/mach-at91/pm_slowclock.S

View file

17

arch/arm/mach-at91/setup.c

View file

5

arch/arm/mach-at91/soc.h

View file

3

arch/avr32/mach-at32ap/include/mach/cpu.h

View file

1

drivers/mmc/host/at91_mci.c

View file

4

drivers/usb/gadget/Kconfig

View file