Граф коммитов

455869 Коммитов

Автор SHA1 Сообщение Дата
Olof Johansson e1adcba9c8 Some minor cleanups to the Ux500 core. DT-only probe path and
some constification from static code analysis.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTvm0dAAoJEEEQszewGV1z0+QQALK+SJvPRMum4lBaorNmmdQs
 2rz760astlUwGqojk4Fd3YilkQobXTe9Tv4tQiMb7p6XSbuktSYPZzGzG4EHarwn
 nyWxJSTdXNwljEg1LykwddTin1MBLxWpUyPb8IKoebcO1Bsxz93pdVqkViiiUfgi
 8auTQRCzt2bSRtYq2wLq7tot6vMW2thI7f8TtayXJEA+MkuDEx+F280dnpyJrXVM
 +dxzYwJVfe3wjPuJ2cL8tkib4FbPftlv/jgj4RpegFqzmxQkzcPxEm53IW8rhuZH
 R6LxRiqPvHvCtaXYQYbqhSa2DODIH2hNIUo2VgX8dOEFHbz5Ti72V4dVV3rdhRUJ
 EM5EnI30kStB/qA9pY1nmGYybnmZlUzeouzy/DbwPAl5kW1+EieXPQXtsLYDBMFm
 Tz09Hw+xLq+iqBOOreu2ohpcrUEsbSPiV5fx5K93G2/wcxOTBoO5UAlWpYhDaYTD
 aP5u7YQEubgwk2Pqggs3NJxfwISUflw7m+V628Zqr2g3+g3UvBHDTxN7/6qDraVa
 IgpnYLDUEnDmgPFjdTT5Ybcgs2D4uSo6xTN+O4F1AcKbE2G56x9Qt6YUvyPZalyH
 elQc9egDvZkVt1eO/HWW1qfmEU2LYaXsJYxhIjkxKQ0GdFq4E2IKq+0Ydz5p0omG
 2NGSFWxlTgqN/I0zWPbD
 =OmbF
 -----END PGP SIGNATURE-----

Merge tag 'ux500-core-for-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup

Merge "Ux500 core changes for v3.17 take 1" from Linus Walleij:

Some minor cleanups to the Ux500 core. DT-only probe path and
some constification from static code analysis.

* tag 'ux500-core-for-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: remove pointless cache setup complexity
  ARM: ux500: storage class should be before const qualifier
  ARM: ux500: Staticize ab8505_regulators
  ARM: ux500: Staticize local symbols in cpu-db8500.c
  ARM: ux500: Staticise ux500_soc_attr
  + Linux 3.16-rc4

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-12 21:41:09 -07:00
Olof Johansson db6d842b84 Cleanup S5P SoCs for 3.17
- removing s5p64x0 SoCs and s5pc100 SoC in mainline because
   no more user and if it is required next time, it will be
   supported with DT.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTwbhUAAoJEA0Cl+kVi2xq1cMP/1GmlTA/rgYF8qj+HkeEv8+H
 APu4RFbDgqIaoq3FMaXRKIOYtlBfxKCj0bq4MSFEpcKJV0A9sE5RRJOM3x4i62t+
 I0I454FGWhZ7Qn8AE6CwW3+f5wI9wADYWnv2PAk3K1Clk6CejiGOzYN5S8QazJvh
 slC2dyQkJVmT9lv5bloef5btFyjH34vcWbOA+C9jPzyNC+s0d55MLM+gFe96IX3G
 6EkDXbvLx1ZmQE6HRvLW8yjQKsPEC52Ak4kfoISG29ZP7aDTsltDVU+FORA/ed5z
 58Era6Z+QGBVI+Px8JAY7FtJjGOk+pVZzLOtGL7iuWW6LvU12wG2bZSN+wrMezoD
 A2xR1fJo91iPGMAVovJTtzOR6/1ROvsjrsHE8HS+Nw+bxUzfzXuNw36HBPvf2hML
 HvYigH/0mtRQpTnGp/LPpynfWMOMJzcJ1/r/r/QxAbCtYRFyP2tu0da4gYHJmhy1
 zC01OfdECYvsNove069KgX+j2R7FRhzjPOe6N03AvpFOVaYbyfseVbDtIoDaYYyh
 ssUSHJ561p++y9NuI5m3UHLbRzI4j/Vj4hCGF73rDBO+KYfa120m02aBmefVNJa3
 aigekaZIJ9hmJgD3+nNYm6rVjbsTT1KF+Ie/vcAKN/ujNtgcpvRg4Icppy5zj2TW
 trRU5G5ylUCsHKg5FQlc
 =CFpb
 -----END PGP SIGNATURE-----

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

Merge "Samsung cleanup 2nd version for S5P SoCs for 3.17" from Kukjin Kim:

Cleanup S5P SoCs for 3.17
- removing s5p64x0 SoCs and s5pc100 SoC in mainline because
  no more user and if it is required next time, it will be
  supported with DT.

* tag 's5p-cleanup-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  video: fbdev: s3c-fb: remove s5pc100 related fimd and fb codes
  mtd: onenand: remove s5pc100 related onenand codes
  spi: s3c64xx: remove s5pc100 related spi codes
  gpio: samsung: remov s5pc100 related gpio codes
  ARM: S5PC100: no more support S5PC100 SoC
  video: fbdev: s3c-fb: remove s5p64x0 related fimd codes
  spi: s3c64xx: remove s5p64x0 related spi codes
  gpio: samsung: remove s5p64x0 related gpio codes
  ARM: S5P64X0: no more support S5P6440 and S5P6450 SoCs

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-12 21:20:47 -07:00
Kukjin Kim f86e0add81 video: fbdev: s3c-fb: remove s5pc100 related fimd and fb codes
This patch removes fimd and fb codes for s5pc100 SoC.

