Commit Graph

481550 Commits

Author SHA1 Message Date
Arnd Bergmann
7d9e89c7c4 mvebu DT changes for v3.19
- mvebu
     - ReadyNAS 102 leds, esata
     - ReadyNAS 2120 esata
     - Add cache-unified for Aurora L2 node
     - Add ref clk for timer and watchdog on Armada 375
     - Cleanup Armada XP pinctrl for GigE
     - Add RGMII pinctrl, i2c eeprom, and fix 74hc595 counter on Lenovo ix4-300d
 
  - kirkwood
     - Add DLink DIR665 and it's DSA configuration
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJUXxGMAAoJEP45WPkGe8Znq5sQAJru6M6HjzXXnd1G8tHe4/+5
 WHSE3x0YOMMy5omHOeQR4Jnu0j6tJfaJPtB6+i/+9wLhTDPXGX92CvRs1+Rn4vSH
 XinJUEja/Xb6M+sJxdOn3JakaLxDjRG3gs2hrMRT74rsuOh4+mJD2JEvEuQCesf0
 A5A6Iwfxac/bXa1mjrjwJwom8l0+ujfqY70yFHQkMR9GsojoIvB2f5vTLEw45AuM
 uk290oP6jRbN2q9/blJ1eU9eIg77ilgHcYeh1kNq5VeBKrg8MID9/Gt5GHrFEd22
 pn70NJQblfKQZBMgcWXs7Hf1E9LgiDNAlbhBF6tbhEDEIrqk2qct0+HBwTBulQ6+
 xeRV256eaQBVDGnXruKJIq6ustdCZXi+sBW8ZOU8bNYD+yfmju454ggh0AkXIV0x
 38THgq9sjPQlNe6AtCD0pBAdt6JXV0hYf2BXLN3tJH9wg1+WPqEcmfpGuehjsuRF
 gOoIIMnKXoocCemNbwR6czzCUk0ZnBXO6amS7//4Iv9ndR1Q4dbGv5YEPBK3yoTU
 Feqmj9eb2cqqbGjbbASHyhXYxWopIh/+xw0muJR91DPAuPWD8cr6QAN50x03NaTt
 sjiljJDPvTirR2VCKUY+TZqGz0apGvi26hwjpDTFAeEMMt16QpMooEJs7bmoUz9w
 baRl6p8AgFhYOAhuNVAi
 =7O/W
 -----END PGP SIGNATURE-----

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

Pull "mvebu DT changes for v3.19" from Jason Cooper:

 - mvebu
    - ReadyNAS 102 leds, esata
    - ReadyNAS 2120 esata
    - Add cache-unified for Aurora L2 node
    - Add ref clk for timer and watchdog on Armada 375
    - Cleanup Armada XP pinctrl for GigE
    - Add RGMII pinctrl, i2c eeprom, and fix 74hc595 counter on Lenovo ix4-300d

 - kirkwood
    - Add DLink DIR665 and it's DSA configuration

* tag 'mvebu-dt-3.19' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: armada-xp: Fix 74hc595 count for Lenovo ix4-300d
  ARM: mvebu: armada-xp: Add I2C eeprom on Lenovo ix4-300d
  ARM: mvebu: armada-xp: Add RGMII pinctrl to Lenovo ix4-300d
  ARM: mvebu: armada-xp: Add GE0 pinctrl settings for GMII
  ARM: mvebu: armada-xp: Move GE0/1 pinctrl settings for RGMII
  ARM: mvebu: armada-xp: Use pinctrl node alias
  ARM: mvebu: armada-xp: Add node alias to pinctrl and add base address
  ARM: mvebu: armada-xp: Consolidate pinctrl node
  ARM: Kirkwood: DIR665: Instantiate Distributed Switch Architecture
  ARM: Kirkwood: Add support for DLink DIR665
  ARM: mvebu: Enable rear eSATA ports of NETGEAR ReadyNAS 2120
  ARM: mvebu: Enable the reference clock for timer and watchdog on Armada 375 SoC
  arm: mvebu: Clarify (e)SATA ports info in NETGEAR ReadyNAS 102 .dts file
  arm: mvebu: Fix LED color in NETGEAR ReadyNAS 102 .dts file
  ARM: mvebu: Fix the Aurora L2 cache node with the required cache-unified property

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-19 23:19:17 +01:00
Arnd Bergmann
2184d566c1 ARM: DT: Hisilicon terminal SoC HiX5HD2 DT updates for 3.19
- Add reboot node, reusing syscon-reboot
 - Add I2C nodes Hisilicon IP
 - Add IR node based on Hisilicon IP
 - Add Watchdog node based on ARM IP
 - Add GPIO nodes based on ARM GPIO IP
 - Add SATA node based on Hisilicon IP
 - Add USB nodes
 - Add MMC nodes based on Synopsys IP
 - Add GMAC nodes based on Hisilicon IP
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJUXLB1AAoJEGROujcbgXtLFMAP/inSVfdrh06VppC62eaeHTjV
 xX7qTOU8Kk9LpbNIU0KEOWkKWDpKHdwK/aG60+Ep2jly+IAxI9e7ZizzO/f20zKe
 jYvvVr1ODvNsADXlZL/EkF8przzQjD9eQm0UCkjGKHEosad9cO/vGD4RYaw2Ip/s
 N1gQMAvJJaQrYZQUGhbfW/DAJbf3EkevZnfY7WXwEejyQGfvzD6iJcL/5sRm36N2
 12Nq+KaO8hg7Y2RED3yyqBPcf73feM8zDoqh7skuthGwKwtVYrsYb/AfJwaIIqPW
 +llvO+VAxdIg4xu0OGpM4FsTrhTA444cRQfv0AtjG10cg+FOfk3SA9XshZCAuTiu
 h1Kb/yQO3d/FfLvkl/MIpZbOaaDsXahysphaVNDMoEkrvoUvvT0JEbt4nh8+T9yi
 ahOh9Z3IIrOHndY7CmNDrig9YAzcFJoW+0yqkDUSgmg6ZkuAnK9W07G98PAW1M5r
 rB3emfHXjF9c4VLLO6PqetWEObhjyiIf3UY4wyjq7ZsYeT70OuhT3BqTPedLgFRM
 KEPvbhzDtIuL65u6pbc3c5TSwceHZM9fU54psRsC3Ec29j/SzYTr486RVMffOFWH
 Jh0Zz23K+LPRJHzI3Ci8D5/UXjhr+5/HZFXYxb3bs0OWEpEz/ZXRLdgYU3gsfxsT
 1ut4CTRYMvT6oz9W05DC
 =ltI6
 -----END PGP SIGNATURE-----

Merge tag 'hix5hd2-dt-for-3.19' of git://github.com/hisilicon/linux-hisi into next/dt

Pull "ARM: DT:  Hisilicon terminal SoC HiX5HD2 DT updates for 3.19" from Wei Xu:

- Add reboot node, reusing syscon-reboot
- Add I2C nodes Hisilicon IP
- Add IR node based on Hisilicon IP
- Add Watchdog node based on ARM IP
- Add GPIO nodes based on ARM GPIO IP
- Add SATA node based on Hisilicon IP
- Add USB nodes
- Add MMC nodes based on Synopsys IP
- Add GMAC nodes based on Hisilicon IP

