add MMC3416xPJ magnetic sensor driver

used in Xperia M2

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>
add KIONIX accelerometer driver

used in Xperia M2

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>
add sensors to IIO framework

add:
Yamaha YAS532 3-Axis Magnetometer
Bosch BMA250E 3-Axis Accelerometer
Kionix KXTJ2 3-Axis Accelerometer

used in Xperia M2

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>
add BMA255/BMA250E/BMA222E/BMA280 acceleration sensor

driver is used in Xperia T3

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>
add BMG160 Gyroscope sensor

driver is used in Xperia T3

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>
add BMM050 Magnetic Sensor

driver is used in Xperia T3

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>
update STK3X1X driver

used in Xperia M2 and T3

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>
video: backlight: add lm3630 driver
shinano: update touchpad wake code

reconcile with aosp usage
fix d2w on aosp

Change-Id: I19731226c8558069da4ca8da2feff240034b1a53
drivers: power: qpnp-charger: Fix USB for Yukon boards
drivers: misc: pn547: Avoid KP if pvdd_en_gpio is invalid.
add ELAN EKTF3135 I2C touchscreens

used in Xperia E3

includes
 commit 1da7eb4c1ce1bc15b488ea6c2c6578e6fdd18fca
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Mon Dec 1 22:28:42 2014 +0000

    input: ts: ektf2k: Reset TS when resuming from suspend

    If we don't reset it, then the IRQ requests will fail
    and the TS will anyway be resetted after waiting some time.
    With this commit, the TS will be ready as soon as the
    system comes out from suspended state, without any apparent delay.

commit f478c46e4905229a4b374364a4e12916401fa3c4
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Fri Dec 12 11:52:25 2014 +0000

    drivers: TS: ektf2k: replace msleep with usleep_range in reset path

    When doing msleep([1...20]) we're likely sleeping for ~20ms.
    Replacing with usleep_range will ensure it'll be ready earlier.
add CYPRESS CYTTSP4 Touchscreen driver

used in Xperia M2, E3, T2 Ultra

includes
commit 665e45b0147358a3dc413344d17b096342fdf9e0
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Tue Dec 9 10:10:15 2014 +0000

    drivers: TS: cyttsp4: Add config option for Yukon

    This is to make sure that noone sends a wrong firmware
    to the TS IC.

commit 8393813f5283f40a631474793fcb0ec72ee31cea
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Tue Dec 9 10:34:33 2014 +0000

    drivers: TS: Do not panic if vreg_l27 is not specified

    This is required for Seagull as it hasn't got that vreg
    and it's not specified in DT.

commit f48b78e456c9768308ce9796159a8fad7cb228e9
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Wed Dec 10 10:53:49 2014 +0000

    drivers: TS: cyttsp4: Stop spamming

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>
Display driver changes

Add changes to support M2,T3,E3 devices

includes
commit a9c352bc0ce39bc8b5155ff5a197c4788e70593d
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Mon Dec 1 22:50:54 2014 +0000

    Port Flamingo display to Sony's unified display driver

commit acc25abf8933fa40ffa1798ad3a37dc09aefeeaa
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Tue Dec 2 10:45:04 2014 +0000

    video: msm: mdss: mdss_dsi_panel_driver: Add somc,no-vsp-gpio property

    Some devices don't need/have this GPIO, so the driver
    can continue to go through its code even if we
    haven't specified the somc,vsp-gpio property.

commit 7cf303074cf6ec93b230656c8d0334a0684f26d9
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Tue Dec 2 14:46:16 2014 +0000

    arm: Seagull: Welcome to the Sony Unified display driver

commit edf230222fde4e12dc18867521dd99bdf3520d6b
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Tue Dec 2 15:11:36 2014 +0000

    video: msm: mdss: mdss_dsi_panel_driver: Fix mistake

commit 017ab0ca4a77ae2e2e353140d30c86084238ba61
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Wed Dec 3 11:19:40 2014 +0000

    video: msm: mdss: Add upside down panel support

commit 8000d028700d2853be252dda53980304c8485999
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Mon Dec 8 12:34:36 2014 +0000

    drivers: video: msm: Make Seagull's display to work (see comment)

    The panel enable/disable/reset logic is now okay, but we still
    have to fix the panel detection because actually there's some
    problem that makes us unable to read the panel ID.
    At this stage, the only working panels on Seagull
    are the two JDI and it's only because of a coincidence in
    the bad id detection that now reads 0x00 (same ID as JDI panel).

