Commit Graph

6833 Commits

Author SHA1 Message Date
Linus Torvalds
35a9ad8af0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Pull networking updates from David Miller:
 "Most notable changes in here:

   1) By far the biggest accomplishment, thanks to a large range of
      contributors, is the addition of multi-send for transmit.  This is
      the result of discussions back in Chicago, and the hard work of
      several individuals.

      Now, when the ->ndo_start_xmit() method of a driver sees
      skb->xmit_more as true, it can choose to defer the doorbell
      telling the driver to start processing the new TX queue entires.

      skb->xmit_more means that the generic networking is guaranteed to
      call the driver immediately with another SKB to send.

      There is logic added to the qdisc layer to dequeue multiple
      packets at a time, and the handling mis-predicted offloads in
      software is now done with no locks held.

      Finally, pktgen is extended to have a "burst" parameter that can
      be used to test a multi-send implementation.

      Several drivers have xmit_more support: i40e, igb, ixgbe, mlx4,
      virtio_net

      Adding support is almost trivial, so export more drivers to
      support this optimization soon.

      I want to thank, in no particular or implied order, Jesper
      Dangaard Brouer, Eric Dumazet, Alexander Duyck, Tom Herbert, Jamal
      Hadi Salim, John Fastabend, Florian Westphal, Daniel Borkmann,
      David Tat, Hannes Frederic Sowa, and Rusty Russell.

   2) PTP and timestamping support in bnx2x, from Michal Kalderon.

   3) Allow adjusting the rx_copybreak threshold for a driver via
      ethtool, and add rx_copybreak support to enic driver.  From
      Govindarajulu Varadarajan.

   4) Significant enhancements to the generic PHY layer and the bcm7xxx
      driver in particular (EEE support, auto power down, etc.) from
      Florian Fainelli.

   5) Allow raw buffers to be used for flow dissection, allowing drivers
      to determine the optimal "linear pull" size for devices that DMA
      into pools of pages.  The objective is to get exactly the
      necessary amount of headers into the linear SKB area pre-pulled,
      but no more.  The new interface drivers use is eth_get_headlen().
      From WANG Cong, with driver conversions (several had their own
      by-hand duplicated implementations) by Alexander Duyck and Eric
      Dumazet.

   6) Support checksumming more smoothly and efficiently for
      encapsulations, and add "foo over UDP" facility.  From Tom
      Herbert.

   7) Add Broadcom SF2 switch driver to DSA layer, from Florian
      Fainelli.

   8) eBPF now can load programs via a system call and has an extensive
      testsuite.  Alexei Starovoitov and Daniel Borkmann.

   9) Major overhaul of the packet scheduler to use RCU in several major
      areas such as the classifiers and rate estimators.  From John
      Fastabend.

  10) Add driver for Intel FM10000 Ethernet Switch, from Alexander
      Duyck.

  11) Rearrange TCP_SKB_CB() to reduce cache line misses, from Eric
      Dumazet.

  12) Add Datacenter TCP congestion control algorithm support, From
      Florian Westphal.

  13) Reorganize sk_buff so that __copy_skb_header() is significantly
      faster.  From Eric Dumazet"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1558 commits)
  netlabel: directly return netlbl_unlabel_genl_init()
  net: add netdev_txq_bql_{enqueue, complete}_prefetchw() helpers
  net: description of dma_cookie cause make xmldocs warning
  cxgb4: clean up a type issue
  cxgb4: potential shift wrapping bug
  i40e: skb->xmit_more support
  net: fs_enet: Add NAPI TX
  net: fs_enet: Remove non NAPI RX
  r8169:add support for RTL8168EP
  net_sched: copy exts->type in tcf_exts_change()
  wimax: convert printk to pr_foo()
  af_unix: remove 0 assignment on static
  ipv6: Do not warn for informational ICMP messages, regardless of type.
  Update Intel Ethernet Driver maintainers list
  bridge: Save frag_max_size between PRE_ROUTING and POST_ROUTING
  tipc: fix bug in multicast congestion handling
  net: better IFF_XMIT_DST_RELEASE support
  net/mlx4_en: remove NETDEV_TX_BUSY
  3c59x: fix bad split of cpu_to_le32(pci_map_single())
  net: bcmgenet: fix Tx ring priority programming
  ...
2014-10-08 21:40:54 -04:00
Linus Torvalds
8b45bc892e ARM: SoC driver updates for 3.18
These are changes for drivers that are intimately tied to some SoC
 and for some reason could not get merged through the respective
 subsystem maintainer tree.
 
 Most of the new code is for the Keystone Navigator driver, which is
 new base support that is going to be needed for their hardware
 accelerated network driver and other units.
 
 Most of the commits are for moving old code around from at91 and omap
 for things that are done in device drivers nowadays.
 
 - at91: move reset, poweroff, memory and clocksource code into drivers
   directories
 - socfpga: add edac driver (through arm-soc, as requested by Boris)
 - omap: move omap-intc code to drivers/irqchip
 - sunxi: added an RTC driver for sun6i
 - omap: mailbox driver related changes
 - keystone: support for the "Navigator" component
 - versatile: new reboot, led and soc drivers
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAVDWWQGCrR//JCVInAQKX7Q//bDkoseKCZsGaXN7vfQ2YhT3SAc52mROV
 YQKdNmtMUrHqDgngATZTx5ogOh1hInnqueFjGGhfMYsHQO1Vj8+odj0r+4jhjuUY
 3YfY+qZ+91tq33JlUOhKn+mfVMdxJc8XarGgR6MSWYkqWVYCtLtBluum7hKm2UJ6
 /e4hd2zzImX5ATwj/LXWLx5eTf1qAVFGWzNUph1DrW+1V5lOu58X4gKwk1QOCVEh
 Pa0GV9oRTkjoswwz9drzjeFtie2yofQ2mygj6QKxg5NsosIF0+B8kJ61Sxwg56Ak
 tF+qn1hGtB2cDQkpxK4o2cZgCELhkh5Aqgol/vZUS1DMBSUEGCV9PPp2eOW83r3B
 0zsTgsShyVcTh7khdpQmHNRigvcc7e69LaAGC4o/RxaZpCU/LUNCQ+/iqVExSE8A
 VNEXr+JNxGxhj3m9KUHuEktdWx1oNvaYR8Rr4RPr6EWR8R6emJ04I7kXInvzhJZL
 HOGh75vSuAU83FrsP8fFRLadoHNVDXylAs38BPfGEMngVpjvwJLgQ3+729CwW+Q4
 +xQXAKSwKfr8xA8eg6wBSbFcwnEW4QwRqFqQ5XPw7zTZkCZbiLtvn3JpI5bH5A5Q
 /d2D+M2vFbB7VbWJBM4etO95eNS/pfhqJhcQh4t0DjXjoW6WqLiHCxhEx8Ogfvop
 /4ckyGvtEOI=
 =POJD
 -----END PGP SIGNATURE-----

Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC driver updates from Arnd Bergmann:
 "These are changes for drivers that are intimately tied to some SoC and
  for some reason could not get merged through the respective subsystem
  maintainer tree.

  Most of the new code is for the Keystone Navigator driver, which is
  new base support that is going to be needed for their hardware
  accelerated network driver and other units.

  Most of the commits are for moving old code around from at91 and omap
  for things that are done in device drivers nowadays.

   - at91: move reset, poweroff, memory and clocksource code into
     drivers directories
   - socfpga: add edac driver (through arm-soc, as requested by Boris)
   - omap: move omap-intc code to drivers/irqchip
   - sunxi: added an RTC driver for sun6i
   - omap: mailbox driver related changes
   - keystone: support for the "Navigator" component
   - versatile: new reboot, led and soc drivers"

* tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (92 commits)
  bus: arm-ccn: Fix spurious warning message
  leds: add device tree bindings for register bit LEDs
  soc: add driver for the ARM RealView
  power: reset: driver for the Versatile syscon reboot
  leds: add a driver for syscon-based LEDs
  drivers/soc: ti: fix build break with modules
  MAINTAINERS: Add Keystone Multicore Navigator drivers entry
  soc: ti: add Keystone Navigator DMA support
  Documentation: dt: soc: add Keystone Navigator DMA bindings
  soc: ti: add Keystone Navigator QMSS driver
  Documentation: dt: soc: add Keystone Navigator QMSS bindings
  rtc: sunxi: Depend on platforms sun4i/sun7i that actually have the rtc
  rtc: sun6i: Add sun6i RTC driver
  irqchip: omap-intc: remove unnecessary comments
  irqchip: omap-intc: correct maximum number or MIR registers
  irqchip: omap-intc: enable TURBO idle mode
  irqchip: omap-intc: enable IP protection
  irqchip: omap-intc: remove unnecesary of_address_to_resource() call
  irqchip: omap-intc: comment style cleanup
  irqchip: omap-intc: minor improvement to omap_irq_pending()
  ...
2014-10-08 17:37:16 -04:00
Linus Torvalds
eb785bef68 ARM: SoC DT updates for 3.18
As usual, this is the largest branch, though this time a little under
 half of the total changes with 307 individual non-merge changesets.
 
 The largest changes are the addition of new machines, in particular
 the Tegra based Chromebook, the Renesas r8a7794 SoC, and DT support
 for the old i.MX1 platform.
 
 Other changes include
 - at91: various sam9 and sama5 updates
 - exynos: much extended Peach Pi/Pit (Chromebook 2) support
 - keystone: new peripherals
 - meson: added DT for meson6 SoC
 - mvebu: new device support for Armada 370/375
 - qcom: improved support for IPQ8064 and MSM8x60
 - rockchip: much improved support for rk3288
 - shmobile: lots of updates all over the place
 - sunxi: dts license change
 - sunxi: more a23 device support
 - vexpress: CLCD DT description
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAVDWVG2CrR//JCVInAQJmARAAnU2I4VpJHlBeHC4CYr/GdRq0NqiFvQ38
 7N/zevUI4l150DtejltbOX71JGM9vD3hq8VXZYBCEpTbG4el9PzAq28Fomtt4tmC
 PGbczQY8ZMvY1/MOT3XLZAd3TSUL0TZRt97t9bdLif6QyPafel5o2pd8D2OG7h+L
 Awtyk9LobT9jU3muFX3ZUfB3Gg2sNKphZjox9Le3gVjGd6g5teEqqMAehK2Y7ArJ
 kixrKck4vgduDdZe59o2yApAUsfIQv/joqu68jv3MUQrKmk4s543+rIdGDuLF5bz
 mEo7qtMXujoNaF3CyLYNEF2ZExIOJDdtmrwjHY8oKIFtIeI/faIJmeSChwa6794t
 Njj5bbnL0Pt61l4gUSFk2hUFo28gpiEB+Mm0R4E1hdoG15Iv6E+lpy44EmEmfz1c
 9h0sATNGUrz18IrUk7jI1WwIaEJUwkbZ+8wKuWtvH+Z+mFA4ZlDykVcnVuELixpb
 vKmI3kcmEw2RsJjkYq3LcgXXQevE4mHRR1ow59yXTY6OR1LmVb7odKUwbrweofQO
 eytVb1deMeYXrBXT5/j6WmrlyDbYcuGsjO4WidT+zwYUiAMCE6bTpNwUWqumVEUv
 LjCBaN6BRIb89EBwt4xIvIu7ir9hNNRZnD8aa4afSzIYxknzZy73pjjT2+wu7jbU
 m15TwYyQG4E=
 =2Sq1
 -----END PGP SIGNATURE-----

Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC DT updates from Arnd Bergmann:
 "As usual, this is the largest branch, though this time a little under
  half of the total changes with 307 individual non-merge changesets.

  The largest changes are the addition of new machines, in particular
  the Tegra based Chromebook, the Renesas r8a7794 SoC, and DT support
  for the old i.MX1 platform.

  Other changes include
   - at91: various sam9 and sama5 updates
   - exynos: much extended Peach Pi/Pit (Chromebook 2) support
   - keystone: new peripherals
   - meson: added DT for meson6 SoC
   - mvebu: new device support for Armada 370/375
   - qcom: improved support for IPQ8064 and MSM8x60
   - rockchip: much improved support for rk3288
   - shmobile: lots of updates all over the place
   - sunxi: dts license change
   - sunxi: more a23 device support
   - vexpress: CLCD DT description"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (308 commits)
  ARM: DTS: meson: update DTSI to add watchdog node
  ARM: dts: keystone-k2l: fix mdio io start address
  ARM: dts: keystone-k2e: fix mdio io start address
  ARM: dts: keystone-k2e: update usb1 node for dma properties
  ARM: dts: keystone: fix io range for usb_phy0
  Revert "Merge tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi into next/dt"
  Revert "ARM: dts: hix5hd2: add wdg node"
  ARM: dts: add rk3288 i2s controller
  ARM: vexpress: Add CLCD Device Tree properties
  ARM: bcm2835: add I2S pinctrl to device tree
  ARM: meson: documentation: add bindings documentation
  ARM: meson: dts: add basic Meson/Meson6/Meson6-atv1200 DTSI/DTS
  ARM: dts: mt6589: Change compatible string for GIC
  ARM: dts: mediatek: Add compatible property for aquaris5
  ARM: dts: mt6589-aquaris5: Add boot argument earlyprintk
  ARM: dts: mt6589: Fix typo in GIC unit address
  ARM: dts: Build dtb for Mediatek board
  ARM: dts: keystone: fix bindings for pcie and usb clock nodes
  ARM: dts: keystone: k2l: Fix chip selects for SPI devices
  ARM: dts: keystone: add dsp gpio controllers nodes
  ...
2014-10-08 17:22:23 -04:00
Linus Torvalds
cf377ad7d4 ARM: SoC platform changes for 3.18
New and updated SoC support. Among the things new for this release are:
 
 - at91: Added support for the new SAMA5D4 SoC, following the earlier SAMA5D3
 - bcm: Added support for BCM63XX family of DSL SoCs
 - hisi: Added support for HiP04 server-class SoC
 - meson: Initial support for the Amlogic Meson6 (aka 8726MX) platform
 - shmobile: added support for new r8a7794 (R-Car E2) automotive SoC
 
 Noteworthy changes to existing SoC support are:
 
 - imx: convert i.MX1 to device tree
 - omap: lots of power management work
 - omap: base support to enable moving to standard UART driver
 - shmobile: lots of progress for multiplatform support, still ongoing
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAVDWVHWCrR//JCVInAQJQVw/+NEfKWh6blDvLEWHpkmBtzdsT3s+r1wwb
 ATtvd1Q7RlOMEbzxc2J87tJ44yHb64mSPBbC4BCGuQsM5IIvM4potmBphl/XxLfd
 b8PNcI6nvLO+FZOcgon0JWmvVnt+vLGKPUWzURXSRjdrpVRg2qyRpW+nPBnvX4HP
 qyzlSskkYzKm7WJQrIV1K3yYwRLrVZdz4DuF340mSFy+4H+uci2Fw91HJ9lKKmPS
 24Klx2Q4n6wfg946WazWtz21HjEBuMzRCq0CGZrwcTJffRyMxa4iq/kqE3xGbPtN
 onuP1gmAM7UOMewEvc1ZLycY7JyZ3mhKnKduqS/QN2JLLQEY2v1iYFnEKP8mHnnw
 ax6RVi91PC2MSLZyPcRtsegSKB9l16I7H+C5pgTOMgsSaqxSG1JtV1qZl3uwhBnE
 GB45KHPvTFojrH2+CqneNTLET1ozKgwtuHkWTG61/puYeap/VlpRU2OWj2mQF2E0
 SiBzmlbUBpSqzjFgVGD4ywKAuVA/WpJtaOB7Qg26GL2QoNKrY/wsUCY8hU742+jE
 b/N6obGcpmjytLkFRHx+AbYc75DHXkPtF4CWawDeQFW30LUeixZJqewQ61a56QF8
 49DbO6J+sR0n3xlteD49QdQJzDCtKw3BV+VQaFRcxqVDq4LJAxtUHJZ7c3iyvzEi
 6Yt+PsqSP7Y=
 =ZHtj
 -----END PGP SIGNATURE-----

Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC platform changes from Arnd Bergmann:
 "New and updated SoC support.  Among the things new for this release
  are:

   - at91: Added support for the new SAMA5D4 SoC, following the earlier
     SAMA5D3
   - bcm: Added support for BCM63XX family of DSL SoCs
   - hisi: Added support for HiP04 server-class SoC
   - meson: Initial support for the Amlogic Meson6 (aka 8726MX) platform
   - shmobile: added support for new r8a7794 (R-Car E2) automotive SoC

  Noteworthy changes to existing SoC support are:

   - imx: convert i.MX1 to device tree
   - omap: lots of power management work
   - omap: base support to enable moving to standard UART driver
   - shmobile: lots of progress for multiplatform support, still
     ongoing"

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (171 commits)
  ARM: hisi: depend on ARCH_MULTI_V7
  CNS3xxx: Fix debug UART.
  ARM: at91: fix nommu build regression
  ARM: meson: add basic support for MesonX SoCs
  ARM: meson: debug: add debug UART for earlyprintk support
  irq: Export handle_fasteoi_irq
  ARM: mediatek: Add earlyprintk support for mt6589
  ARM: hisi: Fix platmcpm compilation when ARMv6 is selected
  ARM: debug: fix alphanumerical order on debug uarts
  ARM: at91: document Atmel SMART compatibles
  ARM: at91: add sama5d4 support to sama5_defconfig
  ARM: at91: dt: add device tree file for SAMA5D4ek board
  ARM: at91: dt: add device tree file for SAMA5D4 SoC
  ARM: at91: SAMA5D4 SoC detection code and low level routines
  ARM: at91: introduce basic SAMA5D4 support
  clk: at91: add a driver for the h32mx clock
  ARM: pxa3xx: provide specific platform_devices for all ssp ports
  ARM: pxa: ssp: provide platform_device_id for PXA3xx
  ARM: OMAP4+: Remove static iotable mappings for SRAM
  ARM: OMAP4+: Move SRAM data to DT
  ...