* tag 'hix5hd2-dt-for-3.19' of git://github.com/hisilicon/linux-hisi:
  ARM: dts: hix5hd2: add reboot node
  ARM: dts: hix5hd2: add i2c node
  ARM: dts: hix5hd2: add ir node
  ARM: dts: hix5hd2: add wdg node
  ARM: dts: hix5hd2: add gpio node
  ARM: dts: hix5hd2: add sata node
  ARM: dts: hix5hd2: add usb node
  ARM: dts: hix5hd2: add mmc node
  ARM: dts: hix5hd2: add gmac node

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-19 23:11:12 +01:00
Arnd Bergmann
a096c88b3f Third Round of Renesas ARM Based SoC DT Cleanups for v3.19
* Use keyboard as gpio-keys node name
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUapdxAAoJENfPZGlqN0++GJ0P/ROuRziwZCeXmsOv6zPNv1XR
 EVY93sam8qoFTgJaGiGbEi7stOIpEW0GPxUJzGDPgysMhSxBt2hqqAMtzRAK8uvl
 d+zMFIPGxPpzQW7lpVdeYnZLyr78jmhwXUsX//bOyIAmhDA80Oo43rWK5ksgGXml
 wkGVhKRipVkyCRztae72T0I5oTIbPSs25P4Qo6NdYlzLOWQ9ss3iQWxYBUBlMb/v
 MwJIy515IF+qhLJngaIG1J+d5x2s4gF68szv+oaUFPH6fRFpgEtl7XMrnvFrj/us
 HGWOi2L6cRBrySkY9D/ApbC4VC/QGbGdRkOJxWj+/p+JxXm3WVm+uPzH6WNARsFU
 EDrODAUfob9eilylDOxrv6fKmc/i4NOYfPfOor9dYDWeNgSXLgWorB1P26cVR9Yg
 bhE5zUcJguw2PJDPIDdfotFxU4cdU6E/NUaMVbGvKRjwB8zTYxMoj2psdYxorMap
 MRn504OAoiHiXqgGHaKvRYTlqE2PO0Mqc1EsPJSE1MVwdI2P4i4SPb3/qija8LWW
 bz1bTxxdCcGEe17EDisgbrqF0Bmeit3GB896UR8XZPy/Xsocjx0p4NkFatkkrMAb
 UNcSY6UfOssqH0+0CfMELP1uLOhwMZGNpw/ifKvOJGO7RDPi9d1VYSjY+vqWaf96
 nLFR+oR2uja0F0/DaotP
 =H8mr
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt-cleanups3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Pull "Third Round of Renesas ARM Based SoC DT Cleanups for v3.19" from Simon Horman:

* Use keyboard as gpio-keys node name

* tag 'renesas-dt-cleanups3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9g-reference: Use keyboard as gpio-keys node name
  ARM: shmobile: koelsch: Use keyboard as gpio-keys node name
  ARM: shmobile: lager: Use keyboard as gpio-keys node name
  ARM: shmobile: armadillo800eva: Use keyboard as gpio-keys node name

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-19 22:49:32 +01:00
Arnd Bergmann
ba84c80bad Second Round of Renesas ARM Based SoC DT Cleanups for v3.19
* Drop console= bootargs parameter on alt
 * Correct scifb* naming on r8a73a4
 * Drop 0x unit-address prefixes
 * Remove unnecessary MMC options
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUYBRyAAoJENfPZGlqN0++D50P/2VWiS9cv/GZXxwVhI1cXHBv
 Zgi2m0aFqM1E6Fs+IreC2RSTR+ucUm/2BXg2Ig3MC3LsQ/iyh3axq27hAphBup51
 aF/Xi87+kDqnQCPB6pZop5lVkx+JL9Zi8ye6+qAjdysz48jf+389MEP4cif9Nk7g
 +o1VIah3orzk2WPummTFdBoYemqZ6M6tENpgQzlWGh6wDSrmKYUnfen74JDeMaqK
 xqqBraBb6P1pbPlZ3Pr0asOTq+fRBM4L1meZLDqNdG/DlhTWXL9uuyBo2jpT60eH
 9ssWhMt39xIbkfZNcDJ0P0BRxi/QbdJS5B/MGQcvmV28sv1eaa59D8gWF+om4F1r
 HQz9j3IsRpB5P7fxSVn+F2o6BPC+IwKmMBTMmVQZQ34ryqIFwo/tVpVDl5iE/+4G
 BYFFrMeuOWsUt05vl6vNmjSOgfMVk2A4ctOD70bNhjlLjym68JuBQFIa3Ju62M/J
 9QKVfg/m3VtIBRgGWq6+9cxvkQstk3AF9bGDH4LLfaNQCSJnScz687y8qjE+NIBm
 aqig/P+uHVQ25o04EYaKmuVCMqW+m7mtmXfiMszDGiQV4zAwZJQvXLLjRDeCaLai
 wWutff87HnKXl45X4hjBDzrCUS5cGm5GYF6gAxqEwAUBr4Ce2cfzN3mPsX+cNoWH
 JNaM3d6h3M99WxUultgX
 =l01+
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Pull "Second Round of Renesas ARM Based SoC DT Cleanups for v3.19" from Simon Horman:

* Drop console= bootargs parameter on alt
* Correct scifb* naming on r8a73a4
* Drop 0x unit-address prefixes
* Remove unnecessary MMC options

* tag 'renesas-dt-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: alt dts: Drop console= bootargs parameter
  ARM: shmobile: r8a73a4: fix scifb* naming
  ARM: shmobile: kzm9g-reference dts: Drop bogus 0x unit-address prefix
  ARM: shmobile: r8a7791 dtsi: Drop bogus 0x unit-address prefix
  ARM: shmobile: r8a7790 dtsi: Drop bogus 0x unit-address prefix
  ARM: shmobile: r8a7790 dtsi: Remove unnecessary MMC options
  ARM: shmobile: r8a7779 dtsi: Remove unnecessary MMC options
  ARM: shmobile: r8a7778 dtsi: Remove unnecessary MMC options

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-19 22:48:06 +01:00
Arnd Bergmann
8ef74e5d39 Renesas ARM Based SoC DT Updates for v3.19
* Add Add SoC-specific SATA compatible property to r8a7779
 * Enable DMA for MMCIF on r8a7791 and r8a7790
 * Enable USB-PHY, HS-USB and USB3.0 on r8a7791 and r8a7790
 * Enable TMU timer via DT on r8a7778
 * Enable CMT timer via DT on r8a73a4
 * Add MMP and {SR}GX clocks to  r8a7791 and r8a7790
 * Correct scifa2 clock index on r8a7740
 * Add missing INTCA for irqpin on r8a7740
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUWBh9AAoJENfPZGlqN0++zjwP/RxjS7wnDQvGqw2d3GSKp0I3
 Es/C4Ssm8kDYlgY1cQqeI/KK05vLEp5998YGy2kaVlTUSCj6UMO4UJ4t6yZgBeGA
 Nh4V70I475zlmxBjF4ZePD5+o/lyTbw+2GxHKFRsnxXqEr3E9QDNCgAc7kPevJl3
 U9T6B63VP3jOxJVzhfSNeFKYgmg4YgLW0aCsnZoW9mlS0phFZPO236JHdvFH8QQj
 FBjcdkkQjncBUTvLB54ASRk6wTWnEQ9WFGIGHDNYM11bypLndbKFxziofkKnex0B
 Pw6r9nY5jsKVkye68PsL5abKnyJQ87assacGEm6SuO/Sp8fR9ixt1+VWvLFfybcr
 sNYs1996kXghKvYbTZOFSGiH9e5BL/rwwepE/XkPbTvI1CeFIs3LQtXLfwfKmf/p
 +gIFT7ouY3GHtCivSSBz0iB8Z4pUNaurLmYkIsvUzsbccOMUcq8F4HL8RXWyBwG9
 FK0fwRCXP5zwI9rMePnGcLhR2LXB1n3yDfbfr7ZOd3Vw9rk3s9fj2czpJJMB4Dtz
 Nd4W5EedW6SrqzCMND1ZoE0T48zRooRWsgMv5AEES4epSDhuDLO1cQpkqca7fbfQ
 7rQmJpS8YEvXstbJWh44jZxWdN+W0TPydv2MrpPorB6KAueSTF259Z7zFoo4+S5f
 EPflJfAS+yMLDnl2ARaC
 =78IM
 -----END PGP SIGNATURE-----

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

Pull "Renesas ARM Based SoC DT Updates for v3.19" from Simon Horman:

* Add Add SoC-specific SATA compatible property to r8a7779
* Enable DMA for MMCIF on r8a7791 and r8a7790
* Enable USB-PHY, HS-USB and USB3.0 on r8a7791 and r8a7790
* Enable TMU timer via DT on r8a7778
* Enable CMT timer via DT on r8a73a4
* Add MMP and {SR}GX clocks to  r8a7791 and r8a7790
* Correct scifa2 clock index on r8a7740
* Add missing INTCA for irqpin on r8a7740