commit 19ac1fdfb3ee9c3ef8bde75b12fe8a59c1ec2084
Author: erikcas <erikcas1972@gmail.com>
Date:   Sun Dec 7 10:42:51 2014 +0100

    silence compilation warnings on use of void + return

    Change-Id: Ia7dae48d00970dfe3e8d033349ffd39435a69383
    Signed-off-by: erikcas <erikcas1972@gmail.com>

commit b1e7735df0c22f67bd95fef1845a488dc6b7214f
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Thu Dec 11 10:56:09 2014 +0000

    Seagull: Fix first panel init

commit a36adb886a65139a60392bbb1d09c72238808d28
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Fri Dec 12 11:25:59 2014 +0000

    msm: mdss: add support for 565 macro tile formats

    Extend macro tile format support to rgb565 and bgr565.

commit efa7dd04b3e195dd707514209ae865230b3c8ee0
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Sun Dec 14 10:09:16 2014 +0000

    drivers: video: msm: mdss: Add ifdefs in mdss_dsi.h

    Some structures, definitions and enumerations are needed only for
    Sony's unified display driver.
    Use ifdefs around those, so that the code will be "marked" and
    it'll be easier to read (and easier to port elsewhere if needed).

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>
yukon: add platform

FLAMINGO DEVICE (Xperia E3)

commit b9a936293c4c85ddaaa5aa0585f1d3721395b531
Author: Adam Farden <adam@farden.cz>
Date:   Sat Nov 15 11:10:16 2014 +0100

Flamingo: add platform

includes
commit db1bbf6b8d6ff974a29f27dadb87e25d2045d656
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Fri Nov 28 02:43:12 2014 +0000

    arm: dts: flamingo: Specify i2c-src-freq and master-id for i2c nodes

    Let's make the kernel happy.

commit 5e0d84b0c208888fa5d78173166d88a1f5cb4180
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Mon Dec 1 09:35:52 2014 +0000

    arm: dts: Flamingo: Remove the qcom,mode property from pm8226_s2

    ....for CPR to work correctly and the device to go to sleep
    without any problem.

commit ff2280813faaf6f19e9c8d502c57eb99fa5e3e3e
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Mon Dec 1 22:31:58 2014 +0000

    arm: configs: Flamingo is ready to migrate to the new display driver.

commit b981c240f3cb8c7efa3d0324a723bb5239cc09b3
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Mon Dec 1 22:50:54 2014 +0000

    Port Flamingo display to Sony's unified display driver

commit bb955fa38c5998185b615e859158828130b358b4
Author: Adam Farden <adam@farden.cz>
Date:   Tue Dec 2 21:38:49 2014 +0100

    Flamingo: consolidate and tidy dtsi

    * Remove unused qhd panels
    * Combine 3 dtsi files into one
    * Rename to remove v3

    Signed-off-by: Adam Farden <adam@farden.cz>

commit 2f02c23390a0c28b7004af2cec521557ca0685eb
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Wed Dec 3 09:43:20 2014 +0000

    arm: Flamingo: Remove unused panel

commit d3f736f02d9af3a02efcf3058646f53966e1b50f
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Tue Dec 9 12:07:23 2014 +0000

    arm: Flamingo: Migrate to *.c batterydata

commit d988b249e28683716928e92434fbc5cfea65490b
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Thu Dec 11 13:14:03 2014 +0000

    arm: dts: Flamingo: Unify panels

EAGLE DEVICE (Xperia M2)

commit 61bdd9339d3a558a4a7650980d05851382bd3aac
Author: Alin Jerpelea <alin.jerpelea@sonymobile.com>
Date:   Tue Nov 18 17:30:29 2014 +0100

    Eagle: add platform

    includes
    commit ceda5c1348bdf1519460cbc4e707101cbb82b053
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Mon Nov 24 11:03:13 2014 +0000

        arm: dts: Eagle: Fix camera regulators

    commit 1bfca7bdb995967a139d24251d638e9a3f3db1d2
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Tue Dec 2 11:18:31 2014 +0000

        arm: configs: Eagle: Use upstream FB_MSM_LOGO

    git cherry-pick ccb555cbe003406b4684f403c6518bbf796f2440
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Tue Dec 2 11:45:16 2014 +0000

        arm: boot: dts: Eagle: Fix primary panel property

    commit a2ea9c3c9d0d82a39fe4cc8b7c578f12d1b6700a
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Tue Dec 2 10:51:42 2014 +0000

        arm: Eagle: Welcome to the Sony Unified display driver

    commit 371f0da8f511a8cc19b323656a3c44c8cb2f2fab
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Wed Dec 3 11:20:07 2014 +0000

        arm: Eagle: Specify upside-down panel property

    commit f1730c27b03bbb7a609c475e3647f0c8c11e2f4e
    Author: erikcas <erikcas1972@gmail.com>
    Date:   Sun Nov 30 01:54:25 2014 +0100

        Eagle: fix regulator msm8226_l27

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>

