Commit graph

448532 commits

Author SHA1 Message Date
LABBE Corentin
962a75a2d5 hwmon: (adm1029) Update Corentin Labbe's email
Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:23 -07:00
LABBE Corentin
fce8ffa354 MAINTAINERS: Update Corentin Labbe's email
Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:23 -07:00
Jingoo Han
cfe03d641e hwmon: (iio_hwmon) Make of_device_id array const
Make of_device_id array const, because all OF functions
handle it as const.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:23 -07:00
Jingoo Han
6de709c5ee hwmon: (gpio-fan) Make of_device_id array const
Make of_device_id array const, because all OF functions
handle it as const.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:23 -07:00
Jingoo Han
adaa50b0dd hwmon: (g762) Make of_device_id array const
Make of_device_id array const, because all OF functions
handle it as const.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:22 -07:00
Guenter Roeck
86b89d73f9 hwmon: (ltc2945) Fix 1st comment line
Somehow a couple of spaces got added to the first line. Remove them.
No code change.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:22 -07:00
Jingoo Han
5b20995ee7 hwmon: (vt1211) remove unnecessary OOM messages
The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:22 -07:00
Jingoo Han
eefb6b76b1 hwmon: (s3c-hwmon) remove unnecessary OOM messages
The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:22 -07:00
Jingoo Han
2f89b072c9 hwmon: (pc87427) remove unnecessary OOM messages
The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:22 -07:00
Jingoo Han
6122de8f8c hwmon: (max197) remove unnecessary OOM messages
The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:22 -07:00
Jingoo Han
611cd8aec8 hwmon: (max1111) remove unnecessary OOM messages
The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:22 -07:00
Jingoo Han
567817de85 hwmon: (lm93) remove unnecessary OOM messages
The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:22 -07:00
Jingoo Han
6d33d304e2 hwmon: (ibmpex) remove unnecessary OOM messages
The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Jean Delvare <jdelvare@suse.de>
Acked-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:21 -07:00
Jingoo Han
b83207fdda hwmon: (f71805f) remove unnecessary OOM messages
The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:21 -07:00
Guenter Roeck
030004b1ed hwmon: (lm92) Convert to use devm_hwmon_device_register_with_groups
Use devm_hwmon_device_register_with_groups API to attach attributes
to hwmon device, simplify code, and reduce code size.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:21 -07:00
Guenter Roeck
b8fe58e953 hwmon: (lm92) Drop function macros
Function macros obfuscate code and increase code size, so drop them.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:21 -07:00
Guenter Roeck
c6f1e7ab91 hwmon: (lm92) Drop FSF mailing address
The FSF mailing address may change, so drop it.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:21 -07:00
Guenter Roeck
ddfe44bfee hwmon: (lm92) Drop unnecessary forward declaration
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:21 -07:00
Guenter Roeck
d663ec496d hwmon: (lm75) Convert to use hwmon_device_register_with_groups
Simplify code and attach hwmon attributes to hwmon device.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:21 -07:00
Guenter Roeck
5975dfbf40 hwmon: (lm77) Convert to use devm_hwmon_device_register_with_groups
Use devm_hwmon_device_register_with_groups API to attach attributes
to hwmon device, simplify code, and reduce code size.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:21 -07:00
Guenter Roeck
48dbd6ff14 hwmon: (lm77) Drop function macros
Function macros make the code harder to read and increase code size,
so drop them.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:20 -07:00
Guenter Roeck
50bf46509f hwmon: (lm77) Do not preserve hysteresis when updating critical temp limit
Updating the hysteresis value when updating the critical temperature limit
was following the rule of 'least surprise'. However, it had the undesirable
side effect of changing the hysteresis for all other attributes, which
defeats the purpose of least surprise. In addition, it could result in
invalid hysteresis values if the resulting hysteresis was too large. In such
cases the resulting hysteresis ended up changed anyway, which again defeats
the purpose. So drop that code and document the new behavior.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:20 -07:00
Guenter Roeck
9f9edcd4c3 hwmon: (lm77) Rearrange code to no longer require forward declarations
Forward declarations are easy to avoid and unnecessary.
Rearrange code to avoid it.

No functional change.

Acked-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:20 -07:00
Guenter Roeck
d9ee59751e hwmon: (lm77) Drop FSF mailing address
The FSF mailing address changes over time, so drop it.

No functional change.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:20 -07:00
Guenter Roeck
276dac8039 hwmon: (tmp421) Convert to use devm_hwmon_device_register_with_groups
Use devm_hwmon_device_register_with_groups API to attach attributes
to hwmon device, simplify code, and reduce code size.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:20 -07:00
Guenter Roeck
ad9beea43f hwmon: (tmp102) Convert to use hwmon_device_register_with_groups
Simplify code, reduce code size, and attach sysfs attributes to hwmon device.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:20 -07:00
Guenter Roeck
fbd9af164c hwmon: (tmp102) Introduce dev variable in probe function
The pointer to client->dev is used several times in the probe function.
Simplify code by introducing a separate variable for it.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:20 -07:00
Guenter Roeck
aa9bcddada hwmon: (lm70) Convert to use devm_hwmon_device_register_with_groups
Use devm_hwmon_device_register_with_groups API to attach attributes
to hwmon device, simplify code, and reduce code size.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2014-05-21 16:02:20 -07:00
Vivek Gautam
6674fd923c ARM: dts: Add USB 2.0 support on exynos5420
Add required device node for ehci and ohci controllers to
enable USB 2.0 support.

Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Signed-off-by: Vikas Sajjan <vikas.sajjan@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-05-22 07:53:19 +09:00
Vivek Gautam
8d53526fe8 ARM: dts: Add usb2phy support on exynos5420
Add required device node for usb2phy to let enable USB 2.0
support.

Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Signed-off-by: Vikas Sajjan <vikas.sajjan@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-05-22 07:52:43 +09:00
Kamil Debski
dba2f05880 ARM: dts: Add usb2phy to exynos5250
Add support to PHY of USB2 of the Exynos5250 SoC.

Signed-off-by: Kamil Debski <k.debski@samsung.com>
[gautam.vivek@samsung.com: Split the usb phy entries]
[gautam.vivek@samsung.com: Added phy entry for OHCI also along with EHCI]
Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Signed-off-by: Vikas Sajjan <vikas.sajjan@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-05-22 07:52:30 +09:00
Vivek Gautam
dfbbdbf440 ARM: dts: Add sysreg sytem controller node to exynos5250 and exynos5420
This patch adds sysreg-syscon node to exynos5250 and exynos5420 device
tree, to access System Register's registers using syscon driver.

