Commit graph

506,942 commits

Author SHA1 Message Date
Peter De Schrijver
a9952a76bc clk: tegra: Fix vic03 mux index
The vic03 mux uses a linear mapping.

Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
2014-02-20 10:45:28 +02:00
Mark Brown
63a5d4c6a7 ALSA: Export snd_pcm_constraint_mask64()
Allow modules to use it, fixing a build failure when the newly added
ADAU1977 driver is built as a module.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Takashi Iwai <tiwai@suse.de>
2014-02-20 17:42:59 +09:00
Olof Johansson
58035fcc94 Renesas ARM Based SoC Updates for v3.15
* r7s72100 SoC (RZ/A1H)
   - Add i2c clocks (portion missing from previous patch due to miss-merge)
 
 * r8a7791 (R-Car M2)
   - Add SATA clocks
   - Add ZS clock
   - Wait for status on all MSTP clocks
  -- Add I2C and VIN clocks
 
 * r8a7790 (R-Car H2)
   - Add PCI USB host clock support
   - Add Audio DMAC, SATA and VIN clocks
   - Add Audio DMAC support
 
 * r8a7779 (R-Car H1)
   - Wait for status on selected MSTP clocks
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJS8yO9AAoJENfPZGlqN0++nzMP/RR48DSawwNaFusAjNbeAZz1
 OxmcXefuy1WOBgH0yW94VYsC2aulssNq9LXciGGE/uTjbXth7cV65tyHbfp73BCr
 xMeFhmWbRtUZ17uq1QEckevQjEy/KAtADzXSY2bbIjIBXtBRCW2L8aTAVbNYYXZl
 Etltuta+BZggwlCQjZ3Z/lct25rB5aZMQWTRtp2rHSh+EayYgxMgY4AXw5gByEE6
 xWQO+9uKKaLisE0clzDTZ3gFahJsaBVtyvDKq4olYZGtFrnqOilb22JTs6g0+W3+
 iiAPHeeonAI5RP5Vyw35vaFJyVZ85Qoa49zBqQPvkrs1LXC+FPGLpFnHn4aTDK15
 nxGnmilVMhgI3yhrSGBj6qne584dctP103uVhe1CBULWx0T3fcWOK4FZPqLAJyty
 fr35u2QIAn1LRXPsqx+vzRle7iwS7oYwrjw9kvBRj0XRMd/XVabb/Po094VeQ7rZ
 rO+64ssESC1eb6qxyQJIPIRQO8qANeV0pc3XBV+5fVhI+rSBaUonH0OYNd3fXxMb
 V+EFpNkDOX7f7lIzpOxZmYTmCQ3K1ESzbhjP3zkUZqy2YRqWdz64uDTgk0zHvBh2
 ijKoohb+FlG8YKeZQU1nRiID3X4dZLTeXurBu4/xFVAh95JC3OWNrmeueip3yxJv
 uYWnHcvZIV3J3/gvc5Ly
 =T5hu
 -----END PGP SIGNATURE-----

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

Merge "Renesas ARM Based SoC Updates for v3.15" from Simon Horman:

* r7s72100 SoC (RZ/A1H)
  - Add i2c clocks (portion missing from previous patch due to miss-merge)

* r8a7791 (R-Car M2)
  - Add SATA clocks
  - Add ZS clock
  - Wait for status on all MSTP clocks
 -- Add I2C and VIN clocks

* r8a7790 (R-Car H2)
  - Add PCI USB host clock support
  - Add Audio DMAC, SATA and VIN clocks
  - Add Audio DMAC support

* r8a7779 (R-Car H1)
  - Wait for status on selected MSTP clocks

* tag 'renesas-soc-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7790: Add PCI USB host clock support
  ARM: shmobile: r7s72100: really add i2c clocks
  ARM: shmobile: r8a7791: Add SATA clocks
  ARM: shmobile: r8a7791: Add ZS clock
  ARM: shmobile: r8a7790: Add SATA clocks
  ARM: shmobile: r8a7790: Add VIN clock support
  ARM: shmobile: r8a7790: add Audio DMAC support
  ARM: shmobile: r8a7790: add Audio DMAC clock
  ARM: shmobile: r8a7791: Wait for status on all MSTP clocks
  ARM: shmobile: r8a7791: Add VIN clocks
  ARM: shmobile: r8a7791: Add I2C clocks
  ARM: shmobile: r8a7790: Wait for status on all MSTP clocks
  ARM: shmobile: r8a7779: Wait for status on selected MSTP clocks
  ARM: shmobile: wait for MSTP clock status to toggle, when enabling it