commit 441487969ad411646b6f9bddfb348b57b82eb9a8
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Thu Dec 11 13:36:59 2014 +0000

    arm: dts: Eagle: Cleanup and merge panels

TIANCHI DEVICE (Xperia T2 Ultra)

commit 0352d27fe9c87a6fa36ca83e69cdb2b3df2399b9
Author: Adam Farden <adam@farden.cz>
Date:   Thu Nov 20 19:39:55 2014 +0100

    Tianchi: Platform

    includes
    commit 5d1b1f19310f3dabedd90a95b4df521d552eb298
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Mon Nov 24 10:30:37 2014 +0000

        arm: dts: Tianchi: 8226_l28 shall be always-on

    commit 0f8788430e5462adbf0514b0b0fca72dc52cb44f
    Author: Adam Farden <adam@farden.cz>
    Date:   Tue Dec 2 19:36:15 2014 +0100

        Tianchi: fix dt.img generation

        Now we can use v2 dt.img like other devices
        msm8926-yukon_tianchi.dtsi is simply an out-of-date msm8926.dtsi, it
        was forked due to Sony's backporting of kernel features.

        Signed-off-by: Adam Farden <adam@farden.cz>

    commit 96d74bf5c429ca9e80ce64b1f08d8adad21f3370
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Tue Dec 9 09:46:30 2014 +0000

        arm: dts: Tianchi: Specify new reset sequences for panels

        The new driver isn't using the classic reset sequence.
        Instead, it uses different sequences for poweron and off
        and that's good for us because we would anyway do the same.

commit 1349a6568b1f9c1f1f3af45fc8b10483f4b2a152
Author: Alin Jerpelea <alin.jerpelea@sonymobile.com>
Date:   Wed Dec 10 13:43:03 2014 +0100

    tianchi: use standard wled:backlight naming

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>

SEAGULL DEVICE (Xperia T3)
commit a17b0d3da5399cf1580e57dc15b7a10705286334
Author: Alin Jerpelea <alin.jerpelea@sonymobile.com>
Date:   Sat Nov 22 13:08:46 2014 +0100

    seagull: platform import

    includes
    commit d5bf5ee2b4e5d4ac73dd689646be6cb5aea0b1ff
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Mon Nov 24 10:18:42 2014 +0000

        arm: dts: Seagull: 8226_l19 shall be always-on

    git cherry-pick 16a392d15d4b67cd3993164ac4b61b401ed54e50
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Tue Dec 2 15:07:18 2014 +0000

        arm: configs: Update Seagull config for new display driver

    commit 569b2622c67df69b9c07d9199664994badae0426
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Tue Dec 2 14:46:16 2014 +0000

        arm: Seagull: Welcome to the Sony Unified display driver

    commit fa87f98040967eaadae2a27dbb68baddc0d1ed02
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Sun Dec 7 10:02:53 2014 +0000

        arm: dts: Seagull: Configure I2C QUP2 properly and add regulator changes

    commit 38dd4656532de7d4963ea0fb752d43bd866de632
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Mon Dec 8 12:39:37 2014 +0000

        arm: dts: Seagull: Rename, fix and unify panel

        Also remove the spi0 property and alias, because of GPIO conflicts.

    commit 3a0c87b2d1f7492e6378e881d979f6bc7daea344
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Mon Dec 8 12:45:26 2014 +0000

        arm: dts: Seagull: Declare address-cells and size-cells for i2c QUP2

        ....So that we'll stop getting warnings while generating the DTB.

    commit 1c7f38e40d4d1194993587d7424b68cc393e92bc
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Tue Dec 9 10:12:27 2014 +0000

        arm: configs: Seagull: New config for touchscreen

    commit 16814e9f6dc522cc7988a111f54f5308dd6779ab
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Tue Dec 9 12:07:23 2014 +0000

        arm: Seagull: Fix volume up button

    commit 0bd24fcc29a32bf2c1959fbe6b66a252d60bf4b3
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Wed Dec 10 10:47:30 2014 +0000

         arm: Seagull: Fix battery charging

    commit fec7b231848360ae09673b8d8a72e0460cb902af
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Fri Dec 12 11:25:03 2014 +0000

        arm: configs: Seagull: Enable FB_MSM_LOGO

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>