Acked-by: Jingoo Han <jg1.han@samsung.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-07-13 07:35:15 +09:00
Kukjin Kim e393bc0900 mtd: onenand: remove s5pc100 related onenand codes
This patch removes s5pc100 related onenand codes because of no more
support for S5PC100 SoC in mainline.

Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-07-13 07:35:14 +09:00
Kukjin Kim f34b89bf83 spi: s3c64xx: remove s5pc100 related spi codes
This patch removes sp5c100 related spi because of no more support
s5pc100 SoC.

Cc: Mark Brown <broonie@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-07-13 07:35:13 +09:00
Kukjin Kim 0d551c3f0c gpio: samsung: remov s5pc100 related gpio codes
This patch removes gpio codes for s5pc100 SoC.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-07-13 07:35:12 +09:00
Kukjin Kim b8529ec1c1 ARM: S5PC100: no more support S5PC100 SoC
This patch removes supporting codes for s5pc100 because no more used
now.

[jason@lakedaemon.net: for drivers/irqchip/Kconfig]
Acked-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-07-13 07:35:11 +09:00
Kukjin Kim 8340417c66 video: fbdev: s3c-fb: remove s5p64x0 related fimd codes
This patch removes fimd codes for s5p6440 and s5p6450 SoCs.

Acked-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-07-13 07:35:10 +09:00
Ezequiel Garcia c3df513334 ARM: pxa: Move iotable mapping inside vmalloc region
In order to remove the following ugly message:

  BUG: mapping for 0x00000000 at 0xff000000 out of vmalloc space

the iotable mappings should be re-located inside the vmalloc
region. Such move was introduced at commit:

commit 0536bdf33f
Author: Nicolas Pitre <nicolas.pitre@linaro.org>
Date:   Thu Aug 25 00:35:59 2011 -0400

    ARM: move iotable mappings within the vmalloc region

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
[laurent.pinchart@ideasonboard.com: Hardcode the virtual address]
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-12 09:51:45 -07:00
Laurent Pinchart 8066ce3b87 ARM: pxa: pxa27x: Don't map IMEMC region statically
The IMEMC mapping not only has no user, but maps a reserved memory
space. It just wastes vmalloc space, remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-12 09:51:43 -07:00
Laurent Pinchart b10f1c836c ARM: pxa: Move UNCACHED_PHYS_0 mapping from generic.c to pxa2[57]x.c
The UNCACHED_PHYS_0 mapping is only needed on PXA25x and PXA27x
platforms. Move it to pxa25x.c and pxa27x.c to avoid wasting vmalloc
space on PXA3xx.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-12 09:51:40 -07:00
Laurent Pinchart 0e32986c0f ARM: pxa: Don't hardcode addresses and size in map_desc tables
The virtual address, physical address and size of all regions for which
we create static mappings are defined in PXA headers. Replaced the
hardcoded values with macros.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-12 09:51:36 -07:00
Olof Johansson ab70e7e7e5 pxa for v3.17 v2
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTvzZuAAoJELXbXY/c+iv27qoP/R8FOuKIaTpRFvaPCZsvqOD9
 X01Y9dhIHIg5eJ1vq5BEu0qbq08xqwFMhyGKqMvPOfjqechem2gznI7DQu5+otzp
 ndrwoKMK3Nw6/32n636OoBoMPPXY37El79kJfd7S8MU8DKuU6p3Zv4DrSvo3cUr0
 FMOoz+Y2RwEiMRfhgpbH4WkZCk4L7Phh475tXjYNe5YMAPcx7fkK7CCwRgJs7upT
 chm59VtCYU85L4WHcQJYvrq6Yr68lUn3AVnwZc+iiVXkhuYWurvmg5OEZucptFuP
 isR7xgRwPR5GLXrtfAHPAFVX8cWuUaO9LDjpzMlymLfQIBdIvx+i+P5sDlSo1Wy+
 +AAS4X0caFDdEEqnSENxZcAziL0F13qnsCPdJ5uiZWK4iTLfqes8pBYEHXDv6QmW
 GfyXTGkbm+Z/F8QvX2N1LRNkBVHACHWgHXHyzZ1kJCTW5I9yMaNMeAoT1EHGM2ah
 rV5kQ215R9P0DaA2/3PCJ0odQUwF174TCplysopEFnNrimCp5HbjGjoUCeOVJtkF
 aAA0+zKl0z69Ir9P9PhOQ6zAEWDs5MV4uN+wp2ntL3Mofb3FvEdoALzA5K/z/HYX
 pqSTWGcTbj4i8qx4KQ8gyQ1i/QDJK8weCPZyloGKnlNlOt8j2bnU3qX0P9weaT2z
 xTTEIjzLqh6xtZ8TYT5P
 =u/vA
 -----END PGP SIGNATURE-----

Merge tag 'pxa-for-v3.17-2' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into next/cleanup

Merge "pxa for v3.17 v2" from Haojian Zhuang:

