arm64: dts: rockchip: disable gmac support for rk3328-evb

Change-Id: I723bf633087713c3ebcfd92eb42e8c7005ecbe38
Signed-off-by: Hans Yang <yhx@rock-chips.com>

arm64: dts add Rockchip RK3328 EVB board for wifi

Change-Id: Ia6588ebd31e34230ff137edc60cb7ffc433391e5
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>

arm: dts: rockchip: rk3288 add android.dtsi

Change-Id: I180b59363766938ed17e10fa4c574b2613f59c9a
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

drm/bridge: dw_hdmi: set vdisplay for frame packing 3d mode

This patch is only applicable to 3d frame packing
of progressive mode.
According to HDMI Specification 1.4b 8.2.3.2,
vertical toatal line is x2 of 2D vertical toatal line
and pixel clock frequency is x2 of 2D pixel clock frequency.

vdisplay += vtotal
mpixelclock *= 2

Change-Id: I097c25cd1a930635e33f0a7bc86797ad1c7ed607
Signed-off-by: algea.cao <algea.cao@rock-chips.com>

drm/bridge: dw_hdmi: initialize hdmi i2c when system resume

Change-Id: Ie9373517e255c91ded38a4e620d15d5cfd0bd9c4
Signed-off-by: algea.cao <algea.cao@rock-chips.com>

ARM64: dts: rk3399-box-rev2: enable hdmi uboot logo display

Change-Id: I90939866aafa8bac613d05528adfefcd6d88f711
Signed-off-by: xuhuicong <xhc@rock-chips.com>

drm/rockchip: dw_hdmi: add power domain control

close pd when suspend, no when plug out because hotplug detect need it.

make hdmi probe before dp otherwise the shared power domain will be
close after dp probe and cause splash screen when starting kernel if
hdmi uboot logo display

Change-Id: I82ba1abdaf7567173df9ad900d57eca0e6be3932
Signed-off-by: xuhuicong <xhc@rock-chips.com>

clk: rockchip: rk3399: Don't allow VPLL as aclk_cci clock source

vpll is just for dclk_vop.
Don't allow are other child under the VPLL.

Change-Id: I755348b4104b532c693c6874127a25721187a4ad
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>

thermal: rockchip: rk3368: fix efuse value of temp ajust code issue

bit 7 of efuse value of temp ajust code indecates positive or negtive.
if bit 7 is set, it indecats a negtive ajust code.

Change-Id: I2b604b6b5e566df08b871c817cf25541292575bc
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>

drivers: video: rockchip: vcodec_dma_map_sg maybe fail

switching front and rear camera, maybe cause memory exhausted.
in this case, vpu driver must print a warning.

Change-Id: I60f3bfb662f42025624988a5a09ce7f69b358ea6
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>

arm64: dts: rk3368-android: enable iep default

Change-Id: Ifcffd957c916b384c32915c4c23c1ad405e4e40e
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>

arm64: dts: rk3368: add iep device node

Change-Id: I1ce93563fdb65c74ddd6afc73a1a96ed9353cfa6
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>

arm64: dts: rk3399-android: enable iep default

Change-Id: Ic32c5d3f4332f5e0e548e4d0c75b8fd252ff10dc
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>

arm64: dts: rk3399-android-6.0: enable iep default

Change-Id: Icb886247d24b631c2064481b1d6840e82d60c63e
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>

arm64: dts: rk3399: add iep device node

Change-Id: I725d4668fd5fa29f94055d8ce36b81bcd29c2d52
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>

arm64: dts: rk3399-android-6.0: remove iep device node

Change-Id: I26bd7e659c929cba3d67ad623b09bfdad260b281
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>

arm64: dts: rockchip: rk3368 emmc add property 'mmc-hs200-1_8v'

Add property 'mmc-hs200-1_8v' for emmc, to support hs200, and
remove the unused property caps2-mmc-hs200.

Change-Id: I9040d004bf78987d5bed7e49ad891c47a47970a9
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

video: rockchip: iep: add drm support

iep drm support is similar with vcodec drm support. change the allocator
part from ion to drm.

Change-Id: I67c7ac795b768c85e80817262a947a20e9804ec8
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>