Signed-off-by: Kamil Debski <k.debski@samsung.com>
[gautam.vivek@samsung.com: Split this syreg-syscon dts entry]
[gautam.vivek@samsung.com: added similar syscon entry for exynos5420]
Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
[vikas.sajjan@samsung.com: updated the binding document]
Signed-off-by: Vikas Sajjan <vikas.sajjan@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-05-22 07:49:13 +09:00
Rahul Sharma
94b62c38f0 ARM: dts: move dp hpd gpio pin to pinctrl_0 for exynos5420 peach_pit
DP Hpd Gpio pin which is "gpx2-6" in Exynos 5420 based peach board,
belongs to Pinctrl_0. It has moved to pinctrl_0 from pinctrl_3.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-05-22 07:26:51 +09:00
Olof Johansson
1af809f65a ARM: tegra: defconfig updates for 3.16
AT24C EEPROM:
 
 This is used for the board ID EEPROM on Jetson TK1, as well as likely
 a whole slew of other NVIDIA reference boards; we simply haven't added
 enabled the EEPROM in the DT files until now.
 
 MTD_SPI_NOR:
 
 This defconfig contains the CONFIG_M25P80 symbol, which is now
 dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
 the new dependency.
 
 FRAMEBUFFER_CONSOLE_ROTATION:
 
 Needed for devices like Tegra Note 7 and NVIDIA SHIELD to get the boot
 console in the expected orientation.
 
 CAN*, RTC_DRV_DS1307:
 
 Toradex Colibri Evaluation Board uses the DS1307 RTC and the MCP251x CAN
 controller. The NVIDIA Tegra 3 based Colibri T30 module can be used on
 this carrier board.
 
 Furthermore the NVIDIA Tegra 3 based Apalis T30 module too contains two
 MCP251x CAN controllers.
 
 INPUT_JOYDEV:
 
 NVIDIA SHIELD embeds a USB joystick device.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTdle3AAoJEMzrak5tbycxgLoP/jeGARkjHxJpk+uvvYqnsvCf
 sobfa86b6w5ZJyWtdE2+j/kjYU+1SNd5TcTIjvCGrVQi7s/haRxaTgcXdKeMqoeF
 I2lVahFJTmfDNm+TebifgxdDs3utcmdO4XGX39kmhaWUzFKJndCp+6hn7vvCj92V
 gVZaqks8Qt5pa27W4MFAv9Nn6z5kiwlypAonheV/vcU2FU8/zhfv7NL+T/o9ISg0
 rXheCS9GRShaL8PGYOI4zrMkZH+YTyv12qS0OUAinVstj8mPPldIQOhG3RB57x0T
 IpAdnKb62c63G2VsOD5sgjx37RB5zzbhMDDXah8GDEh2TLL+AAfss/IBrbJsTSmi
 D7H/j6hUwHY8tHL8NyjnNk4h7EVP3mhllevv0ElFH+DvWYgi03WNhuNExE+S9Zxn
 iwKaHRorG+YWGT6hGTjbrB/Fzm70tdoe7XMeFdDwVhyiCXU0NDjTrAhnUaFB4LeT
 JpxK2IptoMf4sglpJ3OY1ol9qO+9jAYEaQZa8upsDsWXh4Lpj83OpY/W1mWsBDMR
 Uw/TWQ+E6h44j8VJZsIyGeSUjM7V/jcDoBgqN9K8MkYZJqqUKOg5E1QgyjN4qu9o
 woZNaJ2+a9GD7vgbtMTMFQKsHW4L0s/Syr0YzIC2IX4G9Ec+WLD4ZLkyoji1lgFU
 NqX9ZbdzTjtloSUXIp/G
 =K1Dc
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-3.16-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/boards

Merge "ARM: tegra: defconfig updates for 3.16" from Stephen Warren:

AT24C EEPROM:

This is used for the board ID EEPROM on Jetson TK1, as well as likely
a whole slew of other NVIDIA reference boards; we simply haven't added
enabled the EEPROM in the DT files until now.

MTD_SPI_NOR:

This defconfig contains the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.

FRAMEBUFFER_CONSOLE_ROTATION:

Needed for devices like Tegra Note 7 and NVIDIA SHIELD to get the boot
console in the expected orientation.

CAN*, RTC_DRV_DS1307:

Toradex Colibri Evaluation Board uses the DS1307 RTC and the MCP251x CAN
controller. The NVIDIA Tegra 3 based Colibri T30 module can be used on
this carrier board.

Furthermore the NVIDIA Tegra 3 based Apalis T30 module too contains two
MCP251x CAN controllers.

INPUT_JOYDEV:

NVIDIA SHIELD embeds a USB joystick device.

* tag 'tegra-for-3.16-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: tegra_defconfig updates

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 15:07:11 -07:00
Olof Johansson
8b1b57e88e ARM: tegra: device tree changes for 3.16
The bulk of Tegra changes for 3.16 are to device trees. Highlights are:
 
 - New board support for:
   - Jetson TK1.
   - SHIELD.
   - Tegra Note 7.
   - Colibri T30 module.
 - HDMI support on Venice2.
 - SD card write-protect GPIOs added to some boards.
 - Numerous regulator cleanups.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTdldeAAoJEMzrak5tbycxb9cP/0Jhsx+pYsXw2paEkg4U0TWN
 0KhZJpdrOcuwWxJnTnHA7XTwc/XR1aN2mfes1WftGuAUcklkjf8oO03/8HsBMph6
 z2qKzlzGMb+E78VKploGR5ytYygbTRCXTVhQUZH+zSKp2+1HowRkVP/y2MhOT9DG
 jSTkI75BXIKWxXkx05wSq2FbLRy4DVw98I/BRhVM6ttlT5lwKWxmRwAe5YgHwztD
 w/TymCxAE7Fw3PubTwQbUIpMJJEbBLmqdJRB/4ESINKDH0j0Cq/WQYZEJeNCkRjG
 wK07voXCtjtOZDhhtaHzS5Yyfa46CrqM5F1N/UIXyTXCTpPmQNbQzB2kTlaQtvf6
 4/CHWXVm5jUwEjA+EdQX9oSJFQxO/ycs8Y3vZfvzT2ej1v8t+hyNTRB7/p9C8OyQ
 tGRab6fhnEnkDqW6bNE69Qw1XWh3B81blN2CG0CDQ6+dytyVqjd+jOY/NEkoA1Bw
 nuKhPSwnog+QQYASYF4lCLWPj6eUDTGkh7JoY0V8J8Z+Lz9+HUYJLa5vaij1u7WE
 buhvuAOfLoIVRdR0w9d3afZ5Ds5xwQddjwnwvqaWQrea/iLk91LL+T3P0J5YCIua
 iLgnx0yUDIIXJUuei1ZDqUS6J+9bspTWEo5m2vMKbZwlUtLalQWru2OmiqpQOFHf
 Mh6+7htYfwEUD2x/Q8NL
 =5rER
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-3.16-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt

Merge "ARM: tegra: device tree changes for 3.16" from Stephen Warren:

The bulk of Tegra changes for 3.16 are to device trees. Highlights are:

- New board support for:
  - Jetson TK1.
  - SHIELD.
  - Tegra Note 7.
  - Colibri T30 module.
- HDMI support on Venice2.
- SD card write-protect GPIOs added to some boards.
- Numerous regulator cleanups.

* tag 'tegra-for-3.16-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: initial add of Colibri T30
  ARM: tegra: add device tree for SHIELD
  ARM: tegra: add SD wp-gpios to Venice2 DT
  ARM: tegra: add Tegra Note 7 device tree
  ARM: tegra: add SD wp-gpios to Dalmore DT
  ARM: tegra: add SD wp-gpios to Jetson TK1 DT
  ARM: tegra: use correct audio CODEC on Jetson TK1
  ARM: tegra: dalmore - Add DSI power supply
  ARM: tegra: dalmore - Add +5V HDMI supply
  ARM: tegra: beaver - Add +5V HDMI supply
  ARM: tegra: harmony - Add +5V HDMI supply
  ARM: tegra: jetson-tk1 - Enable HDMI support
  ARM: tegra: venice2 - Enable HDMI
  ARM: tegra: Add Tegra124 HDMI support
  ARM: tegra: fix Venice2 SD card VQMMC supply
  ARM: tegra: make Venice's +3.3V_RUN regulator always on
  ARM: tegra: fix Jetson TK1 SD card supply
  ARM: tegra: define Jetson TK1 regulators
  ARM: tegra: add Jetson TK1 device tree

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 15:06:16 -07:00
Olof Johansson
9706c077d8 ARM: tegra: core code changes for 3.16
This branch contains just a single patch this time around. Thierry
 enhanced Tegra's restart code to allow programming PMC scratch registers
 to request specific behaviour after reboot. One of the most useful
 options for mainline software is the ability to reboot directly into USB
 recovery mode, which e.g. allows the bootloader to be reflashed.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTdlZ5AAoJEMzrak5tbycxzBYP/3w8M/VNvK79hkPwAzvHUi2U
 xh4eDX1LrUv8KvXXYCEtZ9+m3fpDSsmUurvAZipBNpdt28ELWKWT9iUQzhmQs0dc
 8FqvqRrl1BNeY+35J0wmxrUv7Q2m41AQnOIQmm5VC0WiR5Na4GzUvCqm8GCjrMse
 TnF3/a12p+IlVxcP966/LFR5H00FPtrhTgi4GiU+jIsqjPNPUw2/6GfV1GzqJscH
 okJe5uAwDUrJiXvk1oJvyXS9qTLiiC2FOK2iBVzfr6pVo/JBcm4KQuMUnmXtrJau
 f+juCeM4bLGrNiOZzvgwuhlWCU83GeJ5J5dXKOAsZe/LOvkhiZOOGHMod4hVS3nT
 BYdv9rL66qHkvNkwxYqxnNOphPpqdrX5PbxOcBKQ4Wq8BCfOmbRvwPUt9YslYEK1
 md5/HQCBefyn7B5cjnRc/hUf1pLIH1cqzub2jSYYgiiBV/LBr5mSUZQUqV9cujqI
 J+Io8txiXkAFZ9hFgny+/knJV4MHhg/d3Ml/EicoGwZeL0mmnbtMc3qvTXkrIca6
 DBp8uCe2AP9KrEI3sHxILUyTA45ujPWT5z41v4jvmrTSJ8kQlzlEVqNdASWPxNOH
 g/wfIJqkY6JvkDJdwGvu1UusjrvuySQRJpLBtMl2N0aVb3JFB4v9GayAn5ijcqof
 yn2qq5S+NHCMdtp8AnXs
 =l5yt
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-3.16-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc

Merge "ARM: tegra: core code changes for 3.16" from Stephen Warren:

This branch contains just a single patch this time around. Thierry
enhanced Tegra's restart code to allow programming PMC scratch registers
to request specific behaviour after reboot. One of the most useful
options for mainline software is the ability to reboot directly into USB
recovery mode, which e.g. allows the bootloader to be reflashed.

* tag 'tegra-for-3.16-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Support reboot modes

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 15:04:52 -07:00
Olof Johansson
072a4fd2b1 i.MX device tree changes for 3.16:
- New board support: imx35-pdk, imx51-digi-connectcore, imx6dl-phytec,
    imx6dl-riotboard, and vf610-colibri.
  - Improve device tree support for imx51-babbage and eukrea-cpuimx51 to
    get the same level support as board files, so that we can kill the
    board files.
  - Quite some updates on imx27-phytec-phycore board support from
    Alexander Shiyan
  - Enable USB, sound and touchscreen on the eukrea imx25/35/51 boards,
    from Denis Carikli
  - Quite a lot of patches from Fabio Estevam, updating Freescale
    imx25-pdk and imx27-pdk board support
  - Correct USB device configuration for imx25/35
  - Fixes i2c4 device node in imx6dl.dtsi regarding to compatible string
    and clock data
  - Enable HDMI, TVE, LVDS display support on a bunch of imx5/6 boards
  - Update PCIe to the new binding and enable PCIe support on
    imx6qdl-sabresd board
  - A couple of imx6q-dmo-edmqmx6 updates from Lucas Stach, adding pfuze
    irq gpio and SPI flash
  - Enable CODA7541 VPU for i.MX53
  - A series of updates on imx6qdl-phytec boards from Philipp Zabel
  - Small cleanups and fixes on board imx28-duckbill - Michael Heimpold
  - Add stdout-path property to i.MX boards
  - Karo TX25 board updates from Sascha Hauer
  - Enable pwm and sdhc devices for board vf610-twr
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQEcBAABAgAGBQJTdiiKAAoJEFBXWFqHsHzOdWgH/jeKXrwTFRjupfN7RIVProPv
 UUJbVqsAgL/Do5R+/ypgY6zDdHtqKJ0AYefI8TQGxLTYS1Ae29oqgH5IDhW0dLh6
 cB6VwA68vzqsQs42wrdh9ZPLuezPpapYmYMRCY8dbI9xhmGv8Ddo+XkNQ2euEdRa
 ZvN+UqqcDq80Fyo3aooWU4lzcAyiNdLSGxNvwDcnWN+yTX3DCk9SxK48cNuuyjMS
 fGbJz2ushPJtr8Ed7bZTjO3C4pl9DF3R3CLsZi3CeDIIfidTtQDD3Yu8GZ0jifii
 e70PoBIde1dTV19Rhlv39tm+bei7xn0Yc4YY1/ALYTbJqyeoaLAAZPdHOp6/DGs=
 =yYf5
 -----END PGP SIGNATURE-----

