Commit Graph

605718 Commits

Author SHA1 Message Date
Shunqian Zheng
4a44a24fd2 CHROMIUM: media: rockchip/isp1: fixup for different media/v4l API
Fixup for differences of the previous FROMLIST patches for
rockchip isp1 driver as following,
 - regression of UPSTREAM commits
   + d6dd645eae: ("[media] media: videobuf2: Move timestamp to vb2_buffer")
   + 36c0f8b32c: ("[media] vb2: replace void *alloc_ctxs by struct device *alloc_devs")
   + df9ecb0cad: ("[media] vb2: drop v4l2_format argument from queue_setup")
 - API changes of (4.4 v.s. UPSTREAM)
   + media_entity_pipeline_start/stop() v.s. media_pipeline_start/stop()
   + media_entity_init() v.s. media_entity_pads_init()
   + media_entity_create_link() v.s. media_create_pad_link()
   + media_device_init()
   + entity function flags: MEDIA_ENT_F_IO_V4L and MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series

Change-Id: I4d9c9f784210fda2165ac5372baea09a9c01a30d
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2018-01-05 17:57:22 +08:00
Jacob Chen
4434f478e3 FROMLIST: dt-bindings: Document the Rockchip MIPI RX D-PHY bindings
Add DT bindings documentation for Rockchip MIPI D-PHY RX

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Reviewed-by: Rob Herring <robh@kernel.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46239/)

Change-Id: If7ca96f97f3c2f2b475d2a918fdcde1684846701
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-05 17:57:22 +08:00
Jacob Chen
9d502fadd5 FROMLIST: dt-bindings: Document the Rockchip ISP1 bindings
Add DT bindings documentation for Rockchip ISP1

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Reviewed-by: Rob Herring <robh@kernel.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46233/)

Change-Id: I289c59f503e74671ab6fcfe54370f29ad1cf220b
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-05 17:57:22 +08:00
Jacob Chen
f92c8b0016 FROMLIST: media: rkisp1: add rockchip isp1 core driver
Add the core driver for rockchip isp1.

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Yichong Zhong <zyc@rock-chips.com>
Signed-off-by: Jacob Chen <cc@rock-chips.com>
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46240/)
Conflicts:
	drivers/media/platform/Kconfig
	drivers/media/platform/Makefile

Change-Id: I09bd87cf0a0557079e93e94a41dc673f36c63f6a
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-05 17:57:22 +08:00
Jacob Chen
68c406aa36 FROMLIST: media: rkisp1: add capture device driver
This is the capture device interface driver that provides the v4l2
user interface. Frames can be received from ISP1.

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Yichong Zhong <zyc@rock-chips.com>
Signed-off-by: Jacob Chen <cc@rock-chips.com>
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46232/)

Change-Id: I3ff679d32c48c8dd8e91f22879e58e1b1ef896d7
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-05 17:57:22 +08:00
Jacob Chen
760a375e13 FROMLIST: media: rkisp1: add ISP1 params driver
Add the output video driver that accept params from userspace.

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Yichong Zhong <zyc@rock-chips.com>
Signed-off-by: Jacob Chen <cc@rock-chips.com>
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46241/)

Change-Id: Ibabcbfb8a607da9e51d124bc878dcc09f201c26b
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-05 17:57:22 +08:00
Jacob Chen
d41678365a FROMLIST: media: rkisp1: add ISP1 statistics driver
Add the capture video driver for rockchip isp1 statistics block.

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Yichong Zhong <zyc@rock-chips.com>
Signed-off-by: Jacob Chen <cc@rock-chips.com>
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46242/)

Change-Id: I70f8b17cde2102cee7742101b38a532fb800ff67
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-05 17:57:22 +08:00
Jacob Chen
f508b1a615 FROMLIST: media: rkisp1: add Rockchip ISP1 subdev driver
Add the subdev driver for rockchip isp1.

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Yichong Zhong <zyc@rock-chips.com>
Signed-off-by: Jacob Chen <cc@rock-chips.com>
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46244/)

Change-Id: I3d4b7aba7ce2d20f1f7c3983ef9bd301c96e5fb3
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-05 17:57:22 +08:00
Jacob Chen
b46ee0e23a FROMLIST: media: rkisp1: add Rockchip MIPI Synopsys DPHY driver
This commit adds a subdev driver for Rockchip MIPI Synopsys DPHY driver

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46243/)

Change-Id: Ic5746f1cddf0900054750e9f4e0f0171e5206d70
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-05 17:57:22 +08:00
Jeffy Chen
651e5e14ce FROMLIST: media: rkisp1: Add user space ABI definitions
Add the header for userspace

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46245/)

