Commit Graph

602107 Commits

Author SHA1 Message Date
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
xuhuicong
e0da313aa4 drm: bridge: dw-hdmi: set hdcp1x_enable in the dts so uboot can visit
Change-Id: Ibaf91c5beac2355e5c270f1edb69a63795dbff6a
Signed-off-by: xuhuicong <xhc@rock-chips.com>
2017-06-23 15:51:56 +08:00
WeiYong Bi
05dd7934ce clk: rockchip: rk3228: add CLK_IGNORE_UNUSED flag for vio_h2p
Change-Id: Ieca7abf5d01f70db09aa0fcc77b838c106f4fc87
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-06-23 15:22:03 +08:00
Finley Xiao
37648ee775 clk: rockchip: rk3228: fix some PLL_NUX_CLKs' gates
Some PLL_NUX_CLKs' gates is actually behind muxs according to latest TRM,
so move the gates to composite clocks and amend their parent clocks.

Change-Id: Ib6043caa61e9df0473f2d0bdc756850968bb2a55
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-06-23 11:58:55 +08:00
Finley Xiao
011fafcfa0 clk: rockchip: rk3228: fix gpu gate-register
Fix a typo making the aclk_gpu and aclk_gpu_noc access a wrong register to
handle its gate.

Change-Id: Ie0bac8014363af7c0409b8a56eacf2e858818843
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-06-23 11:58:46 +08:00
huweiguo
ec6e78e958 arm64: dts: rk3368-r88: gmac work up
Change-Id: I43ffe5abe8293232f026f4696b17b36024d392cd
Signed-off-by: huweiguo <hwg@rock-chips.com>
2017-06-23 09:50:08 +08:00
David Wu
6edd38d8c5 ARM: dts: rockchip: Reduce the time of phy reset for rk3288-evb
It is too long to reset the time with 1000ms, which
would make the system init and resume slowly, 50ms
is enough.

Change-Id: Ifba39f401d14e161dd3d49e1b20ae102569ebb58
Signed-off-by: David Wu <david.wu@rock-chips.com>
2017-06-22 21:18:54 +08:00
algea.cao
69a8f47034 arm64: rockchip_linux_defconfig: enable drm tve
Change-Id: I1e3ddee6b8f0b1987604fff727d4e33ef35c7d5c
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
2017-06-22 21:18:53 +08:00
algea.cao
c64bc3bdfa drm/rockchip: vop: support rk3328 linux drm cvbs
Change-Id: Ie412fb30794b0addb2a4a0844af65e8356ab98c0
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
2017-06-22 21:18:53 +08:00
algea.cao
ce0eedfcb2 drm/rockchip: support rk3328 linux drm cvbs
This adds support for Rockchip CVBS found on rk3328 Linux.
The CVBS driver is based on the DRM framework.
NTSC(720x480i60hz) and PAL(720x576i50hz) modes are supported.
it's worth noting that rk3328 CVBS dclk is base on hdmi clk,so hdmi
should be enabled.

Change-Id: I059808111bfa96724eb629b6fc37915a4852e234
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
2017-06-22 21:18:47 +08:00
huweiguo
e0436fde65 net: wireless: rockchip_wlan: add rtl8189fs support
update rtl8189fs wifi driver to version v4.3.24.8_22657.20170607

Change-Id: Ia8154d438b8d17eb334ccac0bd366f19d7b0f785
Signed-off-by: huweiguo <hwg@rock-chips.com>
2017-06-22 18:41:34 +08:00
William Wu
93ed9f2f5d Revert "usb: xhci-plat: check hcc_params after add hcd"
This reverts commit 4301c33db2.

Since we have merged upstream patch, so let's revert this patch.

Change-Id: I188629f566e50810bd633bff8cc63edda42efe28
Signed-off-by: William Wu <william.wu@rock-chips.com>
2017-06-22 10:57:27 +08:00
wlq
e6d194d389 arm64: dts: rk3399-mid: add otg switch regulator node
Change-Id: I61cb0c65c3bec7750f6b58711e7271c42c72b8bf
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2017-06-22 10:51:57 +08:00
Jianhong Chen
6ed39ee817 arm64: dts: rk3368-p9: add otg switch regulator node
Change-Id: Ia200739711b6cc88e605981c325124720b1dc105
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2017-06-22 10:51:11 +08:00
Jianhong Chen
e503851471 power: rk818-charger: set otg5v by regulator framework
because rk818 regulator driver registers all regulators into
system without checking whether they are defined in dts, so we
have to control it by regulator framework. Otherwise,
psci_system_suspend_finish() will disable it after system wakeup.

Change-Id: Ia9d9c0b7a8cf42ccee071ac0416c1ef2f711df2f
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2017-06-22 10:49:58 +08:00
Jianhong Chen
d222955baf power: rk818-charger: support set charge current by battery temperature
Change-Id: I10b71fae6400f3c0125cab7af1524c2091c8924a
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2017-06-22 10:49:34 +08:00
Huang zhibao
adf8608182 arm64: dts: rk3368-r88: r88 board work up
Change-Id: I86b88bb57d6c61b6dfd898cc45bc927c57a6c6ec
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
2017-06-22 10:48:25 +08:00
Yankun Zheng
bfdfc14d82 ARM: dts: rk3229-gva-sdk: let wifi/bt working properly
Change-Id: I548200c4e81b56cbfdaa78b86369cdb5880b1fba
Signed-off-by: Yankun Zheng <zyk@rock-chips.com>
2017-06-21 18:57:00 +08:00
Xu Xuehui
8d2949d928 arm: rockchip_defconfig: netfilter: add iptables for IPV6
Change-Id: I5c5709cc5335ce0ac5670df7fa0af41eab6e35dc
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
2017-06-21 18:56:32 +08:00
Xu Xuehui
8fcec302bf net: wireless: rockchip_wlan: fix bug for ap6335
1. fix when start softap, wifi driver crash
2. fix p2p mac addr not correct, this case p2p can not use

Change-Id: Ia9b5d7ac660ec9b954a682345c52778f7534229e
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
2017-06-21 18:55:45 +08:00
huweiguo
32d2c0fd14 net: wireless: rockchip_wlan: update rtl8189es wifi driver to version v4.3.18.4_22798.20170620
Change-Id: I257bf2273e34ea9fcc5e1f4199abed892bc1c0d4
Signed-off-by: huweiguo <hwg@rock-chips.com>
2017-06-21 18:54:53 +08:00