video/rockchip: rga2: use axi safe reset

RGA2_SYS_CTRL bit[6] a safe reset, it would be ensure all
axi write/read operation into completion

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

rk: gcc-wrapper.py ignore memcontrol.c:5337

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

Merge tag 'lsk-v4.4-17.03-android' of git://git.linaro.org/kernel/linux-linaro-stable.git

LSK 17.03 v4.4-android

* tag 'lsk-v4.4-17.03-android': (166 commits)
  Linux 4.4.55
  ext4: don't BUG when truncating encrypted inodes on the orphan list
  dm: flush queued bios when process blocks to avoid deadlock
  nfit, libnvdimm: fix interleave set cookie calculation
  s390/kdump: Use "LINUX" ELF note name instead of "CORE"
  KVM: s390: Fix guest migration for huge guests resulting in panic
  mvsas: fix misleading indentation
  serial: samsung: Continue to work if DMA request fails
  USB: serial: io_ti: fix information leak in completion handler
  USB: serial: io_ti: fix NULL-deref in interrupt callback
  USB: iowarrior: fix NULL-deref in write
  USB: iowarrior: fix NULL-deref at probe
  USB: serial: omninet: fix reference leaks at open
  USB: serial: safe_serial: fix information leak in completion handler
  usb: host: xhci-plat: Fix timeout on removal of hot pluggable xhci controllers
  usb: host: xhci-dbg: HCIVERSION should be a binary number
  usb: gadget: function: f_fs: pass companion descriptor along
  usb: dwc3: gadget: make Set Endpoint Configuration macros safe
  usb: gadget: dummy_hcd: clear usb_gadget region before registration
  powerpc: Emulation support for load/store instructions on LE
  ...

Change-Id: I4db95bbe5b2523e19ddf22b3f65863f7f6d46632

arm64: dts: rockchip: rk3368 emmc add property 'caps2-mmc-hs200'

Change-Id: I5735f2168de63abe2a00ef550495f6561bfde1cb
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

ARM64: dts: rk3399-android: set ddc scl clock rate to 50KHz

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

drm: bridge: dw-hdmi: set ddc scl clock rate according to dts

To set dw hdmi i2c bus adapter scl clock rate, we introduce two device
tree parameter, ddc-i2c-scl-high-time-ns and ddc-i2c-scl-low-time-ns.

ddc-i2c-scl-high-time-ns: how many ns SCL hold high
ddc-i2c-scl-low-time-ns: how many ns SCL hold low

After measurement, 50KHz scl clock rate recommended configuration is:

&hdmi {
ddc-i2c-scl-high-time-ns = <9625>;
ddc-i2c-scl-low-time-ns = <10000>;
};

100KHz recommended configuration is:
&hdmi {
        ddc-i2c-scl-high-time-ns = <4708>;
        ddc-i2c-scl-low-time-ns = <4916>;
};

If dts parameter is not available, the default scl rate is 100KHz.

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

usb: dwc_otg_310: add rk3288 usb otg support

This adds amend usb otg driver to support rk3328-evb board.

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

ARM64: dts: rk3328: add pdm node

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

ASoC: rockchip: add support for pdm controller

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

video/rockchip: rga2: retry 10 times when timeout

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

video/rockchip: rga2: reduce work timeout to 100ms

100ms timeout is enough, 2 second timeout is too long.

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

arm: dts: rk3288-evb: add rockchip-relinquish-port quirk for ehci

This adds force abnormal ohci relinquish port owner
and back to ehci on rk3288 SoC.

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

usb: ehci: add rockchip relinquishing port quirk support

Add a quirk to support rockchip relinquishing port from abnormal ohci
to ehci when FS/LS devices plug in.

To support this function, the rockchip-relinquish-port property must be
specified in ehci node of dt.

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

Revert "usb: ehci-platform: support no relinquishing port quirk"

This reverts commit 0fd1853df055.

We found this commit just work well for HS devices, however,
ehci_hub_control will set port owner to companion according line
status bits when FS/LS device is plugged in, so revert this one
and introduce a new workaround.

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

ASoC: rockchip: add support for rk3328 spdif

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