* tag 'renesas-dt-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (34 commits)
  ARM: shmobile: r8a7779 dtsi: Add SoC-specific SATA compatible property
  ARM: shmobile: r8a7791: Reference DMA channels in MMCIF DT node
  ARM: shmobile: r8a7790: Reference DMA channels in MMCIF DT nodes
  ARM: shmobile: r8a7791: Add MMCIF0 DT node
  ARM: shmobile: r8a7790: Rename mmcif node to mmc
  ARM: shmobile: r8a7778: Add SoC-specific TMU compatible property
  ARM: shmobile: r8a73a4: Add SoC-specific CMT compatible property
  ARM: shmobile: henninger: enable HS-USB
  ARM: shmobile: koelsch: enable HS-USB
  ARM: shmobile: r8a7791: add HS-USB device node
  ARM: shmobile: lager: enable HS-USB
  ARM: shmobile: r8a7790: add HS-USB device node
  ARM: shmobile: r8a7791: add USB3.0 device node
  ARM: shmobile: lager: enable USB3.0
  ARM: shmobile: r8a7790: add USB3.0 device node
  ARM: shmobile: r8a7794: Add arch_timer to device tree
  ARM: shmobile: bockw-reference: Initialise TMU device using DT
  ARM: shmobile: r8a7778: Add TMU nodes
  ARM: shmobile: armadillo800eva dts: Enable TMU0
  ARM: shmobile: r8a7740 dtsi: Add TMU0 and TMU1 device nodes
  ...

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-19 22:45:33 +01:00
Arnd Bergmann
67ec55bcb3 Merge branch 'renesas/dt-du' into next/dt
This is a base for the DT updates, merged through the arm-soc
cleanup branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-19 22:44:34 +01:00
Simon Horman
61f1fb47bd ARM: shmobile: kzm9g-reference: Use keyboard as gpio-keys node name
This appears to be the best match for ePAPR.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-14 09:39:47 +09:00
Simon Horman
d3aaec8365 ARM: shmobile: koelsch: Use keyboard as gpio-keys node name
This appears to be the best match for ePAPR.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-14 09:39:45 +09:00
Simon Horman
54caf68103 ARM: shmobile: lager: Use keyboard as gpio-keys node name
This appears to be the best match for ePAPR.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-14 09:39:42 +09:00
Simon Horman
04a5656fbc ARM: shmobile: armadillo800eva: Use keyboard as gpio-keys node name
This appears to be the best match for ePAPR.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-14 09:39:39 +09:00
Olof Johansson
17908a13a4 Nomadik changes for the v3.19 development series:
- Rearrange the DTS files to make a pure SoC-specific file and
   a pure board file for S8815.
 - Add the device tree for the NDK15 board.
 - Update the defconfig and configure in the STMPE expander by
   default on the Nomadik.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUWyzIAAoJEEEQszewGV1z0Q0P/3yvUT1NWTSRAhu+5V1ycVSi
 UmctP58ZPSU14Zavvb6E4XunfgrLNRIGTXAL1YbSUURGLNJ6+bsKLmBHQB3z/oQ4
 4ynSE0pqdLna3fxhgxqfikh4Oc1213Nppnb1RcGupS1S7ya5JGsg6PD50nSlUCan
 xR+WG4U5ZQ80Z0eWMoafFeESt4n2xv4J1BwNyiFDoSDaAmUdRJTiWtXYlVaMcuXD
 Ysrp7QNSihvUO74AcS43H2zv1nMxnUDgKpKWTq4UGHMRkdDSlAo2zskATmYhenBd
 CteDwuGHgTtBcnUOEA+AHidSw25Pl2QmS5CX9Dgt70DNq/OCKIOyi2nwn4NnKhWY
 +WfL4TKLshREe83GCBOkDO5bBNV4qP9W81ASisIp2T6ALCQQEqyRU4BIF1vsAJuR
 fynPzzSDuwAzPbxOTVB8HVyzY2XEKEzMOwAFLBt7U1dteuIGkOUbfM8bso13AAYR
 bI4XPaPpY5l5TE5OKC3AzdMltiVU8onwsMaBfx4Gp3aIhzVN+OH/Tr4Bu1TDAhSb
 hSZ74Z+SAKdrLBvZRe6FJUp+8bV5znTFq/R9g4QmIruw3drOWzxIdZFvvA+Oyz/J
 pGH/kBSRKze1TJfYy2QMbZ1vKj2sD0S8AOIOGTL+hXjHZFDyd7367JsuSWrTGXK6
 oHtUyZhKmHQ+rIUhawy6
 =6oZZ
 -----END PGP SIGNATURE-----

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

Merge "Nomadik updates for the v3.19 series" from Linus Walleij:

Nomadik changes for the v3.19 development series:
- Rearrange the DTS files to make a pure SoC-specific file and
  a pure board file for S8815.
- Add the device tree for the NDK15 board.
- Update the defconfig and configure in the STMPE expander by
  default on the Nomadik.

* tag 'nomadik-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: nomadik: configure in STMPE support
  ARM: update Nomadik config
  ARM: nomadik: device tree for NHK15 board
  ARM: nomadik: push ethernet down to board
  ARM: nomadik: set up MCDATDIR2
  ARM: nomadik: move GPIO I2C to S8815 board file
  ARM: nomadik: disable chrystals in top level board files
  ARM: nomadik: move MMC/SD card detect GPIO to board DTS

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-08 16:59:39 -08:00
Olof Johansson
b265a6df89 First DT batch for 3.19:
- CAN device nodes for at91sam9263 and at91sam9x5
 - at91sam9x5 DMA definitions for usart
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJUV73TAAoJEAf03oE53VmQJYcH/1ExETCf3J9ohXxF3n9R7zf4
 fp+KxCVmpmFdkZSyUSemxTp31MLAgHUD/155pPveaAJ9LsgnEqalX+cqz0b4NVuT
 +5GivQQp5CQGvb8rqrC9UYFroMWJjUY/lNrDDo2WRmX6ay1jLpM7nFupoUxt6+fh
 c/KXHNXf+vQ0Qhx6vVYmGRHnzqAPJEMkLy5LhFo2Yjmg0IRAvhVDZBCVZ2W7Fwy9
 A16w2YIuyQ0Yw2YYPP6KCLls2gRqUvDtNJMKAQ7YB473GwNLRU4qGpdfVJQTgAe/
 4SsMGZHen4DT2k2WgbnQl7b4pwUVaud5F/vshAoU/4NJs4XiTEhItfV3cI9xU3o=
 =r9z8
 -----END PGP SIGNATURE-----

Merge tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt

Merge "at91: dt for 3.19 #1" from Nicolas Ferre:

"Very little DT update for AT91. More will come but I want to send this first
batch soon so it doesn't get in the way of larger modifications."

First DT batch for 3.19:
- CAN device nodes for at91sam9263 and at91sam9x5
- at91sam9x5 DMA definitions for usart

* tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: at91sam9263: Add CAN device nodes
  ARM: at91/dt: at91sam9x5: Add CAN device nodes
  ARM: at91/dt/trivial: at91sam9x5_can.dtsi: comment and whitespace fixes
  ARM: at91: at91sam9x5 dt: add usart dma definitions to dt

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-08 16:53:48 -08:00
Olof Johansson
f26e294535 Berlin DT changes for v3.19 (round 1)
- AHCI and SATA PHY nodes for BG2Q
 - Reset controller binding docs
 - Ethernet nodes for BG2, BG2CD
 - SDHCI nodes for BG2, BG2CD
 - Corresponding board changes to enable AHCI, Ethernet, SDHCI
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUVhGkAAoJEN2kpao7fSL42icQAIC5LG0eL8yi6HXOAhI1Tkky
 0g6J2/HZtUqoGHKU92kvBa7kba852oMi2NIIF9LI03b8o1z7E4Of8sZCPCvH/BQ/
 hBmUIDi6himQ8+SxDBFcsETjIu2vPgemvy1mvwd/OUNY2YEFkYLKT48qrU3pD5oU
 F2W33RpHrkkazG7/WrcRa+Tk2G2eb3tC90czAjE5A5PkAp4LUEZq24treuVv424h
 S6qe76WQs+EHIW3nkIBmRjr3D7yWW1U9vknxwz6XNyNkvW9bcMfTMq1dQY5RXt17
 JiZli9d62Z1Fu8k0qDebcgTw5YzyoXIuLd4+hbPn8qFkT/umjIgrZOZYD4dZmBvB
 vxwQ5NOw1mI27Lbb1IkpizldzpJ1XwhvY3POfgGVYSeI5R4CyLamvzaMJbo8zWWs
 CvneMaghQNWweC9AiOlUXJKzlaYJMu6pfMJssZuzyLx4g+YGKQunoGIEXehWzRAh
 g8K0bUfYxWHmhZPz9nQLaDJTJI85Xytm0/iP14STp59OsKQsFokm4m9X5ZyJrQHc
 ig1NivEC8qDZqegRhjDLsatkI8xsQA6ovA/h7HHil5D04hxI6OlRiFfob9ZAhkxc
 hud9Ne7vocJ6uhB72xm4eTKcMSg1iSi6wDEsaoK/jU6yTdOgV2i3QvIr8wQZ+yru
 SFy2OPWebL9AaCdgTfaO
 =VVTX
 -----END PGP SIGNATURE-----

