Olof Johansson [Sat, 19 Jul 2014 04:39:29 +0000 (21:39 -0700)]
Merge tag 'renesas-dt3-for-v3.17' of git://git./linux/kernel/git/horms/renesas into next/dt
Merge "Third Round of Renesas ARM Based SoC DT Updates for v3.17" from Simon
Horman:
* Initialise SCI using DT when booting the kzm9g, armadillo800eva,
ape6evm and bockw boards without legacy-C code.
* tag 'renesas-dt3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (24 commits)
ARM: shmobile: kzm9g-reference: Initialise SCIF device using DT
ARM: shmobile: sh73a0: Add SCIF nodes
ARM: shmobile: armadillo800eva-reference: Initialise SCIF device using DT
ARM: shmobile: r8a7740: Add SCIF nodes
ARM: shmobile: ape6evm-reference: Initialise SCIF device using DT
ARM: shmobile: r8a73a4: Add SCIF nodes
ARM: shmobile: bockw-reference: Initialise SCIF device using DT
ARM: shmobile: r8a7778: Add SCIF nodes
ARM: shmobile: sh73a0: add SCI clock support for DT
ARM: shmobile: r8a7740: correct SCI clock support for DT
ARM: shmobile: r8a73a4: add SCI clock support for DT
ARM: shmobile: r8a7778: add SCI clock support for DT
ARM: shmobile: r8a7790: lager: use iic cores instead of i2c
ARM: shmobile: Lager: Correct I2C bus for VDD MPU regulator
ARM: shmobile: kzm9g-reference: Remove early_printk from command line
ARM: shmobile: armadillo800eva-reference: Remove early_printk from command line
ARM: shmobile: r8a7779: Consistently use tabs for indentation
ARM: shmobile: henninger: Consistently use tabs for indentation
ARM: shmobile: henninger: enable internal PCI
ARM: shmobile: koelsch: enable internal PCI
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Vince Bridgers [Mon, 23 Jun 2014 18:32:11 +0000 (13:32 -0500)]
ARM: socfpga: Add missing #reset-cells to socfpga device tree
add #reset-cells to socfpga.dtsi. This was missing from the
latest updates and caused the socfpga reset controller to fail
to load like so:
ffd05000.rstmgr: /soc/rstmgr@
ffd05000 missing #reset-cells property
probe of
ffd05000.rstmgr failed with error -22
Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com>
Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Sun, 13 Jul 2014 04:36:50 +0000 (21:36 -0700)]
Merge tag 'ux500-devicetree-v3.16-1' of git://git./linux/kernel/git/linusw/linux-stericsson into next/dt
Merge "Ux500 devicetree changes for v3.17" from Linus Walleij:
Ux500 device tree patches for v3.17:
- Add regulators to STMPE expanders
- Add proper DMA channels for all SD/MMC blocks
- Add sensors to the device tree
* tag 'ux500-devicetree-v3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: add misc sensors to the device trees
ARM: ux500: add some DB8500 DMA channel info
ARM: ux500: add VCC and VIO regulators to STMPE IC
+ Linux 3.16-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Sun, 13 Jul 2014 04:34:22 +0000 (21:34 -0700)]
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
Merge "at91: dt for 3.17 #1" from Nicolas Ferre:
First DT update for 3.17:
- move of crystals DT definitions to the /clocks node
- addition of clock entries for sound for CCF enabled platforms
- addition of DMA and DMA + nand on at91sam9rl
- move to CCF for all not-converted-yet AT91 SoCs: at91rm9200, at91sam9260/9g20,
at91sam9g45 family and at91sam9263
* tag 'at91-dt' of git://github.com/at91linux/linux-at91: (43 commits)
ARM: at91/dt: usb_a9263: define crystals frequencies
ARM: at91/dt: tny_a9263: define crystals frequencies
ARM: at91/dt: sam9263ek: define crystals frequencies
ARM: at91: move at91sam9263 SoC to the CCF
ARM: at91/dt: sam9263: define clocks
ARM: at91: prepare common clk transition for sam9263
ARM: at91/dt: cosino define crystals frequencies
ARM: at91/dt: pm9g45: crystals frequencies
ARM: at91/dt: sam9m10g45ek: define crystals frequencies
ARM: at91: move at91sam9g45 SoC to the CCF
ARM: at91/dt: sam9g45: define clocks
ARM: at91: prepare common clk transition for sam9g45
ARM: at91/dt: kizbox: define main crystal frequency
ARM: at91/dt: animeo_ip: define crystals frequencies
ARM: at91/dt: ethernut5: define crystals frequencies
ARM: at91/dt: evk-pro3: define slow crytal frequency
ARM: at91/dt: aks-cdu: define slow crytal frequency
ARM: at91/dt: ge863-pro3: define main crystal frequency
ARM: at91/dt: mpa1600: define crytals frequencies
ARM: at91/dt: qil_a9260: define crystals frequencies
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Sat, 12 Jul 2014 16:34:38 +0000 (09:34 -0700)]
Merge tag 'renesas-dt2-for-v3.17' of git://git./linux/kernel/git/horms/renesas into next/dt
Merge "Second Round of Renesas ARM Based SoC DT Updates for v3.17" from Simon
Horman:
- Extend hardware coverage
* Add DVC support for sound nodes on r8a7791 and r8a7790
* Enable internal PCI on r8a7790/lager
* tag 'renesas-dt2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7791: add DVC support for sound node on DTSI
ARM: shmobile: r8a7790: add DVC support for sound node on DTSI
ARM: shmobile: lager: enable internal PCI
ARM: shmobile: r8a7790: add internal PCI bridge nodes
Signed-off-by: Olof Johansson <olof@lixom.net>
Simon Horman [Mon, 7 Jul 2014 07:54:52 +0000 (09:54 +0200)]
ARM: shmobile: kzm9g-reference: Initialise SCIF device using DT
Initialise SCIF device using DT when booting armadillo800eva
using DT reference.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 7 Jul 2014 07:54:51 +0000 (09:54 +0200)]
ARM: shmobile: sh73a0: Add SCIF nodes
This describes all of the SCIF hardware of the sh73a0.
Each node is disabled and may be enabled as necessary
by board DTS files.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 7 Jul 2014 07:54:42 +0000 (09:54 +0200)]
ARM: shmobile: armadillo800eva-reference: Initialise SCIF device using DT
Initialise SCIF device using DT when booting armadillo800eva
using DT reference.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 7 Jul 2014 07:54:41 +0000 (09:54 +0200)]
ARM: shmobile: r8a7740: Add SCIF nodes
This describes all of the SCIF hardware of the r8a7740.
Each node is disabled and may be enabled as necessary
by board DTS files.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 7 Jul 2014 07:54:34 +0000 (09:54 +0200)]
ARM: shmobile: ape6evm-reference: Initialise SCIF device using DT
Initialise SCIF device using DT when booting ape6evm
using DT reference.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 7 Jul 2014 07:54:33 +0000 (09:54 +0200)]
ARM: shmobile: r8a73a4: Add SCIF nodes
This describes all of the SCIF hardware of the r8a73a4.
Each node is disabled and may be enabled as necessary
by board DTS files.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 7 Jul 2014 07:54:28 +0000 (09:54 +0200)]
ARM: shmobile: bockw-reference: Initialise SCIF device using DT
Initialise SCIF device using DT when booting bockw
using DT reference.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 7 Jul 2014 07:54:27 +0000 (09:54 +0200)]
ARM: shmobile: r8a7778: Add SCIF nodes
This describes all of the SCIF hardware of the r8a7778.
Each node is disabled and may be enabled as necessary
by board DTS files.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Sat, 12 Jul 2014 13:16:37 +0000 (15:16 +0200)]
Merge branch 'clock-for-v3.17' into dt-for-v3.17
Simon Horman [Mon, 7 Jul 2014 07:54:50 +0000 (09:54 +0200)]
ARM: shmobile: sh73a0: add SCI clock support for DT
This will be used when initialising SCI devices using DT
until common clock framework support is added.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 7 Jul 2014 07:54:40 +0000 (09:54 +0200)]
ARM: shmobile: r8a7740: correct SCI clock support for DT
When initialising SCI devices their names will be .serial
not .sci.
This will be used when initialising SCI devices using DT
until common clock framework support is added.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 7 Jul 2014 07:54:32 +0000 (09:54 +0200)]
ARM: shmobile: r8a73a4: add SCI clock support for DT
This will be used when initialising SCI devices using DT
until common clock framework support is added.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 7 Jul 2014 07:54:26 +0000 (09:54 +0200)]
ARM: shmobile: r8a7778: add SCI clock support for DT
This will be used when initialising SCI devices using DT
until common clock framework support is added.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Thu, 10 Jul 2014 10:50:56 +0000 (12:50 +0200)]
ARM: shmobile: r8a7790: lager: use iic cores instead of i2c
On Lager board, i2c and iic cores can be interchanged since they can be
muxed to the same wires. Commit
e489c2a9bc82713167d9f721ca764f4b0d37e543
("ARM: shmobile: lager: enable i2c devices") activated the i2c cores,
yet the iic cores should be default since they have the more interesting
features for generic use cases, i.e. SMBUS_QUICK and DMA (yet to be
supported).
Reported-by: Khiem Nguyen <khiem.nguyen.xt@renesas.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Khiem Nguyen [Fri, 4 Jul 2014 00:19:51 +0000 (09:19 +0900)]
ARM: shmobile: Lager: Correct I2C bus for VDD MPU regulator
I2C bus for VDD MPU regulator is IIC3, not I2C3.
Signed-off-by: Khiem Nguyen <khiem.nguyen.xt@renesas.com>
Reviewed-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Nicolas Ferre [Wed, 9 Jul 2014 17:14:31 +0000 (19:14 +0200)]
Merge tag 'CCF-for-3.17' of git://github.com/at91linux/linux-at91 into at91-3.17-dt
Pull "CCF migration for 3.17" from Alexandre Belloni:
"This is the switch to CCF for all the remaining at91 SoCs and boards"
Alexandre Belloni [Tue, 24 Jun 2014 06:23:42 +0000 (08:23 +0200)]
ARM: at91/dt: usb_a9263: define crystals frequencies
Define Calao USB-A9263 main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Tue, 24 Jun 2014 06:22:51 +0000 (08:22 +0200)]
ARM: at91/dt: tny_a9263: define crystals frequencies
Define Calao TNY-A9263 main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Tue, 24 Jun 2014 06:21:46 +0000 (08:21 +0200)]
ARM: at91/dt: sam9263ek: define crystals frequencies
Define at91sam9263ek main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Tue, 24 Jun 2014 06:09:44 +0000 (08:09 +0200)]
ARM: at91: move at91sam9263 SoC to the CCF
This patch removes the selection of AT91_USE_OLD_CLK when selecting
at91sam9263 SoC support. This will automatically enable COMMON_CLK_AT91
option and add support for at91 common clock implementation.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Mon, 23 Jun 2014 04:03:37 +0000 (06:03 +0200)]
ARM: at91/dt: sam9263: define clocks
Define the at91sam9263 clocks in the SoC dtsi file.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Thu, 10 Apr 2014 18:19:05 +0000 (20:19 +0200)]
ARM: at91: prepare common clk transition for sam9263
Enclose the sam9263 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91)
#endif"
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Sat, 14 Jun 2014 00:14:32 +0000 (02:14 +0200)]
ARM: at91/dt: cosino define crystals frequencies
Define Cosino boards main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Sat, 14 Jun 2014 00:13:16 +0000 (02:13 +0200)]
ARM: at91/dt: pm9g45: crystals frequencies
Define Ronetix pm9g45 main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Fri, 13 Jun 2014 18:01:51 +0000 (20:01 +0200)]
ARM: at91/dt: sam9m10g45ek: define crystals frequencies
Define at91sam9m10g45ek main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 11 Jun 2014 20:35:59 +0000 (22:35 +0200)]
ARM: at91: move at91sam9g45 SoC to the CCF
This patch removes the selection of AT91_USE_OLD_CLK when selecting at91sam9g45
SoC support. This will automatically enable COMMON_CLK_AT91 option and add
support for at91 common clock implementation.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 11 Jun 2014 20:39:06 +0000 (22:39 +0200)]
ARM: at91/dt: sam9g45: define clocks
Define the at91sam9g45 clocks in the SoC dtsi file.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Thu, 10 Apr 2014 18:19:33 +0000 (20:19 +0200)]
ARM: at91: prepare common clk transition for sam9g45
Enclose the sam9g45 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91)
#endif"
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 18 Jun 2014 19:05:05 +0000 (21:05 +0200)]
ARM: at91/dt: kizbox: define main crystal frequency
Define kizbox board's main crystal frequency.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 18 Jun 2014 19:13:54 +0000 (21:13 +0200)]
ARM: at91/dt: animeo_ip: define crystals frequencies
Define Somfy Animeo IP main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 18 Jun 2014 19:09:19 +0000 (21:09 +0200)]
ARM: at91/dt: ethernut5: define crystals frequencies
Define egnite Ethernut 5 main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 9 Jul 2014 13:23:05 +0000 (15:23 +0200)]
ARM: at91/dt: evk-pro3: define slow crytal frequency
Define Telit EVK-PRO3 slow crystal frequency
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 9 Jul 2014 13:22:15 +0000 (15:22 +0200)]
ARM: at91/dt: aks-cdu: define slow crytal frequency
Define AK signal CDU slow crystal frequency
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 18 Jun 2014 19:07:22 +0000 (21:07 +0200)]
ARM: at91/dt: ge863-pro3: define main crystal frequency
Define Telit GE863-PRO3 main crystal frequency.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 18 Jun 2014 19:03:19 +0000 (21:03 +0200)]
ARM: at91/dt: mpa1600: define crytals frequencies
Define Phontech MPA 1600 main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 18 Jun 2014 19:12:26 +0000 (21:12 +0200)]
ARM: at91/dt: qil_a9260: define crystals frequencies
Define Calao QIL-A9260 main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 18 Jun 2014 19:01:51 +0000 (21:01 +0200)]
ARM: at91/dt: tny_a9260: define crystals frequencies
Define Calao TNY-A9260 and TNY-A9G20 main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Mon, 16 Jun 2014 18:12:19 +0000 (20:12 +0200)]
ARM: at91/dt: usb_a9260: define crystals frequencies
Define Calao USB-A9260, USB-A9G20 and USB-A9G20-LPW main and slow crystals
frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Tue, 17 Jun 2014 09:12:11 +0000 (11:12 +0200)]
ARM: at91/dt: foxg20: define crystals frequencies
Define Acme Systems srl Fox G20 main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 18 Jun 2014 19:10:25 +0000 (21:10 +0200)]
ARM: at91/dt: at91sam9g20ek: define crystals frequencies
Define at91sam9g20ek main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Thu, 29 May 2014 18:42:30 +0000 (20:42 +0200)]
ARM: at91: move at91sam9260 SoCs to the CCF
This patch removes the selection of AT91_USE_OLD_CLK when selecting at91sam9260
SoCs support. This will automatically enable COMMON_CLK_AT91 option and add
support for at91 common clk implementation.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Mon, 16 Jun 2014 17:22:40 +0000 (19:22 +0200)]
ARM: at91/dt: sam9g20: define clocks
Define the at91sam9g20 clocks that differ from at91sam9260 in the SoC dtsi file.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Fri, 18 Apr 2014 10:44:20 +0000 (12:44 +0200)]
ARM: at91/dt: sam9260: define clocks
Define the at91sam9260 clocks in the SoC dtsi file.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Thu, 10 Apr 2014 18:18:47 +0000 (20:18 +0200)]
ARM: at91: prepare common clk transition for sam9260
Enclose the sam9260 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91)
#endif"
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 18 Jun 2014 19:11:37 +0000 (21:11 +0200)]
ARM: at91/dt: at91rm9200ek: define crystals frequencies
Define at91rm9200ek main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Thu, 29 May 2014 18:44:44 +0000 (20:44 +0200)]
ARM: at91: move at91rm9200 SoC to the CCF
This patch removes the selection of AT91_USE_OLD_CLK when selecting at91rm9200
SoC support. This will automatically enable COMMON_CLK_AT91 option and add
support for at91 common clk implementation.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Fri, 2 May 2014 22:46:36 +0000 (00:46 +0200)]
ARM: at91/dt: rm9200: define clocks
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Thu, 10 Apr 2014 18:18:19 +0000 (20:18 +0200)]
ARM: at91: prepare common clk transition for rm9200
Enclose the rm9200 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91)
#endif"
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Sat, 14 Jun 2014 00:18:24 +0000 (02:18 +0200)]
ARM: at91/dt: ariag25: define crystals frequencies
Define Acme Systems Aria G25 board main and slow crystals frequencies.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Tue, 1 Jul 2014 13:44:01 +0000 (15:44 +0200)]
Documentation: dt: document all the atmel pmc compatibles
Documentation for atmel-pmc only list one compatible, add the remaining
compatible strings.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Nicolas Ferre [Thu, 15 May 2014 15:09:28 +0000 (17:09 +0200)]
ARM: at91/dt: add NAND + DMA property for at91sam9rl
Add the "atmel,nand-has-dma" property to NAND node
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Nicolas Ferre [Thu, 15 May 2014 15:08:32 +0000 (17:08 +0200)]
ARM: at91/dt: add DMA controller node to at91sam9rl
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Bo Shen [Mon, 9 Jun 2014 03:31:47 +0000 (11:31 +0800)]
ARM: at91: at91sam9n12ek: switch sound to CCF
As the at91sam9n12ek has switch to CCF, so add clock for wm8904
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Reviwed-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Bo Shen [Mon, 9 Jun 2014 03:31:46 +0000 (11:31 +0800)]
ARM: at91: sama5d3xek: switch sound to CCF
As the sama5d3xek board has switch to CCF, so add clock for wm8904
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Reviwed-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Tue, 17 Jun 2014 13:30:20 +0000 (15:30 +0200)]
ARM: at91/dt: sama5d3 crystals under the clocks node
Having clocks grouped in a subnode is common practice, so move the crystals
under a clocks node for the sama5d3 SoC and sama5d3 based boards.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Tue, 17 Jun 2014 13:30:19 +0000 (15:30 +0200)]
ARM: at91/dt: sam9x5 crystals under the clocks node
Having clocks grouped in a subnode is common practice, so move the crystals and
the ADC clock under a clocks node for the at91sam9x5 SoC and at91sam9x5 based
boards.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Tue, 17 Jun 2014 13:30:19 +0000 (15:30 +0200)]
ARM: at91/dt: sam9rl crystals under the clocks node
Having clocks grouped in a subnode is common practice, so move the crystals
under a clocks node for the at91sam9rl SoC and at91sam9rl based boards.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Tue, 17 Jun 2014 13:30:18 +0000 (15:30 +0200)]
ARM: at91/dt: sam9n12 crystals under the clocks node
Having clocks grouped in a subnode is common practice, so move the crystals
under a clocks node for the at91sam9n12 SoC and at91sam9n12 based boards.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Tue, 17 Jun 2014 13:30:18 +0000 (15:30 +0200)]
ARM: at91/dt: sam9261 crystals under the clocks node
Having clocks grouped in a subnode is common practice, so move the crystals
under a clocks node for the at91sam9261 SoC and at91sam9261 based boards.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Simon Horman [Mon, 7 Jul 2014 06:50:09 +0000 (08:50 +0200)]
ARM: shmobile: kzm9g-reference: Remove early_printk from command line
As early printk is not supported when devices are initialised
using DT, so remove it from the command line.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 7 Jul 2014 06:50:08 +0000 (08:50 +0200)]
ARM: shmobile: armadillo800eva-reference: Remove early_printk from command line
As early printk is not supported when devices are initialised
using DT, so remove it from the command line.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 7 Jul 2014 06:47:38 +0000 (08:47 +0200)]
ARM: shmobile: r8a7779: Consistently use tabs for indentation
Unify white space usage by consistently using tabs for indentation.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 7 Jul 2014 06:47:36 +0000 (08:47 +0200)]
ARM: shmobile: henninger: Consistently use tabs for indentation
Unify white space usage by consistently using tabs for indentation.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Tue, 24 Jun 2014 18:13:38 +0000 (22:13 +0400)]
ARM: shmobile: henninger: enable internal PCI
Enable internal AHB-PCI bridges for the USB EHCI/OHCI controllers attached to
them.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
[horms+renesas@verge.net.au: minor witespace changes]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Tue, 24 Jun 2014 18:11:44 +0000 (22:11 +0400)]
ARM: shmobile: koelsch: enable internal PCI
Enable internal AHB-PCI bridges for the USB EHCI/OHCI controllers attached to
them.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
[horms+renesas@verge.net.au: minor witespace changes]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Tue, 24 Jun 2014 18:10:05 +0000 (22:10 +0400)]
ARM: shmobile: r8a7791: add internal PCI bridge nodes
Add device nodes for the R8A7791 internal PCI bridge devices.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
[horms+renesas@verge.net.au: minor witespace changes]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Olof Johansson [Tue, 8 Jul 2014 05:39:47 +0000 (22:39 -0700)]
Merge tag 'berlin-dt-3.17-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt
Merge "Berlin DT changes for v3.17" from Sebastian Hesselbarth:
- L2CC latency properties for BG2Q
- DW i2c nodes for BG2Q and corresponding dev board
- SMP related nodes for BG2 and BG2Q
* tag 'berlin-dt-3.17-1' of git://git.infradead.org/users/hesselba/linux-berlin:
ARM: dts: berlin: add SMP related nodes and properties for BG2Q
ARM: dts: berlin: add SMP related nodes and properties for BG2
Documentation: bindings: add the marvell,berlin-smp CPU enable method
Documentation: bindings: add the Berlin CPU control doc
ARM: dts: berlin: enable i2c0 and i2c2
ARM: dts: berlin: add I2C nodes for BG2Q
ARM: dts: berlin2q: set L2CC tag and data latency to 2 cycles
Signed-off-by: Olof Johansson <olof@lixom.net>
Linus Walleij [Sat, 12 Apr 2014 15:13:23 +0000 (17:13 +0200)]
ARM: ux500: add misc sensors to the device trees
This adds the STMicroelectonics MEMS sensor devices to the Ux500
family device trees:
- Accelerometer
- Magnetometer
- Gyroscope
- Pressure (barometer)
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Denis CIOCCA <denis.ciocca@st.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij [Wed, 11 Jun 2014 08:45:50 +0000 (10:45 +0200)]
ARM: ux500: add some DB8500 DMA channel info
This adds some missing DMA channel information to the disabled
MMC/SD/SDIO blocks number 3 and 5, and notes that the assignment
of MSP channels vary with ASIC variant.
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij [Tue, 15 Apr 2014 15:31:00 +0000 (17:31 +0200)]
ARM: ux500: add VCC and VIO regulators to STMPE IC
Add a VCC and VIO regulator supplies to the the STMPE expander
found on the STUIB UIB variants.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Olof Johansson [Mon, 7 Jul 2014 00:22:26 +0000 (17:22 -0700)]
Merge tag 'renesas-dt-for-v3.17' of git://git./linux/kernel/git/horms/renesas into next/dt
Merge "Renesas ARM Based SoC DT Updates for v3.17" from Simon Horman:
Increased hardware coverage:
- Add R-Car sounds support to r8a7790 SoC
- Add PCIe support to r8a7790 and r8a7791 SoCs
- Increase I2C support of Henninger and lager boards
- DVFS support to Koelsch board
- Add SYS-DMAC clocks to r8a7791 SoCs
- Add USB 3.0 clocks to r8a7791 and r8a7790 SoCs
- Add LED labels to armadillo800eva board
Cleanup:
- Remove early_printk from marzen command line
* tag 'renesas-dt-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (29 commits)
ARM: shmobile: r8a7791: add R-Car sound support on DTSI
ARM: shmobile: henninger: Enable PCIe Controller & PCIe bus clock
ARM: shmobile: koelsch: Enable PCIe Controller & PCIe bus clock
ARM: shmobile: r8a7791: Add PCIe Controller device node
ARM: shmobile: r8a7791: Add default PCIe bus clock
ARM: shmobile: r8a7791: Add PCIEC clock device tree node
ARM: shmobile: r8a7790: Add PCIe Controller device node
ARM: shmobile: r8a7790: Add default PCIe bus clock
ARM: shmobile: r8a7790: Add PCIEC clock device tree node
ARM: shmobile: r8a7791: add MSTP10 support on DTSI
ARM: shmobile: r8a7791: add audio clock on DTSI
ARM: shmobile: r8a7790: add R-Car sound support on DTSI
ARM: shmobile: r8a7790: add MSTP10 support on DTSI
ARM: shmobile: henninger: add I2C2 DT support
ARM: shmobile: koelsch: Remove duplicate i2c6 nodes
ARM: shmobile: lager: Remove duplicate i2c3 nodes
ARM: shmobile: Lager memory map update
ARM: shmobile: lager: Move i2c[12]_pins nodes to pfc node
ARM: shmobile: lager: add i2c1, i2c2 pins
ARM: shmobile: lager: enable i2c devices
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Linus Torvalds [Sun, 6 Jul 2014 19:37:51 +0000 (12:37 -0700)]
Linux 3.16-rc4
Linus Torvalds [Sun, 6 Jul 2014 19:11:57 +0000 (12:11 -0700)]
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
Linus Torvalds [Sun, 6 Jul 2014 19:08:30 +0000 (12:08 -0700)]
Merge tag 'scsi-for-linus' of git://git./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
Geert Uytterhoeven [Thu, 3 Jul 2014 12:02:45 +0000 (14:02 +0200)]
ARM: shmobile: genmai reference dts: Add RSPI node
Add SPI device for RSPI on Genmai.
On this board, only rspi4 is in use. Its bus contains a single device
(a wm8978 audio codec), for which no bindings are defined yet.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Linus Torvalds [Sun, 6 Jul 2014 00:13:46 +0000 (17:13 -0700)]
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
Linus Torvalds [Sat, 5 Jul 2014 23:57:12 +0000 (16:57 -0700)]
Merge tag 'fixes-for-linus' of git://git./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
Linus Torvalds [Sat, 5 Jul 2014 23:56:14 +0000 (16:56 -0700)]
Merge branch 'irq-urgent-for-linus' of git://git./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.
Dave Airlie [Sat, 5 Jul 2014 21:49:59 +0000 (07:49 +1000)]
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
Dave Airlie [Sat, 5 Jul 2014 21:49:28 +0000 (07:49 +1000)]
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:
Dave Airlie [Sat, 5 Jul 2014 21:48:26 +0000 (07:48 +1000)]
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
Keith Busch [Mon, 30 Jun 2014 22:24:44 +0000 (16:24 -0600)]
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:
7b6ef1262549f6afc5c881aaef80beb8fd15f908
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>
Linus Torvalds [Sat, 5 Jul 2014 17:12:52 +0000 (10:12 -0700)]
Merge tag 'arm64-fixes' of git://git./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
Santosh Shilimkar [Sun, 22 Jun 2014 20:06:22 +0000 (16:06 -0400)]
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>
Shawn Guo [Wed, 2 Jul 2014 07:37:10 +0000 (15:37 +0800)]
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>
Olof Johansson [Sat, 5 Jul 2014 04:51:19 +0000 (21:51 -0700)]
Merge tag 'mvebu-fixes-3.16-2' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for v3.16 (round #2)
- mvebu
- Fix PCIe deadlock now that SMP is enabled
- Fix cpuidle for big-endian systems
* tag 'mvebu-fixes-3.16-2' of git://git.infradead.org/linux-mvebu:
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
Signed-off-by: Olof Johansson <olof@lixom.net>
Maxime Ripard [Sun, 29 Jun 2014 13:48:53 +0000 (15:48 +0200)]
ARM: sunxi: Reintroduce the restart code for A10/A20 SoCs
This partly reverts commits
553600502b84 (ARM: sunxi: Remove reset code from
the platform) and
5e669ec583e2 (ARM: sunxi: Remove init_machine callback) for
the sun4i, sun5i and sun7i families.
This is needed because the watchdog counterpart of these commits was dropped,
and didn't make it into 3.16. In order to still be able to reboot the board, we
need to reintroduce that code. Of course, the long term view is still to get
rid of that code in mach-sunxi.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Sat, 5 Jul 2014 04:45:38 +0000 (21:45 -0700)]
Merge tag 'omap-for-v3.16/fixes-against-rc1' of git://git./linux/kernel/git/tmlind/linux-omap into fixes
Merge OMAP fixes from Tony Lindgren:
Fixes for omaps for issues discovered during the merge window and
enabling of a few features that had to wait for the driver
dependencies to clear.
The fixes included are:
- Fix am43xx hard reset flags
- Fix SoC detection for DRA722
- Fix CPU OPP table for omap5
- Fix legacy mux parser bug if requested muxname is a prefix of
multiple mux entries
- Fix qspi interrupt binding that relies on the irq crossbar
that has not yet been enabled
- Add missing phy_sel for am43x-epos-evm
- Drop unused gic_init_irq() that is no longer needed
And the enabling of features that had driver dependencies are:
- Change dra7 to use Audio Tracking Logic clock instead of a fixed
clock now that the clock driver for it has been merged
- Enable off idle configuration for selected omaps as all the kernel
dependencies for device tree based booting are finally merged as
this is needed to get the automated PM tests working finally with
device tree based booting
- Add hwmod entry for ocp2scp3 for omap5 to get sata working as
all the driver dependencies are now in the kernel and this patch
fell through the cracks during the merge window
* tag 'omap-for-v3.16/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
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
Linus Torvalds [Fri, 4 Jul 2014 16:37:43 +0000 (09:37 -0700)]
Merge tag 'md/3.16-fixes' of git://neil.brown.name/md
Pull md bugfixes from Neil Brown:
"Two minor bugfixes for md in 3.16"
* tag 'md/3.16-fixes' of git://neil.brown.name/md:
md: flush writes before starting a recovery.
md: make sure GET_ARRAY_INFO ioctl reports correct "clean" status
Linus Torvalds [Fri, 4 Jul 2014 15:56:57 +0000 (08:56 -0700)]
Merge tag 'sound-3.16-rc4' of git://git./linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"This contains a few fixes for HD-audio: yet another Dell headset pin
quirk, a fixup for Thinkpad T540P, and an improved fix for
Haswell/Broadwell HDMI clock setup"
* tag 'sound-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - restore BCLK M/N value as per CDCLK for HSW/BDW display HDA controller
drm/i915: provide interface for audio driver to query cdclk
ALSA: hda - Add a fixup for Thinkpad T540p
ALSA: hda - Add another headset pin quirk for some Dell machines
Linus Torvalds [Fri, 4 Jul 2014 15:53:53 +0000 (08:53 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"We've queued up a few fixes in my for-linus branch"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix crash when starting transaction
Btrfs: fix btrfs_print_leaf for skinny metadata
Btrfs: fix race of using total_bytes_pinned
btrfs: use E2BIG instead of EIO if compression does not help
btrfs: remove stale comment from btrfs_flush_all_pending_stuffs
Btrfs: fix use-after-free when cloning a trailing file hole
btrfs: fix null pointer dereference in btrfs_show_devname when name is null
btrfs: fix null pointer dereference in clone_fs_devices when name is null
btrfs: fix nossd and ssd_spread mount option regression
Btrfs: fix race between balance recovery and root deletion
Btrfs: atomically set inode->i_flags in btrfs_update_iflags
btrfs: only unlock block in verify_parent_transid if we locked it
Btrfs: assert send doesn't attempt to start transactions
btrfs compression: reuse recently used workspace
Btrfs: fix crash when mounting raid5 btrfs with missing disks
btrfs: create sprout should rename fsid on the sysfs as well
btrfs: dev replace should replace the sysfs entry
btrfs: dev add should add its sysfs entry
btrfs: dev delete should remove sysfs entry
btrfs: rename add_device_membership to btrfs_kobj_add_device
Marc Zyngier [Fri, 6 Jun 2014 13:16:21 +0000 (14:16 +0100)]
arm64: fix el2_setup check of CurrentEL
The CurrentEL system register reports the Current Exception Level
of the CPU. It doesn't say anything about the stack handling, and
yet we compare it to PSR_MODE_EL2t and PSR_MODE_EL2h.
It works by chance because PSR_MODE_EL2t happens to match the right
bits, but that's otherwise a very bad idea. Just check for the EL
value instead.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
[catalin.marinas@arm.com: fixed arch/arm64/kernel/efi-entry.S]
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Steve Capper [Wed, 2 Jul 2014 10:46:23 +0000 (11:46 +0100)]
arm64: mm: Make icache synchronisation logic huge page aware
The __sync_icache_dcache routine will only flush the dcache for the
first page of a compound page, potentially leading to stale icache
data residing further on in a hugetlb page.
This patch addresses this issue by taking into consideration the
order of the page when flushing the dcache.
Reported-by: Mark Brown <broonie@linaro.org>
Tested-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Steve Capper <steve.capper@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: <stable@vger.kernel.org> # v3.11+
Steve Capper [Wed, 25 Jun 2014 07:41:45 +0000 (08:41 +0100)]
arm64: mm: Fix horrendous config typo
The define ARM64_64K_PAGES is tested for rather than
CONFIG_ARM64_64K_PAGES. Correct that typo here.
Signed-off-by: Steve Capper <steve.capper@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Mengdong Lin [Thu, 3 Jul 2014 09:02:23 +0000 (17:02 +0800)]
ALSA: hda - restore BCLK M/N value as per CDCLK for HSW/BDW display HDA controller
For HSW/BDW display HD-A controller, hda_set_bclk() is defined to set BCLK
by programming the M/N values as per the core display clock (CDCLK) queried from
i915 display driver.
And the audio driver will also set BCLK in azx_first_init() since the display
driver can turn off the shared power in boot phase if only eDP is connected
and M/N values will be lost and must be reprogrammed.
Signed-off-by: Mengdong Lin <mengdong.lin@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>