Commit graph

400943 commits

Author SHA1 Message Date
Olof Johansson
17761fc80f Allwinner sunXi SoCs minor fixes for 3.13
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJSYW75AAoJEBx+YmzsjxAgC+oP/R5FltTQVWagTmrh3kwhBpWI
 pcwrPhmqAhzM9wXbZiJwhRZoVzOlmVH6QZxiaWNhKdzFDmDKuBhF82EjNb6GeuTw
 kiEaGxHz0MtkfS4HxBFc5OpItNOZ0KcfPYyCDR6UcknVDyMCUGwhDwmqIP5iJ8rX
 c3v2OlQfCXje/V89gzDOFIryvC5xCSS0+We4nuBpV1Vf5glcbrNETfmKbKHWoRSs
 m+4u8uZcGaz9saZPOLg6nAyeoU8yvH8WqWgtUDYH3GLi7gB5ra72vHrfbAT3WkL2
 ohf02IRXFunM7INCrluY79fpJnqhU2Fi8uu4hIOfKYUmQSHaxRPC8j67ipvd3mZB
 98pwqeUho/1UdI+HCzlYA/mJnm2ASfaHxt2SOf9hUkA7aUxLr+oz6vgBPSzT7U8v
 VyGCoCY0qvuWSo78j7zw0b+BUYrzm6PKrpnhqH1oj7X3hT5BAJGBInPxUrn7MCqf
 nVVMas6IfL/hAd6HXCEXnOI5daB/OjVqQb28grjWi9k4prOkT1/oeuVdbdf2cX7h
 992La0HhUvAzv4k5ZNa3UexEyvxNT1mfxSGBHGmOybr2R677ZFcet2kradnPnAem
 8FTCsZhjyMpYasB/H5aO1VNg0UYpcXJ/m80jrDqyttRSpUuUkRUBoNMBDDjSk3yU
 GqlqOJurLHSUevdMQeiP
 =qexQ
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-fixes-for-3.13' of https://github.com/mripard/linux into next/dt

From Maxime Ripard:
Allwinner sunXi SoCs minor fixes for 3.13

* tag 'sunxi-fixes-for-3.13' of https://github.com/mripard/linux:
  ARM: sun6i: Fix the APB2 clock gates register size

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-27 21:15:45 -07:00
Olof Johansson
c90d19be27 Allwinner sunXi SoCs device tree changes for 3.13
This DT series sees the introduction of the cubietruck DT, plus the addition of
 the i2c controller for the A20 based boards, and of the Security ID found in
 all the Allwinner SoCs but the A31.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJSYW3yAAoJEBx+YmzsjxAg5HoP/jCsw/QQ+Po6fvf3h0C1PLQs
 JKPredNJwaAjv436zawhlOZWSm6kj0qI6EKshtFUnOm436Ie5vAV/HthlI3vImBs
 xtnaCCphfBRB/9MpjOaqQILBMGiVFbI5Rfsx1VgY3lOnLG7yp87PLJ/2d1h+drKF
 21LgjkDtc5zP1X+42bNF+oK0UDVkWJUxPxcm5JlwYQUFUBoE/FIqUKU5LM5/fsXE
 26eeFPQnf2zqW0Bxx09Jd8wKdRWXLM1+JVlgH+NG2KPL3g5kFbaHHfElzMgsal81
 JKk4qmefGcfzLyJAUPTV8B002o4FKGiwaLZdULDVAXFQcJP6AONTCW9cbNAqTZdE
 6wSwvo01LOFaAXqJD1HB56ZCASc4qXaoq0vK4Jdefjjb7x4MDeNPD89L6sK21TaQ
 atHtFPvzElPyQw5kfJpBypAwSB9+iCk78L7OO2g6bAKvR9WPS2QWr+K7ipuILooT
 c9QX9ww9wIMg8whumKsKGkGreSi075FXoSyhF7NEz3TR8P7ghCUdFuK5pdLhiXXi
 W/ZejujJDMDjuJtW8VblXFBNa6VrPab51jp5fs+k4IJWDcLbnSpD5PbetMZRNlce
 DYAPqhmlx96R2bwzr1Cq+7Ww+7G+xd1HgTh5wZElm2JtBGHVkXOEZbb85stZ5bA8
 i4/5xcEPIFExI69Dj9LV
 =Qc5W
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-for-3.13' of https://github.com/mripard/linux into next/dt

From Maxime Ripard:
Allwinner sunXi SoCs device tree changes for 3.13

This DT series sees the introduction of the cubietruck DT, plus the addition of
the i2c controller for the A20 based boards, and of the Security ID found in
all the Allwinner SoCs but the A31.

* tag 'sunxi-dt-for-3.13' of https://github.com/mripard/linux:
  ARM: sunxi: dts: Add support for the cubieboard3, the CubieTruck
  ARM: sun7i: olinuxino-micro: Enable the I2C controllers
  ARM: sun7i: cubieboard2: Enable the I2C controllers
  ARM: sun7i: Add the pin muxing options for the I2C controllers
  ARM: sun7i: Enable the I2C controllers
  ARM: sunxi: dt: Add sunxi-sid to dts for sun4i, sun5i and sun7i

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-27 21:14:40 -07:00
Olof Johansson
1e819b3ed3 Looks like I managed to break the x86 build for some
configs. Here's a fix for that on top of the pinctrl
 changes already merged with the signed tag
 omap-for-v3.13/quirk-signed.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJSYcuYAAoJEBvUPslcq6Vz9GsQAIIehLrVNmAy+xljClhd9zjY
 U77PPuhh8Iy3AtjrGVIJAv9Cz8vev+LFV9DYY0m52FrwmLS01lk4HmMMkQfBrs+S
 22C1mMwmZFHQg7PNBkZTzpqHFGPgbF4jso9v/UN0GQkvhqSHgQ3kHyT1Hh99aiTx
 GmFRiriTIjImemfcvpCvRPtuO2r4XXwF2gQ2QJp/OVNxW53gpV19BSJMGQ4eBeye
 M09IGjWQiW1O97nyYvUcLmEupL+kDNKwhhL3L54q4f4NrLAwPXRPEqdn5NbbhMyO
 aCuupfD2JuObGqHKXq3dIgrX2XLOX2+rHOeCVBY9tZLrRPvf8JdM9ZGiSBJN3PBL
 JKzEs8jVRvz8r4/BF/U9WEbU+P0e7NNjeemiIUPG3sXGUjX3ByeECLArTIAHr49h
 5ve/daVaSro6AJ+xZQHBWpZY22KJnkw4DC0t/8c7GtA7el4HhTNsjwxJOh9WVpOY
 UhTCGPN2cAEs78EQ9X4dzdihoNX9oU3WC+U/1kg4enUkPO2RF2BkrpN9JF2doRTe
 jHK46aVFsKAZSvTVnwxBoOIUagM2mOdk3x/QKUCUwol9jqxFQhTgUJfsWt1z+8vl
 F94WPk6maGVOOF4P10kI9ErBapl+vIorNbJ/KFshFSkdKpuDvAXUhKqjydKYJMfs
 nbEKnkqMToHd925O1jlX
 =KNnl
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.13/pinctrl-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

