Commit graph

127,691 commits

Author SHA1 Message Date
Arnd Bergmann
dddaea6b96 ARM: DT: Hisilicon ARMv7 SoC Hi3519 DT updates for 4.8
- Add device tree bindings for hi3519 sysctrl
 - Add dts files for hi3519
 - Tidy up DTB makefile entries to keep the list sorted
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXfMdXAAoJEAvIV27ZiWZcS0UP/R1ihe0zFwK1SGZDAjIBZyhe
 Zq7sk/VhjPiD3ewtbjNQkAmRaSTtF+gii3t40FEPjNZL/skLhMFLEKyUAAhiipqG
 8OMF+PnooC6kOXB/RnMCxggWK2lOwbuaXsOHv0Ux7wWqP+sLWQzji3hgIk7hJsXx
 Y9ZYCMBuDgEqPwldpK6E8+jmpPoqktC7MpahWjk+t6fVIPFX+QIm2uUM4BvGI61P
 tcEe59v4OSKcm/QC50bhPmYVikk9R8Mt3gCL5Qjh4rFHtRyKzyJiPy7HdkJMDf6R
 pACKnF8qwyT2Qr1V5qn7M2Xygqwfh20tq9mcBcLLR1qlZHjdzxWNxT706elX9pWp
 D9DDQQdbe22gejq8nDYCBttXiFrzRdSOG5Vx2dTdGxfFXog93tADSvgScwI8Gon+
 frPXbJaqWeLR6K5QhM/jUcj0/9kPAE2B0c/fP89I6IFIcOm0EbB7hJaDzudQb2Vz
 ewEigYqpamEhqBiOFMpgl60/HbMyAWpJ2869YpzFITO6XXRGMxiPc31ShLrziQmJ
 fcuAlVfixmM8tBdmdMVFN8U8bRnwY+KSChWO9J00ehnDeNOnqc8JsvNTppHo7h2U
 XklSru6iLB9TxTk6Ld8oPPJTaNKO0HdmATpJrCM10oCk67TYWs25v24cYnSyRBrk
 AxmKI8yNwpznX9/cNPYD
 =7zT7
 -----END PGP SIGNATURE-----

Merge tag 'hisi-armv7-soc-dt-for-4.8-v2' of git://github.com/hisilicon/linux-hisi into next/dt

Merge "ARM: DT: Hisilicon ARMv7 SoC Hi3519 DT updates for 4.8" from Wei Xu:

- Add device tree bindings for hi3519 sysctrl
- Add dts files for hi3519
- Tidy up DTB makefile entries to keep the list sorted

* tag 'hisi-armv7-soc-dt-for-4.8-v2' of git://github.com/hisilicon/linux-hisi:
  ARM: dts: add dts files for Hi3519 and tidy up the makefile entries
  ARM: dt-bindings: add device tree bindings for Hi3519 sysctrl
2016-07-07 14:53:43 +02:00
Arnd Bergmann
349f9d5239 Allwinner DT changes for 4.8
The usual amount of DT patches, among which:
   - I2S support
   - Support for the AXP809 in the relevant boards (A80 based)
   - New boards: Banapi M1+, Banapi M2+, Allwinner Parrot (R16 EVB),
   - The other patches to enable various controllers on our boards, most
     notably USB OTG
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXfBQtAAoJEBx+YmzsjxAgtzkP/0T6yzjDAp6Kfi5on+VrUdvb
 9253W7nsg5WVuLKEBbsyEDTsX9fI8sziKnyzh0JHGDJou9Uvfv+Fl/vbNpjPXqjx
 gzkSGrNVcXuL9RMeu/acxnTt+zmI54PwwQrSq2WY0hmCyvGeyiDTjgAaYUgYJxoh
 UVwbSBzudx4InR7neyfxeTryQdqam28g61YLueuAy5aKfXPCTdzreHFUN8gbakBg
 pERhBQy++ZjcNlmR+CRQrtimqv3G0VQZUUPZQzsllkCtqRhVt7JXREcAEZ3ogz5i
 gs9fZKSpYUexlOKIqhkGQfs4cP49J8ykmjolj6J90DOhPWl0noNeoqUoWLVcXntl
 o1ELEktLv2nH0SMZ5LVJ1Rm5w32GU6Jv/3Gq83IutN2z+M3ojQu6M/OuLmq7DvK6
 wIWh9Jj8gjiL9LHmqszQ9xaB2z7MehA+ZOZPaIxPsRpFHgmG+0fblYKVqXafobK7
 bhMcOmbnI5L/RD+/uh52ex1MDXocUGJkppb9R9wc0aGqazSuzIAsVepkKGZZdWE5
 jnn0CqhBdEqSDp5eMIAd4RtrQx2WGsedwzJdhEYwHuAAq7YomPk6ALIMMKuQ4gTP
 CEKsOxNJzFcYgVu6OaEsUpP/9ZuPUAVPKnpriB6j7bI/M7pxKY2LgfishCxgueU1
 AheCSB/LBq/6Or5tYjJC
 =XPdf
 -----END PGP SIGNATURE-----

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

Merge "Allwinner DT changes for 4.8" from Maxime Ripard:

The usual amount of DT patches, among which:
  - I2S support
  - Support for the AXP809 in the relevant boards (A80 based)
  - New boards: Banapi M1+, Banapi M2+, Allwinner Parrot (R16 EVB),
  - The other patches to enable various controllers on our boards, most
    notably USB OTG

* tag 'sunxi-dt-for-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (54 commits)
  ARM: dts: sun5i: Enable otg on the auxtex t004
  ARM: sun5i: Allow PLL3 2x fixed factor clock to change PLL3 rate
  ARM: sun7i: Add DAI nodes
  ARM: sun7i: Add mod1 clock nodes
  ARM: dts: sun5i: Add mmc1 / sdio-wifi node to mk802
  ARM: dts: sun5i: Add axp152 pmic node to mk802
  ARM: dts: sun5i: Enable otg on the mk802
  ARM: dts: sun7i: Add BCM53125 switch nodes to the lamobo-r1 board
  ARM: sun8i: Add Parrot Board DTS
  ARM: dts: sun5i: q8-common: Enable USB-based WiFi
  ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board
  ARM: dts: sun8i-q8-common: Add support for USB wifi controllers
  ARM: dts: sun9i: a80-optimus: Order nodes by alphabetical order
  ARM: dts: sun9i: cubieboard4: Order nodes by alphabetical order
  ARM: dts: sun7i: Add NFC node to Allwinner A20 SoC
  ARM: dts: sun4i: Add NFC node to Allwinner A10 SoC
  ARM: dts: sun6i: Add pmic / regulator nodes to Mele M9 dts
  ARM: dts: sun6i: Add pmic / regulator nodes to Mele A1000G quad dts
  ARM: dts: sun6i: The blue led on the Mele M9 is a power led
  ARM: dts: sun6i: The blue led on the Mele A1000G quad is a power led
  ...