* tag 'pxa-for-v3.17-2' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux:
  ARM: pxa: fix typo 'CONFIG_SPI_PXA2XX_MASTER'
  ARM: pxa: call debug_ll_io_init for earlyprintk
  ARM: pxa: correct errata number for PXA270

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-12 09:49:48 -07:00
Olof Johansson 2df9ce91e9 mmp for v3.17
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTtqnlAAoJELXbXY/c+iv2pqoQAI5V5Fr/2SdZBijLdBwHc9kB
 74YVXOFjlnZxgc6abkqqwxlUNL88zL+fcA4bryxoQBtKzxR7Ez0FC3kdDUql9qFP
 SHEf69f2nZWSi5Sw431gTFJSSfxq8wA8pmdOm340hVZAdFmwpYfKZ4Axvb8vajgM
 zbBNG+2MY3lw65zhAHYvhDMOtmrk4CzOKPO0kzNI/CwNLbIXMFA0ksyz30sAOoL5
 uyYdnyO63Kyv1sS966+stTYgvxDUON0cm1bPTkCjYbev8/Yjy0nOPagDU0pJhDm3
 n2CadZ9IGNQZvHGr51RasKDxstEhXN9+uiCLSs+k7UrJijgZcbX4j2iDng7ZIbZU
 c40F+iK7FOAN0NwNoXqRjf7fB1VQswVZMgeGo1dfK2FtnESj+UYc4aDTsClBEtg/
 bSjnitVdaMCU3BUZWanL0hqFTz7zYRNV2y7I34ikH2MMp2guiWrzWI7qYS4ExoyV
 LRwpndG5qJccCvm5ghlhVDNmqwL+IMH7Cu0RL8avJcoUb3cXMJMxQ25rTYN8WPaH
 ZNfP2GVmkLjxy/opWHFXvZN4AbDsv63uoAYqTj+SNOpVeYwCRDhW4i5ojMhkORHd
 ncPLLsVkn7vy2B+mGcwwPXID88iOXUnTPeKqe7XnvKm3N6bGlbH1FGJyba8x/UDa
 t9ZkkIrbj7HtEaC1TLOL
 =+7aN
 -----END PGP SIGNATURE-----

Merge tag 'mmp-for-v3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into next/cleanup

Merge "mmp for v3.17" from Haojian Zhuang:

* tag 'mmp-for-v3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux:
  ARM: mmp: remove duplicate SM_SCLK_SM_SCLK define

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-12 09:47:12 -07:00
Olof Johansson 9641f4084a Second Round of Renesas ARM Based SoC soc-cleanup Updates for v3.17
* Move SOC-specific headers out of mach directory.
   This is part of a multi-stage effort to move headers
   out of that directory.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTsfqyAAoJENfPZGlqN0++ghIQAKRy1qBr/K2A3iRZocQV9+4E
 /D8YzxthAr5BQKdqe0XECTnpfeLCHbttx1VRFfpjZkVtZlDKqepj66PoGuNOOHQc
 SPsxcnNFZzXXv1ObCZX7wamcYrjpEjzHjd/Jq+mndMpgv4vRBKZeEBAqF0VhXoIr
 knF+5MJ1v/vhzLEkn/8f5mdjZrQ5uzHNtRNTtrxs8ZgqVK5dcGu3TQK0dOzP5n1a
 Wi1ypqNyMPnGdkFLj4H3MFMxc/5YIMvJDDcWmSrXLnfHHA5ydk88pyrCGO+9oDKe
 dpUZ3/AeOqGbtUuRSVQsTIFp9PaY+7pJaQaoKL40jWmaJ3/IUYKwF0n0vZnGPakc
 Wt+jpwRu7qhshmjXSaj0wkFUgc5LyzStM6NfaApYfHI248d6jirgRBguV1G3ifds
 CcB8HzFLakSJTON3XLWd7oLSfoA8VGE3YUSdkN/caWf6YxYFhWgSR1sb19GnT1W0
 vaG7zsg/54B1w4h+T8SZK96sC8vol94SviB591FSgktAjDQMupbCm8mLzKLLnEeA
 FjWpnaPDDp845zzAlaYTCItAFFP4/FXV7Rx4Xd6qKA4WiVVwf7A81IAD7U4P+8Ve
 nqoKG/RrbDkAwu2pTHmlVFYm5L5V38AzcBUCTuyVBvCuzR7PBuXdgJbhtKN7PBcF
 kwClqvMoJeC+6cQkB8f9
 =ooGC
 -----END PGP SIGNATURE-----

Merge tag 'renesas-soc-cleanup2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Merge "Second Round of Renesas ARM Based SoC soc-cleanup Updates for v3.17"
from Simon Horman:

* Move SOC-specific headers out of mach directory.
  This is part of a multi-stage effort to move headers
  out of that directory.

* tag 'renesas-soc-cleanup2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Move sh7372.h
  ARM: shmobile: Move sh73a0.h
  ARM: shmobile: Move r8a7790.h
  ARM: shmobile: Move r8a7778.h
  ARM: shmobile: Move r8a7740.h
  ARM: shmobile: Move r8a73a4.h
  ARM: shmobile: Move r7s72100.h

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-12 09:36:50 -07:00
Paul Bolle 5837391bbc ARM: pxa: fix typo 'CONFIG_SPI_PXA2XX_MASTER'
CONFIG_SPI_PXA2XX_MASTER was used were it was surely meant to use
CONFIG_SPI_PXA2XX_MODULE. Use the IS_ENABLED() macro here, as it guards
against typos like this one.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org>
2014-07-11 08:50:53 +08:00
Linus Walleij 823e7546c4 ARM: ux500: remove pointless cache setup complexity
This cleans out non-DT cache setup (the ux500 is DT only), and
sinks the l2cc base into the unlock function.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-07-10 10:46:42 +02:00
Tobias Klauser 922468cdf1 ARM: ux500: storage class should be before const qualifier
The C99 specification states in section 6.11.5:

The placement of a storage-class specifier other than at the beginning
of the declaration specifiers in a declaration is an obsolescent
feature.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-07-10 10:37:43 +02:00
Sachin Kamat aaebafb65d ARM: ux500: Staticize ab8505_regulators
'ab8505_regulators' is used only in this file.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-07-10 10:37:43 +02:00
Sachin Kamat 0d01ab3aa4 ARM: ux500: Staticize local symbols in cpu-db8500.c
Symbols local to this file are made static.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-07-10 10:37:42 +02:00
Thierry Reding 51fe0057cd ARM: ux500: Staticise ux500_soc_attr
This variable is not used outside of the file that it's declared in, so
reduce the scope to the local file.

