]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/dt' into for-next
authorOlof Johansson <olof@lixom.net>
Wed, 12 Jun 2013 23:27:28 +0000 (16:27 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 12 Jun 2013 23:28:18 +0000 (16:28 -0700)
* next/dt: (27 commits)
  ARM: dts: add ohci and ehci controller nodes for EXYNOS5440
  ARM: dts: Update G2D documentation for clock entries
  ARM: dts: Add clock entries to G2D node for exynos4x12
  ARM: dts: Add clock entries to G2D node for exynos4210
  ARM: dts: Remove duplicate and add missing G2D nodes
  clk: exynos4: Add additional G2D clocks
  ARM: dts: Document DP clock in samsung,exynos5-dp binding
  ARM: dts: add pin state information for DP HPD support to Exynos5250
  ARM: dts: add dts node for the ahci sata exynos5440
  ARM: dts: add vmmc regulator support for ODROID-X
  ARM: dts: add max77686 node entry for ODROID-X
  ARM: dts: Enable RTC by default on EXYNOS5440
  ARM: dts: Add display timing node to exynos5250-arndale.dts
  ARM: dts: Add clock provider information for DP controller in Exynos5250 SoC
  ARM: dts: Add DT node for DP controller for Arndale Board
  ARM: dts: Remove combiner IRQ node from exynos4x12.dtsi
  ARM: dts: add max8997 device node for exynos4210-origen board
  ARM: dts: Enable TMU on Origen4210 board
  ARM: dts: Add TMU clock entries to exynos4210.dtsi
  ARM: dts: Update MFC documentation for clock entries
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/arm-soc-for-next-contents.txt

index 4a0e98139485c84cffdb094079fa487af0e621c0,0000000000000000000000000000000000000000..a517de7837c557309d1ed3552d7f36fc33943054
mode 100644,000000..100644
--- /dev/null
@@@ -1,125 -1,0 +1,127 @@@
 +for-next contents for 3.11: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +      <topic branch>
 +              <contents>
 +              <...>
 +      <...>
 +
 +depends/rmk-devel-stable
 +      http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git devel-stable
 +
 +next/fixes-non-critical
 +      mvebu/fixes-non-critical
 +              git://git.infradead.org/users/jcooper/linux.git tags/fixes-non-3.11-1
 +      sirf/fixes-non-critical
 +              git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git tags/sirf-arm-soc-v3.10-fixes
 +
 +next/cleanup
 +      at91/cleanup
 +              git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 +      machdesc/cleanup
 +              git://github.com/mripard/linux.git tags/arm-soc-cleanups-for-3.11
 +      mvebu/cleanup
 +              git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-3
 +      dt/pci-helpers
 +              git://git.infradead.org/users/jcooper/linux.git tags/of_pci-3.11
 +
 +next/soc
 +      mvebu/soc
 +              git://git.infradead.org/users/jcooper/linux.git tags/soc-3.11-2
 +      mvebu/defconfig
 +              git://git.infradead.org/users/jcooper/linux.git tags/defconfig-3.11-3
 +      mvebu/pcie
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie-3.11-2
 +      mvebu/pcie-kirkwood
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11
 +      mvebu/pcie2
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_bridge-3.11
 +      mvebu/clk-cleanup
 +              git://git.infradead.org/users/jcooper/linux.git tags/seb_clk-3.11
 +      vexpress/dual-cluster
 +              git://git.linaro.org/people/nico/linux VExpress_DCSCB
 +              depends on depends/rmk-devel-stable
 +              +patch "drivers/bus: arm-cci: fix combined ARMv6+v7 build"
 +      zynq/clk
 +              git://git.xilinx.com/linux-xlnx tags/zynq-clk-for-3.11
 +      mvebu/pcie-kirkwood2
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11-2
 +      renesas/pinmux-gpio
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-pinmux-for-v3.11
 +      renesas/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11
 +      clps711x/soc
 +              patches
 +                      GPIO: clps711x: Rewrite driver for using generic GPIO cod
 +                      GPIO: clps711x: Add DT support
 +                      ARM: clps711x: Re-add GPIO support
 +                      ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency
 +                      ARM: clps711x: Set PLL clock to zero if we work from 13 mHz sourc
 +                      ARM: clps711x: autcpu12: Move LCD DPOT definitions to board file
 +                      ARM: clps711x: autcpu12: Add support for NOR flash
 +                      ARM: clps711x: autcpu12: Special driver for handling memory is re
 +                      ARM: clps711x: autcpu12: Move remaining specific definitions to b
 +                      ARM: clps711x: p720t: Define PLD registers as GPIOs
 +                      ARM: clps711x: Move specific definitions from hardware.h to board
 +                      ARM: clps711x: Replace "arch_initcall" in common code with ".init
 +                      ARM: clps711x: Add clocksource framework
 +                      ARM: clps711x: Optimize interrupt handling
 +                      ARM: clps711x: edb7211: Add support for I2C
 +                      ARM: clps711x: edb7211: Control LCD backlight via PWM
 +                      ARM: clps711x: Add support for SYSCON driver
 +                      ARM: clps711x: Update defconfig
 +      patches
 +              ARM: socfpga: Add support to gate peripheral clocks
 +              ARM: socfpga: Add syscon to be part of socfpga
 +      samsung/s3c24xx-arch
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-arch-1
 +
 +next/boards
 +      mvebu/boards
 +                git://git.infradead.org/users/jcooper/linux.git tags/boards-3.11-2
 +      renesas/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.11
 +      renesas/boards
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-for-v3.11
 +              depends on renesas/pinmux-gpio
 +              depends on renesas/soc
 +
 +next/dt
 +      nomadik/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-for-arm-soc
 +      mvebu/dt
 +              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-3
 +      patch
 +              "ARM: nomadik: fix clocksource warning"
 +      at91/dt
 +              git://github.com/at91linux/linux-at91.git tags/at91-dt
 +      vt8500/dt
 +              git://github.com/linux-wmt/linux-vtwm vt8500/dts-3.11
 +      cleanup/dts-cpus
 +              git://linux-arm.org/linux-2.6-lp dts-cpus-updates
 +      patch
 +              "ARM: dts: add missing cpu #address-cell values"
 +      mvebu/dt4
 +              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-4
 +      renesas/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.11
 +      patches
 +              ARM: socfpga: dts: Add ethernet bindings for SOCFPGA
 +              ARM: socfpga: dts: Add gate-clock bindings
 +      samsung/s3c24xx-dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-dt-1
++      samsung/exynos-dt
++              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/exynos-dt-1
 +
 +next/drivers
 +      ux500/dma40
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc
 +      timer/dw_apb_timer_of
 +              git://github.com/mmind/linux-rockchip.git tags/dw_apb_timer_of
 +
 +next/mailbox:
 +      mailbox/subsystem
 +              git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox
 +
 +