2014-10-08 17:13:04 -04:00
Linus Torvalds
212fe84a6f ARM: SoC cleanups for 3.18
This time around, the cleanup branch contains mostly code removal. A number
 of board files for at91, imx and msm have become obsolete because of the
 DT conversion and are now ready to be removed. The OMAP platform has
 traditionally had its own DMA engine abstraction and as this is being
 phased out, a lot of the original code is now unused and can be removed
 as well.
 
 S3C24xx can be simplified now that the restart code is a proper device
 driver.
 
 Finally, a number of cleanups in shmobile are done to prepare for
 the addition of new code in other branches.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAVDWVEmCrR//JCVInAQIt+Q/+P9ABxjC/IjbTi2PN1MtBaaiFZajMj9pA
 h6UCsS08sUiOlr+jjl623evQqYswRk4aoOoPS6AiOYt0xUlAJ7euoOvo82Rjc+jy
 Yc4kRx/l7KffhaFGL2zQ0iLax9BH3fkAU5+fOEkq4QWpXzCX9WKWG+x6QYNnuRxy
 Y2jhjH13s/0EKl4hCBBS8LfEWyKmaFBwzKIVTS5IyBPrmu3dGaQS+zM0O65fWY6a
 eLMlsCgnfre4doy60YlZSNLA6Wc9gdBgyVi4wD90PVVnvs/IiSuS/6QABozKRp2t
 p+OH8Apgb1W+y5RL9+3nvTAF/jbLRhu3P7/DJcpQcd35RSDUdqCvQnNyaz4j/P3i
 hsZ67gY/1gIeI09vRHnnZL2Z6whmWVk4bhY9j0bbEnAjvtizWxmJxbboOQQQ0rv6
 UO2oqJ9hN99tf8aKiKK9//DLAAVoRHgJSDxgcC10XcH6JZzACX/9BFNC0X23gWBp
 QygtHFA6kSPW243j26/KVOjP/eUkekEVn89nqVwI3jJI2pwAjylFVEH3kNAZ/R88
 J68V4nwkqrQyAHG/WQo6GDjl5NQ/JeIUHvaAfjMUvFOIiaotkxMrw56hLGk2n1ZN
 QxlnxQJX+w+VvcUhuzu0YPdZnb5AWRV2R13JAoYBCfwWviqBDXJxysTA//4OR29p
 JAqXJqzGync=
 =Af7T
 -----END PGP SIGNATURE-----

Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC cleanups from Arnd Bergmann:
 "This time around, the cleanup branch contains mostly code removal.  A
  number of board files for at91, imx and msm have become obsolete
  because of the DT conversion and are now ready to be removed.  The
  OMAP platform has traditionally had its own DMA engine abstraction and
  as this is being phased out, a lot of the original code is now unused
  and can be removed as well.

  S3C24xx can be simplified now that the restart code is a proper device
  driver.

  Finally, a number of cleanups in shmobile are done to prepare for the
  addition of new code in other branches"

* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
  ARM: at91: Remove the support for the RSI EWS board
  arm: mach-omap2: Convert pr_warning to pr_warn
  ARM: OMAP: Remove unused pieces of legacy DMA API
  ARM: at91: remove board file for Acme Systems Fox G20
  ARM: orion5x: Convert pr_warning to pr_warn
  ARM: S3C24XX: remove separate restart code
  ARM: EXYNOS: Do not calculate boot address twice
  ARM: sunxi: Remove sun4i reboot code from mach directory
  ARM: imx: Remove mach-mxt_td60 board file
  ARM: shmobile: armadillo800eva legacy: Use rmobile_add_devices_to_domains()
  ARM: shmobile: r8a7740: Clean up pm domain table
  ARM: shmobile: r8a7740: Use rmobile_add_devices_to_domains()
  ARM: shmobile: sh7372: Make domain_devices[] static __initdata
  ARM: shmobile: mackerel: Make domain_devices[] static __initdata
  clocksource: tcb_clksrc: sanitize IRQ request
  ARM: at91/tclib: mask interruptions at shutdown and probe
  ARM: at91/tclib: move initialization from alloc to probe
  ARM: at91/tclib: prefer using of devm_* functions
  ARM: clps711x: Switch CLPS711X subarch to use clk and clocksource driver
  ARM: shmobile: r8a7791 is now called "R-Car M2-W"
  ...
2014-10-08 17:06:53 -04:00
Linus Torvalds
4a4743e840 ARM: SoC non-critical bug fixes for 3.18
These are bug fixes for harmless problems that were not important
 enough to get fixed in 3.17. The majority of these are OMAP specific,
 but there are also a couple for Marvell mvebu, cns3xxx, and others,
 as well as some updates for the MAINTAINERS file.
 
 In particular, Robert Jarzmik and Daniel Mack now volunteered to help
 out maintaining the PXA platform, Krzysztof Halasa took over the
 cns3xxx platform, Carlo Caione is the maintainer for the new Amlogic
 meson platform, and Matthias Brugger is now listed for the mediatek
 platform he recently contributed.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAVDWVUmCrR//JCVInAQLm9hAAmXeBRbFFSP5mhGcWW08ME0bparXsYzdB
 dHOpgsc/+sYiwv0UjQlMB16vfUsfzZEh0y5FY2fq8FeFuWcQloeEdPh3pKkC0SOz
 n6qhBMYERajZysQV+zj3ngFoSIDRDrpbyLMpXZCzLgjrO7zz2sqO8oglPYIyJ5mZ
 9YMES5KazmWpVzp2Y0O/ou5x9Gx9y7Mhq+8uhL/ACzkZCqfIm0PuAaZ5Tq72h2GG
 ibjwpGJ6d1dcINOKhsJzGb24wXtjd+mzONVnTTa0wOUzUsixB8kZJEmyQSNaet3P
 Cf/g+YoQaoJkbSR1QQUU+TxvJSC30APiy6B6KeCjl+rO6j28FbWfssi5plCp/24H
 fRfw6MLzYOjfVYZ87dXGAKmO8KYaJz0vvOgKBqfzFIZDJtYnWFsMZPu/Ml20wGOC
 A84sfsAyJI3lPf02XWBv7VBKPyTP9WlaiKzrlLzquNVLZhSkPd6SBSJGCb29WlzH
 h4vfSj2sK3+8UC0HB5ZBWwggdESqaloAjAHAdHk8dkCAkfjyUvjzorSTwaUmy8uc
 PU5Fifl7Pf18pZkj2rJ4mBuVUrxtlW33oXerf9iSaYVhJH/d0xfXca1mwcuKUWFv
 /pOe9c+XNZYzIZ6PWux/SqTSoe6Q6vi3KVBXjP+45cUHa0/uwgufO9vf+zCAfxV/
 +yg7aMWHJP8=
 =Smzi
 -----END PGP SIGNATURE-----

Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC non-critical bug fixes from Arnd Bergmann:
 "These are bug fixes for harmless problems that were not important
  enough to get fixed in 3.17.  The majority of these are OMAP specific,
  but there are also a couple for Marvell mvebu, cns3xxx, and others, as
  well as some updates for the MAINTAINERS file.

  In particular, Robert Jarzmik and Daniel Mack now volunteered to help
  out maintaining the PXA platform, Krzysztof Halasa took over the
  cns3xxx platform, Carlo Caione is the maintainer for the new Amlogic
  meson platform, and Matthias Brugger is now listed for the mediatek
  platform he recently contributed"

* tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (42 commits)
  MAINTAINERS: update Shawn's email address
  MAINTAINERS: condense some Tegra related entries
  MAINTAINERS: add Alexandre Courbot for Tegra
  MAINTAINERS: CNS3xxx and IXP4xx update.
  MAINTAINERS: Add maintainers entry for Mediatek SoCs
  arm, vt8500, LLVMLlinux: Use mcr instead of mcr% for mach-vt8500
  MAINTAINERS: add a third maintainer to mach-bcm
  CNS3xxx: Fix PCIe read size limit.
  CNS3xxx: Fix logical PCIe topology.
  CNS3xxx: Fix debug UART.
  MAINTAINERS: Add entry for the Amlogic MesonX SoCs
  MAINTAINERS: update ARM pxa maintainers
  ARM: at91/PMC: don't forget to write PMC_PCDR register to disable clocks
  ARM: at91: fix at91sam9263ek DT mmc pinmuxing settings
  ARM: mvebu: Netgear RN102: Use Hardware BCH ECC
  ARM: Kirkwood: Fix DT based DSA.
  ARM: OMAP2+: make of_device_ids const
  ARM: omap2: make arrays containing machine compatible strings const
  ARM: LPC32xx: Fix reset function
  ARM: mvebu: Netgear RN2120: Use Hardware BCH ECC
  ...
2014-10-08 17:03:09 -04:00
Rafael J. Wysocki
b2eed302b6 Merge branch 'pm-cpuidle'
* pm-cpuidle:
  drivers: cpuidle: initialize big.LITTLE driver through DT
  drivers: cpuidle: CPU idle ARM64 driver
  drivers: cpuidle: implement DT based idle states infrastructure
  cpuidle: big.LITTLE: add Exynos5800 compatible string
  cpuidle: Replace strnicmp with strncasecmp
  arm64: add PSCI CPU_SUSPEND based cpu_suspend support
  arm64: kernel: introduce cpu_init_idle CPU operation
  arm64: kernel: refactor the CPU suspend API for retention states
  Documentation: arm: define DT idle states bindings
2014-10-07 01:18:23 +02:00
Russell King
d5d1689224 Merge branches 'fiq' (early part), 'fixes', 'l2c' (early part) and 'misc' into for-next 2014-10-02 21:47:02 +01:00
Carlo Caione
d4ac2cfea7 ARM: DTS: meson: update DTSI to add watchdog node
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Carlo Caione <carlo@caione.org>
2014-10-02 22:27:42 +02:00
David S. Miller
739e4a758e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/r8152.c
	net/netfilter/nfnetlink.c

Both r8152 and nfnetlink conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-10-02 11:25:43 -07:00
Arnd Bergmann
4394a00145 mvebu DT changes for v3.18 (round 2)
- Armada XP
     - Add HW datasheet references to docs
 
  - Armada 370
     - Change internal registers to 0xf1000000 for Armada 370 RD board
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJULVkEAAoJEP45WPkGe8ZnXHMP/1nX+ChvRqYxf5cNqvjioUJQ
 LbpTvMZpunqMkhxk3Kg1rVBxsrDnZWQaTq9IM/yvV+W4g/9vnIymJR9xfhNP1IHr
 ZbunZt8ztnBfMxvMonuEa2kHVjrVs2ztb+ouz2ca4owtvh8SvgFZsY7CN0Jus9xQ
 WHIQ+wNt5deeJDQEH7jId1/DocSztyS/9p3L/Ft+z6KmY5ZAn68xoMD4TZ+Gv/mN
 ecdVu5uYWYg3wF+Tgtg2BHX0wQugRdDccQEocU/TPqvXCbx4Eo6oRTJSfHO57i3L
 hZpnvX7YVrpk25uOS4FWIpqfYMWp+zTecRHBlqrvxWlWdeVm2un96wdSEa7toCmf
 Xnc0ELraHNoK45MlRs8eznLw3JZy7485plLZ9aue88n0nqqzIl2q4RhMHrNoLxRG
 4/iHSB5AS/7hJxI95Tn/ALe7LF8Wd73kQI9PFXlmU1Rx+NLP+BPNTrqDEdBQzECW
 q7aEmf7vdx2QUQuzW1IvaBn6OHwGGinw3E/1wHx71L/IZ3wus09tKCtOF5tnhjuP
 3DF9G4fhXz9R6dAJqQExK0ejD5NgcrRho3vuLi9SkSaxtXQ1sObwHiVUDGFzGu5c
 fzQ6bEsaMARl4lHZJYtOxXOmtBq3df+/4XpDNZw/haS4hpY9md3TX3hTUHmYPq3S
 Zqr0zDOolNAtpxsybeLL
 =Cjp7
 -----END PGP SIGNATURE-----

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

Pull "mvebu DT changes for v3.18 (round 2)" from Jason Cooper:

 - Armada XP
    - Add HW datasheet references to docs

 - Armada 370
    - Change internal registers to 0xf1000000 for Armada 370 RD board

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'mvebu-dt-3.18-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: switch the Armada 370 RD board to internal registers at 0xf1000000
  Documentation: arm: add hardware datasheet reference for Marvell Armada XP
2014-10-02 17:08:24 +02:00
Arnd Bergmann
5a6da55f10 Few keystone DTS fixes for 3.18
- IO range fix for USB phy device
 	- Add missing dma-coherent property for K2E USB node
 	- Fix K2L MDIO start address
 	- Fix K2E MDIO start address
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJULA0zAAoJEHJsHOdBp5c/QlgQALfdqkrQATHc4Sp7dggM8XiY
 m52yGIu3X8qvQkD5B9HjHXmo3WuvFWloVuS20l1GwiG6g4nNI+RgMKe0+G1DVHaA
 QadQNm+H2TLlj906xY9ZrXs5igtZRwiIwooQDY/xTpbFoqIhwJAm6aD/i2/OFirx
 L/Z5fge9EaKsWATwmvDqyN9Beu+WD0HwmFMgIc10WH2VU/NaWPpj3Kmt4yIlpzEx
 KCmclHAokQcAQuigYg/6VAooifDQcPLjuqmt+d0BlxWn16twToGV+SDQMITiO10d
 mEWb/h6ugkzfZZgZcNSk8H0QsWP6Y9JCm3d7yH1KGJzkZxBzQ730e10QthtbGQ+W
 gpvWKPbbbS5+kT1QQ9pMaq9EuSS3rdXzhAcSj7uRDh1D0SFTRqsOpxIm8GLW16Dq
 FOiolVpGoXWu9m4OelhbFMAt/m/clQvtZq0o2+yEGLpkc0H5dVERTxyyrkVZaf5o
 LHBzWJu4bwV4ypcPIk6E7N1bbDqr4UZS/PvSJdfyM+nH7P3Ur4ZZ2kRA3VLxGkCI
 +GMlbQkIR/CF73vO4egdwCDEEgwCZjQiiGeCfm9ou/51JULhPucnXrPhVCivluK0
 9FbBWJu0k4E9nYqyTnfL1SfSdXO8wvixsPQ2cAHlP+/TkNTltbT2289ZDzNZgzg5
 UNAQOyr66EOsHcyrvgmX
 =rMKj
 -----END PGP SIGNATURE-----

Merge tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt

Pull "Few keystone DTS fixes for 3.18" from Santosh Shilimkar:

	- IO range fix for USB phy device
	- Add missing dma-coherent property for K2E USB node
	- Fix K2L MDIO start address
	- Fix K2E MDIO start address

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone-k2l: fix mdio io start address
  ARM: dts: keystone-k2e: fix mdio io start address
  ARM: dts: keystone-k2e: update usb1 node for dma properties
  ARM: dts: keystone: fix io range for usb_phy0
2014-10-02 16:47:40 +02:00
Grygorii Strashko
45aa70d1f7 ARM: dts: keystone-k2l: fix mdio io start address
The K2L MDIO io space has different start address.
Hence, fix it to be 0x26200f00 according to TRM.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-10-01 09:59:33 -04:00
Grygorii Strashko
9a84c8928d ARM: dts: keystone-k2e: fix mdio io start address
The K2E MDIO io space has different start address.
Hence, fix it to be 0x24200f00 according to TRM.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-10-01 09:58:25 -04:00
Grygorii Strashko
b741bb2878 ARM: dts: keystone-k2e: update usb1 node for dma properties
Keystone supports dma-coherent on USB master and also needs
dma-ranges to specify the hardware alias memory range in which DMA
can be operational.
Such configuration applied for USB0 devices, but It's missed for
USB1 device which is present only in K2E SoC - hence apply it.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-10-01 09:58:25 -04:00
Grygorii Strashko
cfb198ceed ARM: dts: keystone: fix io range for usb_phy0
The IO range size is set incorrectly for USB PHY0 deivice
it should be 24 instead of 32. Otherwise, It causes
USB PHY1 probing failure.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-10-01 09:58:25 -04:00
Antoine Ténart
75215193b9 ARM: dts: berlin: enable the Ethernet port on the BG2Q DMP
This patch enables the Ethernet port on the Marvell Berlin2Q DMP board.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-09-30 16:36:13 -04:00
Antoine Ténart
bdc06cd701 ARM: dts: berlin: add the Ethernet node
This patch adds the Ethernet node, enabling the network unit on Berlin
BG2Q SoCs.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-09-30 16:36:13 -04:00
Mike Turquette
38bf3a7978 Merge branch 'clk-pxa27x' into clk-next 2014-09-30 12:49:42 -07:00
Robert Jarzmik
85fe55c11a dts: add devicetree bindings for pxa27x clocks
Add the clock tree description for the PXA27x based boards.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2014-09-30 12:31:31 -07:00
Mike Turquette
24afc3852e Samsung clock patches for v3.18
1) non-critical fixes (without the need to push to stable)
 
 fa0111be4f clk: samsung: exynos4: remove duplicate div_core2 divider clock instantiation
 b511593d71 clk: samsung: exynos4: fix g3d clocks
 c142543001 clk: samsung: exynos4: add missing smmu_g2d clock and update comments
 22842d244a clk: samsung: exynos5260: fix typo in clock name
 e82ba578cc clk: samsung: exynos3250: fix width field of mout_mmc0/1
 59037b92f4 clk: samsung: exynos3250: fix width and shift of div_spi0_isp clock
 5ce37f2666 clk: samsung: exynos3250: fix mout_cam_blk parent list
 
 2) Clock driver extensions
 
 07ccf02ba5 dt-bindings: clk: samsung: Document the DMC domain of Exynos3250 CMU
 d0e73eaf19 ARM: dts: exynos3250: Add CMU node for DMC domain clocks
 e3c3f19bc6 clk: samsung: exynos3250: Register DMC clk provider
 4676f0aab9 clk: samsung: exynos4: add support for MOUT_HDMI and MOUT_MIXER clocks
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJUKcEKAAoJEIv3Hb8G/XruW/cP/34kC45bvMqXIIcDHq3CRRpG
 i3HgG3mJb/rSzE4rDMPBtBXmkp45tHfOh4npdw5Db/+Kpb6m22X0yEYmGtH5Yfpw
 thQEuAeCjL5jDob/YjbPHH1PeoBHy5LS5wgwaJIC/aLQj6od31mgWZabYpeVX3AE
 flrWoxVmFVWGUKqfk2hJMY7RVuJcNw2CyIJ/jK0V3zh05GM9e8sFulXY3vellofW
 6aSaRYWqD7QYlf9VSU0ECHpCoFTIRCDh0k/yafDZrvOyKuWfyvGYorGnLh3wE7S7
 bPi+fo47WKRtoiKEeQDa0egxq/fl0ksp3kubWZq09EQYKQE/pMHayCYyImxGyAeK
 gy0M6E8M3Xwf+Slg+xKrNRP89ExfW0ymTbaNMgKJf96ocQjSH93rcPZGrXhrPILT
 CV8jWNRSjNcAfAvuzH2CZiLfCrc9phTbz3WEce8D8zf14fPOkGrYQB0GMr1+HUj1
 4LL/3JcCt/3wrliSVim3eSf1lgUCLKocMM1lrzzc7JhBamKvesKU2gw+RRSg9Pe5
 gg7RPCSgQMieGp1yO8nNkbmZhhXPNIXoEHjMlS1XTymBHiG+24f1mX7Q/nfGD5mY
 VP7LKeLUIYKPQZlvM9d9Ko2Xt13ypDZLGAM/bmEtOoibeNbELbfzeIxiUkgkB6rE
 uADWSEd6SDyV+E6nK62z
 =MsKp
 -----END PGP SIGNATURE-----

