power: rk81x battery: use get_monotonic_boottime to get system run time

local_clock will lose the suspend time, so we use get_monotonic_boottime instead

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>

power: rk81x-battery: modify low power check threshold voltage

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>

power: rk81x-battery: add calc seconds availability check

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>

power: rk81x-battery: add debug message dump limit

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>

power: rk81x-battery: optimize zero discharge algorithm

avoid display_soc to be initialed in some case which makes dsoc
drop too quick

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>

power: rk81x-battery: get charger type by usb notifier instead of polling

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>

dts: rk3368-p9_818: disable vcc_codec when system sleep.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

hdmi:rk3036/rk3128: fix picture flicker error when setting audio.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

hdmi:rk3288/rk3368: modify avi colorimetry information according to input colorimetry.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

hdmi: support parse and modify colorimetry.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

fix rga2 3368 first proc scale bug

Signed-off-by: Shengqin.Zhang <zsq@rock-chips.com>

fix rga2 soft reset may cause rga status uncorrect

Signed-off-by: Shengqin.Zhang <zsq@rock-chips.com>

fix rga miss flush cmd reg to DDR bug

Signed-off-by: Shengqin.Zhang <zsq@rock-chips.com>

ASoC: es8316: reinit codec when resume from deep sleep.

because codec power will be cut off when enter deep sleep.
so need reinit codec when resume.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

ASoC: rockchip: i2s: move pinctrl_pm_* to suspend/resume.

some codec initializtion depends on i2s's mclk/lrck, when codec enter
deep sleep, codec power loss, then codec resume and reinit
codec logic which need mclk/lrck, if these clk is not ready, codec will
work abnormally.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

hdmi: move show sink info to debug node.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

hdmi: modify debug string mode.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

hdmi: mute output before disabled or suspended.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

Drivers: TP: disable vcc_tp when gt9xx in suspend mode

Signed-off-by: guoyi <gy@rock-chips.com>

rk3368: rk3368-p9_818.dts: set vcc_tp sleep mode to disabled

Signed-off-by: guoyi <gy@rock-chips.com>

PMIC:rk818.dtsi: remove rk818_reg_ldo2 aways-on,
then we can disable it during OS is running

Signed-off-by: guoyi <gy@rock-chips.com>

RK3368: add vpu cru reset resource.

Add cru reset resource according to RESET CONTROLLER.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>

VPU: add cru reset support.

This depend on RESET_CONTROLLER enable on kernel.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>

mmc: rk_sdmmc: enhance recovery flow

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

dts: rockchip: add cru regmap refnode for mmc

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

direct-io: only inc/dec inode->i_dio_count for file systems

do_blockdev_direct_IO() increments and decrements the inode
->i_dio_count for each IO operation. It does this to protect against
truncate of a file. Block devices don't need this sort of protection.

For a capable multiqueue setup, this atomic int is the only shared
state between applications accessing the device for O_DIRECT, and it
presents a scaling wall for that. In my testing, as much as 30% of
system time is spent incrementing and decrementing this value. A mixed
read/write workload improved from ~2.5M IOPS to ~9.6M IOPS, with
better latencies too. Before:

clat percentiles (usec):
|  1.00th=[   33],  5.00th=[   34], 10.00th=[   34], 20.00th=[   34],
| 30.00th=[   34], 40.00th=[   34], 50.00th=[   35], 60.00th=[   35],
| 70.00th=[   35], 80.00th=[   35], 90.00th=[   37], 95.00th=[   80],
| 99.00th=[   98], 99.50th=[  151], 99.90th=[  155], 99.95th=[  155],
| 99.99th=[  165]

After:

clat percentiles (usec):
|  1.00th=[   95],  5.00th=[  108], 10.00th=[  129], 20.00th=[  149],
| 30.00th=[  155], 40.00th=[  161], 50.00th=[  167], 60.00th=[  171],
| 70.00th=[  177], 80.00th=[  185], 90.00th=[  201], 95.00th=[  270],
| 99.00th=[  390], 99.50th=[  398], 99.90th=[  418], 99.95th=[  422],
| 99.99th=[  438]

