Commit Graph

413111 Commits

Author SHA1 Message Date
Kevin Hilman
939ac3cd06 Merge branch 'mvebu/dt-4' into next/dt
* mvebu/dt-4:
  ARM: mvebu: sort DT nodes by address
  ARM: orion5x: sort DT nodes by address
  ARM: dove: sort DT nodes by address
  ARM: kirkwood: sort dt nodes by address

Signed-off-by: Kevin Hilman <khilman@linaro.org>

Conflicts:
	arch/arm/boot/dts/armada-370-xp.dtsi
2013-12-19 15:25:04 -08:00
Kevin Hilman
718133a637 mvebu DT changes for v3.14 (incr. #3)
- kirkwood
     - use symbolic names for gpios and key inputs
 
  - mvebu
     - add the pxa nand controller to the ReadyNAS and A370-RD boards
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJSrNh/AAoJEP45WPkGe8ZnXFoP/jlCWdq7sjHgeEVq086xjcRq
 altKZbk4VcfbQmZoM+LSdVsMXhxjOvRrsOUG06uzQftzE6YgZ6TuypB++sEIkfzL
 qAyu+DDDZGTeK35JDbM9MhjUCHdhCoBoQW8LUAgXk77p/FSccOvHAGINRiWZ5xib
 a/Eb5YR8Of4anNOqG1Tl/Uji8A2cGTMo4yQcWXo//A9XHPg3zsDgXYmkYJHs80ce
 8bgOChAF5tjAjchbYncRkQyZhGVLEBZ6dFMLDFW/4NQtSYUu7CopTTOJnYbj5w//
 wxDrr222DXcMQ4Po6NYJHzsewu6QmRYBqZLG2HSfCN3sGVRzmq7B6OQaif8N8j9g
 9WmfD7PCVhcSCMx6N4FGtnJobSP3H3oZuEOAmsy5MVFF22c8SwwBMIwF+UVwP9wR
 mny1FhZbWREgyDDbKEYwuc13PgjIrP5DoJ5jhTuG9Mqv/fUn4ZS5XOPTe2AIbBO3
 UBZRLUsUirYMyGJxy2Yz08ovIOfBb6ilQFvvli2BWDcyiqdpxZ5HTYtQSKd8YLnQ
 Q2B28n4Gxi8QC9OpObeyU2y03wiI/jYTGKDDgS5Ar8SKEZg479QK0lAGuaZPFSdo
 09mRkY3OF521+2LfAByw8AFIBW945XzJLDUx0L9Qv9OFTkJof3VB4S3DTF8PILQB
 SWXQHTLNhJLF4fVxd1B0
 =ux36
 -----END PGP SIGNATURE-----

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

From Jason Cooper:
mvebu DT changes for v3.14 (incr. #3)

 - kirkwood
    - use symbolic names for gpios and key inputs

 - mvebu
    - add the pxa nand controller to the ReadyNAS and A370-RD boards

* tag 'mvebu-dt-3.14-3' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Enable NAND controller in A370 Reference Design board
  ARM: mvebu: Enable NAND controller in ReadyNAS 2120 .dts file
  ARM: mvebu: Enable NAND controller in ReadyNAS 104 .dts file
  ARM: mvebu: Enable NAND controller in ReadyNAS 102 .dts file
  ARM: DT: Kirkwood: Use symbolic names from gpio.h
  ARM: DT: Kirkwood: Use symbolic names from input.h

Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-12-19 07:34:39 -08:00
Kevin Hilman
1cfe0874c1 Some Nomadik Device Tree updates for the v3.14 cycle:
- Drop 0x prefixes
 
 - Get rid of explicit GPIO management
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJSq6K8AAoJEEEQszewGV1zFkkP/jZEnJ/pBEcdiCVZGc6UGcIk
 ITGpqkY6Baq9W3j4g8BINEcT1h8zPk/ZxICE+GpzgeKd3K2u00p44mMixZXVFHaI
 umP98AbzvTP3ZdBL+v93uNm5dTcIEG1jdvC8BsgJs80KsYv/6HKPvT2RfF1vfsri
 S2ZrbIlWXRGeCqERfctilOrGD0HUbAM7tD4LuiBd14LWfc40OswHjweUsKvqESj9
 DS3F6Eo9y1oZcdOZJ2zOqep61rBiuJ8yyQ/TGG1/fKcKDrS+pd21bOn4DKkq3OMw
 Of1OHvylxjiId060kgbEpBvRtH2GsjO4rd9jLzcuzg+/apSqoxHoYaRuWucOeTF3
 5PQ2FMjlkcRMJMZjNHg6v3I/OFy1KXiWpSN6IN7p/VgB7V9krNQFxruxS/bW/Mzu
 DTtvJV3YoNXVl5Krf9oEAjLn3mEn2SXKxlgtaMuvElQF2V1xZ4KzH0fvlJIpZJTn
 O38UoalNDJKJDZ/Db+TnNmFN28ApoT+wXdUPRRuyojhwcHwmNMuqEwGP1Jtjc9ts
 yFEH6Hohdli0Uvgfj4lBU2pZIRqq2qIIehLJ/MyO4sCN4BNV5ZJRynDLmbCQ4DXM
 H2gJxvm6pY3ORN+Ry2ii4PXmvmc3X5ihU6ejVXtfyO77ZD81Z8fcRqiH5iFqNJ0/
 +Tzr9G+dE5DFOv+Jw2Ml
 =QVcj
 -----END PGP SIGNATURE-----

Merge tag 'nomadik-dt-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

From Linus Walleij:
Some Nomadik Device Tree updates for the v3.14 cycle:

- Drop 0x prefixes

- Get rid of explicit GPIO management

* tag 'nomadik-dt-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: nomadik: get rid of explicit ethernet GPIO management
  ARM: nomadik: Remove '0x's from nomadik stn8815 DTS file
2013-12-19 07:24:35 -08:00
Jason Cooper
a095b1c78a ARM: mvebu: sort DT nodes by address
Prevent future unnecessary merge conflicts

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-12 15:00:44 +00:00
Jason Cooper
6226cf186c ARM: orion5x: sort DT nodes by address
Prevent future unnecessary merge conflicts

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-12 15:00:44 +00:00
Jason Cooper
b31b32119a ARM: dove: sort DT nodes by address
Prevent future (unnecessary) merge conflicts

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-12 15:00:43 +00:00
Jason Cooper
20bba5883a ARM: kirkwood: sort dt nodes by address
This has caused merge conflicts in the past.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-12 15:00:43 +00:00
Ezequiel Garcia
69e18e26b5 ARM: mvebu: Enable NAND controller in A370 Reference Design board
Marvell's Armada 370 Reference Design has a NAND flash, so enable it in
the devicetree and add the partitions as prepared in the factory images.

In order to skip the driver's custom device detection and use only ONFI
detection, the "marvell,keep-config" parameter is used. This is needed
because we have no support for setting the timings parameters yet.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-12 14:04:34 +00:00
Mike Dunn
e7b4a8dfc8 ARM: pxa: add PWM nodes to pxa27x.dtsi
This patch adds PWM nodes for each of the four channels present on the
pxa270.

Signed-off-by: Mike Dunn <mikedunn@newsguy.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-11 16:36:47 -08:00
Kevin Hilman
899dd6ccf3 Two integrator device tree patches for v3.14:
- Delete some static core module mappings.
 
 - Move EBI location to the device tree.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJSpuqrAAoJEEEQszewGV1zkKAQAMK02JKcbyWJgazaWUgg5FcS
 HZQkGlemrSX4lVIIGy/bYCzbChDo5u0iCzSJfjKj5crh777reCPiIwkMGFsgFVlS
 7n6XiLxH//TpdkOh9eq5g+zMDqkVcZgrDhXDdku3p2CoRJZxQmHQ5rn1tripozxS
 SNepI19shc/pBhVJhypjJLhkxduArS6DasAvJKY1y1FwoD7KOsWKeJEvRDa6If6a
 3yPztJGLgVXS63NfDNQ2JQYSXxgT1sB9+xDPUIcupDHX4S1Qa372E1kv5o1dblhR
 TkyPSMQCgCl4VahXJrbulD4aDh4dXLTggiRUX//rVYLwOyyfKCk1GLSXgOftzPSn
 WJx0Wxu0815rwozoOjgjbNaDPCx8Dg8MjBs4cr4vYDfr09/snRmJX7p9/fUGagIM
 NWPLAwukLgrgZoIMV3CLHD9S0+ud/cTlOlAmfLn/UBN6Rvjh9H1tNP2qepZ6L33e
 lTfZPNg/Y9bbK12vYu2ioj/gIu1c0G6pPPhkgZ8oEdFAxdGHwSCKi5i9qXODlPbv
 q8Qn3gXJxBDVbDcgp5gssxcNpNQzSOtiSu8LuqQSBmej/lNVoQHPE6eMe23F1ELj
 WNoC7c0hJMXSI68pNIKwZWEy3+J1qKd0pP1QMndMUVW//Dx2datu2FInOYtLnSB9
 ClienuVdwe43Pdygb+VG
 =efPU
 -----END PGP SIGNATURE-----

Merge tag 'integrator-v3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/dt

From Linus Walleij:
Two integrator device tree patches for v3.14:

- Delete some static core module mappings.

- Move EBI location to the device tree.

* tag 'integrator-v3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: integrator: move EBI to the device tree
  ARM: integrator: delete static core module mappings

Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-12-11 07:37:48 -08:00
Kevin Hilman
374dc56b6c First DT pull-request for 3.14
- many little corrections and documentation updates
 - LCD FB Device Tree for at91sam9263 and at91sam9g45 boards
 - crypto peripherals DT entries + DMA specification
 - new Cosino board
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJSpd+hAAoJEAf03oE53VmQB7cH+wVFP2N7+kGTB9WTBFOmTt/6
 tAEyO/yUTGPZiDV1Vsb5F+MPi+de3pt0t9Br11bXSDolzwHPDMhcGXCDxpJlyYrN
 sIGXO2YtUmIo+QMqShRXOgoozkGqXxpOqVt4vZRaEOQguVja5NJz7xbXUmoma8a/
 eKgt94Bqyfmnv1wIsjgz3AR1mXYMKIZbDxJ1IZvVLwNnp6n6H8Lrh5qrOloICJ0Z
 sm0gD85lq/An9FGiYDQkxAlIkYNFHlB0fmQdLw+uKLTRftT7EuGK4RqawrzQW84E
 32pZ6fzLTCQ1FQfkpamEOrWaoF4DDvTuBn3YXCtk7bA/8gNCmX7y42PcCR6UHpY=
 =7H2V
 -----END PGP SIGNATURE-----

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

From Nicolas Ferre:
First DT pull-request for 3.14
- many little corrections and documentation updates
- LCD FB Device Tree for at91sam9263 and at91sam9g45 boards
- crypto peripherals DT entries + DMA specification
- new Cosino board

* tag 'at91-dt' of git://github.com/at91linux/linux-at91: (21 commits)
  ARM: at91/at91rm9200ek.dts: rearrange nodes in address ascending order
  ARM: at91: dt: at91rm9200ek: add emac and nor flash support
  ARM: at91: add uart aliases to sama5d3 dtsi
  ARM: at91: add i2c2 pinctrl speficifation to sama5d3 DT
  ARM: at91: Animeo IP: fix mtd partition table
  ARM: at91: at91sam9g45: add i2c pinctrl
  ARM: at91: at91sam9g45: set default mmc pinctrl-names
  ARM: at91: sama5d3: enable qt1070 as a wakeup source
  ARM: at91: add support for Cosino board series by HCE Engineering
  ARM: at91/dt/sama5d3: add DMA information to SHA/AES/TDES nodes
  ARM: at91/dt/trivial: before sama5d3, Atmel MPU were using at91 prefix
  ARM: at91/dt/trivial: use macro for AES irq type
  ARM: at91: sam9263ek: add dt lcd support
  ARM: at91: at9sam9m10g45ek: add dt lcd support
  ARM: at91: sam9263: add fb dt support
  ARM: at91: sam9g45: add fb dt support
  ARM: at91/dt: binding: add missing compatibility string in SDRAM/DDR documentation
  ARM: at91/dt: binding: add precision to AIC documentation
  ARM: at91/dt: add atmel,pullup-gpio to at91rm9200ek usb1 definition
  ARM: at91/dt: add ethernet phy to at91rm9200ek board
  ...

Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-12-10 10:02:47 -08:00
Josh Wu
b32313c614 ARM: at91: sama5d3/dt: add sama5d36ek dts files
Add .dts and .dtsi file to support sama5d36ek board.
Also update the the comments for sama5d36 in sama5d3.dtsi.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Boris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-12-10 09:59:57 -08:00
Kevin Hilman
8e1c9f5944 Merge branch 'next/cleanup' into next/dt 2013-12-10 09:59:21 -08:00
Kevin Hilman
c69bb7bd60 mvebu DT changes for v3.14 (set #2)
- mvebu
     - Netgear ReadyNAS cleanup
     - add Netgear ReadyNAS 2120
 
  - kirkwood
     - Netgear ReadyNAS cleanup
     - add Netgear ReadyNAS NV+ v2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJSo7wDAAoJEP45WPkGe8Zne+MP/iJNR0X1HK1FnLfcM5bq/dym
 JT9cfFMiIBLsLHCxayLQAG/8SwYBBbPoNjGlS2TfKNKeORM/sv6sxq08NvybOOJX
 +GGPweC4qXUzOXu4efTRnTHtrjfZe7zXDW8TUhs6TCiWV5IQP/hba3WWzk+kL1Zl
 C697b5HNsbAIo/zgiXafYoDSctyyjHWSn3vAve+RsYLWG8D0vEO8ketM1zyebLiz
 cQS8ZA8jhUK6MG3cyHzDYgCSS/OGyhne0UjAOiIn3dTC1TLr+nFkAiOjaUeCbr2a
 cR0u7iJJvmNG73pNDIDjDOScBd8eq/w7Vwmct0XmYBm9AUpy7buSaNNbS1FZRgRh
 3XJvwULcYscgFKgcB5tE+Rwi1iAYy2HVtIcHinmvk5G2Ff1GnB+ryyZy++JlO+j8
 Ft8BUIthMKPwzY3z3i7JVl+yC/ENzJddmvo5UPKJPR6Fl0wo7tIfsL9EWdZAIM4h
 sO7iZf+hkHnRnOt6iedsv7jr99K73hKMp+jfgssstlfP+44fIXbvj1hWezkJwp9J
 rHoOGnaZ5Xo6sUNsRerkTHj6EuCABeAhypcY+5V/QAqT8gyRwSeo+BiJmogF9DTd
 JX/MMjIiHNiP1ZujimPvZspo579FBxCut9+hh+Osl1ubHDM8aX4f/q+0JLYOLzGg
 cMbJ2qx9jaKFLUW51iiz
 =USMT
 -----END PGP SIGNATURE-----

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

From Jason Cooper:
mvebu DT changes for v3.14 (set #2)

 - mvebu
    - Netgear ReadyNAS cleanup
    - add Netgear ReadyNAS 2120

 - kirkwood
    - Netgear ReadyNAS cleanup
    - add Netgear ReadyNAS NV+ v2

* tag 'mvebu-dt-3.14-2' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: Add support for NETGEAR ReadyNAS NV+ v2
  ARM: mvebu: Add Netgear ReadyNAS 2120 board
  ARM: mvebu: Fix whitespace in NETGEAR ReadyNAS .dts files
  ARM: mvebu: NETGEAR ReadyNAS 104 .dts cleanup
  ARM: mvebu: NETGEAR ReadyNAS 102 .dts cleanup
  ARM: kirkwood: NETGEAR ReadyNAS Duo v2 .dts cleanup

Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-12-10 09:21:23 -08:00
Nicolas Ferre
ca594844e4 ARM: at91/at91rm9200ek.dts: rearrange nodes in address ascending order
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Boris BREZILLON <b.brezillon@overkiz.com>
2013-12-09 15:08:57 +01:00
Jean-Christophe PLAGNIOL-VILLARD
c8b3cc56b7 ARM: at91: dt: at91rm9200ek: add emac and nor flash support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
[nicolas.ferre@atmel.com: remove one macb node too many]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 14:34:05 +01:00
Nicolas Ferre
ac0585cad0 ARM: at91: add uart aliases to sama5d3 dtsi
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by Boris BREZILLON <b.brezillon@overkiz.com>
2013-12-09 11:10:14 +01:00
Nicolas Ferre
557844ecc0 ARM: at91: add i2c2 pinctrl speficifation to sama5d3 DT
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Boris BREZILLON <b.brezillon@overkiz.com>
2013-12-09 11:10:14 +01:00
Jean-Christophe PLAGNIOL-VILLARD
2f8e458204 ARM: at91: Animeo IP: fix mtd partition table
Update to production one.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 11:10:13 +01:00
Ludovic Desroches
cd127e1d99 ARM: at91: at91sam9g45: add i2c pinctrl
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 11:10:13 +01:00
Ludovic Desroches
0645b93f6c ARM: at91: at91sam9g45: set default mmc pinctrl-names
pinctrl-names property was missing from mmc nodes.

Cc: <stable@vger.kernel.org> #3.11+
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 11:10:12 +01:00
Bo Shen
c1463f68bf ARM: at91: sama5d3: enable qt1070 as a wakeup source
Enable qt1070 keyboard as a wakeup source on sama5d3xek board.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 11:10:12 +01:00
Rodolfo Giometti
470e891b06 ARM: at91: add support for Cosino board series by HCE Engineering
This patch adds the Cosino at91sam9g35 based CPU module and the
Cosino Mega 2560 extension board.

Web site: http://www.cosino.it

Signed-off-by: Rodolfo Giometti <giometti@linux.it>
[plagnioj@jcrosoft.com: added "at91-" to files, pinctrl fixed, removed unneeded stuff]
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
[nicolas.ferre@atmel.com: adapted to newer kernel, modified commit message]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 11:10:11 +01:00
Nicolas Ferre
9860c515c1 ARM: at91/dt/sama5d3: add DMA information to SHA/AES/TDES nodes
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 11:10:11 +01:00
Nicolas Ferre
c76f266d97 ARM: at91/dt/trivial: before sama5d3, Atmel MPU were using at91 prefix
Change the sha/aes/tdes compatibility string to match common
case for the at91sam9g45 family which is to keep the at91 prefix.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 11:10:11 +01:00
Nicolas Ferre
07f7d503e3 ARM: at91/dt/trivial: use macro for AES irq type
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 11:10:10 +01:00
Jean-Christophe PLAGNIOL-VILLARD
510e37831e ARM: at91: sam9263ek: add dt lcd support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 11:10:10 +01:00
Jean-Christophe PLAGNIOL-VILLARD
f4390a798f ARM: at91: at9sam9m10g45ek: add dt lcd support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 11:10:09 +01:00
Jean-Christophe PLAGNIOL-VILLARD
f8a0d79376 ARM: at91: sam9263: add fb dt support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 11:10:09 +01:00
Jean-Christophe PLAGNIOL-VILLARD
ddee65b331 ARM: at91: sam9g45: add fb dt support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 11:10:08 +01:00
Nicolas Ferre
20b4e4fa84 ARM: at91/dt: binding: add missing compatibility string in SDRAM/DDR documentation
The "atmel,at91rm9200-sdramc" was missing from binding documentation.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2013-12-09 11:10:08 +01:00
Nicolas Ferre
28c9a8b357 ARM: at91/dt: binding: add precision to AIC documentation
In response to the "undocumented compatible strings" message, here is a
patch which is adding the precision of two "chips" that should be used for
the "atmel,<chip>-aic" compatibility string.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2013-12-09 11:10:07 +01:00
Boris BREZILLON
a7704b7ffc ARM: at91/dt: add atmel,pullup-gpio to at91rm9200ek usb1 definition
Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 11:10:00 +01:00
Boris BREZILLON
44fa054e08 ARM: at91/dt: add ethernet phy to at91rm9200ek board
Add ethernet phy node in at91rm9200ek.dts.
The reg register is not specified, as it may differ depending on the init
process of the board:
ADDR0/1 phy pins are connected to PA13/14 rm9200 pins. Which means the phy
will take its address from these pins during the reset process.

The macb driver will launch a full scan on the mdio bus to discover the phy
address.

Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
[nicolas.ferre@atmel.com: changed to IRQ_TYPE_EDGE_BOTH as asked by Boris]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09 11:07:16 +01:00
Nicolas Ferre
5cffba20f0 ARM: at91/trivial: fix at91rm9200 rts/cts pinctrl definitions
Swap names as they were improperly defined.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2013-12-09 11:07:15 +01:00
Arnaud Ebalard
ad51eddd95 ARM: mvebu: Enable NAND controller in ReadyNAS 2120 .dts file
Now that NAND controller support is available for Armada XP
(cb28e2537a: ARM: mvebu: Add support for NAND controller in
Armada 370/XP), this patch enables support for ReadyNAS 2120
and defines default partition layout as delivered by NETGEAR.

As described in similar commits 2be2bc39c6 (ARM: mvebu: Enable
NAND controller in Armada XP GP board) and d8c552dddf (ARM:
mvebu: Enable NAND controller in Armada 370 Mirabox),
"marvell,keep-config" parameter is used as current support does
not allow for setting of timing parameters yet.

Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-08 01:16:54 +00:00
Arnaud Ebalard
0373a558bd ARM: mvebu: Enable NAND controller in ReadyNAS 104 .dts file
Now that NAND controller support is available for Armada 370
(cb28e2537a: ARM: mvebu: Add support for NAND controller in
Armada 370/XP), this patch enables support for ReadyNAS 104 and
defines default partition layout as delivered by NETGEAR.

As described in similar commits 2be2bc39c6 (ARM: mvebu: Enable
NAND controller in Armada XP GP board) and d8c552dddf (ARM:
mvebu: Enable NAND controller in Armada 370 Mirabox),
"marvell,keep-config" parameter is used as current support does
not allow for setting of timing parameters yet.

Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-08 01:16:53 +00:00
Arnaud Ebalard
92beaccd8b ARM: mvebu: Enable NAND controller in ReadyNAS 102 .dts file
Now that NAND controller support is available for Armada 370
(cb28e2537a: ARM: mvebu: Add support for NAND controller in
Armada 370/XP), this patch enables support for ReadyNAS 102 and
defines default partition layout as delivered by NETGEAR.

As described in similar commits 2be2bc39c6 (ARM: mvebu: Enable
NAND controller in Armada XP GP board) and d8c552dddf (ARM:
mvebu: Enable NAND controller in Armada 370 Mirabox),
"marvell,keep-config" parameter is used as current support does
not allow for setting of timing parameters yet.

Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-08 01:16:53 +00:00
Andrew Lunn
3a31f2d7fc ARM: DT: Kirkwood: Use symbolic names from gpio.h
Use GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW instead of 0 and 1.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-08 01:00:54 +00:00
Andrew Lunn
23301190d2 ARM: DT: Kirkwood: Use symbolic names from input.h
Replace the numeric key value with a symbolic name from
<bt-bindings/input/input.h>

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-08 01:00:53 +00:00
Olof Johansson
64bf54f779 Merge tag 'DT-for-v3.14-part-1' of http://git.stlinux.com/devel/kernel/linux-sti into next/dt
From Srinivas Handagatla, DT updates for STi platforms.

* tag 'DT-for-v3.14-part-1' of http://git.stlinux.com/devel/kernel/linux-sti:
  ARM: STi: Add I2C config to B2000 and B2020 boards
  ARM: STi: Supply I2C configuration to STiH415 SoC
  ARM: STi: Supply I2C configuration to STiH416 SoC
  ARM: STi: OF: Fix a typo in pincfg header

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-04 13:55:41 -08:00
Olof Johansson
94c5216ee9 AT91: Move to Common Clock Framework and sama5d3 implementation
This is the first step to move AT91 to the CCF.
 - core CCF and drivers for most of the clocks
 - use of CCF for sama5d3 (100% DT-based)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJSnLhVAAoJEAf03oE53VmQugkH/11ZuSaLsjn31/WvE4WwKdgc
 RCIx7r8BCmPLNwDFOgc7tsheH7Jb6I7BNv4MnX8NIPrcAGy6yCEaD8TqhwKGTs9s
 2YGoKB48fpwm1udDc6Hfq3/yqkPvM7AnzE1ei1rJNmLt2582tlX1FI+klQG5EoUK
 23Pf4yjxtxt31s6xjuvRjEVjEat4PWnuVLs0nZWK6mizApXjA1JPIsKS6NL7q+eG
 aBMWDGw0DW4M8VEHAZygxF16PRXnumuB7NAIxKp8SJW5/acSeQntJTNXisMQBem7
 DxWfvK7WAFEBGUcRN33a9RpKaHg0Gur1If2sw6CkZ83RnRV9CLqURty1mO4WCUo=
 =B+yP
 -----END PGP SIGNATURE-----

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

From Nicolas Ferre:
AT91: Move to Common Clock Framework and sama5d3 implementation
This is the first step to move AT91 to the CCF.
- core CCF and drivers for most of the clocks
- use of CCF for sama5d3 (100% DT-based)

* tag 'at91-cleanup' of git://github.com/at91linux/linux-at91: (22 commits)
  ARM: at91/dt: remove old clk material
  ARM: at91: move sama5d3 SoC to common clk
  ARM: at91/dt: define sama5d3xek's main clk frequency
  ARM: at91/dt: define sama5d3 clocks
  ARM: at91: prepare common clk transition for sama5d3 SoC
  ARM: at91: prepare sama5 dt boards transition to common clk
  ARM: at91: add new compatible strings for pmc driver
  ARM: at91: move pit timer to common clk framework
  dt: binding: add at91 clks dt bindings documentation
  clk: at91: add PMC smd clock
  clk: at91: add PMC usb clock
  clk: at91: add PMC utmi clock
  clk: at91: add PMC programmable clocks
  clk: at91: add PMC peripheral clocks
  clk: at91: add PMC system clocks
  clk: at91: add PMC master clock
  clk: at91: add PMC pll clocks
  clk: at91: add PMC main clock
  clk: at91: add PMC macro file for dt definitions
  clk: at91: add PMC base support
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-04 13:50:33 -08:00
Olof Johansson
330641ceba Merge commit 'fixes' into next/cleanup
Merging in post-rc1 fixes that have gone into rc2/3 to avoid later conflicts.

* commit 'fixes': (39 commits)
  arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk
  arm: socfpga: Enable ARM_TWD for socfpga
  ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS=16
  ARM: sunxi_defconfig: enable NFS, TMPFS, PRINTK_TIME and nfsroot support
  ARM: multi_v7_defconfig: enable network for BeagleBone Black
  ARM: dts: Fix the name of supplies for smsc911x shared by OMAP
  ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm
  ARM: dts: omap3-beagle: Add omap-twl4030 audio support
  ARM: dts: omap4-sdp: Fix pin muxing for wl12xx
  ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx
  ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM
  ARM: at91: add usart3 alias to dtsi
  ARM: at91: sama5d3: reduce TWI internal clock frequency
  mmc: omap: Fix I2C dependency and make driver usable with device tree
  mmc: omap: Fix DMA configuration to not rely on device id
  ARM: dts: omap3-beagle: Fix USB host on beagle boards (for 3.13)
  ARM: dts: omap3-igep0020: name twl4030 VPLL2 regulator as vdds_dsi
  ARM: dts: AM33XX IGEP0033: add USB support
  ARM: dts: AM33XX BASE0033: add 32KBit EEPROM support
  ARM: dts: AM33XX BASE0033: add pinmux and user led support
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-04 13:49:22 -08:00
Linus Walleij
307b96677c ARM: integrator: move EBI to the device tree
This moves the External Bus Interface (EBI) over to a device
tree node and deletes the static mappings from the platform.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-12-04 16:22:31 +01:00
Linus Walleij
78d1632183 ARM: integrator: delete static core module mappings
Now that the core module base is taken from the device tree
both for platform initialization and cpufreq, let's delete
the static mappings.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-12-04 16:22:31 +01:00
Maxime COQUELIN
c6fddbd47f ARM: STi: Add I2C config to B2000 and B2020 boards
This patch supplies I2C configuration to B2000 and B2020
based on either STiH415 or STiH416 SoCs.

Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2013-12-04 09:00:31 +00:00
Maxime COQUELIN
5bbb75273f ARM: STi: Supply I2C configuration to STiH415 SoC
This patch supplies I2C configuration to STiH415 SoC.

Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2013-12-04 09:00:18 +00:00
Maxime COQUELIN
f53e99a9b4 ARM: STi: Supply I2C configuration to STiH416 SoC
This patch supplies I2C configuration to STiH416 SoC.

Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2013-12-04 08:59:55 +00:00
Srinivas Kandagatla
1bf17b828e ARM: STi: OF: Fix a typo in pincfg header
This patch fixes a typo for OD define in st-pincfg header file.

Reported-by: Maxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2013-12-04 08:58:39 +00:00
Olof Johansson
25e9cd462b mvebu DT changes for v3.14
- mvebu:
     - remove unneeded OS-specific properties from led nodes
     - add NAND controller to Armada boards
     - add sata leds to readynas 104
     - add gpio-poweroff to readynas duo v2
 
  - kirkwood:
     - comment cleanup in sheevaplug files
     - default pinctrl for sdio
     - sdio in guruplug is non-removable
 
  - orion5x:
     - typo fix
 
  - dove:
     - typo fix
     - add PMU interrupt controller and RTC interrupt via same
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJSm6WGAAoJEP45WPkGe8Znj3AP/1OZ7ukVZYS51ut3biDaEwJz
 yWtzPMLV6PeHXOn+r/IecwoysRez1T7ReUPYOh/GaApPbFxAXKVnN4HbfsEZKXOC
 f45lKgNujF2LOlg+Uzj+7W6wjWPlKWK12vGqP5jeJHff4FYZiK6wKFqvG5ThtICg
 wgn6aSoMEkGZTIRkTP9CC0uYFjqiy7RY+8k7Kxp/y3iQmD2+evPAl9CpwY9PoPb5
 q2cnoXhLi6kmQV7pnoeI2JotuTKbdlqnhVT6GfFBeoGNs9pJvQz6j36MMltP2BFU
 V0JRv4kZWtzqy1SAgHRLk9r+Cl6JYYrBbAdwFDU/64xyKvCFEwWuuGxVl/etc4Gm
 hDXoGKQOxuSj89BEkIP6SYKO508ZU4bnvqi4vvUdbXRzaXx6aJV8I7m9OnWbsu6g
 VDLvVTkDsc0EM7rdFWdgM7hZGaY94dLjd20NhOkS4rYch5w24vhTd1RHV6ZU5D/8
 AZkUgMFY03kmEyXD973OW+SN3aywJCa8UfPqNfeRgUJDD4Q+vL8KfgdZ0N4NI5uo
 SeX8I2UvldPk355He3zVuVbxm4DOIY6LPJcChiuk0BHPRHV6wRRxQ5z+N+aW5l+O
 hLZ/9DAtA9iFuL5EDdwZvzU5zl2KsR5uFnIcU5IUsaq6k0yFRUkzLsKmt0LrgyHK
 EIs/bQXOHTW76Au1GLuR
 =j87K
 -----END PGP SIGNATURE-----

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

From Jason Cooper:
mvebu DT changes for v3.14

 - mvebu:
    - remove unneeded OS-specific properties from led nodes
    - add NAND controller to Armada boards
    - add sata leds to readynas 104
    - add gpio-poweroff to readynas duo v2

 - kirkwood:
    - comment cleanup in sheevaplug files
    - default pinctrl for sdio
    - sdio in guruplug is non-removable

 - orion5x:
    - typo fix

 - dove:
    - typo fix
    - add PMU interrupt controller and RTC interrupt via same

* tag 'mvebu-dt-3.14' of git://git.infradead.org/linux-mvebu:
  ARM: Dove: Add RTC interrupt via PMU interrupt controller.
  ARM: Dove: Add DT node for PMU interrupt controller.
  ARM: mvebu: Add DT entry for ReadyNAS Duo v2 to use gpio-poweroff driver
  ARM: mvebu: Add RN104 SATA LEDs driven via NXP PCA9554 I2C to GPIO muxer
  ARM: kirkwood: mark guruplug sdio as non-removable
  ARM: kirkwood: provide pinctrl default to sdio nodes
  ARM: dove: Fix typo in device_type property of phy node
  ARM: orion5x: Fix typo in device_type property of phy node
  ARM: mvebu: Enable NAND controller in Armada 370 Mirabox
  ARM: mvebu: Enable NAND controller in Armada XP GP board
  ARM: mvebu: Add support for NAND controller in Armada 370/XP
  ARM: kirkwood: Cleanup comments in Sheevaplug dts files
  ARM: mvebu: dts: remove unneeded linux,default-state from led nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-03 17:07:28 -08:00