Merge tag 'for_3.18/samsung-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tfiga/samsung-clk into clk-next

Samsung clock patches for v3.18

1) non-critical fixes (without the need to push to stable)

fa0111be4f clk: samsung: exynos4: remove duplicate div_core2 divider clock instantiation
b511593d71 clk: samsung: exynos4: fix g3d clocks
c142543001 clk: samsung: exynos4: add missing smmu_g2d clock and update comments
22842d244a clk: samsung: exynos5260: fix typo in clock name
e82ba578cc clk: samsung: exynos3250: fix width field of mout_mmc0/1
59037b92f4 clk: samsung: exynos3250: fix width and shift of div_spi0_isp clock
5ce37f2666 clk: samsung: exynos3250: fix mout_cam_blk parent list

2) Clock driver extensions

07ccf02ba5 dt-bindings: clk: samsung: Document the DMC domain of Exynos3250 CMU
d0e73eaf19 ARM: dts: exynos3250: Add CMU node for DMC domain clocks
e3c3f19bc6 clk: samsung: exynos3250: Register DMC clk provider
4676f0aab9 clk: samsung: exynos4: add support for MOUT_HDMI and MOUT_MIXER clocks
2014-09-29 23:43:12 -07:00
Markus Pargmann
fa5f4adf3a arm: dts: am33xx, Add syscon phandle to cpsw node
There are 2 MACIDs stored in the control module of the am33xx. These are
read by the cpsw driver if no valid MACID was found in the devicetree.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Reviewed-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-09-30 01:30:43 -04:00
Markus Pargmann
c9aaf87cd0 am33xx: define syscon control module device node
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Reviewed-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-09-30 01:30:43 -04:00
Linus Torvalds
8369289864 ARM: SoC fixes for 3.17
Here's our last set of fixes for 3.17. Most of these are for TI platforms,
 fixing some noisy Kconfig issues, runtime clock and power issues on
 several platforms and NAND timings on DRA7.
 
 There are also a couple of bug fixes for i.MX, one for QCOM and a small
 fix to avoid section mismatch noise on PXA.
 
 Diffstat looks large, partially due to some tables being updated and
 thus touching many lines. The qcom gsbi change also restructures clock
 management a bit and thus touches a bunch of lines.
 
 All in all, a bit more changes than we'd like at this point, but nothing
 stands out as risky either so it seems like the right thing to send it
 up now instead of holding it to the merge window.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJUJxVMAAoJEIwa5zzehBx3VVoP/3WeftI/+vncYhMmPCaUxOso
 B/rNY1CW2ZYr9yWEvREQtMQCkLWYPifeyHa+fXHeFfLGWlMP1wU4LP78RrvaMnSs
 V0d2wYmfTkSIlVwqRMuArY9KwnOTRSiDfhQpl2BQ84u1IaZM5/IRw9oNICTao8jI
 A7NsLAnss3exKCT06R3CcG7+fq3zVc19aI1QJG61BFqTIVItf71NTm/lcjsL3Tss
 Tr/ITTgZM6UGkEnTUuRCl3gpMn/TVvO/qE94xU6vY0jqDQKUl1cxUCx6gRcSDRu4
 PvLvPS7d4p99dHmLxVUuLBT7AGtRCxfdAoVE3D3rmGfcthDt1nFBgJfp6ekQZAM9
 ZfJnrvfHRLjl/lxQvWWkpuugu0z7GCFeXRFHN6aLsD6aRD4JmYoRuSeA0aXmTKyp
 oDcduXqYOImTcbUQ8G8n1YeK8BAVlL6PEZKvaIhjmxUWHVeGdpesz9s7TFBqGBBd
 F1EeCPtAczBpNJP4E/dRDzWYjp+lGyQs4dQEU+YpRe9drzJpw6GsDuaF78QP8A5a
 TEcc3y3o2FSNbGCw9qQ7pkgm76aS1YhLKMQb+2JXJptgwKMw3G6abMr+iomlm3Id
 DY8+WIBggx/gB5k/onFseZvjNxVKqQUeh31UT5e1v/9M4bCJvEcY+KeKcgjbPpy7
 GnGoXEvCnwZ7kPokqH0D
 =K6xV
 -----END PGP SIGNATURE-----

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "Here's our last set of fixes for 3.17.  Most of these are for TI
  platforms, fixing some noisy Kconfig issues, runtime clock and power
  issues on several platforms and NAND timings on DRA7.

  There are also a couple of bug fixes for i.MX, one for QCOM and a
 small fix to avoid section mismatch noise on PXA.

  Diffstat looks large, partially due to some tables being updated and
  thus touching many lines.  The qcom gsbi change also restructures
  clock management a bit and thus touches a bunch of lines.

  All in all, a bit more changes than we'd like at this point, but
  nothing stands out as risky either so it seems like the right thing to
  send it up now instead of holding it to the merge window"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  drivers/soc: qcom: do not disable the iface clock in probe
  ARM: imx: fix .is_enabled() of shared gate clock
  ARM: OMAP3: Fix I/O chain clock line assertion timed out error
  ARM: keystone: dts: fix bindings for pcie and usb clock nodes
  bus: omap_l3_noc: Fix connID for OMAP4
  ARM: DT: imx53: fix lvds channel 1 port
  ARM: dts: cm-t54: fix serial console power supply.
  ARM: dts: dra7-evm: Fix NAND GPMC timings
  ARM: pxa: fix section mismatch warning for pxa_timer_nodt_init
  ARM: OMAP: Fix Kconfig warning for omap1
2014-09-27 14:58:59 -07:00
Mike Turquette
4dc7ed32f3 Allwinner Clocks Additions for 3.18
The most important part of this serie is the addition of the phase API to
 handle the MMC clocks in the Allwinner SoCs.
 
 Apart from that, the A23 gained a new mbus driver, and there's a fix for a
 incorrect divider table on the APB0 clock.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUJm3zAAoJEBx+YmzsjxAgxJwQAJk3+Oq3J54jzRxKLGjUpfy9
 Ma9p/78ZSnYlYWrEn62vzu7sGeMJsPo4Lsmy+Hch2r765+PzFZw9oDaxjFT5poQy
 Mv8F7Uyetc99sGAfmg/fKnzgQpp1t+9+kB42cV6lzjXolqX/ACcIjzFOzROXEF9B
 2bnQ3RwXqvQhKKryDBg9+hJYt1R15d4SxQ7Rn6lb6WsZTxjGVO0cvvU3tp4QGQgg
 ZDUkJNLzLYdMK9XUNyqreatmz+HMxL5vYHeEWFz388ECp9DRUPT3MqlQcUqgSLlD
 eMqQPOnd5p5ZEUdB8qAAtf4kIbQTaVa7/4u37sE/+fogw6Pq/6a2Jqppl9aJWD7I
 PDFjxSMl77W5mQZSEanbc0a0qmqAqtZokDusP0bc0ETSZzmPVvohjW5Fa9Awyi0j
 PeN2bTglaFDPsHxKlQ31HF/e/almXkpiIXegeG0e/3VrGSrghFMQtqLEUXgVPu10
 4PV8x7O2ib1VVAowwOb10qGv0fLGC8UCqL9zXVNlCy268ijjKMlNyK3U1sllphba
 fWBYgtg9+1YHONI1SewuYibAqROC7ICDXiqDkJVb6UWmO39HBcOFDb3HJ0EIj8T4
 9v1clkVy1vONIqfvi1SeTekLovpROOxhxGtyXTpdx5qdlVhBjkEsNVHc5jh6BPHr
 o9TlBnnmIPajvF9wMN+H
 =ZkI9
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-clocks-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-next

Allwinner Clocks Additions for 3.18

The most important part of this serie is the addition of the phase API to
handle the MMC clocks in the Allwinner SoCs.

Apart from that, the A23 gained a new mbus driver, and there's a fix for a
incorrect divider table on the APB0 clock.
2014-09-27 12:52:33 -07:00
Maxime Ripard
7868c5ebdb ARM: sunxi: dt: Switch to the new mbus compatible
Now that we have a compatible of its own for the mbus clock, switch to it.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
2014-09-27 08:58:02 +02:00
Vincent Sanders
75c349062a ARM: 8153/1: Enable gcov support on the ARM architecture
Enable gcov support for ARM based on original patches by David
Singleton and George G. Davis

Riku - updated to patch to current mainline kernel. The patch
has been submitted in 2010, 2012 - for symmetry, now in 2014 too.

https://lwn.net/Articles/390419/
http://marc.info/?l=linux-arm-kernel&m=133823081813044

v2: remove arch/arm/kernel from gcov disabled files

Cc: Andrey Ryabinin <a.ryabinin@samsung.com>
Cc: Naresh Kamboju <naresh.kamboju@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Signed-off-by: Vincent Sanders <vincent.sanders@collabora.co.uk>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2014-09-26 14:39:57 +01:00
Arnd Bergmann
3a75d1ad9a Revert "Merge tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi into next/dt"
Apparently most of the newly added nodes had the same problem,
so instead of reverting the individual patches, this undoes
the effect of the merge and backs out all of them at once.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-09-26 14:17:26 +02:00
Olof Johansson
32bb231845 Revert "ARM: dts: hix5hd2: add wdg node"
This reverts commit 610bd8722e.

"ARM: dts: hix5hd2: add wdg node" causes a build breakage due to
an undefined constatns:

Error: arch/arm/boot/dts/hisi-x5hd2.dtsi:374.22-23 syntax error