Merge tag 'imx-dt-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

Merge "ARM: imx: device tree changes for 3.16" from Shawn Guo:

i.MX device tree changes for 3.16:
 - New board support: imx35-pdk, imx51-digi-connectcore, imx6dl-phytec,
   imx6dl-riotboard, and vf610-colibri.
 - Improve device tree support for imx51-babbage and eukrea-cpuimx51 to
   get the same level support as board files, so that we can kill the
   board files.
 - Quite some updates on imx27-phytec-phycore board support from
   Alexander Shiyan
 - Enable USB, sound and touchscreen on the eukrea imx25/35/51 boards,
   from Denis Carikli
 - Quite a lot of patches from Fabio Estevam, updating Freescale
   imx25-pdk and imx27-pdk board support
 - Correct USB device configuration for imx25/35
 - Fixes i2c4 device node in imx6dl.dtsi regarding to compatible string
   and clock data
 - Enable HDMI, TVE, LVDS display support on a bunch of imx5/6 boards
 - Update PCIe to the new binding and enable PCIe support on
   imx6qdl-sabresd board
 - A couple of imx6q-dmo-edmqmx6 updates from Lucas Stach, adding pfuze
   irq gpio and SPI flash
 - Enable CODA7541 VPU for i.MX53
 - A series of updates on imx6qdl-phytec boards from Philipp Zabel
 - Small cleanups and fixes on board imx28-duckbill - Michael Heimpold
 - Add stdout-path property to i.MX boards
 - Karo TX25 board updates from Sascha Hauer
 - Enable pwm and sdhc devices for board vf610-twr

* tag 'imx-dt-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (105 commits)
  ARM: dts: imx35-pdk: Fix memory region description
  ARM: dts: imx51-eukrea-mbimxsd51-baseboard: Add CAN support
  ARM: dts: imx6: add new board RIoTboard
  ARM: dts: imx6: i2c4 cleanup
  ARM: dts: imx6: edmqmx6: add vcc and vio power supplies to stmpe
  ARM: dts: Karo TX25: use hardware ecc
  ARM: dts: Karo TX25: Add phy reset gpio and supply for FEC
  ARM: dts: Karo TX25: Add pinctrl nodes
  ARM: dts: i.MX25: Add IRAM node
  ARM: dts: i.MX25: Add mmc aliases
  ARM: dts: i.MX51 babbage: Fix FEC pad ctrl settings
  ARM: dts: imx6qdl-sabresd: Add USDHC4 support
  ARM: imx: add HDMI support for SolidRun HummingBoard and Cubox-i
  ARM: dts: imx6: edmqmx6: add SPI bus and flash
  ARM: dts: imx6: edmqmx6: add pinctrl for pfuze irq gpio
  ARM: dts: imx6q-udoo: Add HDMI support
  ARM: dts: Add stdout-path property to i.MX boards
  ARM: dts: imx: Fix LVDS mapping for Ventana GW52xx
  ARM: dts: imx: add LVDS backlight for Ventana
  ARM: dts: imx6qdl-sabresd: remove power-on gpio from pcie
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 14:59:21 -07:00
Olof Johansson
0b3534be65 i.MX SoC changes for 3.16:
- A few cleanups on mx21ads board file, which should make the later
    conversion to DT a little bit easier.
  - Add some missing clocks and drop unused clk lookups for i.MX1 and
    i.MX27 clock drivers
  - Add initial i.MX SoloX (imx6sx) SoC support
  - Remove mx51_babbage and mach-cpuimx51sd board files, as the
    equivalent DT support is ready for the boards
  - Clean up device tree timer initialization a little bit
  - Add missing i2c4 clock for i.MX6 DualLite/Solo
  - Add missing CKO clock i.MX25
  - Add shared gate clock support for i.MX specific clk_gate2
  - Add low-level debug support for SoC VF610
  - Some random code cleanups and defconfig updates
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQEcBAABAgAGBQJTdigBAAoJEFBXWFqHsHzOoRoIALGPcsJWrRak7raPhzxUB8u8
 pmx6LWLA6d9biFXBBgU4PTABKN26jXDoj13aAaT/WW5pj6ILd8BYuyH8yqrblatE
 Whkvak0+VUaY5vFWy5F2sex4Xi8nctumF6GmdcN7oUJTR0Cn6StpzhoWySQ7Yj91
 Wio5T5RN7Rz7/JgZsnMTKEmGzjovWN2R1J2qvBdSgmx5dL1uqBFZkWDPbkMOfKph
 BkHejE+wdKvzZNDZgTlwHve4zfIMMen9GDOBp/+LKDU5bz6883BoOLzO0mtIs1zp
 JGULjBQLCMYx+AXtlXI+KFQaLtrmLYyUR1I7x5kz6KMflXoCWpiioErfrHg9HUs=
 =oPiG
 -----END PGP SIGNATURE-----

Merge tag 'imx-soc-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc

Merge "ARM: imx: soc changes for 3.16" from Shawn Guo:

i.MX SoC changes for 3.16:
 - A few cleanups on mx21ads board file, which should make the later
   conversion to DT a little bit easier.
 - Add some missing clocks and drop unused clk lookups for i.MX1 and
   i.MX27 clock drivers
 - Add initial i.MX SoloX (imx6sx) SoC support
 - Remove mx51_babbage and mach-cpuimx51sd board files, as the
   equivalent DT support is ready for the boards
 - Clean up device tree timer initialization a little bit
 - Add missing i2c4 clock for i.MX6 DualLite/Solo
 - Add missing CKO clock i.MX25
 - Add shared gate clock support for i.MX specific clk_gate2
 - Add low-level debug support for SoC VF610
 - Some random code cleanups and defconfig updates

