Preston_PLB/kernel-aes67
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
634095dab2
kernel-aes67/arch/arm/mach-omap1
History
Linus Torvalds 6c5096e553 arm-soc: board specific changes 
These updates are all for board specific code, including
 
 * defconfig updates for shmobile, davinci, bcm2835, imx, omap and tegra
 * SD/MMC and I2C support on bcm2835 (Raspberry PI)
 * minor updates for PXA
 * shmobile updates to GPIO usage in board files
 * More things in OMAP board files are moved over to device tree probing
 * Better support for audio devices on some OMAP platforms
 
 Conflicts include the omap board-apollon.c file that is removed without
 a replacement, and conflicting context in the 4430sdp board file.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAUSUyPmCrR//JCVInAQKc4xAAm3UXWLjjIecgdcWperYzUn8wVGg2sRvT
 eFFtGvj3iC+HttPw01O2uVn2O/ixW6SJIgls1O3VTt6IKXPQg3OCjeu1/1vvgq14
 IWuOVS9TLUS4IWkbIvQSdWrDTHocon1Umx+yIgyOpenHBn6kHMg1Tx6qQlUKKo8q
 ne8DKlAfSmao2oHg08Biuzc+cjUOCj7Dq57P1Y5gRhtmdXiFfvdd6GytyFAGUl/m
 60c7BECUs9ileeAUTgehsUk84uV9w/FHeWhccxKspd8GjuHg31t5lB/PEEud34FK
 CTBWoPRn/xG6qjmp34kjP2zIFVfiYYscJpSzXw+cOmPx2gNcs9mGUflAmG9I2t/C
 TPuRCgmhqjZkfHjoNPUaGSvLa4m3279lrqxVqU6BWs8NlqzXSma1rqUKCxikV4lR
 OlPasykwIGdHoJWyrm517RRkLq9Jn2XxtZmequp8TAsUBzW1Su3ZNArSQ6VqGTgs
 W8T20UGVj4bDaAUG4VICeRZGIJx5wknEr11NrRL1a0/EFhFUxNFZf5JAs1YHw/Yi
 rJP8oTppbo6eAaTThc6/a1/rklu8TUcRvmeS+iIH4IFxbroqc/ntAYd16+cKhPbO
 EJtvUv2B3WQZesV7zmDG4TzleYjgYeFxPzTeYHHOYRIgDA3al2eSlp6EIZULSmul
 gqxlMv/YHF8=
 =/qBE
 -----END PGP SIGNATURE-----

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

Pull ARM SoC board specific changes from Arnd Bergmann:
 "These updates are all for board specific code, including

   - defconfig updates for shmobile, davinci, bcm2835, imx, omap and
     tegra

   - SD/MMC and I2C support on bcm2835 (Raspberry PI)

   - minor updates for PXA

   - shmobile updates to GPIO usage in board files

   - More things in OMAP board files are moved over to device tree
     probing

   - Better support for audio devices on some OMAP platforms"

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits)
  ARM: imx_v4_v5_defconfig: Add VPU support
  ARM: imx: configs: enable netfilter support
  ARM: OMAP2+: Fix twl section warnings related to omap_twl4030_audio_init
  ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc
  RX-51: Register twl4030-madc device
  RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel
  ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
  ARM: OMAP1: nokia770: enable CBUS/Retu
  ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator
  ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support
  ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
  ARM: OMAP2+: craneboard: support the TPS65910 PMU
  ARM: OMAP2+: craneboard: support NAND device
  ARM: OMAP3: cm-t3517: add MMC support
  ARM: OMAP2+: Remove apollon board support
  ARM: shmobile: armadillo800eva: set clock rates before timer init
  ARM: tegra: defconfig updates
  ARM: shmobile: mackerel: Use gpio_request_one()
  ARM: shmobile: kzm9g: Use gpio_request_one()
  ARM: shmobile: bonito: Use gpio_request_one()
  ...
