Commit Graph

602127 Commits

Author SHA1 Message Date
chenzhen
40b400f156 MALI: utgard: read parameters of power model from device tree
Change-Id: I6e71100b77b98d2994c0b284b992942e696b023a
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-06-29 16:08:51 +08:00
Sugar Zhang
c5e5df7b59 arm: dts: rk3288-android: rename card name
Change-Id: I62a9de19b115f96f0b55b1dad696816e623868d4
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2017-06-29 16:04:01 +08:00
Sugar Zhang
9a961be14d ASoC: hdmi_analog: add snd_card's name parsing from DT node support
Change-Id: Ie0fcd8ccbac5686b53261cf37a82921e05875dee
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2017-06-29 16:02:55 +08:00
Tang Yun ping
a901869bbd arm: dts: rockchip: enable dfi and dmc nodes for rk3288 rk818 edp board
Change-Id: I13d7de4810cc5d101db751f32afeaa3815a4727b
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2017-06-29 16:02:25 +08:00
chenzhen
4052bfdd13 arm: dts: rockchip: rk3328: add gpu_power_model in gpu node
Indeed, the values of the model parameters are supplied by Rocky Hao.

Change-Id: I23edaa0ee104d07f79f5bf5bdbd393b4fb3c5120
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-06-29 15:30:09 +08:00
chenzhen
6e3ee4de85 arm: dts: rockchip: rk322x: add gpu_power_model in gpu node
Indeed, the values of the model parameters are supplied by Rocky Hao.

Change-Id: Ie6ff535eab3a1fabcd69289a0c1f32c76603a391
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-06-29 15:26:58 +08:00
Zheng Yang
572c465358 drm: rockchip: hdmi: check sink max_tmds_clock in mode_valid
If sink max TMDS clock < 340MHz, we think the mode pixel clock
greater than 340MHz should support YCbCr420, or it is a bad mode.

Change-Id: I9f53fa4f9875977ae0355b65d9ccd8a304558c5d
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2017-06-29 14:20:49 +08:00
Huang zhibao
e68ba0f6dd arm64: dts: rk3368-r88: enabled usb host
Change-Id: I02dbdeebb15221076a2e1c415e5e6e8bccb484b2
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
2017-06-29 14:16:14 +08:00
xubilv
9e30cc3b63 arm: dts: rk3288: remove cpll from cru
Change-Id: Iad4df450078a805abbeca5c271a75f40f2fefa6c
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-06-29 11:47:07 +08:00
xubilv
1ba8e8e114 arm: dts: rk3288: support mipi dsi uboot display for rk818 evb
Change-Id: Id1b225de0905df9fe7837614b11b523f4b202c74
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-06-29 11:45:16 +08:00
xubilv
8d3966e35f clk: rockchip: 3288: dclk will change if cpll initialized
Change-Id: I698437b21c94684af0a7dfbe643794de62edc962
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-06-29 11:45:06 +08:00
Tang Yun ping
db73f668ab arm: dts: rk3288: add dfi and dmc device nodes
Add dfi and dmc nodes in the device tree for the ARM rk3288 SoC.
To support ddr frequency scaling function, we need enable dmc and
dfi nodes.

Change-Id: Ib796c08c694e74e0da3319d2797e95aecf3e7e73
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2017-06-29 09:49:17 +08:00
Tang Yun ping
5c906a2193 PM / devfreq: assign set_auto_self_refresh for rk3288
This makes ddr possible to enter auto self-refresh mode
when early suspend.

Change-Id: I0cd214bcb9c8e82aeea3f335a77be21feb356e2d
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2017-06-28 16:14:12 +08:00
Zheng Yang
0637d2d637 drm/edid: Clear the old hdmi info before parsing display info
The current EDID might not support advanced HDMI 2.0 features.
Leaving old hdmi info in the drm_display_info will make display
work not okay, when switching display from HDMI 2.0 device to
HDMI 1.4 device.