Signed-off-by: Thierry Reding <treding@nvidia.com>
[Also add const marker after suggestion from Lee Jones]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-07-10 10:37:41 +02:00
Olof Johansson 5db3f62007 First pull request of Versatile family clean-ups for v3.17:
- Remove <mach/memory.h> from the Integrator, paving the
   road for multiplatform.
 - Push the CLCD helper code down into the framebuffer subsystem,
   removing the last hook in plat-versatile for the Integrator,
   also paving the road for multiplatform.
 
 Patches tested on Integrator/AP, Integrator/CP and Versatile AB
 (all real hardware).
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTrSikAAoJEEEQszewGV1zh9oP+QHoI4WOUhHJMPNBa5ZpUXdZ
 KnbNHQrBvmSoMfVjQyiJnNz8AJGzlabIA/usMXw0q2QHB3SKx28zOVwhsI2mh1sk
 mVWIyr5ZQa4O5yRwyJtQKbwGRjEi8wQMHYJRMhJLioDgMAWaYC1t/fFNKH/JH+mi
 JoE/CD+/DBl1lw8px4udL4lisDMSguYOLRoq4GhHPfOEbnMOV4trV2dT7Wn6z3V9
 TcLj9r30rBZcf/GD3+vOzMsUxJtUNU+u/sqfFBbetqrZut5K4PrM4Ybc7xBwJEFr
 55/szveJS4pb+rSZWaCGanSizDTV9P4rjvWsBqVFw2xe1b+HElXZGUmsD0CXsNe4
 64LRTlY5smISgkeQhGqfYyZ4c0n221ceSRsKEV526N7MHKH4wc065wkv+edwps5C
 Yh/kvzo4zgt4pZPP2RNNZm4Rt5aI40W4GYtuV6NzJs2rNrAXDzVibmSRrgkh1j5M
 nbtl3Ygxbwt5VwMGg56AqvPj8tOUrolNBC12b6Pumakpvlr/br918GtOKvrSqKaT
 FSXTHnkYNcn5vwChXMc6kqXfl/rh/eKDYlevkrSPDgiKergqJBZMQjoSOTVxgAox
 q+zbOK88qHJOFdXuulcAaPFoRWLmjJ+90sg3uq/nCOD0ZrRyvn/lVIxlPZDcnbcC
 Bc6/qzYhqE3/ulMMBO9n
 =7Tuj
 -----END PGP SIGNATURE-----

Merge tag 'versatile-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup

Merge "First pull request of Versatile family clean-ups for v3.17" from Linus
Walleij:

- Remove <mach/memory.h> from the Integrator, paving the
  road for multiplatform.
- Push the CLCD helper code down into the framebuffer subsystem,
  removing the last hook in plat-versatile for the Integrator,
  also paving the road for multiplatform.

Patches tested on Integrator/AP, Integrator/CP and Versatile AB
(all real hardware).

* tag 'versatile-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  video: move Versatile CLCD helpers
  ARM: integrator: get rid of <mach/memory.h>

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-07 22:10:59 -07:00
Kukjin Kim add924f9db spi: s3c64xx: remove s5p64x0 related spi codes
This patch removes s5p64x0 related spi because of no more support for
s5p64x0 SoCs. Meanwhile, cleanup SPI DT bindings for s5p6440-spi, it
should be s5p64x0-spi instead.

Cc: Mark Brown <broonie@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-07-08 07:28:55 +09:00
Kukjin Kim a07a6a30af gpio: samsung: remove s5p64x0 related gpio codes
This patch removes gpio codes for s5p6440 and s5p6450 SoCs.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-07-08 07:28:49 +09:00
Kukjin Kim 070b8b436b ARM: S5P64X0: no more support S5P6440 and S5P6450 SoCs
This patch removes supporting codes for s5p6440 and s5p6450 because
seems no more used now. And if its supporting is required, DT based
codes should be supprted next time.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-07-08 07:06:19 +09:00
Sachin Kamat e12f739e11 ARM: spear: Staticize local symbols in spear1340.c
Symbols local to this file are made static.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-06 17:50:20 -07:00
Sachin Kamat 17681ff255 ARM: spear: Staticize spear1310_io_desc in spear1310.c
'spear1310_io_desc' is used only in this file.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-06 17:50:15 -07:00
Sachin Kamat 3da1d7b1e0 ARM: spear: Staticize spear13xx_io_desc
'spear13xx_io_desc' is used only in this file.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-06 17:50:10 -07:00
Sachin Kamat 192ebb7d8f ARM: vt8500: Staticize local symbols
Variables local to this file are made static.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Tony Prisk <linux@prisktech.co.nz>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-06 17:50:01 -07:00
Sachin Kamat 7e4588e83b ARM: sti: Staticize local variables
Symbols local to this file are made static.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Cc: kernel@stlinux.com
Cc: Srinivas Kandagatla <srinivas.kandagatla@gmail.com>
Cc: Maxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-06 17:49:54 -07:00
Olof Johansson a7ed497e3f Renesas ARM Based SoC Cleanup for v3.17
* Use shmobile_init_delay on r8a7790, r7s72100 and EMEV2 SoCs
 * Remove unused redundant callbacks on EMEV2 SoC
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTp4YiAAoJENfPZGlqN0++xfEQALAC6IG0nydElVsJZavFVTiq
 NpVWfG7A9LrEcPswO9ODlzJ3szbsHfr5hG1Cyq2w1/4V6xrvhhRe5hfs9K2gQMf4
 32exqFsND9pf6Rzu2YBbKfi6Zlxfi3wJO7dXvf2Q7BIVXvDRUXUGtDscTQ+Wde9v
 icMVrkliAOLWDyrZpdJAcsJGyMpyUNhdia5n7qQcPEHshMQZWQHPvAwoG6s9qGC3
 7Lv5DkkrsQwNDB2ASlGFw3eK3IEEL8DiHbxF3gX/rCMF6jpWWtoLrwMeSU/D/sUo
 Yk6Vs6xC3pNcpgnqHJD8hw5QlNPWvh5vb7qfpBkR7WnZmziw13Y5TM9CT8bD9f59
 wj83YmLNccltQWN+T6Celu/I1X1QkBz09Ai63SIlzN2tfrr05t1EXL8acSVfWXXS
 Tc/Mf+GXqqIHtMKe5hXM7biizHn7sXk57OfSVnNNSbE5Wrs/TaCsHiTL4E74C2dt
 bwq7GHDBYkETs1Rvh727sfJDpDSGHwWyrhTdXclSn+HHb5kxZ69TfnmovXTUbRPa
 99ieorUeSFqwmkb6/jn3DKjPz2I/KyIfF7yS2T8BNIP742wtD3aSVa6m7KAZ+udS
 kO5WOfunHY7Ckt4/pmgO1gPDX+cbbmG8r+UPXlH+2W73ryTtc46HLoImqawT6h2g
 0WkoIqd4qmyiBLenZiL+
 =UEEy
 -----END PGP SIGNATURE-----

