Commit graph

605,771 commits

Author SHA1 Message Date
Sugar Zhang
fa385769cb arm64: dts: rockchip: rk3328: add mclk for internal codec
Change-Id: I3a29c25af0fa58f97f5dd8345b91df48f4f087ff
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-01-12 19:19:29 +08:00
Rocky Hao
0ea4217387 PM / devfreq: rockchip_dmc: init and update last_status
Last_status is used to calculate dmc's power in thermal control.
If last_status is neithor inited nor kept updated, the power model will
get the wrong status and then the wrong power. And dmc gets wrong
cooling state at last.
Meanwhile this issue reports the  warning "core: dev_pm_opp_get_voltage
: Invalid parameters"

Change-Id: Ic371796ad94fd6dab376fefbea91adff0068d26b
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-01-12 19:17:11 +08:00
Finley Xiao
336773f36d ARM: dts: rockchip: rk3036: Add vpu qos node
The vpu qos registers need to save and restore when reset.

Change-Id: I649cf4a360842ad1abb06c35a6fd8d3868fbf706
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-12 19:11:50 +08:00
Finley Xiao
e3db9462f8 arm64: dts: rockchip: rk3328: Add rkvdec and vpu qos node
The rkvdec and vpu qos registers need to save and restore when reset.

Change-Id: If0fbee0aed9227cfd795c5f439cfb8c3b2f0ccaf
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-12 19:11:42 +08:00
Wyon Bi
313564d931 drm/rockchip: dsi: support non-continuous clock behavior
This bit enables the automatic mechanism to stop providing clock in
the clock lane when time allows.

Change-Id: Ia3d85589f54adcf6206ee7ded32624b8e92936af
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-12 15:03:33 +08:00
Shunqing Chen
9ff817b7ab drm/rockchip: inno_hdmi: add support for rk618
Change-Id: Ic4fcfbc9adec378c67666455e45ae581e3a46ecd
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-12 15:03:05 +08:00
Rocky Hao
5172573fa1 PM / devfreq: rockchip_dmc: optimize thermal control code
use framework internal dynamic power calc function. Do not use
global data, rk_dmcfreq.

Change-Id: I1f46b2471b5d25a9233724fdd61efe63ea13b860
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-01-12 14:30:19 +08:00
Zhou weixin
d49822a34a arm64: rockchip_defconfig: add CONFIG_TOUCHSCREEN_GSL3673_800X1280
Change-Id: I2b1af38803b36c45ba0287b325e0db5ed5abcb95
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2018-01-12 14:21:58 +08:00
Zhou weixin
d1ce97ac91 input: touchscreen: gsl3673: add tp driver for rk3326 f863 board
Change-Id: I9aef5a8972887782c8becf6ddba3bc3649cb82fa
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2018-01-12 14:21:46 +08:00
Jacob Chen
77c621e531 ARM: dts: rk3288-miniarm: enable rkisp1 and add imx219/ov5647
Change-Id: Ifb9c18be4cc7fc3d663101c41e3c0be9eff513d4
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11 17:16:08 +08:00
Zhou weixin
e2346cddf0 arm64: dts: rockchip: add some peripheral configuration for px30/rk3326
devicelist: backlight\key\wifi\bt\sdmmc\touchpad\gsensor\fiq

Change-Id: I303c91ebca0b6d2ec9d452395e470fdd574e6fef
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2018-01-11 16:53:52 +08:00
Wyon Bi
714abae67e drm/rockchip: rk618: vif: Convert to drm_bridge
Change-Id: I124bfabf7fe67854f55aef5fec0cad00cd5e2eac
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 16:52:00 +08:00
Wyon Bi
08d59c7d52 mfd: rk618: add vif subdev
Change-Id: Ib2516da15406e232d5836f7476db935e7343d7d8
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 16:50:11 +08:00
Wyon Bi
99d81a6554 arm64: dts: rockchip: Add dsi node for PX30
Change-Id: Idf22f326c457c6b658269070b4fd2d5e71a9f62f
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 16:48:50 +08:00
Wyon Bi
886d0dc582 arm64: dts: rockchip: Add mipi_dphy node for PX30
Change-Id: I92c6bfe60dfe0c89befddad528c8d41a2318567a
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 16:48:20 +08:00
Wyon Bi
dffc889042 phy/rockchip: dphy: Add support for PX30
Change-Id: Ia7e29691f66fa10a5cdf1379b4eb419581ddda5f
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 16:45:24 +08:00
Wyon Bi
faa3764d61 drm/rockchip: dsi: Add support for PX30
Change-Id: Ib7e43456d8456b1db74880710b88bdf7da4639e8
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 16:44:58 +08:00
Wyon Bi
371553e68b drm/rockchip: dsi: Add a better description for dw_mipi_dsi_plat_data
Change-Id: I6a149747a12bbd1c3e84cd33769ed453770353af
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 16:44:26 +08:00
Jacob Chen
fbe1b71c32 media: i2c: imx219: apply gain/exposure immediately
or it's too slow for AEC algorithm