commit e2c8b64b1f9bec008b0f804e7a549330df1560bf
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Wed Dec 10 16:20:24 2014 +0000

    arm: dt: Seagull: Fix panel specs

commit f7c4d8e4ac7e6c2a634d56df654936157acdcde5
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Thu Dec 11 10:56:09 2014 +0000

    Seagull: Fix first panel init

COMMON
commit 1bc18c7213d89d73617097b758a97ed1e864f69d
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Thu Dec 4 21:49:37 2014 +0000

    arm: msm: Add SOMC Yukon board to Kconfig

commit bbe9643bd5cfd6d79a98eccf1075cbc4dd1cb36a
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Tue Dec 9 10:02:20 2014 +0000

    arm: dts: Introduce common properties for SOMC Yukon

    commit a42765af76cdbbe18c3d5a674252a8e49b694988
    Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
    Date:   Tue Dec 9 01:27:44 2014 +0000

        arm: dts: Yukon: add qcom,clamp-soc-max-count property for battery

commit aa812f39642505c04a153bff635b3c270b9c0bae
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Tue Dec 9 15:21:58 2014 +0000

    arm: dts: Flamingo: Cleanup and unify

commit 5bfa3243f3e3e362687c6c1c84d2bdb713ad69f5
Author: Alin Jerpelea <alin.jerpelea@sonymobile.com>
Date:   Wed Dec 10 11:00:35 2014 +0100

    yukon: gpio key cleanup

    this commit also fixes gpio keys bug for eagle

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>

commit 36f70b5c55705e552921563619b891db3d81c985
Author: Alin Jerpelea <alin.jerpelea@sonymobile.com>
Date:   Wed Dec 10 15:41:49 2014 +0100

    yukon: move leds to yukon_common

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>

commit 450ae6e8639e507f396dd9854acc6f434c3609b3
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Thu Dec 11 11:38:18 2014 +0000
    configs: Yukon: Add MMC cache feature and HS200_AWAKE

commit 6adb3434b16a864b53bbaba505c9bddccd0f7ccc
Author: Angelo G. Del Regno -- EternityProject Team Manager <kholk11@gmail.com>
Date:   Thu Dec 11 15:11:39 2014 +0000

    Yukon: Initial NFC Bringup
nl80211: Correct the usage of command NL80211_CMD_VENDOR

Assign/pass the cur_cmd_info parameter correctly. This fixes a
merge error when open source commit
ad7e718c9b4f717823fd920a0103f7b0fb06183f was pulled into the tree.

CRs-Fixed: 672390
Change-Id: Iaa21a1723709683a6f34b07423b74ef0b6077b68
Signed-off-by: Sunil Dutt <usdutt@codeaurora.org>
Enable NEED_NETDEV for vendor command support.

The Vendor command needs to have the NEED_NETDEV internal flag set
for the corresponding vendor_cmd function to initialize correctly
and call the vendor subcommand specific doit function.

Change-Id: Icc46438dc9467fe0344cb832633c49466e2d20d0
CRs-fixed: 633799
Signed-off-by: Subhani Shaik <subhanis@codeaurora.org>
nl80211: nl80211hdr_put() doesn't return an ERR_PTR

There are a few places which check nl80211hdr_put() for an ERR_PTR
but actually it returns NULL on error and never error values.  In
nl80211_testmode_dump() the return wasn't checked at all so I have
added one.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
[some whitespace changes]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: cb35fba360dfc3496e5d8a47e23ec5ccdfd90925
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Change-Id: I5da1aafea35110a1ce606d402b1b96859d34b869
[akholaif@codeaurora.org: resolved conflicts manually]
Signed-off-by: Ahmad Kholaif <akholaif@codeaurora.org>
nl80211: fix error path in nl80211_get_key()

Coverity pointed out that in the (practically impossible)
error case we leak the message - fix this.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: 9fe271af7d4de96471c5aaee2f4d0d1576050497
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Change-Id: I78c3631eabd04e86872faf65fa1e401dadb35a75
Signed-off-by: Ahmad Kholaif <akholaif@codeaurora.org>
msm: mdss: Mark some unused variables as unused

..in the panel specific driver

Change-Id: I612b05ca0c82188354318c92d930f4c167265076