Merge tag 'renesas-soc-cleanup-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Merge "Renesas ARM Based SoC Cleanup for v3.17" from Simon Horman:

- Use shmobile_init_delay on r8a7790, r7s72100 and EMEV2 SoCs
- Remove unused redundant callbacks on EMEV2 SoC

* tag 'renesas-soc-cleanup-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Remove unused r8a7790_init_early()
  ARM: shmobile: Use r8a7790 DT CPU Frequency for Lager
  ARM: shmobile: Use r8a7790 DT CPU Frequency in common case
  ARM: shmobile: Use shmobile_init_delay() on r7s72100
  ARM: shmobile: Use shmobile_init_delay() on Genmai boards
  ARM: shmobile: Update r7s72100 DTS to include CPU frequency
  ARM: shmobile: Get rid of redundant EMEV2 mach callbacks
  ARM: shmobile: Use shmobile_init_delay() on EMEV2
  ARM: shmobile: Update EMEV2 DTS to include CPU frequency

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-06 17:21:19 -07:00
Olof Johansson 64460c7ef2 Renesas ARM Based SoC Header Cleanup for v3.17
Move the most common shared header files for mach-shmobile
 from <mach/foobar.h> to "foobar.h"
 
 6287298 ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case
 585c09d ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case
 6b8b0cb ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h
 fd44aa5 ARM: shmobile: Move common.h
 b6bab12 ARM: shmobile: Move most of irqs.h, keep some for pinctl
 ad6ffa0 ARM: shmobile: Move clock.h
 74ac0de ARM: shmobile: Move dma-register.h
 6200e2c ARM: shmobile: Move intc.h, cleanup sh_intc.h usage
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTp3nTAAoJENfPZGlqN0++mhYP/iGe9QAv1fng63178VffF0KK
 e3TVaGkXVoWmZZs11zbkGu3fYkXqgFvJ1PFd/WDZN5m31XgehodZhFOHFXvN54Tc
 u+n3U0nGOAhE5SAKmQq1d1X3FqePGFnt2MoQVMvgWJ6Cj/yZ6KaMZdtKTXxXRwQ4
 S9efhT+niEMU0vnjYvtn4ru3g9HmQsJKD8N2t/e65MBPnRZlHIojeEYtLRIzT35d
 9I7j1SwrzjVjzA0COSxPEeFVRYfnqtdsKPqDPqu7VxRA7uGtT7yrf5C7l7cFp/FH
 7LVGqNuvagvY/fVLO2FW5yxCuqiII1yFT14pgyQ2m8QezZBQiWLiUXPIRBWYoxV0
 jZUWK0TBEQsg1CmuNc7x/rxL+K3HXUii8eMlD/FX8dZPfbbonEqf//CELzL05jjb
 Bz7nCRTSUkF23ahcba1tNb88n/4ILxV4CAHwoHs0i/XMWzVln4elHFb2morWEsWH
 HCTDIEGVKpxuUNutlVpwX9/OnklfsdqX6+Uvrd0w5Y0kl9EeFbtXylunzI1SY8sa
 fEP7K4QdPPPz8lBS4bDyR1KTTr9/haD8PwVJwf3pQ/oyjueDelveCxpuf4vsXW0b
 kGIROPjJRgHOW+DpKd/rV5ljBILfe9GNQPfRc1etcJi81aTTiraxE+wFUu1X9fes
 HZapAhJwv4Br9jGZS+Ff
 =BoE9
 -----END PGP SIGNATURE-----

Merge tag 'renesas-header-cleanup-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Merge "Renesas ARM Based SoC Header Cleanup for v3.17" from Simon Horman:

Move the most common shared header files for mach-shmobile
from <mach/foobar.h> to "foobar.h"

