Olof Johansson
c6ffdc0741
Merge tag 'renesas-dt3-for-v3.17' of git://git.kernel.org/pub/scm/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 >
2014-07-18 21:39:29 -07:00
Vince Bridgers
dc8fbed5d9
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 >
2014-07-14 21:39:54 -07:00
Olof Johansson
6dda8e594b
Merge tag 'ux500-devicetree-v3.16-1' of git://git.kernel.org/pub/scm/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 >
2014-07-12 21:36:50 -07:00
Olof Johansson
89d70e99ff
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 >
2014-07-12 21:34:22 -07:00
Olof Johansson
c38114f393
Merge tag 'renesas-dt2-for-v3.17' of git://git.kernel.org/pub/scm/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 >
2014-07-12 09:34:38 -07:00
Simon Horman
700ce7c2bb
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 >
2014-07-12 15:16:58 +02:00
Simon Horman
2131421b85
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 >
2014-07-12 15:16:57 +02:00
Simon Horman
c4fac6f2f9
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 >
2014-07-12 15:16:57 +02:00
Simon Horman
fa12355b24
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 >
2014-07-12 15:16:57 +02:00
Simon Horman
27bc82353a
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 >
2014-07-12 15:16:57 +02:00
Simon Horman
94f1a03db6
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 >
2014-07-12 15:16:57 +02:00
Simon Horman
5be97ca4a4
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 >
2014-07-12 15:16:56 +02:00
Simon Horman
9930dc8ee1
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 >
2014-07-12 15:16:56 +02:00
Simon Horman
963b0c359b
Merge branch 'clock-for-v3.17' into dt-for-v3.17
2014-07-12 15:16:37 +02:00
Simon Horman
ff4ce48e1f
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 >
2014-07-12 15:15:39 +02:00
Simon Horman
d1ec90f287
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 >
2014-07-12 15:15:23 +02:00
Simon Horman
9947efaac0
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 >
2014-07-12 15:15:14 +02:00
Simon Horman
7a0c99478d
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 >
2014-07-12 15:15:06 +02:00
Wolfram Sang
cb9a2b12e0
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 e489c2a9bc
("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 >
2014-07-11 10:47:06 +02:00
Khiem Nguyen
5179ffd099
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 >
2014-07-11 10:44:11 +02:00
Nicolas Ferre
bf4d997ab8
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"
2014-07-09 19:14:31 +02:00
Alexandre Belloni
447025e96d
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 >
2014-07-09 19:05:23 +02:00
Alexandre Belloni
edc4a8349d
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 >
2014-07-09 19:05:22 +02:00
Alexandre Belloni
c8b41e005f
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 >
2014-07-09 19:05:22 +02:00
Alexandre Belloni
c2bddbd6f4
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 >
2014-07-09 19:05:21 +02:00
Alexandre Belloni
c2375821c9
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 >
2014-07-09 19:05:21 +02:00
Alexandre Belloni
b81ccb3293
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 >
2014-07-09 19:05:21 +02:00
Alexandre Belloni
a0747caccd
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 >
2014-07-09 19:05:20 +02:00
Alexandre Belloni
57314956cc
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 >
2014-07-09 19:05:20 +02:00
Alexandre Belloni
4c67a1319b
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 >
2014-07-09 19:05:19 +02:00
Alexandre Belloni
5c5a57a45e
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 >
2014-07-09 19:05:19 +02:00
Alexandre Belloni
6f368c3089
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 >
2014-07-09 19:05:19 +02:00
Alexandre Belloni
003b45e287
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 >
2014-07-09 19:05:18 +02:00
Alexandre Belloni
d738989f08
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 >
2014-07-09 19:05:18 +02:00
Alexandre Belloni
650defcf96
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 >
2014-07-09 19:05:18 +02:00
Alexandre Belloni
b77d635007
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 >
2014-07-09 19:05:17 +02:00
Alexandre Belloni
2421d1c6d2
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 >
2014-07-09 19:05:17 +02:00
Alexandre Belloni
c544bc7a43
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 >
2014-07-09 19:05:16 +02:00
Alexandre Belloni
cea5c34dfb
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 >
2014-07-09 19:05:16 +02:00
Alexandre Belloni
80994f0a73
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 >
2014-07-09 19:05:16 +02:00
Alexandre Belloni
322192640b
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 >
2014-07-09 19:05:15 +02:00
Alexandre Belloni
90de7ccc81
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 >
2014-07-09 19:05:15 +02:00
Alexandre Belloni
f1e7861518
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 >
2014-07-09 19:05:14 +02:00
Alexandre Belloni
32cc703a23
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 >
2014-07-09 19:05:14 +02:00
Alexandre Belloni
f48a833534
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 >
2014-07-09 19:05:14 +02:00
Alexandre Belloni
20183110a8
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 >
2014-07-09 19:05:13 +02:00
Alexandre Belloni
09d773cea8
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 >
2014-07-09 19:05:13 +02:00
Alexandre Belloni
684b8fb5a0
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 >
2014-07-09 19:05:13 +02:00
Alexandre Belloni
57b37ed519
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 >
2014-07-09 19:05:12 +02:00
Alexandre Belloni
94788118ef
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 >
2014-07-09 19:05:12 +02:00