Merge tag 'berlin-dt-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt

Merge "ARM: berlin: DT changes for v3.19 (round 1)" from Sebastian Hesselbarth:

"This is Berlin DT changes for v3.19 and contains those patches that missed
the v3.18 merge window plus corresponding patches to catch-up with Antoine's
BG2Q improvements for BG2 and BG2CD. We now have working SDHCI and Ethernet
on all SoCs (well, BG2CD has HDMI HEC only), SATA PHY support for BG2 is still
pending."

Berlin DT changes for v3.19 (round 1)
- AHCI and SATA PHY nodes for BG2Q
- Reset controller binding docs
- Ethernet nodes for BG2, BG2CD
- SDHCI nodes for BG2, BG2CD
- Corresponding board changes to enable AHCI, Ethernet, SDHCI

* tag 'berlin-dt-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: dts: berlin: Enable eMMC on Sony NSZ-GS7
  ARM: dts: berlin: Enable WiFi on Google Chromecast
  ARM: dts: berlin: Add SDHCI controller nodes to BG2/BG2CD
  ARM: dts: berlin: Enable ethernet on Sony NSZ-GS7
  ARM: dts: berlin: Add phy-connection-type to BG2Q Ethernet
  ARM: dts: berlin: Add BG2CD ethernet DT nodes
  ARM: dts: berlin: Add BG2 ethernet DT nodes
  ARM: dts: berlin: Add GPIO leds to Google Chromecast
  ARM: dts: berlin: enable timer 1 for sched_clock
  ARM: dts: berlin: add a required reset property in the chip controller node
  Documentation: bindings: add reset bindings docs for Marvell Berlin SoCs
  ARM: dts: berlin: enable the eSATA interface on the BG2Q DMP
  ARM: dts: berlin: add the AHCI node for the BG2Q

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-08 16:47:37 -08:00
Olof Johansson
1749e1fc9e STi DT updates for v3.19, round 1.
Highlights:
 -----------
  - Add SDHCI support for STiH41x B2020 boards
  - Add reset controllers to STiH407 SoC
  - Add MiPHY & SATA support to STiH416
  - Add Thermal supportto STiH416
  - Add Clock support to STiH407 SoC
 
 This tag also includes STiH407 bindings definitions for reset controller.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUU24fAAoJEMo4jShGhw+J8AMP/ii1CVgJZkaimGllZlO6kOwj
 tB6tZ3n8EGoC7P4UismVzmKqqGCkLGChzlUzvJMqSjE8kmmtwYPODxUy6nRZ5Gii
 S9PGAmJ8vRqEyG/8y83Y1OGnV7WBzVQfHnwFr0JvrFvCYyiHnpbUlxIKkA85F+JG
 Hnd+HKqOymhwY8eSN8nH/slrFkCYAEaGLoVV7tZWtr0p6gQYA7rP7XkFOXs1Ln5G
 iA8wtTDaPIyRH7X5/WeESjhkBMP8YcmslLUtaagIrORcQWC+TYNSFwWkciyFothd
 sz0szIO0/j9uLgxdKLnHxAU8mwx1in0ZNDaC+WlKtSE7V39C2PhaSmJ9sL+0Dxu3
 2HSoUPBgEJ0Zu5U7xSNgYQZrfANGx059B00J2OqDJfLshyDmpJrbJZtsQTW6Qz6N
 c8fGebGTXHHkLvjRHfh6LXRN30CpJc6m+mmwybhROnYyXdv7htv2q2V340GoG2mI
 6l5JY46g91KrSjEf91//qXLBvesoRVAPS9g2wKBjiePIl1nzdjZOfZ0vpw+vn1PV
 t9DUk1S2OuzeMdqSIt6XsjJQQcTL8npx2V+88ibo5BkAlOdLcCSOUuTzAHEBZtwB
 GJVTXog3TX3SoDmCc/guUAN7gzto3LBAz9GwcIuC28tkF0UufUX3v6wU+yz1+l00
 vLV6A2aJwUAZ3rRbQI2b
 =YmAW
 -----END PGP SIGNATURE-----

Merge tag 'sti-dt-for-v3.19-1' of git://git.stlinux.com/devel/kernel/linux-sti into next/dt

Merge "STi DT updates for v3.19, round 1" from Maxime Coquelin:

Highlights:
-----------
 - Add SDHCI support for STiH41x B2020 boards
 - Add reset controllers to STiH407 SoC
 - Add MiPHY & SATA support to STiH416
 - Add Thermal supportto STiH416
 - Add Clock support to STiH407 SoC

This tag also includes STiH407 bindings definitions for reset controller.

* tag 'sti-dt-for-v3.19-1' of git://git.stlinux.com/devel/kernel/linux-sti:
  ARM: STi: DT: STiH407: Fix: clk-tmds-hdmi clock is missing
  ARM: STi: DT: STiH407: Add all defines for STiH407 DT clocks
  ARM: STi: DT: STiH407: 407 DT Entry for clockgenA9
  ARM: STi: DT: STiH407: 407 DT Entry for clockgen D0/D2/D3
  ARM: STi: DT: STiH407: 407 DT Entry for clockgen C0
  ARM: STi: DT: STiH407: 407 DT Entry for clockgen A0
  ARM: DT: STi: STiH416: Add DT node for ST's SATA device
  ARM: DT: STi: STiH416: Add DT node for MiPHY365x
  ARM: STi: DT: STiH416: Supply Thermal Controller Device Tree nodes
  ARM: STi: DT: Enable second sdhci controller for stih416 b2020 boards.
  ARM: STi: DT: Enable mmc0 for both stih415 and stih416 SoCs
  ARM: STi: DT: Add sdhci controller for stih415
  ARM: STi: DT: Add sdhci pin configuration for stih415
  ARM: STi: DT: Add sdhci controller for stih416
  ARM: STi: DT: Add sdhci pins for stih416
  ARM: sti: Add STiH407 reset controller support.
  ARM: sti: Add STiH407 Kconfig entry to select STIH407_RESET
  ARM: STi: DT: STiH41x: Convert all uppercase non-defines to lowercase
  reset: stih407: Add reset controllers DT bindings

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-08 16:39:12 -08:00
Olof Johansson
1ba5568c01 Merge tag 'arm-soc/for-3.18/cygnus-dts-v9' of http://github.com/brcm/linux into next/dt
Merge "Broadcom Cygnus SoC Device Tree changes" from Florian Fianelli:

This patchset contains initial support for Broadcom's Cygnus SoC based on our
iProc architecture. Initial support is minimal and includes just the mach
platform code, clock driver, and a basic device tree configuration. Peripheral
drivers will be submitted soon, as will device tree configurations for other
Cygnus board variants.

These are the Device Tree changes