In other setups, Robert Elliott reported seeing good performance
improvements:

https://lkml.org/lkml/2015/4/3/557

The more applications accessing the device, the worse it gets.

Add a new direct-io flags, DIO_SKIP_DIO_COUNT, which tells
do_blockdev_direct_IO() that it need not worry about incrementing
or decrementing the inode i_dio_count for this caller.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Elliott, Robert (Server Storage) <elliott@hp.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Tested-and-Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>

defconfig: rockchip: enable CONFIG_MMC_DW_SKIP_CACHE_OP

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

fs: direct-io: convert rw from READ to KERNEL_READ

KERNEL_READ equal READ puls REQ_KERNEL, which indicates
this brq comes from direct-io. Any block-layer devices who
care this req type can get it now.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

mmc: rk_sdmmc: add MMC_DW_SKIP_CACHE_OP for data manipulation

Direct IO of filesystem  had recursive searched and map the addr
itself, so mmc drivers can avoid to do the same ops in order to
improve throughput. We got 30% improvement for 4KB bs packet test.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

arm64: dma-mapping: conditional skip map_sg by attrs

Add if statement(DMA_ATTR_SKIP_CPU_SYNC) for __swiotlb_map_sg_attrs
to skip invalidating each sg element

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

 hdmi:rk3368/rk3288: modify phy termination resistance.

        Set single-ended source termination resistance
        to 100ohm for HDMI1.4 and 50ohm for HDMI2.0.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

hdmi:rk3368/rk3288: set color format in avi to RGB before mute output.

        For some sink, it will random recognize YCbCr as RGB when swithing
        hdmi format, picture will covered with purple. If we set color
        fomat in avi to RGB and reset avi to YCbCr, picture will be ok. So
        we set avi to RGB before mute ouput when switching hdmi format.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

dts:sdmmc: slow down sdmmc frequence to 37.5MHz for SDK board

SDK board sdmmc can't run 50MHz, otherwise SD initialising will return error.
log as below. slow down sdmmc frequence to 37.5MHz can fix it.

<4>[  802.611901]  [0:    kworker/0:2:  644] rk_sdmmc: BOOT   The card is inserted.  ===!!!!!!==[mmc1]
<6>[  802.838728]  [0:  kworker/u16:0:    6] mmc_host mmc1: Bus speed (slot 0) = 50000000Hz (slot req 400000Hz, actual 3
96825HZ div = 63)
<4>[  802.838858]  [0:  kworker/u16:0:    6] rk_sdmmc: BOOT dw_mci_setup_bus: argue clk_mmc workaround out 800000Hz for
init[mmc1]
<6>[  802.990527]  [0:  kworker/u16:0:    6] mmc_host mmc1: Bus speed (slot 0) = 50000000Hz (slot req 50000000Hz, actual
50000000HZ div = 0)
<4>[  802.990671]  [0:  kworker/u16:0:    6] rk_sdmmc: BOOT dw_mci_setup_bus: argue clk_mmc workaround out normal clock
[mmc1]
<3>[  802.996461]  [0:  kworker/u16:0:    6] mmc1: error -84 whilst initialising SD card

Signed-off-by: hecanyang <hcy@rock-chips.com>

tve:rk1000: set default cvbd mode to PAL.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

dts:rk3368-box: enable uboot logo

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

rfkill-wlan: repair vref pmu ctrl problem

rk_vop: rk3288: fix kernel logo crash with iommu enable

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

ASoC: hdmi_spdif: support format SNDRV_PCM_FMTBIT_S24_LE

because of DMA_SLAVE_BUSWIDTH_4_BYTES, we support SNDRV_PCM_FMTBIT_S24_LE
which store data in low three bytes. not support SNDRV_PCM_FMTBIT_S24_3LE

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

ASoC: rockchip: implement suspend/resume for i2s

