Commit Graph

600354 Commits

Author SHA1 Message Date
Jung Zhao
25f0664f67 ARM64: dts: rk3368: add vpu & hevc node
Change-Id: Iee8fb808ad0c929be8fa5db8164fd6e05321b352
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2017-03-24 14:01:11 +08:00
Jianqun Xu
f7f4bdd020 arm: dts: rk3288-evb: disable uart 1/3/4
Uart3 has been iomux to gpio, for vcc_3g regulator, which is designed
on rk3288 evb main board.

Disable unused uarts to fix gpio request blaim during system booting.

Change-Id: I2eb79ae63a6f226255c12fc3da9ba95ec4219d32
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-24 13:39:15 +08:00
Jianqun Xu
2eaa4d2cca arm: dts: rk3288-evb: fix regulator 'No configuration' error
SYR827/SYR828 regulators complain "No configuration", which caused by
lacking of regulator-state-mem.

Change-Id: Id113c05abb8fb095bf09979b5eb8ea1c4891037b
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-24 11:43:41 +08:00
Mark Yao
88f3f82414 staging: ion: add dma_map_sg/dma_umap_sg to map_dma_buf
Change-Id: Ibb1da3afd35a4411f096e8cbd7a17d35fc216cba
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-24 10:57:03 +08:00
Jung Zhao
acb5e395f4 iommu/rockchip: add multi irq support
there are two irq in vpu_mmu on 3368 platform.

Change-Id: I81d869c1ee536e31334a401a2ddb0e7f2226d4b2
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2017-03-23 20:35:22 +08:00
Jianqun Xu
d75575ba3a arm: dts: rk3288-evb: remove memory node
Change-Id: I84b2397dea92eb0e7cc926c17515c16f98854ad4
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-23 18:36:56 +08:00
Jianqun Xu
9b04c24ba1 arm: dts: rk3288-evb: add copyright
Change-Id: I4a68728a38d725a39bfefc51a3b188be94ffe87c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-23 18:36:56 +08:00
Jianqun Xu
f2850ddd46 arm: dts: rk3288-evb: add earlycon to args of cmdline
Change-Id: I4a7ce913deac9e88a9660c960c9fed746226db78
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-23 18:36:56 +08:00
Mark Yao
5a90381e5a drm/drm-prime: cache dma_buf import context
Change-Id: Ia39a3d4691f0b545039efb880c999a35886178a0
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-23 18:20:05 +08:00
Mark Yao
faedd820db dma-buf: add release callback support
Change-Id: Ibfb4ffe3d97fae0a27f20032fdfbc3cc561aa375
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-23 18:19:48 +08:00
Mark Yao
6db46c9e7e drm/rockchip: fixup display reference count
Change-Id: I9ae0699f26e3971e1f01cf36aa7a2f64dcade8dc
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-23 15:33:10 +08:00
Jacob Chen
3a03958f96 drm/rockchip: add support for src1
Although libdrm didn't implment src1, we should support it in driver in advance.

Change-Id: I7da051d1376ded63750f3363f9dd37fe6937a81c
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-03-23 14:33:38 +08:00
Xu Jianqun
88267760e9 arm64: dts: rk3368-android: remove dumplicated node
Change-Id: If5675877c29fbc7f29568cfe2c482f98d9d62608
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
2017-03-23 14:08:30 +08:00
WeiYong Bi
71d279801c clk: rockchip: rk3368: Add CLK_IGNORE_UNUSED flag for mipi phy refclk
If this flag is not specified, will cause loader display abnormal.

Change-Id: I8ecfc2a6f55c8437e7c30d1cf099ae8cc93a0150
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-03-23 13:58:43 +08:00
Mark Yao
d7debfeb77 drm/rockchip: vop: report error when check resource error
Change-Id: If59ea4f7344931795cadcfec1cae4d2ab95ab4c3
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-23 12:03:49 +08:00
zzc
d0b696db78 arm64: rockchip_linux_defconfig: enable rtl8188eu
CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP=y
CONFIG_RTL8188EU=y

Change-Id: I5d19e92280f0fb91701a3f2547251069380593ef
Signed-off-by: zzc <zzc@rock-chips.com>
2017-03-23 09:23:46 +08:00
Mark Yao
830239e9c9 video/rockchip: rga2: enable rga power when read rga version
Change-Id: Ib2a704b8f75f4b792dc5a70ed58c0b9306c2793c
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-22 19:36:51 +08:00
Elaine Zhang
e9fd218be3 arm64: dts: rockchip: rk3399: remove some unnecessary assigned-clocks node
keep aclk_vop hclk_vop freq the same as uboot,
to slove shaking for uboot logo to kernel show.