2016-07-07 14:46:48 +02:00
Arnd Bergmann
0c789933d2 Allwinner defconfig changes for 4.8
Two patches to enable the DRM driver in the sunxi and multi_v7 defconfig.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXfBKiAAoJEBx+YmzsjxAg7q8P/2+bdNaxfnqEEUDNUVkWPxx0
 /5FezVeOAYsrcB2BFhyAokGfz+hU1XbRc8ctYkdsiWJVwQmu29EmWqKSyWYtdoxa
 AISn1abz1UGlwILaUSaBQJspJyhHrnebxgSz85RkL+rpcCMI0wdxxuQ804g2ACai
 WT9ZeALIliz24kZbd6YPueVozJ/HatEdbuMChN9yeH9afqjO0vE66fdfvxOstMGD
 403ZVGN/Sz0k88OH8SVdTSUzGgjwbEs97HFGRWC4uldZln0qOG2vtjZ6ZSZSY6IY
 ZTZgAyjhPa4iY8VMe0FDM8LoGpyElchxlqGAY7HOFf2X+mpFATM02DrmTQD8t8yA
 e2NdDKKc0pLDodBIEufdl6QYFb3KhuLC6LwRxvoKunRAUAqVjvTgXvk2yY/JpQSS
 5uPVO9T9gdfA6vE1AxCPyykznNfVp2shRdNHg5fNNmEQJYqYULBiTREuqWKeco5j
 7/CPHXHurLV7BxC8VfsWO/XYY0RE1F3urSwetu9jxoFya9wIN/kJ81cMahsHl+tP
 Dv9t7pqClF3CEV0aFZmVpxFAvtSr8MgC0fW/7h+B+qJ9g9mv8gaW2Hgel/k+64No
 3/cVZDApk33yCQc7Gp25eCm1GTC3U+7UaQ/ISLd4dKe8PTpWBaNgY2MIgla6ELgn
 NW3HeAIcV8F+c5QUoHzz
 =CrDC
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-defconfig-for-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/defconfig

Merge "Allwinner defconfig changes for 4.8" from Maxime Ripard:

Two patches to enable the DRM driver in the sunxi and multi_v7 defconfig.

* tag 'sunxi-defconfig-for-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Enable sun4i DRM driver
  ARM: multi_v7: Enable sun4i DRM driver
2016-07-07 14:44:34 +02:00
Arnd Bergmann
04b6d0a300 Few more omap SoC changes for v4.8 merge window:
- Fix a make randconfig build error for recent SMP kexec changes
 
 - A series of clock related fixes to prepare things for moving
   device clkctrl register handling to drivers/clk
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXe11sAAoJEBvUPslcq6Vz/XwQAItR9F4G/DibYl6CgIgvxdZF
 heCFfhg/TjNnAlOdqSszAmCDxrL0cSj9/Djm7PBmcZz6T0XQWp2xviTsW/08N9LI
 Hcugi179a10IjOan6EASQlITRDC6S9Elkq2arMDTxkRMH8jRBGCG3Wk7H3N4084O
 x7XCZH2zDGDsYJp12L1iZ6DZ+aYneSmcK3WmUmAiKQTZw1fK0AfMtc95fHh2iCTJ
 hK0+LCbg2gUL1+GKZTIa+caLDdU+48XDpxagAnnIDiWJH+TC1DOve14I0OqzZiCB
 YZC/W14ulIwkTMpUNHZufcG9ZVg0G3gtvnfKISxLI8gf/X/CrbcGsVnqRmsA3P2g
 r3rIVpdoZ4UbHfKZnE36jR6EggX71pQ+h8M3iazb9aoraWQKOL6NanqPbf3WZO3i
 PGXDOwrnXqK2mjfkMWr+ERLKcLFJSnYQaeZuZF84s1TqLIvzm7ouvGfD0fcbvW9N
 RA/imL/FqLeuu3X6PtE0mReS+aGJ+Ov2ZpmPpemdOryys3LotYHoC8fJyD9l5GKp
 M5sHHEVZicFHPesYaBnjThVbM5zVHYnmb1o+Yyjizwnh52kOKJO8SrJ9+qBvJ9Bo
 JitY8Y2+52IVDPtpeST2METORIP2HDZF4GnQdx8EakJBok4EPfVgXUzT7M1XB7Bw
 RnGWoAxSVQzrzr7kSMHS
 =qmem
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.8/soc-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

Merge "Few more omap SoC changes for v4.8 merge window" from Tony Lindgren:

- Fix a make randconfig build error for recent SMP kexec changes

- A series of clock related fixes to prepare things for moving
  device clkctrl register handling to drivers/clk

* tag 'omap-for-v4.8/soc-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: AM33xx: fix module_wait_ready without clkctrl register
  ARM: OMAP2+: clockdomain: add usecounting support to autoidle APIs
  ARM: OMAP2+: timer: change order of hwmod data handling
  ARM: OMAP2+: hwmod: fetch main_clk based on hwmod name
  ARM: OMAP2+: omap_device: create clock alias purely from DT data
  ARM: OMAP2+: Fix build with CONFIG_SMP and CONFIG_PM is not set
2016-07-07 14:34:43 +02:00
Arnd Bergmann
82be1178ee Fix a long time regression for ir-rx51 driver for n900 device tree
booting.
 
 This driver has been unusable with multiarch because of the hardware
 timer access. With the recent PWM changes, we can finally fix the
 driver for multiarch and device tree support. And naturally there
 is no rush for these for the -rc cycle, these can wait for the
 merge window.
 
 The PWM changes have been acked by Thierry. For the media changes
 I did not get an ack from Mauro but he was Cc'd in the discussion
 and these changes do not conflict with other media changes.
 
 After this series we can drop the remaining omap3 legacy booting
 board files finally.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXe1v2AAoJEBvUPslcq6VzLvsQALIWLcgyqUKNgPV6EOxAsxeO
 azvjPPZgI0oTl5+voS6dzSg5mXhQt3rVlaXxJXxCdxYgOf67zYjugrJqf5Sm4stF
 BEtzPGLRTwR8miJbHNB8eGfcBGU3q+hx19dT+U7EAsPQqItlFfxVTh5ZzS0TOZc2
 9bQGO6MYIWNEk6V0TRxNUfRt+4fQN17zRdIpKL8NCJOsoBn9ZpztB76GeHUnd34t
 pYeaMFPdVUqBCQOmE9EA3dmOB7q37JgtsM312zpn72OgzpTTttza1Vo6HAh7dTWM
 Pmphin+H54zmsrB3wvI0h4G2WmuZjNNEHBTbLV4fgTjDer4o84RHJUGOgQmmPnni
 q9nyuV0y1gudk8ihlq7hxnickPS+NCSk8aQgAfspY+8rhxYWstJdJ66gUl+bUPlQ
 qaOvNACaEMVuRdeqnuTLm/mhQdVLz5VuUzSZkAWosVVuCVY9ONLt/t/Mxbylqf9P
 CfKiDBEUp+DQ8Ly4L0odD7n4fOWOq6XOx3RR6C4IJqkLyb6VL5O8POKNsHuMvb1q
 ptWyN1aWHrdYvd4PD0QB6hakY+C2P9BSAMb0t9ZscAX1nGvkGY27TRzHD8rkhHZD
 WKy5J4gzr8VDLnQom9MwoXcoqrWKTGY5QCqw1hdUrqNlVnRJTu2jYc5NrYxOK0mD
 TUC5drgK5e2mjmgUv95q
 =frvc
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.8/ir-rx51-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers

Merge "omap ir-rx51 driver fixes for multiarch for v4.8 merge window"
from Tony Lindgren:

Fix a long time regression for ir-rx51 driver for n900 device tree
booting.

This driver has been unusable with multiarch because of the hardware
timer access. With the recent PWM changes, we can finally fix the
driver for multiarch and device tree support. And naturally there
is no rush for these for the -rc cycle, these can wait for the
merge window.

The PWM changes have been acked by Thierry. For the media changes
I did not get an ack from Mauro but he was Cc'd in the discussion
and these changes do not conflict with other media changes.

After this series we can drop the remaining omap3 legacy booting
board files finally.

* tag 'omap-for-v4.8/ir-rx51-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ir-rx51: use hrtimer instead of dmtimer
  ir-rx51: add DT support to driver
  ir-rx51: use PWM framework instead of OMAP dmtimer
  pwm: omap-dmtimer: Allow for setting dmtimer clock source
  ir-rx51: Fix build after multiarch changes broke it
2016-07-07 14:32:08 +02:00
Arnd Bergmann
0df88121fb mvebu dt64 for 4.8 (part 1)
- update dt with mv-xor-v2 found in the Armada 7K/8K SoCs
 - update dt with the clocks found in the Armada 3700 SoCs
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAld6y2sACgkQCwYYjhRyO9UU9wCgpZ7Nd5KeqQMuwOPL/RNjIg6F
 oHsAoKcUVoQteML8NkpMeyr9Lk+dtb0A
 =OElN
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt64-4.8-1' of git://git.infradead.org/linux-mvebu into next/dt64

Merge "mvebu dt64 for 4.8 (part 1)" from Gregory CLEMENT:

- update dt with mv-xor-v2 found in the Armada 7K/8K SoCs
- update dt with the clocks found in the Armada 3700 SoCs

* tag 'mvebu-dt64-4.8-1' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: add peripherals clocks for Armada 37xx
  arm64: dts: marvell: add tbg clocks for Armada 37xx
  arm64: dts: marvell: Add xtal clock support for Armada 3700
  arm64: dts: marvell: add XOR engine description for Armada 7K/8K CP
  arm64: dts: marvell: adjust to the latest mv-xor-v2 DT binding
2016-07-07 14:18:17 +02:00
Arnd Bergmann
623149b00e mvebu arm64 for 4.8
enable Armada 3700 clock drivers
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAld6ykAACgkQCwYYjhRyO9Wo8ACdH6kYBKYuaivu3ggVBoSle+01
 5noAn13h+iScUld+CAn0UVktOjd7Yplp
 =sjV8
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-arm64-4.8-1' of git://git.infradead.org/linux-mvebu into next/arm64

Merge "mvebu arm64 for 4.8" from Gregory CLEMENT:

enable Armada 3700 clock drivers

* tag 'mvebu-arm64-4.8-1' of git://git.infradead.org/linux-mvebu:
  arm64: marvell: enable Armada 3700 clock drivers
2016-07-07 14:16:43 +02:00
Arnd Bergmann
7dccd2ec96 Reset controller changes for v4.8, part 3
- change request API to be more explicit about the difference between
   exclusive and shared resets (the former guarantee the reset line is
   asserted immediately when reset_control_assert is called, the latter
   are refcounted and do not guarantee this).
 - add Hisilicon hi6220 media subsystem reset controller support
 - add TI SYSCON based reset controller support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJXdEKmAAoJEFDCiBxwnmDr0qUQAK7zmAATBcgGp/ipvkEajNzp
 oTnxTC8kpGJ1oG0rQzXVDHImcOGxsLaV2CwEx5KLRyTkMvTRWroCrmpspmwpFgbg
 P9CY2HBim7TJzEKG3Z7qJ5cymvGeS4aDFWHZ97Il26/ElGcXqnNRlI8jmYEBuAQD
 GiW3Q1mzxp/fsr0vjIn8JE/j4T4kUrs2A1TSv4AjlBtDp1eHdDzWq1l11TvH9GTO
 fpSOMEPxfU+KPN4Bdu0ZrxQan8wlCFr+YBvkXzaJRZv1bjRYOqgqhYnprM0VT62J
 KZkkrDUzZ/QweOhH4bFr0REddWGGnj9NZ7rmaAYLi6iTy9vHv8AwFuST3J+bmCuu
 soOzx+HTLJuYnOtb4dg7KQRqLik04V3oNKqdeuCxeh+nRpOjssb1HeycN7tcrIPb
 6Io4amMYP3S81B3LZIXVh/zxUxHmPudtKeiDl7YEaZR9/oY7LIh1DSlysBru9+OQ
 bX+lxOzUdNaXBZAt/9MHC4Z6GDe0/xr7G6v1cQjRSzwX6HC8PPY3fgnyB04CfUZK
 srnLI+ZzxOjEqEaqJ3/ekJRZQ3dLUIB1NibrUF4U7JPTwkM/509jyOUwOb9CsPuP
 5P6x/ufpVHFGZvHc1LIk1GKwUi+Zh0VQbFwGCaVn7UdIenw5rURiWS9/Bv/VhtB7
 bbfx0gRGzvgIfs1esRPS
 =5bzt
 -----END PGP SIGNATURE-----

Merge tag 'reset-for-4.8-3' of git://git.pengutronix.de/git/pza/linux into next/drivers

Merge "Reset controller changes for v4.8, part 3" from Philipp Zabel:

- change request API to be more explicit about the difference between
  exclusive and shared resets (the former guarantee the reset line is
  asserted immediately when reset_control_assert is called, the latter
  are refcounted and do not guarantee this).
- add Hisilicon hi6220 media subsystem reset controller support
- add TI SYSCON based reset controller support

* tag 'reset-for-4.8-3' of git://git.pengutronix.de/git/pza/linux:
  reset: add TI SYSCON based reset driver
  Documentation: dt: reset: Add TI syscon reset binding
  reset: hisilicon: Add hi6220 media subsystem reset support
  reset: hisilicon: Change to syscon register access
  arm64: dts: hi6220: Add media subsystem reset dts
  reset: hisilicon: Add media reset controller binding
  reset: TRIVIAL: Add line break at same place for similar APIs
  reset: Supply *_shared variant calls when using *_optional APIs
  reset: Supply *_shared variant calls when using of_* API
  reset: Ensure drivers are explicit when requesting reset lines
  reset: Reorder inline reset_control_get*() wrappers
2016-07-07 14:09:00 +02:00
Guilherme G. Piccoli
63a72284b1 powerpc/pci: Assign fixed PHB number based on device-tree properties
The domain/PHB field of PCI addresses has its value obtained from a
global variable, incremented each time a new domain (represented by
struct pci_controller) is added on the system. The domain addition
process happens during boot or due to PHB hotplug add.

As recent kernels are using predictable naming for network interfaces,
the network stack is more tied to PCI naming. This can be a problem in
hotplug scenarios, because PCI addresses will change if devices are
removed and then re-added. This situation seems unusual, but it can
happen if a user wants to replace a NIC without rebooting the machine,
for example.