use regmap_reinit_cache to restore hw registers after power loss
during a suspend/resume cycle.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

dts: 3368 box dts add dcdc eta3558

mmc: rk_sdmmc: fix wrong skip condiction of post_tmo

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

tve:rk1000: fix rk1000 suspend and resume error

Signed-off-by: ShenZhengyi <szy@rock-chips.com>
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

dts:rk3288-box: enable uboot logo.

tve:gm7122: When gm7122 init, do not switch fb.

it can avoid green screen, when HDMI switch to CVBS.

Signed-off-by: ShenZhengyi <szy@rock-chips.com>
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

ASoC: hdmi_spdif: config hdmi audio when hdmi using spdif source.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

ASoC: spdif: fill channel status sample freq.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

 rk3368: pmic: rk808:adjust dcdc voltage step

Signed-off-by: guoyi <gy@rock-chips.com>
Signed-off-by: zhangqing <zhangqing@rock-chips.com>

change RGA2 dtsi name for all platform

Signed-off-by: Shengqin.Zhang <zsq@rock-chips.com>

bcmdhd wifi: auto recognize for AP62x2

ASoC: rockchip: rename rk30_i2s.c to rk_i2s.c

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

ASoC: rockchip: refactor i2s driver.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

HDMI: add a helper function for config hdmi audio.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

rockchip_defconfig: support rk1000.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

rk1000: fix ypbpr compile error.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

dts: rk3288 box: fix some error.

1. fix audio codec.
2. framebuffer size set to 1080P.
3. fix hdmi setting error.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

bcmdhd wifi: nvram auto recognize for AP6335

dts: add rk3288-box.dts.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

dtsi:rk3288: add remotectl pwm.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

HDMI:rk3368/rk3288: delete some unused code.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

HDMI:rk3368/rk3288: add debugfs node regs_phy to modify phy regs.

and rename debugfs node hdmi to regs_ctrl.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

dts:rk3368-box-r88_808: add dts support for the BOX board of R88(RK3368)_PMU_Vxx

Signed-off-by: Aiyoujun <ayj@rock-chips.com>

delete unused code and update coding style

rk3368: tsadc: support print temp from console

Signed-off-by: David Wu <wdc@rock-chips.com>

rk3368: tsadc: add hw shut temp

if temp reached hw_shut_temp three times continuously, system would power off.

Signed-off-by: David Wu <wdc@rock-chips.com>

rk3368: tsadc: get temp from scpi interface

Signed-off-by: David Wu <wdc@rock-chips.com>

rk3368: clk: cpll: make cpll low jitter.

This modify is for cpll low jitter.
Make the signal of clk_gmac better.

Signed-off-by: zhangqing <zhangqing@rock-chips.com>

dvfs: rockchip: fix min_temp_limit

Signed-off-by: Xiao Feng <xf@rock-chips.com>

arm64: rockchip: rk3368: dts: fix min_temp_limit

Signed-off-by: Xiao Feng <xf@rock-chips.com>

rk3368: mailbox: Added SCPI APIs for TSADC function.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>

rk3368: tsadc: prevent to get temp when system going to suspend.

Signed-off-by: David Wu <wdc@rock-chips.com>

VPU: return correct decoded length on iommu case

On iommu case the decode buffer address is replace by iommu address.
When decoding finished the new register value is also the iommu address.
So the actual decoded length need a hack to calculate.

This patch is to resolve H.264 field stream packet with both top field
and bottom field. By retrieving the real decoded length decoder can detect
this case.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>

dts: rk3368-tb_mipi: headset: no adc mode.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

dts: rk3368-tb_mipi: disable headset wakeup.

because the hp det src is provider by micbais in this board.
when suspend, micbais will be power down to reduce power consumption.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

Headset: add parse property "rockchip,headset_wakeup".

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

ASoC: rt3261: initial micbais.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

rtl8188eu: update driver to v4.3.0.8_13968.20150417, modify some error

pm_tests: rockchip: add pvtm test

Signed-off-by: Xiao Feng <xf@rock-chips.com>

