korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-28 13:34:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
48e93e402a
linux/arch/arm/mach-tegra
History
Linus Torvalds 69f1d1a6ac Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 
* 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
  ARM: S5P64X0: External Interrupt Support
  ARM: EXYNOS4: Enable MFC on Samsung NURI
  ARM: EXYNOS4: Enable MFC on universal_c210
  ARM: S5PV210: Enable MFC on Goni
  ARM: S5P: Add support for MFC device
  ARM: EXYNOS4: Add support FIMD on SMDKC210
  ARM: EXYNOS4: Add platform device and helper functions for FIMD
  ARM: EXYNOS4: Add resource definition for FIMD
  ARM: EXYNOS4: Change devname for FIMD clkdev
  ARM: SAMSUNG: Add IRQ_I2S0 definition
  ARM: SAMSUNG: Add platform device for idma
  ARM: EXYNOS4: Add more registers to be saved and restored for PM
  ARM: EXYNOS4: Add more register addresses of CMU
  ARM: EXYNOS4: Add platform device for dwmci driver
  ARM: EXYNOS4: configure rtc-s3c on NURI
  ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
  ARM: EXYNOS4: configure ADC on NURI
  ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
  ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
  ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
  ...

Fix up tons of silly conflicts:
 - arch/arm/mach-davinci/include/mach/psc.h
 - arch/arm/mach-exynos4/Kconfig
 - arch/arm/mach-exynos4/mach-smdkc210.c
 - arch/arm/mach-exynos4/pm.c
 - arch/arm/mach-imx/mm-imx1.c
 - arch/arm/mach-imx/mm-imx21.c
 - arch/arm/mach-imx/mm-imx25.c
 - arch/arm/mach-imx/mm-imx27.c
 - arch/arm/mach-imx/mm-imx31.c
 - arch/arm/mach-imx/mm-imx35.c
 - arch/arm/mach-mx5/mm.c
 - arch/arm/mach-s5pv210/mach-goni.c
 - arch/arm/mm/Kconfig
2011-07-26 17:41:04 -07:00
..
include/mach Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
board-harmony-pcie.c ARM: tegra: harmony: update PCI-e initialization sequence 2011-03-15 14:28:32 -07:00
board-harmony-pinmux.c ARM: tegra: harmony: Beginnings of audio support 2011-03-07 15:34:25 -08:00
board-harmony-power.c ARM: Tegra: Harmony: Fix conflicting GPIO numbering 2011-06-04 15:51:52 -07:00
board-harmony.c ARM: tegra: remove copy-and-pasted i2c platform data in boards 2011-07-12 20:39:02 -07:00
board-harmony.h ARM: Tegra: Harmony: Fix conflicting GPIO numbering 2011-06-04 15:51:52 -07:00
board-paz00-pinmux.c ARM: tegra: paz00: cleanup sdhci ports 2011-07-12 20:38:56 -07:00
board-paz00.c ARM: tegra: remove copy-and-pasted usb platform data from boards 2011-07-12 20:39:40 -07:00
board-paz00.h ARM: tegra: paz00: cleanup sdhci ports 2011-07-12 20:38:56 -07:00
board-seaboard-pinmux.c ARM: tegra: seaboard: register i2c devices 2011-03-07 15:44:09 -08:00
board-seaboard.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
board-seaboard.h ARM: tegra: create defines for SD-related GPIO names 2011-03-07 15:34:25 -08:00
board-trimslice-pinmux.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
board-trimslice.c ARM: tegra: remove copy-and-pasted usb platform data from boards 2011-07-12 20:39:40 -07:00
board-trimslice.h ARM: tegra: trimslice: enable USB ports 2011-07-12 20:39:00 -07:00
board.h ARM: tegra: Move tegra_common_init to tegra_init_early 2011-02-22 11:25:12 -08:00
clock.c switch assorted clock drivers to debugfs_remove_recursive() 2011-07-20 20:47:51 -04:00
clock.h ARM: tegra: clock: Add function to set SDMMC tap delay 2011-02-21 00:16:47 -08:00
common.c ARM: Tegra: Make tegra_dma_init a postcore_initcall 2011-02-23 14:00:11 -08:00
cpu-tegra.c ARM: tegra: cpufreq: Adjust memory frequency with cpu frequency 2011-02-21 00:16:46 -08:00
devices.c ARM: tegra: remove copy-and-pasted usb platform data from boards 2011-07-12 20:39:40 -07:00
devices.h ARM: tegra: add devices.c entries for audio 2011-03-07 15:34:24 -08:00
dma.c Fix common misspellings 2011-03-31 11:26:23 -03:00
fuse.c [ARM] tegra: Add support for reading fuses 2010-10-21 18:12:09 -07:00
fuse.h [ARM] tegra: Add support for reading fuses 2010-10-21 18:12:09 -07:00
gpio-names.h [ARM] tegra: add GPIO support 2010-08-05 14:57:02 -07:00
headsmp.S [ARM] tegra: SMP support 2010-08-05 14:57:01 -07:00
hotplug.c ARM: fix wrongly patched constants 2011-01-14 12:06:26 +00:00
io.c ARM: remove unnecessary mach/hardware.h includes 2011-07-12 11:19:27 -05:00
irq.c ARM: tegra: irq: Add tegra_eoi 2011-05-11 16:04:16 +01:00
Kconfig ARM: Tegra: select MACH_HAS_SND_SOC_TEGRA_WM8903 2011-04-21 11:57:31 +01:00
localtimer.c ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime 2011-02-23 17:54:27 +00:00
Makefile gpio/tegra: Move Tegra gpio driver to drivers/gpio 2011-06-15 14:52:43 -06:00
Makefile.boot [ARM] tegra: initial tegra support 2010-08-05 14:51:42 -07:00
pcie.c ARM: convert PCI defines to variables 2011-07-12 11:19:29 -05:00
pinmux-t2-tables.c ARM: tegra: pinmux: Add missing drive pingroups and fix suspend 2011-02-09 21:57:02 -08:00
pinmux.c [ARM] tegra: pinmux: add safe values, move tegra2, add suspend 2010-10-21 18:11:41 -07:00
platsmp.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
powergate.c ARM: tegra: Add api to control internal powergating 2011-02-09 21:57:00 -08:00
tegra2_clocks.c arm: tegra: remove generic disp clock divisor flag 2011-07-12 20:38:57 -07:00
tegra2_emc.c ARM: tegra: Add external memory controller driver 2011-02-21 00:16:45 -08:00
tegra2_emc.h ARM: tegra: Add external memory controller driver 2011-02-21 00:16:45 -08:00
timer.c clocksource: convert ARM 32-bit up counting clocksources 2011-05-23 18:04:51 +01:00
usb_phy.c ARM: tegra: Add support for Tegra USB PHYs 2011-03-11 14:22:11 -08:00