Zheng Yang [Tue, 11 Jul 2017 08:28:19 +0000 (16:28 +0800)]
drm: bridge: dw-hdmi: delete phy ops read/write
RK3328/RK3228 phy registers are mapped by inno-hdmi-phy driver,
there is no need to register hdmi phy debugfs on RK3328/RK3228.
Change-Id: I1e259b75ee7af6f29dffd5526d67776d5c6853ae
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Tue, 11 Jul 2017 08:19:06 +0000 (16:19 +0800)]
drm/rockchip: hdmi: use inno-hdmi-phy driver to operate rk3328 hdmi phy
Change-Id: Ic090fec14f076ba634d35cb85c59c160c47d0058
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Tue, 11 Jul 2017 08:03:48 +0000 (16:03 +0800)]
phy: rockchip-inno-hdmi-phy: support rk3328 hdmi phy
RK3328 hdmi phy is an upgraded version of 3228 hdmi phy, with
a completely different register layout. It improves physical
and antistatic capabilities.
It's max output bandwidth is same as rk3228 hdmi phy, optimized
up to 3.72Gbps per TMDS link.
Change-Id: I03c718c49e44cfeaa113e3ed07eec7055b4380cc
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Tue, 11 Jul 2017 08:01:59 +0000 (16:01 +0800)]
arm64: rockchip_linux_defconfig: enable CONFIG_PHY_ROCKCHIP_INNO_HDMI_PHY
Change-Id: Ie775672f43e6c2491d750c82f604c454a367e136
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Mark Yao [Tue, 27 Jun 2017 02:52:25 +0000 (10:52 +0800)]
drm/rockchip: vop: support get register by name
When get vop base register byname failed, retry first entry.
Change-Id: I60f4ebd901d353966c94734dd796dc702ae06f3f
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Mark Yao [Tue, 11 Jul 2017 07:00:50 +0000 (15:00 +0800)]
dt-bindings: rockchip: vop: introduce registers names
Change-Id: I0df821f2582b26e26cfe3059db19a90b206df5c5
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Huibin Hong [Mon, 21 Nov 2016 10:10:01 +0000 (18:10 +0800)]
arm64: dts: rockchip: rk3399-android: enable fiq mode
Change-Id: Ib40f065ba6ac2f597a27db87a46a0d2f7c0714ed
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Steven Chen [Wed, 12 Jul 2017 03:51:34 +0000 (11:51 +0800)]
ARM: dts: rk3288-android: enable dmc auto frequency adjustment
Enable dmc auto frequency adjustment and
set dmc minimum frequency to 400MHz for better performance
Change-Id: I0d2a192f438c23d879158f55dc948205f67f8663
Signed-off-by: Steven Chen <cw@rock-chips.com>
Huibin Hong [Wed, 12 Jul 2017 02:27:51 +0000 (10:27 +0800)]
spi: rockchip: test: update driver
Change-Id: I773cdc245fcdf8eee10dd7983343f206aecb856c
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Huibin Hong [Wed, 12 Jul 2017 02:22:18 +0000 (10:22 +0800)]
spi: rockchip: rockchip_spi_prepare_dma return 1 if it is ok
If rockchip_spi_prepare_dma return 0, spi_transfer_one_message
won't wait for the dma complete event. Which may cause unknown
error.
Change-Id: Idf51a737bbd9fa9b9d1ae749636fe524de1cbfa9
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Zhaoyifeng [Thu, 18 May 2017 06:39:09 +0000 (14:39 +0800)]
soc: rockchip: vendor storage support realloc
To rewrite the same id with the data size large than first alloc size,
it`s will write fail. This commit will support realloc new memory
for rewrite.
Change-Id: Icd53afd072328dc45f1faae033471c5069664f05
Signed-off-by: Zhaoyifeng <zyf@rock-chips.com>
Zorro Liu [Wed, 12 Jul 2017 02:39:47 +0000 (10:39 +0800)]
arm64: dts: rockchip: use dwmmc for rk3366
Change-Id: I3ecadd51e34545af61a1bfcc54ee0d6f045c40fa
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Mark Yao [Fri, 7 Jul 2017 08:23:50 +0000 (16:23 +0800)]
drm/rockchip: vop: fliter interlace mode
rk3288 and rk3368 are not support interlace mode
Change-Id: I5b6c155095285a5ae6e574efba122b56ddb1a112
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
William Wu [Fri, 7 Jul 2017 01:53:00 +0000 (09:53 +0800)]
power: rk818-charger: fix usb charger undetected
On some platforms (e.g. rk3399), we use extcon notify
framework to receive USB charger notifier from USB PHY
driver. Generally, the USB PHY driver uses a work to check
vbus status and the USB charger type every 2 seconds,
this polling mechanism may cause USB charger undetected
if we plug in/out USB charger quickly.
A typical error case is:
1. Plug in an USB DCP Adapter.
- USB PHY driver sends notifier to rk818-charger
2. Plug out the USB Adapter, and plug in again immediately
- rk818 detects plug out irq, and turns off charging
- USB PHY driver schedule work doesn't detect the plug
out/in operations, and doesn't send usb charger notifier
Fortunately, rk818 can detect plug in irq, so let's check
the USB charger type in rk818 plug in irq handler.
Change-Id: Iee45769c8a98c709da2dbfa514198ab0f648fd20
Signed-off-by: William Wu <william.wu@rock-chips.com>
Lionel Landwerlin [Fri, 26 Feb 2016 17:05:00 +0000 (17:05 +0000)]
UPSTREAM: drm: introduce pipe color correction properties
Patch based on a previous series by Shashank Sharma.
This introduces optional properties to enable color correction at the
pipe level. It relies on 3 transformations applied to every pixels
displayed. First a lookup into a degamma table, then a multiplication
of the rgb components by a 3x3 matrix and finally another lookup into
a gamma table.
The following properties can be added to a pipe :
- DEGAMMA_LUT : blob containing degamma LUT
- DEGAMMA_LUT_SIZE : number of elements in DEGAMMA_LUT
- CTM : transformation matrix applied after the degamma LUT
- GAMMA_LUT : blob containing gamma LUT
- GAMMA_LUT_SIZE : number of elements in GAMMA_LUT
DEGAMMA_LUT_SIZE and GAMMA_LUT_SIZE are read only properties, set by
the driver to tell userspace applications what sizes should be the
lookup tables in DEGAMMA_LUT and GAMMA_LUT.
A helper is also provided so legacy gamma correction is redirected
through these new properties.
v2: Register LUT size properties as range
v3: Fix round in drm_color_lut_get_value() helper
More docs on how degamma/gamma properties are used
v4: Update contributors
v5: Rename CTM_MATRIX property to CTM (Doh!)
Add legacy gamma_set atomic helper
Describe CTM/LUT acronyms in the kernel doc
v6: Fix missing blob unref in drm_atomic_helper_crtc_reset
Signed-off-by: Kumar, Kiran S <kiran.s.kumar@intel.com>
Signed-off-by: Kausal Malladi <kausalmalladi@gmail.com>
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Acked-by: Rob Bradford <robert.bradford@intel.com>
[danvet: CrOS maintainers are also happy with the userspacde side:
https://codereview.chromium.org/
1182063002/ ]
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1456506302-640-4-git-send-email-lionel.g.landwerlin@intel.com
(cherry picked from commit
5488dc16fde74595a40c5d20ae52d978313f0b4e)
Change-Id: I8952fa72998b669cf6d8a7e120a72ffb225b1ba1
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Markus Elfring [Fri, 6 Nov 2015 11:03:46 +0000 (12:03 +0100)]
UPSTREAM: GPU-DRM: Delete unnecessary checks before drm_property_unreference_blob()
The drm_property_unreference_blob() function tests whether its argument
is NULL and then returns immediately.
Thus the tests around the calls are not needed.
This issue was detected by using the Coccinelle software.
Link: http://patchwork.freedesktop.org/patch/msgid/563C8B3E.405@users.sourceforge.net
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit
5f911905054a64cf8c7871fddd33f4af74f07a17)
Change-Id: I599721227294c7cde5fd4f2ef6d5a97212b61b77
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Huang, Tao [Fri, 7 Jul 2017 11:01:06 +0000 (19:01 +0800)]
ARM: dts: rockchip: fix rk3288-android fiq-debugger irq
153 is arm pmu irq.
Change-Id: I18c00eb0cb10646b1b73535837ac26af196a3b51
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Steven Chen [Thu, 6 Jul 2017 07:49:40 +0000 (15:49 +0800)]
ARM: dts: rk3288-evb: enable hs200 mode
Change-Id: I2a805198e2441a33f721a2b7167c99a180f1fc21
Signed-off-by: Steven Chen <cw@rock-chips.com>
Huibin Hong [Tue, 4 Jul 2017 07:26:21 +0000 (15:26 +0800)]
rk_fiq_debugger: reset and init uart, if uart is abnormal
Change-Id: Idaa5d3d9ecd03325f3412a5b9e9b95eae20b0a22
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Andy Yan [Fri, 7 Apr 2017 08:19:29 +0000 (16:19 +0800)]
arm64: dts: rockchip: fix the memory size of PX5 Evaluation board
Commit
122682b2abb6 ("arm64: dts: rockchip: Add PX5 Evaluation board")
sets the memory size to 2 GB, but this board only has 1 GB DRAM, so change
it to the correct value here.
Fixes: 122682b2abb6 ("arm64: dts: rockchip: Add PX5 Evaluation board")
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry-picked from git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
commit
2f513bd9eac1a2642b40387d4f89c3987641e59b)
Change-Id: If6a64fa0eab3d76b90f122e63d30c1d7940b0a57
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Shawn Lin [Thu, 22 Sep 2016 04:02:18 +0000 (12:02 +0800)]
arm64: dts: rockchip: add sdmmc support for px5-evb
px5-evb has one sdmmc slot, so we could support sdmmc.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry-picked from git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
commit
41a603b9337c412e5902091f5343f803b36b9995)
Change-Id: I3f4edbeefb39516d814d54b6583e2ada5505ab75
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Shawn Lin [Thu, 22 Sep 2016 04:02:17 +0000 (12:02 +0800)]
arm64: dts: rockchip: Add more properties for emmc on px5-evb
The emmc on px5-evb can support hs200, so let's add mmc-hs200-1_8v.
And in order to speed up the boot time, we could add no-sdio and
no-sd to simplify the initialization.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry-picked from git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
commit
674c81cf2c22918e34a8b42b89aaf89247256b6d)
Change-Id: I2e72c7b2d6bc5da939068264ed90b2980ffdfabb
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Andy Yan [Sat, 10 Sep 2016 17:47:03 +0000 (01:47 +0800)]
arm64: dts: rockchip: Add PX5 Evaluation board
PX5 EVB is designed by Rockchip for automotive field
with integrated CVBS (TP2825) / MIPI DSI / CSI / LVDS
HDMI video input/output interface, audio codec ES8396,
WIFI/BT (on RTL8723BS), Gsensor BMA250E and light&proximity
sensor STK3410.
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Conflicts:
Documentation/devicetree/bindings/arm/rockchip.txt
arch/arm64/boot/dts/rockchip/Makefile
(cherry-picked from git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
commit
76c923bb64923a387f0fc95480afb61ff1504eae)
Change-Id: I41212701d9bec3ce0864b995070439d4640bce28
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
shengfeiXu [Wed, 29 Mar 2017 09:13:26 +0000 (17:13 +0800)]
power_supply: Add support TI BQ25703 charger chip
Change-Id: I3689a9f108e6fb86db4800d47a3aa7da7f7010e7
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Tang Yun ping [Wed, 28 Jun 2017 12:41:02 +0000 (20:41 +0800)]
PM / devfreq: get lcdc type from vop drivers for rk3368
Change-Id: I9205286f7b4c0d7ecba3bb08a45af3f49225abe5
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
Huang, Tao [Wed, 5 Jul 2017 07:15:01 +0000 (15:15 +0800)]
arm64: rockchip_defconfig: enable CROSS_MEMORY_ATTACH
For pass Android bionic sys_uio_test.
Change-Id: I45a951d195c630a3765769ca030791b099594340
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Huang, Tao [Wed, 5 Jul 2017 06:50:33 +0000 (14:50 +0800)]
arm64: rockchip_defconfig: update by savedefconfig
Change-Id: I44fc7dbdd6b87089668a7231d06424ea773742bd
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Rocky Hao [Tue, 16 May 2017 03:07:06 +0000 (11:07 +0800)]
ARM: dts: rockchip: rk322x: update thermal config and add cpu's parameters
add cpu's dynamic power coefficient and add gpu as a cooling device in the
thermal zone. rename the thermal zone's config and make it more readable.
Change-Id: Iac935a6dde5e079667b6712224b32e786ccebc1e
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
Rocky Hao [Tue, 27 Jun 2017 06:47:26 +0000 (14:47 +0800)]
arm64: dts: rockchip: add gpu in thermal control for rk3328
add gpu as a cooling device in thermal control
Change-Id: Ia9db5df7b2d5d9ed19672f64f8924877016732c2
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
chenzhen [Tue, 4 Jul 2017 03:06:25 +0000 (11:06 +0800)]
arm64: dts: rockchip: change "power-mode" to "power_model" in gpu node for rk3328
The reference code from ARM uses "power_model".
It's convenient to use the same name
for rebasing Mali DDK update from ARM and avoiding confusion.
Change-Id: I9095500a5d0eb7f9edfeed3a07a1c2bdca51aaf1
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
chenzhen [Tue, 4 Jul 2017 03:05:21 +0000 (11:05 +0800)]
ARM: dts: rk322x: change "power-mode" to "power_model" in gpu node
The reference code from ARM uses "power_model".
It's convenient to use the same name
for rebasing Mali DDK update from ARM and avoiding confusion.
Change-Id: I1bb87bf3d80a7dcdeedf3320751d03c4e9339ad5
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
huweiguo [Tue, 4 Jul 2017 00:42:44 +0000 (08:42 +0800)]
arm64: dts: rockchip: rk3368-r88: solve gmac open fail probability
Change-Id: I64d358bfa4d64f53a207d5358615c3819a1566a5
Signed-off-by: huweiguo <hwg@rock-chips.com>
Jianqun Xu [Tue, 4 Jul 2017 00:15:18 +0000 (08:15 +0800)]
ARM: dts: rockchip: rk3288 re-name dts files
Intent to keep same dts with upstream version, this patch does:
1. restore rk3288-evb-act8846.dts, keep without android configurations.
2. add char of "-android-" to android dts files.
Change-Id: Ic063f1187160f88e9ec8a779749ff7b17cfac9e8
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Wenping Zhang [Fri, 30 Jun 2017 07:28:56 +0000 (15:28 +0800)]
ARM: dts: rk322x: move the gpio_keys node from dtsi to product dts.
The keys configuration is constantly changed on different products,
so move it to product's dts.
Change-Id: Ifec408a0529a224b8716797a88b97eddeab10fa7
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Zorro Liu [Mon, 3 Jul 2017 06:33:53 +0000 (14:33 +0800)]
arm64: dts: rockchip: rk3368-p9: add RKPM_CLUSTER_L_WKUP_EN for gpio wakeup
Change-Id: I19b6ff4a0770a7d7c1427c40c33c59953c5357b7
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
huweiguo [Fri, 30 Jun 2017 06:03:08 +0000 (14:03 +0800)]
arm64: dts: rockchip: rk3368-r88: sdio work up
Change-Id: I7026275e46cce6a4460bd5464d63f583984b9d5e
Signed-off-by: huweiguo <hwg@rock-chips.com>
Jianqun Xu [Wed, 28 Jun 2017 02:49:28 +0000 (10:49 +0800)]
ARM: configs: rockchip_defconfig select CROSS_MEMORY_ATTACH
Change-Id: I0428b81385647872ff54e2d800e2b0b143138070
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Yankun Zheng [Wed, 28 Jun 2017 08:34:13 +0000 (16:34 +0800)]
ARM: dts: rk3229-gva-sdk: enable cw2015 fuel gauge
Change-Id: Ibe6b3fd249a82239790e5d5a17c70a37f995ff9f
Signed-off-by: Yankun Zheng <zyk@rock-chips.com>
Mark Yao [Fri, 30 Jun 2017 00:32:50 +0000 (08:32 +0800)]
drm/rockchip: vop: support drm legacy set property
Change-Id: I96ff8c49429ed8b71c8542c981f63c488f7d8baa
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Wenping Zhang [Fri, 30 Jun 2017 09:20:18 +0000 (17:20 +0800)]
ARM: dts: rk3229-gva-sdk: delete vcc_host node in gva dts.
Gva products don't use usb host mode, so delete vcc_host regulator
node and other related configuration.
Change-Id: I9d8db775ab33ab7b51c2a4d867d77e1fe8912d9a
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
xubilv [Thu, 29 Jun 2017 09:24:59 +0000 (17:24 +0800)]
arm: dts: rk3288: use vopb by default, disabled mipi_in_vopl
Change-Id: I7db89cdd2acb9196b0a2bfb64fda06eb140f6f40
Signed-off-by: xubilv <xbl@rock-chips.com>
chenzhen [Wed, 28 Jun 2017 02:50:11 +0000 (10:50 +0800)]
MALI: utgard: read parameters of power model from device tree
Change-Id: I6e71100b77b98d2994c0b284b992942e696b023a
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
Sugar Zhang [Thu, 29 Jun 2017 01:47:33 +0000 (09:47 +0800)]
arm: dts: rk3288-android: rename card name
Change-Id: I62a9de19b115f96f0b55b1dad696816e623868d4
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Sugar Zhang [Thu, 29 Jun 2017 01:43:08 +0000 (09:43 +0800)]
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>
Tang Yun ping [Wed, 12 Apr 2017 09:50:53 +0000 (17:50 +0800)]
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>
chenzhen [Wed, 28 Jun 2017 02:43:14 +0000 (10:43 +0800)]
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>
chenzhen [Wed, 28 Jun 2017 02:49:21 +0000 (10:49 +0800)]
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>
Zheng Yang [Wed, 21 Jun 2017 07:18:04 +0000 (15:18 +0800)]
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>
Huang zhibao [Tue, 27 Jun 2017 08:24:38 +0000 (16:24 +0800)]
arm64: dts: rk3368-r88: enabled usb host
Change-Id: I02dbdeebb15221076a2e1c415e5e6e8bccb484b2
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
xubilv [Thu, 29 Jun 2017 03:47:07 +0000 (11:47 +0800)]
arm: dts: rk3288: remove cpll from cru
Change-Id: Iad4df450078a805abbeca5c271a75f40f2fefa6c
Signed-off-by: xubilv <xbl@rock-chips.com>
xubilv [Thu, 29 Jun 2017 02:39:47 +0000 (10:39 +0800)]
arm: dts: rk3288: support mipi dsi uboot display for rk818 evb
Change-Id: Id1b225de0905df9fe7837614b11b523f4b202c74
Signed-off-by: xubilv <xbl@rock-chips.com>
xubilv [Thu, 29 Jun 2017 02:27:55 +0000 (10:27 +0800)]
clk: rockchip: 3288: dclk will change if cpll initialized
Change-Id: I698437b21c94684af0a7dfbe643794de62edc962
Signed-off-by: xubilv <xbl@rock-chips.com>
Tang Yun ping [Wed, 12 Apr 2017 09:49:04 +0000 (17:49 +0800)]
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>
Tang Yun ping [Fri, 23 Jun 2017 08:15:37 +0000 (16:15 +0800)]
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>
Zheng Yang [Wed, 28 Jun 2017 02:58:36 +0000 (10:58 +0800)]
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>
Sugar Zhang [Tue, 27 Jun 2017 01:48:45 +0000 (09:48 +0800)]
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>
Sugar Zhang [Tue, 27 Jun 2017 01:41:13 +0000 (09:41 +0800)]
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>
Jianqun Xu [Wed, 28 Jun 2017 02:09:20 +0000 (10:09 +0800)]
ARM: dts: rk3288: fix to timer0 for broadcast timer
Change-Id: I0dd9a367c2587391b17ab9bb3a4610abdee14816
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
xuhuicong [Tue, 27 Jun 2017 09:17:26 +0000 (17:17 +0800)]
arm64: dts: rk3368-r88: add hdmi sound card
Change-Id: I2a81102c7e110a2fe36ec8ba3622ebb63cc91066
Signed-off-by: xuhuicong <xhc@rock-chips.com>
buluess.li [Tue, 27 Jun 2017 03:38:48 +0000 (11:38 +0800)]
arm: dts: rk3288: add iep node and enable it
Change-Id: Ie7fe0bbc91a5fedb0617d9b6c6056bdb4aed610d
Signed-off-by: buluess.li <buluess.li@rock-chips.com>
buluess.li [Tue, 27 Jun 2017 08:19:44 +0000 (16:19 +0800)]
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>
Rocky Hao [Tue, 27 Jun 2017 07:10:39 +0000 (15:10 +0800)]
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>
Zheng Yang [Wed, 21 Jun 2017 07:08:03 +0000 (15:08 +0800)]
Revert "FROMLIST: drm: edid: HDMI 2.0 HF-VSDB block parsing"
This reverts commit
6e9aa006c4ae10f95bba0121c26b06363efb3b96.
UPSTREAM code has support parsing HDMI.20 HF-VSDB.
Change-Id: Ia25ee6a92e9a2fee4b3356446c1198e938c5e74d
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Wed, 21 Jun 2017 06:45:44 +0000 (14:45 +0800)]
drm: bridge: dw-hdmi: use scdc struct and function defined in upstream
Change-Id: I32c81abd842d61559032668d609bf479daac2666
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Shashank Sharma [Mon, 13 Mar 2017 11:24:02 +0000 (16:54 +0530)]
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
62c58af32c935a98a1e8d8ceb39a3a47b36fbbcd)
buluess.li [Tue, 27 Jun 2017 08:44:17 +0000 (16:44 +0800)]
arm: dts: rk3288-evb: set i2c4 clock frequency to 400khz
Change-Id: I849a99d147e9336ba81cd25c92594ffb1289cb53
Signed-off-by: buluess.li <buluess.li@rock-chips.com>
Shashank Sharma [Mon, 13 Mar 2017 11:24:01 +0000 (16:54 +0530)]
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
afa1c763653e0fd68f2d1e3dca869c9453d8ef06)
Thierry Reding [Mon, 13 Mar 2017 11:24:00 +0000 (16:54 +0530)]
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
50dd1bd1e2395a78e5adfad96487092e215483e0)
Jianqun Xu [Tue, 27 Jun 2017 09:00:35 +0000 (17:00 +0800)]
scripts/gcc-wrapper.py: ignore drm_edid.c:3506
Change-Id: I3363df9995e27dedb4b0b461e210f872b7ef83c8
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Zheng Yang [Tue, 27 Jun 2017 06:10:51 +0000 (14:10 +0800)]
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>
buluess.li [Tue, 27 Jun 2017 03:40:29 +0000 (11:40 +0800)]
arm: rockchip_defconfig: enable CONFIG_IEP
Change-Id: I2b37378eb04f2146c515e074ba4f6d83d6148a0e
Signed-off-by: buluess.li <buluess.li@rock-chips.com>
Sugar Zhang [Tue, 27 Jun 2017 01:38:46 +0000 (09:38 +0800)]
ASoC: rockchip: hdmi_analog: set sysclk for codec dai
Change-Id: Ia9eabcc482451c64897b6d9d09d484da77624cbb
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
buluess.li [Tue, 27 Jun 2017 03:29:40 +0000 (11:29 +0800)]
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>
Wenping Zhang [Mon, 26 Jun 2017 08:59:11 +0000 (16:59 +0800)]
ARM: dts: rockchip: add power key support on gva sdk board.
Change-Id: I10046d4369fad752b76e3dc518aab2c714e37eb6
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Zheng Yang [Tue, 27 Jun 2017 03:36:43 +0000 (11:36 +0800)]
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>
Randy Li [Fri, 23 Jun 2017 03:55:58 +0000 (11:55 +0800)]
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>
Finley Xiao [Mon, 22 May 2017 10:50:17 +0000 (18:50 +0800)]
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>
xuhuicong [Mon, 26 Jun 2017 08:27:26 +0000 (16:27 +0800)]
drm: bridge/dw-hdmi: add platform_device_unregister when remove
Change-Id: I7fdc7046b0065329abddbe503c9acd576175670a
Signed-off-by: xuhuicong <xhc@rock-chips.com>
algea.cao [Fri, 23 Jun 2017 01:40:31 +0000 (09:40 +0800)]
arm64: rockchip_defconfig: enable drm tve
Change-Id: Ic1fb7387191a16cb37f690ce300ff0814af51c9c
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
algea.cao [Wed, 14 Jun 2017 01:51:19 +0000 (09:51 +0800)]
ARM64: dts: rk3328-evb: enable tve
tve is enabled by default.
Change-Id: I43f9103a0a8d3078031e5d32a1d99602fb0a96ed
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
algea.cao [Wed, 14 Jun 2017 01:50:12 +0000 (09:50 +0800)]
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>
Finley Xiao [Mon, 26 Jun 2017 10:16:59 +0000 (18:16 +0800)]
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>
Finley Xiao [Thu, 25 May 2017 03:51:11 +0000 (11:51 +0800)]
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>
Finley Xiao [Tue, 23 May 2017 03:47:42 +0000 (11:47 +0800)]
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>
Finley Xiao [Mon, 22 May 2017 12:59:20 +0000 (20:59 +0800)]
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>
Wenping Zhang [Mon, 26 Jun 2017 01:23:44 +0000 (09:23 +0800)]
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>
xuhuicong [Sat, 24 Jun 2017 10:10:00 +0000 (18:10 +0800)]
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>
Huang, Tao [Thu, 25 May 2017 12:48:57 +0000 (20:48 +0800)]
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>
Mark Yao [Fri, 23 Jun 2017 07:47:42 +0000 (15:47 +0800)]
drm/rockchip: vop: correct vop register's version
Change-Id: Ic7a85e3107501ed652b79e41a7c849b7538f0f81
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Zhang Zhijie [Mon, 5 Jun 2017 08:13:23 +0000 (16:13 +0800)]
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>
huweiguo [Fri, 23 Jun 2017 02:04:24 +0000 (10:04 +0800)]
arm64: dts: rk3368-r88: wifi work up
Change-Id: I3b110916ac835be300253133a1977c7fd44bf332
Signed-off-by: huweiguo <hwg@rock-chips.com>
xuhuicong [Tue, 20 Jun 2017 03:40:43 +0000 (11:40 +0800)]
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>
WeiYong Bi [Tue, 6 Jun 2017 03:31:06 +0000 (11:31 +0800)]
clk: rockchip: rk3228: add CLK_IGNORE_UNUSED flag for vio_h2p
Change-Id: Ieca7abf5d01f70db09aa0fcc77b838c106f4fc87
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
Finley Xiao [Thu, 22 Jun 2017 12:22:25 +0000 (20:22 +0800)]
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>
Finley Xiao [Thu, 22 Jun 2017 11:53:46 +0000 (19:53 +0800)]
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>
huweiguo [Thu, 22 Jun 2017 11:44:21 +0000 (19:44 +0800)]
arm64: dts: rk3368-r88: gmac work up
Change-Id: I43ffe5abe8293232f026f4696b17b36024d392cd
Signed-off-by: huweiguo <hwg@rock-chips.com>
David Wu [Mon, 19 Jun 2017 08:38:45 +0000 (16:38 +0800)]
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>
algea.cao [Wed, 14 Jun 2017 01:40:42 +0000 (09:40 +0800)]
arm64: rockchip_linux_defconfig: enable drm tve
Change-Id: I1e3ddee6b8f0b1987604fff727d4e33ef35c7d5c
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
algea.cao [Wed, 14 Jun 2017 10:11:36 +0000 (18:11 +0800)]
drm/rockchip: vop: support rk3328 linux drm cvbs
Change-Id: Ie412fb30794b0addb2a4a0844af65e8356ab98c0
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
algea.cao [Wed, 14 Jun 2017 10:10:07 +0000 (18:10 +0800)]
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>
projects / firefly-linux-kernel-4.4.55.git / log