Change-Id: Ifaf11a115580a93ec00160d54f0d453842d7b484
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2017-06-28 15:06:55 +08:00
Sugar Zhang
ec32dc61d2 arm: dts: rk3288-android: enable built-in hdmi and rt5640 sound
This patch use one cpudai->multicodecs card for built-in hdmi and
external codec which share the same i2s controller.

Change-Id: Ib56d7f10b6739b1c26ec8946470b9f0cd7215979
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2017-06-28 10:45:52 +08:00
Sugar Zhang
e66d174f6e arm: configs: rockchip: enable SND_ROCKCHIP_HDMI_ANALOG
This patch enable SND_ROCKCHIP_HDMI_ANALOG for built-in hdmi sound
and external codec which share the same i2s controller.

Change-Id: I3ac29ba12f75c938e015d2b77a3b749888c2e4c2
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2017-06-28 10:45:52 +08:00
Jianqun Xu
240b24588c ARM: dts: rk3288: fix to timer0 for broadcast timer
Change-Id: I0dd9a367c2587391b17ab9bb3a4610abdee14816
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-06-28 10:09:20 +08:00
xuhuicong
7f4985d21c arm64: dts: rk3368-r88: add hdmi sound card
Change-Id: I2a81102c7e110a2fe36ec8ba3622ebb63cc91066
Signed-off-by: xuhuicong <xhc@rock-chips.com>
2017-06-27 18:25:57 +08:00
buluess.li
5150079e68 arm: dts: rk3288: add iep node and enable it
Change-Id: Ie7fe0bbc91a5fedb0617d9b6c6056bdb4aed610d
Signed-off-by: buluess.li <buluess.li@rock-chips.com>
2017-06-27 18:25:09 +08:00
buluess.li
cb76f82440 input: touchscreen: gsl3673: to solve the boot and resume slowly
when boot and resume,the fw should load/reload,this will take up
much time in the main thread,so here add a thread to load/reload
fw in order to void this situation.

Change-Id: Ic1a67fd662b0406ede08b0aeb944525fabc519e6
Signed-off-by: buluess.li <buluess.li@rock-chips.com>
2017-06-27 18:23:34 +08:00
Rocky Hao
a5acf91cc0 arm: dts: rockchip: rk3288: update tsadc's working frequence
tsadc in rk3288 can not work well at 10k hz clock. at most time, tsadc
in rk3288 can work well, but it will wrongly report a very high
temperature (eg. 110 degree) occasionally.  we set 5k hz can
resolve this issue.

Change-Id: I06a4a1631baa5f65786a524e2430bb2386f52bdf
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2017-06-27 17:54:05 +08:00
Zheng Yang
afb31b9c18 Revert "FROMLIST: drm: edid: HDMI 2.0 HF-VSDB block parsing"
This reverts commit 6e9aa006c4.

UPSTREAM code has support parsing HDMI.20 HF-VSDB.

Change-Id: Ia25ee6a92e9a2fee4b3356446c1198e938c5e74d
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2017-06-27 17:22:33 +08:00
Zheng Yang
31fa2abc81 drm: bridge: dw-hdmi: use scdc struct and function defined in upstream
Change-Id: I32c81abd842d61559032668d609bf479daac2666
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2017-06-27 17:22:09 +08:00
Shashank Sharma
2ea023ac38 UPSTREAM: drm/edid: detect SCDC support in HF-VSDB
This patch does following:
- Adds a new structure (drm_hdmi_info) in drm_display_info.
  This structure will be used to save and indicate if sink
  supports advanced HDMI 2.0 features
- Adds another structure drm_scdc within drm_hdmi_info, to
  reflect scdc support and capabilities in connected HDMI 2.0 sink.
- Checks the HF-VSDB block for presence of SCDC, and marks it
  in scdc structure
- If SCDC is present, checks if sink is capable of generating
  SCDC read request, and marks it in scdc structure.