* tag 'renesas-header-cleanup-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case
  ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case
  ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h
  ARM: shmobile: Move common.h
  ARM: shmobile: Move most of irqs.h, keep some for pinctl
  ARM: shmobile: Move clock.h
  ARM: shmobile: Move dma-register.h
  ARM: shmobile: Move intc.h, cleanup sh_intc.h usage

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-06 17:05:57 -07:00
Alexander Shiyan 402277e0f8 ARM: clps711x: edb7211: Remove excess layer to calling clps711x_devices_init()
clps711x_devices_init() can be used directly in ".machine_init"
without any intermediate function.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-06 16:52:24 -07:00
Alexander Shiyan 8623916405 ARM: clps711x: clep7312: Add common devices initialization
Add initialization of commonly used devices to the CLEP7312 generic
board.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-06 16:52:20 -07:00
Alexander Shiyan 2d57f248c7 ARM: clps711x: Switch CLPS711X subarch to use cpuidle driver
This patch removes old support for cpuidle and switches all current
users to use new cpuidle driver.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-06 16:52:15 -07:00
Alexander Shiyan dd99eef5f6 ARM: clps711x: Move debug include into arch/arm/include/debug/
One more step to allowing CLPS711X to participate in the
multi-platform defconfig.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-06 16:52:05 -07:00
Alexander Shiyan a8a28affc3 ARM: clps711x: Remove IO_ADDRESS() macro
All uses of the IO_ADDRESS() macro has been removed.
This patch removes the definition of this macro.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-06 16:51:57 -07:00
Linus Torvalds cd3de83f14 Linux 3.16-rc4 2014-07-06 12:37:51 -07:00
Linus Torvalds 100193f5b7 Devicetree bugfixe for v3.16
Important bug fix for parsing 64-bit addresses on 32-bit platforms.
 Without this patch the kernel will try to use memory ranges that cannot
 be reached.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTuRSlAAoJEMWQL496c2LNyeAP/3xVkBxtXzaLDU39ijCr5x6B
 2PoagkCapWSCp2GXv29wJii3YgO6cVa54T1p6lbDNLkmzLzBrywq8zcLCOgaAh9G
 3QAulbSAW2nBNMf+8tJ/a86PhOLd6414myrtlvS6LdgRhZQKqzXpHQcEAhkJKIQZ
 YNjE6aW5KtKpiRFToXh166AriL0KYHIbyT0AW3ut5gNUSC+I5X7kLMvw4CsfqexQ
 Mf1P5QkK9Bfk6ss9dTwNYLlenjnKiOVEh7wq6MkcK7JDIP5mSfr5+NgGZpqYsKwR
 eF2lJ8zTmQC+Qjfz20b4ZBu935KmjDklQ7q5FQR3kE3kbCVB9lxYijpvb/51x1h9
 ZpU7fG8gv0KneuJazL2SbqIUEN80DgFZMAy34ohyR+PcFcRkv1rHgbGSq840LjDe
 jBs5xVaDqm5eAwYfPS+DYwB/0SFGEeyx4A9EpEpil5/esVeRwsS6HDkmNGfms5OQ
 SRTyDdxFWhdBphbrcBBT93kc06lnXmISNaMj2njmRtiUDOQEFfVol6MXgjligNPE
 yOTODWZmPmnjXH15DmXxWUKyLGgYqruVQthFo9F94eqT4BXJiPICnJ4xt4oRmGGf
 4VexG2NN0dN7TymvLKp0TUIPSYDGCGZpYA0K+82PfHnRd1PinX2iTL1wO02hLn8A
 uNphY1FdjFbwSPJOqj92
 =7+H1
 -----END PGP SIGNATURE-----

Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux

Pull devicetree bugfix from Grant Likely:
 "Important bug fix for parsing 64-bit addresses on 32-bit platforms.
  Without this patch the kernel will try to use memory ranges that
  cannot be reached"

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
  of: Check for phys_addr_t overflows in early_init_dt_add_memory_arch
2014-07-06 12:11:57 -07:00
Linus Torvalds 8addf0c713 SCSI for-linus on 20140705
This is a set of 13 fixes, a MAINTAINERS update and a sparse update.  The
 fixes are mostly correct value initialisations, avoiding NULL derefs and some
 uninitialised pointer avoidance.
 
 Signed-off-by: James Bottomley <JBottomley@Parallels.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQEcBAABAgAGBQJTuNEhAAoJEDeqqVYsXL0MYC4H/2gpxHA9rELiqPRLJGNjt9v3
 YlGrIwVAAdYLBSgwtkpAYj6oDJtwRmZvP3Saj2n5Lga+32mgFsPjvy+JsM3O41SL
 k5QRlAs10wMbOB/dSoGxFsKdGnig4NolCIe5p0MGQvAbcCvh9z2Tr876ssvSfMCh
 1mh0xmTCIutD7R2f5WjRckA+HZo+qmLLz5ZyogDasI3mSRAHjcZ+j5HdWBQbEsag
 U6lPDR5VpUjGpigwJ+BPWwKTbIAIW1v2TB1YjWSHr5h2QPLBa+hfbyc15S1AjsGb
 9F5/L432yk4UXQUKyKIpCKi8rDCoioM8dt8ofjjTNfNNjDlYRRHKutalef1yOw8=
 =HPXQ
 -----END PGP SIGNATURE-----

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

Pull SCSI fixes from James Bottomley:
 "This is a set of 13 fixes, a MAINTAINERS update and a sparse update.
  The fixes are mostly correct value initialisations, avoiding NULL
  derefs and some uninitialised pointer avoidance.

  All the patches have been incubated in -next for a few days.  The
  final patch (use the scsi data buffer length to extract transfer size)
  has been rebased to add a cc to stable, but only the commit message
  has changed"

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  [SCSI] use the scsi data buffer length to extract transfer size
  virtio-scsi: fix various bad behavior on aborted requests
  virtio-scsi: avoid cancelling uninitialized work items
  ibmvscsi: Add memory barriers for send / receive
  ibmvscsi: Abort init sequence during error recovery
  qla2xxx: Fix sparse warning in qla_target.c.
  bnx2fc: Improve stats update mechanism
  bnx2fc: do not scan uninitialized lists in case of error.
  fc: ensure scan_work isn't active when freeing fc_rport
  pm8001: Fix potential null pointer dereference and memory leak.
  MAINTAINERS: Update LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI) maintainers Email IDs
  be2iscsi: remove potential junk pointer free
  be2iscsi: add an missing goto in error path
  scsi_error: set DID_TIME_OUT correctly
  scsi_error: fix invalid setting of host byte