From Tony Lindgren:

Looks like I managed to break the x86 build for some
configs. Here's a fix for that on top of the pinctrl
changes already merged with the signed tag
omap-for-v3.13/quirk-signed.

* tag 'omap-for-v3.13/pinctrl-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  pinctrl: single: Fix build when not built on ARM

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-18 17:30:19 -07:00
Tony Lindgren
1b9c0fb365 pinctrl: single: Fix build when not built on ARM
Looks like we need a little bit of arch specific handling
with the generic IRQ. Fix the issue with an ifdef the
same way as other drivers do.

ARM needs things set to IRQF_VALID, which also then sets
noprobe. Others seem to use just irq_set_noprobe().

Otherwise we can get:

drivers/pinctrl/pinctrl-single.c: In function 'pcs_irqdomain_map':
drivers/pinctrl/pinctrl-single.c:1750:2: error: implicit declaration of function 'set_irq_flags' [-Werror=implicit-function-declaration]
drivers/pinctrl/pinctrl-single.c:1750:21: error: 'IRQF_VALID' undeclared (first use in this function)
drivers/pinctrl/pinctrl-single.c:1750:34: error: 'IRQF_PROBE' undeclared (first use in this function)

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-18 16:43:06 -07:00
Kevin Hilman
ee4383e0c1 Changes needed to drop legacy booting support for some
omap3 boards.
 
 Note that that these are based on a merge of the
 following for the dependencies:
 
 - v3.12-rc5 for fixes to pinctrl mask
 - omap-for-v3.13/dt-signed to avoid pointless merge conflicts
 - omap-for-v3.13/quirk-signed for legacy pdata handling
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJSYXP6AAoJEBvUPslcq6Vz2fcQAJyOHsHVNs3vxpB2CbFWzgl7
 D4tFyL3pHlq9+p/VJwthUoY6WIiWIgEcKoLACD39w+EQ3XThcG1coc0TFj8IPxTr
 QOCn5sMu1Z11OKhegcTEhySp8GUrmtNFplMCNK3jPsLjYLdVxOopjziO7qcCd49O
 7pjCPfHoU5NkAACcm2nmE2uAlYP4STpGDnzwsi/aHZZQSIni2MslyeN9LeXdwBrN
 of29pw8gTA0TVQSXemq0oLnMlEYzLd0ICG2SjSmJ/tWX0vXwjQl4fdDkqHwumPxo
 wyjVw744AuXy0WC7PZluQxadd0jEptAs7XSsYgTGOvececWtmZEJDzPGamfabhlX
 V6aHIqwVyDOGJXjQkUuaNuD5eO+afDwyaeVOla8YgE9ugwEs3xDXfHdks9nC8n4I
 OAk+hXfEBPpLQgItkP+Q3EnYIUJVh4ew5oWCHVfXM8ssKTH6bblWFVtJXP1eyC+0
 qkcHOHMR5oK4p+YAmRoRkeMG+Fe2pzT7dWOli4lPVXre1MAd/DQM5+NvgMaveW/E
 S8YHj5mRR7a13OAgOWtscjUz+hWE+WIBkCyFuo0w4+RMShKtsiuC+FJirsQpCxLp
 aFuwGG8ixT0F4WL/9Ao4iVmIOt15YIW3ND9ubHrPL2Ll0nGPwSmJSb+B7OgSFwqo
 G3r4/CSgwljeUq4FZox4
 =9Iuv
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.13/board-removal-signed-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

From Tony Lindgren:
Changes needed to drop legacy booting support for some
omap3 boards.

Note that that these are based on a merge of the
following for the dependencies:

- v3.12-rc5 for fixes to pinctrl mask
- omap-for-v3.13/dt-signed to avoid pointless merge conflicts
- omap-for-v3.13/quirk-signed for legacy pdata handling

* tag 'omap-for-v3.13/board-removal-signed-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (125 commits)
  ARM: OMAP2+: remove legacy support for IGEP boards
  ARM: OMAP2+: Remove legacy support for zoom platforms
  ARM: OMAP2+: Remove legacy booting support for omap3 EVM
  ARM: OMAP2: delete board-rm680
  ARM: dts: add minimal DT support for Nokia N950 & N9 phones
  ARM: dts: Add basic support for zoom3
  ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
  ARM: dts: Add common support for omap3-evm
  ARM: dts: Shared file for omap GPMC connected smsc911x
  +Linux 3.12-rc5

Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-18 11:30:37 -07:00
Javier Martinez Canillas
06ff74fd19 ARM: OMAP2+: remove legacy support for IGEP boards
Device Tree support for IGEP boards in mainline is almost
finished. The only remaining bits are support for the
Marvell SD8686 wifi + BT and TFP410 DVI chips.

Adding support for these should be straightforward so let's
not block OMAP3 moving to Device Tree only boot and remove
the board file for IGEP boards.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-18 10:25:46 -07:00
Tony Lindgren
97411608fd ARM: OMAP2+: Remove legacy support for zoom platforms
We now have pretty decent device tree based support for
zoom platforms. It's not complete, but basics work for
me so adding more features should be quite trivial.

Looks like also 3630 sdp is zoom based, and looking
at it's board file should also be trivial to support
with the device tree based booting.