V2: Addressed review comments
  Thierry:
  - Fix typos in commit message and make abbreviation consistent
    across the commit message.
  - Change structure object name from hdmi_info -> hdmi
  - Fix typos and abbreviations in description of structure drm_hdmi_info
    end the description with a full stop.
  - Create a structure drm_scdc, and keep all information related to SCDC
    register set (supported, read request supported) etc in it.

  Ville:
  - Change rr -> read_request
  - Call drm_detect_scrambling function drm_parse_hf_vsdb so that all
    of HF-VSDB parsing can be kept in same function, in incremental
    patches.

V3: Rebase.
V4: Rebase.
V5: Rebase.
V6: Addressed review comments from Ville
  - Add clock rate calculations for 1/10 and 1/40 ratios
  - Remove leftovers from old patchset
V7: Added R-B from Jose.
V8: Rebase.
V9: Rebase.
V10: Rebase.

Change-Id: I14d2a5585a528b7195170a4202be87199eb858c6
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-5-git-send-email-shashank.sharma@intel.com
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from 62c58af32c)
2017-06-27 17:18:46 +08:00
buluess.li
96aa175dae arm: dts: rk3288-evb: set i2c4 clock frequency to 400khz
Change-Id: I849a99d147e9336ba81cd25c92594ffb1289cb53
Signed-off-by: buluess.li <buluess.li@rock-chips.com>
2017-06-27 17:18:12 +08:00
Shashank Sharma
c0486e8458 UPSTREAM: drm/edid: detect SCDC support in HF-VSDB
This patch does following:
- Adds a new structure (drm_hdmi_info) in drm_display_info.
  This structure will be used to save and indicate if sink
  supports advanced HDMI 2.0 features
- Adds another structure drm_scdc within drm_hdmi_info, to
  reflect scdc support and capabilities in connected HDMI 2.0 sink.
- Checks the HF-VSDB block for presence of SCDC, and marks it
  in scdc structure
- If SCDC is present, checks if sink is capable of generating
  SCDC read request, and marks it in scdc structure.

V2: Addressed review comments
 Thierry:
 - Fix typos in commit message and make abbreviation consistent
   across the commit message.
 - Change structure object name from hdmi_info -> hdmi
 - Fix typos and abbreviations in description of structure drm_hdmi_info
   end the description with a full stop.
 - Create a structure drm_scdc, and keep all information related to SCDC
   register set (supported, read request supported) etc in it.

Ville:
 - Change rr -> read_request
 - Call drm_detect_scrambling function drm_parse_hf_vsdb so that all
   of HF-VSDB parsing can be kept in same function, in incremental
   patches.

V3: Rebase.
V4: Rebase.
V5: Rebase.
V6: Rebase.
V7: Added R-B from Jose.
V8: Rebase.
V9: Rebase.
V10: Rebase.

Change-Id: I93cd26ee5c51c3714eb702e8a1bd1b335385f26e
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-4-git-send-email-shashank.sharma@intel.com
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit afa1c76365)
2017-06-27 17:10:49 +08:00
Thierry Reding
ac24bfd495 UPSTREAM: drm/edid: check for HF-VSDB block
This patch implements a small function that finds if a
given CEA db is hdmi-forum vendor specific data block
or not.

V2: Rebase.
V3: Added R-B from Jose.
V4: Rebase
V5: Rebase
V6: Rebase
V7: Rebase
V8: Rebase
V9: Rebase
V10: Rebase

