2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 19:53:59 +08:00
linux-next/arch/arm/plat-s5p
Linus Torvalds 952414505f Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc
* 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits)
  ARM: mach-mxs: fix machines' initializers order
  mmc: mxcmmc: explicitly includes mach/hardware.h
  arm/imx: explicitly includes mach/hardware.h in pm-imx27.c
  arm/imx: remove mx27_setup_weimcs() from mx27.h
  arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c
  arm/imx: remove mx31_setup_weimcs() from mx31.h
  ARM: tegra: devices.c should include devices.h
  ARM: tegra: cpu-tegra: unexport two functions
  ARM: tegra: cpu-tegra: sparse type fix
  ARM: tegra: dma: staticify some tables and functions
  ARM: tegra: tegra2_clocks: don't export some tables
  ARM: tegra: tegra_powergate_is_powered should be static
  ARM: tegra: tegra_rtc_read_ms should be static
  ARM: tegra: tegra_init_cache should be static
  ARM: tegra: pcie: 0 -> NULL changes
  ARM: tegra: pcie: include board.h
  ARM: tegra: pcie: don't cast __iomem pointers
  ARM: tegra: tegra2_clocks: 0 -> NULL changes
  ARM: tegra: tegra2_clocks: don't cast __iomem pointers
  ARM: tegra: timer: don't cast __iomem pointers
  ...

Fix up trivial conflicts in
  arch/arm/mach-omap2/Makefile,
  arch/arm/mach-u300/{Makefile.boot,core.c}
  arch/arm/plat-{mxc,omap}/devices.c
2011-11-01 20:11:00 -07:00
..
include/plat Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:11:00 -07:00
clock.c ARM: S5P: fix bug in spdif_clk_get_rate 2011-08-19 21:21:08 +09:00
cpu.c ARM: S5P6442: Removing ARCH_S5P6442 2011-05-12 08:10:53 +09:00
dev-csis0.c ARM: S5P: Rename MIPI-CSIS driver header and update Copyright 2011-03-11 15:49:00 +09:00
dev-csis1.c ARM: S5P: Rename MIPI-CSIS driver header and update Copyright 2011-03-11 15:49:00 +09:00
dev-ehci.c ARM: EXYNOS4: Add usb host phy control 2011-04-13 16:50:44 -07:00
dev-fimc0.c ARM: S5P: Decrease IO Registers memory region size on FIMC 2010-09-14 17:57:55 +09:00
dev-fimc1.c ARM: S5P: Decrease IO Registers memory region size on FIMC 2010-09-14 17:57:55 +09:00
dev-fimc2.c ARM: S5P: Decrease IO Registers memory region size on FIMC 2010-09-14 17:57:55 +09:00
dev-fimc3.c ARM: S5P: Add platform definitions for FIMC3 2011-03-12 08:58:01 +09:00
dev-fimd0.c ARM: EXYNOS4: Add platform device and helper functions for FIMD 2011-07-21 17:28:51 +09:00
dev-mfc.c ARM: S5P: Add support for MFC device 2011-07-21 17:29:00 +09:00
dev-onenand.c ARM: SAMSUNG: Remove unused onenand plat functions 2011-06-03 16:45:02 -07:00
dev-pmu.c ARM: S5P: Add PMU device 2010-08-05 18:30:21 +09:00
dev-uart.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
irq-eint.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
irq-gpioint.c ARM: S5P: fix offset calculation on gpio-interrupt 2011-10-21 18:05:02 +09:00
irq-pm.c ARM / Samsung: Use struct syscore_ops for "core" power management 2011-04-24 19:16:10 +02:00
irq.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
Kconfig ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
Makefile ARM: S5P: Add support for MFC device 2011-07-21 17:29:00 +09:00
pm.c ARM: S5P: Remove unused s3c_pm_check_resume_pin 2011-04-14 13:19:40 +09:00
s5p-time.c Merge branch 'next-samsung-clkdev-fix' into next-samsung-devel 2011-07-21 17:28:23 +09:00
setup-mipiphy.c ARM: S5P: Add support for common MIPI CSIS/DSIM D-PHY control 2011-03-11 15:49:01 +09:00
sysmmu.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00