Patches are welcome if people are still using these.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-18 10:24:33 -07:00
Tony Lindgren
95807689ea ARM: OMAP2+: Remove legacy booting support for omap3 EVM
We now have pretty decent support with the device tree
based booting. Patches to add more features are welcome.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-18 10:24:33 -07:00
Aaro Koskinen
dfcc11ad4a ARM: OMAP2: delete board-rm680
Delete board file for Nokia RM-680/RM-696 (N950/N9). DT-based booting
should be used for further development on this HW.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-18 10:24:33 -07:00
Aaro Koskinen
df01318850 ARM: dts: add minimal DT support for Nokia N950 & N9 phones
Add minimal DT support for Nokia N950 & N9 phones. The same functionality
that is provided by the current board file should work: serial console,
USB, OneNAND and MMC.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-18 10:24:33 -07:00
Tony Lindgren
c482525659 ARM: dts: Add basic support for zoom3
I've tested serial, MMC, smsc911x and wl12xx on zoom3. As my
omap is an early ES revision, I have not been able to test
off-idle on this one. But anyways, I'd say we have enough
device tree support for the zoom to be able to drop the
board-zoom files. Patches are welcome to add further features
to this .dts file.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-18 10:24:33 -07:00
Kevin Hilman
af43ef6770 First DT series for 3.13
- addition of sound for at91sam9n12
 - a little fix for MMC vs. SPI on at91sam9g20ek
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJSYUtRAAoJEAf03oE53VmQH+EH/1YhBDF7uL5s+TCKLBOyau+G
 i+W93uG4acZAdbUMRwY+/dP5HMwFu5ZSoKDD5LoRnG2O+jW5dB3rBPi1C42XRKa/
 ra1wQcabKFPERJGDJ8DWbuLoJ7WNiDNENDa5ckV3m+F7dRbflcNyUB7vPUiGW78c
 xe/WKCKB9Hhpytl1fAynRs+VEu/z3hW7KV7QFyVDatOtV11Vb4QSSJ5HjfMhfito
 T7zAsML26hIdcNRsDQs8/4Uwgy8Tevl6FbtLHvht18BJB7FSxRtiPrAGh0KAmwsl
 HwIT8RzgJqdDlXTi9z9BdLFlvFZkX83n12jrB7hGScOKav45kvmmC9pgwhFbRzk=
 =uw6I
 -----END PGP SIGNATURE-----

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

From Nicolas Ferre:
First DT series for 3.13
- addition of sound for at91sam9n12
- a little fix for MMC vs. SPI on at91sam9g20ek

* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91: remove pinctrl conflict between mmc and SPI for at91sam9g20ek
  ARM: at91: add sound support on at91sam9n12ek board
  ARM: at91: enable ssc on at91sam9n12ek board
  ARM: at91: enable wm8904 on at91sam9n12ek board
  ARM: at91: add ssc dma parameter for at91sam9n12
  ARM: at91: add at91sam9n12 ssc clock in look up table

Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-18 08:21:28 -07:00
Jean-Christophe PLAGNIOL-VILLARD
e483341ce8 ARM: at91: remove pinctrl conflict between mmc and SPI for at91sam9g20ek
These MMC and SPI buses can't be configured at the same time because they
share the same traces on the EK board.

Reported-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-10-18 16:50:13 +02:00
Kevin Hilman
ec902c620b Merge branch 'tegra/dt' into next/dt
From Stephen Warren:
* tegra/dt:
  ARM: tegra: Use symbolic names for gr3d clocks
  ARM: tegra: Mark Tegra30 display controller compatible with Tegra20
  ARM: tegra: add GPIO controller to tegra124.dtsi
  ARM: tegra: enable LP1 suspend mode for Venice2
  ARM: tegra: enable Tegra RTC as default for Tegra124
  ARM: tegra: add Venice2 board support
  ARM: tegra: Add initial device tree for Tegra124
  ARM: tegra: add vcc supply for nct1008 to Cardhu
  ARM: tegra: add DT entry for nct1008 to Dalmore
  ARM: tegra: use dt-binding header for key code
  ARM: tegra: add palmas pincontrol to Dalmore device tree

Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-17 16:02:51 -07:00
Kevin Hilman
048e5a786a mvebu dt changes for v3.13 (round 3)
- dove
     - add audio devices
     - fix bad properties of si5351 clkout2 for CuBox
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQEcBAABAgAGBQJSX+yTAAoJEAi3KVZQDZAev1wIAJA521UnQR6efGNEU6wD3Yvq
 hjXEe+Da62FG2YUzZhOpLYIRrc0EvTrt/JIAbLbf5qrOnc9kzO6YdZVnRJJgWDP0
 Qzak9C0xqfsFeR7MxnDuyJ10/TYgM1iugvUcs6tqRDb7LdqcGBv92vv8zCdieiiJ
 XNtA56GVvEXo6LKp4KjC/dNv4vQBPEzDukSm81g/dfVDIhm7vbGMeNpFtHPHcNQa
 lASc6NjYzZXBZlz/ckRIZeT+MePpPkWusb8DOtLkv6/pRJjtSLaQqSLR82l52U+E
 eVb9SoQJWjxmrVLMEk3nUYvsWVgLtClND62snfpu+JP5ELb+DBwky4DzVvftpaY=
 =P7l9
 -----END PGP SIGNATURE-----

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

From Jason Cooper:
mvebu dt changes for v3.13 (round 3)

 - dove
    - add audio devices
    - fix bad properties of si5351 clkout2 for CuBox

* tag 'dt-3.13-3' of git://git.infradead.org/linux-mvebu:
  ARM: Dove: fix bad properties of the si5351 clkout2 used by Cubox audio
  ARM: Dove: Add the audio device to the Cubox DT
  ARM: Dove: Add the audio devices in DT