(Don't you just looove the dtc error messages? They are so informative!)

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-25 17:42:58 -07:00
Arnd Bergmann
55c71581d4 Fixes non critical for AT91:
- mmc pinmux for at91sam9263 was missing
 - little fix of the old clock implementation
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJUIvtbAAoJEAf03oE53VmQMP4H/1e3NM8xP6ePHSDzYW/SyqGx
 IdFJwRff/FlHTzx23jND6z9SJDLTDu7NhUtABEsOIN+uJ28Vg9FLSR5+XqOfpbGt
 UH9M2Xxla0WClIUzNDcDTyX56vo/TT0M1lnfh7IvP4yR0iWghbvDIWj/4L5Zl52n
 bU1Ac+Spz4kuSShb6PSLxWfZXY7rlEFZbdOUd0ju2AqgLGbf+GeEWl4JcyPBb0id
 MrS2YN5yO+0Ts72QPX7mSDS+RCzTm5ncIw6aLfgJzC0vWWvV6AXn6w6nYNUm/o4+
 BlHZLHYOPVOLoz+uQE9biKcWeZhMR1orWkcIGXxfzao2cOm5WGa3CkuLd+dol2g=
 =VQv1
 -----END PGP SIGNATURE-----

Merge tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91 into next/fixes-non-critical

Pull "Fixes non critical for AT91" from Nicolas Ferre:

- mmc pinmux for at91sam9263 was missing
- little fix of the old clock implementation

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91:
  ARM: at91/PMC: don't forget to write PMC_PCDR register to disable clocks
  ARM: at91: fix at91sam9263ek DT mmc pinmuxing settings
2014-09-26 01:49:21 +02:00
Arnd Bergmann
01eacbb84c Samsung DT update for 3.18
- un-use slot-node and deprecate the supports-highspped
   for dw-mmc
 - remove old USB2 PHY node for exynos5250
 
 - exynos4412-odroid-common
   enable PMIC interrupt and i2c improvements
 
 - exynos5250-snow
   fold exynos5250-cros-common
   update display related nodes
 
 - Peach Pit and Pi
   improve power scheme, add support max77802 PMIC,
   add hdmi regulators add thermistor, ISL29018 sensor,
   set i2c clock at 400kHz, add support Atmel touchpad,
   update display related nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJUGLrUAAoJEA0Cl+kVi2xqpTgQAKXkcDw25ITAB/50rpnV0oi0
 qtM8sUA7MuZgtOA0ymQwV2/xGKei+KKYLT14Sgs8UWvQTGYBpj5p8xug35KP0e7Y
 ndpc3I6K9Jx1D3ICu9aEhbuIPNLGxGhxMhcVLrRoH0UTqgQkH2AUpEADuR43HZx7
 jD4wyJZtLhnKoiN8mPWto5tHXAUBG4iKHGYGkubfEGZUk1tHCbV6sBi1+6Dmc/gZ
 QmBrhbB69iSe2Rvza/s7XCTafV18AW7XiWjm/Un3C4ARdZ28YUD6o0Dqb/ol6Eoc
 rmyMxgNUyrabJrvrN9HUi6oXNGWcPl6a3oJoCoL0PL+9ks6pPRST+7rDCN5+a73Z
 xlNl1EiiwHpgXbDufQESMglhV63aJ9BCRpYrj3n2nkJc42qyJNfldjMlKacObqKd
 4S3sTIpfLI6WAk+7/RL47w9MMZtWtWOnJW4hgZ9OGiaRQe+i3lP2X/KYrsZcu/Zm
 ZSMjVSOPc1w+9KxHTbuhsqaHeeDEJRn4eg4xSs6jfCE93l+5qnSQqR0NMQuRtqVk
 4cL0AmowQUHX5dImKpBIg+CuMOvTayBG7ZvhPZSMCCDqm3fEhP5rmsh+NL0UozvH
 9+j9NZV0ZJ3Y+7xzbkww0K04sNKU9ojcj5GYaNYq0QEOM0DtKBlcdSaVyF4ANtJe
 Vv7zahRq1Ub2avVGQYd8
 =aaca
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt

Pull "Samsung DT update for 3.18" from Kukjin Kim:

- un-use slot-node and deprecate the supports-highspped
  for dw-mmc
- remove old USB2 PHY node for exynos5250

- exynos4412-odroid-common
  enable PMIC interrupt and i2c improvements

- exynos5250-snow
  fold exynos5250-cros-common
  update display related nodes

- Peach Pit and Pi
  improve power scheme, add support max77802 PMIC,
  add hdmi regulators add thermistor, ISL29018 sensor,
  set i2c clock at 400kHz, add support Atmel touchpad,
  update display related nodes

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: remove old USB2 PHY node for exynos5250
  ARM: dts: remove old USB2 PHY node hook for exynos5250-arndale
  ARM: dts: update display related nodes for exynos5800-peach-pi
  ARM: dts: update display related nodes for exynos5420-peach-pit
  ARM: dts: update display related nodes for exynos5250-snow
  ARM: dts: Add support Atmel touchpad for exynos5800-peach-pi
  ARM: dts: Add support Atmel touchpad for exynos5420-peach-pit
  ARM: dts: Set i2c7 clock at 400kHz for exynos based Peach boards
  ARM: dts: Add ISL29018 sensor for exynos based Peach boards
  ARM: dts: Add thermistor dts fragment used by exynos based Peach boards
  ARM: dts: add hdmi regulators for exynos5420-peach-pit
  ARM: dts: add hdmi regulators for exynos5800-peach-pi
  ARM: dts: Add support max77802 PMIC for exynos based Peach boards
  ARM: dts: Improve Peach Pit and Pi power scheme
  ARM: dts: unuse the slot-node and deprecate the supports-highspeed for dw-mmc in exynos
  ARM: dts: Fold exynos5250-cros-common into exynos5250-snow
  ARM: dts: Fix MMC pinctrl for exynos5250-snow
  ARM: dts: ODROID i2c improvements for exynos4412-odroid-common
  ARM: dts: Enable PMIC interrupts for exynos4412-odroid-common
2014-09-26 00:51:53 +02:00
Arnd Bergmann
8446cef1ca Keystone DTS updates for v3.18
- Add IRQ and GPIO nodes
 - Fix SPI chip select
 - Fix usb and pcie clock nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJUIHqLAAoJEHJsHOdBp5c/oAkP/izvFIgYHLD9un5BIlVmyxWk
 WaGFYCXKlIhN/pf0XIGQUjt39ohpXDi63T3vztua5Gk8HV8sCnm+m0aeBRiG1ezf
 M96FeYgcbxiM56dd261JIBeP10cIB44TChP81RFftWE8QTP3Tc6qy1gcjLI5Q7Ya
 7gDOcfhXLa46L7+dm/MBpF+THfJG8MhRro+jCxIYrJEut3/764+QbzemFQaMRzsv
 +L1w+6aayMl+wPMsKr0MiM09AaxmafMrJ9ek1P+uNnh1hbyMI1FY2cXURVflNGFg
 ca6kRxR3T3Lw6o9Ii4cMe0kN1WcN/Vnkl+uxOY12MYbi6tUqzSoM1/TnI4ohTCKf
 mv30yfvPPqvp7pcYgUuC9nCywgaD95CAKdcsJCt8lpFzhwf2StvHbMbIpIwmDKKN
 tTI7zz67zWpnqmBjNSgBL1G631rqvMkKSvLf4gyaBAFNozAX5NJFmUr0Fa48YckL
 XqbmLLmu8viqpuphWx3QHIeHceW/jNLFoYlefWdSlLwiWExrxuKq7tnCmMxyXlai
 clWhNL0LhNjB/g0G6fCmIUIYGqLoNhMUZwj8kHKFWdsYjSqHm+JFeTZ9o/uuKurq
 BEh2jJ1d01ZIaptpFU7SDPt3DKS2AZEPFUhGpJAg88tqYaHc9i7pjyy+sFf/1eya
 jWeWAycqkTQkCyG4eU9R
 =BjWz
 -----END PGP SIGNATURE-----

Merge tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt

Pull "Keystone DTS updates for v3.18" from Santosh Shilimkar"

- Add IRQ and GPIO nodes
- Fix SPI chip select
- Fix usb and pcie clock nodes

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone: fix bindings for pcie and usb clock nodes
  ARM: dts: keystone: k2l: Fix chip selects for SPI devices
  ARM: dts: keystone: add dsp gpio controllers nodes
  ARM: dts: keystone: add keystone irq controller node
2014-09-26 00:40:43 +02:00
Jianqun
a0f95e35c7 ARM: dts: add rk3288 i2s controller
Add dt for rk3288 i2s controller, since i2s clock pins and data pins
default to be GPIO, this patch also add pinctrl to mux them.

Tested on RK3288 board.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-09-26 00:38:53 +02:00
Arnd Bergmann
6d50424a39 Second SoC batch for 3.18:
- introduction of the new SAMA5D4 SoC and associated Evaluation Kit
 - low level soc detection and early printk code
 - taking advantage of this, documentation of all AT91 SoC DT strings
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJUIB6OAAoJEAf03oE53VmQL+IIALNg2XPS49u2Y6VMjL3srFLt
 7CUdNoGB7GJKoGrIXPSyAhJLkRlWREgRsEk/RSYqfBpyBZV4PIx9R6dIz1L+VxGU
 9neXLkZGrYNzN8qJPz82+ARuCXdCF13N8ClVfXkNDhwbDnlbZgTkh4hNV118mKLt
 +PF0d3w354ujieUD7D0pOcdRlny487qMNjtc/0U4P+H2sp2EtL0PpFHicn79InPT
 V36PpFtUMEgbw2wQPNtlFkjQWstyZ7WJJGUbIX/2P3PASCwKsgrbmkvDvmfp5tUT
 FdclJwJnxgcpni2fDvbz8Vq04i3hixl2Olm8tAvIXOI/hdVcurvZSfweJ5BrfDk=
 =fMfO
 -----END PGP SIGNATURE-----

Merge tag 'at91-soc2' of git://github.com/at91linux/linux-at91 into next/soc

Pull "Second SoC batch for 3.18" from Nicolas Ferre:

- introduction of the new SAMA5D4 SoC and associated Evaluation Kit
- low level soc detection and early printk code
- taking advantage of this, documentation of all AT91 SoC DT strings

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'at91-soc2' of git://github.com/at91linux/linux-at91:
  ARM: at91: document Atmel SMART compatibles
  ARM: at91: add sama5d4 support to sama5_defconfig
  ARM: at91: dt: add device tree file for SAMA5D4ek board
  ARM: at91: dt: add device tree file for SAMA5D4 SoC
  ARM: at91: SAMA5D4 SoC detection code and low level routines
  ARM: at91: introduce basic SAMA5D4 support
  clk: at91: add a driver for the h32mx clock
2014-09-26 00:15:09 +02:00
Arnd Bergmann
16529509a5 Changes to add dra7 PMU, display support for cm-t54, misc
changes needed for omap3 boards for device tree support.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUGztXAAoJEBvUPslcq6VzvYQP/RAqIs92dr8Xd0bhqUeIjnBC
 6tUjBowX1MvpeW9vkN6omBICzVnkZeuwTSLVYIeQlJQ0KH86Z8kMjcTVrBs9JPaZ
 KL71sw6TSf55Ljyb5ODwKDcErd45Vc3JrWmNCjk6yQAxWxmr5/IyEN/FIpVhxu5P
 vvTT1G9HmBdJOBc3FlHy2qdygnhOQHWZI4L3GMiDtJID1MJGIwm/rvniqG83qTlO
 5CbjY+AUcoTD2Ggt6IkWIarbgcTe8cTKKHvC0kw5l89VssVLVL4T47r9TgOQGsK4
 PpaCqkmcMGe0A3JSTZ+viCAbGVBmblakUpAugpk5cynz0IX1N2PHy1kAlP3v8g8j
 Oj4AJMgwa9gVXQb9ZOqyisjT6GlUwouWgioAg8+xouFpkQNyvkTnR8NZiupgzIN4
 CbPqLT8si1BUNQzbqvgTUmCyrlvdjc872XeAeKKiirXXp0ujYLBCe4RDKudyJLkE
 Ve+pjE3G0rYYXjlQivZyIQk+KVxrr0VjZiXHqLEO33bPp9YTBBjNQ/SYX6UQyTWC
 yXNLLD7iS9kTKDCv/p5Jg/1fr6EVkITyIMKSzOhdosNgKhFTpLflrKXf9mkPtBdV
 qQm62bFGIgpNnb/jIc0+gXcMlmSQYZdp5v2DkW7zaodFee99sm7XN9fFpYq1E8Q3
 3PFerwHRAxfnoOWW3VFA
 =7kOC
 -----END PGP SIGNATURE-----

Merge tag 'dt-part2-v2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "part 2 of omap dts changes" from Tony Lindgren:

Changes to add dra7 PMU, display support for cm-t54, misc
changes needed for omap3 boards for device tree support.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'dt-part2-v2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: DRA7: Add PMU nodes
  ARM: dts: cm-t54: setup omap_dwc3
  ARM: dts: cm-t54: add ADS7846 touchscreen support
  ARM: dts: cm-t54: add Startek LCD support
  ARM: dts: cm-t54: add HDMI/DVI display data
  ARM: dts: cm-t54: fix mux mode comment style
  ARM: dts: sbc-t54: fix mux mode comment style
  ARM: dts: Enable PMIC idle configuration for LDP
  ARM: dts: Add support for Ethernet on some N900 macro boards
  ARM: dts: Do not set pulls for I2C lines
  ARM: dts: omap: Remove WAKEUPENABLE mux options for UARTs
  ARM: dts: omap3-overo: Fix UART wake-up events
2014-09-26 00:08:06 +02:00
Arnd Bergmann
cd95427481 Few hwmod changes to support upcoming 8250 driver with DMA,
start using the SRAM driver for some omaps, and update the
 defconfig.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUGzhLAAoJEBvUPslcq6VzHcMQAK/WsTqmMgZ6ydOQGzOuyELi
 wLUrSdIHmw6vRYAdgWlXHS9X/F3avqS3tDXjUgW7801prbVn1MvSZ+Re3e862Md9
 GdDpB2Q1fV6J9BFXY8nENkHIf7S86Nnsa5yGh6i6IIPHizmb2jf2KrRRSrsrRVA4
 00PhmTlLaQb4Xuo4WG2PkOF/g10/vBqboRsG8Jhn9QTlBUYByYqNJJ3tKw9gHccr
 UdYe94XjX6HLfenSv/FeWobk1QMnNJdjXmj4obgZtauKku6ZUOA5y41spirry8Rg
 G9d+MJByrwG/2O2Vq71Ap0HSlGN00odlFco1FIUw8K3d5RVYD2VLDE+ROJiFBSKg
 yavCrmZj7aTh+fMZuvprFKo0PBMlqZMCCsokz51MWxql6Unt9eXKbAey40KtAoo6
 Y6Nq4ijdirJTWcdnKjk3dg4Mz6avHRSP+8YqndxNnnI1WS3++aI/GJNT5sCYuDG5
 DezFkKET3DvIpKxHByh+n+H6P8NV3MPQ6vvV2qZAv3mvnDdA109Rgb2XamHKgf6z
 dP76dA05K7/XFCRjZwbSAYJYAA3nU51fPkH1lO79oBwuP8OCqcBo6CAk22lXZupW
 Dkkk+LWhYRAEvExHVEUs6raGJErOrFLtWF3wLkWVjSWZDC+Pb5psHqzGw9ck2Po1
 aI+/ZyHh2P8Nl7X1G7kZ
 =iau9
 -----END PGP SIGNATURE-----

Merge tag 'soc-part2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

Pull "part 2 of omap SoC changes" from Tony Lindgren:

Few hwmod changes to support upcoming 8250 driver with DMA,
start using the SRAM driver for some omaps, and update the
defconfig.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'soc-part2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4+: Remove static iotable mappings for SRAM
  ARM: OMAP4+: Move SRAM data to DT
  ARM: AM335x: Get rid of unused sram init function
  ARM: omap2plus_defconfig: Enable some display features
  ARM: omap2plus_defconfig: Enable battery and reset drivers
  ARM: omap2plus_defconfig: Add support for distros with systemd
  ARM: omap2plus_defconfig: Add cpufreq to defconfig
  ARM: omap2plus_defconfig: Shrink with savedefconfig
  ARM: OMAP3: Use manual idle for UARTs because of DMA errata
  ARM: OMAP2+: Add hwmod flag for HWMOD_RECONFIG_IO_CHAIN
2014-09-26 00:00:02 +02:00
Arnd Bergmann
6839dbbb16 Second part of omap intc interrupt controller changes to
move it to drivers.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUGze9AAoJEBvUPslcq6VzL4oP/3WxH63RYT2eAyYQ8EGEpPiu
 puAfHh30Rrc+TH9ir51DbdXbcGnimOsJSHP89oEM309NKsMhezVx7htDAMKGguNt
 wH9uU9LSJtoAHiO06wQOQJCho2UCYd6Fywveauhauxw7k9EQ6uHZlN3q/knLH6r2
 2eV6E7aHeqwOWFlajOQywICeu7vlmYmEJCdrbcl+GAWzfzH+yiBHfJwzns1RIvmv
 A4qBHvbejL2053Iz4BpO+6iGBLfvzCjoNZn37i/Etc32MTf4cVLRXeoqQBTfthxS
 27R5CeT+EHTEU9q77uRF3R1t2PzoUZPx04zPEntYsiBLTRtlolbC6WrMAmPNKYS+
 ePwkbVNvhapXzKD5SlcaC+8aY29rToF4l7pCh7ARWG2IYMlZNWRgkeQPWS76LF2O
 53g/cy+FUaW2WSWjwL/ktnRdv50ShzUngcdaOrztK9mnF8MihlmbZwoTk5JLFQP6
 Ick7vc2SVVMP55d7tMhPWH7o07Xc0KvUb3goSvsA4z7KMopaqFAw5s6nZx2QwA6o
 LLJNbShIRPrsbi21dohkE/WUUAHFjFsWcckfzK9XKOMM9RRY6usAFVvp3XwM0326
 xRcd8vvAb5DP2nbBYxSqLYygCQKG80KlpF9Uvuk3NCK5aPo3gEcJs8/qzv5ZwFjq
 DIWYy/AVRYGQhY/8GJUP
 =cYAz
 -----END PGP SIGNATURE-----

Merge tag 'intc-part2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers

Merge "part 2 of omap intc changes" from Tony Lindgren:

Second part of omap intc interrupt controller changes to
move it to drivers.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'intc-part2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  irqchip: omap-intc: remove unnecessary comments
  irqchip: omap-intc: correct maximum number or MIR registers
  irqchip: omap-intc: enable TURBO idle mode
  irqchip: omap-intc: enable IP protection
  irqchip: omap-intc: remove unnecesary of_address_to_resource() call
  irqchip: omap-intc: comment style cleanup
  irqchip: omap-intc: minor improvement to omap_irq_pending()
  arm: omap: irq: move irq.c to drivers/irqchip/
  irqchip: add irq-omap-intc.h header
  arm: omap2: n8x0: move i2c devices to DT
2014-09-25 23:57:23 +02:00
Pawel Moll
478a4f81af ARM: vexpress: Add CLCD Device Tree properties
... for V2M-P1 motherboard CLCD (limited to 640x480 16bpp and using
dedicated video RAM bank) and for V2P-CA9 (up to 1024x768 16bpp).

Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-09-25 23:54:33 +02:00
Arnd Bergmann
e1e85e76ef Merge tag 'bcm63138-v4' of http://github.com/brcm/linux into next/soc
Merge "ARM: BCM: Broadcom BCM63138 support" from Florian Fainelli:

This patchset adds very minimal support for the BCM63138 SoC which is
a xDSL SoC using a dual Cortex A9 CPU complex.

* tag 'bcm63138-v4' of http://github.com/brcm/linux:
  MAINTAINERS: add entry for the Broadcom BCM63xx ARM SoCs
  ARM: BCM63XX: add BCM963138DVT Reference platform DTS
  ARM: BCM63XX: add BCM63138 minimal Device Tree
  ARM: BCM63XX: add low-level UART debug support
  ARM: BCM63XX: add basic support for the Broadcom BCM63138 DSL SoC

Conflicts:
	arch/arm/Kconfig.debug

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-09-25 23:50:02 +02:00
Mark Brown
667bbd5337 ARM: bcm2835: add I2S pinctrl to device tree
Signed-off-by: Florian Meier <florian.meier@koalo.de>
[Tweaked slightly to disable by default -- broonie]
Signed-off-by: Mark Brown <broonie@linaro.org>
[swarren, removed duplicate i2s node]
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-09-25 23:25:30 +02:00
Arnd Bergmann
0bee2b6f44 ARM: DT: Hisilicon terminal SoC HiX5HD2 DT updates for 3.18
- Add watchdog, gpio, sata, usb, mmc and gmac nodes in HiX5HD2 SoC DT
 - Enable sata and gmac in HiX5HD2 dkb board DT
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJUF8R5AAoJEGROujcbgXtLUtQP/A2nZVYqBAAdZCeflFyvphlg
 6Vl83VzcSo/vfzJ++u4Hq3OFxUMfnlV1oOfFIaT4OgKFElC5pWReVrmPhKkt1FxL
 lPQypxwsguj3ROX+/d0CS/7DZxbEFrpir20kZnj/jezCOxBHYXT9D1Q+iEZpENnM
 qiADLtJZi3bMwJVHpNEMAVQ6roPKwCkf4wieeP+jrdlubuY+voxkPkW6heh6JLxY
 6WBfpfor+SrY/1I9WpMrvu9i7kvbTbfpgW7PvNpfh8oitFN7rZZZ4KPcYBb3w5Sp
 ZAIgIQAQ1o7ZKJkCip6fE723mD4/gGMx+uLqNb6CZG+YAPyIchAkMH7QAyzEx4t0
 K8SCMhgtyf5Fc7VT0xH8I81eCQtq2LOeFEPrV7QikEkIi1b8Be3w+4nSOMErt46P
 rcQgZq+9Ads3qV9L/BZ8IiwEdW2a+5Nvrzs8bncaQArZ4fsTR5RMeqhcrmK7aVAY
 QRhbHi0yG3GVQpK+lyqKdvUG55C9sUekF1AAdo2tQJwQk+/Q0FzaMucrBOtC6f4H
 qPfuTJAnP9XyaQ216SS2+T7LLX27g0XkhB5T4VX1bi9UsO3Ucg539kWTUw+jODWz
 vYKis3jq7TJRrzuJgWQopaaY9J5xgNt25YdnkytY7xxbyP9R5jcJ13Srjztn9X7o
 l51xb8XM8sRB6tNOVRjT
 =BIjd
 -----END PGP SIGNATURE-----

Merge tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi into next/dt

Pull "ARM: DT:  Hisilicon terminal SoC HiX5HD2 DT updates for 3.18" from Wei Xu:

- Add watchdog, gpio, sata, usb, mmc and gmac nodes in HiX5HD2 SoC DT
- Enable sata and gmac in HiX5HD2 dkb board DT

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi:
  ARM: dts: hix5hd2: add wdg node
  ARM: dts: hix5hd2: add gpio node
  ARM: dts: hix5hd2: add sata node
  ARM: dts: hix5hd2: add usb node
  ARM: dts: hix5hd2: add mmc node
  ARM: dts: hix5hd2: add gmac node
2014-09-25 23:21:09 +02:00
Arnd Bergmann
cd7555aeae Allwinner DT Additions for 3.18
Mostly:
   - A23 bringup ongoing
   - New boards: HSG H702, Merrii A20 Hummingbird
   - sun(4|5|7)i DMA support
   - DT relicensing to a dual GPL/X11 license
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUHeJlAAoJEBx+YmzsjxAg+ucQAIRU5OYdzKt8shq4sVfn+X2E
 ST65yLSzDIOtsZzvojL8otyCiIaaMza5Q8K68bYPTPfGKM7fhDlP4ldWeOB2+sB7
 dnLYnUluLrK/aDn92DuaXqPmC7HI3R+QYElwfxNtc/39+DHJfjD1mHSiDcV856Lx
 zjh6b1dFced7JV4Gz9yxkzT0eWXOEvo2gI87vd/V4AlEAw4fzYkWBkHrYYlBLknj
 T2BGFOyZeXB6/DyaJjImLyjG4p7YqJMaICOC3JsRa/vAYmF1i39uRw0A3VTQCXxh
 CvoV8v9NjWmszDvHcrG7tA5gB3Y+jUGOkOdAhFuT0mm8GyzIaU6muRD/thhvhHg4
 JsUNIFnRRs/uRQTv+YSyXGupq9NZo1QtnTSRqKmPqZSDMf2KGaacntvzjoBX7NOQ
 aTauTfTnEshyI/XnCjQ4hxjAjbh3mSBLCTjlfFUllOQwHMFgFkTYCO1z6g6oRxQ4
 CZ6UZZ8LO/XfbfnaKh5WR2he/+cqgmdSvZWCB6B01QWY3ZqPn3OE83sCqNBv69P1
 aLzO173d4crL0lhEMCjHi4B9zVar05FTJ2VjEKRXRZ97NGpaCteY5sa9Ck3+jaDr
 vvlaqHK1rpYtLwXv6Um034AWVJ8SNSR1bHN4dzmwgjqtNmdz5Npv5YarTWz4CPuB
 MQaca/w/SKLq9jl9gtnv
 =PNFc
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt

Pull "Allwinner DT Additions for 3.18" from Maxime Ripard:

Mostly:
  - A23 bringup ongoing
  - New boards: HSG H702, Merrii A20 Hummingbird
  - sun(4|5|7)i DMA support
  - DT relicensing to a dual GPL/X11 license

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'sunxi-dt-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (30 commits)
  ARM: dts: sun8i: Add DMA controller node
  ARM: dts: sun5i: Add DT for HSG H702 tablet board
  ARM: dts: sunxi: Add fixed 5V regulator
  ARM: sun8i: Relicense the A23 DTSI under GPLv2/X11
  ARM: sun7i: Relicense the A20 DTSI under GPLv2/X11
  ARM: sun6i: Relicense the A31 DTSI under GPLv2/X11
  ARM: sun7i: Add support for Olimex A20-OLinuXino-LIME
  ARM: dts: sun7i: Add Merrii A20 Hummingbird board
  ARM: dts: sun7i: Add uart3/4/5, i2c3 and spi2 pinmux
  ARM: dt: sunxi: Remove i2c controller clock-frequency that matches default
  ARM: dts: sun8i: Enable i2c controllers on ippo-q8h-v5
  ARM: dts: sun8i: Add i2c controller nodes
  ARM: dts: sun8i: Add pin-muxing info for the i2c controllers
  ARM: dts: sun8i: Enable mmc controller on ippo-q8h-v5
  ARM: dts: sun8i: Add mmc controller nodes
  ARM: dts: sun8i: Add pin-muxing info for the mmc controllers
  ARM: dts: sun8i: Add mmc clocks to the dtsi
  ARM: dts: sun8i: ippo-q8h: Add pinctrl properties for R_UART
  ARM: dts: sun8i: Add pin muxing option for R_UART
  ARM: dts: sun8i: Add pinmux set for uart0
  ...
2014-09-25 18:13:49 +02:00
Arnd Bergmann
45c636b46e Fifth Round of Renesas ARM Based SoC DT Updates for v3.18
* Document manufacturer for KZM boards
 * Use SoC-specific irqc compatible property
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUG6yEAAoJENfPZGlqN0++CGUP/1XqrqiyBtjpcwn+PXbGDli/
 DBUpj3shuCG4nWmOxR2KYHP9KGHBOOdENr1vYNjOtYP8YY6uUcbwbl2uGcfjWyMT
 7BQOFIKpxVY8fsC0SPf+3UlqbX7JrPdhzavtJ5U/q/6/JI4B2baFk3f56Wp2YkRG
 As7xIu9ntbSj30MwXmYzZ0Ct5J5n6t+lPR4E628CuwnYVYbbtMXeN15d0ZL0z1o5
 u9DfH/gdhZVYBqHuuTbXyRE4TDXDNdKIQkxnmrPs3oH4j7rYzHA0/ImSor+t/uRl
 ANklHlVL8V2Sym7rCHeu0U2jdLmCRYLvzbpJz28xyTtWGNKAoWbB8Nixr/A6cNm5
 d4jcLfrt8wnARnLxg84aL9tvpSCBXWSnrNCDIM20LW8uphAqw7GolxW6kmeuKmJB
 VBTa5DSdbrimeedsBU6HS7rkBSJKqhPzF/DmOzKY4a+AOBEi2OgsUhhUYHTsyYPs
 jWPFB7ViqPmPaB4BUTaWIgnbK9dWmFKfhd8kr/DmkvvX/aw6Yul0ulAymU/SMIEU
 DgDJL8h4H1r5Zwak10lRCzNdDraip7ufqmLe31IefNg6Lsz+Gf5JypptQuSBIwDU
 QBemqhS/8yFQ+Cc8ae1v+gNgNXwUEmpVfefwnB5mr3250POPE9fjrX9IJsJGdwvw
 MED5gr3YDTvH5Ej7VJ6X
 =t5J9
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt5-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Pull "Fifth Round of Renesas ARM Based SoC DT Updates for v3.18" from Simon Horman:

* Document manufacturer for KZM boards
* Use SoC-specific irqc compatible property

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'renesas-dt5-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Add manufacturer for KZM boards
  ARM: shmobile: r8a73a4 dtsi: Add SoC-specific irqc compatible property
2014-09-25 18:08:56 +02:00
Arnd Bergmann
84bdd3a491 Since DT aren't fully enabled in pxa2xx, it's fine to merge them in v3.18
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUGxqOAAoJELXbXY/c+iv2UBIP/2Sh/qtZw3Z5dFNrtCz0VbLE
 v5wVhy03txuEqmHw5n0jE4TgQ3+ULUkDa6dIPEvNDRbp04riyd5Xacv2xAOifk8u
 1/GhxWhhDr8MsVptwUJO9VYUcXBpIkOWBEh+vMjfeyBuZTt1Bk+eHubBmYCb/IT8
 s+5rVcQPzTYJXQMMfntpzKX2xxIAzwHbsc7xC1VmnLazUs7kM3D18ra8m4ced1Mr
 oEGwJ8JCJXMm4UvUJ6eZekS5TscPIu5yjLmzu13nJwp1BsjoeIMIOsMCdl/MAPLL
 Ab4pqXubgDHzxGlV3k02o7XftCQGBdy3xjP320QdY0FTfSrtdi4ey6V7f4kV+6Gs
 JnJrdOj1pukfaFHiTWUt28w7vNBvfnwd65c0i5ZzefvOlUYl8IN8Mw/DTl3TxtGX
 XyxNXs6gdTH5eV0CVP5i8KaMXzwdmD2Pb0bTHpXmtT9i4J9AtLZHNYa7zl/E0R8a
 bWywK/gA8FZoykhzoY68jDCgy/ecbxu2D6Lo3IOYLaigT/vQtu75CKBUMCwT5FPD
 Zmqj8T0SKLcYuvfLLO2CJIzqvurakLJPw2ylbEqPa+HdhmTc8AUi3DjDD6sVXgUt
 pyeoHhq9erwU1/RDmIKH86OG3cRjLL1Xaat9nzMcZUcPpn9gvn5MlgcVPFOIwQ80
 rWKlJ0H/Z5Mp2gr1LMpV
 =v60b
 -----END PGP SIGNATURE-----

Merge tag 'pxa-fix-abi' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into next/dt

Pull "pxa2xx DT changes" from Haojian Zhuang:

Since DT aren't fully enabled in pxa2xx, it's fine to merge them in v3.18

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'pxa-fix-abi' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux:
  ARM: pxa: dts: fix ohci controller compatible string
  ARM: pxa: dts: fix mmc controller compatible string
2014-09-25 18:02:30 +02:00
Arnd Bergmann
ea62edd850 ARM: tegra: device tree changes for 3.18
The main highlights are:
 * SATA and PCIe support added to Tegra124, and enabled on Jetson TK1.
 * Touchpad enabled on Venice2 (although the driver still has a few issues
   to be worked out).
 * NVIDIA reference boards rely on the bootloader to program the pinmux.
 * Support added for the Acer Chromebook 13 (CB5).
 * DT nodes added for the Tegra flow controller HW module. This will
   help reduce use of iomap.h in a future code cleanup.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUGxqBAAoJEMzrak5tbycx+wEQAK6ZYRguvDAlCHWfleVYfoZd
 SFrexKADcTDy3Rvu6c3dXCsct/JLXR0ptkXmq+iLG6D9lQ5v/FYnFDeDq1GT0ftN
 TQLZVWEoFOt0KaVP2C8nwvEu0kCnXiUhljBONs+xQYExS06xOs9qJ3qBM3j7xpPT
 5teVF1zXCxDeXVeT6M2DqscEwZczIjgHeMfM18uIZfQE+HJv3DcIOevUygOyGW2V
 lNKdnVrqi3qJ7eZ6usuSb/K9ukNpDj8pLeb/qca275uSsLAoTpJ+Zx4iFb9ZDHy1
 e+VpL91CqOUXmp+lks54Wlsd//xz6IzK6E7B+kwsUMYFXSxXzqT0PJ2OEXsJtQ+1
 neQYiZwoGv1PLv13AnU2KlVz71PKdY+FUJ8hrndBFQXHUB9okkYGZabZEIC8dM34
 mM4rVGs1NPHwmaoJF6BPob7KFiUkH72oClSshlxSYm2l4smk7p2Wvp5oOm3f423P
 sEb8Ic4yjH8fBWuX+8NQX+jk6ut9tO9zGg0y2A1ouI71tOKuL+k3Jc2gKVcyt6EL
 j2Q5mHepT5FNTelkQw4aFPdT6YUrIGiuksrFYroYVZv1evEu4q2fzit6XzTc2WAh
 h4eI7tMl5DqcCy926rWq0Iz3tLkAuVygSV+yD2vS4ROCf60mtK9XjnHUtBM25rqT
 LgWisUN2swEhbTmvirY4
 =X2mr
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-3.18-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt

Pull "ARM: tegra: device tree changes for 3.18" from Stephen Warren:

The main highlights are:
* SATA and PCIe support added to Tegra124, and enabled on Jetson TK1.
* Touchpad enabled on Venice2 (although the driver still has a few issues
  to be worked out).
* NVIDIA reference boards rely on the bootloader to program the pinmux.
* Support added for the Acer Chromebook 13 (CB5).
* DT nodes added for the Tegra flow controller HW module. This will
  help reduce use of iomap.h in a future code cleanup.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'tegra-for-3.18-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: enable PCIe in Jetson TK1 DT
  ARM: tegra: add PCIe to Tegra124 DT
  ARM: tegra: rely on bootloader pinmux programming on Tegra124
  ARM: tegra: add Acer Chromebook 13 device tree
  ARM: tegra: Move pwm and dpaux labels to tegra124.dtsi
  ARM: tegra: add touchpad to Venice2 DT
  ARM: tegra: Add device tree nodes for flow controller
  ARM: tegra: add PCIe-related pins to the Jetson TK1 pinmux tables
  ARM: tegra: Add SATA and SATA power to Jetson TK1 device tree
  ARM: tegra: Add SATA controller to Tegra124 device tree
2014-09-25 17:54:32 +02:00
Arnd Bergmann
44086148bf More AT91 DT material for 3.18:
- specify DMA channels for USART on sama5d3 and choose peripherals
   that will use them on the EK boards
 - SSC update for audio on at91sam9rl and at91sam9g20
 - addition of the NFC clock and new pinctrl compatible string
   to use enhancements that will land in drivers during this release
 - several new nodes and fixes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJUGxCuAAoJEAf03oE53VmQDRYIAIMkFVY9ZfhVDD8BEwOXm5FL
 ZECxGAKxzoaN+P5DbDOqCWmW9juxLhJjxPrwmpoYi7ShG5exYGl2jUZiF6fRq/fH
 JJgSNKuNCLJbwlVWBo150v+2gRTyew3Pt8ijZWkzK06YPjW8Oxy3c4MjZ+wF2838
 k9jv/8dMT52nEr24x9Py0CPYR1Dh+EzFfoIXyJ4XM66CPIFfn4Ds4tz2gRhj7t2Z
 8NyGJ/F+fP3HB1ds3nauaS77XkulN5R/odIQchUzu4IO+mEQY9pbeVvyXWv97Y5T
 gL9AE5hcSwnE2xrXJGt2l2HV90FZMFU108WIKucca+RPOlfaB25fpMvMm8gAxDA=
 =fE/3
 -----END PGP SIGNATURE-----

Merge tag 'at91-dt3' of git://github.com/at91linux/linux-at91 into next/dt

Pull "More AT91 DT material for 3.18" from Nicolas Ferre:

- specify DMA channels for USART on sama5d3 and choose peripherals
  that will use them on the EK boards
- SSC update for audio on at91sam9rl and at91sam9g20
- addition of the NFC clock and new pinctrl compatible string
  to use enhancements that will land in drivers during this release
- several new nodes and fixes

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'at91-dt3' of git://github.com/at91linux/linux-at91:
  ARM: at91/dt: at91sam9m10g45ek add rtc node
  ARM: at91/dt: sama5d3: use new pinctrl compatible string
  ARM: at91/dt: sama5d3: add the nfc clock
  ARM: at91/dt: declare sckc node on at91sam9g45
  ARM: at91/dt: Fix typo regarding can0_clk
  ARM: at91/dt: at91sam9g20: switch ssc compatible string
  ARM: at91/dt: at91sam9rl: switch ssc compatible string
  ARM: at91: sama5d3xek: reserve dma channel for audio
  ARM: at91: sama5d3: add usart dma configurations
2014-09-25 17:50:36 +02:00
Arnd Bergmann
41c9002ad1 arm: Xilinx Zynq dt patches for v3.18
- Add eth phys
 - Add led for zc702
 - Various dts cleanups
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iEYEABECAAYFAlQYFewACgkQykllyylKDCGHKgCeJK4b6TUOD3UNQgI8qu8UkUPV
 UQwAnRH5BSaqtTkiasx6feLE7dKpNHeW
 =Trb8
 -----END PGP SIGNATURE-----

Merge tag 'zynq-dt-for-3.18' of git://git.xilinx.com/linux-xlnx into next/dt

Pull "arm: Xilinx Zynq dt patches for v3.18" from Michal Simek:

- Add eth phys
- Add led for zc702
- Various dts cleanups

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'zynq-dt-for-3.18' of git://git.xilinx.com/linux-xlnx:
  ARM: zynq: Add ISL9305 regulator on Parallella board
  ARM: zynq: DT: Add Ethernet phys
  ARM: zynq: DT: Fix coding style issues in dtsi
  ARM: zynq: DT: Describe interrupt-names for pl330
  ARM: zynq: DT: Extend compatible string for zedboard
  ARM: zynq: DT: Use 0x prefix for memory nodes
  ARM: zynq: DT: Update years in header
  ARM: zynq: DT: Move size/address properties to dtsi
  ARM: zynq: DT: Fix Ethernet phy modes
  ARM: zynq: DT: Add LEDs to zc702 DT
2014-09-25 17:47:26 +02:00
Arnd Bergmann
e36087998a arm: Xilinx Zynq cleanup patches for v3.18
- PM support
 - Fix L2 useless setting
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iEYEABECAAYFAlQYGFwACgkQykllyylKDCFI/ACeMQecelDM7sN3pOXVDA8unho5
 eqEAnjwQL/kw2p8jru1+t13V1SxThxKa
 =xfgX
 -----END PGP SIGNATURE-----

Merge tag 'zynq-cleanup-for-3.18' of git://git.xilinx.com/linux-xlnx into next/soc

Pull "arm: Xilinx Zynq cleanup patches for v3.18" from Michal Simek:

- PM support
- Fix L2 useless setting

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'zynq-cleanup-for-3.18' of git://git.xilinx.com/linux-xlnx:
  ARM: zynq: Remove useless L2C AUX setting
  ARM: zynq: Rename 'zynq_platform_cpu_die'
  ARM: zynq: Remove hotplug.c
  ARM: zynq: Synchronise zynq_cpu_die/kill
  ARM: zynq: cpuidle: Remove pointless code
  ARM: zynq: Remove invalidate cache for cpu die
  ARM: zynq: PM: Enable DDR clock stop
  ARM: zynq: DT: Add DDRC node
  Documentation: devicetree: Add binding for Synopsys DDR controller
  ARM: zynq: PM: Enable A9 internal clock gating feature
2014-09-25 17:42:57 +02:00
Carlo Caione
6b112e2414 ARM: meson: dts: add basic Meson/Meson6/Meson6-atv1200 DTSI/DTS
The Meson6 SoC is produced by Amlogic inc. and it is based on 2 Cortex
A9 and an ARM Mali-400 GPU.
This patch adds two basic DTSI for the preliminary support of Meson and
Meson6 SoCs. Another DTS is also added for supporting the atv1200 board,
produced by Geniatech inc.

Signed-off-by: Carlo Caione <carlo@caione.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-09-25 17:34:14 +02:00
Lorenzo Pieralisi
d2e5c871ed drivers: cpuidle: initialize big.LITTLE driver through DT
With the introduction of DT based idle states, CPUidle drivers for ARM
can now initialize idle states data through properties in the device tree.

This patch adds code to the big.LITTLE CPUidle driver to dynamically
initialize idle states data through the updated device tree source file.

Cc: Chander Kashyap <k.chander@samsung.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
2014-09-25 10:52:21 +02:00
Olof Johansson
9cd701648d The i.MX device tree changes for 3.18:
- Device tree support for i.MX ADS and Armadeus APF9328 boards
  - Enable thermal sensor support for i.MX6SL
  - Add LCD support for i.MX6SL EVK board
  - Fix display duplicate name for a bunch of board dts files
  - Configure imx6qdl-sabresd board pins locally to remove the dependency
    on bootloader
  - A set of imx28-tx28 board dts updates from Lothar
  - Add pci config space as platform resource
  - Enable devices RTC, I2C and HDMI for nitrogen6x board
  - Split HummingBoard DT to support s/dl and d/q
  - mSATA and IR input support for HummingBoard
  - Add SSI baud clock for i.MX6 device trees
  - Add USB support for vf610-colibri and vf610-twr boards
  - A set of cleanup and updates on Gateworks boards
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUF7RZAAoJEFBXWFqHsHzOFUgH/i/9xApJoCS4X5HcnS3p0uYO
 XLu9qkl4BgvlWTehOQlBBn4Nitv9A2b23BFkZ73+FMiM43NgEXTpitt1oTdO57tA
 lmOrtlIeKFGjLLwqBu0WL01VKaH7O6B4Qe09xv/Zx3wz4yYC9l/T23yQ/Z/UFJQT
 afqyzMrfzKd0WyE4RsuL/Ir94K9Y0FzWV1u8mhupYlqDdMop27XZRMD2CHs3W9PI
 v3c7hjXT4RtLdmvHWUSVg5xwBE7ntYysv7KlEsBebSQ6dkl5vIWDO37yuGQjUAB5
 v/Ro63UwM/wPqzq50VESG5c4/OWqz+xLN0r9z+csapDcezO86dCceeek0+qyjvY=
 =svCp
 -----END PGP SIGNATURE-----

Merge tag 'imx-dt-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

Merge "ARM: imx: device tree changes for 3.18" from Shawn Guo:

The i.MX device tree changes for 3.18:
 - Device tree support for i.MX ADS and Armadeus APF9328 boards
 - Enable thermal sensor support for i.MX6SL
 - Add LCD support for i.MX6SL EVK board
 - Fix display duplicate name for a bunch of board dts files
 - Configure imx6qdl-sabresd board pins locally to remove the dependency
   on bootloader
 - A set of imx28-tx28 board dts updates from Lothar
 - Add pci config space as platform resource
 - Enable devices RTC, I2C and HDMI for nitrogen6x board
 - Split HummingBoard DT to support s/dl and d/q
 - mSATA and IR input support for HummingBoard
 - Add SSI baud clock for i.MX6 device trees
 - Add USB support for vf610-colibri and vf610-twr boards
 - A set of cleanup and updates on Gateworks boards

* tag 'imx-dt-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (86 commits)
  ARM: dts: imx6: make gpt per clock can be from OSC
  ARM: dts: imx: ventana: add canbus support for GW52xx
  ARM: dts: imx: ventana: cleanup pinctrl groups
  ARM: dts: imx: ventana: configure padconf for all pins
  ARM: dts: imx: ventana: use gpio constants
  ARM: dts: imx: ventana: remove unused aliases
  ARM: dts: imx: ventana: remove unsupported dt nodes
  ARM: dts: imx28-tx28: add alias for CAN XCVR regulator
  ARM: dts: imx28-tx28: add spi-gpio as alternative for spi-mxs
  ARM: dts: imx28-tx28: use GPIO flags
  ARM: dts: imx28-tx28: remove spidev labels and add third instance of spidev
  ARM: dts: imx6sl: add baud clock and clock-names for ssi
  ARM: dts: imx6qdl: add baud clock and clock-names for ssi
  ARM: dts: imx6qdl-sabresd: Configure the pins locally
  ARM: dts: imx28-m28evk: Fix display duplicate name warning
  ARM: dts: imx28-tx28: Fix display duplicate name warning
  ARM: dts: imx28-m28cu: Fix display duplicate name warning
  ARM: dts: imx28-cfa100: Fix display duplicate name warning
  ARM: dts: imx28-apf28dev: Fix display duplicate name warning
  ARM: dts: imx28-apx4devkit: Fix display duplicate name warning
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-24 11:29:50 -07:00
Olof Johansson
14bbd322f4 The i.MX SoC updates for 3.18:
- Add initial devicetree support for i.MX1
  - Support GPT per clock source from OSC for i.MX6
  - A couple of parent selection corrections for i.MX6SL clock driver
  - Support more chip revision for i.MX6
  - Convert pr_warning to pr_warn
  - Add exclusive gate clock support
  - Add BYPASS support for i.MX6 PLL clocks
  - Update i.MX6 clock tree for audio use case
  - A couple of VF610 clock driver updates
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUF672AAoJEFBXWFqHsHzOTXQIAJ0ZTXtzQsJ3gLFU+CwRMm2F
 hIzFDNOsRkEYpJaa6AkweBmLyUUdePn9rUVRzCi4P9Ux5uCSU6sd3CPHOykOCrV4
 xGXk+hL47IpPNGP1tZ4NU7bVBz4BvrIkLRXBxlO+YZ2ZKf+k8Ma166c3iwYFqpDD
 8Fd7SQrKleZiXXDgz6y8SRCsOre3HmmjeJBBHhKuegSRscyh2cYfduBsmr6xTojR
 Jzcega1pprb1ojxflMVLHcGRquyYVHaoH65mD4leDhSWa93MZFCOAFCl27qsZNs5
 gTlaayqq8ws8aFOXi9OmONSjL+ZBMkf0Jk/QGOo5cLCUKYYv10KK2LXFeBOpg8A=
 =yLWI
 -----END PGP SIGNATURE-----

Merge tag 'imx-soc-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc

Merge "ARM: imx: SoC updates for 3.18" from Shawn Guo:

The i.MX SoC updates for 3.18:
 - Add initial devicetree support for i.MX1
 - Support GPT per clock source from OSC for i.MX6
 - A couple of parent selection corrections for i.MX6SL clock driver
 - Support more chip revision for i.MX6
 - Convert pr_warning to pr_warn
 - Add exclusive gate clock support
 - Add BYPASS support for i.MX6 PLL clocks
 - Update i.MX6 clock tree for audio use case
 - A couple of VF610 clock driver updates

* tag 'imx-soc-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (30 commits)
  ARM: imx_v6_v7_defconfig updates
  ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM
  arm: mach-imx: Convert pr_warning to pr_warn
  ARM: imx: source gpt per clk from OSC for system timer
  ARM: imx: add gpt_3m clk for i.mx6qdl
  ARM: imx: fix register offset of pll7_usb_host gate clock
  ARM: clk-imx6sl: refine clock tree for SSI
  ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3 driver
  ARM: imx6sx: add BYPASS support for PLL clocks
  ARM: imx6sl: add BYPASS support for PLL clocks
  ARM: imx6q: add BYPASS support for PLL clocks
  ARM: imx: add an exclusive gate clock type
  ARM: clk-imx6q: refine clock tree for SSI
  ARM: clk-imx6q: refine clock tree for ASRC
  ARM: clk-imx6sl: correct the pxp and epdc axi clock selections
  ARM: clk-imx6q: refine clock tree for ESAI
  ARM: clk-imx6sl: Select appropriate parents for LCDIF clocks
  ARM: clk-imx6sl: Remove csi_lcdif_sels[]
  ARM: imx: clk-vf610: Add USBPHY clocks
  ARM: imx: add cpufreq support for i.mx6sx
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-24 11:27:35 -07:00
Matthias Brugger
7e9b2828f2 ARM: dts: mt6589: Change compatible string for GIC
This patch changes the compatible string of the GIC to the
new "arm,cortex-a7-gic" which does reflect the actual hardware.

Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-24 11:12:32 -07:00
Matthias Brugger
6e9cb26336 ARM: dts: mediatek: Add compatible property for aquaris5
Add the missing 'compatible' property to device tree root node of

 - mt6589-aquaris5.dts

and document the new values.

Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-24 11:12:27 -07:00
Matthias Brugger
d82df11466 ARM: dts: mt6589-aquaris5: Add boot argument earlyprintk
Add boot argument for earlyprintk to the aquaris5 device tree file.

Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-24 11:12:21 -07:00
Matthias Brugger
510f1d72e5 ARM: dts: mt6589: Fix typo in GIC unit address
This changes the unit address of the gic node to it's first register area.

Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-24 11:12:17 -07:00
Matthias Brugger
995425883e ARM: dts: Build dtb for Mediatek board
This allows the "make dtbs" to build the aquaris5 dtb for the Mediatek
SoC.

Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-24 11:12:11 -07:00
Olof Johansson
3e32adc819 mvebu DT changes for v3.18
- Armada 375
     - Add RTC support
 
  - Armada 370
     - Add proper pinmuxing
     - Add SSCG
     - Add gpio-fan
     - Add LED support
 
  - change Intersil vendor prefix to isil
  - use improved Armada SPI compatible string
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJUFVaZAAoJEP45WPkGe8ZnuSEP/2zVmLwPblxQZxrGU71wup7L
 Ob7OSiNIoQI+n1dewGluBbPG+2mfdDTZ39OVzvHT4y/H1p4fyx1tN+ITlr5XDrmO
 cOcKgQzA1qLCVYtDb2PXuR99R1C7rx9yqE3Df4Tm1yKgmymSr3duIh1HU/FgyK4U
 KK+L/ZmvwUjEneiZ5Mjo1vQcBUFx2MN0EZKE9qnTnnVkT2MbA8UdwsBjsIsuXCpm
 7+YU7eiltfkJym19rjviw+WYIZySvHpq3Ydg2rn8znFGMpL7ZdGAXYhGwXytQlM0
 R6lYcfyeMKf+k75q6nDrH+Q8BCSsxxWjPpj0mfaiS1rVE7S8tuXW4geGC+DQIc8z
 PNPmIKFuEX2HR8jbtyMv3VJhyPvtdXG3WJdWFUFA6w+czJrd4rh+pc7QOV71hAuO
 T8FX8CU/cDSK9GyJH3Hbb7gU5wiwUyBS1ffsasAKWpAghVCnCShO1y2LefAtEYfH
 JTCcycJLTq0gMxClnaQQtp5tDtecTKI7gSEYw2NXmR61Yfqz9HrG5g82ONCY3KcP
 xs5q2PudK8sWsJBqTp+VGSf23+nACfZLMN/tCBPtCHLbT9/ktIxXtKa209zLkLaU
 xokh3Rx4+NBSKyXwn0uD/ohNZbOjf33NT27Yimv4FrqLNrW+89q/O9lKtzW/QMIx
 UC61fpH/F+8XNIlxAJvd
 =rLx3
 -----END PGP SIGNATURE-----

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

Merge "ARM: mvebu: DT changes for v3.18" from Jason Cooper:

mvebu DT changes for v3.18

 - Armada 375
    - Add RTC support

 - Armada 370
    - Add proper pinmuxing
    - Add SSCG
    - Add gpio-fan
    - Add LED support

 - change Intersil vendor prefix to isil
 - use improved Armada SPI compatible string

* tag 'mvebu-dt-3.18' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: add user LED support of Armada 370 RD
  ARM: mvebu: add gpio fan support to Armada 370 RD
  ARM: mvebu: Change vendor prefix for Intersil Corporation to isil
  ARM: mvebu: use improved armada spi device tree compatible name
  ARM: mvebu: add SSCG to Armada 370 Device Tree
  ARM: mvebu: Add proper pin muxing on Armada 370 RD board
  ARM: mvebu: Add proper pin muxing on Netgear ReadyNAS 104
  ARM: mvebu: Add proper pin muxing on Netgear ReadyNAS 102
  ARM: mvebu: Add proper pin muxing on the Armada 370 DB board
  ARM: mvebu: Add proper pin muxing on Globalscale Mirabox board
  ARM: mvebu: Add network pin mux configuration for the Armada 370 SoC
  ARM: mvebu: Add RTC support for Armada 375

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-24 10:39:10 -07:00
Andreas Henriksson
b65e0fb3d0 ARM: at91: fix at91sam9263ek DT mmc pinmuxing settings
As discovered on a custom board similar to at91sam9263ek and basing
its devicetree on that one apparently the pin muxing doesn't get
set up properly. This was discovered since the custom boards u-boot
does funky stuff with the pin muxing and leaved it set to SPI
which made the MMC driver not work under Linux.
The fix is simply to define the given configuration as the default.
This probably worked by pure luck before, but it's better to
make the muxing explicitly set.

Signed-off-by: Andreas Henriksson <andreas.henriksson@endian.se>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: <stable@vger.kernel.org>  # 3.11+
2014-09-24 17:47:21 +02:00
Olof Johansson
422d9abf99 mvebu fixes for v3.17
- kirkwood
     - final driver cleanup of ARCH_KIRKWOOD removal
     - fix DT based DSA
 
  - mvebu
     - use BCH ECC for the RN2120 and RN104/2 nand chips
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJUFVCDAAoJEP45WPkGe8ZnEYcP/1M3SDwvSk4lwXbvJnZQUo+H
 NS32Ve0O85ZAVgdV8KiETBq2DJS1rioYrJ4QK5t5NhTFBkNpLZ8R3H7TBbobohaq
 hVLEidOx8RoV/igsGzx1fCsmWSQN/v+qvaQxvmHUrvAcha9QkcluIJ7gIZ3Oe8iD
 L/VFCcJDInmXGNw9pmcz00NR4OUIkOuaYibgz6ZgpfeeZJ/rWtSJkYR9DmzzwwU7
 yj8CU8ErcrgAeqe8o3fCAENZmQmnG14B3fPfBvJU02GZzfLGUSbVNe6hP2DuKnP6
 xpx2CCA1tJaovD9AVu70/vbH/E2sOqaydV7CYXLGwKA3E5X2XAnVMzS9pWVwMFMk
 ed+31urGaLm74y4XBcGtGCqVTzP/xXEX0dsKhxqiEGyz/jf/E6LrcBIuEnTm4iYl
 p0tGlqwZb97hXORZDitry5hUrgJ7Yu6tGUAEeZ6hvvaLhCADMctoNeaavthmSI+w
 YsdvAMM31XxyRgvgERvZfk+eNraV+X5EXyBQzJ8880279aV640nq/LjDcrq3kOZz
 3FcdrRnX1fSyhUStbs+5h+T7vQ5zJd07xtvK0xsdl1g7DaqURCKgla/VZ2xJuNrf
 eK8NTERF0Y/nwUXeq37ETDx25Kd4wTGgitzNAW8gkVp3gIvxGDpjDBQvwY1Bc6Fz
 NQN0g0pX4TSgcXJywEoX
 =D/As
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical

Merge "mvebu fixes for v3.17" from Jason Cooper:

 - kirkwood
    - final driver cleanup of ARCH_KIRKWOOD removal
    - fix DT based DSA

 - mvebu
    - use BCH ECC for the RN2120 and RN104/2 nand chips

* tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Netgear RN102: Use Hardware BCH ECC
  ARM: Kirkwood: Fix DT based DSA.
  ARM: mvebu: Netgear RN2120: Use Hardware BCH ECC
  ARM: mvebu: Netgear RN104: Use Hardware BCH ECC
  cpufreq: Remove ARCH_KIRKWOOD dependency
  watchdog: Remove ARCH_KIRKWOOD dependency
  rtc: Remove ARCH_KIRKWOOD dependency
  leds: Remove ARCH_KIRKWOOD dependency
  thermal: Remove ARCH_KIRKWOOD dependency
  ata: Remove ARCH_KIRKWOOD dependency
  cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
2014-09-23 22:29:09 -07:00
Olof Johansson
fa0510fb21 More peripheral support for Rockchip SoCs
- dwc2 usb controllers
 - spi controllers
 - emmc controller
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJUH/JuAAoJEPOmecmc0R2BhJMH/3qVBTtvmBWOcV/aZldW+hqc
 IeJXmSE3R25+A5L2m0rkteat+0karR5eOFXMiDWr4IUChBdWdQtfuY/PM9szSs7d
 zwEFSpolAjlWPWfYvhBdaLopBgqGcVPJi+bp32TGYgUXz+cYuX0CACJO9noY9FwK
 PMdo8oGbiH0SYJgaTPGiE77wHNxvgNQUP2194SIJi5dYctQ2tla4DeuVCBW68PbN
 BPSGiWPGDouVm/H4Ut4dQMPo7Kn+go4xmjo0g8BHCVRz2SFu6gZ4hMEhy5J2YV5n
 WQm4wcJKD1qFIt8k1XZnzY/e7MM5Wlk/gFuRfcRsZcTOtTsi+rh7/52JOcagNtk=
 =4Z0Z
 -----END PGP SIGNATURE-----

Merge tag 'v3.18-rockchip-dts2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "second bunch of dts changes for 3.18" from Heiko Stubner:

More peripheral support for Rockchip SoCs
- dwc2 usb controllers
- spi controllers
- emmc controller

* tag 'v3.18-rockchip-dts2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Remove "regulator-always-on" in vcc_rmii for Radxa Rock
  ARM: dts: rockchip: fix rk3188 emmc pull references
  ARM: dts: rockchip: fix swapped Radxa Rock pinctrl references
  ARM: dts: rockchip: clean up rk3xxx mmc nodes
  ARM: dts: rockchip: add emmc nodes for rk3066 and rk3188
  ARM: dts: rockchip: add Cortex-A9 SPI controller nodes
  ARM: dts: rockchip: enable usb ports on Radxa Rock
  ARM: dts: rockchip: add dwc2 controllers for rk3066 and rk3188
  ARM: dts: rockchip: remove rockchip,bus-index from rk3xxx i2c0
  ARM: dts: Switch i2c0 to 400kHz on rk3288-evb-rk808
  ARM: dts: Add rk808 PMIC to rk3288-evb-rk808
  ARM: dts: Add mshc aliases for rk3288
  ARM: dts: Add SPI nodes to rk3288
  ARM: dts: Enable USB host1(dwc) on rk3288-evb
  ARM: dts: add rk3288 dwc2 controller support
  ARM: dts: Add sdio0 and sdio1 to the rk3288

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-23 22:27:51 -07:00
Olof Johansson
5f0798ce4a Qualcomm ARM Based Device Tree Updates for v3.18-2
* Added SDCC nodes on MSM8960/CDP and MSM8660/SURF
 * Added I2C and SDCC4/WLAN on APQ8064/IFC6410
 * Added I2C on MSM8984/DB8074
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 Comment: GPGTools - https://gpgtools.org
 
 iQIcBAABCgAGBQJUIHADAAoJEF9hYXeAcXzBXsMP/jW0q5mdEClCC9G0w9Qtr6g7
 8HXTDpRxxt4ToN6t5h5NBEGhayJzMxelk9CeNU0F/zUBJbBuldqLxD5GS3tYip+N
 O8/tjeyL0ulBLAX1R4c78TLiO5fBNz8Ce1OaNvNM3ExjWLhd3ITJWWRruPtxp23m
 BKTegtRB83eEVH2Cxt9k4vtl1cF934en0A++Sr+sCOM9HJn16s2hek/11MZLlXev
 p4ENj8FiX2F60oeAVIN2ErYwVVRCjv1GQ4oLnnX/UFrSJJ+1MeYttSQUzRENDllT
 7btWsTXOw+4om8/Eb2D9vWXdgM5ydL644B1EB7Pk4k0kmgjW33zCBa7Okxz5nUk8
 HJNolNNmuxNjcZTJSwYWR0PwscgVgm/Qw1IxlaKYHDGtZxDtu/NSObMtoIhBhQXb
 f28KctcR9+P65/FL7i+Y9Z9T84U3fgEzJXc+CN6Xqd/LT25t/u+PyD/rnHtIFzNr
 3dZWwS9N6SlDQOtjuLpAnqLHzdbHyRZ3XYQ4iOsDPNS4xjii0ZDcEnaaXGWSsKw9
 njxyDkVaH8wVSfhv1+xnGuK9RH0R1t3S8KlxADTXOS/wDBZO6iP+dCMtGGcRCmms
 xBqOSKpStI8arCcZITLVQX3SykTOT477DAjI9Z/z4kHd3J9g6ZknBFQPzgFJP1tC
 M5HiJReosU8QKUMJQNOh
 =lFYZ
 -----END PGP SIGNATURE-----

Merge tag 'qcom-dt-for-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/dt

Merge "qcom DT changes for v3.18-2" from Kumar Gala:

Qualcomm ARM Based Device Tree Updates for v3.18-2

* Added SDCC nodes on MSM8960/CDP and MSM8660/SURF
* Added I2C and SDCC4/WLAN on APQ8064/IFC6410
* Added I2C on MSM8984/DB8074

* tag 'qcom-dt-for-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: DT: msm8960: Add sdcc nodes
  ARM: DT: msm8660: Add sdcc nodes
  ARM: DT: apq8064: Add i2c device nodes
  ARM: DT: apq8064: add support to sdcc4 for wlan.
  ARM: dts: qcom: Add I2C dt node for MSM8974 and DB8074 board

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-23 22:26:28 -07:00
Olof Johansson
007c7fdbdf Qualcomm ARM Based Device Tree Updates for v3.18
* Added APQ8084 dt support for clocks, serial, pinctrl, and IFC6540 board
 * Added IPQ8064 dt support for basic SoC and AP148 board
 * Added APQ8064 dt support for pinctrl, reset, SDHC, and multimedia clocks
 * Added PMIC 8058 dt support on MSM8660, enables PMIC based power key,
   keypad, rtc, and vibrator
 * Added PMIC 8921 dt support on MSM8960, enables PMIC based power key,
   keypad, and rtc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 Comment: GPGTools - https://gpgtools.org
 
 iQIcBAABCgAGBQJUE0thAAoJEF9hYXeAcXzB1LcQAJNWsOLCGdq966OZDs6gC78k
 +aCfW4EtoqgzC3auNVkgeAhz35p0GkmNTMBOoEpAH1UF7lavUM3v7EpKr29b2iKw
 tcfcvYddgHcfXuVVoR+QE/cf8Z36utQN5fdEJgmwWD4RQJGdfXrSP1dZQ7PVMCt+
 LIVMEdD70Jc404FqQnUW0jLG9f7vOyM62HcuDGjh7l1HHA0I36476zFGlTzym+tn
 NrNJV1BZHcCgIq2iVUMyCj+rlB4QTrNd8xLwddA3vV02xgyFmpWVEnX0MJVACpwl
 uIRWZe3IlNSdMsEE0mAHBjuuyjdDtnR52V7OEepd8XqA9js4RwltlFIpeXysVEcq
 e8yzpAY4AgXy11oKWPH0zR9ErpxKr/VWXEuB+XW3oqgFs9t29GcCttf6zXwOdtIf
 p958ARd3KfPVFcSr3OHsqWXLBBI9IKoS42v8KLZ8k54WBg4Pc/pcsDSvOAu65D5o
 CTF/ECfBOHGnrbXmFWIIprLWsbakEzbknb8OuETP44h1FNEWZJIak3HusWKhJLSQ
 OBnI9/jPTGeKYepb0Zf5ZoRfZ55oAfa8Jx1YJEjzcfIuIPfogD3EACtElQa3wwhO
 MowBggkdc6HxEdCc98qHPlvQtMUjTzC0MteII0/M+/ZPvXHSEzFp1NAGZwoj1y4Y
 6UMGNmhnRBv83NKqo2lE
 =L0k9
 -----END PGP SIGNATURE-----

Merge tag 'qcom-dt-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/dt

Merge "qcom DT changes for v3.18" from Kumar Gala:

Qualcomm ARM Based Device Tree Updates for v3.18

* Added APQ8084 dt support for clocks, serial, pinctrl, and IFC6540 board
* Added IPQ8064 dt support for basic SoC and AP148 board
* Added APQ8064 dt support for pinctrl, reset, SDHC, and multimedia clocks
* Added PMIC 8058 dt support on MSM8660, enables PMIC based power key,
  keypad, rtc, and vibrator
* Added PMIC 8921 dt support on MSM8960, enables PMIC based power key,
  keypad, and rtc

* tag 'qcom-dt-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: DT: QCOM: apq8064: Add dma support for sdcc node
  ARM: DT: apq8064: Add sdcc support via mcci driver.
  ARM: dts: qcom: Add 8064 multimedia clock controller node
  ARM: DT: APQ8064: Add node for ps_hold function in pinctrl
  ARM: DT: APQ8064: Add pinctrl support
  ARM: dts: qcom: Add TLMM DT node for APQ8084
  ARM: dts: qcom: Add initial IFC6540 board device tree
  ARM: dts: msm: Add 8058 PMIC to ssbi bus
  ARM: dts: msm: Add 8921 PMIC to ssbi bus
  ARM: qcom: Add initial IPQ8064 SoC and AP148 device trees
  ARM: dts: qcom: Add APQ8084 serial port DT node
  ARM: dts: qcom: Add APQ8084 Global Clock Controller DT node

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-23 22:25:53 -07:00
Olof Johansson
c8bc4dceb7 ARM: mach-hisi: Hisilicon hip04 soc and D01 board updates for 3.18
- Add the CONFIG_MCPM_QUAD_CLUSTER configuration to enlarge cluster number from 2 to 4
 - Enable MCPM on HiP04 SoC
 - Enable 16 cores on HiP04 SoC
 - Add platform & Fabric controller devicetree binding document for HiP04 SoC
 - Add hip04.dtsi & hip04-d01.dts for hip04 SoC platform and D01 board
 - Enable HiP04 SoC in both hi3xxx_defconfig & multi_v7_defconfig
 - Add the support of Hisilicon HiP04 debug uart
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJUEp9QAAoJEGROujcbgXtLyxAQAIns/8tZw6XpomoeAk31l/Fv
 K02HNScUlrR/ZY9A8AWg65vMhM0L4W1dQeLplHYAZ9jKclWCfBhtUvb3aWPe9R7R
 A8Vb4DN5cenJwOs9nfSMrhlpVdIgCK8RtbmVfW7zd2GB8S2K1o4O13fDygxPwZR9
 7CpsGLttaPYmAe5T/B1IOEEDixIQ/F5++xaPOIurnRFwdl5CR/pAoY0xwA05Qtoc
 7vvPWqs1FCcccc8s6fYBiOdIIRKj08FVsvLfjul53YL0tmwxNjGWdfNuDPr45dPw
 6ExbcSJCS2t31DPKW1WCKdw6sYkdMmH2KIQXfn2AntFmcFPTEY4J/v4/mAVDwdVq
 1cqf9zjEPQOm9n9ss/FV6AkVop3dEubjzWhfX2E9DPVYmYnzGXnCEZgHpMC6Pytk
 wI+gbKNRjhWE8rZMg0dwkODNyjfrOm38C4OPrE4ISP2kdh7uI8G4Foq9eHYD0Hp8
 XQ5krGqCb9S52+DH12Am8b3RJLk9C4RngZS9f3W+Tf15REQuEjl1xHa7q5vm+K/f
 C5gk6GFeWay06A/fSNBc3J4Nru6UmiRjZ8VkzB45VuvXnDmyyiAE3HxFdS/6pcZY
 8G9O+C/QuAKB6/e5Y4wgU0NNQxkfRE1wSiPgdoIi5Qd3zJ9JllpHjUwt9mV+X0EG
 BQeDWFtFIuQzVwZt6SO7
 =YL0t
 -----END PGP SIGNATURE-----

Merge tag 'D01-for-3.18' of git://github.com/hisilicon/linux-hisi into next/soc

Merge "pull request for hisilicon hip04 soc and D01 board updates" from Wei Xu:

ARM: mach-hisi: Hisilicon hip04 soc and D01 board updates for 3.18

- Add the CONFIG_MCPM_QUAD_CLUSTER configuration to enlarge cluster number from 2 to 4
- Enable MCPM on HiP04 SoC
- Enable 16 cores on HiP04 SoC
- Add platform & Fabric controller devicetree binding document for HiP04 SoC
- Add hip04.dtsi & hip04-d01.dts for hip04 SoC platform and D01 board
- Enable HiP04 SoC in both hi3xxx_defconfig & multi_v7_defconfig
- Add the support of Hisilicon HiP04 debug uart

* tag 'D01-for-3.18' of git://github.com/hisilicon/linux-hisi:
  ARM: debug: add HiP04 debug uart
  ARM: config: enable hisilicon hip04
  ARM: dts: add hip04 dts
  document: dt: add the binding on HiP04
  ARM: hisi: enable HiP04
  ARM: hisi: enable MCPM implementation
  ARM: mcpm: support 4 clusters

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-23 22:21:04 -07:00
Olof Johansson
8adc36bcd3 Changes for .dts files for omaps for v3.18 merge window:
- Updates for gta04 to add gta04a3 model
 - Add support for Tehnexion TAO3530 boards
 - Regulator names for beaglebone
 - Pinctrl related updates for omap5, dra7 and am437
 - Model name fix for sbc-t54
 - Enable mailbox for various omaps
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUEhVBAAoJEBvUPslcq6VzQYAQAKDnfBYh1UWb5hA7IQtmutih
 ITnsvB0lhrAK9SRNk3UCmTdLMnc18ZYfA/DBht/tQ8OM53GKA8TF1rmWjuIk9HWa
 2cMHuCYa/n96Wkrue1j3M6iaUqT8tS78lX/dKHueF7RGVrc40v5m6vXOLR7Kh97w
 LIARYZb5xmoFU6kIHrUdNEJ1xyp02qCIkwHK4xIiCQp61OYNYYpXHiyjnIg43U65
 duNVXAkTGArYSR0qJUi7Nu9gmakRJVG8vTm9sVyDvHuF9uDbrjRUb9pzLV0j4P0t
 Xf5ze4FPUTPQEc5AjaK3LgIEhnvT2OYIDlMFsJfwFfeVByWOlxDLiJ1LurK6oZrH
 lPRF81bP8VS/0th7/HUGGxPO3ddHbtPJHyJxgrOW6Gf4OC5X+HDajrovSTr/j0bq
 5CK3bpIMYLoYDzWcXreAueMI5Un77UsOxIR80gvwMbFIeAQUzz0OdvfjxmFX1keE
 PaMDv6mk1LE2vm32KGVbwwU7ep800bCWNOb2iAuBb4bQh0k6EkxEOnhQgQiYgSsP
 k3intuxCHVCwMDs29bM4cYlLVwXer6cAVLd6rSlyI3SaoLnAaeP7lqP9yLKS9Dbj
 tewUG1y67ReYyliqrv3BuZhQZwdSJ6Mgp6JS0aWE0iJbm5fPCyHYobsIh/NKFKoR
 zBTcOFc1uK+Vi/Q+mXa6
 =i9cD
 -----END PGP SIGNATURE-----

Merge tag 'dt-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Merge "omap dts changes for v3.18 merge window" from Tony Lindgren:

Changes for .dts files for omaps for v3.18 merge window:

- Updates for gta04 to add gta04a3 model
- Add support for Tehnexion TAO3530 boards
- Regulator names for beaglebone
- Pinctrl related updates for omap5, dra7 and am437
- Model name fix for sbc-t54
- Enable mailbox for various omaps

* tag 'dt-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (291 commits)
  ARM: dts: OMAP2+: Add sub mailboxes device node information
  ARM: dts: dra7-evm: Mark uart1 rxd as wakeup capable
  ARM: dts: OMAP5 / DRA7: switch over to interrupts-extended property for UART
  ARM: dts: AM437x: switch to compatible pinctrl
  ARM: dts: DRA7: switch to compatible pinctrl
  ARM: dts: OMAP5: switch to compatible pinctrl
  ARM: dts: am335x-boneblack: Add names for remaining regulators
  ARM: dts: sbc-t54: fix model property
  ARM: dts: omap5.dtsi: add DSS RFBI node
  ARM: dts: omap3: Add HEAD acoustics omap3-ha.dts and omap3-ha-lcd.dts (TAO3530 based)
  ARM: dts: omap3: Add Technexion Thunder support (TAO3530 SOM based)
  ARM: dts: omap3: Add Technexion TAO3530 SOM omap3-tao3530.dtsi
  ARM: OMAP2+: tao3530: Add pdata-quirk for the mmc2 internal clock
  ARM: OMAP2+: board-generic: add support for AM57xx family
  ARM: dts: dra72-evm: Add tps65917 PMIC node
  ARM: dts: dra72-evm: Enable I2C1 node
  Linux 3.17-rc3
  unicore32: Fix build error
  vexpress/spc: fix a build warning on array bounds
  spi: sh-msiof: Fix transmit-only DMA transfers
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-23 22:11:25 -07:00
Olof Johansson
9cdf6bd510 Interrupt code related clean-up for omap2 and 3 to make
it ready to move to drivers/irqchip. Note that this series
 does not yet move the interrupt code to drivers, that will
 be posted separately as a follow-up series.
 
 Note that this branch has a dependency to patches both
 in fixes-v3.18-not-urgent and soc-for-v3.18 and is based on
 a merge. Without doing the merge, off-idle would not work
 properly for git bisect.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUEhOaAAoJEBvUPslcq6VzdOIP/33RC/kf5aUMBvSM/lvie/ZF
 Au9Ns6lmHvPagHtgPkbtlQvXjLBZXv3S3fSLvhvuGHQgwC/U7JvD7iBzTc5MQQmE
 nIoKe3q6hwWHXUtx5M6zzAxUGNAkwd9ui0O/qIjK8j3F9p5w7f98m01fZEIbM8uD
 iRr/PCjmxPLkvl4NsGQ4y6EnXOjy+9M3ZRzbLU57KZ+cMa1ntT5/SbwRCG8y8So9
 7xcNc/gJ+kaHWmaztnSDadXJSdd9PuXohInYEDjnqG7Eg8zecbRGW2sJEYac4XIj
 CvSxPXyyKFVEHjm6uVcIm7zRFWK7iQqlpugBJ4yQ6PfIP5aINEE+rU2T8a/cOSkR
 NOKI58nV5jpT7+JcSnefg0OJYhzdr5QUYSh2m7bRwWCFLat8ZhU5eAWoIHUSgJgB
 lgGGLxdeb+RgjJP5p+PWbP2xRZZ5THL3u8utgiSGFWL19RRV2OnipdqPtehKNHB9
 rmndYjn2PU++wMATJmWzdr694a6Q9/vviXDPF46gbQsSYBO7bvBg9iLkt9xaBUuz
 qnVyi7BcujOKcfmp0rz1JXOS4Rp0zXFnTebDN4sqYkWE0cvbmYGeX+26zhMswzYs
 pASwfh3gY7knSdtyU7cZrN3yrRwFY/H8mcQo18W/mN+594gTz8tPgKgeiU25XxFD
 Em9mXFuRQRtK9oqmPotc
 =M+BY
 -----END PGP SIGNATURE-----

Merge tag 'intc-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers

Merge "omap intc changes for v3.18 merge window" from Tony Lindgren:

Interrupt code related clean-up for omap2 and 3 to make
it ready to move to drivers/irqchip. Note that this series
does not yet move the interrupt code to drivers, that will
be posted separately as a follow-up series.

Note that this branch has a dependency to patches both
in fixes-v3.18-not-urgent and soc-for-v3.18 and is based on
a merge. Without doing the merge, off-idle would not work
properly for git bisect.

* tag 'intc-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (325 commits)
  arm: omap: intc: switch over to linear irq domain
  arm: omap: irq: get rid of ifdef hack
  arm: omap: irq: introduce omap_nr_pending
  arm: omap: irq: remove nr_irqs argument
  arm: omap: irq: remove unnecessary header
  arm: omap: irq: drop omap2_intc_handle_irq()
  arm: omap: irq: drop omap3_intc_handle_irq()
  arm: omap: irq: call set_handle_irq() from .init_irq
  arm: omap: irq: move some more code around
  arm: boot: dts: omap2/3/am33xx: drop ti,intc-size
  arm: omap: irq: drop ti,intc-size support
  arm: boot: dts: am33xx/omap3: fix intc compatible flag
  arm: omap: irq: use compatible flag to figure out number of IRQ lines
  arm: omap: irq: add specific compatibles for omap3 and am33xx devices
  arm: omap: irq: drop .handle_irq and .init_irq fields
  arm: omap: irq: use IRQCHIP_DECLARE macro
  arm: omap: irq: call set_handle_irq() from intc_of_init
  arm: omap: irq: make intc_of_init static
  arm: omap: irq: reorganize code a little bit
  arm: omap: irq: always define omap3 support
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-23 22:10:01 -07:00
Olof Johansson
eec317319d SoC related changes for omaps for v3.18 merge window:
- PM changes to make the code easier to use on newer SoCs
 - PM changes for newer SoCs suspend and resume and wake-up events
 - Minor clean-up to remove dead Kconfig options
 
 Note that these have a dependency to the fixes-v3.18-not-urgent
 tag and is based on a commit in that series.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUEhKGAAoJEBvUPslcq6VzURoP/3tM1iOFzQ83xe0ijEnHuUEz
 To5DF1AgJ/l8a6H9FV9xDTn7SXjV8Fts0MrPwveGnKRUMmZfrUBedvWGM9NyyWm5
 L7IJKHvSc7FAj7ee5crNobCYTrQ9THUlr8X1mLILFl5mTh2pDnm4ZRscHy+OxN0+
 w97d/T5MrFhoCa8LXo8nGm7jROvayp+E0VTxjFdU07VKJK8xjd++M0B5U3pXsqCC
 8VabNDt8VBK/SVCOKYn3tnNop1/9t9nSWfN18OAEaIS6rn5ZaQxXETKxyRWgjTvn
 OVEgsazFiPVm87H3O6cj0BizOSXG2gMfBTECZwVPtavyQR2lb/YljHUQ5Z9/T4v9
 x+nOWFxqVAr8OM1kKcatSMrZymY4AG5NdOmOgrAqKoQzWGGKhT3LcNz3Ecja25vX
 ZWGYsJl6hbF4PPaCgKe8KGRISLuv1g1N4TI8ztsxELRzhClxhuaERt7TkdQRLGrH
 emKSFP8Kkn6yrQy/RirOaXnwPWJRzuMrgpLuwDTKY6vY07MGk+nHkzF+2itKkvLB
 CG/Tw29jUi9gnOU9QwjkpBiJxsHlgcO/XzSTGN89p6EjVylyqdCqkpO3MCfjPV7Q
 kPap33Zx5SvxMMMSXRDKrrez533RfxBeTXkgT1O0fnR0r4fWYoc5+zL8Y02g10Wt
 tZ4gZRYP68IuxzfPUAgJ
 =LW8C
 -----END PGP SIGNATURE-----

Merge tag 'soc-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

SoC related changes for omaps for v3.18 merge window:

- PM changes to make the code easier to use on newer SoCs
- PM changes for newer SoCs suspend and resume and wake-up events
- Minor clean-up to remove dead Kconfig options

Note that these have a dependency to the fixes-v3.18-not-urgent
tag and is based on a commit in that series.

* tag 'soc-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (514 commits)
  ARM: OMAP5+: Reuse OMAP4 PM code for OMAP5 and DRA7
  ARM: dts: OMAP3+: Add PRM interrupt
  ARM: omap: Remove stray ARCH_HAS_OPP references
  ARM: DRA7: Add hook in SoC initcalls to enable pm initialization
  ARM: OMAP5: Add hook in SoC initcalls to enable pm initialization
  ARM: OMAP5 / DRA7: Enable CPU RET on suspend
  ARM: OMAP5 / DRA7: PM: Provide a dummy startup function for CPU hotplug
  ARM: OMAP5 / DRA7: PM: Avoid all SAR saves
  ARM: OMAP5 / DRA7: PM: Enable Mercury retention mode on CPUx powerdomains
  ARM: OMAP5 / DRA7: PM / wakeupgen: Enables ES2 PM mode by default
  ARM: OMAP5 / DRA7: PM: Set MPUSS-EMIF clock-domain static dependency
  ARM: OMAP5 / DRA7: PM: Update CPU context register offset
  ARM: AM437x: use pdata quirks for pinctrl information
  ARM: DRA7: use pdata quirks for pinctrl information
  ARM: OMAP5: use pdata quirks for pinctrl information
  ARM: OMAP4+: PM: Use only valid low power state for CPU hotplug
  ARM: OMAP4+: PM: use only valid low power state for suspend
  ARM: OMAP4+: PM: Make logic state programmable
  ARM: OMAP2+: powerdomain: introduce logic for finding valid power domain
  ARM: OMAP2+: powerdomain: pwrdm_for_each_clkdm iterate only valid clkdms
  ...
2014-09-23 22:04:19 -07:00
Tomasz Figa
b756dc48b7 ARM: dts: Fix pull setting in sd4_width8 pin group for exynos4x12
The group has the samsung,pin-pud property set to 4, which is not a
correct value. This patch fixes this by replacing it with 3, which is
the correct value for pull-up.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-09-24 02:47:42 +09:00
David S. Miller
1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-09-23 12:09:27 -04:00
Olof Johansson
602f585006 Few regression fixes for omaps for the -rc cycle:
- Fix for omap_l3_noc bus code
 - Serial console fix for cm-t53
 - NAND timings fix for dra7-evm
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUEg62AAoJEBvUPslcq6VzjIgP+wbxNHQCcPeobANHmyewzgXl
 GVBaydBdsDAFikT3es70zm9uc+X4A5t93r3SIdTjpWw3MuX4B8AfZwEC6ojjhjgk
 FP13U9aEMhDWOZaCYsu0JyW2GIk4bbB0zaCxU69Vw7s+DS2uJYBEX0GuPZce6MVa
 gV2fUbXn3P7HGGGX4jWuOb0Rj5NA+JWd9BKYSXV0S8YQwndoHCf/k3sHp4w406gM
 mBDrsmw7vN7bY/Mp1GmX/mChsUP60hH9AUrK+mAIdIOYc7Xltsdvy5YRdh18ifxO
 Z4gCuXKnENyp8YyksNWp5kEemGvHRmxM9qnD4pVNKO5X1cGAB2A6VyFfAGNU/os0
 0/xKp2FBG2R/FUHAiTo4mxumLqigN0D+qDBwHrSefcmuKWRPR/wLiLW5k/NldZpP
 W5A/gFmlpa3mGUjFlThSJ82PKtX/y51ox2TbT17CEvnC618YgBXTcd6mjp7bDN4T
 0uaOJ4TFTQ9IQ5fbdEoTFeQ2bd2H1HuoATnaC5lkWHriMr1tL8YTTy6i7v9zVtBM
 aUkZs5gb1cZp0s7DRAdzjKYZcC8NK1arFY+KOQL83B1qBw8CgjR5GlawQw2mQ6eZ
 LPQS29cYOwvJ1KEU8aCPUWeHxb63nzwugEFBrxqPWnDC+RJh2feH5Sbw3Ah5SDHr
 4CiVOy4lo5NkG+5DZmn+
 =NJhf
 -----END PGP SIGNATURE-----

Merge tag 'fixes-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Few regression fixes for omaps for the -rc cycle:

- Fix for omap_l3_noc bus code
- Serial console fix for cm-t53
- NAND timings fix for dra7-evm

* tag 'fixes-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  bus: omap_l3_noc: Fix connID for OMAP4
  ARM: dts: cm-t54: fix serial console power supply.
  ARM: dts: dra7-evm: Fix NAND GPMC timings

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-22 21:54:17 -07:00
Olof Johansson
3c91f97aaf Keystone Edision dts fix for -rc cycle. Fix the PCIE and USB nodes.
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJUEhfqAAoJEHJsHOdBp5c/eyYQAJ2THv+CuSuX+LkET4b+payP
 2IFFCQldE5YM3B7F2Q4F/+L5evs0RWNuNkKu2KUgKrrGCKzCBJhXpRdh+6GwhKFt
 WnrTYqg6VTyjaStNqcXSsYLytrLvttIoHVN/GhDYW0xjBUQuSujY6JKJJILwmDoC
 IIe95LJRe9gQirnXgz6ZjhcHmmSO2REjPw8RNnCwUAWee95uwRNM3sbYdPu6ZBEd
 oWguXS3XNWl1VpPBnlC9dFJCoaQFav2BrejzpMGk8bAQt8JCXofaT+D5a7TuHooe
 DRA5k/B4Du10z1GnCj4ieoGgdPYt/i87IyuNTl+P8jVrIp/hALmrhdpbPD84MHs5
 XzKHHZQePoMhBVyvkc3qMA6wQDlB78BFP5YepOXAk5Kc4VsHXp2DjkL8OJfABLI0
 2oSK1RIgAnL1ReZyU6hafITatjVazDklKa7XP2VnqR7jmynz3Rv5bw2xFUabmZzE
 y3KTgppLS5tDW8+SiVWf8Mo9N/X2CCbe0JSgyzeGgA+IScsxlFWZ+z9IHlFzpN0i
 RdMEESAgMUucVbgYJQkHZPCQ4hgGt73tEoaYiPJYb6BT/MTErlRGVENuWeLCyYOZ
 iHc74vu7uXOxG/UmA0kVWwlVwGtOfviAFhiIr8GK31tNjLKOfOxLAMD7vV4QZYjO
 x5na3p3HrARIIIlqXdnK
 =s3j+
 -----END PGP SIGNATURE-----

Merge tag 'fixes-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into fixes

Keystone Edision dts fix for -rc cycle. Fix the PCIE and USB nodes.

* tag 'fixes-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: keystone: dts: fix bindings for pcie and usb clock nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-09-22 21:52:56 -07:00
Pratyush Anand
65aaae245a PCI: spear: Pass config resource through reg property
PCIe configuration space should be passed through reg property, rather than
through ranges property.  This patch does the correction for SPEAr13XX
SOCs.

Signed-off-by: Pratyush Anand <pratyush.anand@st.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Mohit Kumar <mohit.kumar@st.com>
2014-09-22 14:19:30 -06:00
Karicheri, Muralidharan
b2ed7d98e1 ARM: dts: keystone: fix bindings for pcie and usb clock nodes
Fix incorrect clock names for usb1, pcie1 and domain register
offset for pcie1 clock nodes on K2E EVM

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-09-22 15:19:36 -04:00
Karicheri Muralidharan
48443f07bd ARM: dts: keystone: k2l: Fix chip selects for SPI devices
There are 5 chip selects per SPI0 and SPI2 and 3 per SPI1. SPI2 needs
to be pinned out to use and by default they are disabled. So keep the
state disabled to reflect default.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-09-22 15:19:27 -04:00
Grygorii Strashko
a3d3ee3f7d ARM: dts: keystone: add dsp gpio controllers nodes
Add Keystone 2 DSP GPIO nodes for SoCs:
k2hk:
 DSP GPIO banks 0-7 correspond to DSP0-DSP7
k2l:
 DSP GPIO banks 0-3 correspond to DSP0-DSP3
k2e:
 DSP GPIO bank 0 corresponds to DSP0

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-09-22 15:19:27 -04:00
Grygorii Strashko
a392d42de7 ARM: dts: keystone: add keystone irq controller node
Add Keystone IRQ controller IP node which allows ARM
CorePac core to receive signals from DSP cores.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-09-22 15:19:27 -04:00
Stephen Boyd
aabff7bfe5 ARM: DT: msm8960: Add sdcc nodes
Add the sdcc nodes to support the SD card controller using pl180
mmci driver. We also add a temporary fixed regulator until the
regulator driver is mainlined.

Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
2014-09-22 13:49:43 -05:00
Stephen Boyd
55602a09dd ARM: DT: msm8660: Add sdcc nodes
Add the sdcc nodes to support the SD card controller using pl180
mmci driver. We also add a temporary fixed regulator until the
regulator driver is mainlined.

Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
2014-09-22 13:49:41 -05:00
Nicolas Ferre
7a4752677c ARM: at91: dt: add device tree file for SAMA5D4ek board
Add reference SAMA5D4-EK platform DT file.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2014-09-22 14:42:39 +02:00
Nicolas Ferre
7c661394c5 ARM: at91: dt: add device tree file for SAMA5D4 SoC
Add SAMA5D4 SoC DT file.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2014-09-22 14:42:38 +02:00
Krzysztof Kozlowski
d0e73eaf19 ARM: dts: exynos3250: Add CMU node for DMC domain clocks
Add CMU (Clock Management Unit) node for DMC (Dynamic Memory Controller)
domain clocks on Exynos3250.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
2014-09-22 14:28:53 +02:00
Romain Perier
6051ddd4f9 ARM: dts: rockchip: Remove "regulator-always-on" in vcc_rmii for Radxa Rock
On Rockchip RK3188 SoCs the platform driver emac_rockchip is used. This variant driver
enables this regulator when the device driver is loaded. The phy no longer needs
to be always on.

Signed-off-by: Romain Perier <romain.perier@gmail.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-09-22 11:53:39 +02:00
Chen-Yu Tsai
d07fe96718 ARM: dts: sun8i: Add DMA controller node
Add the DMA controller node and DMA bindings to the supported devices.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-09-20 12:39:13 +02:00
Inki Dae
025d8e1348 ARM: dts: add mipi dsi device node to exynos3250.dtsi
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
2014-09-20 00:56:09 +09:00
Inki Dae
9fab9d6a72 ARM: dts: add mipi_phy device node to exynos3250.dtsi
This patch adds mipi_phy device node to reset, disable and enable
DSIM and CSIS PHY.

Signed-off-by: Inki Dae <inki.dae@samsung.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
2014-09-20 00:56:09 +09:00
Inki Dae
03b86c7962 ARM: dts: add fimd device node to exynos3250.dsti
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
2014-09-20 00:56:09 +09:00
Daniel Mack
7a08cf77db ARM: pxa: dts: fix ohci controller compatible string
The vendor prefix was renamed from "mrvl" to "marvell". Follow this
change in the dts file.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
2014-09-19 01:39:03 +08:00
Daniel Mack
2bf172cfdd ARM: pxa: dts: fix mmc controller compatible string
The vendor prefix was renamed from "mrvl" to "marvell". Follow this
change in the dts file.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
2014-09-19 01:38:52 +08:00
Lucas Weaver
f53e3c538d ARM: dts: DRA7: Add PMU nodes
DRA74x and DRA72x family of processors vary slightly in the number
of CPUs. So, add different instances of PMU for each of these processor
groups. Further, since the interrupts bypass crossbar and are directly
connected to GIC, mark the dts nodes with relevant information.

Tested with perf utility.

Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Lucas Weaver <l-weaver@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-09-18 09:58:10 -07:00
Rajendra Nayak
1306c08a7c ARM: OMAP4+: Remove static iotable mappings for SRAM
In order to handle errata I688, a page of sram was reserved by doing a
static iotable map. Now that we use gen_pool to manage sram, we can
completely remove all of these static mappings and use gen_pool_alloc()
to get the one page of sram space needed to implement errata I688.
omap_bus_sync will be NOP until SRAM initialization happens.

Suggested-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-09-18 09:47:35 -07:00
Rajendra Nayak
8b9a2810b0 ARM: OMAP4+: Move SRAM data to DT
Use drivers/misc/sram.c driver to manage SRAM on all DT only
OMAP platforms (am33xx, am43xx, omap4 and omap5) instead of
the existing private plat-omap/sram.c

Address and size related data  is removed from mach-omap2/sram.c
and now passed to drivers/misc/sram.c from DT.

Users can hence use general purpose allocator apis instead of
OMAP private ones to manage and use SRAM.

Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-09-18 09:47:00 -07:00
Erik van Luijk
4dd7933ad6 ARM: at91/dt: at91sam9m10g45ek add rtc node
Add rtc node to both the at91sam9g45 SoC family and the at91sam9m10g45ek board.

Signed-off-by: Erik van Luijk <evanluijk@interact.nl>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-09-18 18:14:48 +02:00
Dmitry Lifshitz
be9d32e8ab ARM: dts: cm-t54: setup omap_dwc3
Add "extcon" and "vbus-supply" properties of DWC3 node.

Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-09-18 09:07:52 -07:00
Dmitry Lifshitz
1a3290b813 ARM: dts: cm-t54: add ADS7846 touchscreen support
Add ADS7846 touchscreen support.

Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-09-18 09:07:52 -07:00
Dmitry Lifshitz
ac84d6cc18 ARM: dts: cm-t54: add Startek LCD support
Add DT support for Startek KD050C LCD 800x480 panel.

Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-09-18 09:07:52 -07:00
Dmitry Lifshitz
6097b5a534 ARM: dts: cm-t54: add HDMI/DVI display data
Add DSS related pinmux and display data nodes required to support HDMI
and DVI video out on CM-T54.

Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-09-18 09:06:52 -07:00
Dmitry Lifshitz
db5790f89f ARM: dts: cm-t54: fix mux mode comment style
Follow the comment style of mode0_name.modeX_name for pins
which mux mode differs from MUX_MODE0.

Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-09-18 09:06:51 -07:00
Dmitry Lifshitz
68dac838d3 ARM: dts: sbc-t54: fix mux mode comment style
Follow the comment style of mode0_name.modeX_name for pins
which mux mode differs from MUX_MODE0.

Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-09-18 09:06:51 -07:00
Tony Lindgren
7f5736c31b ARM: dts: Enable PMIC idle configuration for LDP
With the IO chain reconfigure fixed, we can now enable the PMIC
scripts for LDP.

Note that at least on my es3.0 based LDP, the UART seems to be
flakey after wake-up events from off-idle and hangs but eventually
continues.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-09-18 09:03:36 -07:00
Tony Lindgren
271d4c6bc7 ARM: dts: Add support for Ethernet on some N900 macro boards
As we have support for this in board-rx51-peripherals.c, let's
add it to the .dts files too.

Note that the reset GPIO will eventually go to the driver.
For now let's just pull it down and skip any further reset
in case the bootloader has configured the MAC address so
NFSroot works.

Also note that after 3430-sdp are using proper GPMC timings
we can remove the tests for smsc,lan91c94 in gpmc.c.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-09-18 09:03:36 -07:00