Change-Id: I2ae3db2f719c4a5de2dc631a5692b333effe5ea3
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-05 17:57:22 +08:00
Jacob Chen
839b765c64 FROMLIST: media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format
Add the Rockchip ISP1 specific processing parameter format
V4L2_META_FMT_RK_ISP1_PARAMS and metadata format
V4L2_META_FMT_RK_ISP1_STAT_3A for 3A.

Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46247/)

Conflicts:
	drivers/media/v4l2-core/v4l2-ioctl.c

Change-Id: I9ede55b68c075e54cefb11edecf5ef68b5452ec4
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-05 17:57:22 +08:00
Shunqian Zheng
0fb7758438 FROMLIST: [media] dt/bindings: Add bindings for OV2685
Add device tree binding documentation for the OV2685 sensor.

Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46250/)

Change-Id: I8ccd9efcba95d9be6c6ae55818d4876a35f20154
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-05 17:57:22 +08:00
Jacob Chen
cbd77317fe FROMLIST: media: ov2685: add support for OV2685 sensor
This patch adds driver for Omnivision's ov2685 sensor.
Though the ov2685 can output yuv data, this driver only
supports the raw bayer format, including the following features:
  - output 1600x1200 at 30fps
  - test patterns
  - manual exposure/gain control
  - vblank and hblank
  - media controller
  - runtime pm

Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46251/)

Conflicts:
	drivers/media/i2c/Kconfig
	drivers/media/i2c/Makefile

Change-Id: Ia73ea2ff1d01226824f98bf4a45b98303223eed8
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-05 17:57:22 +08:00
Shunqian Zheng
403111b2f4 FROMLIST: [media] dt/bindings: Add bindings for OV5695
Add device tree binding documentation for the OV5695 sensor.

Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46249/)

Change-Id: Id4c9b1c6a576f82a1c6a0119aa2017c46a552b46
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-05 17:57:22 +08:00
Shunqian Zheng
c94b420594 FROMLIST: media: ov5695: add support for OV5695 sensor
This patch adds driver for Omnivision's ov5695 sensor,
the driver supports following features:
 - supported resolutions
   + 2592x1944 at 30fps
   + 1920x1080 at 30fps
   + 1296x972 at 60fps
   + 1280x720 at 30fps
   + 640x480 at 120fps
 - test patterns
 - manual exposure/gain(analog and digital) control
 - vblank and hblank
 - media controller
 - runtime pm

Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46248/)
Conflicts:
	drivers/media/i2c/Makefile

Change-Id: Iaeb971c609d4a6d62fb23ae3b5c7881d4d3481f7
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-05 17:57:22 +08:00
Wyon Bi
db8a437fd3 drm/panel: simple: Add support for BOE MV270QUM-N10
This adds support for the BOE Corporation MV270QUM-N10 27"
eDP(HBR2, 5.4Gbps) UHD TFT LCD panel, which can be supported
by the simple panel driver.

Change-Id: Ib7df60a7c9a5cd4755a67bedef35a95bcc16a498
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-05 17:38:15 +08:00
Algea Cao
b7a227a37d arm64: dts: rockchip: add HDMI cec support for rk3328
Change-Id: I28a77d09a6cd21aff9099247594323b8bff595dc
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-01-05 17:37:57 +08:00
Ruoming, Wang
083714b03a rtl8189fs: Solve rtl8189fs compile error
Change-Id: I591c9d381d2eb983578eaadb4d27f66a256b12ec
Signed-off-by: Ruoming, Wang <wrm@rock-chips.com>
2018-01-05 17:37:22 +08:00
Xinhuang Li
e66561316f video: rockchip: vpu: clk_core is not necessary
if the combo is avsd and vdpu,clk_core is not necessary;
others case,the DTS will set the clk_core and here will
get the clk as well.

Change-Id: I5e33375e4655763791b9c4418bce7cbe0f5ac530
Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com>
2018-01-05 17:36:49 +08:00
Jung Zhao
4157aa8e4d video: rockchip: vpu: rk3328 use sip_smc_vpu_reset to reset
Change-Id: I0ad285da9a611e26b678d8ecfbfa8c6c69dace58
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-01-05 15:38:54 +08:00
Sandy Huang
f73ce8e085 drm/rockchip: vop: add support overscan for TV
Change-Id: Id4e37862df2b8acd0012469eb3793aa550491fb0
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-01-05 14:19:52 +08:00
Sandy Huang
c6fc59e97a drm/rockchip: vop: fix win2 area0 mst register config error
Change-Id: If122fb253090c4a613f9d5a63f9fcf9f75f31db6
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-01-05 14:19:21 +08:00
Rocky Hao
945db3d053 arm64: dts: rockchip: rk3328: add thermal control for dmc
add power model for dmc and add dmc as a cooling device in thermal
control