2013-10-17 15:22:29 -07:00
Thierry Reding
c71d39090e ARM: tegra: Use symbolic names for gr3d clocks
Commit 05849c9381 (ARM: tegra30: convert
device tree files to use CLK defines) updated the Tegra30 device tree to
use symbolic clock names but forgot to update this node.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2013-10-17 11:42:47 -06:00
Thierry Reding
05465f4e25 ARM: tegra: Mark Tegra30 display controller compatible with Tegra20
The display controller found on Tegra30 SoCs is backwards-compatible
with the one on Tegra20 SoCs.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2013-10-17 11:30:42 -06:00
Stephen Warren
0a9375d129 ARM: tegra: add GPIO controller to tegra124.dtsi
The Tegra124 GPIO controller is identical to Tegra30, so copy the
DT node from tegra30.dtsi to tegra124.dtsi.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
2013-10-15 09:25:28 -06:00
Kevin Hilman
fd781337b6 omap device tree related changes via Benoit Cousson <bcousson@baylibre.com>:
Add the minimal DTS support for DRA7xx based SoC core.
 Add the initial support for N900 and gta04 phones.
 Enable USB3 on OMAP5 evm board.
 Add support for cryto accelerators
 Add new IGEP AQUILA board
 Add AM33XX EDMA support
 Update HSUSB node to use the reset-gpios fmwk
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJSWIe0AAoJEBvUPslcq6Vz9RwP/iZ3rnaPUUYmuw4SmlOcgXe4
 NaMOPAWspcKVfL5hxTKRaMBNLvbwDcD/WY0VH7Tt/Yx6+aDdtifc3bgPnwAX8kyW
 408QlT3R4cOOyieDNLyFYdc0z3X5LvVaEW0bDzj1Sxdg/9uv8yKrVcPxXjo3rP4Z
 6NVgYdXYYKPGOCyhs3z+7sPXb6WZeneCYoYbuXbuaIem37fhMYm4OWbKToT/0CKS
 nkE+bNzoYaeouIOeNwLWs8o7yp9W9psnhkAmfSDujw8h+Y2cpemIaQQrYyy/td2P
 pF6UL67fNyVtcf5Oj2/N4a6OUSyac2mbkBLvbdxDoE/PjVIBTVNqFFphQvWivTBC
 WCjx9/skFS/t5P2MldmDp4qek8hTJUXFK0WbzFn00mC+i6+DOVBVEXIWO6ESWoPi
 X+B3417QCzZEab+q6NlVX+WjuStNuYUc9UAExC75q43rAoS8TpBZZK+dtKZE8lRB
 +xh9okQqKfybNunZbcsYTL5AJNqQQvBS5jNSmSXeCfrBBaZumfo8fg7c4dQ+ARwf
 GEnJH+ntCazNJRO66mBLf5wZ9OXF0g4TtCfLWXsmj4wdWjpokg1jEJSjtOmEg3xN
 cBGrfhP/o0prx/JSYAWU6ogh4bBvbkOZ4/jEsQMKOzUFHFyQ78qOt/7GZOq074p0
 4/luoHeG3Ri4QoVwIf8y
 =808Q
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.13/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

From Tony Lindgren:
omap device tree related changes via Benoit Cousson <bcousson@baylibre.com>:

Add the minimal DTS support for DRA7xx based SoC core.
Add the initial support for N900 and gta04 phones.
Enable USB3 on OMAP5 evm board.
Add support for cryto accelerators
Add new IGEP AQUILA board
Add AM33XX EDMA support
Update HSUSB node to use the reset-gpios fmwk

* tag 'omap-for-v3.13/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (58 commits)
  ARM: dts: dra7-evm: Add mmc2 node for eMMC support
  ARM: dts: dra7-evm: Add mmc1 node for micro-sd support
  ARM: dts: omap5-uevm: mark TWL6037 as system-power-controller
  ARM: dts: omap3-igep0020: use standard constant for IRQ flags
  ARM: dts: omap3-igep0020: Add HS USB Host support
  ARM: dts: omap3-igep: Add USB OTG support
  ARM: dts: AM33XX beagle black: add pinmux and hdmi node to enable display
  ARM: dts: AM33XX: Add LCDC info into am335x-evm
  ARM: dts: AM437X: Add DES node
  ARM: dts: AM437X: Add AES node
  ARM: dts: AM33XX: Fix AES interrupt number
  ARM: dts: AM33XX: Add AES data and documentation
  ARM: dts: AM33XX: Add SHAM data and documentation
  ARM: dts: OMAP4: Add DES3DES node
  ARM: dts: OMAP4: Add AES node
  ARM: dts: am335x-evm[sdk]: switch mmc1 to 4-bit mode
  ARM: dts: am335x-bone-common: correct mux mode for cmd line
  ARM: dts: AM33XX: Add support for IGEP AQUILA EXPANSION board.
  ARM: dts: AM33XX: Add support for IGEP COM AQUILA
  ARM: dts: am335x-boneblack: move fixed regulator to board level
  ...

Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-14 15:35:21 -07:00
Kevin Hilman
7587b5965f Changes needed to prepare for making omap3 device tree only:
- Always build in board-generic, and add pdata quirks and auxdata
   support for it so we have all the pdata related quirks
   in the same place.
 
 - Merge of the drivers/pinctrl changes that are needed for PM
   to continue working on omap3 and also needed for other omaps
   eventually. The three pinctrl related patches have been acked
   by Linus Walleij and are pulled into both the pinctrl tree
   and this branch.
 
 - Few defconfig related changes for drivers needed.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJSWIMoAAoJEBvUPslcq6VzudIQAKVjdFI26yxmI3xpYjNVS2P8
 JWaUTTjHAR7Lc0EWwtuGj6CqCtbNXUH1bTnChQrkzhT7fPMGQGFbgErnoaYQdwwJ
 qI15T7qcwy4q54vzeaOMAUS9UNZzr4lChEvxt9uYNoEhHlu7i6/ntyk5fgRfHMsh
 yK439VA7W/2rLNinpUmIAghx6+gUuRIBbVtfJ71gg5roXL7fY2hYizEoIkDKqWSD
 i1F24Xt33LAjNhy3n4/6JxCldee7ib2z0YrOUOrTdXWh/L1G9tDTslkdga6rAA5c
 A+B4nP7zP7i9c1SlTPbwRyguwjHhfSPuNTRhyhuePbwVk4bscglQZx8A7dH8BwS0
 pSCUxCTe2+CPEEzeN/ee9TgXwyX9Ab/r5BM092xFrX2lBbV3KxPl1F7rAxJ4HQTu
 Bh/M5bnKGupO7H9MOKqmLAf1y3a3JCrXVUuQljDMJnvauB8QFTx0nYQvZ/bQCJLZ
 /wfADHtooJ/FGHFS7Vb+HSLX7ifF2HyES9FgnQag5H77VfXS+bqI5yHsTcYHTgP1
 MlW8mObg0vJ+oUuowhhrk9pzQ1l1VFIaMqOKOouL3X6GHAHFiBSCti1fRiSE7d4U
 feW7a0NSyIjue+MAwxCjSLXOpHCATgnQ1mp9s8ByD0IF98iPugpnp9d6NGH/wp9A
 bgK7SGeOWXGoc+kN672c
 =bqsS
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.13/quirk-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

From Tony Lindgren:
Changes needed to prepare for making omap3 device tree only:

- Always build in board-generic, and add pdata quirks and auxdata
  support for it so we have all the pdata related quirks
  in the same place.

- Merge of the drivers/pinctrl changes that are needed for PM
  to continue working on omap3 and also needed for other omaps
  eventually. The three pinctrl related patches have been acked
  by Linus Walleij and are pulled into both the pinctrl tree
  and this branch.