This patch changes the way PCI domain values are generated: now, we use
device-tree properties to assign fixed PHB numbers to PCI addresses
when available (meaning pSeries and PowerNV cases). We also use a bitmap
to allow dynamic PHB numbering when device-tree properties are not
used. This bitmap keeps track of used PHB numbers and if a PHB is
released (by hotplug operations for example), it allows the reuse of
this PHB number, avoiding PCI address to change in case of device remove
and re-add soon after. No functional changes were introduced.

Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Reviewed-by: Ian Munsie <imunsie@au1.ibm.com>
Acked-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
[mpe: Drop unnecessary machine_is(pseries) test]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2016-07-07 22:06:55 +10:00
Arnd Bergmann
1ed59b8f43 Defconfig changes for 4.8 #2:
- Addition of the sama5d2 xplained PMIC: ACT8945A
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCgAGBQJXemchAAoJENiigzvaE+LC9LIP/jU3O5r54sHQsbmZzCaf0GZY
 1v2Q6EWDTP2aoFLxZ6dpRi4G+Gu7ycf/wy0CFF0LNjZbsYPrYf3A4dNBVzii7Qkh
 xEjQBr3Qc0EOR3xUV2lkdNzJNWbEolHgAmdA5dDRdZK55m8F/3j+yzeizTk96tc/
 n8gf9Rk2hz0KZnuP7M2jP29nzIYiShkbx0uQQ95VQwNYYJJeNJAgKOvUnK2cwnQT
 3xw0tf/QWk9azBQs0eRwz0tp7YBpvOdgrT3zdQrGPZl0BknJ75f6pQhiV3+Ez++y
 QSPjj8bsZVx1bpnqKd2G+hbsMMj+aCy4jYt+LP4LdYqwaeD1o0ytDuAMEXPQtgrO
 SAe+5B37M1QKq0DaMjj4aQu5Iod/bpg9FGBC9EsiUYH3jikluexqjW9IRL305yJD
 B4dSZXuKbFODTLvEauD0q2zL0KMgWTqog3B77zlZ6oYk1pHUPnN7Wans1FUYGzbB
 x9Wqf8rQmEB3bdIl1aquiivP8zwsEqQbNOhxqVO0vFlB1mAMl99x2tUpOrlBWu5j
 hk1Y1pA24kgF2Yoz7WKOZSZlOp3x9pD0qiDCzypCa/9uIdv8NDxPlGQbJZukJ9P2
 mjjV7hUVYfv3zms9dUJ7SCKajnYcF8BmUeJfTQL9tGEDTZGu6U8Ai5Ms7yHFw1CT
 Bl9MKpor+uoBnloV+RN5
 =21yF
 -----END PGP SIGNATURE-----

Merge tag 'at91-ab-4.8-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/defconfig

Merge "Defconfig changes for 4.8 #2:" from Alexandre Belloni:

 - Addition of the sama5d2 xplained PMIC: ACT8945A

* tag 'at91-ab-4.8-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: multi_v7_defconfig: add ACT8945A
  ARM: at91/defconfig: Add ACT8945A driver
2016-07-07 14:06:14 +02:00
Linus Walleij
83919ef0a5 ARM: dts: Ux500: fix up TVK sensor data
- Fix the I2C address and supply line names for the AK8974

- Sets up the interrupt lines to the different components as they
  actually are connected, I was confused for some time by the fact
  that several lines were connected with <NM> 0 Ohm resistors, which
  means NOT MOUNTED and is thus not 0 Ohm at all but infinite ohms,
  i.e. not connected at all.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-07 14:05:02 +02:00
Michael Ellerman
fc022fdf41 powerpc/kernel: Drop unused extern for current_set
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2016-07-07 22:03:10 +10:00
Arnd Bergmann
c8a12c063b - Add nodes for the DISP function ports
- Add dt-bindings for mt6755
 - Add basic support for mt6755 SoC
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJXeLPXAAoJELQ5Ylss8dNDiKoP/3yeVm9IcmtizZRZlauOZ4PH
 Rk32lKAITXMXRT6j/xgYTP2F67S0qu+mZW4kz5Ma9vY8Su678iD6+6QfEtJfrH+Z
 T8JTT6yI75ZY6MkBWC5GtcYiWtT8ZGXkflBH8FMHhNxx4LsSN79SQAnzlyv66wFq
 yFtLSMYxRaUhwq+ffT4ksYLw9133UQKcZgf1PJgGN++eXW0bxJ8YV27PD8mzSTcV
 t847mzEY/Kqzl6/upjVjloOIyYf66CVg6xBuVBOOlM2Pa2/mhBip0fkxcE3KpvrN
 erSlIQtCJYZL2fjRnOA67omcmilZw5NIBo8yO7nc5Pzo4CG8nBpoY1k9YtLIoNTp
 sFDhmXzGUgOZHvCqwRoQAGxorNlxFn9mdyItKcClbil0wnPbxwtZ3QcE/7/Q4B03
 0HjWwRb55HKAo0IRZ7hVi2Qk/w4MERYl9/knZPR7kyV2ncyl9txtyYBzc8hosn6m
 IgI9Oyj+HPJ516EzQNbrfOc3sEVSRYJKT8TXxXqeSZnsmHzmO8Crjz3TPUPw+MdP
 5CuN8m/mNsVbqbvlZfdbAsMibJnLmDmi8YKmQ7uJjaZFQcZDayIU4NEDiK9OOqWi
 yr3Q/mO9yH6ego7Z0AQUjP5F81R7YtUG6doLKjduhjPcLPydqILHzfHyI4YQMw5A
 1b1OyLu71uvsZQ3hJjmI
 =aMUx
 -----END PGP SIGNATURE-----

Merge tag 'v4.7-next-dts' of https://github.com/mbgg/linux-mediatek into next/dt64

Merge "ARM: mediatek: dts 64 bit updates for v4.8" from Matthias Brugger:

- Add nodes for the DISP function ports
- Add dt-bindings for mt6755
- Add basic support for mt6755 SoC

* tag 'v4.7-next-dts' of https://github.com/mbgg/linux-mediatek:
  arm64: dts: mediatek: add mt6755 support
  Document: DT: Add bindings for mediatek MT6755 SoC Platform
  arm64: dts: mt8173: Add display subsystem related nodes
2016-07-07 13:58:44 +02:00
Jiancheng Xue
abee8fbf2b ARM: hisi: consolidate the hisilicon machine entries
The original patch was to add compatible string for Hi3519 soc
and do some cleanup.

Since the generic machine entry could meet most of the cases,
so I did a further cleanup to reuse it and just keep one machine
entry that needs map_io here.