2013-02-21 15:33:45 -08:00
..
include/mach ARM: remove unused arch_decomp_wdog() 2013-01-11 10:54:03 +08:00
ams-delta-fiq-handler.S ARM: OMAP1: Move board-ams-delta.h from plat to mach 2012-09-20 15:02:19 -07:00
ams-delta-fiq.c ARM: OMAP1: Move board-ams-delta.h from plat to mach 2012-09-20 15:02:19 -07:00
board-ams-delta.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
board-fsample.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-generic.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-h2-mmc.c ARM: OMAP: Split plat/mmc.h into local headers and platform_data 2012-10-15 12:09:43 -07:00
board-h2.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-h2.h ARM: OMAP: No need to include board-h2.h from hardware.h 2009-03-23 18:07:33 -07:00
board-h3-mmc.c ARM: OMAP: Split plat/mmc.h into local headers and platform_data 2012-10-15 12:09:43 -07:00
board-h3.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-h3.h ARM: OMAP: No need to include board-h3.h from hardware.h 2009-03-23 18:07:33 -07:00
board-htcherald.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-innovator.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-nand.c ARM: OMAP1: board files: deduplicate and clean some NAND-related code 2012-04-13 06:34:31 -06:00
board-nokia770.c arm-soc: board specific changes 2013-02-21 15:33:45 -08:00
board-osk.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-palmte.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-palmtt.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-palmz71.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-perseus2.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sx1-mmc.c ARM: OMAP: Split plat/mmc.h into local headers and platform_data 2012-10-15 12:09:43 -07:00
board-sx1.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-voiceblue.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
clock_data.c ARM: OMAP: Split sram.h to local headers and minimal shared header 2012-10-31 10:14:13 -07:00
clock.c ARM: OMAP: Split sram.h to local headers and minimal shared header 2012-10-31 10:14:13 -07:00
clock.h ARM: OMAP: clock: split plat/clkdev_omap.h into OMAP1/2 files 2012-10-18 16:23:30 -07:00
common.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
devices.c omap prcm changes via Paul Walmsley <paul@pwsan.com>: 2012-11-30 08:40:31 -08:00
dma.c ARM: OMAP: Fix dmaengine init for multiplatform 2013-01-11 11:24:19 -08:00
dma.h ARM: OMAP1: DMA: Moving OMAP1 DMA channel definitions to mach-omap1 2012-10-15 14:01:01 -07:00
fb.c ARM: OMAP: Split fb.c to remove last remaining cpu_is_omap usage 2012-12-17 10:50:40 -08:00
flash.c ARM: OMAP1: Move plat/tc.h to mach/tc.h for omap1 2012-10-17 11:36:40 -07:00
fpga.c ARM: OMAP: Fix relative includes for fpga.h 2012-10-31 15:37:14 -07:00
fpga.h ARM: OMAP: Fix relative includes for fpga.h 2012-10-31 15:37:14 -07:00
gpio7xx.c ARM: OMAP: Remove NEED_MACH_GPIO_H 2012-11-02 12:00:36 -07:00
gpio15xx.c ARM: OMAP: Remove NEED_MACH_GPIO_H 2012-11-02 12:00:36 -07:00
gpio16xx.c ARM: OMAP: Remove NEED_MACH_GPIO_H 2012-11-02 12:00:36 -07:00
i2c.c ARM: OMAP: Fix i2c cmdline initcall for multiplatform 2013-01-11 11:24:19 -08:00
id.c ARM: OMAP: Split plat/cpu.h into local soc.h for mach-omap1 and mach-omap2 2012-10-18 16:23:46 -07:00
io.c ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h 2012-11-30 08:41:50 -08:00
iomap.h ARM: OMAP1: Remove relative includes 2012-10-31 15:37:14 -07:00
irq.c ARM: OMAP: Split plat/cpu.h into local soc.h for mach-omap1 and mach-omap2 2012-10-18 16:23:46 -07:00
Kconfig ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
lcd_dma.c ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h 2012-11-30 08:41:50 -08:00
mailbox.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
Makefile ARM: OMAP: Split fb.c to remove last remaining cpu_is_omap usage 2012-12-17 10:50:40 -08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mcbsp.c ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h 2012-11-30 08:41:50 -08:00
mmc.h ARM: OMAP: Split plat/mmc.h into local headers and platform_data 2012-10-15 12:09:43 -07:00
mux.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
ocpi.c ARM: OMAP1: OCPI: move to mach-omap1/ 2012-04-13 06:34:27 -06:00
opp_data.c ARM: OMAP: clock: split plat/clkdev_omap.h into OMAP1/2 files 2012-10-18 16:23:30 -07:00
opp.h ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
pm_bus.c ARM: OMAP1: fix build breakage introduced by commit 25c7d49ed4 2012-10-26 13:19:06 -06:00
pm.c ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h 2012-11-30 08:41:50 -08:00
pm.h ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM 2011-02-04 14:26:08 +00:00
reset.c ARM: OMAP2+: PRCM: remove obsolete prcm.[ch] 2012-11-08 15:09:26 -07:00
serial.c ARM: OMAP: Make plat/fpga.h local to arch/arm/plat-omap 2012-10-17 11:36:37 -07:00
sleep.S ARM: OMAP1: Remove relative includes 2012-10-31 15:37:14 -07:00
soc.h ARM: OMAP1: Remove relative includes 2012-10-31 15:37:14 -07:00
sram-init.c ARM: OMAP: Move omap1 specific code to local sram.c 2012-10-31 10:14:14 -07:00
sram.h ARM: OMAP: Split sram.h to local headers and minimal shared header 2012-10-31 10:14:13 -07:00
sram.S ARM: OMAP: Remove remaining includes for mach/io.h 2012-03-06 21:34:38 -06:00
time.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
timer32k.c ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
timer.c ARM: OMAP: Add platform data header for DMTIMERs 2012-11-16 10:35:08 -06:00
usb.c ARM: OMAP1: fix USB configuration use-after-release 2013-01-03 11:31:40 -08:00