- Few defconfig related changes for drivers needed.

* tag 'omap-for-v3.13/quirk-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (523 commits)
  ARM: configs: omap2plus_defconfig: enable dwc3 and dependencies
  ARM: OMAP2+: Add WLAN modules and of_serial to omap2plus_defconfig
  ARM: OMAP2+: Run make savedefconfig on omap2plus_defconfig to shrink it
  ARM: OMAP2+: Add minimal 8250 support for GPMC
  ARM: OMAP2+: Use pdata quirks for wl12xx for omap3 evm and zoom3
  ARM: OMAP: Move DT wake-up event handling over to use pinctrl-single-omap
  ARM: OMAP2+: Add support for auxdata
  pinctrl: single: Add support for auxdata
  pinctrl: single: Add support for wake-up interrupts
  pinctrl: single: Prepare for supporting SoC specific features
  ARM: OMAP2+: igep0020: use display init from dss-common
  ARM: OMAP2+: pdata-quirks: add legacy display init for IGEPv2 board
  +Linux 3.12-rc4

Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-14 15:29:24 -07:00
Kevin Hilman
6a9d10d529 Updates to dts file structure for Altera's SOCFPGA
* Does not include any new bindings or bindings change
 * Add dts file for a SOCFPGA with an Arria V FPGA
 * Add a clocks property for the TWD timer
 * Add support for Terasic SocKit Board which has Cyclone5 FPGA
 * From Steffen Trumtrar:
 "This series includes some minor cleanups (indentation and clock labels) and
 reorders the socfpga dts hierarchy from:
 	socfpga.dtsi
 	-> socfpga_$board.dts
 	-> socfpga_$otherboard.dts
 to
 	socfpga.dtsi
 	-> socfpga_cyclone5.dtsi
 	--> socfpga_cyclone5_$board.dts
 	--> socfpga_cyclone5_$otherboard.dts
 "
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJSVdPOAAoJEBmUBAuBoyj0pJcQALhtTLPhih/7GLlMUPEeH9JK
 KEx6IyPjg/+70Ap+dwdalv5WM13SoVy9beIEBceLgk7q/iRRmMtlrCgpHZkkGktp
 s4DF+xIqtJRtOjiJQwbAEpknE1MgiaDCJjtQAKUDppq9g2swik0nztpzDwgDIvFF
 dGwJffRYQUwvCQ6UqFdIyUudbGvDpHgsuI67/mRsR7jzdJMPhO1BX8A6X4i7feRY
 QP8RJWVpO8/6Vvh93rCF4AfapBZIpnRoUU60vfhgXHLw6BiPIwMCI4l60ccvXIzy
 yKfM68FZAPq8Loz4YKFcvH/AiHBlUVNHNPZtPd8HsPoKP6pn9kFsbz8S+0VfVH5Y
 PDiuaFSIFE98YyPIZ/YsCkMENAOoSmiYQFGnErIp1Ve8BIyjMWytnt7uxdMl41SM
 tYsjVyfMobnRwcyd6gWuQACgOeqSzWJJwH2m8Wz+HiugcOgQtnXmMmu9YaZyaOxK
 aS65w5jtxLje+tN7HmY3vUBVxMSDxd01wVFaDfxsjOAUWbOVnFh+hUtVkUL/5zOJ
 7R5S1yVZw3pe6OY+N4gy0V+1w2T0WxfLxXly97B5JN5baeHtEvJmAj9/ukf92LES
 O4Ub2wEjrz72kl2IY20vWLBiAD+Q6405b7hfNJUKZ+ugKkcsdDseiMguv10aDREG
 kdp6J7h8aLxUBWWgAkVH
 =jmLh
 -----END PGP SIGNATURE-----

Merge tag 'socfpga-dts-updates-for-v3.13' of git://git.rocketboards.org/linux-socfpga-next into next/dt

From Dinh Nguyen:
Updates to dts file structure for Altera's SOCFPGA

* Does not include any new bindings or bindings change
* Add dts file for a SOCFPGA with an Arria V FPGA
* Add a clocks property for the TWD timer
* Add support for Terasic SocKit Board which has Cyclone5 FPGA
* From Steffen Trumtrar:
"This series includes some minor cleanups (indentation and clock labels) and
reorders the socfpga dts hierarchy from:
	socfpga.dtsi
	-> socfpga_$board.dts
	-> socfpga_$otherboard.dts
to
	socfpga.dtsi
	-> socfpga_cyclone5.dtsi
	--> socfpga_cyclone5_$board.dts
	--> socfpga_cyclone5_$otherboard.dts
"

* tag 'socfpga-dts-updates-for-v3.13' of git://git.rocketboards.org/linux-socfpga-next:
  dts: socfpga: Add support for Altera's SOCFPGA Arria V board
  ARM: socfpga: dts: fix s2f_* clock name
  ARM: socfpga: dts: cleanup indentation
  ARM: socfpga: dts: Add support for terasic SoCkit
  ARM: socfpga: dts: Move common nodes to cyclone5 dtsi
  arm: socfpga: Add clock for smp_twd timer

Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-14 15:13:44 -07:00
Kevin Hilman
7a093c74c7 Merge branch 'renesas/dt2' into next/dt
From Simon Horman:
* renesas/dt2: (21 commits)
  ARM: shmobile: bockw: fixup ether node naming
  ARM: shmobile: r8a7779: add irqpin default status on DTSI
  ARM: shmobile: marzen: fixup SMSC IRQ number on DTS
  ARM: shmobile: bockw: add SMSC support on DTS
  ARM: shmobile: r8a7778: add renesas_intc_irqpin support on DTSI
  ARM: shmobile: r8a7791 SMP device tree node
  ARM: shmobile: r8a7791 Arch timer device tree node
  ARM: shmobile: r8a7791 IRQC device tree node
  ARM: shmobile: armadillo800eva-reference: add SDHI and MMCIF interfaces
  ARM: shmobile: armadillo-reference: Add PWM backlight node to DT
  ARM: shmobile: r8a73a4: add a DT node for the DMAC
  ARM: shmobile: r8a7790: add I2C DT nodes
  ARM: shmobile: only enable used I2C interfaces in DT on all Renesas boards
  ARM: shmobile: r8a7778: add usb phy power control function
  ARM: shmobile: r8a7778: add USBHS clock
  ARM: shmobile: r8a7791 CMT support
  ARM: shmobile: r8a7791 SCIF support
  ARM: shmobile: Initial r8a7791 SoC support
  ARM: shmobile: r8a7778: add SSI/SRU clock support
  ARM: shmobile: r8a7790: Add DU and LVDS clocks
  ...

Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-14 13:53:12 -07:00
Tony Lindgren
5992234bc5 ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
I've tested the serial, MMC, smsc911x, wl12xx, and off-idle support
with the pinctrl patches, so it probably works better than the
board-*.c files ever did. Also the board-omap3evm.c file is broken
for the DSS, and has been for a while. Patches are welcome to fix
it in this .dts file, let's just drop the board-*.c file for this.

