Commit Graph

600274 Commits

Author SHA1 Message Date
Finley Xiao
af6f2d70c0 clk: rockchip: rk3368: add 216M and 126M for armclkb and armclkl
support 216M/126M for armclkb and armclkl

Change-Id: I047ac24ad5a176923a55bd6934f06afcf272660d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-03-15 18:49:09 +08:00
Mark Yao
20201aebf8 ARM64: dts: rk3368: add vop display node
Change-Id: Ie747e90413fbfabe95e9d3c2ae55e02eff2e4708
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-15 18:34:58 +08:00
William Wu
7cc91d50e9 phy: rockchip-inno-usb2: don't power on otg phy in ls irq handler
The commit c590056b6a ("phy: rockchip-inno-usb2: usb remote
wakeup support") power on otg phy in linestate irq handler,
this will cause usb peripheral fail to connect to PC in the
following case:
1. enable otg linestate irq
2. set system enter deep sleep
3. wakeup system by power key
4. connect usb peripheral to PC, pull up D+ to ~3V, trigger
   linestate irq and power on otg phy.
5. usb peripheral do BC1.2 detect, but PC try to enumerate
   the usb peripheral at the same time and fail at last.

Actually the usb controller drivers (e.g. dwc3 driver)
and otg_sm_work can manage the otg phy power consumption, so
it doesn't need to power on otg phy in linestate irq handler.

Change-Id: Ifd78e4d44ab96f07f75f063ed20af153b4027028
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-03-15 17:38:47 +08:00
Elaine Zhang
edd7917229 arm64: dts: rockchip: rk3368-p9: add ramp-delay for syr82x dcdc
Change-Id: I0a1cca68d6e40a881e153f824ccbeb611d006ff0
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-03-15 16:51:10 +08:00
William Wu
d3e500796d usb: dwc_otg_310: pcd: fix isoc in ep transfer issue
When test usb gadget uvc function, we find a isoc in
ep transfer bug that will cause uvc data transfer fail.
The error case is:

1. The current EP request is done, call complete_ep()
to completes the request, and then call start_next_request()
to check the EP request queue, in this error case, the
queue is empty, so it doesn't start next request, just
set ep frame_num to 0xFFFFFFFF.

2. NAK Interrutp is triggered, check isoc ep frame_num
is 0xFFFFFFFF, then reset the frame_num to 0, and then
call start_next_request() to check the EP request queue,
in this error case, the queue is still empty, so set ep
frame_num to 0xFFFFFFFF again.

But afer the above operation, the current code will
modify the ep frame_num in NAK Interrutp handler by
add ep bInterval to frame_num, this cause frame_num
change again, but not keep in 0xFFFFFFFF, so the next
NAK Interrutp handler doesn't start next request any
more.

This patch reset the frame_num to the current frame
number got from DSTS SOFFN register if detect the
frame_num is 0xFFFFFFFF in NAK Interrutp handler.
And modify the frame_num in NAK Interrutp handler
only when the frame_num is not 0xFFFFFFFF.

TEST=Set usb gadget as webcam, use Ubuntu Guvcview
to preview the webcam, observe the preview screen
and the error log "There are no more ISOC requests".

Change-Id: I4403a67b1d5d257d092a2a71d5666c5d6fd5af3c
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-03-15 11:07:52 +08:00
Jianqun Xu
51a9f0660f clk: rockchip: rk3368 add 1296000 support to freq table
Change-Id: I6cff0d8820401c36c98f54a9777629dc1d37fba8
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-15 10:56:07 +08:00
chenzhen
30e2eaaf4b Revert "Revert "MALI: midgard: support sharing regulator with other devices""
This reverts commit eb6c2ed720.

Change-Id: I09424d08bfac3457da24b10fe2b97d2856399e63
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-03-15 09:45:49 +08:00
chenzhen
6b022755ac Revert "Revert "MALI: midgard: avoid GPU voltage domain keeping the initial voltage""
This reverts commit e7db50b512.

Change-Id: I47f9c1d114b06264d6dd4098bc0e00228fd8f187
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-03-15 09:45:49 +08:00
chenzhen
422afe6b4a MALI: midgard: RK: add wake_lock for delayed_work_to_power_off_gpu
To ensure that the work is executed before system being suspended.

Change-Id: Iec1bd114dfff53e2464540f09ced66cf6be81d1a
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-03-15 09:45:49 +08:00
xiaoyao
2e9cf4d2e5 net: wireless: rockchip: fix compile error for rtl8822be
Fixes: 4d99f97 ("net: wireless: rockchip: add rtl8822be ...")
Change-Id: I40234ce807ef9289f422e762e2c94e163fe1824d
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2017-03-15 08:53:13 +08:00
Zorro Liu
4797250413 ARM64: dts: rk3368: add rk3368-p9.dts for p9 board
Change-Id: Id7e718b4f670aa91768db695e5c38da88f048987
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-15 08:18:37 +08:00
Jianqun Xu
3d1d70f6ba ARM64: dts: rk3368-android enable usb otg
Change-Id: Idd9e683c1c48dad940779dbb701dd4271ca8292f
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-15 08:12:13 +08:00
Huang, Tao
8894bbbfb2 net: wireless: rockchip: disable build rtl8822be pcie wifi by default
Until fix this compile error:
ERROR: "Array_MP_8822B_FW_NIC" [drivers/net/wireless/rockchip_wlan/rtl8822be/8822be.ko] undefined!

Change-Id: I78afda57761bb0bd7737864e5d04deeaa1b7df8a
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2017-03-14 16:48:02 +08:00
Jianqun Xu
b59dbc2886 ARM64: dts: rk3368: add rk3368-sheep.dts for sheep board
rework for rk3368-tb.dtsi and rk3368-tb-sheep.dts, intergrate them
to rk3368-sheep.dts

Change-Id: Ieb9198be7c80a5c8c31b0a1990bac22079548eea
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-14 16:06:12 +08:00
Simon
53f846a05f ARM64: dts: rk3368: Add iommu node for ISP/HEVC/VOP/VPU
Change-Id: I8193fa6f4cf186c2122b56d652f076024f517fb7
Signed-off-by: Simon <xxm@rock-chips.com>
2017-03-14 14:38:07 +08:00
Finley Xiao
3ff7f2b035 arm64: dts: rockchip: add cpu-avs device node for rk3368
Add cpu-avs node in the device tree for the ARM64 rk3368 SoC.

Change-Id: Ie7eee09c20b06bd755b9277e0acd8eaf810c5331
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-03-14 10:28:27 +08:00
Finley Xiao
8c0fbe8d07 arm64: dts: rockchip: add efuse device node for rk3368
Add a efuse node in the device tree for the ARM64 rk3368 SoC.

Change-Id: I7d13febf73e336d5b9d1046ffe6ed69d99ea9dd6
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-03-14 10:28:27 +08:00
Finley Xiao
1846e7d725 nvmem: rockchip-efuse: add rk3368-efuse support
This adds the necessary data for handling efuse on the rk3368.
As efuse of rk3368 is secure, use secure interface to access efuse.

Change-Id: I72c29348b7744b232d75ab51c56dc7de0988c24e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-03-14 10:28:27 +08:00
Finley Xiao
ed4dc984d2 clk: rockchip: use rk3368-efuse clock ids
Reference the newly added efuse clock-ids in the clock-tree.

Change-Id: Ibbef52bcc44d006ab48e6f1f874e3bc88c681bd6
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-03-14 10:28:27 +08:00
Finley Xiao
3125e80cd5 clk: rockchip: add ids for efuse pclk on rk3368
Adds new ids for the pclk supplying the efuse on rk3368 socs.

Change-Id: I69f0daf402d62079e47d8df8f6e9bef0b274239f
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-03-14 10:28:27 +08:00
chenjh
e5edf0a295 firmware: rockchip: sip: add secure register read/write
Change-Id: If1369fb63a2618d20bfe7edffdc49bd4a959f954
Signed-off-by: chenjh <chenjh@rock-chips.com>
2017-03-14 10:28:27 +08:00
Elaine Zhang
88dd889620 clk: rockchip: fix up the rockchip_rk3066_pll_clk_set_by_auto func
Change-Id: Id7c561a50a16918c2943f79701ab72c6eaccdc41
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-03-14 10:26:50 +08:00
Jacob Chen
181f6bdcff drm/rockchip: rga: fix potential buffer overflow
Change-Id: Id923e38264855320fbe994bed156bf16eac60245
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-03-14 09:09:32 +08:00
Jacob Chen
89211fb8a7 drm/rockchip: rga: don't flush buffer context
to save time

Change-Id: Ie4a1618eabdbb9ebf5ad0b73b8acc9df884a81bb
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-03-14 09:09:19 +08:00
Jacob Chen
0800d51b9d ARM: dts: rk3288: add dma-coherent to rga
RGA are used for scale copy buffer form vpu,isp,
no need to flush CPU cache

Change-Id: Id3cfa0560a14cea122321dc1ea814aa8ec5dd4b6
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-03-14 09:09:08 +08:00
Zorro Liu
39d4073fe9 driver, touch, gt9xx: enable regulator default
Change-Id: I6e3e7fe6102c83058078486104f88a31cdf1d65b
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-03-13 17:45:17 +08:00
Frank Wang
acee7563ea arm64: configs: rockchip_defconfig: enable mailbox and scpi
This adds select mailbox and scpi support.

Change-Id: I98fa6ee1ca210779b44c1351b68e8725071de07a
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2017-03-13 15:55:00 +08:00
Frank Wang
c71a0bf1fd arm64: dts: rockchip: enable mbox related for rk3368-tb
This adds enable mbox and scpi function for rk3368-tb board.

Change-Id: I0b4866b72ad59892bc1c051c60bafd1a15ddce14
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2017-03-13 15:53:02 +08:00
Frank Wang
c77cc0a3ef arm64: dts: rockchip: add mbox related nodes for rk3368
This adds support rk3368-mbox and scpi nodes for rk3368 SoC.

Change-Id: Ifdb90f8101c67ec579b5bba28f163527ed096c4c
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2017-03-13 15:50:10 +08:00
Frank Wang
f18ee0f4d9 mailbox: rk3368: add mailbox and scpi function
Add mailbox and scpi protocol function support for rk3368 SoC.

Change-Id: I201c916865eb2729ed135c3f5a77a9dd97007952
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2017-03-13 15:49:22 +08:00
Randy Li
c144dc5d53 video: rockchip: vcodec: fix the output buffer of jpeg
The JPEG decoder is also able to output the raw image in
NV12 format without the help of Post Processor of decoder
in VDPU1.

Change-Id: I1b29a5d93d2dd8ae2f21a7537cc3493adf57d022
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2017-03-13 15:38:06 +08:00
XiaoDong Huang
2dd82913d7 soc: rockchip: add virtual poweroff support
Change-Id: I79240fa936eee3e64eb74eb5d5cdc952c3b2ac9b
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2017-03-13 15:29:35 +08:00
wlq
3f217d60ae ARM64: dts: rk3399: config rockchip_suspend
Change-Id: I41e7e77b1cc903200c7e1711bae15c629a616564
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2017-03-13 14:58:29 +08:00
Mark Yao
0e371c3c78 ARM64: dts: rk3399-mid-818: enable hdmi on vopl
Change-Id: Ic42cd1895aaf0326671a30b4971c79b8ab309b4e
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-13 14:57:41 +08:00
xiaoyao
4ff12c77a2 arm64: rockchip_defconfig: enable CONFIG_FW_LOADER_USER_HELPER_FALLBACK
Change-Id: Ide84478567d97b53359619bd646c3d11c89e2485
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2017-03-13 12:54:18 +08:00
David Wu
7b542a395d arm64: dts: rockchip: rk3328: Fix the saradc compitiable
The rk3328 saradc is the same as rk3399, so change the compitiable,
they are both 6 channels.

Change-Id: Ia6104e8c5c3590cc745792b8cd3a457a15bb53d2
Signed-off-by: David Wu <david.wu@rock-chips.com>
2017-03-13 12:45:22 +08:00
David Wu
8aceffc885 arm64: dts: rockchip: rk3328: remove the gmac m0 pins
The RK3328 datasheet is not define the pins of gmac m0,
so remove them.

Change-Id: Ic537586c76bd2f3a937c1e15b5877744598cc702
Signed-off-by: David Wu <david.wu@rock-chips.com>
2017-03-13 12:45:09 +08:00
David Wu
d356b80cab arm64: dts: rockchip: rk3328: Use new define for RK3328 pins
Change-Id: I33ba7d3ae0fd93e94fe661936d90f2100f478205
Signed-off-by: David Wu <david.wu@rock-chips.com>
2017-03-13 12:44:53 +08:00
Andy Yan
fe207b3cb8 include: dt-bindings: Add GPIO pin index definition for rockchip pinctrl
Add gpio pin index definition to make it easier to describe
GPIO in dts.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Change-Id: I4aa6c01f96d91fd8ddcb371fd01ca9629f1a3013
2017-03-13 12:44:37 +08:00
Xu Xuehui
81d4a9fdbd net: wireless: rockchip_wlan: update for ap6xxx wifi firmware
bcmdhd driver support ko module or compile into kernel

Change-Id: I260c9d3c3da0a9e249a4ee3883ed3efe03964ddf
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
2017-03-10 17:42:07 +08:00
Elaine Zhang
0545b1db57 linux: mfd: rk808: fix up the RK818_NUM_REGULATORS
Change-Id: I049286ec7afcaa66ca88458f51a3e0d516121001
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-03-10 16:11:05 +08:00
Sean Paul
22f2220668 FROMLIST: drm/bridge: analogix_dp: Don't read EDID if panel present
If there's a panel connected to the analogix_dp bridge, rely on
the panel driver for modes, rather than reading EDID *and* calling
get_modes() on the panel.

This allows panels with a valid EDID to read it in the panel driver
(e.g. simple_panel), and panels with invalid EDID to homebrew modes
in their get_modes implementation.

BUG=chrome-os-partner:53565
TEST=Boot device and confirm the modes returned are from panel driver
     instead of EDID

[from https://patchwork.freedesktop.org/patch/107115/]
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/374959
Commit-Ready: Chris Zhong <zyw@rock-chips.com>
Tested-by: Chris Zhong <zyw@rock-chips.com>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

Change-Id: Ie07dd33e3c121215bf24394cfcb3fff8c7c746a5
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-10 16:10:10 +08:00
xiaoyao
2694919094 arm64: rockchip_defconfig: enable CONFIG_BT_RTKBTUSB
Change-Id: I571f3c53cb63a0f5f4d11c2e3dd128d828815b47
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2017-03-10 14:43:35 +08:00
xiaoyao
4d99f97ec0 net: wireless: rockchip: add rtl8822be pcie wifi driver
Change-Id: Ibdc9a9272bf5221b56e2c63b59ffcba41674994c
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2017-03-10 14:41:50 +08:00
Xu Xuehui
e49f8fa707 arm64: rockchip_defconfig: enable CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP
Change-Id: Idd64d6b137dc4bdabfd553bd6912d75a405b6485
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
2017-03-10 14:37:27 +08:00
Mark Yao
0814e5b4a4 iommu/rockchip: don't do power domain enable on probe
Change-Id: I1484cbe6f7aa4fe358a3223de62a19aabee29d5c
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-10 14:23:22 +08:00
Jianqun Xu
141e497420 ARM64: dts: rk3368-android: assigned aclk_vop to 400Mhz
Change-Id: Ie70934cb7046aa96a94e14b251d11e87a98b1512
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-10 13:57:50 +08:00
Jianqun Xu
f9faa9007b ARM64: dts: rk3368-android: set firmware_class.path=/system/vendor/firmware
It's required by gpu driver, which will load firmware through
/system/vendor/firmware.

If android finds another way to fix it, then can be reverted.

Change-Id: I2fede28f022f10c2e16f68b21159a638a10a53ec
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-10 12:24:27 +08:00
Jianqun Xu
466ee1ee7b staging: ion: add api to set/get platform device
Change-Id: Ic251497b173608e1f98bf68fbf2b54b75f89c143
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-10 09:22:28 +08:00
Jianqun Xu
f2c399320e Revert "arm64/dma-mapping: __generic_dma_ops always call swiotlb_dma_ops"
This reverts commit 3e89f7de9a.

Change-Id: I4cf45807f91ab3021b6593f171c1f2573e1ea7f2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-10 09:20:41 +08:00