* tag 'arm-soc/for-3.18/cygnus-dts-v9' of http://github.com/brcm/linux:
  ARM: dts: Enable Broadcom Cygnus SoC
  dt-bindings: Document Broadcom Cygnus SoC and clocks

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-08 16:13:31 -08:00
Zhangfei Gao
92cfcb26fc ARM: dts: hix5hd2: add reboot node
Reuse syscon-reboot, drivers/power/reset/syscon-reboot.c

Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2014-11-07 19:29:53 +08:00
Zhangfei Gao
f4d0ab1e6d ARM: dts: hix5hd2: add i2c node
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2014-11-07 19:29:49 +08:00
Zhangfei Gao
a3322d284b ARM: dts: hix5hd2: add ir node
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2014-11-07 19:29:43 +08:00
Zhangfei Gao
5d730f85fa ARM: dts: hix5hd2: add wdg node
Signed-off-by: Jiancheng Xue <xuejiancheng@huawei.com>
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2014-11-07 19:29:40 +08:00
Zhangfei Gao
57d434656f ARM: dts: hix5hd2: add gpio node
Signed-off-by: Jiancheng Xue <xuejiancheng@huawei.com>
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2014-11-07 19:29:36 +08:00
Zhangfei Gao
a47f88efa1 ARM: dts: hix5hd2: add sata node
Signed-off-by: Jiancheng Xue <xuejiancheng@huawei.com>
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2014-11-07 19:29:32 +08:00
Zhangfei Gao
d1a3a0d6ad ARM: dts: hix5hd2: add usb node
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Jiancheng Xue <xuejiancheng@huawei.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2014-11-07 19:29:28 +08:00
Zhangfei Gao
afecbf4153 ARM: dts: hix5hd2: add mmc node
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2014-11-07 19:29:25 +08:00
Zhangfei Gao
9fb0e6e7e0 ARM: dts: hix5hd2: add gmac node
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2014-11-07 19:29:16 +08:00
Linus Walleij
640e2f13ca ARM: nomadik: configure in STMPE support
This enables the STMPE MFD, GPIO and keypad support by default on
the Nomadik builds. This expander is used on the NDK 15 board.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-11-06 09:06:22 +01:00
Linus Walleij
07cc65e3dd ARM: update Nomadik config
This updates the Nomadik (NHK8815) defconfig to what saveconfig
produces after some recent changes to Kconfig fragments here
and there.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-11-06 09:03:58 +01:00
Simon Horman
89aeff9989 ARM: shmobile: alt dts: Drop console= bootargs parameter
Alt is booted from DT, so chosen/stdout-path is
always used, and we can drop the "console=" parameter from chosen/bootargs.

This change has a side-effect of changing the console speed from 38400
to 115200. This is intentional as 115200 is consistently used on
all other shmobile boards.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-05 14:54:10 +09:00
Ulrich Hecht
0b3a0ef613 ARM: shmobile: r8a73a4: fix scifb* naming
Ports are named scifb0-3, not scifb2-5.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-05 14:53:19 +09:00
Olof Johansson
a0f3e826e8 Renesas ARM Based SoC DT Clocksource Updates for v3.19
* sh_mtu2: Drop incorrect SoC family name
 * sh_tmu: Document r8a7778 and r8a7740 bindings
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUUYebAAoJENfPZGlqN0+++eQP/iUFNof45qV40pjis+HqGnDx
 YtZyJbcyrz359cfy8tXwsfS+38UCtzzJhYRdsOoa+w76Cmsgl4BnqT0CEeRZrwMm
 i/A+eZSH2RAL0WlJZWYNWh8rqgCzvNNxOgbJQIM9CeIDtV6b8O7zEThD1PhNwvBH
 +3Pa4MDC31Tm9eYsJ58wVMoLVlj4SyN/dBgQ/edq7v6R5nVSgXp0YiUZxOeyT1x9
 XauajYvoGnokYST1124mZ/IAL+hSfFZT5iRmfrG6AeIBF8aIbN/cfN9DoDs7KOR1
 XOIJluLLMmtCbTEE4P3E8pro5jHYWkKwEagVDnBb/UerSssNqF6CHFWAsIuTdiMG
 cHYDDxy+6LDrPvwOyfYkSzLimblcKTeUyWUpP6UBcih4PLErCWyj2HyTuJJctLMI
 OkkNgaciHcwHgs3npKNnGYfLH5QQ+2uEXKevqVHRxTtKVorNVSfUfJLtzsCnaBB3
 EsyR/dKJC3Hutu8BBspYbHLwZfcOR5Jj9gYvdKn+HS2/mSLIw7G8QFLzO6eGRJq3
 +NiXizwOnIHCpT59Hc3QAjcQ0nDMBXWr0Z6Jdox/epcFbGSIVPQaCZlU2GypFhvr
 W1v5kcmWzg2L4bJ/s1TorDEo0K82gLS9bFq4YXCI0g7l9VL1Yi7CqAOX3wGuxCAi
 +Eppjq+pErh5UOspbaUa
 =IUO0
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt-clocksource-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Renesas ARM Based SoC DT Clocksource Updates for v3.19" from Simon
Horman:

* sh_mtu2: Drop incorrect SoC family name
* sh_tmu: Document r8a7778 and r8a7740 bindings

* tag 'renesas-dt-clocksource-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  clocksource: sh_mtu2: Drop incorrect SoC family name
  clocksource: sh_tmu: Document r8a7778 binding
  clocksource: sh_tmu: Document R-Mobile r8a7740 binding

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04 14:44:53 -08:00
Olof Johansson
1f2dd7bcbf First hunk of rockchip devicetree patches, containing:
- cpu operating points and supplies
 - dma support for spi controllers
 - i2s on rk3066 and rk3188
 - default core clock settings for rk3288
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJUUQ98AAoJEPOmecmc0R2BH34H/1qtmX45t6JvaHTgu4O8431L
 B4+zuCAlVKW8t8QJv30Z+Nouf7Ch521RAKVeFDHoTl6yOlhioCsWvY2Szq+OEGfR
 N5f2lDZNG3kjPXEcqrOt+5fyyvflYHozE2GySvefhtku3ee6fKWN8RPkn0TQgfSW
 ay4JDBfM2s2UQ4wkOAzOjju7PeHs2tUJk2CgEGLNuYVCattT8dKtKov8U+jvskaw
 ednvFEuiRb38A//KL7UaWg1lsRK2nGXs1RWdFtyqP5W5GzR8APjQ0Ag8u6K2ntSN
 tzEdAePaHAFnXhKi2Gjdpy6cyldf9r9AQ0dP5soCbPYoNt9+vkQ865jw3zcDw+0=
 =SUrm
 -----END PGP SIGNATURE-----

Merge tag 'v3.19-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "first bunch on Rockchip dt changes" from Heiko Stübner:

First hunk of rockchip devicetree patches, containing:
- cpu operating points and supplies
- dma support for spi controllers
- i2s on rk3066 and rk3188
- default core clock settings for rk3288

* tag 'v3.19-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Add SPI DMA into rk3288.dtsi
  ARM: dts: rockchip: enable init rate for clock
  ARM: dts: rockchip: add I2S controllers for rk3066 and rk3188
  ARM: dts: rockchip: enable DMA on SPI for rk3066 and rk3188
  ARM: dts: rockchip: add cpu supplies to boards
  ARM: dts: rockchip: add operating points and armclk references

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04 14:41:09 -08:00
Olof Johansson
2c49e0250a Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19
* Initialise CMT1 timer using DT
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUUG1xAAoJENfPZGlqN0++kNQP/1pfyx9m1XnBqj5Xt6GldxLp
 /5nUzU/q/JgSW457NGiigPdYC9z4yELknL00PYbM1pCvJJAtGnpdcnFUku8JPyiE
 0YrLCRT/JZk0a1MlDJ3Ve0osaefyEoK0LmFWvnJJgm672gE3/sUlDfg4CmmOJqer
 4c0sgz7xS1xU1xuciyvhIaZ7gZ8sz1k5ZXm3em8uwG+uHWE+JQl6BGiup+9XMGaS
 MYjTpL9Vlgz2LH8VZHrnkTbrfeZwT/ufwf12GkXw3nGEvVcVcU2SHPbiHJckETsz
 7w4Jaf5fY/fjHHGbocnbCVH9a4VHqy5pI3pm3Gr8dRqM6s/9oEw50rrXqeFvdjNN
 5SQVoRzScghh+t1bESrf3r3h8dSdCwfkwKkn5SsQZLpJfnvxHUXe1yf3Bvwsklv/
 4U3FmisHDurCCHWyGxEdnAhsUOQT+lbpi+tKuaSCVxwfawiAHCK5hAIRVHGNm0Zr
 hwq28Rrfxd5Nd1z/LREm3ObQCPMyaFm1x3Zd4sGNjoRq6yElf52+O9jW52gAwrqi
 9WObGI7fgIZj5/o8ZDxZl02JnKvRTHuOLWNAnJtDnjtktAxNZsZns7IYK4RA/aIv
 bmDJLUquQWaUkl6gYFXIOUd3nqi4cy54aAsUtwIbjGsVS/bosSb2hqWm6EHnIP/j
 IrtOo8W2PlC7pPsvJ+jH
 =Htuq
 -----END PGP SIGNATURE-----

Merge tag 'renesas-r8a73a4-dt-timers-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19" from Simon
Horman:

* Initialise CMT1 timer using DT