2014-02-20 00:34:58 -08:00
Olof Johansson
6b43a28472 Renesas ARM Based SoC DT Updates for v3.15
* r8a7791 (R-Car M2) based Koelsch board
   - Enable GPIO Keys, (1+1)GiB memory, SATA0 and serial ports
   - Add VIN and thermal clocks
   - Remove r8a7791-koelsch-reference.dts
 
 * r8a7790 (R-Car H2) based Lager board
   - Replace IRQ type numerical values with macros
   - Enable SATA0 and serial ports
   - Add VIN and thermal clocks
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJS8yJIAAoJENfPZGlqN0++L5oP/is2wD+iOWk/x0vXU0Mfzx/q
 WMOhn3h/cHagojfRJp9T+mkLkXEXmUVxHgo7vI44/1V1Ytxp7GFSTvDmHdPrsR5d
 Dss/3zjxrpjRPSgEIq1dk/W1UoTTwKRlaJ425Nl0odi+C2qA60iwNKQrQp2Zu0kK
 DnpHmbVm8qaG3I0HhdK851RLml4etakjQ+5zgyyrDH+++93LtZ1tLNaw4ZnFYPP4
 J+OZczBeXfBjotK0r1nUVoF7qrtBDoK47QbBmT1Hto/0xdlnal0O7wskuiD9ZlM3
 u7ZF6xvfP3fu1/urdRPV24QykaF//go6yv7pX99/PXmksnl+mK9h/gUDGZysygW4
 UZQQukuApGrmEq1DItm+Zny2KbatOOYr5Xzss20W/sqlO9KGF248UyseVEs3kMZa
 on6te/S78rZARPYDabusGJaPMRbKwx3LzXz81wJamv6u0MKre75maBwxIEqMTX9b
 V52Z158+xsxibOggkLC4hDjOLrlG+ts8cbsO8CLuLZ7EuA9ICncSZXC5CFp2KDH+
 MMUzQUj7/63irITIqvOolS0B3HrB08tINBe7N0Tjb99Am5CQ4Pe2ZJfBOZxzN01w
 tsAtp7qMh9VcTY0dzRdZxqCpkBOtIhBRTWlGahVZdE0uR1o3M1s78AhPffwTdym/
 E0YPt+A2T/edD0lXH9+7
 =GRoY
 -----END PGP SIGNATURE-----

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

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

* r8a7791 (R-Car M2) based Koelsch board
  - Enable GPIO Keys, (1+1)GiB memory, SATA0 and serial ports
  - Add VIN and thermal clocks
  - Remove r8a7791-koelsch-reference.dts

* r8a7790 (R-Car H2) based Lager board
  - Replace IRQ type numerical values with macros
  - Enable SATA0 and serial ports
  - Add VIN and thermal clocks

* tag 'renesas-dt-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7790: Replace IRQ type numerical values with macros
  ARM: shmobile: r8a7790: Fix serial ports DT compatible strings
  ARM: shmobile: lager: Enable SATA1 in r8a7790-lager.dts
  ARM: shmobile: r8a7790: Add SATA nodes to r8a7790.dtsi
  ARM: shmobile: koelsch: Enable SATA0 in r8a7791-koelsch.dts
  ARM: shmobile: r8a7791: Add SATA nodes to r8a7791.dtsi
  ARM: shmobile: r8a7791: Add SATA clocks to device tree
  ARM: shmobile: r8a7790: Add SATA clocks to device tree
  ARM: shmobile: r8a7791: Add VIN clocks to device tree
  ARM: shmobile: r8a7790: Add VIN clocks to device tree
  ARM: shmobile: r8a7790: Add serial ports to the device tree
  ARM: shmobile: r8a7791: Add serial ports to the device tree
  ARM: shmobile: r8a7790: Add thermal clock in device tree
  ARM: shmobile: r8a7791: Add thermal clock in device tree
  ARM: shmobile: koelsch: (1+1)GiB memory in DT
  ARM: shmobile: Add GPIO keys to Koelsch DTS
  ARM: shmobile: dts: Remove r8a7791-koelsch-reference.dts

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-02-20 00:27:25 -08:00
Olof Johansson
22a74909b1 Renesas ARM based SoC Defconfig Updates for v3.15
* Renesas ARM based SoC boards (Global)
   enable CONFIG_DEVTMPFS in defconfig
 
 * r8a7791 SoC (R-Car M2) based Koelsch board
   - Enable SATA
 
 * r8a7790 SoC (R-Car H2) based Lager board
   - Enable SATA, VIN and ADV7180 decoder in defconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJS8ujBAAoJENfPZGlqN0++hhMP/2jgh424foj3NRlTmTypabBK
 lsqGxx2xsgOCc0RH3/kQVMgxiLNseSkIyWBaALKGCZWRxp5CNI8pFYoJbzE6hKCi
 PRdKwGZnArQ3m2DqtCoD+1kJK8F/WLl88zXvPH4dM1l7QdI87lWaa7NjraROXPkJ
 OuPBZckLHyPny/uahYbTrB+geHUFJZJAayrzL8/bRUhMggPegi+D9V6TsLCYQrvS
 zbnAxogf2+IUOxqqUm6DNGwjUEgxO4QhqhnaFAfwNKZDi74PCv1eIUMPYsrch6QP
 /JDH8QQrIKqm1jvwDm4Ma7OWrqCUURRxrRtzncrAUnyPNnB07y4IqGeCRrnoYFYj
 ooQI5tYrkF5g0JZm8dbn609B+3Cmg9aqvZFhKL+nenGv1loHFVxSBxE9eVVX4Hwv
 zjmHf8Zi1FH72LEEiDas1l+ojcDHs7IR33vJKnFUyAQPLi+mOGmPZgbiTF5whRTj
 RfIsM4PWeLa2NPohfTJ0tOIo7+UwiBya5V7foPb1da2vSYIGU4yE9LbMWLRyiwTx
 vwF3DmBwdTqGbv8LTw6ZM83arhobnNoY2mmN0pBZkOCXNgBbgvvihBKwzQ6k9rQB
 9iX3vlLu2PlgVq24PKrKngQYwU2UjjaHUAWgNFRsIqsYfEdc1OJcJx5vk+fLGDrk
 3iswYHduMBzNyr5SmLuj
 =8swW
 -----END PGP SIGNATURE-----

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