* tag 'imx-soc-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (33 commits)
  ARM: mx25: Add CLKO support
  ARM: i.MX1 clk: Remove clk_register_clkdev() for unused clocks
  ARM: i.MX1 clk: Add missing clocks
  ARM: imx: add basic imx6sx SoC support
  ARM: imx: add clock driver for imx6sx
  ARM: imx: add low-level debug support for imx6sx
  ARM: mx51: Remove mach-cpuimx51sd board file
  ARM: i.MX: Setup IRQ handler from IRQ driver
  ARM: i.MX27 pca100: remove deprecated IRQF_DISABLED
  ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
  ARM: i.MX: Fix eMMa PrP resource size
  ARM: imx_v4_v5_defconfig: drop CONFIG_COMMON_CLK_DEBUG option
  ARM: i.MX27 clk: Remove clk_register_clkdev() for unused clocks
  ARM: i.MX27 clk: Add missing clocks for MSHC and RTIC
  ARM: imx6q: add the missing esai_ahb clock
  ARM: imx: add shared gate clock support
  ARM: imx: lock is always valid for clk_gate2
  ARM: imx: define struct clk_gate2 on our own
  ARM: i.MX: Remove #ifdef CONFIG_OF
  ARM: imx_v6_v7_defconfig: enable option CONFIG_LOCALVERSION_AUTO
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 14:45:05 -07:00
Olof Johansson
ed99885ccb Merge branch 'sunxi/drivers-for-3.16' of https://github.com/mripard/linux into next/drivers
Merge "Allwinner drivers changes for 3.16" from Maxime Ripard:

Reset drivers for the A31, that have been merged with reset maintainer's
Acked-by.

* 'sunxi/drivers-for-3.16' of https://github.com/mripard/linux:
  reset: sunxi: allow MFD subdevices probe
  reset: sunxi: document sunxi's reset controllers bindings

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 14:42:56 -07:00
Linus Torvalds
4b660a7f5c Linux 3.15-rc6 2014-05-22 06:42:02 +09:00
Olof Johansson
6ad8f98d22 Allwinner defconfig additions for 3.16
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTdgS+AAoJEBx+YmzsjxAgBYIQAKdc5InJHL7JmRfZ8dopyCw6
 CmCuk4XvCTpel6onRJ5CI0fuMmSYENEK0NBDao1BapAP1X2Zw2WH7VaG6yEB/w83
 umh/pNHCZZ5F3ebjZiLEiOedE7S69pDOzfZlHvf8iQVwj5E+NF3nWdJg5OcbRurl
 wecwZ/xCp2fhzSaR464QVmKijVWizchARiFosQPgQtf5d5MRaeDcD1iN6jk3vBIm
 onLLY33MjsBK+Z96dlMAUwBUvaSkl+2CfcBq0SCaZVMJDOsvbefvx6Ridh30+a2W
 8k8YS1cK1Rvynz0rcZPU4Zyrhnpi/5eXXPjDLvguFO3a78Co1hr0ufpGWA9dtGpa
 OxbzKbBBGbKW92ZP0j+tsWT+793ZgAGwthmPpg8jE5j3/zwvxV9XGgmY6EraGCmW
 pwf2ebgh4Lh9tBCt/0D89b27SjB3sWbqTxBwQKt5tkB1JNUtuwv0hfcdV2/CQz7N
 MgH67ADj/Mpg5MACqJjmzFXshHtvQNAnqOzEC+pVsvJKIHJg25ow4b+aFe8l9sA3
 QEgJdGBkK4ENcp4L0INjU/qyWkVN0luAG5PfKMAvOsVWmaRgb8Bgv+4LGyDKGtLr
 HmQiJ9drsjMS651AagA6yd2KQN9cOUt2osAAqiw/bUYJmWwA8Ub4oX6BvAmzXCH4
 3KTrOT8DoZGEnG1ChS56
 =vrpT
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-defconfig-for-3.16' of https://github.com/mripard/linux into next/boards

Merge "Allwinner defconfig additions for 3.16" from Maxime Ripard.

* tag 'sunxi-defconfig-for-3.16' of https://github.com/mripard/linux:
  ARM: sunxi: drop CONFIG_COMMON_CLK_DEBUG

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 14:42:01 -07:00
Olof Johansson
a59a591104 Allwinner DT additions for 3.16
- Introduction of the MMC controlers
   - New board: A10s R7, Mele M9, APP4-EVB1
   - Enabled the PMU on the Cortex A7-based SoCs
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTdf7wAAoJEBx+YmzsjxAg0+gP/13p44oOdcr9NHt7hQgLWHwS
 pkCKvEA7z01WgFl2ZmAa8JADJT1blAC31jQMO/sEVxHjIpvPBpBHqzEYndBzy7/x
 1GjW4wUTYXaHLvJyOWN8nI2sGfooWv9zqcRJxOSYZ+njs89vsT5uzUSPv/wQb/zf
 Fi/daMdhQzlnWrrahoIEy5xWwRLjMmnFNIJXHdh5sU/GmXC9nvCqdFn2p0li7bwv
 d9+G4CVcM+aCOBgKqEberTAGlpmPzFO/N7+CMl03U4mbGYpxoSt1Ngo9hA5L3UGX
 9LF8ech9EIY5/W6dEayHPAUNbuRcVzqE4ANMMMTcYKxs5ttxi6ZPqCbyrW6Q5NIN
 ndHqN9+V1Ug8aJGbtyXC7lkFR0uk9aMmOw0dGhSvXhVwknnNAPJgk2kf9g52WJoW
 2c6pQ6R1N98Uh+7ltv3ws+Zsj0qf1xHQEPuQ2r9TY44z5N6na5w17EEnJunovE6J
 wzdam0I25PCbHkSybeQHqWIQRstDz1ONKs0i4f5U1Qo9r0oPgMy2haQQuRjD3U0y
 UrbwBqP0178ogLbb0Yu0fMG6UWqduEivh/p7B2+315Eznml+xG/603eeFdvxkB7C
 caSRz5KoNG4BUv56Y5++MeSVm0dQKSiNWW6W1OH4JPFH8bIu1TwOJV4sSKsOA+vg
 40UzstT5T05mf4jD2U9J
 =N37P
 -----END PGP SIGNATURE-----

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

Merge "Allwinner DT additions for 3.16" from Maxime Ripard:

  - Introduction of the MMC controlers
  - New board: A10s R7, Mele M9, APP4-EVB1
  - Enabled the PMU on the Cortex A7-based SoCs