* tag 'renesas-r8a73a4-dt-timers-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a73a4: Remove empty r8a73a4_add_dt_devices
  ARM: shmobile: ape6evm-reference: Initialise CMT1 device using DT
  ARM: shmobile: r8a73a4: Rename cmt registration helper
  ARM: shmobile: r8a73a4: Add CMT1 node

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04 14:37:47 -08:00
Olof Johansson
5d3e1cf245 Renesas ARM Based SoC DT Cleanups for v3.19
* Add chosen/stdout-path to DTS files for shmobile boards
 * Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
   - The corresponding board file has already been removed
 * Sort dts nodes by address
 * Sort SHMOBILE dtbs alphabetically in Makefile
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUUG0JAAoJENfPZGlqN0++NvoP/1pbn8UA1kfxTpxcQ+GIr9TV
 yUbN50FMwsjeVgIPLn3kfD9PrgwAh7AdSR3oxo/dBF0WR8edhgCFX5WcHGk8yYlf
 9dQXcDpFXPGh7ia5ggh0NNO8wv1Sr95dVqoaI9i9EqEXNVWi2P1yKuzJ2PFYwXqS
 KOqyzBzAlb2dpNnFj6xjtsepGhJwXkwm0X82Vg3FCjVVq3BPzNIUvizpE2GJe3ql
 e5ihwESwOhGL7NapiPcjMpmHpDrp7J/Xrux0jeQFsHTCgCvR09n4JlTY2qIdJlbp
 +Fz8WehIRz2wrd9tngCdmoIGgaQJ6s9iVEOcxTrC1OelfpR3728vPaYihHCP0Ehp
 ewW65U9MRvBDa+EPm0Hb8w9BLThvQJzEQZpHGqzD3+A/FN2B0jNFBafqmv2bHvv8
 WuDy4a3yvjCWAqQ/f8dqWWqUYyXy4FYE2nu2HtYnZJQDPdBVVQ9ZHhMuStKVZjma
 8YYZ87SgF5Ogo0iWWLCaVaJgiy6SkEOAeYT7TORaYQ+1kCSQmDHs5Jc++Kuc3uFT
 n4Y8Wmh67kzabJ2L2NyNgDkf3bK6JKDCo3w+rKARIZESFODw93DlavuGLn62kEng
 TWNl1UL7gsjDT3b5rooPoNXYDfIxgp6aY1rrkxpDInqeDZZbepgaV2u5g6pEjl2K
 q+HNAJqFGezwo4SXnA7Y
 =sqJL
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Renesas ARM Based SoC DT Cleanups for v3.19" from Simon Horman:

* Add chosen/stdout-path to DTS files for shmobile boards
* Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
  - The corresponding board file has already been removed
* Sort dts nodes by address
* Sort SHMOBILE dtbs alphabetically in Makefile

* tag 'renesas-dt-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9d dts: Add chosen/stdout-path
  ARM: shmobile: kzm9g-reference dts: Add chosen/stdout-path
  ARM: shmobile: alt dts: Add chosen/stdout-path
  ARM: shmobile: koelsch dts: Add chosen/stdout-path
  ARM: shmobile: henninger dts: Add chosen/stdout-path
  ARM: shmobile: lager dts: Add chosen/stdout-path
  ARM: shmobile: marzen dts: Add chosen/stdout-path
  ARM: shmobile: bockw-reference dts: Add chosen/stdout-path
  ARM: shmobile: armadillo800eva dts: Add chosen/stdout-path
  ARM: shmobile: ape6evm-reference dts: Add chosen/stdout-path
  ARM: shmobile: genmai dts: Add chosen/stdout-path
  ARM: shmobile: emev2 dtsi: Add uart* labels for easier referencing
  ARM: shmobile: emev2 dtsi: Use generic names for device nodes
  ARM: shmobile: r7s72100: Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
  ARM: shmobile: r8a73a4: sort dtsi file by address
  ARM: shmobile: kzm9d: sort dts file by address
  ARM: shmobile: r7s72100: sort dtsi file by address
  ARM: shmobile: r8a73a4: Remove spurious dma-multiplexer base addresses
  ARM: dts: Sort SHMOBILE dtbs alphabetically

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04 14:32:21 -08:00
Olof Johansson
a3206509f6 - Device Tree implementation for the ARM RealView boards
- DTS file for the ARM RealView PB1176
 - Updates on top of the same DTS file
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUR5sZAAoJEEEQszewGV1zEFoP/iqRbD//O4ul8jMNMwrRXw5W
 y6vO8jPPImZm9PSz/KGpx/W/HUXZOZpyja8HgD9v8345jQYhtzFQTagXerNDEMRR
 YXU2CnAPCLoowu/pI+ImNh9rVehGBszzZxEHuBZJq0GAhum6JvaTu3tUWKxfAaqO
 hRfPLchHhHhduzdivHuq2ghmrzYcWM9T8T7MN/8fwI4cnkPaOhPgfIFSD49IydP3
 tx2OaUKVbThw+4t01hD9Ojjj418Cgxl1JNWp55qmQS5l7WMqR885kax1b3OYaStZ
 3vTpbgvQVY/Ht+NFZVE9nNbqGudwCAa8AfhRprHHQ2eaCL/EF35xKtzV7Qr+PwaJ
 jLogO3LlHBsTkkM+UGGz75aclwbyoCcwskqfRefxLRH5ZShIK4noe12Q/DTkR9wB
 lCVEnEtEcMQlVkso/yTZj6u2emQn0mmPDm+HHlK916E4/UlwN7nC47IpNHwtl6fT
 ELAi/7/YoWc+VpdkAjRMKkbK5Aw3m3WhwbG1hGEwscfDmkfJ+gjbmieJJxoEUqEI
 fIZ3uw7Vvn3hxEAJgT/Nf8z9j0r8qq8/EfzsJucH3sVI9dqAcaNPoPRvixtDM+p3
 WgpE+pe9BfE/iD5wYkxoe3vKovqe2vLIcsh+UgPEaFOKpmwV4sdCAaEoEbPI15VH
 S7aSrXpVBZpnypMgS/vA
 =ubCW
 -----END PGP SIGNATURE-----

Merge tag 'arm-realview-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/dt

Merge "RealView DeviceTree support for v3.19" from Linus Walleij:

- Device Tree implementation for the ARM RealView boards
- DTS file for the ARM RealView PB1176
- Updates on top of the same DTS file

* tag 'arm-realview-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: add MMCI to the PB1176 DTS
  ARM: realview: add KMIs to the PB1176 DTS
  ARM: realview: add FPGA UART4 to PB1176 DTS
  ARM: realview: add PL022 SSP/SPI block to PB1176 DTS
  ARM: realview: add RTC clocks to device tree
  ARM: realview: add charlcd to PB1176 device tree
  ARM: realview: add PL061 GPIO to the PB1176 DTS
  ARM: realview: move DT GIC to FPGA node
  ARM: realview: add device tree and bindings for PB1176
  ARM: realview: basic device tree implementation

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-03 22:23:34 -08:00
Olof Johansson
b2b2490a99 Samsung DT updates for v3.19
- add CPU nodes for exynos4210, exynos4212, exynos4412
 
 - exynos4x12-pinctrl: add utility macro to define pin sleep states
 - exynos4412-trats2: add Maxim77693 PMIC node, add sleep mode pin
   configuration and keep eMMC regulators soft-disabled
 
 - add new exynos5250-spring DT
 
 - cleanup exynos5250-arndale, exynos5250-smdk5250 and exynos5250-snow
 
 - exynos5250-arndale: fix apparent GPIO typo and simplify USB3503
 - exynos5250-snow and exynos Peach boards: add rtc_src clock for RTC
 
 - correct mmc0 capability string exynos5420-peach-pit and exynos5800-
   peach-pi
 
 - exynos3250: add MFC codec nodes
 
 - s3c64xx: enable PWM node by default
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJURS3sAAoJEA0Cl+kVi2xqzkcP/1xqcWWiBabtpCEs6nyUL9MD
 9hxi0z7Le9diufZDmAoey2EIWlU/eFpc9eQ7GU/t0bluv1n2CZ07wKO7LAE2OQ/G
 FAsogr1DlnER5fMidgv8nnMBI1v1cHSW+RSaHVQI+r9gsY0uPSqDbGeDk4KQtGbU
 CKSCiuEB0HVtCIbEMwBKpltSy+qfAZuF0kCFKzT8TPGPpIJPJwcA4RAsLRPPS2tv
 QXtnW599fsu4foGFRiOiCUY5bDQlE50BmXSwJsVsGcQ6TSsd25+6f2MUHEQhwStH
 RduGXBqW2J4GNr9I8cdekx2UPrw5kudfg02Vpg/mpYN3c6ZYIostuN31B4tz/d0g
 /w7PoEoDSeSHlUy4GgM1Gs5UYwy3QEYHkx6qOYgYcBHFzebgWERT3cmY7cDhnfKB
 0xyx1UcE3syaMKECYR4AYVZI7p2wEBlZY+FeEspLviI7CVmBzRZXYfwaj8GXb1w5
 dm1nl11Z/q9FIJ19vVUnU/oEyvDFQMiWVKJl5xdM1xWnicve5yZTPUuflVBUEs6/
 g56CBmn7s+OhFSCpoUEKCOKvCg9IpEkbVxrEF0duAh4+it9cnyqWE2qL0wP+hT9X
 kokuFVuUml8tBqgaQIHxwsdvKRMSK14TKpwatVLC18WOozp/Tpf5b3kKSW0OqpYl
 RiOyPFZV0FSzZkMWnvE4
 =DrpM
 -----END PGP SIGNATURE-----

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