Note that off-idle currently requires doing request_irq() on the
wake-up pin from pinctrl-single IRQ domain until we can handle
that in some Linux generic way.

[tony@atomide.com: updated for make dtbs build fix]
Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-14 11:34:37 -07:00
Tony Lindgren
465ce68b46 ARM: dts: Add common support for omap3-evm
Looks like the main difference between the TMDSEVM3530 and
TMDSEVM3730 is just the omap processor:

http://www.ti.com/tool/tmdsevm3530
http://www.ti.com/tool/tmdsevm3730

So let's add a common file for the EVMs, and fix the description
for the omap3-evm.dst as that's clearly for the TMDSEVM3530
since it includes omap34xx.dtsi. It cannot support the TMDSEVM3730
properly, and we need a separate file for that in the following
patch.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-14 11:34:37 -07:00
Tony Lindgren
6b2978ac40 ARM: dts: Shared file for omap GPMC connected smsc911x
Looks like at least Igep, Zoom and EVM boards can use a
common file for the GPMC connected smsc911x.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-14 11:34:37 -07:00
Tony Lindgren
f41509ad0d Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal
We need the fixes in v3.12-rc5, dts changes in omap-for-v3.13/dt, and
the platform data quirk changes in omap-for-v3.13/quirk to start
removing omap3 board files without breaking things.
2013-10-14 11:33:07 -07:00
Bo Shen
551a409ca6 ARM: at91: add sound support on at91sam9n12ek board
Add sound support on at91sam9n12ek board with wm8904 as codec.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-10-14 09:43:26 +02:00
Bo Shen
476090661a ARM: at91: enable ssc on at91sam9n12ek board
Enable ssc on at91sam9n12ek board

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-10-14 09:43:12 +02:00
Bo Shen
e6f7991660 ARM: at91: enable wm8904 on at91sam9n12ek board
Enable wm8904 codec on at91sam9n12ek board, which is connect
to i2c0 bus with 0x1a as address.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-10-14 09:42:53 +02:00
Bo Shen
ffcd77e279 ARM: at91: add ssc dma parameter for at91sam9n12
Add ssc dma parameter for at91sam9n12

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-10-14 09:42:38 +02:00
Bo Shen
45cf70c0dc ARM: at91: add at91sam9n12 ssc clock in look up table
Add at91sam9n12 ssc clock in look up table

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-10-14 09:42:19 +02:00
Linus Torvalds
61e6cfa80d Linux 3.12-rc5 2013-10-13 15:41:28 -07:00
Linus Torvalds
73cac03d0c Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
 "This will fix a deadlock on the ts72xx_wdt driver, fix bitmasks in the
  kempld_wdt driver and fix a section mismatch in the sunxi_wdt driver"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: sunxi: Fix section mismatch
  watchdog: kempld_wdt: Fix bit mask definition
  watchdog: ts72xx_wdt: locking bug in ioctl
2013-10-13 11:41:26 -07:00
Maxime Ripard
1d5898b4f8 watchdog: sunxi: Fix section mismatch
This driver has a section mismatch, for probe and remove functions,
leading to the following warning during the compilation.

WARNING: drivers/watchdog/built-in.o(.data+0x24): Section mismatch in
reference from the variable sunxi_wdt_driver to the function
.init.text:sunxi_wdt_probe()
The variable sunxi_wdt_driver references
the function __init sunxi_wdt_probe()

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2013-10-13 20:02:03 +02:00
Jingoo Han
4c4e45669d watchdog: kempld_wdt: Fix bit mask definition
STAGE_CFG bits are defined as [5:4] bits. However, '(((x) & 0x30) << 4)'
handles [9:8] bits. Thus, it should be fixed in order to handle
[5:4] bits.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2013-10-13 20:01:57 +02:00
Dan Carpenter
8612ed0d97 watchdog: ts72xx_wdt: locking bug in ioctl
Calling the WDIOC_GETSTATUS & WDIOC_GETBOOTSTATUS and twice will cause a
interruptible deadlock.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2013-10-13 20:01:50 +02:00
Linus Torvalds
3552570a21 ARM: SoC fixes for 3.12-rc
A small batch of fixes this week, mostly OMAP related. Nothing stands out
 as particularly controversial.
 
 Also a fix for a 3.12-rc1 timer regression for Exynos platforms, including
 the Chromebooks.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJSWs1jAAoJEIwa5zzehBx3OLEQAKQCQxbZ+LatgSK3Usk7I9s8
 BXsAvzb26e1frZBQqN8V2o3Mz7sIDwOLJE9pPMgm/Q63+7+EAGR4S1ZO9fLHk7l8
 vSHm/KJicTFtYZkppjnxyULN9biuhBxXJZUwqqNdrC6rmee/OiE4llKpbgPsU3k0
 ZWLwFiPL6ZLgfezsOQNOP7exC48oex1aRok9glAExmryqsk2Cj6l+o8iV8T7Lpok
 mvdoKnCHfhYX8hB+NBlSpedvCOWMwos10+JuXC5MbpewqE7xpX8zLWuGhB3my33a
 EQPQGvpbi9qhcaXX/Bwe3ybnLDA6yi2GCeRA/5wb7uTxCTR/vWzLYWLDpgV0lcv1
 EunPa79U2qj1mcyUNno0tRkjSCefJy7ruW53h4xRWdrBqUbGWVsZ62JKK7hNJP1V
 5oIdEidFnOfXsPxiBg1o/WtjPk9DelSn9zz82l81Vqew+H9Dj684nssCJRXwUxaB
 X2AT+nlxSskQmhK05ZSn8qejQueV7LeUL17Xh9WNFVDsg7YYqi24npg/6gwpfkzC
 i+Pxvk3UseTyThOoUVGWOZy1aeyLHDQO9VccEzrRZRjWtOfpc/ubYVZpGyvgHOY0
 QSaPfLZxsDPoa8bUY/qKiZP/tSSR4GqUzEB3aLYrvuXhasrR5txHbOQtIMEQR4tQ
 udb80OrLAt/vVl5vhDJh
 =HpMx
 -----END PGP SIGNATURE-----

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "A small batch of fixes this week, mostly OMAP related.  Nothing stands
  out as particularly controversial.

  Also a fix for a 3.12-rc1 timer regression for Exynos platforms,
  including the Chromebooks"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: exynos: dts: Update 5250 arch timer node with clock frequency
  ARM: OMAP2: RX-51: Add missing max_current to rx51_lp5523_led_config
  ARM: mach-omap2: board-generic: fix undefined symbol
  ARM: dts: Fix pinctrl mask for omap3
  ARM: OMAP3: Fix hardware detection for omap3630 when booted with device tree
  ARM: OMAP2: gpmc-onenand: fix sync mode setup with DT