Change-Id: I646a31b026a1e753e8bee681d088c7b2944ed147
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11 14:30:48 +08:00
Jacob Chen
e9b2399061 media: i2c: imx219: support 1920*1080*48fps mode
and correct some control to make 3A work

Change-Id: Id3fc3ca9c5b123b6d45cd80d8e857a5c151c2427
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11 14:30:46 +08:00
Jacob Chen
05ffa6bb37 ARM: configs: rockchip_linux: enable rockchip isp1 driver
and some sensors

Change-Id: I8be884069341680c09c7bccd0e17b6faff0a681b
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11 14:30:43 +08:00
Jacob Chen
2e65cfc38f ARM: dts: add rk3288-firefly-reload-linux
tc358749 enabled with rockchip-isp1 driver

Change-Id: I94c36f2d78cb190436e974bd47500dbbce18deae
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11 14:30:39 +08:00
Jacob Chen
2f45de6bee ARM: dts: add rk3288-rkisp1.dtsi
There are many isp driver in 4.4 kernel, let's add a dtsi
to help switch between them.

Change-Id: Ida1af575b6c64ffec56ad695933dfdf22cdd72c1
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11 14:28:28 +08:00
Greg Hackmann
e2a963621b clocksource: arch_timer: make virtual counter access configurable
CVE-2017-13218
Change-Id: Ibdb1fd768b748002b90bfc165612c12c8311f8a2
2018-01-11 10:44:36 +08:00
Greg Hackmann
fe1b88d895 arm64: issue isb when trapping CNTVCT_EL0 access
CVE-2017-13218
Change-Id: I6005a6e944494257bfc2243fde2f7a09c3fd76c6
2018-01-11 10:44:28 +08:00
Marc Zyngier
e35b7d2759 BACKPORT: arm64: Add CNTFRQ_EL0 trap handler
We now trap accesses to CNTVCT_EL0 when the counter is broken
enough to require the kernel to mediate the access. But it
turns out that some existing userspace (such as OpenMPI) do
probe for the counter frequency, leading to an UNDEF exception
as CNTVCT_EL0 and CNTFRQ_EL0 share the same control bit.

The fix is to handle the exception the same way we do for CNTVCT_EL0.

Fixes: a86bd139f2 ("arm64: arch_timer: Enable CNTVCT_EL0 trap if workaround is enabled")
Reported-by: Hanjun Guo <guohanjun@huawei.com>
Tested-by: Hanjun Guo <guohanjun@huawei.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 9842119a23)

CVE-2017-13218
Change-Id: I2f163e2511bab6225f319c0a9e732735cbd108a0
2018-01-11 10:44:13 +08:00
Marc Zyngier
6c970498b3 BACKPORT: arm64: Add CNTVCT_EL0 trap handler
Since people seem to make a point in breaking the userspace visible
counter, we have no choice but to trap the access. Add the required
handler.

Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
(cherry picked from commit 6126ce0588)

CVE-2017-13218
Change-Id: I0705f47c85a78040df38df18f51a4a22500b904d
2018-01-11 10:42:02 +08:00
Wyon Bi
993719678f drm/rockchip: dsi: Convert to use regmap
Change-Id: Ia697fce3f51cf0278f37ac0e809173ebca076d6b
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 10:16:34 +08:00
Wyon Bi
51a7171dd2 drm/rockchip: dsi: Fix pclk hanndling
Change-Id: I31f6bc3991a03b79209c846a9c051acb0b2e8270
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 10:16:24 +08:00
Leo Wen
5c64b1b7ca arm: dts: rk3288-evb-rk808-linux: Add ov13850 camera support.
Change-Id: I693f3ec61b8a2cadc5d4c461149a54d8c6332eec
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-01-11 09:22:40 +08:00
Putin Lee
2742e98839 dt-bindings: rockchip: rga: Document for px30/rk3326 rga
Change-Id: Ibbd3c1c7aa47697870a0168c889ff6a0247464d5
Signed-off-by: Putin Lee <putin.li@rock-chips.com>
2018-01-10 18:45:54 +08:00
Xinhuang Li
ccf1ebd486 arm64: dts: rockchip: rk3328: add vpu_combo and enable it
add vpu_combo consist of avsd and vdpu

Change-Id: Ib49238d6a187dd7d621ad40ee0635b74825931f8
Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com>
2018-01-10 16:51:27 +08:00
Meng Dongyang
79406f8ed7 usb: dwc_otg_310: fix NULL pointer error from driver attributes
In current code, the driver attributes of DWC2 controller is
created during driver initialization, if we get or set them
before finish probe device, the device's pointer in attribute
function will be NULL and this will crash the system. So this
patch make the function return directly if the pointer is NULL.

The attributes mention above:
/sys/bus/platform/drivers/usb20_otg/dwc_otg_conn_en
/sys/bus/platform/drivers/usb20_otg/force_usb_mode
/sys/bus/platform/drivers/usb20_otg/vbus_status

