Linux 3.4.31
Linux 3.4.32
ARM: EXYNOS: manta: modify eMMC's drive stregnth to LV4

Bug: 7390764

Change-Id: I0c75ba51eac511301f69f10ef09286a6492eb42b
Signed-off-by: Hosung Kim <hosung0.kim@samsung.com>
mmc: dw_mmc: add h/w reset for mmc card

This patch adds h/w reset to support mmc core sequence
for mmc card. This patch provides more stability on mmc driver.

Bug: 7118793

Change-Id: I2b8a7553f48ce9622aaad843e4679b09e5d49760
Signed-off-by: Hosung Kim <hosung0.kim@samsung.com>
ARM: EXYNOS: manta: add h/w reset function for eMMC

This patch adds h/w reset function to board file with using EMMC_EN
gpio pin. And other eMMC's pins should be set to output low for
power off.

Bug: 7390764

Change-Id: I5073f00fc5b2554a03d0d81ce67ce4e439e9d057
Signed-off-by: Hosung Kim <hosung0.kim@samsung.com>
mmc: dw_mmc: add DW_MMC_QUIRK_HW_RESET_PW quirk

This patch adds DW_MMC_QUIRK_HW_RESET_PW quirk for supporting
hardware reset using power off/on of card instead of reset pin
that is explicit in ext_csd regs.

Bug: 7390764

Change-Id: Ieb151ccae0bbc6d2d9c2120472afbbc82ccd5908
Signed-off-by: Hosung Kim <hosung0.kim@samsung.com>
mmc: dw_mmc: remove wait_prvdata_complete bit setting

This patch removes wait_prvdata_complete bit setting of CMD reg in
abnormal status. This bit is used for waiting for previous data transfer
completion before sending command. In abnormal status, it is not needed.

Bug: 7390764

Change-Id: I8c55f19184d6716a99d8e4da0ffe770789961fac
Signed-off-by: Hosung Kim <hosung0.kim@samsung.com>
mmc: dw_mmc: fix to check data busy on request func by CMD13

CMD13 is used to check the card state whether card is busy or not
after block write. If busy time is long, CMD13 should be issued many times.
Instead of that case, old patch was added to reduce cpu load.
But it was not considered for some erase operations which takes long
times over a few seconds. If it was taking time over a few seconds,
though it returned error, it was not error.
This patch fixes CMD13 is able to issue every 1 seconds.

Bug: 7336393, 7118793

Change-Id: I82ae59e0ebb0a07b9660e509ed848dfe73333255
Signed-off-by: Hosung Kim <hosung0.kim@samsung.com>
ARM: EXYNOS: manta: Enable DW_MMC_QUIRK_HW_RESET_PW

This enables resetting the emmc chip when transaction errors are detected.

Change-Id: Ia5771acc8d69ae49735f996448c1c061342783d0
Signed-off-by: Ken Sumrall <ksumrall@android.com>
s3c-fb: add register dump to debugfs

Bug: 7572971
Change-Id: I78a86db637a090791258d541e8bf4f4c5e138e50
Signed-off-by: Greg Hackmann <ghackmann@google.com>
ARM: exynos: manta: reserve 384MB for mali driver

Call kbase_carveout_mem_reserve to create a 384MB carveout for
use by the Mali GPU driver.  This will avoid sprinkling unmovable
pages mapped into the gpu all over the kernel's memory.

Change-Id: I3227556e175319553c25751a8447ed43be99dbcf
Signed-off-by: Colin Cross <ccross@android.com>
media: exynos: s5p-mfc: prevent suspend while MFC is in use

Change-Id: I6beecbdcb828c20af0f32c1af4d97a163867786a
Signed-off-by: Dima Zavin <dima@android.com>
mmc: dw_mmc: add to clear HLE interrupt

HLE(Hardware Locked Error) interrupt is raised when host controller
cannot load a command issued by software. When software sets the
start_cmd bit in the CMD register, host contoller tries to load
the command. If the command buffer is already filled with a command,
this error is raised. This error can not occur by the current mmc
stack.

Change-Id: I5d62f009d23f513d81b5199fc98483814c379b32
Signed-off-by: Hosung Kim <hosung0.kim@samsung.com>
media: exynos-tv: add to clear interrupt after changing to HDMI internal interrupt

Add to clear interrupt after changing to HDMI internal interrupt
and call hpd_work only in unplug state of irq-handler.
Skip to check HPD_STATUS in hpd_work.

Bug: 7368925
Change-Id: Icd0a0ad4bdcd51811ae7d67caabaa93884b67291
Signed-off-by: Jun Kim <junkim@samsung.com>
mmc: dw_mmc: fix to clear interrupt pending when exception

The previous code could not clear raw interrupt pending when
If clock update is fail to CIU after error occurs.
The remaining raw interrupt blocks to issue next operation,
The host controller can not process no longer.

Bug: 7390764, 7638890

Change-Id: I39208cea8d889f04524fa2f4c2d7ce58e91db623
Signed-off-by: Hosung Kim <hosung0.kim@samsung.com>
media: exynos: mfc: print some debug info in irq on invalid context

Change-Id: I5f857f2aad2c861ad26072555cfcfe217e618090
Signed-off-by: Dima Zavin <dima@android.com>

Conflicts:
	drivers/media/video/exynos/mfc/s5p_mfc.c
Log when a device on a mmc bus is hw reset

The original message was a debug message, turned off by default, so
we couldn't tell if it was being invoked when we had emmc errors.
Change it to KERN_WARN level, always print it, and improve the
actual error message.

Change-Id: I909a106470e139402ba2764d486bd3aa464a6cc6
Signed-off-by: Ken Sumrall <ksumrall@android.com>
media: exynos: mfc: don't drop wakeup source in multiple context case

Wakeup sources aren't ref counted, but we we always dropping ours in
release. If there were multiple contexts open, it would allow suspend
even though the MFC was still in use. Although, by itself, it's not a
problem, it did not have the intended effect.

Bug: 7261738
Change-Id: Id42006b2cff0e84711047a149a8654ed950f012a
Signed-off-by: Dima Zavin <dima@android.com>
Revert "power: android-battery: push uevent whenever charge source changes"

This reverts commit d22c22edb46eb3fc3bd21320092f15f9fb48225d.
Revert "power: android-battery: remove ac and usb supplies"

This reverts commit 8ce0ad208db639bd861623dc0b1743af4d7d5149.