Merge "Renesas ARM based SoC Defconfig Updates for v3.15" from Simon Horman:

* Renesas ARM based SoC boards (Global)
  enable CONFIG_DEVTMPFS in defconfig

* r8a7791 SoC (R-Car M2) based Koelsch board
  - Enable SATA

* r8a7790 SoC (R-Car H2) based Lager board
  - Enable SATA, VIN and ADV7180 decoder in defconfig

* tag 'renesas-defconfig-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: ape6evm: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: armadillo: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: bockw: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: genmai: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: kzm9d: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: kzm9g: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: lager: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: mackerel: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: marzen: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: lager: Enable SATA in defconfig
  ARM: shmobile: koelsch: Enable DEVTMPFS_MOUNT in defconfig
  ARM: shmobile: koelsch: Enable SATA in defconfig
  ARM: shmobile: lager: Enable VIN along with ADV7180 decoder in defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-02-20 00:25:23 -08:00
Olof Johansson
4a179c1f37 Renesas ARM Based SoC Clean-Ups for v3.15
* Renesas SoCs (Global)
   - Remove duplicate shmobile_invalidate_start() declaration
 
 * emev2 SoC (Emma Mobile)
   - Use __initconst for const init definition
 
 * r8a7779 SoC (R-Car H1)
   - Remove unused clock constants
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJS8udfAAoJENfPZGlqN0++3ZMP/2Xze31UmbIru0c2DwoRdV6W
 E8ljKy3/02JDOJktaq4Xskcn6Sog/PXSTsVHiz+c+gNzZkbQqn6KOmkmG+tCI4KC
 Rqn6D/rWneXr5pNWTFD+UEySZDS6+zsZOwD6p/2a1zMYDm9WBunG3vX2qvkwDDFy
 G1peyQY6KP+wDvsvpiA32xwW395tnqoJmEM4QscRjRth+e+3z2N/P0aTH05ik/MT
 5WGzjUyUJVa6LMm4ySmkRCnpUwwgemaJ+8iIVrGGxAGSdio0/IPObmi/Z9HLd97F
 N2+qN9G0Ei8qSaD9Mw2vl+P4JSuF0z2h4PciM9S68lqFA2awpZHPtMKEeai7dzi5
 aNSsTwp6a5lDcbw0R0+49buP5zCWiP7jeQ10DzrEOHiUvxEBV54AJ2kOJzklLCPb
 miUrEGLidnbdBC96E0Vt7hWO/cdTzGF81HnEut3iU24B0PeCxUMVKJE+DEgiF05X
 8TZkjbMPKk4ZKmZKHUt6g7c8Eq8wmvnuDySBw7Y1Zw7PVEGc2C1cxQVTwQvMKsGe
 VTh2l/R8d7vakIzcI5FrK/wAL0samme119iH+D50HojtByLkIz1qHX7agz5xrRG1
 JkowQ0hVOHk09pDytmLvBYHf/dONH20ZIsZoJUIDIS1af3a2InAvXUFqz6sRX+9x
 c4zwGUOXWfiAaXnBD8W+
 =qfHb
 -----END PGP SIGNATURE-----

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