* tag 'sunxi-dt-for-3.16' of https://github.com/mripard/linux: (38 commits)
  ARM: sunxi: dt: declare the r_pio pin controller for A31 SoC
  ARM: sunxi: dt: add PRCM clk and reset controller subdevices
  ARM: sunxi: dt: add APP4-EVB1 board support
  ARM: sun6i: dt: Add support for the USB controllers
  ARM: sun6i: Add the USB clocks to the DTSI
  ARM: dts: sun5i: Add new A10s r7 hdmi tv dongle board
  ARM: dts: sun7i: Add reg_vcc3v3 to sun7i board mmc nodes
  ARM: dts: sun6i: Add reg_vcc3v3 to sun6i board mmc nodes
  ARM: dts: sun5i: Add reg_vcc3v3 to sun5i board mmc nodes
  ARM: dts: sun4i: Add reg_vcc3v3 to sun4i board mmc nodes
  ARM: dts: sunxi: Add reg_vcc3v3 supply to sunxi-common-regulators.dtsi
  ARM: dts: sun7i: Add basic support for the Cubietruck WiFi module
  ARM: dts: sun7i: Enable mmc controller on various A20 boards
  ARM: dts: sun7i: Add pin-muxing info for the mmc controllers
  ARM: dts: sun7i: Add mmc controller nodes
  ARM: dts: sun6i: Add new sun6i-a31-m9 dts file for Mele M9
  ARM: dts: sun6i: Add mmc controller nodes
  ARM: dts: sun6i: Add mmc clocks
  ARM: dts: sun5i: Enable mmc controller on various A10s and A13 boards
  ARM: dts: sun5i: Add mmc controller nodes
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 14:36:06 -07:00
Olof Johansson
16ae66cc33 Allwinner SoCs core additions for 3.16
Refactor the Kconfig options to have one Kconfig option per machine.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTdehEAAoJEBx+YmzsjxAgp4gQAKblJMMaz7vEN/H/FO3Jn/dI
 7uAMuTWL/m2RDOIE/oOuxipRg0dvoL+lEOR4BiuPiSjRKHO5Lzw+OWvh18xfPXZg
 sfoIoutDa5a8DuBpQMTmgbr/8BMDV5jlJOG8VLE8I3l4gtU1buZM9uxJWLzfv7vs
 s/rhPBW5O+vmQ/wdD7CKyxPo57Cz5Y0fbgv7tE91zbKidN9bp8YEFT2UFwtoh/Xh
 0YtLTDduz38wzpfMco17hDVK6lNg1Y10kb6k8dos2QOrsUDFTx6lDBeMPI5NqsXI
 hEjGRWmGm3tqF4LfaDkYyYXkmnhCdEonKN9r7YzavtbI6xpKtBmKB60acqVMusL7
 i4zirrl6F42y84troeZafdPbEWS/NmT9k2oSCZZnEoRtpd9w/G7XaCaAY8saQwVT
 Lw4AaxoY5TlpWELV8t6deN2D0dVRwcxobvaOmJMAZ6g480hEnQ5z84U6Vqrs/rkc
 szbmAx0UxJEr87IXORDKCLIud6OORPM/ccRzgiGNf76fKxwPcCYwjL/PaDcKHSJf
 BAHL2IAN1oSpj+CrfXKN13RHIMK6VZ9W/dUqsqD0YnU3iNI7njAW3JONM85fwgQS
 bniSLMFC/G4GvIq3D2GPQ8yx5pVlyZ49gU0tlvTV98yCxp1WNMv1xndt22Z9I6Mw
 +AgfQZ6ef1sFQgVQ8wBq
 =so0P
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-core-for-3.16' of https://github.com/mripard/linux into next/soc

Merge "Allwinner SoCs core additions for 3.16" from Maxime Ripard:

Refactor the Kconfig options to have one Kconfig option per machine.

* tag 'sunxi-core-for-3.16' of https://github.com/mripard/linux:
  ARM: sunxi: select MFD_SUN6I_PRCM when sun6i arch support is enabled
  ARM: sunxi: Split the various SoCs support in Kconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 14:35:04 -07:00
Olof Johansson
0db6542dd4 Renesas ARM Based r7s72100 SoC CCF Updates for v3.16
r7s72100 (RZ/A1H) SoC and its Genmai board
 * Add and use CCF support
 * Initislise SCIF, I2C and SPI via DT
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTdWCgAAoJENfPZGlqN0++KwYQALL3hcVIZghBDNjOct7w7HFp
 a6FAf6NVzlRkydB5Isn3OW0P8ivnhVKX6TcCzPDncXb9rh8hMwpeQHQO6gXajFwc
 Fb7AbDnchqH9Vqx7MFyPW/DkUcm/LYMIsMobDnBEIbK77971Sha5efqVDmB0ymuy
 b8C3AzQ9QXPzuzII04lDdjLv9n76NnB17/+ixrE6VYlPjqHiIOHKBiyPozEeNbPz
 okWmR01dHkf1gQfYj46HsdGbTgHRQ1RDjRXJnmBWeD61y53xvgb4PCUxbzgkDR1x
 T06LTuYX7GTBuPT8Nok+NM3Nbw5dEpCzX5HkW5KKgmHd2zfD73FN5WE6xAwwtSRX
 dzaKOfqonSsqCm1ZGcgHAMCbB4lfi4j8rgdDgvZ71qalDDes3W99pobXu2xYAG+v
 9tvW4IPMsJFYYReULjNCFYawfrlUwHKK6LCS8zLaBgvkAH9Smdy2f2FlDYsnk7xE
 j10SrUbhkds+moGqn/GX2PdWr45xvNvK3EqTN7TUsSaeO0i0kbDYggNzUhzs4QJ4
 f3QKTldxv+1yE8+mQXCd4etDIIG6ItSKI2739+C+tTeJ4sJ5B/WJJ/5B67nLDMZI
 pkZ9jmOWLluqCcgzybbxxlScc5EiAQ0iT/Dx764qs1RU5x0XIhgPR9q7hC4LcNjS
 AKvRT6W4D98mnwUMy0nH
 =Y38+
 -----END PGP SIGNATURE-----

Merge tag 'renesas-r7s72100-ccf-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Renesas ARM Based r7s72100 SoC CCF Updates for v3.16" from Simon Horman:

r7s72100 (RZ/A1H) SoC and its Genmai board
* Add and use CCF support
* Initislise SCIF, I2C and SPI via DT