Change-Id: I175e503b671be27e777693745a127a7830c6e829
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-01-05 11:06:03 +08:00
Rocky Hao
b7402ccd73 arm64: dts: rockchip: rk3328: add thermal control for rkvdec
add power model for rkvdec and add rkvdec as a cooling device in thermal
control

Change-Id: I4560f9b2a6b395d565652549a8f0dbcc1903da6f
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-01-05 11:03:34 +08:00
Rocky Hao
5e0e5276e3 video: rockchip: vpu: add thermal control support
add vpu module as a cooling device in thermal control

Change-Id: Ib71d925b32dbf861f62abf38b84b92c9f5bf9e3e
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-01-05 11:03:16 +08:00
Xu Xuehui
f4b0c45cc4 net: wireless: rockchip_wlan: fix ap6212a/ap6212 connect ap fail
The ap6212a/ap6212 firmware can not support MFP protocol

Change-Id: I9835e7da0e7dbac6554f75ff28c3c3e9e785f39d
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
2018-01-05 11:01:54 +08:00
Caesar Wang
72d9dd355e ARM: dts: rockchip: update rk808's regulators for rk3036 kylin
According to the actual schematic designed by kylin board, update and
rename the regulators for rk808 node information.

Especially gpu regulator voltage, the schematic didn't have this
regulator, this regulaor should be applied by cpu regulator since the
cpu/gpu/ddr are belong to the same logic power supply.

Change-Id: I39e4cf18969391da396cc775f8660701e42977bd
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2018-01-05 11:00:55 +08:00
Zorro Liu
b930443d8c arm64: dts: rockchip: disabled sdmmc for rk3368-p9 board, we need uart2 to debug
Change-Id: I3e23ec65e78534abfc67b33eea25f06b9966b541
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-01-05 11:00:09 +08:00
Joseph Chen
2d9a3c1125 rockchip: sip: sm_nsec_ctx adds fiq spsr, sp and lr
due to optee os bugfix patch for FIQ:
	cf6a4d8 arm: sm: [bugfix] save/restore fiq core registers

we have to update sm_nsec_ctx to keep same with optee os, otherwise
FIQ debugger "bt" command is abnormal.

Change-Id: I950cfacd1c34abd88fbee2862c593b5fa59387bd
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-01-05 10:59:37 +08:00
Shunqing Chen
07f3a9425f power: rk818-charger: disable irq after otg power off
Change-Id: I5af9ad74d9f863427846c4b3da747ca7945b1a07
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-01-05 10:55:26 +08:00
Jung Zhao
0a27ad80d8 video: rockchip: vpu: fix some bugs
1. fix scaling list write overflow
2. add reset lock when vpu_reset

Change-Id: Iead232b6469f4f8a37b464c50086934931f0747f
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-01-05 09:22:15 +08:00
Jung Zhao
87e3d09740 video: rockchip: vpu: fix page fault crash
Change-Id: I71c3629cec0ee7903770170de15acb73e67298d2
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-01-05 09:22:00 +08:00
Jianqun Xu
1d4da5168e soc/rockchip: rk_fiq_debugger register as platform device
Register rockchip fiq debugger as platform device, also do some
codingstyle for the driver.

Change-Id: I78e6c3365275e3d45e37eee86378c350a18f259d
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-01-05 09:21:23 +08:00
Zhou weixin
0e1602046c ARM: dts: rockchip: rk3126-bnd-d708: remove unused gpio cd-gpios from sdmmc node
Change-Id: I39fd391be0674116e0e329ab950e341eb37cdf60
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2018-01-04 20:40:13 +08:00
Tao Huang
31cc257056 arm64: dts: rockchip: fix interrupts property of rk3399
Change-Id: Ifed5ba59ba2ca7d527e1747ccfa962b353062c0d
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-01-04 20:31:26 +08:00
Tao Huang
7f4dca3e62 arm64: dts: rockchip: fix interrupts property of rk3368
Change-Id: I5eae4d300fe8f2057ce4ee9fcbb5144cdae1a4d9
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-01-04 18:55:36 +08:00
Tao Huang
82f0d683a3 arm64: dts: rockchip: fix interrupts property of rk3366
Change-Id: I832fe95e886b5c33cc618edb24fffc2bfbb3b25f
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-01-04 18:52:48 +08:00
Tao Huang
699b3ebf6f arm64: dts: rockchip: fix interrupts property of rk3328
Change-Id: I456a74303595c33ec66e9c2aa19af1f9b68155b2
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-01-04 18:52:31 +08:00
Tao Huang
69cfeb75c0 arm64: dts: rockchip: fix interrupts property of px30
Change-Id: I97ed22688ab57cdc602f07b3226622cae8b09910
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-01-04 18:46:13 +08:00
Jung Zhao
485c608fd1 video: rockchip: vpu: add rk3328 reduce freq
Change-Id: I0bee9324bd439772e6eedc9045cd9fa6730379e2
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-01-04 16:49:23 +08:00
Sandy Huang
15b5ecbc01 arm64: dts: rockchip: update for px30/rk3326 evaluate board display
Change-Id: I8773926b52e1e3be8ea967ffc93a85777417c520
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-01-04 15:50:11 +08:00
Zorro Liu
48ce086873 drivers: input: sensors: reset sensor rate if rate is out of range
Change-Id: I7d78b0bf3bab24c18a13ba72b0868fb609a6ceb3
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-01-04 14:28:21 +08:00
Jung Zhao
26c69f0334 arm64: dts: rockchip: rk3328: rename reset clock of rkvdec
Change-Id: Ie9ad47027f474b0b07f7c3979b5a83184ac5091a
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-01-04 11:51:33 +08:00
Simon Xue
94d27447dd iommu/rockchip: use status register instead of flags as parameter
When iommu fall into interrupt, status register indicate more information
than read or write flag, so use status register as parameter when callback
report_iommu_fault