2014-07-06 12:08:30 -07:00
Linus Torvalds 110e4308f8 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
 "i915, tda998x and vmwgfx fixes,

  The main one is i915 fix for missing VGA connectors, along with some
  fixes for the tda998x from Russell fixing some modesetting problems.

  (still on holidays, but got a spare moment to find these)"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/vmwgfx: Fix incorrect write to read-only register v2:
  drm/i915: Drop early VLV WA to fix Voltage not getting dropped to Vmin
  drm/i915: only apply crt_present check on VLV
  drm/i915: Wait for vblank after enabling the primary plane on BDW
  drm/i2c: tda998x: add some basic mode validation
  drm/i2c: tda998x: faster polling for edid
  drm/i2c: tda998x: move drm_i2c_encoder_destroy call
2014-07-05 17:13:46 -07:00
Linus Torvalds 75bf757edc ARM: SoC fixes for 3.16-rc
This week's arm-soc fixes:
 
 - A set of of OMAP patches that we had missed Tony's pull request of:
   - Reset fix for am43xx
   - Proper OPP table for omap5
   - Fix for SoC detection of one of the DRA7 SoCs
   - hwmod updates to get SATA and OCP to work on omap5 (drivers merged in 3.16)
   - ... plus a handful of smaller fixes
 - sunxi needed to re-add machine specific restart code that was removed in
   anticipation of a watchdog driver being merged for 3.16, and it didn't make
   it in.
 - Marvell fixes for PCIe on SMP and a big-endian fix.
 - A trivial defconfig update to make my capri test board boot with
   bcm_defconfig again.
 
 ... and a couple of MAINTAINERS updates, one to claim new Keystone
 drivers that have been merged, and one to merge MXS and i.MX (both
 Freescale platforms).
 
 The largest diffs come from the hwmod code for omap5 and the re-add of
 the restart code on sunxi. The hwmod stuff is quite late at this point
 but it slipped through cracks repeatedly while coming up the maintainer
 chain and only affects the one SoC so risk is low.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTuFXOAAoJEIwa5zzehBx30dYQAJ2jfunXR0R4BldQw7UzYoob
 3ht/tgIRglMcGIGbdvwRznOjjAsZTTssUzZvCvdU/B5ckILg7FCsaHFo6eYhB0NE
 bvxpMD1XyfO2JPF1r7jQqQsuwUXWtyAnkxFiuFkeBnriwo69ikbZnPb5g0bcMaXx
 HzPZoSoODn9g2vbgEH3jL3+AClWvHgJ7lXQxUSH9xvCqjqQjiwFx8l6QY/+qgkde
 QuRfZ0UCBuRFpTdR4jfvTIO4mctD6ObfaRRiQpzIQPa8HDGcWmD2LJm+IeCdclFv
 PwINZnf5aICz+CEJa8oo7tyKpEUNQwJL2YPesCXeRnVxcCHMn0UCDuZ3Z2MR3C8I
 w21msVS+bxr+tisj7QY3KCi73DMlTjOPj21OaPrpTAjDI/5tZxTCCvCWctg0aF4S
 HKKETWtrWhN6qiIpkKalCcr6CHlqf9p7QOz7d4yzE89O3thyg7YrRff7KOCtoaZo
 +aJnW7Z3gTuJFWTpAOQL+DeRQsY0ZpYqG6wVc8bIgM+vYYPBJO7mGa2ARBiz4Piw
 a+iEOP3ej8uqa60YfehXRS/YTGnOVkUf9Qk4zmyKjyoXSNhasQDHG/ujb7/hxzpd
 Lq4X2CkLZTOX+kjlXWD7kk3OBhIxdu38UtWPomd3QVZqEg7dCYxQooXuiidqYQ9x
 xquFfKAuIJlvBzVpWIbz
 =J9xD
 -----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:
 "This week's arm-soc fixes:

   - A set of of OMAP patches that we had missed Tony's pull request of:
     * Reset fix for am43xx
     * Proper OPP table for omap5
     * Fix for SoC detection of one of the DRA7 SoCs
     * hwmod updates to get SATA and OCP to work on omap5 (drivers
       merged in 3.16)
     * ... plus a handful of smaller fixes
   - sunxi needed to re-add machine specific restart code that was
     removed in anticipation of a watchdog driver being merged for 3.16,
     and it didn't make it in.
   - Marvell fixes for PCIe on SMP and a big-endian fix.
   - A trivial defconfig update to make my capri test board boot with
     bcm_defconfig again.

  ... and a couple of MAINTAINERS updates, one to claim new Keystone
  drivers that have been merged, and one to merge MXS and i.MX (both
  Freescale platforms).

  The largest diffs come from the hwmod code for omap5 and the re-add of
  the restart code on sunxi.  The hwmod stuff is quite late at this
  point but it slipped through cracks repeatedly while coming up the
  maintainer chain and only affects the one SoC so risk is low"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  MAINTAINERS: Add few more Keystone drivers
  MAINTAINERS: merge MXS entry into IMX one
  ARM: sunxi: Reintroduce the restart code for A10/A20 SoCs
  ARM: mvebu: fix cpuidle implementation to work on big-endian systems
  ARM: mvebu: update L2/PCIe deadlock workaround after L2CC cleanup
  ARM: mvebu: move Armada 375 external abort logic as a quirk
  ARM: bcm: Fix bcm and multi_v7 defconfigs
  ARM: dts: dra7-evm: remove interrupt binding
  ARM: OMAP2+: Fix parser-bug in platform muxing code
  ARM: DTS: dra7/dra7xx-clocks: ATL related changes
  ARM: OMAP2+: drop unused function
  ARM: dts: am43x-epos-evm: Add Missing cpsw-phy-sel for am43x-epos-evm
  ARM: dts: omap5: Update CPU OPP table as per final production Manual
  ARM: DRA722: add detection of SoC information
  ARM: dts: Enable twl4030 off-idle configuration for selected omaps
  ARM: OMAP5: hwmod: Add ocp2scp3 and sata hwmods
  ARM: OMAP2+: hwmod: Change hardreset soc_ops for AM43XX