* tag 'renesas-r7s72100-ccf-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r7s72100: use workaround for non DT-clocks
  ARM: shmobile: Add forward declaration of struct clk to silence warning
  ARM: shmobile: r7s72100: remove SPI DT clocks from legacy clock support
  ARM: shmobile: r7s72100: add spi clocks to dtsi
  ARM: shmobile: r7s72100: remove I2C DT clocks from legacy clock support
  ARM: shmobile: r7s72100: add i2c clocks to dtsi
  ARM: shmobile: r7s72100: genmai: platform scif devices only for legacy support
  ARM: shmobile: r7s72100: genmai: add uart alias and activate scif2 as console
  ARM: shmobile: r7s72100: add scif nodes to dtsi
  ARM: shmobile: r7s72100: genmai: populate nodes for external clocks
  ARM: shmobile: r7s72100: add essential clock nodes to dtsi
  ARM: shmobile: r7s72100: document MSTP clock support

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 14:30:46 -07:00
Olof Johansson
bcafdb4fe8 Renesas ARM Based SoC dt-scif Updates for v3.16
r8a7791 (R-Car M2) based Koelsch board and
 r8a7790 (R-Car H1) based Lager board
 * Enable SCIF0 and SCIF1 serial ports in DT
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTdWHAAAoJENfPZGlqN0++CooP/R0lSwmJr0qRN6IarjTPnPNh
 R3yuLn2owGvtgF5N6tdsUeo9VrTWsS38QaW3F0Adn1xSF/ub+KwIpmpkelaqhYO/
 UZIa6q0hT9Jwj0n06lrn8esf+1fkLNQYqg3YHmJwq29EK+Hf1O3UYG+B4gOPvII7
 EkYRhALTZW4MO5iW5Ys5Vv9Ohs128PCsbxH+mP9RWVU2BzI12NUcQrnfk9GLvyoZ
 Y9JWddB/MQTPiWKs5DOlhr3PnZAbujJIKpt2jFJrfqgIARFGYpIFfoIk96eQPsvL
 LVPxrs2n7Y/HUTW1RCF2pOI+F/j1dJ+wggG2/tbn1zzNGjq/kYMeF5sOVXhDoCMQ
 JLDtJokp5WU3ttszuFnCOPVPILZQJLOh5rsZT81uncZdr91IuRHIHg6S6l4Yn4qI
 vH5BCm+j//WM/0Lp5Pa2OQQG1q0aALsstxiNxE7ZyYBMp81YuHJ6AKHf8k8ZbatG
 Cusb4WwWjV7ST+YElV/bUs2dz0daGEOSMexG72XqEnMza6ZnL2rdj0Gg4QtWuTw0
 FTFKsLBUalG8NzQtkNJ+g2GBZjlT03quaTJ+JMS+3r9EDWGMM/6o1yaeY5WKXWBw
 kTX6bnS/RLfBs0FSdhB3S2YpPB71wzM/kOTSdVRulbctE9ZJjRUMvENycPzWZfH8
 MSTGMpCjive8HsKcGdRb
 =gSwR
 -----END PGP SIGNATURE-----

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

Merge "Renesas ARM Based SoC dt-scif Updates for v3.16" from Simon Horman:

r8a7791 (R-Car M2) based Koelsch board and
r8a7790 (R-Car H1) based Lager board
* Enable SCIF0 and SCIF1 serial ports in DT

* tag 'renesas-dt-scif-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT
  ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 14:26:44 -07:00
Olof Johansson
486ad2ede1 ARM Versatile Express updates for 3.16
This series reworks VE's platform configuration infrastructure by:
 
 - making it possible to instantiate selected devices from the
   Device Tree, prior to massive population,
 - converting custom "func" API into standard "regmap",
 - splitting the existing MFD driver into smaller ones and placing
   them into relevant directories.
 
 The common clock framework driver can now be selected individually
 (mostly for arm64 sake, where some of them are not used at all).
 
 It also simplifies the machine code, by:
 
 - moving the shed clock info clocksource driver,
 - simplifying SMP operations to base them entirely of the DT data,
 - moving platform ID checks into relevant driver.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJTdPALAAoJEL9jRaJfXa5PkwIH/1x/yvJ+LBCTP7Dx5a8X0ZBJ
 PIVxj2ynUbdFBWywMOuEh3YIPC6xrKFGVB2+u6ZnBiPTBgS1UVc3OoLb5HbKiq2I
 IgnTv/etcuDrn5gVXPnmUJNVXNbDCspyT6YTaO8xZm81MTOB+QwJHh0wbaY9BXHO
 qnpPpIowfb53X1DiZ4Uo5sXpcJdXih2C+pJ8AQLIDLdGGiIg9loa1s2fJkChyPi3
 4xmx8JtcRXEeiWPtxb5fQ2mT0tTRMFUMqH7LSKTSTKsLBaMmFQq6H/W/Wc7auTQC
 ZGZuZpChJFkrH20mc6RqUu3XObZaeD9O9hzP0V8RlnJI3gVN81OT0DOcKQjMiNI=
 =3R6A
 -----END PGP SIGNATURE-----

Merge tag 'vexpress/updates-for-3.16' of git://git.linaro.org/people/pawel.moll/linux into next/cleanup

Merge "ARM Versatile Express updates for 3.16" from Pawel Moll:

This series reworks VE's platform configuration infrastructure by:

- making it possible to instantiate selected devices from the
  Device Tree, prior to massive population,
- converting custom "func" API into standard "regmap",
- splitting the existing MFD driver into smaller ones and placing
  them into relevant directories.

The common clock framework driver can now be selected individually
(mostly for arm64 sake, where some of them are not used at all).

It also simplifies the machine code, by:

- moving the shed clock info clocksource driver,
- simplifying SMP operations to base them entirely of the DT data,
- moving platform ID checks into relevant driver.

* tag 'vexpress/updates-for-3.16' of git://git.linaro.org/people/pawel.moll/linux:
  ARM: vexpress: move HBI check to sysreg driver
  ARM: vexpress: Simplify SMP operations for DT-powered system
  ARM: vexpress: remove redundant vexpress_dt_cpus_num to get cpu count
  clocksource: Sched clock source for Versatile Express
  clk: versatile: Split config options for sp810 and vexpress_osc
  mfd: vexpress: Define the device as MFD cells
  mfd: syscon: Add platform data with a regmap config name
  mfd: vexpress: Convert custom func API to regmap
  of: Keep track of populated platform devices
  + Linux 3.15-rc5

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 14:23:56 -07:00
Eric Dumazet
4de462ab63 ipv6: gro: fix CHECKSUM_COMPLETE support
When GRE support was added in linux-3.14, CHECKSUM_COMPLETE handling
broke on GRE+IPv6 because we did not update/use the appropriate csum :

