]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branches 'next/fixes-non-critical', 'next/soc', 'next/dt' and 'next/boards...
authorOlof Johansson <olof@lixom.net>
Thu, 2 Jan 2014 18:28:19 +0000 (10:28 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 2 Jan 2014 18:28:32 +0000 (10:28 -0800)
* next/fixes-non-critical:
  ARM: msm: trout: fix uninit var warning

* next/soc:
  ARM: msm: Simplify ARCH_MSM_DT config
  ARM: msm: Add support for MSM8974 SoC
  ARM: msm: trout: fix uninit var warning

* next/dt:
  ARM: dts: MSM8974: Add MMIO architected timer node
  ARM: dts: MSM8974: Add restart node
  ARM: msm: Simplify ARCH_MSM_DT config
  ARM: msm: Add support for MSM8974 SoC
  ARM: msm: trout: fix uninit var warning

* next/boards:
  ARM: msm_defconfig: Enable restart driver
  ARM: msm_defconfig: Enable CONFIG_ARCH_MSM8974
  ARM: msm: Add support for APQ8074 Dragonboard
  ARM: dts: MSM8974: Add MMIO architected timer node
  ARM: dts: MSM8974: Add restart node
  ARM: msm: Simplify ARCH_MSM_DT config
  ARM: msm: Add support for MSM8974 SoC
  ARM: msm: trout: fix uninit var warning

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

index 8efbaa0b1570c059a1fa32b1bd7c7304a9663233,0000000000000000000000000000000000000000,0000000000000000000000000000000000000000,0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b627e6c74e3388b819008b80195bd1a8612a135d
mode 100644,000000,000000,000000,000000..100644
--- /dev/null
--- /dev/null
--- /dev/null
--- /dev/null
@@@@@@ -1,170 -1,0 -1,0 -1,0 -1,0 +1,185 @@@@@@
-    
 ++++Contents of arm-soc branches contained in for-next
 ++++
 ++++dependencies:
 ++++
 ++++depends/asoc-dma
 ++++   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git asoc-dma-v3.14
 ++++depends/dma-defer-probe
 ++++   git://git.infradead.org/users/vkoul/slave-dma.git topic/defer_probe
 ++++depends/dma-of
 ++++   git://git.infradead.org/users/vkoul/slave-dma.git topic/of
 ++++depends/tegra-clk
 ++++   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git clk-tegra-for-3.14
 ++++
 ++++next/fixes-non-critical
 ++++   samsung/fixes
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-fixes
 ++++   samsung/fixes2
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-fixes-2
 ++++
 ++++next/cleanup
 ++++   renesas/cleanup
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v3.14
 ++++   mvebu/soc
 ++++           git://git.infradead.org/linux-mvebu.git tags/mvebu-soc-3.14
 ++++   at91/sama5-ccf
 ++++           git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 ++++   patches
 ++++           ARM: at91: remove redundant dependency
 ++++           ARM: clean up cache handling in platform code
 ++++           ARM: pxa: Remove unused variables
 ++++           ARM: pxa: remove IRQF_DISABLED
 ++++           ARM: mmp: build sram driver alone
 ++++   patch
 ++++           ARM: at91: remove AT91_PROGRAMMABLE_CLOCKS configuration option
 ++++   zynq/cleanup
 ++++           git://git.xilinx.com/linux-xlnx.git tags/zynq-cleanup-for-3.14
 ++++   samsung/cleanup
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-cleanup
 ++++   tegra/dma-reset-rework
 ++++           based on depends/asoc-dma
 ++++           based on depends/dma-defer-probe
 ++++           based on depends/dma-of
 ++++           based on depends/tegra-clk
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git clk-tegra-for-3.14
 ++++   samsung/cleanup2
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-cleanup-2
 ++++   renesas/cleanup2
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup2-for-v3.14
 ++++   renesas/drivers-sci
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-sh-sci-for-v3.14
+++++   qcom/fixes
+++++           patch ARM: msm: trout: fix uninit var warning
 ++++
 ++++next/soc
 ++++   patches
 ++++           ARM: ep93xx: remove deprecated IRQF_DISABLED
 ++++           ARM: ep93xx: use soc bus
 ++++   soc/sched_clock
 ++++           local branch: rebased onto tip/timers-core-for-linus for dependencies
 ++++   patch
 ++++           ARM: at91: sama5d3: add support for sama5d36 chip
 ++++   berlin/soc
 ++++           https://github.com/shesselba/linux-berlin.git tags/berlin-3.14
 ++++   efm32/soc
 ++++           git://git.pengutronix.de/git/ukl/linux.git tags/efm32
 ++++   keystone/soc
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git for_3.14/soc
 ++++   renesas/soc
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.14
 ++++   patch
 ++++           ARM: moxart: add MOXA ART SoC platform files
 ++++           MAINTAINERS: take maintainership for Energy Micro efm32 SoCs
 ++++   samsung/dev
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dev
 ++++   tegra/powergate
 ++++           based on tegra/dma-reset-rework
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-powergate
 ++++   tegra/soc
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-soc
 ++++   renesas/soc2
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.14
+++++   qcom/soc
+++++           contains qcom/fixes
+++++           patch ARM: msm: Add support for MSM8974 SoC
+++++           patch ARM: msm: Simplify ARCH_MSM_DT config
+++++    
 ++++next/dt
 ++++   ux500/dt
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson tags/ux500-devicetree-v3.14-1
 ++++   mvebu/dt
 ++++           git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14
 ++++   sti/dt
 ++++           http://git.stlinux.com/devel/kernel/linux-sti.git tags/DT-for-v3.14-part-1
 ++++   mvebu/dt-2
 ++++           git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14-2            
 ++++   patch
 ++++           ARM: at91: sama5d3/dt: add sama5d36ek dts files (based on next/cleanup for dependencies)
 ++++   at91/dt
 ++++           git://github.com/at91linux/linux-at91.git tags/at91-dt
 ++++   integrator/dt
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git tags/integrator-v3.14-1
 ++++   patches
 ++++           ARM: pxa: add PWM nodes to pxa27x.dtsi
 ++++   nomadik/dt
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-v3.14
 ++++   mvebu/dt-3
 ++++           git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14-3
 ++++   mvebu/dt-4
 ++++           git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14-4
 ++++   keystone/dt
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/keystone-dts
 ++++   renesas/dt
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.14
 ++++   zynq/dt
 ++++           git://git.xilinx.com/linux-xlnx.git tags/zynq-dt-for-3.14
 ++++   patch
 ++++           ARM: moxart: add MOXA ART SoC device tree files
 ++++   samsung/dt
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt
 ++++   at91/dt-2
 ++++           git://github.com/at91linux/linux-at91.git tags/at91-dt2
 ++++   samsung/dt2
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt-2
 ++++   tegra/dt
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-dt
 ++++   tegra/dt2
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-dt-2
 ++++   renesas/dt2
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.14
+++++   qcom/dt
+++++           contains qcom/fixes and qcom/soc
+++++           patch ARM: dts: MSM8974: Add restart node
+++++           patch ARM: dts: MSM8974: Add MMIO architected timer node
 ++++
 ++++next/boards
 ++++   renesas/defconfig
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.14
 ++++   mvebu/defconfig
 ++++           git://git.infradead.org/linux-mvebu.git tags/mvebu-defconfig-3.14
 ++++   patch
 ++++           ARM: multi_v7_defconfig: Fix STi support
 ++++   omap/board-removal
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.14/board-removal-safe
 ++++   samsung/defconfig
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-defconfig
 ++++   mvebu/defconfig-2
 ++++           git://git.infradead.org/linux-mvebu.git tags/mvebu-defconfig-3.14-2
 ++++   tegra/defconfig
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-defconfig
 ++++   tegra/defconfig2
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-defconfig-2
 ++++   samsung/defconfig2
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-defconfig-2
 ++++   renesas/boards
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-for-v3.14
 ++++   renesas/defconfig2
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig2-for-v3.14
+++++   qcom/boards
+++++           contains qcom/fixes, qcom/soc and qcom/dt
+++++           patch ARM: msm: Add support for APQ8074 Dragonboard
+++++           patch defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
+++++           patch ARM: msm_defconfig: Enable restart driver
 ++++
 ++++next/drivers
 ++++   mvebu/drivers
 ++++           git://git.infradead.org/linux-mvebu.git tags/mvebu-drivers-3.14
 ++++   samsung/s3c64xx-dmaengine
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git tags/s3c64xx-dmaengine
 ++++   renesas/drivers-usb
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-usb-r8a66597-hcd-for-v3.14
 ++++   at91/drivers
 ++++           git://github.com/at91linux/linux-at91.git tags/at91-drivers
 ++++           Contains at91/dt
 ++++   samsung/irq
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-irq
 ++++   tegra/trusted-foundations
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-trusted-foundations
 ++++   sunxi/drivers
 ++++           https://github.com/mripard/linux.git tags/sunxi-drivers-for-3.14
 ++++   renesas/drivers-irqchip
 ++++           git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-irqc-for-v3.14
 ++++
 ++++Patches only in for-next, not in any topic branch due to conflicts:
 ++++
 ++++ARM: multi_v7: copy most options from tegra_defconfig
index b848764121f55d03f77671e79b3d3c6dd715b09b,d57c1a65b24f981fb25c62aa58c73c1fedd84ab8,b44dd26b951d1f910a8d9592a0242d4a5ab31cdd,25d708c47eb5c8b23def7e4feb68cc8fde98d85c,4179056f4584f87fd3f5d725cf550a5c978a930a..ca246d0ea261836c41cfabf73ae9a8df623a7c44
@@@@@@ -112,9 -104,8 -108,8 -108,9 -104,9 +112,10 @@@@@@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood
        kirkwood-ts219-6281.dtb \
        kirkwood-ts219-6282.dtb
     dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
 ++ +dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
     dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
----    qcom-msm8960-cdp.dtb
++++    qcom-msm8960-cdp.dtb \
++++    qcom-apq8074-dragonboard.dtb
     dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
        armada-370-mirabox.dtb \
        armada-370-netgear-rn102.dtb \
@@@@@@ -231,9 -216,8 -220,8 -222,8 -222,9 +232,9 @@@@@@ dtb-$(CONFIG_ARCH_U8500) += ste-snowbal
     dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
     dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
        s3c6410-smdk6410.dtb
 -   dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
 +   dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
        r7s72100-genmai.dtb \
 +++    r7s72100-genmai-reference.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
        r8a7778-bockw-reference.dtb \