renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 03:04:01 +08:00
Code
e887ae25b0
linux-next/arch/arm
History
Arnd Bergmann e887ae25b0 mvebu dt changes for v3.15 (incremental pull #3) 
- mvebu
     - merge armada 375, 380, 385 boards (mvebu/dt-3xx)
 
  - kirkwood
     - Add many Synology NAS boards
     - add board HP T5325
     - add L2 cache node
     - add system-controller node
     - add audio node
 
  - dove
     - add pinctrl and global-config register
 
 Depends:
  - tags/mvebu-dt-fixes-3.14 (mvebu/dt-fixes)
     - removed dove PMU interrupt controller
 
 Conflicts:
  - mvebu/soc (arch/arm/boot/dts/Makefile)
     - add/add conflict.
     - move CONFIG_ARCH_LPC32XX to alphabetical order (after KIRKWOOD)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTFTyxAAoJEP45WPkGe8ZnDnwP/j1mxhzK7jY6KHJlY79Z/Bjr
 ZXGcVZIcmzYQMEaEcpT1lMtzQnxRf9xqd8JMr2k33oNe0uzEOp6wiSfIkw7aldkV
 s2ZGp0PjaVhJZqhgzbH0LJhid73RRBTCUGNrzCYDQt9BWkvJygnP7iFjNHQzijVJ
 UjpXhxVdVXpx9RTVwgcHs7GtDskrUhiPBlDcJePuk3q8oRwNJA+jDiWxBTALtABd
 JdvpaNW4RHFR1KAoHTqxhFuS61W+DF3IQalH8PpcYHYV/MXs1QByP1nbEira7Dav
 HuIgGtiltfObMHN6DrU4uPQFvb0Ab13q5WoZmW4bR9Y01wpM5TgOQxXpLZi/aCbV
 dr4UmbcUSo9MDCMZvOEIHC+7FW5LutVNt4IwqQN/bJQyK1aZMjJTS4aVxmU+2Vl+
 mIaPyh3ePXAtGEg3Ai7iWfbEMANKz2qoqShckxbqEPLsDCeYY4ar9TnUHHSc8Mat
 LskwGE25ACcaQkf1vFkZNSaezEiB9yai37yGKu83FyYk8Vi/hsLxeb6EBHKULC//
 8uU4abC12nw8KAX/sHStjMKa64upoyycczVxhKjwLPmgwSSW47m8ZyE+tzxpNBE3
 4oBLB4C9lCouUXrpOxkkRv0uSSeJ/1dW8IhSxFWQuNRi2rl2KJsKzYKIWLEjNbqT
 YrrarK14xpMewjJduvat
 =38NX
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu into next/dt

Merge "mvebu dt changes for v3.15 (incremental pull #3)" from Jason Cooper:

 - mvebu
    - merge armada 375, 380, 385 boards (mvebu/dt-3xx)

 - kirkwood
    - Add many Synology NAS boards
    - add board HP T5325
    - add L2 cache node
    - add system-controller node
    - add audio node

 - dove
    - add pinctrl and global-config register

Depends:
 - tags/mvebu-dt-fixes-3.14 (mvebu/dt-fixes)
    - removed dove PMU interrupt controller

Conflicts:
 - mvebu/soc (arch/arm/boot/dts/Makefile)
    - add/add conflict.
    - move CONFIG_ARCH_LPC32XX to alphabetical order (after KIRKWOOD)

* tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: Add dts file describing HP T5325 thin client
  ARM: kirkwood: Add i2c alias so setting bus number
  ARM: kirkwood: Add audio node to kirkwood.dtsi
  ARM: mvebu: select dtbs from MACH_ARMADA_*
  ARM: dove: add global-config register node
  ARM: dove: add additional pinctrl registers
  ARM: mvebu: Instantiate system controller in kirkwood.dtsi
  ARM: kirkwood: Instantiate L2 cache from DT.
  ARM: mvebu: use macros for interrupt flags on Armada 375/38x
  ARM: mvebu: use GIC_{SPI,PPI} in Armada 375/38x DTs
  ARM: mvebu: use C preprocessor include for Armada 375/38x DTs
  ARM: Kirkwood: Add support for many Synology NAS devices
  DT: i2c: Trivial: Add sii,s35390a
  DT: Vendor prefixes: Add ricoh, qnap, sii and synology
  ARM: dove: dt: revert PMU interrupt controller node
  ARM: mvebu: add Device Tree for the Armada 385 DB board
  ARM: mvebu: add Device Tree description of the Armada 380/385 SoCs
  ARM: mvebu: add Device Tree for the Armada 375 DB board
  ARM: mvebu: add Device Tree description of the Armada 375 SoC
  ARM: mvebu: dt: add missing alias 'eth3' on Armada XP mv78260

Conflicts:
	Documentation/devicetree/bindings/vendor-prefixes.txt
	arch/arm/boot/dts/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 11:05:37 +01:00
..
boot mvebu dt changes for v3.15 (incremental pull #3) 2014-03-17 11:05:37 +01:00
common ARM: SoC platform changes for 3.14 2014-01-23 18:40:49 -08:00
configs ARM: multi_v7_defconfig: Select CONFIG_SOC_DRA7XX 2014-02-10 10:38:06 -08:00
crypto CRYPTO: Fix more AES build errors 2014-01-05 13:59:56 +00:00
firmware
include This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
kernel Merge branches 'fixes' and 'misc' into for-linus 2014-01-28 21:38:48 +00:00
kvm First round of KVM updates for 3.14; PPC parts will come next week. 2014-01-22 21:40:43 -08:00
lib ARM: 7877/1: use built-in byte swap function 2013-12-29 12:32:45 +00:00
mach-at91 This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-bcm ARM: pinctrl: Add Broadcom Capri pinctrl driver 2014-01-16 14:25:38 +01:00
mach-bcm2835 ARM: bcm2835: Fix grammar in help message 2014-01-02 12:07:52 -08:00
mach-berlin
mach-clps711x This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-cns3xxx
mach-davinci This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-dove This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-ebsa110
mach-efm32 ARM: efm32: drop unused file <mach/timex.h> 2014-02-24 10:07:27 +01:00
mach-ep93xx This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-exynos This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-footbridge This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-gemini
mach-highbank Merge branches 'amba', 'fixes', 'kees', 'misc' and 'unstable/sa11x0' into for-next 2014-01-21 21:26:33 +00:00
mach-hisi ARM: hisi: fix kconfig warning on HAVE_ARM_TWD 2014-02-02 19:52:42 -08:00
mach-imx ARM: imx6: Initialize low-power mode early again 2014-02-10 10:37:32 -08:00
mach-integrator This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-iop13xx
mach-iop32x This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-iop33x
mach-ixp4xx This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-keystone ARM: dts: keystone: update for supporting K2L/K2E EVMs 2014-02-25 16:24:19 -05:00
mach-kirkwood This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-ks8695 This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-lpc32xx This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-mmp This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-moxart ARM: moxart: move DMA_OF selection to driver 2014-02-02 19:52:45 -08:00
mach-msm Merge branch 'efm32/cleanup' into next/dt 2014-03-17 10:14:20 +01:00
mach-mv78xx0 This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-mvebu mvebu fixes for v3.13 (incremental #2) 2014-01-31 14:59:28 -08:00
mach-mxs ARM: mxs: Add support for the eukrea-cpuimx28. 2014-02-09 21:33:20 +08:00
mach-netx
mach-nomadik
mach-nspire
mach-omap1 This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-omap2 Merge branch 'efm32/cleanup' into next/dt 2014-03-17 10:14:20 +01:00
mach-orion5x This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-picoxcell
mach-prima2
mach-pxa Merge branch 'efm32/cleanup' into next/dt 2014-03-17 10:14:20 +01:00
mach-qcom ARM: qcom: Rename various msm prefixed functions to qcom 2014-02-06 16:20:41 -06:00
mach-realview
mach-rockchip
mach-rpc
mach-s3c24xx This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-s3c64xx This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-s5p64x0
mach-s5pc100
mach-s5pv210
mach-sa1100 This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-shmobile Merge branch 'efm32/cleanup' into next/dt 2014-03-17 10:14:20 +01:00
mach-socfpga
mach-spear
mach-sti
mach-sunxi ARM: SoC platform changes for 3.14 2014-01-23 18:40:49 -08:00
mach-tegra ARM: driver updates for 3.14 2014-01-23 18:49:36 -08:00
mach-u300 ARM: SoC platform changes for 3.14 2014-01-23 18:40:49 -08:00
mach-ux500 mfd: dbx500/abx500: root out hardcoded IRQ assignments 2014-03-04 08:58:11 +08:00
mach-versatile This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
mach-vexpress
mach-virt
mach-vt8500
mach-w90x900
mach-zynq ARM: zynq: Reserve not DMAable space in front of the kernel 2014-02-10 10:45:42 -08:00
mm Merge branches 'fixes' and 'misc' into for-linus 2014-01-28 21:38:48 +00:00
net bpf: do not use reciprocal divide 2014-01-15 17:02:08 -08:00
nwfpe
oprofile
plat-iop
plat-omap This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
plat-orion mvebu fixes for v3.13 (incremental #2) 2014-01-31 14:59:28 -08:00
plat-pxa
plat-samsung MTD updates for 3.14: 2014-01-28 18:56:37 -08:00
plat-versatile ARM: SoC platform changes for 3.14 2014-01-23 18:40:49 -08:00
tools
vfp
xen xen/gnttab: Use phys_addr_t to describe the grant frame base address 2014-01-30 12:56:34 +00:00
Kconfig Merge branch 'efm32/cleanup' into next/dt 2014-03-17 10:14:20 +01:00
Kconfig-nommu
Kconfig.debug ARM: qcom: Split Qualcomm support into legacy and multiplatform 2014-02-06 16:20:26 -06:00
Makefile ARM: qcom: Split Qualcomm support into legacy and multiplatform 2014-02-06 16:20:26 -06:00