power: rk81x-battery: support otg device

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>

usb: bc: fix compile error

Fix conflicting types for 'rk_bc_detect_notifier_register'

usb: bc: fix function name in hader file

arm64: rockchip: rk3368-p9: dts: modify clocks init rate

reduce aclk_bus hclk_bus aclk_peri hclk_peri for power

Signed-off-by: Xiao Feng <xf@rock-chips.com>

add RGA param_x when scale down

Signed-off-by: Shengqin.Zhang <zsq@rock-chips.com>

arm64: rockchip: rk3368: dts: add leakage adjust volt support

Signed-off-by: Xiao Feng <xf@rock-chips.com>

arm64: rockchip: rockchip_defconfig disable SCHED_HMP_LITTLE_PACKING

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

HDMI:rk3128/rk3036: fix compile error introduced by pre-commit.

hdcp_power_off_cb() was changed by commit
90e99a4c359e2609512feb7433670b10815593b4.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

HDMI:rk3288/rk3368: support 2nd HDCP authentication.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

HDMI: modify callback and events for HDCP 2nd auth.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

mmc: core: reduce erase event timeout

We set wrong discard timeout limitation for erase event
which exceed that block layer does. And jbd warning
can be observed like blow:

INFO: task update_binary:151 blocked for more than 10 seconds.
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
update_binary   D ffffffc000085674     0   151    134 0x00400008
Call trace:
[<ffffffc000085674>] __switch_to+0x80/0x8c
[<ffffffc00082cb28>] __schedule+0x4e0/0x6f4
[<ffffffc00082cda0>] schedule+0x64/0x70
[<ffffffc00082aea0>] schedule_timeout+0x28/0x250
[<ffffffc00082d2ac>] io_schedule_timeout+0x6c/0xa8
[<ffffffc00082d37c>] wait_for_common_io.constprop.111+0x94/0x114
[<ffffffc00082d41c>] wait_for_completion_io+0xc/0x18
[<ffffffc0002ffb08>] blkdev_issue_discard+0x1e0/0x214
[<ffffffc000300630>] blkdev_ioctl+0x2d0/0x708
[<ffffffc00030d52c>] compat_blkdev_ioctl+0x464/0x5ec
[<ffffffc0001bdf0c>] compat_sys_ioctl+0x104/0x1e8

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

mmc: queue: use swap() in mmc_queue_thread()

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

dts: rk312x-pinctrl: disable IO pull-down for SDIO

  Rockchips' platform contain ridiculous and closely
w/o maintained macro in pcl to pave the bumpy way for
other drivers to distinguish VALUE_PULL_UPDOWN_DISABLE
from VALUE_PULL_DISABLE.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Xiao Yao <xiaoyao@rock-chips.com>
Tested-by: Xiao Yao <xiaoyao@rock-chips.com>
Cc: Roger Hu <roger.hu@rock-chips.com>

mmc: core: avoid recovery flow for tuning failure

  Communication scenario definitely should fail during
tuning procedure. Already does it reset controller, so
we don't need executing recovery for that case.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

mmc: card: Fixup request missing in mmc_blk_issue_rw_rq

The current handler of MMC_BLK_CMD_ERR in mmc_blk_issue_rw_rq function
may cause new coming request permanent missing when the ongoing
request (previoulsy started) complete end.

The problem scenario is as follows:
(1) Request A is ongoing;
(2) Request B arrived, and finally mmc_blk_issue_rw_rq() is called;
(3) Request A encounters the MMC_BLK_CMD_ERR error;
(4) In the error handling of MMC_BLK_CMD_ERR, suppose mmc_blk_cmd_err()
    end request A completed and return zero. Continue the error handling,
    suppose mmc_blk_reset() reset device success;
(5) Continue the execution, while loop completed because variable ret
    is zero now;
(6) Finally, mmc_blk_issue_rw_rq() return without processing request B.

The process related to the missing request may wait that IO request
complete forever, possibly crashing the application or hanging the system.