2013-10-13 09:59:10 -07:00
Yuvaraj Kumar C D
4d594dd302 ARM: exynos: dts: Update 5250 arch timer node with clock frequency
Without the "clock-frequency" property in arch timer node, could able
to see the below crash dump.

[<c0014e28>] (unwind_backtrace+0x0/0xf4) from [<c0011808>] (show_stack+0x10/0x14)
[<c0011808>] (show_stack+0x10/0x14) from [<c036ac1c>] (dump_stack+0x7c/0xb0)
[<c036ac1c>] (dump_stack+0x7c/0xb0) from [<c01ab760>] (Ldiv0_64+0x8/0x18)
[<c01ab760>] (Ldiv0_64+0x8/0x18) from [<c0062f60>] (clockevents_config.part.2+0x1c/0x74)
[<c0062f60>] (clockevents_config.part.2+0x1c/0x74) from [<c0062fd8>] (clockevents_config_and_register+0x20/0x2c)
[<c0062fd8>] (clockevents_config_and_register+0x20/0x2c) from [<c02b8e8c>] (arch_timer_setup+0xa8/0x134)
[<c02b8e8c>] (arch_timer_setup+0xa8/0x134) from [<c04b47b4>] (arch_timer_init+0x1f4/0x24c)
[<c04b47b4>] (arch_timer_init+0x1f4/0x24c) from [<c04b40d8>] (clocksource_of_init+0x34/0x58)
[<c04b40d8>] (clocksource_of_init+0x34/0x58) from [<c049ed8c>] (time_init+0x20/0x2c)
[<c049ed8c>] (time_init+0x20/0x2c) from [<c049b95c>] (start_kernel+0x1e0/0x39c)

THis is because the Exynos u-boot, for example on the Chromebooks, doesn't set
up the CNTFRQ register as expected by arch_timer. Instead, we have to specify
the frequency in the device tree like this.

Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd@samsung.com>
[olof: Changed subject, added comment, elaborated on commit message]
Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-13 09:33:54 -07:00
Olof Johansson
98ead6e001 Few fixes for omap3 related hangs and errors that people have
noticed now that people are actually using the device tree
 based booting for omap3.
 
 Also one regression fix for timer compile for dra7xx when
 omap5 is not selected, and a LED regression fix for n900.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJSVFFqAAoJEBvUPslcq6VzmMwP+wYGQ1a0Dyq/nHvHFbsm8Ny2
 QQJBcz2QqiOUk3gCENl5MJ2CWeKr9vsB9JoC+BAWbaJ2qc20ru/LcT8vrd1bvFFm
 qfvQzdSQubV+6//aTTjWc0pCfNw5ElpfjVztR3NbA6r1x4N3UISsLhLM20UOlq7v
 aS6tIcP66H2haJRX5SIQkow8/zT1/YRZ3w368JDRCUWD+Lj+ceDasgyJVpPkIscV
 q15EFSi4RWboxY6d6u5LkQwdxnX4cBL5/TWD/jHP2OGtDwdpg3aXW9uLrewETXlT
 4OGh7igHe7mBXnUpWgOB5vjElp3i7zN81//hIe7rNys4hj4ED7t71n/qy90EOJWm
 fH2mou/lOmqIXhEB68vOT88BeGlrELBRu6hrA56aem7LWOZKkIRIPEhC2qE/r18l
 YIcBMsNlxxWY0ebmJvmvYCDxUyJpMIxePZ3k1xwybNojbSI0CRGd1qZMQoDWV6Yd
 dbnvs+f0sCy7lOjrg9u/miCZJnc+wrkoKDQUfFiP2gHWQpQyBswOFO76VD7zW4DX
 zLZs4oGml+Tc3LyLlTFdoMKeeW2AmQHKBNEupUzWhL0AjndTTetD4S3YwU8EfAVS
 hPkzT0gI5oum3TypIdCr9Wmobn0tzJGI/rLxe5UJCeVbWpDfwqyccEy1wF/ET4FO
 bVvy4NsDCHOSeDbAi8Xe
 =yVzH
 -----END PGP SIGNATURE-----

Merge tag 'fixes-against-v3.12-rc3-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:

Few fixes for omap3 related hangs and errors that people have
noticed now that people are actually using the device tree
based booting for omap3.

Also one regression fix for timer compile for dra7xx when
omap5 is not selected, and a LED regression fix for n900.

* tag 'fixes-against-v3.12-rc3-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2: RX-51: Add missing max_current to rx51_lp5523_led_config
  ARM: mach-omap2: board-generic: fix undefined symbol
  ARM: dts: Fix pinctrl mask for omap3
  ARM: OMAP3: Fix hardware detection for omap3630 when booted with device tree
  ARM: OMAP2: gpmc-onenand: fix sync mode setup with DT

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-13 09:33:32 -07:00
Linus Torvalds
2d4712b7a6 Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller:
 "This patchset includes a bugfix to prevent a kernel crash when memory
  in page zero is accessed by the kernel itself, e.g.  via
  probe_kernel_read().

  Furthermore we now export flush_cache_page() which is needed
  (indirectly) by the lustre filesystem.  The other patches remove
  unused functions and optimizes the page fault handler to only evaluate
  variables if needed, which again protects against possible kernel
  crashes"

* 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: let probe_kernel_read() capture access to page zero
  parisc: optimize variable initialization in do_page_fault
  parisc: fix interruption handler to respect pagefault_disable()
  parisc: mark parisc_terminate() noreturn and cold.
  parisc: remove unused syscall_ipi() function.
  parisc: kill SMP single function call interrupt
  parisc: Export flush_cache_page() (needed by lustre)