2014-07-05 16:57:12 -07:00
Linus Torvalds 549f11c9f0 Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
 "A few minor fixlets in ARM SoC irq drivers and a fix for a memory leak
  which I introduced in the last round of cleanups :("

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Fix memory leak when calling irq_free_hwirqs()
  irqchip: spear_shirq: Fix interrupt offset
  irqchip: brcmstb-l2: Level-2 interrupts are edge sensitive
  irqchip: armada-370-xp: Mask all interrupts during initialization.
2014-07-05 16:56:14 -07:00
Dave Airlie dfd7aecfd6 Merge tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel
Fixes for 3.16-rc3; most importantly Jesse brings back VGA he took away
on a bunch of machines. Also a vblank fix for BDW and a power workaround
fix for VLV.

* tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Drop early VLV WA to fix Voltage not getting dropped to Vmin
  drm/i915: only apply crt_present check on VLV
  drm/i915: Wait for vblank after enabling the primary plane on BDW
2014-07-06 07:49:59 +10:00
Dave Airlie 80e6e6b176 Merge branch 'vmwgfx-fixes-3.16' of git://people.freedesktop.org/~thomash/linux
fix to a 3.15 commit.

* 'vmwgfx-fixes-3.16' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix incorrect write to read-only register v2:
2014-07-06 07:49:28 +10:00
Dave Airlie d808e62f7f Merge branch 'tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox
mode fixes for tda998x.

* 'tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox:
  drm/i2c: tda998x: add some basic mode validation
  drm/i2c: tda998x: faster polling for edid
  drm/i2c: tda998x: move drm_i2c_encoder_destroy call
2014-07-06 07:48:26 +10:00
Keith Busch 8844aad89e genirq: Fix memory leak when calling irq_free_hwirqs()
irq_free_hwirqs() always calls irq_free_descs() with a cnt == 0
which makes it a no-op since the interrupt count to free is
decremented in itself.

Fixes: 7b6ef12625

Signed-off-by: Keith Busch <keith.busch@intel.com>
Acked-by: David Rientjes <rientjes@google.com>
Link: http://lkml.kernel.org/r/1404167084-8070-1-git-send-email-keith.busch@intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2014-07-05 21:42:08 +02:00
Linus Torvalds e1a08b855f ARM64 fixes:
- Exception level check at boot time (for completeness, not triggering
   any bug before)
 - I/D-cache synchronisation logic for huge pages
 - Config symbol typo
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
 iQIcBAABAgAGBQJTt+DiAAoJEGvWsS0AyF7xufkP/RLthhgr6OJJW2UF1uLKa4VC
 ouRCPLsMvTk8KGOOYOq//2tnM0B3ZR5489YQouiVA9a0QW6R1QNkGeWdB9q/6hyG
 YhfS+yRyq4+xtv1qKrwD2LF2AJ9Wb6q6E4NwkuqNiYQN4c9npImouZ70PZRqj7Qw
 y8xf1mstaIiQZBqfkIt6o6lKBwlFPvcXrDLEwG4leg03AetbW9OkLaSOTtSOIHw3
 jHwpiKonKhN0j1gzJp4quLLu6NtdiFeNmXv0qSRdX+sRQpkSkO8cV0bSWNiEO501
 W2allUz9a9rY+zkYXByIoJNe04lrTPYye+rc4TtCnGXp+rE82aIz6hHLPFGzfnGH
 j2uBJZho90uY23wN/sxtfTlXvRnYpni9jb+dtQGa2GkcB/hlh+4+ge2BCJ7EjDN8
 n0UZGMRLa3odi+t5n3cSt+jNnjCimtrDbFsq+Zs97QMV/0T2XjV1rwGsZKXj2EDR
 7EFm5dAR/9OjTmy7DCEQOcsiyBpvH2X0rJeE44SoVWTY/qIoebVnwsDxsExK3wn8
 6AdYGEg4eZefC2sELoTPddP1FquUd7sFr+AIfvclmrgaoaWH34i1UMe7vmvODeki
 5Mt85cg2qhKLE5+EOfMdzB6ztazRkY1Kw7t7vghSpW3Q0Q1lteuHAfLVlEAOuzT7
 cDeJrERLoJJ4xTjDZ9a+
 =1PCg
 -----END PGP SIGNATURE-----

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull ARM64 fixes from Catalin Marinas:
 - Exception level check at boot time (for completeness, not triggering
   any bug before)
 - I/D-cache synchronisation logic for huge pages
 - Config symbol typo

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: fix el2_setup check of CurrentEL
  arm64: mm: Make icache synchronisation logic huge page aware
  arm64: mm: Fix horrendous config typo
2014-07-05 10:12:52 -07:00
Santosh Shilimkar bc6aa56680 MAINTAINERS: Add few more Keystone drivers
Update MAINTAINERS file for recently added reset controller, AEMIF
and clocksource driver for Keystone SOCs.

The EMIF memory controller driver is also added along with AEMIF.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
Cc: Kevin Hilman <khilman@linaro.org>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-04 21:53:13 -07:00
Shawn Guo ce515a6b8d MAINTAINERS: merge MXS entry into IMX one
The mach-mxs platform is actually co-maintained by myself and
pengutronix folks.  Also it's hosted in the same kernel tree as IMX.
So let's merge the entry into IMX one.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-04 21:51:59 -07:00