Signed-off-by: Jiancheng Xue <xuejiancheng@huawei.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2016-07-07 09:37:59 +01:00
Thomas Gleixner
f9c287ba38 timers, x86/mce: Initialize MCE restart timer as pinned
Pinned timers must carry the pinned attribute in the timer structure
itself, so convert the code to the new API.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Chris Mason <clm@fb.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: George Spelvin <linux@sciencehorizons.net>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Len Brown <lenb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160704094341.215783439@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-07 10:25:14 +02:00
Thomas Gleixner
920a4a70c5 timers, x86/apic/uv: Initialize the UV heartbeat timer as pinned
Pinned timers must carry the pinned attribute in the timer structure
itself, so convert the code to the new API.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Chris Mason <clm@fb.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: George Spelvin <linux@sciencehorizons.net>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Len Brown <lenb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160704094341.133837204@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-07 10:25:14 +02:00
Geert Uytterhoeven
c805f1a701 arm64: dts: r8a7796/salvator-x: Enable watchdog timer
Enable the Watchdog Timer (WDT) controller on the Renesas Salvator-X
board equipped with an R-Car M3-W (r8a7796) SoC.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-07-07 10:21:28 +02:00
Geert Uytterhoeven
c8ce8007e5 arm64: dts: r8a7796: Add RWDT node
Add a device node for the Watchdog Timer (WDT) controller on the Renesas
R-Car M3-W (r8a7796) SoC.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-07-07 10:21:28 +02:00
Geert Uytterhoeven
a9003187a9 arm64: dts: r8a7796: Use SYSC "always-on" PM Domain
Hook up all devices that are part of the CPG/MSSR Clock Domain to the
SYSC "always-on" PM Domain, for a more consistent device-power-area
description in DT.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-07-07 10:21:27 +02:00
Geert Uytterhoeven
56aebae000 arm64: dts: r8a7796: Add SYSC PM Domains
Add a device node for the System Controller.
Hook up the Cortex-A57 CPU core and L2 cache/SCU to their respective PM
Domains.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-07-07 10:21:27 +02:00
Takeshi Kihara
006e1db8f7 arm64: dts: salvator-x: add Salvator-X board on R8A7796 SoC
This patch adds initial board support for R8A7796 Salvator-X.

Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
2016-07-07 10:21:26 +02:00
Simon Horman
1561f20760 arm64: dts: r8a7796: Add Renesas R8A7796 SoC support
Basic support for the Gen 3 R-Car M3-W SoC.

Based on work for the r8a7795 and r8a7796 SoCs by
Takeshi Kihara, Dirk Behme and Geert Uytterhoeven.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
2016-07-07 10:21:25 +02:00
Ramesh Shanmugasundaram
162cd7845d arm64: dts: r8a7795: Add CAN FD support
Adds CAN FD controller node for r8a7795.

Note: CAN FD controller register base address specified in R-Car Gen3
Hardware User Manual v0.5E is incorrect. The correct address is:

CAN FD - 0xe66c0000

Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-07-07 10:21:18 +02:00
Geert Uytterhoeven
a5547642a4 arm64: dts: r8a7795: Add missing blank lines between cpu nodes
For consistency with a57_0/a57_1 cpu nodes, and all other nodes.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-07-07 10:21:18 +02:00
Ingo Molnar
36e91aa262 Merge branch 'locking/arch-atomic' into locking/core, because the topic is ready
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-07 09:12:02 +02:00
Will Deacon
03e3c2b7ed locking/barriers, arch/arm64: Implement LDXR+WFE based smp_cond_load_acquire()
smp_cond_load_acquire() is used to spin on a variable until some
expression involving that variable becomes true.

On arm64, we can build this using the LDXR and WFE instructions, since
clearing of the exclusive monitor as a result of the variable being
changed by another CPU generates an event, which will wake us up out of WFE.

This patch implements smp_cond_load_acquire() using LDXR and WFE, which
themselves are contained in an internal __cmpwait() function.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: catalin.marinas@arm.com
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1467049434-30451-1-git-send-email-will.deacon@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-07 09:10:53 +02:00
Kan Liang
46866b59df perf/x86/intel/uncore: Add support for the Intel Skylake client uncore PMU
This patch adds full support for Intel SKL client uncore PMU:

 - Add support for SKL client CPU uncore PMU, which is similar to the
   BDW client PMU driver. (There are some differences in CBOX numbering
   and uncore control MSR.)
 - Add new support for SkyLake Mobile uncore PMUs, for both CPU and PCI
   uncore functionality.