mmc: core: use default generic cmd6 timeout for flushing cache

We need a luxury timeout once needing some extra time to
wait for flushing cache.

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

power: rk818-battery: fix charge voltage table define error

Change-Id: Ica6f1a11846a93485847406fdcd914d76662eda4
Signed-off-by: chenjh <chenjh@rock-chips.com>

UPSTREAM: drm/edid: Extract SADs properly from multiple audio data blocks

SADs may span multiple CEA audio data blocks in the EDID.

CEA-861-E says:
"The order of the Data Blocks is not constrained. It is also possible
to have more than one of a specific type of data block if necessary to
include all of the descriptors needed to describe the sink’s capabilities."

Each audio data block can carry up to 10 SADs, whereas the ELD SAD limit
is 15 according to HDA 1.0a spec. So we should support at least two data
blocks. And apparently some devices take a more liberal interpretation
and stuff only one SAD per data block even when they would fit into one.

So let's try to extract all the SADs we can fit into the ELD even when
they span multiple data blocks.

While at it, toss in a comment to explain the 13 byte monitor name
string limit which confused me at first.

Cc: Arturo Pérez <artur999555@gmail.com>
Tested-by: Arturo Pérez <artur999555@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94197
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1457554066-8739-1-git-send-email-ville.syrjala@linux.intel.com
(cherry picked from commit 7c01878254daadbb91f5b1137b7404d952e3931b)
Change-Id: I18c5c64b69802a6a50de624d55b4b5217943b76e
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

arm64: rockchip_defconfig: enable CONFIG_PHY_ROCKCHIP_DP

Change-Id: Icdaad2e5aa8b54b0b27a6770e9d6354b13822900
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>

drm: bridge: dw-hdmi: add debugfs node

Create two debugfs node to debug hdmi controller and phy.

Use following command to debug:
Read hdmi controller register:
cat /d/dw-hdmi/ctrl
Read hdmi phy register:
cat /d/dw-hdmi/phy
Write hdmi controller register:
echo <reg> <val> > /d/dw-hdmi/ctrl
Write hdmi phy register:
echo <reg> <val> > /d/dw-hdmi/phy

<reg> and <val> is hexadecimal.

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

video: rockchip: vpu: clear mmu status when vpu reset

Change-Id: I9c8f02e5275b2a5e286b4306a2390b8cbfdcbbe5
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>

ARM: dts: rk3288: set simple_ondemand parameter for gpu

Change-Id: If69037b42d424521abd9fb1f0826441068cfd94f
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>

MALI: midgard: Linux: support custom ondemand_data

get parameter from dts

Change-Id: Id1b11e3d6a5809cbd4f6f52b1595562e0fa66f70
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>

clk: rockchip: add SCLK_DDRC id for rk3368 ddrc

Add the needed id for the ddr clock.

Change-Id: Ib2a4d8dffef5b393e294df49a925577f14306e72
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>

camera: rockchip: camsys version 0.0x21.0xb

some log is so boring, set print level more high.

Change-Id: I8cfe16f535718a130fa03ee7173e4ef325239e06
Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>

drm: bridge/dw_hdmi: check is_hdmi2 in hdmi_config_AVI

If a display support HDMI2.0, it must support SCDC or YCbCr420.
So we check the connector->scdc_present and mode->flags to
check the connected display is HDMI 2.0.

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

FROMLIST: drm: Add HDMI 2.0 VIC support for AVI info-frames

HDMI 1.4b support the CEA video modes as per range of CEA-861-D (VIC 1-64).
For any other mode, the VIC filed in AVI infoframes should be 0.
HDMI 2.0 sinks, support video modes range as per CEA-861-F spec, which is
extended to (VIC 1-107).

This patch adds a bool input variable, which indicates if the connected
sink is a HDMI 2.0 sink or not. This will make sure that we don't pass a
HDMI 2.0 VIC to a HDMI 1.4 sink.

This patch touches all drm drivers, who are callers of this function
drm_hdmi_avi_infoframe_from_display_mode but to make sure there is
no change in current behavior, is_hdmi2 is kept as false.