Merge "Renesas ARM Based SoC Clean-Ups for v3.15" from Simon Horman:

* Renesas SoCs (Global)
  - Remove duplicate shmobile_invalidate_start() declaration

* emev2 SoC (Emma Mobile)
  - Use __initconst for const init definition

* r8a7779 SoC (R-Car H1)
  - Remove unused clock constants

* tag 'renesas-cleanup-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: emev2: Use __initconst for const init definition
  ARM: shmobile: r8a7779: Remove unused clock constants
  ARM: shmobile: Remove duplicate shmobile_invalidate_start() declaration

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-02-20 00:23:41 -08:00
Olof Johansson
65b108ecde Renesas ARM based SoC Board Updates for v3.15
* r8a7791 (R-Car M2) based Koelsch board
   - Fix error return code check from clk_get()
   - Add SATA0 support
   - Conditionally select MICREL_PHY for Multiplatform
 
 * r8a7790 (R-Car H2) based Lager board
   - Add USBHS support
   - Fix error return code check from clk_get()
   - Add SATA support
   - Make spi_flash_data const
   - Add VIN1 SoC camera support
   - Conditionally select CONFIG_MICREL_PHY
 
 * r8a7778 (R-Car M1) based Bock-W board
   - Add USB Func DMAEngine support
   - Use HPBIF DMAEngine for sound
   - Use SSI DMAEngine for sound
 
 * emev2 (Emma Mobile EV2) based kzm9d board
   - Use common clock framework
 
 * r8a773a0 (SH-Mobile AG5) based kzm9g board
   - Add zboot support
 
 * Many boards
   - Conditionally select SMSC_PHY
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJS8yASAAoJENfPZGlqN0++f1oQAK/Kw1GLxU6hKGDU57X2UgfR
 gx1HZm4vQFzBKF1d+Trpc/GRzWzMUbLvoA70GWfs7aoYrT0ZZaOHrOD5mWiet1Dh
 2Mcrvja60yC5BP5mvmXsxWB0UK6TgNqlwI+6zoqFNE5yjY3a1FG3Upi6ARvhp2Td
 FnLInNvASiTGOmpY7RU8224L78u10VFiWOkektKmjIK2BWCBQ04oM4Y26Jg7Nedg
 Eu0KfIHAC/UFHjV4vb0/RRRBQC4nm4xgRr7ihIp347aFTTkzemhC5+PN4ebNMNIq
 u0ISWg89GcESXM126ft+7fLmzn8zM5V/FJkkKY01vpsGrSUJj7OQUDU8huhnaEav
 f2qYyxzcYzqLIekKIqBCqzqWJDH4AxQJTyK3L3sLzt1hWT4nWcVwlpiRUZ21X+H3
 OLB9AsscFdkeLy4eTE2pgvAAxarj62e2ggcWG3DuoLap8sVW25a6+mN5IJqUxtGp
 Qyi6MqWuVBNMYDrZKgmy5HmoWItCvO03mwBSJOR8lPjz0FloAovEculzbtEWLVll
 LKwj3bM9wYBHa34f2CP01k24v4S+9zavV+mJK+6lOl/VJyay4Tk1p12oNhCNqzA9
 0/0RS5ejaP2EvbKSp+pfsX30c2A+tuFps+ShEea1fBRbdcmIdT0M4+ELiLkwcZFp
 P5q453rEqQQj5HBplAXg
 =/cww
 -----END PGP SIGNATURE-----

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

Merge "Renesas ARM based SoC Board Updates for v3.15" from Simon Horman:

* r8a7791 (R-Car M2) based Koelsch board
  - Fix error return code check from clk_get()
  - Add SATA0 support
  - Conditionally select MICREL_PHY for Multiplatform

* r8a7790 (R-Car H2) based Lager board
  - Add USBHS support
  - Fix error return code check from clk_get()
  - Add SATA support
  - Make spi_flash_data const
  - Add VIN1 SoC camera support
  - Conditionally select CONFIG_MICREL_PHY

* r8a7778 (R-Car M1) based Bock-W board
  - Add USB Func DMAEngine support
  - Use HPBIF DMAEngine for sound
  - Use SSI DMAEngine for sound

* emev2 (Emma Mobile EV2) based kzm9d board
  - Use common clock framework

* r8a773a0 (SH-Mobile AG5) based kzm9g board
  - Add zboot support

* Many boards
  - Conditionally select SMSC_PHY