Change-Id: I07c6b9996f305eb970bd1d1d2b0f2a7db53cc6ba
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2018-01-04 11:51:33 +08:00
Javi Merino
5dcb4226bb BACKPORT: devfreq_cooling: pass a pointer to devfreq in the power model callbacks
When the devfreq cooling device was designed, it was an oversight not to
pass a pointer to the struct devfreq as the first parameters of the
callbacks.  The design patterns of the kernel suggest it for a good
reason.

By passing a pointer to struct devfreq, the driver can register one
function that works with multiple devices.  With the current
implementation, a driver that can work with multiple devices has to
create multiple copies of the same function with different parameters so
that each devfreq_cooling_device can use the appropriate one.  By
passing a pointer to struct devfreq, the driver can identify which
device it's referring to.

Change-Id: I384bf9aafd2391eccab2ca6a76e4e57f2740aa6b
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Reviewed-by: Punit Agrawal <punit.agrawal@arm.com>
Reviewed-by: Ørjan Eide <orjan.eide@arm.com>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Signed-off-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 3aa5374376)
2018-01-04 09:22:34 +08:00
Marc Zyngier
ece9e5b002 UPSTREAM: ARM: 8488/1: Make IPI_CPU_BACKTRACE a "non-secure" SGI
Having IPI_CPU_BACKTRACE as SGI15 may not work if the kernel is
running in non-secure mode and that the secure firmware has
decided to follow ARM's recommendations that SGI8-15 should
be reserved for secure purpose.

Now that we are "only" using SGI0-6, change IPI_CPU_BACKTRACE
to use SGI7, which makes it more likely to work.

Change-Id: I11e99a59024f1d256b45ede9cc2a89bb4d3dc1ae
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit e7273ff49a)
2018-01-04 09:20:14 +08:00
Marc Zyngier
0b6c94614b UPSTREAM: ARM: 8487/1: Remove IPI_CALL_FUNC_SINGLE
Since 9a46ad6d6d ("smp: make smp_call_function_many() use logic
similar to smp_call_function_single()"), the core IPI handling
has been simplified, and generic_smp_call_function_interrupt is
now the same as generic_smp_call_function_single_interrupt.

This means that one of IPI_CALL_FUNC and IPI_CALL_FUNC_SINGLE has
become redundant. We can then safely drop IPI_CALL_FUNC_SINGLE,
and use only IPI_CALL_FUNC.

This has the advantage of reducing the number of SGI IDs we're using
(a fairly scarse resource).

Tested on a dual A7 board.

Change-Id: I279a90b950c713e822bc4db9844788d7c05e7d77
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 89d798b73d)
2018-01-04 09:20:14 +08:00
Shawn Lin
8b4d925d7d phy: rockchip-emmc: improve calpad busy trimming and dllrdy timeout
It turns out that 5us of caldone isn't enough for all cases, so
let's retry some more times to wait for caldone. And use the API
instead of open-coding for polling dllrdy, but no functional change
intended.

Change-Id: I91e776871a223fc76f76c71ffa0d32c689fcca4e
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2018-01-03 16:44:27 +08:00
Liang Chen
541a9cf6d6 arm: dts: rename cpu0-supply to cpu-supply for rk3288 boards
cpu0-supply is for older DTs, we had better use new name from now on.

Change-Id: Icb80f5ad4718aeb1e112f317883a0cc756a5eaef
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-01-03 14:13:28 +08:00
Liang Chen
2de91db5d3 arm: dts: add pvtm configuration for rk3288 SoCs
Change-Id: I74fef189bfc0f2a3de683d8ae2fbedfd8fc88c99
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-01-03 14:12:58 +08:00