Change-Id: If063a884249afa7172bf28719b8c2b8a5641ac4b
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
2018-01-10 16:50:41 +08:00
Viktor Slavkovic
f689b67a36 staging: android: ashmem: fix a race condition in ASHMEM_SET_SIZE ioctl
A lock-unlock is missing in ASHMEM_SET_SIZE ioctl which can result in a
race condition when mmap is called. After the !asma->file check, before
setting asma->size, asma->file can be set in mmap. That would result in
having different asma->size than the mapped memory size. Combined with
ASHMEM_UNPIN ioctl and shrinker invocation, this can result in memory
corruption.

Bug: 66954097
Signed-off-by: Viktor Slavkovic <viktors@google.com>
Change-Id: I268225133f96fde0fadd1ec621aafef27d392d65
2018-01-09 15:40:58 +08:00
Joseph Chen
0e7d55e6f0 mfd: rk808: initialize rk808_i2c_client by default
Even "rockchip,system-power-controller" is not found,
rk808_i2c_client is needed for suspend/resume and the
other.

Change-Id: I17ebb3a1d1e7ec8dc9f4a3ee2dbdcd9ae4c1648b
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-01-09 14:34:34 +08:00
Joseph Chen
8c6943ea7c power: rk818-battery: fix 4250mv charge voltage missing
Update according to latest datasheet.

Change-Id: I980e3b9705c8e1ccce5d0fba9b1b40cbf1681abe
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-01-09 14:34:29 +08:00
Zorro Liu
aae2e5388c driver: input: sensors: modify accel sensor calibration offset
Change-Id: I411f148b38aa0b4feabf9135123d20d3006798fa
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-01-09 14:09:48 +08:00
Liang Chen
59af91b563 arm64: dts: rockchip: auto select opp-table by leakage for rk3328
Change-Id: I5807d47085291efcd8eea61e59e931615b283ba5
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-01-09 09:29:29 +08:00
Liang Chen
225047ca4a video: rockchip: vpu: auto select opp-table by leakage
Change-Id: I3937d7bd896cca9aedb80bac2a8eb8737c79e7fb
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-01-09 09:28:53 +08:00
Shunqing Chen
84a2162b28 power: rk818-charger: flush workqueue on shutdown
do not need to destroy workqueue on shutdown

Change-Id: I78262414e91d8e48e088fd1a54a36542e29af8a7
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-01-09 09:27:10 +08:00
CanYang He
9b04710a12 arm64: dts: rockchip: update rk3328-dram-2layer-timing
according kernel-3.10 below commit to update
	16ceab7 ARM: dts: rockchip: update rk322xh-dram-2layer-timing

Change-Id: I7ed708704adce3d1dfec6b2d8008e2474621a576
Signed-off-by: CanYang He <hcy@rock-chips.com>
2018-01-08 21:02:00 +08:00
CanYang He
96312b689d PM / devfreq: rockchip_dmc: fix rk3328 of_get_ddr_timings fail
because of_parse_phandle() phandle_name parameter incorrect

Change-Id: Ic1b2cf7b1a7331aff52102a863e97a937677f2ae
Signed-off-by: CanYang He <hcy@rock-chips.com>
2018-01-08 21:01:19 +08:00
Wyon Bi
b3e88957f8 drm/rockchip: dsi: support read command
Change-Id: I195b25ecef18978b1801e39ddc3fa37a3ae94050
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-08 20:52:18 +08:00
Zhangbin Tong
472c7e2afa arm64: dts: rockchip: rk3328-evb-android: Adjust temperature control parameters
Change-Id: I5e153efcdd1b839ddd412c2c0e6b15c69c4fa6b4
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-01-08 20:51:49 +08:00
Shunqing Chen
2223d1404c power: rk816: add power_supply property for CTS.
Android8.0 CTS needs to get max charging current,
max charging voltage and battery charge counter.

Change-Id: I83371d5b9f126ee17979f56e92d78b7887c316c6
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-01-08 17:55:27 +08:00
Finley Xiao
a8c497e79d arm64: dts: rockchip: rk3328: Disable 400MHz and 600MHz for dmc
400MHz and 600MHz aren't supported at present.

Change-Id: I2420866243bcf389c1f4ae68f322639986d3e41d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-08 10:32:57 +08:00
Finley Xiao
a1b416e8de clk: rockchip: px30: Add CLK_IGNORE_UNUSED for ddr clk
Change-Id: Ib53b8b8c24edeb4e1046808ae9ae2736d2fb8df9
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-08 09:59:42 +08:00
Finley Xiao
32c581e78e soc: rockchip: power-domain: export qos save and restore
Change-Id: I89af4462f561fa06ace7761e20cf522b5954aaed
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-08 09:35:18 +08:00
Xinhuang Li
7579b0e52a clk: rockchip: rk3328: the group of softrst is 12
Change-Id: Idec7baa6bb0bb5824270e9cd8f3c6ed38d47ecc1
Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com>
2018-01-08 09:33:27 +08:00
Huibin Hong
13659af222 serial: 8250: fix bug cpu and DMA read uart fifo concurrently
Change-Id: I5284caff8cd684e890e6d7136158db042d724f57
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-01-08 09:17:59 +08:00