* tag 'renesas-boards-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (21 commits)
  ARM: shmobile: Remove Lager USBHS UDC ifdefs
  ARM: shmobile: lager: Add USBHS support
  ARM: shmobile: koelsch: fix error return code check from clk_get()
  ARM: shmobile: lager: fix error return code check from clk_get()
  ARM: shmobile: marzen: Conditionally select SMSC_PHY
  ARM: shmobile: mackerel: Conditionally select SMSC_PHY
  ARM: shmobile: kzm9d: Conditionally select SMSC_PHY
  ARM: shmobile: bockw: Sort Kconfig node's selections
  ARM: shmobile: armadillo800eva: Conditionally select SMSC_PHY
  ARM: shmobile: ape6evm: Conditionally select SMSC_PHY
  ARM: shmobile: koelsch: Add SATA0 support
  ARM: shmobile: lager: Add SATA support
  ARM: shmobile: lager: Make spi_flash_data const
  ARM: shmobile: kzm9d: Use common clock framework
  ARM: shmobile: lager: Add VIN1 SoC camera support
  ARM: mach-shmobile: kzm9g: add zboot support
  ARM: shmobile: koelsch: Conditionally select MICREL_PHY for Multiplatform
  ARM: shmobile: bockw: add USB Func DMAEngine support
  ARM: shmobile: bockw: use HPBIF DMAEngine for sound
  ARM: shmobile: bockw: use SSI DMAEngine for sound
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-02-20 00:19:35 -08:00
Fernando Luis Vazquez Cao
6671b2240c tun: remove bogus hardware vlan acceleration flags from vlan_features
Even though only the outer vlan tag can be HW accelerated in the transmission
path, in the TUN/TAP driver vlan_features mirrors hw_features, which happens
to have the NETIF_F_HW_VLAN_?TAG_TX flags set. Because of this, during packet
tranmisssion through a stacked vlan device dev_hard_start_xmit, (incorrectly)
assuming that the vlan device supports hardware vlan acceleration, does not
add the vlan header to the skb payload and the inner vlan tags are lost
(vlan_tci contains the outer vlan tag when userspace reads the packet from
the tap device).

Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-20 02:15:38 -05:00
Toshiaki Makita
8d0d21f405 veth: Fix vlan_features so as to be able to use stacked vlan interfaces
Even if we create a stacked vlan interface such as veth0.10.20, it sends
single tagged frames (tagged with only vid 10).
Because vlan_features of a veth interface has the
NETIF_F_HW_VLAN_[CTAG/STAG]_TX bits, veth0.10 also has that feature, so
dev_hard_start_xmit(veth0.10) doesn't call __vlan_put_tag() and
vlan_dev_hard_start_xmit(veth0.10) overwrites vlan_tci.
This prevents us from using a combination of 802.1ad and 802.1Q
in containers, etc.

Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Acked-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-20 02:15:38 -05:00
Hui Wang
1de7ca5e84 ALSA: hda - Enable front audio jacks on one HP desktop model
The front headphone and mic jackes on a HP desktop model (Vendor Id:
0x111d76c7 Subsystem Id: 0x103c2b17) can not work, the codec on this
machine has 8 physical ports, 6 of them are routed to rear jackes
and all of them work very well, while the remaining 2 ports are
routed to front headphone and mic jackes, but the corresponding
pin complex node are not defined correctly.

After apply this fix, the front audio jackes can work very well.

[trivial fix of enum definition by tiwai]