Change-Id: Id0b86fc583024482f16f40b2f1ec6f9189eac160
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-03-22 16:22:05 +08:00
Huang, Tao
72504dff7b arm64: dts: rk3328-evb: set fiq-debugger signal-irq to 145
Before is 135, which is conflict with arm-pmu irq.

Change-Id: Ib17928f3e3854b8ff1a0571e1639ca362ef2e190
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2017-03-22 14:31:46 +08:00
Shawn Lin
6529bc7a72 ahci: Add Device ID for ASMedia 1061R and 1062R
Change-Id: Idecc85eb9af85dbb7e6fcca95aa63762bcf1c2b4
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2017-03-22 14:17:14 +08:00
Zhou weixin
1690ce15bd arm64: dts: rockchip: config pwm polarity on rk3399-mid
Change-Id: Icbc406cb737c8ee00fd63b218bde3751611acc19
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2017-03-22 11:39:58 +08:00
dalon.zhang
4701514ad4 arm64: dts: rk3368-android: enable isp
Change-Id: Ib658fb798bb24b9686a78b4a2b64ab9fcc1a92f6
Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>
2017-03-22 11:38:23 +08:00
dalon.zhang
c1f06bff81 arm64: dts: rk3368: add isp config
Change-Id: I279afac575d17f534ce028ec13fbec7798b117d9
Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>
2017-03-22 11:38:06 +08:00
algea.cao
50b3052c04 drm: bridge: dw-hdmi: enable 3d mode
Change-Id: I45c4b0ded4aeaf24122d5cc6eb49b6bc72afc060
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
2017-03-22 11:31:30 +08:00
dalon.zhang
df804a00a9 camera: rockchip: camsys v0.0x21.0xa
Change-Id: Ic9c5661ba76eaf8aee36e1a1822aa9bcd288e0ac
Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>
2017-03-22 09:48:24 +08:00
Rocky Hao
92f81f9d04 arm64: dts: rockchip: update thermal config for rk3368
add cpus' dynamic power coefficient and update alert temperature

Change-Id: I502e49d52268b63625e01103b50e6c18fb8da8b0
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2017-03-21 18:00:29 +08:00
Zorro Liu
7ad1fc1c43 arm64: dts: rockchip: enable tsadc node for rk3368 p9 board
Change-Id: I5d8b84248b0c713068143df303427ef31cb78963
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-03-21 17:10:58 +08:00
Jianqun Xu
1ab80996a7 arm64: dts: rk3368-android: debug uart id change to uart3
Change earlycon and console to uart3.

Change-Id: I7c6d7322e077b605b209dce4cf51afb26b9147dc
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-21 16:28:23 +08:00
Zorro Liu
a274596ac3 arm64: dts: rk3368: hdmi disabled default and remove hdmi node from p9 board
Change-Id: I034f119de02a04841b8b70746ef63c73a170988f
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-03-21 16:10:08 +08:00
Elaine Zhang
61e585b9ef arm64: dts: rockchip: rk3368: xin32k use the fixed clk
If xin32k use the rk808_clkout1, rk808 init is too late,
xin32k enable count and prepare count is not match with it's child clk.

Change-Id: I314776c5024fdf3373619968582497e0e2d5666f
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-03-21 16:09:43 +08:00
Rocky Hao
d63ab481f1 arm64: dts: rockchip: enable tsadc node for rk3368 sheep board
Change-Id: I82c8ef62f5e149d07c76e3a3d971e4222d9b8ecf
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2017-03-21 11:54:41 +08:00
Rocky Hao
112fa9a922 arm64: dts: rockchip: update tsadc node for rk3368
Change-Id: I0c99dcc6b5515639a496b915832542c3b844f4c8
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2017-03-21 11:54:41 +08:00
Rocky Hao
6cd7160544 arm64: configs: rockchip_defconfig: enable rk3368 thermal
Change-Id: Ied2658479d5cccc404623af39da2c6cbe028bae0
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2017-03-21 11:54:41 +08:00
Rocky Hao
fa07761ac3 thermal: rockchip: add rk3368 support
Change-Id: I970fedca9542c724d777c0bac788300c4fa21303
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2017-03-21 11:54:40 +08:00
Finley Xiao
d472b161d5 nvmem: rockchip-efuse: Fix dependencies
Not every rockchip efuse depends on ROCKCHIP_SIP, so delete
dependencies in Kconfig. It is more appropriate to add
dependencies for sip_smc_secure_reg_read/write.

