shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 20:32:04 +09:00
Code Issues Packages Projects Releases Wiki Activity
600,371 Commits 55 Branches 2,486 Tags
89e06cd3b06062df35a1b262a95d413bb04ae9c4
Commit Graph

600371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Yao
89e06cd3b0 drm/rockchip: vop: correct rk3368/rk3366 feature 
RK3368/RK3366 not support 10bit output

Change-Id: Ib5cdab237828236e7867ce784d0e7b208aeb1ed0
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
 2017-03-27 09:59:38 +08:00
Jianqun Xu
471947d6ff arm: dts: rk3288-evb: use rockchip_key to replace adc_key 
Change-Id: I46df35c489bf15a159eb64a2d5e3d0b3510f6bef
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2017-03-27 09:40:00 +08:00
Jianqun Xu
8502633ed8 Input: add document for rockchip keys 
Change-Id: I3f8f4522e6279e3f5faf3f293936c835ce8fc6b7
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2017-03-27 09:39:44 +08:00
Huang, Tao
be3abb6107 ARM: rockchip_defconfig: update defconfig 
Change-Id: I594981b15c098d78313c4c17572cfbab643dbc9a
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2017-03-25 13:23:11 +08:00
Huang, Tao
c2b7f944b6 video/rockchip: rga2: fix compilation warning 
Change-Id: I92c2034da63cc8db2dac9a55cb654d4af21a7cf8
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2017-03-25 13:22:57 +08:00
Huang, Tao
94e602741d rk: Makefile set default CROSS_COMPILE for arm 
Change-Id: I44a0dfe1a1f3bbad6f6c21001d2e4d668ff0db8a
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2017-03-25 13:11:06 +08:00
Jianqun Xu
f33c5b9d6e usb: otg: modify default to n for usb2.0 
Change-Id: I6dc85a9fbf89b35afe67fc119f0d60a130691317
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2017-03-25 10:32:33 +08:00
Mark Yao
09eb60c109 arm64: dts: rk3399-box: fix dp and hdmi dclk parents 
Change-Id: Iebe0bfe248bf4ca6f61dafe1eb86a34dc6346e6f
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
 2017-03-25 09:06:17 +08:00
Jianqun Xu
31e823d95d arm64: dts: rk3368: modify rksdmmc to dwmmc 
Modify rksdmmc to dwmmc, sync with upstream.

Change-Id: I0aabcf47a5fe1b1f564bde2f719d8c1c48debc90
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2017-03-24 19:55:49 +08:00
Mark Yao
17f8b65e5c staging: ion: dup sg_table when map_dma_buffer 
Change-Id: Ib57df4e7f972a8e46b6c8e8c82e314e04cc3b349
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
 2017-03-24 18:36:30 +08:00
Elaine Zhang
21b4bfc5aa arm64: dts: rockchip: rk3399: add aclk/hclk_vop init freq 
to fix up the display error when no uboot logo show.

Change-Id: I6227391a3c0d015a5fa6ae916d849659d5957077
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
 2017-03-24 18:36:07 +08:00
Zikim,Wei
7ce80d0297 video/rga: fix rga support flip 
Change-Id: Ib5283779e08d1e58ff8a1fb5e3eb662aa8f0d130
Signed-off-by: Zikim,Wei <wzq@rock-chips.com>
(cherry picked from commit 7318eabddc3799460319181f9ffd34f2116a9e46)
 2017-03-24 18:35:34 +08:00
Jianqun Xu
b9eeaf94f6 video/rockchip: rga: replace system_nrt_wq with system_wq 
Change-Id: Id79ba17575b5844c329391a6e33e0f2f0c4353ff
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2017-03-24 16:49:35 +08:00
Jung Zhao
b9bc2efe94 video: rockchip: vpu: alloc & mmap iova inside drm allocator 
since on 3368 platform, hevc & vpu share the same hardware
resource, but have two independent mmu. and only one mmu can
be attached at the same time. I have to alloc and mmap iova
outside mmu attached status, otherwise it will cause mmu reset
error.

fix bugs:
1. hevc & vpu can work at the same time now. on 3368 platform,
vpu_mmu and hevc_mmu share the same irq with their respective
master device, we can not detach mmu during irq context.
2. fix copy_sgt offset and lenght invalide value

Change-Id: I9d02aa0b85a6d0690832c7869a260953f5a5baab
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
 2017-03-24 14:50:42 +08:00
Huang, Tao
90ad8256b6 mmc: rm rk_sdmmc.c 
Change-Id: Id48880a140a8055d30dafb42ad3e1aef973ae5c6
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2017-03-24 14:45:45 +08:00
Jung Zhao
2909a86c7b video: rockchip: vpu: add rk3368 support 
3368 is vpu & hevc combo platform which have a virtual master device
and two sub devcie - vpu_service & hevc_service. There is a flag in
grf, driver need write or erase this flag when switch mode.

since shutdown function only be called on virtual master device, we
need to call into both vpu and hevc device.

Change-Id: I56ad28dbbc7cc380204fb7d0da11d93b5ace9469
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
 2017-03-24 14:04:22 +08:00
Jung Zhao
f8dc9a61c5 ARM64: dts: rk3368-android: enable vpu_combo default 
Change-Id: I7b130e3d0787c441f862030f8a935063af818e01
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
 2017-03-24 14:01:40 +08:00
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