Fix this issue by starting new request when reset success.

Signed-off-by: Ding Wang <justin.wang@spreadtrum.com>
Fixes: 67716327eec7 ("mmc: block: add eMMC hardware reset support")
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

mmc: core: add timeout for context_info->is_done_rcv

  After dequeue a rq from blk and a accidental rq missing makes
bq->queue fails to fetch blk_rq again since !rq w/o been done.
Whatsoever was that, MUST ensure a schedule mechanisam to break
the dead loop, and issue the missing one again. We observe this
problem, all processes calling aio page writeback or commiting
journal were confined in io_schedule waiting for previous blk rq
to be completed, and cause os stucked.

page:c1337420 count:3 mapcount:0 mapping:dc8fdc34 index:0x502
page flags: 0x4000286c(referenced|uptodate|lru|active|private|writeback)
sleep_on_page: inode: dc8fdb58, 119091
CPU: 3 PID: 199 Comm: abc Not tainted 3.10.0 #298
[<c0013e44>] (unwind_backtrace+0x0/0xe0) from [<c001175c>] (show_stack+0x10/0x14)
[<c001175c>] (show_stack+0x10/0x14) from [<c00cadb8>] (sleep_on_page+0x6c/0x8c)
[<c00cadb8>] (sleep_on_page+0x6c/0x8c) from [<c0769a80>] (__wait_on_bit+0x54/0xa0)
[<c0769a80>] (__wait_on_bit+0x54/0xa0) from [<c00ca88c>] (wait_on_page_bit+0x8c/0x9c)
[<c00ca88c>] (wait_on_page_bit+0x8c/0x9c) from [<c00ca954>] (filemap_fdatawait_range+0x6c/0x110)
[<c00ca954>] (filemap_fdatawait_range+0x6c/0x110) from [<c00cbd8c>] (filemap_write_and_wait_range+0x54/0x78)
[<c00cbd8c>] (filemap_write_and_wait_range+0x54/0x78) from [<c0182e14>] (ext4_sync_file+0xdc/0x308)
[<c0182e14>] (ext4_sync_file+0xdc/0x308) from [<c01305f8>] (vfs_fsync_range+0x34/0x44)
[<c01305f8>] (vfs_fsync_range+0x34/0x44) from [<c01306b0>] (generic_write_sync+0x80/0x88)
[<c01306b0>] (generic_write_sync+0x80/0x88) from [<c00cc3fc>] (generic_file_aio_write+0xa0/0xb0)
[<c00cc3fc>] (generic_file_aio_write+0xa0/0xb0) from [<c0109198>] (do_sync_write+0x74/0x98)
[<c0109198>] (do_sync_write+0x74/0x98) from [<c0109ab8>] (vfs_write+0xd4/0x16c)
[<c0109ab8>] (vfs_write+0xd4/0x16c) from [<c0109df8>] (SyS_write+0x3c/0x60)
[<c0109df8>] (SyS_write+0x3c/0x60) from [<c000da00>] (ret_fast_syscall+0x0/0x30)

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Tested-by: Meiyou Chen <cmy@rock-chips.com>

mmc: rk_sdmmc: remove edmac init in post tmo and data->stop

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

mmc: rk_sdmmc: add new property for mmc_assume_removable

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

mmc: core: limit tuning block timeout

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

dts: rockchip: add tune_regsbase for mmc

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

mmc: host: Add facility to support re-tuning

  This commit comes from community but not upstreram.
We cannot wait for picking up such a great movement without
upstream admit it. We just take a light way to merge it and
minimize the change.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>

mmc: rk_sdmmc: new tuning policy

  Totally new tuning policy for rockchip mhsc
merging from upstream and sustainable experiments
conducted by massive test using tier one customers's board.
This fine ajustment might be more durable and readable.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Xiao Yao <xiaoyao@rock-chips.com>
Test-by: Xiao Yao <xiaoyao@rock-chips.com>

mmc: rk_sdmmc: local reversion and code regulation

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>