GRO layer is supposed to use/update NAPI_GRO_CB(skb)->csum instead of
skb->csum

Tested using a GRE tunnel and IPv6 traffic. GRO aggregation now happens
at the first level (ethernet device) instead of being done in gre
tunnel. Native IPv6+TCP is still properly aggregated.

Fixes: bf5a755f5e ("net-gre-gro: Add GRE support to the GRO stack")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Jerry Chu <hkchu@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-21 17:18:47 -04:00
Olof Johansson
82711e7b46 Renesas SoC Clock Cleanups for v3.16
Work from Laurent Pinchart to switch all Renesas platforms to the new style
 CMT, MTU2 and TMU device platform data. This is in preparation for
 initialising these devices using DT on ARM Based Renesas SoCs.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTcdAFAAoJENfPZGlqN0++JFEP/3l31Q8CEWp0e6mNoUWzNmqS
 dhwuB6mEXs3n5WkDNrN/3O4sKwDp5dPvjrNOqn2Tc1nb/Bb+wsZr4G8oGdOI/XMS
 BY5mCQ66tpqrFUyoWpOH1oHdh6gvqX4ULyNgkEAQR8XAI125NYTydHvoAhQghJEy
 bmdhgtFUcJyjIJ2doku0uWlpoKEihrOZ/5GUwBkNw30wBs2bp9jvp+jOosvtypuA
 UrA7Xi0Mtm0hhyGIOawbeiP+yvzLOu7ORDa+e8F5fKZ0rituPmKyDWcDIkYh6aNp
 WCoo4B6qOFtRILNGxcbnq9jDSpHoMUFGmWaoohcnVhQ+zxwvEyW7NkMCd0mH/7/u
 EPUn9svnXY6cXzq+WfBNRazK6AwQuCc4NTU7j0iy19ZOIlFltpz+9HpuZ1uxDYzA
 g+gmfJ887khBahIXluWHrGibf4td7dCdfsrUZtNamHqonlDCiINa+b7a/qovdbhJ
 u1jK4pDQlDLqhAoAXvWaV8zzwuXelQpZl3smTA7/Id5jEncbdzjQRR21klskXPSK
 5PZV8EbCkFDS0keOfIF4+do0p36kLj3N/7tC6d7z17BnieE3GuQ9gFb8MjOKLJq2
 biRpJ5/ruxIAjY/bngpwse+arC29Rt/9jH9bJ35lrRnAfSQQqCInOBc1EhY7go6y
 iVpI+VhLrLsxC/3d+r/M
 =6i4y
 -----END PGP SIGNATURE-----

Merge tag 'renesas-clock-cleanup2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Renesas SoC Clock Cleanups for v3.16" from Simon Horman:

Work from Laurent Pinchart to switch all Renesas platforms to the new style
CMT, MTU2 and TMU device platform data. This is in preparation for
initialising these devices using DT on ARM Based Renesas SoCs.

* tag 'renesas-clock-cleanup2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r7s72100: Switch to new style MTU2 device
  sh: Switch to new style MTU2 device
  ARM: shmobile: r8a7779: Switch to new style TMU device
  ARM: shmobile: r8a7778: Switch to new style TMU device
  ARM: shmobile: r8a7740: Switch to new style TMU device
  ARM: shmobile: sh73a0: Switch to new style TMU device
  ARM: shmobile: sh7372: Switch to new style TMU device
  sh: Switch to new style TMU device
  ARM: shmobile: r8a7791: Switch to new style CMT device
  ARM: shmobile: r8a7790: Switch to new style CMT device
  ARM: shmobile: r8a7740: Switch to new style CMT device
  ARM: shmobile: r8a73a4: Switch to new style CMT device
  ARM: shmobile: sh73a0: Switch to new style CMT device
  ARM: shmobile: sh7372: Switch to new style CMT device
  sh: Switch to new style CMT device

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 14:05:58 -07:00
Olof Johansson
91f0f06ccb Merge branch 'depends/clockevents-cleanups' into next/boards
Bringing in as an external dependency that the renesas/clock-cleanup2 branch
relies on.

* depends/clockevents-cleanups: (52 commits)
  clocksource: sh_mtu2: Sort headers alphabetically
  clocksource: sh_mtu2: Remove FSF mail address from GPL notice
  clocksource: sh_mtu2: Rename clock to "fck" in the non-legacy case
  clocksource: sh_mtu2: Add support for multiple channels per device
  clocksource: sh_mtu2: Hardcode MTU2 clock event rating to 200
  clocksource: sh_mtu2: Set cpumask to cpu_possible_mask
  clocksource: sh_mtu2: Replace hardcoded register values with macros
  clocksource: sh_mtu2: Allocate channels dynamically
  clocksource: sh_mtu2: Replace kmalloc + memset with kzalloc
  clocksource: sh_mtu2: Add index to struct sh_mtu2_channel
  clocksource: sh_mtu2: Add memory base to sh_mtu2_channel structure
  clocksource: sh_mtu2: Constify name argument to sh_mtu2_register()
  clocksource: sh_mtu2: Split channel setup to separate function
  clocksource: sh_mtu2: Rename struct sh_mtu2_priv to sh_mtu2_device
  clocksource: sh_mtu2: Split channel fields from sh_mtu2_priv
  clocksource: sh_mtu2: Turn sh_mtu2_priv fields into local variables
  clocksource: sh_mtu2: Use request_irq() instead of setup_irq()
  clocksource: sh_tmu: Sort headers alphabetically
  clocksource: sh_tmu: Remove FSF mail address from GPL notice
  clocksource: sh_tmu: Rename clock to "fck" in the non-legacy case
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 14:05:27 -07:00
Xuelin Shi
c1f43dd9c2 dmaengine: fix dmaengine_unmap failure
The count which is used to get_unmap_data maybe not the same as the
count computed in dmaengine_unmap which causes to free data in a
wrong pool.

This patch fixes this issue by keeping the map count with unmap_data
structure and use this count to get the pool.

Cc: <stable@vger.kernel.org>
Signed-off-by: Xuelin Shi <xuelin.shi@freescale.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
2014-05-21 14:02:37 -07:00