Merge "1st Round of Samsung DT updates for v3.19" from Kukjin Kim:

Samsung DT updates for v3.19

- add CPU nodes for exynos4210, exynos4212, exynos4412

- exynos4x12-pinctrl: add utility macro to define pin sleep states
- exynos4412-trats2: add Maxim77693 PMIC node, add sleep mode pin
  configuration and keep eMMC regulators soft-disabled

- add new exynos5250-spring DT

- cleanup exynos5250-arndale, exynos5250-smdk5250 and exynos5250-snow

- exynos5250-arndale: fix apparent GPIO typo and simplify USB3503
- exynos5250-snow and exynos Peach boards: add rtc_src clock for RTC

- correct mmc0 capability string exynos5420-peach-pit and exynos5800-
  peach-pi

- exynos3250: add MFC codec nodes

- s3c64xx: enable PWM node by default

* tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: add CPU nodes for Exynos4 SoCs
  ARM: dts: add MFC codec device node for exynos3250
  ARM: dts: Add Maxim 77693 PMIC to exynos4412-trats2
  ARM: dts: Add sleep mode pin configuration for exynos4412-trats2
  ARM: dts: Add utility macro to define pin sleep states for exynos4x12-pinctrl
  ARM: dts: Keep eMMC regulators soft-disabled for exynos4412-trats2
  ARM: dts: correct the mmc0 capability string for exynos Peach boards
  ARM: dts: Add rtc_src clk for s3c-rtc on exynos5250-snow
  ARM: dts: Add rtc_src clk for s3c-rtc on exynos Peach boards
  ARM: dts: Enable PWM node by default for s3c64xx
  ARM: dts: Add exynos5250-spring device tree
  ARM: dts: Simplify USB3503 on exynos5250-arndale
  ARM: dts: Fix apparent GPIO typo in exynos5250-arndale
  ARM: dts: Clean up exynos5250-arndale
  ARM: dts: Clean up exynos5250-smdk5250
  ARM: dts: Fill in bootargs for exynos5250-snow
  ARM: dts: Clean up exynos5250-snow
  ARM: dts: Prepare node labels for exynos5250

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-03 22:04:47 -08:00
Alexander Stein
2667c6adfc ARM: at91/dt: at91sam9263: Add CAN device nodes
Add the missing CAN devices node including their pin muxing. The required
clock node already exists.

Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-11-03 11:34:33 +01:00
Alexander Stein
316a88da4c ARM: at91/dt: at91sam9x5: Add CAN device nodes
Add the missing CAN devices node including their pin muxing to the shared
.dtsi for at91sam9x5. Actually include this file.

Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-11-03 11:34:32 +01:00
Nicolas Ferre
5563d34896 ARM: at91/dt/trivial: at91sam9x5_can.dtsi: comment and whitespace fixes
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-11-03 11:34:31 +01:00
Jiri Prchal
dd4f25a3ed ARM: at91: at91sam9x5 dt: add usart dma definitions to dt
This patch adds usart dma definitions to both dtsi for sam9x5 chips. Without
usage of dma it's unable to catch all bytes on usart receiver.

Signed-off-by: Jiri Prchal <jiri.prchal@aksignal.cz>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-11-03 11:34:23 +01:00
Linus Torvalds
0df1f2487d Linux 3.18-rc3 2014-11-02 15:01:51 -08:00
Linus Torvalds
81d92dc117 Three main MTD fixes for 3.18:
* A regression from 3.16 which was noticed in 3.17. With the restructuring of
    the m25p80.c driver and the SPI NOR library framework, we omitted proper
    listing of the SPI device IDs. This means m25p80.c wouldn't auto-load
    (modprobe) properly when built as a module. For now, we duplicate the device
    IDs into both modules.
 
 * The OMAP / ELM modules were depending on an implicit link ordering. Use
   deferred probing so that the new link order (in 3.18-rc) can still allow for
   successful probing.
 
 * Fix suspend/resume support for LH28F640BF NOR flash
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUVq20AAoJEFySrpd9RFgt8XQQAI4oIygz4zGQ6n0y4HOqwOBy
 F4ZPtOuzuCYA86x2zORFgj4A9JGVjDQwTfnMQnn1NG+XEEmZMJfG2IwqlUxsZd5A
 KkAS5XUoi/Fvq95Qi95KQYXqm1dniXEGKsRFsHKXIsnnDmbqRK5fBn6Ve5PAwcau
 uru5FwrZ2Ve0EwF9/Z/bxAatRirdAhwgMGlaXdXLmL7S13NQGmXP9QI7CbxSZ38R
 GJ+A6PhiYs6Sml6Ou5bovNXyFGfx4J35pk6nTWoWe5MfZHRQk447OQwBPbsrM119
 Boq8F/6diXyJfuXdxvF6JiDmDzaw/fBY+Xuq1O6p+JzLONN16x93KlpAPhzy4a15
 PwFHCBzg5khY49if/dmrPJ+kLkU+9wIHUib8m6HSImCKBT5Bv/VJXoQ1g4s1IJ8/
 Di3mz/8pWm/cscABIkuEqb9TwwUrSHzVXgGH/p4CY0eUo8DbQQA1zDsig8aRIX36
 FlAReaHH8QivdnghkMX9Px7SIo7XoMZZEi+55k8FrIVqjqEHNGx+w+BKhxgtFggN
 nAg0l7NrLdQHpigK1SZjLFGIYi7MmarvbatUjVPGagiRqoQ0mCSS7eKX1DEs4EAo
 P2g64BSJickGAhUiAV9ZO1EBoaOU6olIPpc33J+uG/8qBU1cNClx3FJ1UPWX27JQ
 +FBsD1mec4FuoZ2SoE7r
 =IxjM
 -----END PGP SIGNATURE-----

Merge tag 'for-linus-20141102' of git://git.infradead.org/linux-mtd

Pull MTD fixes from Brian Norris:
 "Three main MTD fixes for 3.18:

   - A regression from 3.16 which was noticed in 3.17.  With the
     restructuring of the m25p80.c driver and the SPI NOR library
     framework, we omitted proper listing of the SPI device IDs.  This
     means m25p80.c wouldn't auto-load (modprobe) properly when built as
     a module.  For now, we duplicate the device IDs into both modules.

   - The OMAP / ELM modules were depending on an implicit link ordering.
     Use deferred probing so that the new link order (in 3.18-rc) can
     still allow for successful probing.

   - Fix suspend/resume support for LH28F640BF NOR flash"

* tag 'for-linus-20141102' of git://git.infradead.org/linux-mtd:
  mtd: cfi_cmdset_0001.c: fix resume for LH28F640BF chips
  mtd: omap: fix mtd devices not showing up
  mtd: m25p80,spi-nor: Fix module aliases for m25p80
  mtd: spi-nor: make spi_nor_scan() take a chip type name, not spi_device_id
  mtd: m25p80: get rid of spi_get_device_id