Change-Id: Ie787aa71b17a5aad6b30722872e9befe79803baa
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-3-git-send-email-shashank.sharma@intel.com
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit 50dd1bd1e2)
2017-06-27 17:01:51 +08:00
Jianqun Xu
cb39b5bcd6 scripts/gcc-wrapper.py: ignore drm_edid.c:3506
Change-Id: I3363df9995e27dedb4b0b461e210f872b7ef83c8
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-06-27 17:01:50 +08:00
Zheng Yang
6321294fd3 drm: bridge: dw-hdmi: correct the judgment condition of curr_ctrl
The judgment condition of curr_ctrl is curr_ctrl->mpixelclock. It is
a hand mistake of commit <594a077e31e8b1ff0bd192e9af702fecaeea31ba>,
when patch(https://patchwork.kernel.org/patch/9603303) is merged.

Change-Id: I40b150e4f166aa4ca05c078f52347764bdd1fd01
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2017-06-27 16:55:10 +08:00
buluess.li
5d7bb4cadc arm: rockchip_defconfig: enable CONFIG_IEP
Change-Id: I2b37378eb04f2146c515e074ba4f6d83d6148a0e
Signed-off-by: buluess.li <buluess.li@rock-chips.com>
2017-06-27 16:54:41 +08:00
Sugar Zhang
50c2e3af27 ASoC: rockchip: hdmi_analog: set sysclk for codec dai
Change-Id: Ia9eabcc482451c64897b6d9d09d484da77624cbb
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2017-06-27 15:08:46 +08:00
buluess.li
8f74840178 video: rockchip: iep: compatible for did not config CONFIG_FB_ROCKCHIP
if there not config CONFIG_FB_ROCKCHIP that will build error

Change-Id: Icaa837f3c0a539e98133b7cb9550700e8a46817f
Signed-off-by: buluess.li <buluess.li@rock-chips.com>
2017-06-27 14:47:48 +08:00
Wenping Zhang
e00cd14512 ARM: dts: rockchip: add power key support on gva sdk board.
Change-Id: I10046d4369fad752b76e3dc518aab2c714e37eb6
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
2017-06-27 13:56:45 +08:00
Zheng Yang
20a9024d3d drm: bridge: dw-hdmi: correct the judgment condition of pll_config
The judgment condition of pll_config is phy_config->mpixelclock. It is
a hand mistake of commit <594a077e31e8b1ff0bd192e9af702fecaeea31ba>.

Change-Id: I7e312fd3b7982ca4fdf610e577776bc5a45c4bde
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2017-06-27 11:51:31 +08:00
Randy Li
46e1e5a6da arm64: dts: rk3328: enable the power domain for decoder
The decoder requests the power domain is idle status when
it is resetting. Without the power domain it won't work.

Change-Id: If3afdbefbe40bc7529f13c12444adddbb328a21b
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2017-06-27 10:19:27 +08:00
Finley Xiao
d1263c3be2 arm64: dts: rk3368: add system-status-freq and auto-freq-en properties for dmc
Change-Id: I4e1190548ab9e4a6167de7a04541e1e2db69481f
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-06-27 10:19:07 +08:00
xuhuicong
88bd00640f drm: bridge/dw-hdmi: add platform_device_unregister when remove
Change-Id: I7fdc7046b0065329abddbe503c9acd576175670a
Signed-off-by: xuhuicong <xhc@rock-chips.com>
2017-06-27 08:12:15 +08:00
algea.cao
e385b101d3 arm64: rockchip_defconfig: enable drm tve
Change-Id: Ic1fb7387191a16cb37f690ce300ff0814af51c9c
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
2017-06-26 18:24:02 +08:00
algea.cao
c69d61610a ARM64: dts: rk3328-evb: enable tve
tve is enabled by default.

Change-Id: I43f9103a0a8d3078031e5d32a1d99602fb0a96ed
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
2017-06-26 18:22:58 +08:00
algea.cao
a1fdea0e0c ARM64: dts: rk3328: add tve display node
support rk3328 cvbs.Some display parameter can be configured,
such as saturation.For more information, please check
Documentation/devicetree/bindings/display/rockchip/rockchip_drm_tve.txt

Change-Id: Ifcc074a34910b58a26fc309fc601494562851025
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
2017-06-26 18:22:39 +08:00
Finley Xiao
92658e5cc7 arm64: dts: rk3399: remove 297MHz and add 300MHz for dmc
Only 200MHz, 300MHz, 400MHz, 528MHz, 600MHz, 666MHz, 732MHz and
800MHz are available at present.

Change-Id: I48ed7e6e6f636389fbc239b1cca201f5c5f19d7a
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-06-26 18:16:59 +08:00
Finley Xiao
a0105915c6 PM / devfreq: assign set_auto_self_refresh for rk3368
This makes it possible to enter ddr self-refresh mode
when early suspend.

Change-Id: Ib72f391af00674a3c3ab32bbbd4e4a857d3354e8
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-06-26 17:58:21 +08:00
Finley Xiao
237df2a04b PM / devfreq: rockchip_dmc: change frequency according to system status
This registers a reboot notifier, it will change ddr frequency to a
specified value when reboot system.

This registers a fb notifier, it will change ddr frequency to a specified
value and enable ddr self-reflash mode when early suspend.

This adds a new sysfs node system_status, so that different system status
can change ddr frequency through the node.

Change-Id: Ib5d7d5bd8ee82c29f6f260a3d2ffcb829dde2003
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-06-26 17:58:04 +08:00
Finley Xiao
7e1f848e15 soc: rockchip: introduce system status notifier
This makes dmc driver possible to register a system status notifier and
other drivers possible to call the notifier call-back easily, so that
the dmc driver can change frequency according to different system status.

Change-Id: I1a4fb4649366d75310d2e29f87775bb2d9ca3d67
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-06-26 17:56:39 +08:00
Wenping Zhang
f736e71ba8 ARM: dts: rk3229-gva-sdk: remove memory node in dts.
Use memory region passed from uboot. 

Change-Id: I8bd1c320cd1824fab9f2bc39213e24aa2fbcbc7b
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
2017-06-26 16:16:48 +08:00
xuhuicong
185e3ecd1f drm: bridge: dw-hdmi: add debugfs_remove_recursive when unbind
On RK3328, dw-hdmi driver is reloaded after bind and unbind
then it will use the first register debugfs address if no run
debugfs_remove_recursive, and cause system crash.

Change-Id: Iafa6b4059962b62c79157a9cf6c3e1d56df48f03
Signed-off-by: xuhuicong <xhc@rock-chips.com>
2017-06-24 18:23:37 +08:00
Huang, Tao
dd19ce4b83 ARM: dts: rockchip: convert rk3288 device tree files to 64 bits
In order to be able to use more than 4GB of RAM when the LPAE is
activated, the dts must be converted in 64 bits.

Most of the changes by the following commands:
sed -e 's/0xff/0x0 0xff/g' -e 's/0x0 0xff[[:xdigit:]]\{6\}/& 0x0/g'
sed 's/reg = <0x0 0x80000000>/reg = <0x0 0x0 0x0 0x80000000>/'
sed 's/reg = <0 0x80000000>/reg = <0x0 0x0 0x0 0x80000000>/'
sed 's/reg = <0 0x8000000>/reg = <0x0 0x0 0x0 0x8000000>/'

Change-Id: Ic4711ae04abc03db9ee09f78223a955a66a85d60
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2017-06-23 16:19:31 +08:00
Mark Yao
32914eebfa drm/rockchip: vop: correct vop register's version
Change-Id: Ic7a85e3107501ed652b79e41a7c849b7538f0f81
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-06-23 16:17:12 +08:00
Zhang Zhijie
b04da73d7f OP-TEE: remove macro SWITCH_CPU0_DEBUG
Now OP-TEE OS can run in muti-core state,
so don't need switch to cpu0 anymore.'

Change-Id: I4f61120250823d6e2e13e2edeee58c26a184b7d2
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
2017-06-23 16:16:58 +08:00
huweiguo
0ee648d77c arm64: dts: rk3368-r88: wifi work up
Change-Id: I3b110916ac835be300253133a1977c7fd44bf332
Signed-off-by: huweiguo <hwg@rock-chips.com>
2017-06-23 15:53:21 +08:00