In case of I915 driver, this patch checks the connector->display_info
to check if the connected display is HDMI 2.0.

Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Jose Abreu <jose.abreu@synopsys.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
PS: This patch touches a few lines in few files, which were
already above 80 char, so checkpatch gives 80 char warning again.
- gpu/drm/omapdrm/omap_encoder.c
- gpu/drm/i915/intel_sdvo.c

Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
(am from https://patchwork.kernel.org/patch/9641449)
Change-Id: I364cd0aed7eea0384ea9eddfff20c3fa86eb9ba2
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

UPSTREAM: devfreq: rk3399_dmc: Remove dangling rcu_read_unlock()

This call never had the rcu_read_lock() counterpart. Remove the unlock
part as well.

Change-Id: Ifc5abfd7cea9a245b6edc0f50e362963ac045b7f
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
(cherry picked from commit d8323de3d4062e1b5a5aa7e9c0f935138405a582)

UPSTREAM: PM / devfreq: rk3399_dmc: Use the resource-managed function to add devfreq dev

This patch uses the resource-managed to add the devfreq device.
This function will make it easy to handle the devfreq device.

- struct devfreq *devm_devfreq_add_device(struct device *dev,
  struct devfreq_dev_profile *profile,
  const char *governor_name,
  void *data);

Conflicts:
        drivers/devfreq/rk3399_dmc.c

Change-Id: I2ba2779a1b944931dc240f0593824f0316d11985
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
(cherry picked from commit 927b75a628b1d80fef171420fbd694fc28d9b8e9)

UPSTREAM: PM / devfreq: rk3399_dmc: Fix module autoload

If the driver is built as a module, autoload won't work because the module
alias information is not filled. So user-space can't match the registered
device with the corresponding module.

Export the module alias information using the MODULE_DEVICE_TABLE() macro.

Before this patch:

$ modinfo drivers/devfreq/rk3399_dmc.ko | grep alias
$

After this patch:

$ modinfo drivers/devfreq/rk3399_dmc.ko | grep alias
alias:          of:N*T*Crockchip,rk3399-dmcC*
alias:          of:N*T*Crockchip,rk3399-dmc

Change-Id: I4bffd86067bb487619ce8365532123938a0ca964
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
(cherry picked from commit 2f3f1a261c0f4827bda86009f0059aefbe30ed11)

UPSTREAM: PM / devfreq: rk3399_dmc: Remove explictly regulator_put call in .remove

Current code uses devm_regulator_get() in .probe so a regulator_put() will
be automatically called when unload the module. Remove the explictly
regulator_put() call and then we can also remove rk3399_dmcfreq_remove().

Change-Id: I56a62a76f06403aff9ad0478e7701862084a90b3
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
(cherry picked from commit da4a64481b3504a6f4f07c08ff03be8f08d9638d)

clk: rockchip: rk3288: add gate id of hclk_usb_peri for usb otg

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

drm: bridge: dw-hdmi-i2s-audio: enable INSERT_PCUV bit for LPCM

dw-hdmi introduced insert_pcuv bit in version 2.10a. When
set (1'b1), this bit enables the insertion of the PCUV
(Parity, Channel Status, User bit and Validity) bits on the
incoming audio stream (support limited to Linear PCM audio).

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

ARM: rockchip_defconfig: enable dwc2 driver

Change-Id: Ie84fb1d496f18114da988f52e1a9e4b240013844
Signed-off-by: William Wu <wulf@rock-chips.com>

arm64: rockchip_linux_defconfig: enable PCIe config

Change-Id: I7be6a725eb0043d135d166939ecde3c6f47b24f9
Signed-off-by: hero.huang <hero.huang@rock-chips.com>

rk808: rtc: set rtc stopped by default

set rtc stopped by default, start rtc in rtc device probe.
add rtc node, whether RTC need to initialize.

Change-Id: Ifab269786f316d33149a50a18e23af1b6206d57d
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>

arm64: dts: rockchip: enable pcie_phy for Sapphire board

Change-Id: Ia59a697ee27d4f4848f3fceb344f362b7fdcae73
Signed-off-by: hero.huang <hero.huang@rock-chips.com>

arm64: rockchip_defconfig: update by savedefconfig

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

phy: rockchip-dp: fix unexpected reset 24m clock

Reset_control_assert/reset_control_deassert will not check whether
the incoming pointer is NULL, so we need to check it before using it.

Change-Id: Ib2aeeefcb2d5d7429031bc21bf7e3df1d897a6c9
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>

arm: dts: rk3288-evb: add ion support

Change-Id: Icbdba5ef01681e4ab107a5af295cfa9e51215288
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

drm/rockchip: rga: replace primitive api with dma sync api

Since rga is a dma-coherent device, we have to use drm bus
 device to call sync api.

Change-Id: Ia12062293fabba083c8ab9c4f7457e3167807bb9
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>

usb: dwc_otg_310: remove unused configs

The USB20_HOST_EN and USB20_OTG_EN configs are used
for rockchip dwc2 legacy driver, they are not needed
for dwc_otg_310 driver.

Change-Id: I4c16f0be5276b3c07429ab88cb063508b34ce007
Signed-off-by: William Wu <wulf@rock-chips.com>

arm: rockchip_defconfig: enable dwc_otg_310 usb driver

This adds enable dwc_otg_310 driver for dwc otg and host.

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

usb: dwc_otg_310: fixed compilation error

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

ARM64: dts: rockchip: configure EAS data for rk3368

Change-Id: I3154b1ae060553b7919c213420782f7a1f5d36fc
Signed-off-by: Chen Liang <cl@rock-chips.com>

arm64: dts: rk3368-android: Add eDP route node

Change-Id: I824d7a1c15cf7cddcb2e3f080498bd23e269be40
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>

arm64: dts: rockchip: Add eDP node for rk3368

Change-Id: I0fa5ddc12cdbb2bf1d9fb0667222ead15071bdec
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>

phy: rockchip-dp: Add support for rk3368 Display Port PHY

Change-Id: Ic2134ba719dadba121dc2fcc944662ef06b2ecfa
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>

drm/rockchip: analogix_dp: Add support for RK3368 eDP

Change-Id: I738ddf122776081cf41adef2921644ddfc6e07dd
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>

clk: rockchip: rk3368: set hclk_vio_noc as critical clock

to fix up the display shaking when uboot to kernel show.

Change-Id: I5f85028921d76a2dea752aafe7420b05b041bc8e
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>

arm: dts: rk3288-evb: add support for GSL3673

GSL3673 is a touchscreen device, let support it.

Change-Id: I4bf302c395491ca49a1874c8984caa0b49cfb326
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

arm: dts: rk3288: move i2c0 to the front of other i2c

Change-Id: I822622fc1f1ed41729851294858246cf6da8c202
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

FROMLIST: drm: bridge: dw-hdmi: add HDMI vendor specific infoframe config

Vendor specific infoframe is mandatory for 4K2K resolution
and stereoscopic 3D mode.
Without this, the HDMI protocol compliance fails.
(am from https://patchwork.kernel.org/patch/9636115/)

Change-Id: I97ebe1b139eff7fe69cc9f393b40426134588b91
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Reviewed-by: Jose Abreu <joabreu@synopsys.com>

arm64: dts: rockchip: update thermal config and add gpu's parameters for rk3368

add both static and dynamic power coefficient for gpu
module, and add gpu as a cooling device in the thermal zone.
rename the thermal zone's config and make it more readable.
update temperature pooling interval and make the temperature
control more effective.

Change-Id: I6e0939fe26ece9c611151ffbbb55e62b824a602f
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>

arm64: dts: rk3368-p9: fix backlight polarity err

Change-Id: I3dc9376b60f3c6acba67cfb379944c7c969b2ffc
Signed-off-by: Zorro Liu <lyx@rock-chips.com>

drm/rockchip: vop: correct rk3368/rk3366 feature

RK3368/RK3366 not support 10bit output

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

arm: dts: rk3288-evb: use rockchip_key to replace adc_key

Change-Id: I46df35c489bf15a159eb64a2d5e3d0b3510f6bef
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

Input: add document for rockchip keys

Change-Id: I3f8f4522e6279e3f5faf3f293936c835ce8fc6b7
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

ARM: rockchip_defconfig: update defconfig

Change-Id: I594981b15c098d78313c4c17572cfbab643dbc9a
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

video/rockchip: rga2: fix compilation warning

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

rk: Makefile set default CROSS_COMPILE for arm

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

usb: otg: modify default to n for usb2.0

Change-Id: I6dc85a9fbf89b35afe67fc119f0d60a130691317
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

arm64: dts: rk3399-box: fix dp and hdmi dclk parents

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

arm64: dts: rk3368: modify rksdmmc to dwmmc

Modify rksdmmc to dwmmc, sync with upstream.

Change-Id: I0aabcf47a5fe1b1f564bde2f719d8c1c48debc90
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

staging: ion: dup sg_table when map_dma_buffer

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

arm64: dts: rockchip: rk3399: add aclk/hclk_vop init freq

to fix up the display error when no uboot logo show.

Change-Id: I6227391a3c0d015a5fa6ae916d849659d5957077
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>

video/rga: fix rga support flip

Change-Id: Ib5283779e08d1e58ff8a1fb5e3eb662aa8f0d130
Signed-off-by: Zikim,Wei <wzq@rock-chips.com>
(cherry picked from commit 7318eabddc3799460319181f9ffd34f2116a9e46)

video/rockchip: rga: replace system_nrt_wq with system_wq

Change-Id: Id79ba17575b5844c329391a6e33e0f2f0c4353ff
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

video: rockchip: vpu: alloc & mmap iova inside drm allocator

since on 3368 platform, hevc & vpu share the same hardware
resource, but have two independent mmu. and only one mmu can
be attached at the same time. I have to alloc and mmap iova
outside mmu attached status, otherwise it will cause mmu reset
error.

fix bugs:
1. hevc & vpu can work at the same time now. on 3368 platform,
vpu_mmu and hevc_mmu share the same irq with their respective
master device, we can not detach mmu during irq context.
2. fix copy_sgt offset and lenght invalide value

Change-Id: I9d02aa0b85a6d0690832c7869a260953f5a5baab
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>

mmc: rm rk_sdmmc.c

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

video: rockchip: vpu: add rk3368 support

3368 is vpu & hevc combo platform which have a virtual master device
and two sub devcie - vpu_service & hevc_service. There is a flag in
grf, driver need write or erase this flag when switch mode.

since shutdown function only be called on virtual master device, we
need to call into both vpu and hevc device.

Change-Id: I56ad28dbbc7cc380204fb7d0da11d93b5ace9469
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>

ARM64: dts: rk3368-android: enable vpu_combo default

Change-Id: I7b130e3d0787c441f862030f8a935063af818e01
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>

ARM64: dts: rk3368: add vpu & hevc node

Change-Id: Iee8fb808ad0c929be8fa5db8164fd6e05321b352
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>

arm: dts: rk3288-evb: disable uart 1/3/4

Uart3 has been iomux to gpio, for vcc_3g regulator, which is designed
on rk3288 evb main board.

Disable unused uarts to fix gpio request blaim during system booting.

Change-Id: I2eb79ae63a6f226255c12fc3da9ba95ec4219d32
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

arm: dts: rk3288-evb: fix regulator 'No configuration' error

SYR827/SYR828 regulators complain "No configuration", which caused by
lacking of regulator-state-mem.

Change-Id: Id113c05abb8fb095bf09979b5eb8ea1c4891037b
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

staging: ion: add dma_map_sg/dma_umap_sg to map_dma_buf

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

iommu/rockchip: add multi irq support

there are two irq in vpu_mmu on 3368 platform.

Change-Id: I81d869c1ee536e31334a401a2ddb0e7f2226d4b2
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>

arm: dts: rk3288-evb: remove memory node

Change-Id: I84b2397dea92eb0e7cc926c17515c16f98854ad4
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

arm: dts: rk3288-evb: add copyright

Change-Id: I4a68728a38d725a39bfefc51a3b188be94ffe87c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

arm: dts: rk3288-evb: add earlycon to args of cmdline

Change-Id: I4a7ce913deac9e88a9660c960c9fed746226db78
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

drm/drm-prime: cache dma_buf import context

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

dma-buf: add release callback support

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