2014-11-02 14:45:52 -08:00
Linus Torvalds
ad2be3796f SCSI for-linus on 20141102
This is a set of six patches consisting of two MAINTAINER updates, two scsi-mq
 fixs for the old parallel interface (not every request is tagged and we need
 to set the right flags to populate the SPI tag message) and a fix for a memory
 leak in scatterlist traversal caused by a preallocation update in 3.17) and an
 ipv6 fix for cxgbi.
 
 Signed-off-by: James Bottomley <JBottomley@Parallels.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQEcBAABAgAGBQJUVqYyAAoJEDeqqVYsXL0MDwQIAI4aCdC3LUelt6IzywToiJ9u
 GTUZU7eULzV1KuaExcBM8g9DyE3wtnhfS0WA5TqvfKf8ImMKntan0loK0juIjj8K
 UBtbSDapwkKRRAIoRHvBzcHU+Jzc//naO95ojsFt2ELHB91jta368+DiPb8m+wQx
 IKeYO6vFaSwZZCKVNaWwyCpxEKmMO+ib80zfuANBzWjau3IFxMiUofSvtPGIWb+E
 Zxi9qvOyqjfFE8OLfL9ckH5NPiIYcwmarAXyuYcJstiw6VX2deGBaJalueSSC0JV
 TAqEtT5k1AraFS2HM0TRxar+HK5iBj3s8f0pFBfgD2+oagUln6L/486nMh2Ktac=
 =l6wS
 -----END PGP SIGNATURE-----

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

Pull SCSI fixes from James Bottomley:
 "This is a set of six patches consisting of:
   - two MAINTAINER updates
   - two scsi-mq fixs for the old parallel interface (not every request
     is tagged and we need to set the right flags to populate the SPI
     tag message)
   - a fix for a memory leak in scatterlist traversal caused by a
     preallocation update in 3.17
   - an ipv6 fix for cxgbi"

[ The scatterlist fix also came in separately through the block layer tree ]

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  MAINTAINERS: ufs - remove self
  MAINTAINERS: change hpsa and cciss maintainer
  libcxgbi : support ipv6 address host_param
  scsi: set REQ_QUEUE for the blk-mq case
  Revert "block: all blk-mq requests are tagged"
  lib/scatterlist: fix memory leak with scsi-mq
2014-11-02 14:39:35 -08:00
Linus Torvalds
12267166c5 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
 "Nothing too astounding or major: radeon, i915, vmwgfx, armada and
  exynos.

  Biggest ones:
   - vmwgfx has one big locking regression fix
   - i915 has come displayport fixes
   - radeon has some stability and a memory alloc failure
   - armada and exynos have some vblank fixes"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (24 commits)
  drm/exynos: correct connector->dpms field before resuming
  drm/exynos: enable vblank after DPMS on
  drm/exynos: init kms poll at the end of initialization
  drm/exynos: propagate plane initialization errors
  drm/exynos: vidi: fix build warning
  drm/exynos: remove explicit encoder/connector de-initialization
  drm/exynos: init vblank with real number of crtcs
  drm/vmwgfx: Filter out modes those cannot be supported by the current VRAM size.
  drm/vmwgfx: Fix hash key computation
  drm/vmwgfx: fix lock breakage
  drm/i915/dp: only use training pattern 3 on platforms that support it
  drm/radeon: remove some buggy dead code
  drm/i915: Ignore VBT backlight check on Macbook 2, 1
  drm/radeon: remove invalid pci id
  drm/radeon: dpm fixes for asrock systems
  radeon: clean up coding style differences in radeon_get_bios()
  drm/radeon: Use drm_malloc_ab instead of kmalloc_array
  drm/radeon/dpm: disable ulv support on SI
  drm/i915: Fix GMBUSFREQ on vlv/chv
  drm/i915: Ignore long hpds on eDP ports
  ...
2014-11-02 14:27:30 -08:00
Linus Torvalds
3c43de0ffd Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
 - add the new bpf syscall to ARM.
 - drop a redundant return statement in __iommu_alloc_remap()
 - fix a performance issue noticed by Thomas Petazzoni with
   kmap_atomic().
 - fix an issue with the L2 cache OF parsing code which caused it to
   incorrectly print warnings on each boot, and make the warning text
   more consistent with the rest of the code

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8180/1: mm: implement no-highmem fast path in kmap_atomic_pfn()
  ARM: 8183/1: l2c: Improve l2c310_of_parse() error message
  ARM: 8181/1: Drop extra return statement
  ARM: 8182/1: l2c: Make l2x0_cache_size_of_parse() return 'int'
  ARM: enable bpf syscall
2014-11-02 12:56:20 -08:00
Linus Torvalds
7501a53329 A small set of x86 fixes. The most serious is an SRCU lockdep fix.
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQEcBAABAgAGBQJUVd9KAAoJEL/70l94x66Dc1AH/0jdb8DsewyAuJzLKaJ/qJwK
 9JMqglpDQ+Sm0f2puPyJkR8NQd2AMPK7J5aJjWAl/XxJjsDcn+TQur20okzUDXLJ
 21sIbqo92hCgpSNs+RHLHlj7/iMQVYnMFh7bp6JcvzmhpN8F/D793BT+oOxdjMRg
 PLCQ794ugGhFboesDkV822VWgtQ26yG2aQDWbYgL9r5xPp5OpbzSiq85KopSEfS0
 K+PPntI8yNI+EvOC9ta0FfEOMMfQoLDds+V0FXiEIRx43MV8bwAXpWzsB8ibd1F6
 eY+cVvSPzWgDSCVLn3gfYkrRl3sWGdvyfxTe/cz507ZfXcuT2uHJhtbpH2KCGto=
 =FJ6/
 -----END PGP SIGNATURE-----

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull kvm fixes from Paolo Bonzini:
 "A small set of x86 fixes.  The most serious is an SRCU lockdep fix.

  A bit late - needed some time to test the SRCU fix, which only came in
  on Friday"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: vmx: defer load of APIC access page address during reset
  KVM: nVMX: Disable preemption while reading from shadow VMCS
  KVM: x86: Fix far-jump to non-canonical check
  KVM: emulator: fix execution close to the segment limit
  KVM: emulator: fix error code for __linearize
2014-11-02 12:31:02 -08:00
Dave Airlie
66338feee4 Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes
This pull-request includes some bug fixes and code cleanups.
Especially, this fixes the bind failure issue occurred when it tries
to re-bind Exynos drm driver after unbound, and the modetest failure
issue incurred by not having a pair to vblank on and off requests.

* 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: correct connector->dpms field before resuming
  drm/exynos: enable vblank after DPMS on
  drm/exynos: init kms poll at the end of initialization
  drm/exynos: propagate plane initialization errors
  drm/exynos: vidi: fix build warning
  drm/exynos: remove explicit encoder/connector de-initialization
  drm/exynos: init vblank with real number of crtcs
2014-11-03 05:23:17 +10:00
Sebastian Hesselbarth
f5ed9ccc4c ARM: mvebu: armada-xp: Fix 74hc595 count for Lenovo ix4-300d
There is only one 74hc595 connected to GPIO but two were given
in the registers-number property. Fix it up.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-By: Benoit Masson <yahoo@perenite.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-02 18:59:10 +00:00
Sebastian Hesselbarth
7207cef47d ARM: mvebu: armada-xp: Add I2C eeprom on Lenovo ix4-300d
There is an I2C eeprom connected on Lenovo ix4-300d, add the
corresponding node.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-By: Benoit Masson <yahoo@perenite.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-02 18:58:48 +00:00
Sebastian Hesselbarth
c06cf0a2c6 ARM: mvebu: armada-xp: Add RGMII pinctrl to Lenovo ix4-300d
Lenovo ix4-300d has two ethernet PHYs connected via RGMII. Add the
corresponding pinctrl settings.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-By: Benoit Masson <yahoo@perenite.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-02 18:58:32 +00:00
Sebastian Hesselbarth
7254f6c52b ARM: mvebu: armada-xp: Add GE0 pinctrl settings for GMII
There is a GMII setting for GE0, add it to the common pinctrl node.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-By: Benoit Masson <yahoo@perenite.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-02 18:58:11 +00:00
Sebastian Hesselbarth
e59451432d ARM: mvebu: armada-xp: Move GE0/1 pinctrl settings for RGMII
Pinctrl settings for GE0 and GE1 are not only usable on RD-AXPWiFiAP.
Moreover, naming the RGMII settings pmx-ge{0,1} is not precise enough
as there is also a GMII setting for GE0.

Move the pinctrl sub-nodes to the common pinctrl node and rename them
to pmx-ge{0,1}-rgmii.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-By: Benoit Masson <yahoo@perenite.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-02 18:57:44 +00:00