Change-Id: I7f551f9fe71ced847657531e3c3cf418766fa3a4
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-03-21 10:41:53 +08:00
hero.huang
c1b18ddbbc arm64: dts: rockchip: add RK3399 Firefly Board for Linux Opensource
Add Firefly board dts file for Linux Opensource project

Change-Id: Ia525b7ff17f4d74990625e2e02c764996f57e520
Signed-off-by: hero.huang <hero.huang@rock-chips.com>
2017-03-20 19:14:21 +08:00
Zorro Liu
097c89626d arm64: dts: rk3368-p9: add usb host
Change-Id: Ief0045ac99d3af4db22042d468b67609d6fddf2f
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-03-20 16:29:01 +08:00
Jianqun Xu
1ae04305b6 arm64: dts: rk3368-p9&sheep: disable uart2
Disable uart2 since gpio mux on uart with sdmmc, and rk3368 use
fiq debugger, the uart2 could set to be disabled.

Change-Id: I2d784ccd6cf7526afc0f3bae54914e05febf91a6
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-20 14:35:48 +08:00
Jianqun Xu
b3c7d6f14c arm64: dts: rk3368-p9: enable sdmmc
Change-Id: Ib2849e2af020c744e33f0ab1baefbe50cecaa80b
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-20 14:35:10 +08:00
Maarten Lankhorst
6c59c5bb51 FROMLIST: drm/core: Reuse the reserved member in drm_event_vblank for crtc_id.
When doing a atomic commit affecting multiple crtc's, multiple events
are generated. The user_data member does not allow you to distinguish,
because they all have the same pointer.

I've chosen to use crtc_id, because using pipe would create ambiguity
when pipe = 0. A test for != 0 is easier to implement, and crtc_id
will never be 0.

Change-Id: Ie2daba50f711f298872f15498b8d46dedb38c0ff
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Stone <daniels@collabora.com>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
(am from https://patchwork.kernel.org/patch/9272895/)
2017-03-20 11:10:55 +08:00
Zikim,Wei
b8ee4085ec arm64: dts: rk3368-android: enable rga
Change-Id: I869f4bae54f72dc384c644fe3a0a499db2af3dbf
Signed-off-by: Zikim,Wei <wzq@rock-chips.com>
2017-03-20 10:53:00 +08:00
Mark Yao
8c677f9c19 arm64: dts: rk3368-sheep: fix sheep backlight
Change-Id: Ief2603afd33a65158bf6e86f08e53f96573ce486
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-20 10:49:56 +08:00
Mark Yao
e16d8ea934 video: backlight: pwm_bl: fix backlight polarity
Backlight polarity not works without pwm_adjust_config.

Change-Id: I11e5eefe340f758b6721021f13238306b3721270
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-20 10:49:34 +08:00
Mark Yao
b20e10aa93 arm64: dts: rk3368: enable uboot loader logo
Change-Id: I4807ac2aafd9cf319e37eacd184c1eae3ea36242
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-20 10:48:44 +08:00
Zhou weixin
92fb96cb16 ARM64: dts: rk3368: p9: fix dc detect failed
Change-Id: Ia4cd3528725dd4de250b9417295e7705eb16c412
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2017-03-17 19:27:20 +08:00
Jianqun Xu
68865315a5 arm64: dts: rk3368-sheep: support mipi display
Change-Id: Ibeadd258ccbcd68a6c96fb08e7bfbcea79e5e6c6
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-17 16:06:20 +08:00
Jianqun Xu
00f65d6c96 arm64: dts: rk3368-android: reserve memory for drm-logo
Change-Id: I81b401d5561c67012f4d42d1640a6b1176490ca4
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-17 15:59:16 +08:00
WeiYong Bi
02a0a43f01 ARM64: dts: rk3368: p9: Add MIPI DSI panel support
Change-Id: I0d42d9ccd7ba09338c3074d1328ab5ec18079c27
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-17 15:30:25 +08:00
Jianqun Xu
f78164b394 arm64: dts: rk3368-android: enable display and vop
Change-Id: Iad1bd3544191d3badc8d0d8b8d9be363e3ac6ed6
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-17 15:30:25 +08:00
Elaine Zhang
d072a98be5 clk: rockchip: rk3368: add CLK_SET_RATE_PARENT flag for dclk_vop
dclk_vop only allowed on NPLL.

Change-Id: I5325a530d3052de1e8685c39b90357291f0f4fb3
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-03-17 15:24:30 +08:00