BugLink: https://bugs.launchpad.net/bugs/1282369
Cc: David Henningsson <david.henningsson@canonical.com>
Tested-by: Gerald Yang <gerald.yang@canonical.com>
Cc: stable@vger.kernel.org
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2014-02-20 08:14:57 +01:00
David S. Miller
ebe44f350e ip_tunnel: Move ip_tunnel_get_stats64 into ip_tunnel_core.c
net/built-in.o:(.rodata+0x1707c): undefined reference to `ip_tunnel_get_stats64'

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-20 02:14:23 -05:00
Takashi Iwai
f31f40be8f ASoC: Fixes for v3.14
A few fixes, all driver speccific ones.  The DaVinci ones aren't as
 clear as they should be from the subject lines on the commits but they
 fix issues which will prevent correct operation in some use cases and
 only affect that particular driver so are reasonably safe.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTBDGxAAoJELSic+t+oim95ZoP/0YCVAn+Eia9ohs6o+8bEQWb
 UXj6PxGlwk0z7kPsTLbffCqPlktTlrJPIpL4JPLkWPxUrS8Q/Lc1jSBS/wIfeQXs
 u+kjn/RR91p8yLRDaVpgp2adoh18d9YU9hYuCcoDu+gLOCzTdLOXV3IriN67Sp3p
 WZIORNKPaRH4uHQdtcY+ajdwduWi5fd4cF56FOS2xnq0dxJ07rFpLmdm6HaKxOB0
 J9/F1h+asgdBIYmkg/+Kex1MO0OvcfCUSsYNbybXqesjfdicEHIco4IvegqBYq3F
 wwu5K/bJQUx4Ylah3JvNCRDlzMLSTD709hcOZsEoZmrB6cWwakrJAkBXN2N6AHUt
 CjzKZ+JLKovjttZ/h86MtvulQwH+T6ouVJ0CUcgNoD+pGlytl30DGB9Cn2j33jKr
 ix/LvFF12wES1G8poAHvskuGWONyfefFq7Ri+t+W5blitSUVVYO+5EwZC7BR0GNt
 bhoFxeTC2nO7tYkTTzoNEFrU/X+zy4m8dQfkaSDYnaDTtSURlOwa24qmCbI+FSTo
 Ti7T/NtyWzDtFbDhxxhVE8HMR1BO9X2+16zAEN4SuWotYXzab7xbh3wjOQtWa5HL
 toEBBY3ZQ5VFkCxe35dAXMPVp1ToQh7dTVohGE4wg7yPiorZ44ehNsSTMNaItjh5
 /d2rx9Su3+X2R2xY+UqK
 =Kgdb
 -----END PGP SIGNATURE-----

Merge tag 'asoc-v3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.14

A few fixes, all driver speccific ones.  The DaVinci ones aren't as
clear as they should be from the subject lines on the commits but they
fix issues which will prevent correct operation in some use cases and
only affect that particular driver so are reasonably safe.
2014-02-20 07:50:32 +01:00
Marcel Holtmann
7a4cd51dec Bluetooth: Track the current configured random address
For Bluetooth controllers with LE support, track the value of the
currently configured random address. It is important to know what
the current random address is to avoid unneeded attempts to set
a new address. This will become important when introducing the
LE privacy support in the future.

In addition expose the current configured random address via
debugfs for debugging purposes.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
2014-02-20 08:28:04 +02:00
Dave Airlie
5d7aad03c8 drm/tegra: Fixes for v3.14-rc3
These patches contain a fix for a potential hang when the RGB output is
 disabled twice, a typofix that prevents the framebuffer console from
 being restored on ->lastclose() and an optimization to do as little work
 as possible during host1x job submission.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJS+xxlAAoJEN0jrNd/PrOhccMQAL4gGMXoDI+LrPT99qjSvMN5
 gxCQ5DUgKKNLWFp42phVvCbUyqOS8sYd3SBK8rAjmCnFLGyqlUp6CGecoH3Hhl47
 j91CtkJDPytqMPSymxPH14JXxFvBq9e2AlKBKLEJcBE155KtaRbgPYsAfgMef81/
 HBP+QfnteWMs3Mg8vWpUsMikGT7HQlYSEdCf0hptsuOe3AmUiUP1fGG77u3uKMbW
 iJZTuRenVCcPTvP9YpDYc2xG4QzcRwngHb/SuFL6vuMZlbRt/PCP/83y5QpJ+DnQ
 qyP6rzPUmnTcGZN0gfcy9MpMRuR97ptA6srpA1ZBowwTKGO95a5K8cGdIP3056dG
 ZyKRNEMlRT4Oo7xJu2jRd4vPGuJ/Xno5NY9RW0l6E8kit7Mutw5DWX5/gxis3YtE
 UVAy74qeWyYjM7Pi2PvZxPyZ09Gsma8oUF+KNnU69SvcZsfCzt4JB6C2WgWvpyiC
 A2kJcfa/JU69AvYHhLoz9EhbcBonu1KWF+mAgCNZWZL3qkRkKuXDI2op1y3CInVc
 2agGHKqN9FWVOlvA8yuYEvlXpABLKbMCU2JNEtj9+fT1IuntRNY6qvigCUv1j/Gq
 St4KOHEOXF1qMp8Dn+i9UXqF8S+a291dACsDoagacIyy9zmwb6Cj9aN4OLzcp2vg
 kJJYyuQeAqiMsvstR8d2
 =pQjy
 -----END PGP SIGNATURE-----

Merge tag 'drm/for-3.14-rc3' of git://anongit.freedesktop.org/tegra/linux into drm-fixes

drm/tegra: Fixes for v3.14-rc3

These patches contain a fix for a potential hang when the RGB output is
disabled twice, a typofix that prevents the framebuffer console from
being restored on ->lastclose() and an optimization to do as little work
as possible during host1x job submission.

* tag 'drm/for-3.14-rc3' of git://anongit.freedesktop.org/tegra/linux:
  drm/tegra: Add guard to avoid double disable/enable of RGB outputs
  gpu: host1x: do not check previously handled gathers
  drm/tegra: fix typo 'CONFIG_TEGRA_DRM_FBDEV'
2014-02-20 16:22:25 +10:00
Marcel Holtmann
b32bba6ced Bluetooth: Replace own_address_type with force_static_address debugfs
The own_address_type debugfs option does not providing enough
flexibity for interacting with the upcoming LE privacy support.

What really is needed is an option to force using the static address
compared to the public address. The new force_static_address debugfs
option does exactly that. In addition it is also only available when
the controller does actually have a public address. For single mode
LE only controllers this option will not be available.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
2014-02-20 08:19:37 +02:00
Marcel Holtmann
5192d30114 Bluetooth: Add comment explainging store hint for long term keys
The code itself is not descriptive on what store hint is used for
long term keys and why. So add some extensive comment here. Similar
to what has already been done for identity resolving key store hint.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
2014-02-20 08:16:36 +02:00
Marcel Holtmann
bab6d1e594 Bluetooth: Don't send store hint for devices using identity addresses
The identity resolving keys should only be stored for devices using
resolvable random addresses. If the device is already using an
identity address, inform it about the new identity resolving key,
but tell userspace that this key is not persistent.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
2014-02-20 08:12:41 +02:00
Theodore Ts'o
ab0c00fccf ext4: make sure ex.fe_logical is initialized
The lowest levels of mballoc set all of the fields of struct
ext4_free_extent except for fe_logical, since they are just trying to
find the requested free set of blocks, and the logical block hasn't
been set yet.  This makes some static code checkers sad.  Set it to
various different debug values, which would be useful when
debugging mballoc if these values were to ever show up due to the
parts of mballoc triyng to use ac->ac_b_ex.fe_logical before it is
properly upper layers of mballoc failing to properly set, usually by
ext4_mb_use_best_found().

Addresses-Coverity-Id: #139697
Addresses-Coverity-Id: #139698
Addresses-Coverity-Id: #139699

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2014-02-20 00:36:41 -05:00
Dave Chinner
027f185e66 Merge remote-tracking branch 'xfs-async-aio-extend' into for-next 2014-02-20 15:16:39 +11:00
Dave Chinner
b678573e29 Merge branch 'xfs-fixes-for-3.15' into for-next 2014-02-20 15:16:09 +11:00
Xiubo Li
e2f74dc673 regmap: Clean up _regmap_update_bits()
Since sometimes the 'config' parameter has no use, it should be NULL.
And make the code simplifier.

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 11:37:39 +09:00
Takashi Iwai
af1f0a5082 ASoC: max98095: Use SOC_ENUM_SINGLE_DECL()
Just replace with the helper macro.  No functional change at all.

Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 11:26:38 +09:00
Takashi Iwai
2907cbcc12 ASoC: max98090: Use SOC_ENUM_SINGLE_DECL()
Just replace with the helper macro.  No functional change at all.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 11:26:03 +09:00
Takashi Iwai
a0628934d6 ASoC: max98088: Use SOC_*_ENUM_SINGLE_DECL()
Just replace with the helper macros.  No functional change at all.

Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 11:24:27 +09:00
Takashi Iwai
9839ce9360 ASoC: da9055: Use SOC_ENUM_SINGLE_DECL()
Just replace with the helper macro.  No functional change at all.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 11:23:32 +09:00
Takashi Iwai
6415e307b1 ASoC: lm4857: Use SOC_ENUM_SINGLE_EXT_DECL()
Just replace with the helper macro.  No functional change at all.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 11:22:43 +09:00
Trond Myklebust
4f14c194a9 NFSv4: Clear the open state flags if the new stateid does not match
RFC3530 and RFC5661 both prescribe that the 'opaque' field of the
open stateid returned by new OPEN/OPEN_DOWNGRADE/CLOSE calls for
the same file and open owner should match.
If this is not the case, assume that the open state has been lost,
and that we need to recover it.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2014-02-19 21:21:07 -05:00
Trond Myklebust
226056c5c3 NFSv4: Use correct locking when updating nfs4_state in nfs4_close_done
The stateid and state->flags should be updated atomically under
protection of the state->seqlock.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2014-02-19 21:21:07 -05:00
Trond Myklebust
78096ccac5 NFSv4.1: Ensure that we free existing layout segments if we get a new layout
If the server returns a completely new layout stateid in response to our
LAYOUTGET, then make sure to free any existing layout segments.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2014-02-19 21:21:06 -05:00
Trond Myklebust
9a7fe9e890 NFSv4.1: Minor optimisation in get_layout_by_fh_locked()
If the filehandles match, but the igrab() fails, or the layout is
freed before we can get it, then just return NULL.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2014-02-19 21:21:06 -05:00
Trond Myklebust
27999f2530 NFSv4.1: Ensure that the layout recall callback matches layout stateids
It is not sufficient to compare filehandles when we receive a layout
recall from the server; we also need to check that the layout stateids
match.

Reported-by: shaobingqing <shaobingqing@bwstor.com.cn>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2014-02-19 21:21:05 -05:00
Trond Myklebust
e999e80ee9 NFSv4: Don't update the open stateid unless it is newer than the old one
This patch is in preparation for the NFSv4.1 parallel open capability.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2014-02-19 21:21:05 -05:00
Trond Myklebust
2c64c57dfc NFSv4.1: Fix wraparound issues in pnfs_seqid_is_newer()
Subtraction of signed integers does not have well defined wraparound
semantics in the C99 standard. In order to be wraparound-safe, we
have to use unsigned subtraction, and then cast the result.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2014-02-19 21:21:01 -05:00
Takashi Iwai
c99f8b216c ASoC: da7213: Use SOC_ENUM_SINGLE_DECL()
Just replace with the helper macro.  No functional change at all.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 11:16:17 +09:00
Takashi Iwai
e34042d850 ASoC: da7210: Use SOC_ENUM_SINGLE_DECL()
Just replace with the helper macro.  No functional change at all.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 11:15:27 +09:00
Takashi Iwai
4682a0a2b8 ASoC: cs42l52: Use SOC_ENUM_SINGLE_DECL()
Just replace with the helper macro.  No functional change at all.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Brian Austin <brian.austin@cirrus.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 11:14:39 +09:00
Takashi Iwai
98bf1b5e78 ASoC: alc5623: Use SOC_ENUM_SINGLE_DECL()
Just replace with the helper macro.  No functional change at all.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 11:13:45 +09:00
Takashi Iwai
1c38450b9f ASoC: adau1373: Use SOC_ENUM_SINGLE_DECL()
Just replace with the helper macro.  No functional change at all.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 11:11:50 +09:00
Takashi Iwai
898b48eb88 ASoC: wm8400: Fix the wrong number of enum items
wm8400 codec driver has a few places wrongly defining the number of
enum items.

Use SOC_ENUM_SINGLE_DECL() macro and they are automatically fixed.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 11:07:53 +09:00
Takashi Iwai
cdbb492557 ASoC: isabelle: Fix the wrong number of items in enum ctls
isabelle codec driver has a few places wrongly defining the number of
enum items.

Use SOC_ENUM_SINGLE_DECL() macro and they are automatically fixed.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 11:06:37 +09:00
Takashi Iwai
901bb6c55d ASoC: ad1980: Fix wrong number of items for capture source
The number of capture sources is 8, not 7.
Use SOC_ENUM_DOUBLE_DECL() macro and it's automatically fixed.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 11:01:26 +09:00
Takashi Iwai
27ca2c30f4 ASoC: arizona: Fix wrong number of items in enum ctls
arizona codec driver has a few places wrongly defining the number of
enum items.

Use SOC_ENUM_SINGLE_DECL() macro and they are automatically fixed.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 10:43:59 +09:00
Takashi Iwai
48e50ce37f ASoC: wm8995: Remove superfluous const
As SOC_ENUM_SINGLE_DECL() itself contains const modifier now, we can
reduce const from its users.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 10:43:51 +09:00
Takashi Iwai
d0a4eec16a ASoC: wm8985: Remove superfluous const
As SOC_ENUM_SINGLE_DECL() itself contains const modifier now, we can
reduce const from its users.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 10:43:47 +09:00
Takashi Iwai
ae170688da ASoC: wm8983: Remove superfluous const
As SOC_ENUM_SINGLE_DECL() itself contains const modifier now, we can
reduce const from its users.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 10:43:43 +09:00
Takashi Iwai
11a544bb2f ASoC: wm8978: Remove superfluous const
As SOC_ENUM_SINGLE_DECL() itself contains const modifier now, we can
reduce const from its users.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 10:43:38 +09:00
Takashi Iwai
da9f39f512 ASoC: wm8804: Remove superfluous const
As SOC_ENUM_SINGLE_DECL() itself contains const modifier now, we can
reduce const from its users.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 10:43:35 +09:00
Takashi Iwai
f281205422 ASoC: sta529: Remove superfluous const
As SOC_ENUM_SINGLE_DECL() itself contains const modifier now, we can
reduce const from its users.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 10:43:31 +09:00
Takashi Iwai
655e3652db ASoC: ssm2518: Remove superfluous const
As SOC_ENUM_SINGLE_DECL() itself contains const modifier now, we can
reduce const from its users.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 10:43:28 +09:00
Takashi Iwai
4c03cb6f86 ASoC: rt5640: Remove superfluous const
As SOC_ENUM_SINGLE_DECL() itself contains const modifier now, we can
reduce const from its users.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-02-20 10:43:24 +09:00