Signed-off-by: Kan Liang <kan.liang@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1467208912-8179-1-git-send-email-kan.liang@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-07 09:03:29 +02:00
Peter Zijlstra
aefbc4d04c perf/x86/intel: Fix rdlbr_to() MSR reading typo
It helps to actually read the right MSR..

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: linux-kernel@vger.kernel.org
Fixes: d4cf1949f9 ("perf/x86/intel: Add {rd,wr}lbr_{to,from} wrappers")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-07 09:03:28 +02:00
Ingo Molnar
3ebe3bd8fb Merge branch 'perf/urgent' into perf/core, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-07 08:58:23 +02:00
Michael Ellerman
d468fcafb7 powerpc/pci: Fix build with PCI_IOV=y and EEH=n
Despite attempting to fix this in commit fb36e90736 ("powerpc/pci: Fix
SRIOV not building without EEH enabled"), the build is still broken when
PCI_IOV=y and EEH=n (eg. g5_defconfig with PCI_IOV=y):

  arch/powerpc/kernel/pci_dn.c: In function ‘remove_dev_pci_data’:
  arch/powerpc/kernel/pci_dn.c:230:18: error: unused variable ‘edev’

Incorporate Ben's idea of using __maybe_unused to avoid so many #ifdefs.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2016-07-07 16:33:27 +10:00
Benjamin Herrenschmidt
fecbfabe1d powerpc: Fix build with CONFIG_MEMORY_HOTPLUG on some configs
For memory hotplug to work, the MMU code needs to provide the functions
create_section_mapping() and remove_section_mapping() to respectively
map and unmap portions of the linear mapping.

At the moment only hash64 provides these, so we provide weak stubs that
just error out. This fixes the build with configurations such as 64-bit
BookE with CONFIG_MEMORY_HOTPLUG enabled.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2016-07-07 16:33:27 +10:00
Benjamin Herrenschmidt
e93d8e6773 powerpc/mm: Fix build of Book3E/64 with 64K pages
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2016-07-07 16:33:26 +10:00
Olof Johansson
135a2f38fa The rk3399 gets support for its emmc controller as well as thermal,
i2c and core io-domain nodes and some reasonable default rates
 for core clocks. The rk3368 also gets io-domains for its r88 board
 as well as a small fix for the gic's memory regions.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJXdbPUAAoJEPOmecmc0R2BiAUH/2UBBQ1f5A9W5bCtxe+kirFa
 R+4tDNske10/h3ey+igciC+6SG4RavHyQn/MoQvu2rzeZvAoPRYi2IVR3/RERf86
 uuDNMqI9C0zQNujuiN/1eVMLAhAUoDZ9+uC1uEJ6ilzKwcsk6Sb+8Fo/zQnR8evd
 Z4GK+YnJtLvxQ3joEh5AcRbd+CaURjAXeJt1HGlDcLCG8HHKNNDpzaFPV2uaoVXp
 1hwx7X8tY5u13K0W7yAzaAq5C4poKa+OpdxlE5g+ryOFWqnqco4l/BBaWg+XK0z5
 XvPjtDE5Di8Wpgjeik/4KLwG/maD9ogdPAZGmg+U2SkGlwVdcOSZmSOE2mFHf3c=
 =W2eY
 -----END PGP SIGNATURE-----

Merge tag 'v4.8-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt64

The rk3399 gets support for its emmc controller as well as thermal,
i2c and core io-domain nodes and some reasonable default rates
for core clocks. The rk3368 also gets io-domains for its r88 board
as well as a small fix for the gic's memory regions.

* tag 'v4.8-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: add ap_pwroff and ddrio_pwroff pins for rk3399
  arm64: dts: rockchip: Provide emmcclk to PHY for rk3399
  arm64: dts: rockchip: Add soc-ctl-syscon to sdhci for rk3399
  arm64: dts: rockchip: fixes the gic400 2nd region size for rk3368
  arm64: dts: rockchip: add i2c nodes for rk3399
  arm64: dts: rockchip: add thermal nodes for rk3399 SoCs
  arm64: dts: rockchip: add rk3399 io-domain core nodes
  arm64: dts: rockchip: add rk3368-r88 iodomains
  arm64: dts: rockchip: add rk3368 io-domain core nodes
  arm64: dts: rockchip: make rk3368 grf syscons simple-mfds
  arm64: dts: rockchip: enable eMMC for rk3399 EVB
  arm64: dts: rockchip: add sdhci/emmc for rk3399
  arm64: dts: rockchip: make rk3399's grf a "simple-mfd"
  arm64: dts: rockchip: assign default rates for core rk3399 clocks

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 22:23:27 -07:00
Olof Johansson
a7f856d6ad Audio support and spi-flash on rk3288-veyron Chromedevices
as well as i2s and ethernet support on rk3228/rk3229 devices
 and a dts file for the rk3229 eval board.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJXdbKVAAoJEPOmecmc0R2B4t8H/3J/l3fXyAskseN12883GkgO
 WxEaCe4LeLbxp9Lcd3jmhXM4WZKPbfngYdLvL6kNh/LZeZT3naa2B55ot0FiIOHQ
 PVvAC9ce7T0wTeK/aC2iFU6two6ZMbk8jSRfpfpijHIwK9U1NQcXTssuzvHR+S/L
 +QP29M2TP3Y9UrPydx8kpCeH0kav2WmdqNmRdpQ9hokCqAiR2jbXi2N4PNtVl9v9
 Vy/s+kFa8RSLzWTUICalwrMzS7j/VyeFKq61NPPjVdfS0Q+poCcdaDw5ZPEtZYBu
 eerD1hTou+z7MPz6F5SM3J5U9G8NEp0NO4b3C0eWvAuA9cMv0smJFfqVD4erp40=
 =wEmr
 -----END PGP SIGNATURE-----

Merge tag 'v4.8-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Audio support and spi-flash on rk3288-veyron Chromedevices
as well as i2s and ethernet support on rk3228/rk3229 devices
and a dts file for the rk3229 eval board.

* tag 'v4.8-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add support rk3229 evb board
  ARM: dts: rockchip: add GMAC nodes for RK322x SoCs
  ARM: dts: rockchip: add i2s nodes for RK322x SoCs
  ARM: dts: rockchip: rename rk3228.dtsi to rk322x.dtsi
  clk: rockchip: add clock-ids for rk3228 MAC clocks
  clk: rockchip: add clock-ids for rk3228 audio clocks
  ARM: dts: rockchip: rename i2s model for Veyron devices
  ARM: dts: rockchip: move rk3288 io-domain nodes to the grf
  ARM: dts: rockchip: Enable analog audio on rk3288-veyron chromebooks
  ARM: dts: rockchip: Add shared file for audio on rk3288-veyron boards
  ARM: dts: rockchip: add SPI flash node for rk3288-veyron

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 22:22:19 -07:00
Lucas Stach
5eb495349f ARM: tegra: beaver: Allow SD card voltage to be changed
This allows to switch the card signal voltage level to 1.8 V, which is
needed for any ultra high speed modes to work.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Acked-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 22:21:40 -07:00
Olof Johansson
c341376ae9 Second Round of Renesas ARM Based SoC Updates for v4.8
* Add DT support to the APMU driver and prioritise DT APMU support
 * Obtain extal frequency from DT
 * Add support for r8a7792
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdR2IAAoJENfPZGlqN0++PFsP+QG1N24uc3pc1+kDFvgnPzqH
 Hs3SzPdSLTjx72K4gybaxLp6N6IMLWwHZUSfWDa1WoUDw8j4yVieJ+bTqPQ52SAS
 +9bRbUb5P1kowQ643xIxOoNPKN+XERJtFMUgt9NW/auzxGJFtVuxkDkxzovwWtgm
 f4+wQSgf0zgl/JabbD1qZtf8zhm8gPGsG92CFJqPmkGYoXjVNkiGwsAF4W1WCKfJ
 oXGUAwuVCpoZluLTg7sY2drqIb/L2mZ0QunjdY3dEJO7YxDF7cYTCE0BgGhN/oGH
 nFme3l9WPi2cPMfEl6Ucfvj4lXPeReXhTIGq8XzKCyJy75WlZsCCPgNJ0nuBvriC
 i0V4q2wfpfubzxjcVGdGfP/05QOY2ZZbvBvqaLyxorjw7atTGhn0QPgQtIfL4P1T
 nlf1fMMtlG5m8CjM7J3nAR6BKcEEF1plUL0c1ZG6UeZCAENX9MyB0J47B7+umI1a
 xuNugqKJg2Z8OsFKJ40MwdvlQuw6QRNw8am4erEou0pt3tzY2+O9pgw7yV2ElNkX
 OVskuk+ove0uK5XAmOdClZHtTl5+wNp+XKCKTcUGHY7L4RaC9zax0YujrrBoe/wz
 QvqwZF5As7pXk8ckzDS4Zvxsc2AuKQBRKfIp9JMcM9urEwRdlWvhb/OgKUjlqsve
 BSj+hDjpO4V4VZCSQv8r
 =+RmG
 -----END PGP SIGNATURE-----

Merge tag 'renesas-soc2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Second Round of Renesas ARM Based SoC Updates for v4.8

* Add DT support to the APMU driver and prioritise DT APMU support
* Obtain extal frequency from DT
* Add support for r8a7792

* tag 'renesas-soc2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7791: Prioritize DT APMU support
  ARM: shmobile: r8a7790: Prioritize DT APMU support
  ARM: shmobile: smp: Add function to prioritize DT SMP
  ARM: shmobile: apmu: Add APMU DT support via Enable method
  ARM: shmobile: apmu: Move #ifdef CONFIG_SMP to cover more functions
  ARM: shmobile: rcar-gen2: Correct arch timer frequency on R-Car V2H
  ARM: shmobile: rcar-gen2: Obtain extal frequency from DT
  ARM: shmobile: r8a7792: basic SoC support
  soc: renesas: rcar-sysc: Improve SYSC interrupt config in legacy wrapper
  soc: renesas: rcar-sysc: Move SYSC interrupt config to rcar-sysc driver
  soc: renesas: rcar-sysc: Make rcar_sysc_init() init the PM domains
  soc: renesas: rcar-sysc: Fix uninitialized error code in rcar_sysc_pd_init()
  soc: renesas: rcar-sysc: add R8A7792 support
  soc: renesas: rcar-sysc: Add support for R-Car M3-W power areas
  soc: renesas: Add r8a7796 SYSC PM Domain Binding Definitions
  soc: renesas: rcar-sysc: Document r8a7796 support

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 22:21:11 -07:00
Olof Johansson
b85751c761 Second Round of Renesas ARM Based SoC R-Car SYSC Updates for v4.8
* Prepare for handling SYSC interrupt configuration purely
   from DT in the rcar-sysc driver for new SoCs, while preserving
   backward compatibility with old DTBs for R-Car H1, H2, and M2-W
 * Add R8A7792 support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdRvUAAoJENfPZGlqN0++qocQAJ6MApU5z9Bn+bLCCLOUeL+F
 5qtRZIQoO/VQ+7sbRR7pBTTLbKs13Zeizq9CxvhGVtq/YUqzP25/RJ8mE25j1Hq1
 +X3QVVOIqCnRQVDlGSq6Og7IMOvCVsNgqxWdmAwtkuiRkD75Qsb6lkmLH8MyNkRj
 6UcC7UUJ5P/Pes9Qgh7ZqfWHD+A7JkUbYlN8THQkuSOJyA5Vf/jAry6riQSkJiuy
 854xJ/f1FRAQas/Usqr3i+6gpZtRw66n5DA+JFubXJLxvrqnZUDdjV2d1tS8phC6
 /AIGxx8n967lPg7j9DO6YxEViF3sxFrvQNds8qYoxzH6+z7FtApBJW9EDLkb58+H
 nvP93DnYz1PzIjcKq0CDreqVnPDtBFK4kfDzkMxLIfbfQVgtSQlo0rpjHQzUA24u
 6zk0Nhl2DM7pe9BYxQNGwWK9f9QIKxiKx9y8Qqkghylq27V34tG+dBgRj0Klv6G+
 QHJNg2ShGZ/esup14eOh4YOw4ks6oNPeda0Rbl4ox3Ec970/42uIR495rsM40Avb
 G17hpvsCd4oVq5xhmr8CKSDzNleewRYGxbzs5Yp1VpWxAjkKOO2AlCxaWSYtYpQe
 gO1sT/YDWx4m0wiEa1/W0z3tO+U3w3wKaKOtxOZyjOj6dq99MJxPwMRoHYUGyMKW
 gGN/bJjsoxBJO/Kl0om+
 =/p9r
 -----END PGP SIGNATURE-----

Merge tag 'renesas-rcar-sysc2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers

Second Round of Renesas ARM Based SoC R-Car SYSC Updates for v4.8

* Prepare for handling SYSC interrupt configuration purely
  from DT in the rcar-sysc driver for new SoCs, while preserving
  backward compatibility with old DTBs for R-Car H1, H2, and M2-W
* Add R8A7792 support

* tag 'renesas-rcar-sysc2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  soc: renesas: rcar-sysc: Improve SYSC interrupt config in legacy wrapper
  soc: renesas: rcar-sysc: Move SYSC interrupt config to rcar-sysc driver
  soc: renesas: rcar-sysc: Make rcar_sysc_init() init the PM domains
  soc: renesas: rcar-sysc: Fix uninitialized error code in rcar_sysc_pd_init()
  soc: renesas: rcar-sysc: add R8A7792 support

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 22:12:04 -07:00
Olof Johansson
5fd70b1b17 Second Round of Renesas ARM Based SoC DT Updates for v4.8
* Use APMU on R-Car Gen2 and provide SMP for r8a7793 SoC
 * Update console parameters to uniformly use chosen/stdout-path,
   serial0, not provide kernel unnecessary command line parameters
 * Add DU pins to silk board
 * Add support for blanche/r8a7792
 * Name pfc subnodes after device name
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdSEnAAoJENfPZGlqN0++T0kP/jc/xLIytIA61qGuaTALFFaz
 h5d3b5gxww8jaQSPsTiaNueQLUCGWdimDp9Jl7r2CduZ633B62l9awobY5E5mx9X
 tPL90nZM1wuuKGwcwDl2LDKUJ/jUbUDb6MN+YIGHhp8qTOa75GxHpGhhdYQH8Uzs
 MlxWkWqucmTMsSQs9USX5/XloQwzZVSbplvS6wHjS4HoaBToB9lQS8qcjX8DGx+j
 OrndwruYx9B5cYA0Fp7xcae/YKiyfyhMdDX2iRKpIAfpheO9/Km7HFES2dY57Xw5
 DN4U4g/iDrdcIBfh6VR6MtfGh+JprOyoelFloh3hKtTL7Pu6bkN4ZnPlN5z6W3Ej
 jFrjgUrf9TSGQaAUaOdzTAjSPRCj63Z3xy8twNn0De0D7dk+AjTQbbdtGR6afAUR
 20i6+8ktB08vZHwoB3DxC5xnDOwugceHLHrR9lbPx+s2eXYQpEze6UNgr5/2r6eo
 HCa1NeFk60F1gJHGvKBbCoFSgP+6QYALt7p5KJ4xfKh/ta08DKz6d3b93KbcXaWM
 NAzrFT0yWdWMHspvsKdTfMA2xyUquWFDzj6URGZ1q84vGJqrXAoZ7XaEl/DKnhdk
 H8+qwSR4Y8jL7MSzGwesaQIrUF9CjYt47+nvAERvJYjZsFHHbq7TuRslTicTgleT
 Bl6Kaqg/1nFH0Xu/9NOD
 =gmxg
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Second Round of Renesas ARM Based SoC DT Updates for v4.8

* Use APMU on R-Car Gen2 and provide SMP for r8a7793 SoC
* Update console parameters to uniformly use chosen/stdout-path,
  serial0, not provide kernel unnecessary command line parameters
* Add DU pins to silk board
* Add support for blanche/r8a7792
* Name pfc subnodes after device name

* tag 'renesas-dt2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (41 commits)
  ARM: dts: r8a7792: add SMP support
  ARM: dts: r8a7793: Add APMU node and second CPU core
  ARM: dts: r8a7791: Add APMU node
  ARM: dts: r8a7790: Add APMU nodes
  devicetree: bindings: Renesas APMU and SMP Enable method
  ARM: dts: kzm9g: Update console parameters
  ARM: dts: kzm9d: Update console parameters
  ARM: dts: marzen: Add serial port config to chosen/stdout-path
  ARM: dts: genmai: Update console parameters
  ARM: dts: armadillo800eva: Update console parameters
  ARM: dts: r8a7792: add JPU support
  ARM: dts: r8a7792: add JPU clocks
  ARM: dts: silk: add DU pins
  ARM: dts: blanche: add Ethernet support
  ARM: dts: blanche: initial device tree
  ARM: dts: blanche: document Blanche board
  ARM: dts: r8a7792: add IRQC support
  ARM: dts: r8a7792: add [H]SCIF support
  ARM: dts: r8a7792: add SYS-DMAC support
  ARM: dts: r8a7792: initial SoC device tree
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 22:11:20 -07:00
Olof Johansson
51a8506608 Renesas ARM Based SoC Defconfig Updates for v4.8
* Enable newly added support for r8a7792 SoC in multi_v7 and shmobile
   defconfigs
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdRmbAAoJENfPZGlqN0++/BEQALN/c/IywQ7haJ1X7U3BIAea
 zDgRMbZxtKCnEVw51hqpOjkobhW3dvMP8Yw1WVngmUJRMnpF1YFbYRXtezS5rMsl
 5nAMvzR4uuqjKbGVcR6DMT5EJMbWCY99MGyqB9OLfzuCC90Y3L85kdkWNi3JCukK
 /0DQ3NU39FdnHnloauVDyXa1WauEl+Tti/kXU2EIoK3fxEmBVWauUGxAlpf0MBa9
 2B8lZlS930r5srQOZBlOiWWNVQT0mYvljSjO9GX9MHjmhLQGfY5LcHPaRupcEHmv
 weDInqnwk0OvHJBjLFNJuMpG11TU7UMGuEVFDNjfel3ItRwzQ+lwZRrn6g58pr52
 N1jotBGeZhtc7ozOmgMqj5oFjhvo+KXAnQiVtpQECAHFo8NL45HCT81+ZRbpmOHG
 Q9EGgOJyh7hnTa6GLgqfG5n+UCCQQmtIYo4mkbhuBIgiBTVaKvLINgrGnghTeul7
 xJyvzafWa3D81NeJB3fnQWfvug/GKSQJp8axk4yultNtLUd8mEAABL5C5fCqYmKL
 xPtDEfmGlVEsJa/L42aDYVrTOhRzt4S8Cy3z5nJkJah7X5FwPAGn8Sx0zkexhS4j
 ANrk2I/ec5ttVUP+2sjmgyvU+JbIyPgjQhP2lp3ifEGosWbYxA4/u5GTzJiyheuX
 6PC9YZ0dQzStAx/QoYWT
 =f6TZ
 -----END PGP SIGNATURE-----

Merge tag 'renesas-defconfig-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig

Renesas ARM Based SoC Defconfig Updates for v4.8

* Enable newly added support for r8a7792 SoC in multi_v7 and shmobile
  defconfigs

* tag 'renesas-defconfig-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: multi_v7_defconfig: defconfig: Enable r8a7792 SoC
  ARM: shmobile: defconfig: Enable r8a7792 SoC

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 22:07:19 -07:00
Olof Johansson
744f0b376d Renesas ARM64 Based SoC Defconfig Updates for v4.8
* Enable Renesas R8A7796 SoC in ARM64 defcnfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdRYaAAoJENfPZGlqN0++NvEQAJN5eMuk92Z426CyubNx/TBM
 pTD/TQg8FyX7wYFSL66LqLZgzYPxzuQlGl0Lfy55IlIsxoGp9xf7t4tZPcvcw5wQ
 BfvhQ6vOeQV8NGbsQS0sRmMrgH6rhPwaQWs/RUawr34v1vVhyRTNJF5pQbpBCqUD
 9pQW9G6G+1WdffjEHQ53Cp56E+nB3sZ0Y/mbI1kydfr5UNx/sTccGOuIPc7UPAwn
 xzpL8XhV6eDKUZu3tGQEDn6rw6iacyi4SB2GQE+QCzw/DB0V/Zb3Z8dd6k2R/6rm
 TZ8xHvz5lucxsGhPpJa43+IVF2nb/RwPs/EsJ8UZrMFgvDEdgCAFEKOwKtI9cPl3
 CELgofXHXMChaA8fwGOVbLlLDNi4H/gV6MEC6jFm8HP6nJRxKwrBGbWQmHKfuqnA
 YPB29ba5GsBUUzV2l8S/Re8eLO85tplzq2vgLSMLixAM4R5LN7tNB2HgRAOrSLND
 ts0qQRyYdIV8Kfdh0e/alXsXnCoJ5RCSkL/KvAsvcNQADizhPLyBKWBk6JZfN0Rr
 XSwcxRybratvNUoKDQjAyCvrSY8fbtJdE4dSa/BmEvY+CH4NsTIye9c7DmoOqluw
 Zoii6V3eTSpHNGooepd8tAtIWF9kXU0xUAB8sFvPwm+O4BSBMIsM78KkuU3E85GS
 +sQKKyhWmsBH0KbDkIZS
 =LjO1
 -----END PGP SIGNATURE-----

Merge tag 'renesas-arm64-defconfig-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/arm64

Renesas ARM64 Based SoC Defconfig Updates for v4.8

* Enable Renesas R8A7796 SoC in ARM64 defcnfig

* tag 'renesas-arm64-defconfig-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: defconfig: enable Renesas R8A7796 SoC

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 22:00:41 -07:00
Arnd Bergmann
8264dde537 ARM: tango: fix CONFIG_HOTPLUG_CPU=n build
Building with CONFIG_HOTPLUG_CPU disabled fails for mach-tango:

include/linux/stddef.h:7:14: error: excess elements in struct initializer [-Werror]
 #define NULL ((void *)0)
arch/arm/mach-tango/platsmp.c:48:15: note: in expansion of macro 'tango_cpu_kill'
  .cpu_kill  = tango_cpu_kill,

the problem as that the .cpu_kill and .cpu_die struct members are
unavailable and we must not try to assign them in this configuration.

Hiding the two (as all other platforms do too) lets us get rid of
the #else clause as well.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 21:44:58 -07:00
Florian Fainelli
2dc9e0b9f1 ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs
Northstar Plus SoCs (ARCH_BCM_NSP) have the exact same UART location and
properties like the register shift of 0, so make it usable.

Acked-by: Jon Mason <jon.mason@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-07-06 19:43:22 -07:00
Florian Fainelli
9a4865d42f ARM: dts: NSP: Specify RAM amount for BCM958625HR board
Add 512MB of memory starting at physical offset 0x6000_0000.

Fixes: 65e9ac208c8e ("ARM: dts: NSP: Add new DT file for bcm958625hr")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-07-06 19:42:43 -07:00
Rafał Miłecki
70a0ae1c33 ARM: BCM5301X: Fix NAND ECC parameters for D-Link DIR-885L
This device uses BCH-1 instead of BCH-8. This fixes ECC errors and makes
NAND usable with brcmnand.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-07-06 19:42:33 -07:00
Rafał Miłecki
8ab5f1fbd3 ARM: BCM5301X: Specify NAND chip select and ECC in separated files
Using separated file with common chip select parameters will allow us
adding other ECC setups without code duplication.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-07-06 19:42:26 -07:00
David S. Miller
30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-07-06 10:35:22 -07:00
Arnd Bergmann
7c2d780ec0 Merge ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB changes into next/soc
* commit '5c34a4e89c':
  ARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB
  ARM: uniphier: drop code for old DT binding

These cause a harmless conflict with the clps711x multiplatform
support, and it's easy to resolve.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-06 18:00:32 +02:00
Alexander Shiyan
c86f51737f ARM: clps711x: Switch to MULTIPLATFORM
Switch CLPS711X to multiplatform.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-06 17:57:56 +02:00
Alexander Shiyan
4a56f46a7d ARM: clps711x: Remove boards support
Any CLPS711X-based board can be replaced with devicetree equivalent.
Remove the board files.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-06 17:57:55 +02:00
Alexander Shiyan
46e6b3aa65 ARM: dts: clps711x: Add DT Cirrus Logic EDB7211 Development board
This adds the Cirrus Logic EP7209,EP7211 DT templates and support for
EDB7211 Development board.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-06 17:57:40 +02:00