2013-10-13 09:13:28 -07:00
Linus Torvalds
75c531881b Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul:
 "Another week, time to send another fixes request taking time out of
  extended weekend for the festivities in this part of the world.

  We have two fixes from Sergei for rcar driver and one fixing memory
  leak of edma driver by Geyslan"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dma: edma.c: remove edma_desc leakage
  rcar-hpbdma: add parameter to set_slave() method
  rcar-hpbdma: remove shdma_free_irq() calls
2013-10-13 09:02:03 -07:00
Helge Deller
db080f9c53 parisc: let probe_kernel_read() capture access to page zero
Signed-off-by: Helge Deller <deller@gmx.de>
2013-10-13 17:46:31 +02:00
John David Anglin
2d8b22de6e parisc: optimize variable initialization in do_page_fault
The attached change defers the initialization of the variables tsk, mm
and flags until they are needed. As a result, the code won't crash if a
kernel probe is done with a corrupt context and the code will be better
optimized.

Signed-off-by: John David Anglin  <dave.anglin@bell.net>
Signed-off-by: Helge Deller <deller@gmx.de>
2013-10-13 17:45:40 +02:00
Helge Deller
59b33f148c parisc: fix interruption handler to respect pagefault_disable()
Running an "echo t > /proc/sysrq-trigger" crashes the parisc kernel.  The
problem is, that in print_worker_info() we try to read the workqueue info via
the probe_kernel_read() functions which use pagefault_disable() to avoid
crashes like this:
    probe_kernel_read(&pwq, &worker->current_pwq, sizeof(pwq));
    probe_kernel_read(&wq, &pwq->wq, sizeof(wq));
    probe_kernel_read(name, wq->name, sizeof(name) - 1);

The problem here is, that the first probe_kernel_read(&pwq) might return zero
in pwq and as such the following probe_kernel_reads() try to access contents of
the page zero which is read protected and generate a kernel segfault.

With this patch we fix the interruption handler to call parisc_terminate()
directly only if pagefault_disable() was not called (in which case
preempt_count()==0).  Otherwise we hand over to the pagefault handler which
will try to look up the faulting address in the fixup tables.

Signed-off-by: Helge Deller <deller@gmx.de>
Cc: <stable@vger.kernel.org> # v3.0+
Signed-off-by: John David Anglin  <dave.anglin@bell.net>
Signed-off-by: Helge Deller <deller@gmx.de>
2013-10-13 17:45:20 +02:00
Helge Deller
a60ac4b5f0 parisc: mark parisc_terminate() noreturn and cold.
Signed-off-by: Helge Deller <deller@gmx.de>
2013-10-13 17:44:49 +02:00
Helge Deller
ec7c241953 parisc: remove unused syscall_ipi() function.
Signed-off-by: Helge Deller <deller@gmx.de>
2013-10-13 17:44:39 +02:00
Jiang Liu
528d8eb20a parisc: kill SMP single function call interrupt
Commit 9a46ad6d6d "smp: make smp_call_function_many() use logic
similar to smp_call_function_single()" has unified the way to handle
single and multiple cross-CPU function calls. Now only one interrupt
is needed for architecture specific code to support generic SMP function
call interfaces, so kill the redundant single function call interrupt.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Jiang Liu <liuj97@gmail.com>
Signed-off-by: Helge Deller <deller@gmx.de>
2013-10-13 17:44:29 +02:00
Geert Uytterhoeven
320c90be7b parisc: Export flush_cache_page() (needed by lustre)
ERROR: "flush_cache_page" [drivers/staging/lustre/lustre/libcfs/libcfs.ko] undefined!

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Helge Deller <deller@gmx.de>
2013-10-13 17:44:17 +02:00
Linus Torvalds
9d05746e7b vfs: allow O_PATH file descriptors for fstatfs()
Olga reported that file descriptors opened with O_PATH do not work with
fstatfs(), found during further development of ksh93's thread support.

There is no reason to not allow O_PATH file descriptors here (fstatfs is
very much a path operation), so use "fdget_raw()".  See commit
55815f7014 ("vfs: make O_PATH file descriptors usable for 'fstat()'")
for a very similar issue reported for fstat() by the same team.

Reported-and-tested-by: ольга крыжановская <olga.kryzhanovska@gmail.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: stable@kernel.org	# O_PATH introduced in 3.0+
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-10-12 13:12:31 -07:00
Linus Torvalds
be5090da4a A bug fix and performance regression fix for ext4.
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABCAAGBQJSWZeNAAoJENNvdpvBGATwx6kP/2mVlKlNBXVfGUmLVP3Xb68v
 4JhBzlC3ra3TRqVkw6C6kx4fbdq0cW/mDkecmYg2s+aDnswG/94/+yRdU4kQkyne
 iqN22ZYA7CumZgJvR0Z2ptWksDRpv8H5twgdVbPtad6/2cKmjseUraPo7YZhjDCe
 O9eRCXyVII305soAddZzZUgWOWCSWpdTW5zBitKaGq5x/K//rY9UlPVSuAo+9KPZ
 vyBiKJ1R6fDbtyH7JhCdXydMPKzlAPmyqYBQGLyq2GsRsXDp/VljGci6QN0iuZ5k
 lZsxFg8q0P6/R4Pjr3DDtE0tUbPXEyMxuquh/m4b3pAXRoMMCynyLP2zy7Gc7ec0
 ek2ty+sVG06JjseqigHSmS/a+PdZgDY5xEMKhaK4X38lxRPb7apNktolXxxEt6eU
 OPZsuvma1g+lbkkCdRO5FVwMllb7cuPhuZPGyxZvmP+ON59oT5QOVsDC+55WnHNs
 Ib11PCTN93Mwhrm1YPNWVV+gWG50eLZQYJam6H4mE4knaXnba6htEhYrdNczoFH4
 lcHaJzCDJLnYVRRbKXKdLSSnyz1X9cYJBP9g5ks1iNy7/JreF7WoIAOWvZWCp432
 7NC0IOmV4Q4itiCTcSh85rGlsXU8ZA7wK5HILhp9qZmNkw30OMvihNoWoTFiWTJR
 mVCkm+isBbqMP0nhV5km
 =ZwlW
 -----END PGP SIGNATURE-----

Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Pull ext4 bugfixes from Ted Ts'o:
 "A bug fix and performance regression fix for ext4"

* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix memory leak in xattr
  ext4: fix performance regression in writeback of random writes
2013-10-12 12:55:15 -07:00