kernel-ark/arch/arm
Olof Johansson 24025f6f58 Merge branch 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
From Kukjin Kim:

Here is Samsung DT for v3.8 and this is including DT for EXYNOS4X12
SoC, SMDK4412 board, pinctrl for exynos4x12, TMU, MFC, SATA and SATA
PHY.

As I commented on [4/7], this branch merged pinctrl/samsung to support
pinctrl for exynos4x12 without useless merge conflicts.

* 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (32 commits)
  ARM: EXYNOS: DT Support for SATA and SATA PHY
  ARM: dts: Remove broken-voltage property from sdhci node for exynos4210-trats
  ARM: dts: Add node for touchscreen for exynos4210-trats
  ARM: dts: Add node for touchscreen voltage regulator for exynos4210-trats
  ARM: dts: Add node for i2c3 bus for exynos4210-trats
  ARM: dts: Add nodes for GPIO keys available on Trats
  ARM: dts: Update for pinctrl-samsung driver for exynos4210-trats
  ARM: dts: Add nodes for pin controllers for exynos4x12
  pinctrl: samsung: Add support for EXYNOS4X12
  gpio: samsung: Skip registration if pinctrl driver is present on EXYNOS4X12
  ARM: EXYNOS: Skip wakeup-int setup if pinctrl driver is used on EXYNOS4X12
  ARM: dts: add board dts file for EXYNOS4412 based SMDK board
  ARM: dts: Add support for EXYNOS4X12 SoCs
  ARM: EXYNOS: Add devicetree node for TMU driver for exynos5
  ARM: EXYNOS: Add devicetree node for TMU driver for exynos4
  ARM: EXYNOS: Add MFC device tree support
  ARM: dts: Enable serial controllers on Origen and SMDKV310
  Documentation: Update samsung-pinctrl device tree bindings documentation
  pinctrl: samsung: Add GPIO to IRQ translation
  pinctrl: exynos: Set pin function to EINT in irq_set_type of wake-up EINT
  ...

Add/add conflicts in:
	arch/arm/boot/dts/exynos5250-smdk5250.dts
	arch/arm/boot/dts/exynos5250.dtsi
	arch/arm/mach-exynos/mach-exynos5-dt.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-11-21 11:30:32 -08:00
..
boot Merge branch 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt 2012-11-21 11:30:32 -08:00
common
configs It's mxs device tree changes for 3.8. The majority is device tree 2012-11-16 17:55:01 +01:00
crypto
include It's based on imx/multiplatform branch. Most of them are dts changes. 2012-11-16 17:57:23 +01:00
kernel Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 2012-11-07 04:14:45 +01:00
lib
mach-at91 ARM: at91: fix at91x40 build 2012-10-27 17:46:48 +02:00
mach-bcm2835
mach-clps711x
mach-cns3xxx
mach-davinci ARM: davinci: move dtb targets to common location 2012-11-19 22:25:59 -08:00
mach-dove ARM: dove: Add crypto engine to DT 2012-10-17 17:20:01 +00:00
mach-ebsa110
mach-ep93xx
mach-exynos Merge branch 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt 2012-11-21 11:30:32 -08:00
mach-footbridge
mach-gemini
mach-h720x
mach-highbank
mach-imx It's based on imx/multiplatform branch. Most of them are dts changes. 2012-11-16 17:57:23 +01:00
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-kirkwood ARM: Kirkwood: fix disabling CACHE_FEROCEON_L2 2012-10-18 17:04:24 +00:00
mach-ks8695
mach-l7200/include/mach
mach-lpc32xx
mach-mmp
mach-msm
mach-mv78xx0
mach-mvebu
mach-mxs ARM: mxs: Setup scheduler clock 2012-11-12 09:27:30 +08:00
mach-netx
mach-nomadik
mach-omap1 Merge branch 'omap/cleanup-prcm-part2' into next/dt 2012-11-15 17:59:54 +01:00
mach-omap2 Merge branch 'omap/cleanup-prcm-part2' into next/dt 2012-11-15 17:59:54 +01:00
mach-orion5x
mach-picoxcell
mach-prima2 pinctrl: sirf: remove sirfsoc_gpio_set_pull function 2012-10-15 09:09:27 +02:00
mach-pxa
mach-realview
mach-rpc
mach-s3c24xx Merge branch 'v3.7-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes 2012-10-26 14:45:06 +02:00
mach-s3c64xx
mach-s3c2410
mach-s3c2412
mach-s3c2440
mach-s5p64x0 ARM: SAMSUNG: Add naming of s3c64xx-spi devices 2012-10-17 16:47:32 +09:00
mach-s5pc100 ARM: SAMSUNG: Add naming of s3c64xx-spi devices 2012-10-17 16:47:32 +09:00
mach-s5pv210 ARM: SAMSUNG: Add naming of s3c64xx-spi devices 2012-10-17 16:47:32 +09:00
mach-sa1100
mach-shark
mach-shmobile ARM: shmobile: r8a7779: I/O address abuse cleanup 2012-10-19 15:39:38 +09:00
mach-socfpga
mach-spear3xx
mach-spear6xx
mach-spear13xx ARM: SPEAr: Remove unused empty files 2012-10-25 16:34:18 +02:00
mach-tegra ARM: tegra: Add Tegra30 host1x clock support 2012-11-15 14:46:29 -07:00
mach-u300
mach-ux500 ARM: ux500: Describe UART platform registering issues more accurately 2012-11-20 16:10:47 +00:00
mach-versatile
mach-vexpress
mach-vt8500
mach-w90x900
mach-zynq ARM: zynq: add clk binding support to the ttc 2012-11-14 16:10:42 +01:00
mm Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 2012-11-07 04:14:45 +01:00
net
nwfpe
oprofile
plat-iop
plat-nomadik
plat-omap Merge branch 'omap/cleanup-prcm-part2' into next/dt 2012-11-15 17:59:54 +01:00
plat-orion
plat-pxa
plat-s3c24xx
plat-samsung Merge branch 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt 2012-11-21 11:30:32 -08:00
plat-spear
plat-versatile
tools
vfp ARM: 7566/1: vfp: fix save and restore when running on pre-VFPv3 and CONFIG_VFPv3 set 2012-10-29 10:04:05 +00:00
xen xen/arm: Fix compile errors when drivers are compiled as modules (export more). 2012-11-09 07:48:22 -05:00
Kconfig These changes add DT boot support to DaVinci DA850 2012-11-19 22:25:01 -08:00
Kconfig-nommu
Kconfig.debug It's based on imx/multiplatform branch. Most of them are dts changes. 2012-11-16 17:57:23 +01:00
Makefile Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/dt 2012-11-16 17:47:11 +01:00