Tao Huang
dcc52ea50d
video/rockchip/rk_fb: fix compile warning
...
drivers/video/rockchip/rk_fb.c:4002:4: warning: this else
clause does not guard... [-Wmisleading-indentation]
Change-Id: I4c75dea72a2ebde8f1271334f91d5fd890274017
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
2018-02-07 19:25:00 +08:00
Tao Huang
6e1a9a5ca4
video/rockchip/lcdc/rk3368_lcdc: fix compile warning
...
drivers/video/rockchip/lcdc/rk3368_lcdc.c:2198:2: warning: this if
clause does not guard... [-Wmisleading-indentation]
Change-Id: I0cbd3ba10b891b67782b1a105eaac3d473e52527
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
2018-02-07 19:24:35 +08:00
Tao Huang
c763c84a62
media/video/rk30_camera_oneframe: fix compile warning
...
drivers/media/video/rk30_camera_oneframe.c:2212:5: warning: this if
clause does not guard... [-Wmisleading-indentation]
Change-Id: Ie304d39082a84b322a15b8b74f5b24d9d394b4d7
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
2018-02-07 19:20:38 +08:00
Tao Huang
02a3e3fc5e
media/video/generic_sensor: fix compile warning
...
drivers/media/video/generic_sensor.c:865:5: warning: this if
clause does not guard... [-Wmisleading-indentation]
Change-Id: Ic34e59cb45b28864ccc15f5c641cd6aedbff4dab
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
2018-02-07 19:06:04 +08:00
Tao Huang
27ba838b5e
power/rk817_charger: fix compile warning
...
drivers/power/rk817_charger.c:735:2: warning: this else clause
does not guard... [-Wmisleading-indentation]
Change-Id: Ib65d2f54463c39d7fe9fd1dfb39a76035df05172
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
2018-02-07 18:59:05 +08:00
Tao Huang
d97eb29a35
hid/hid-rkvr: fix compile warning
...
drivers/hid/hid-rkvr.c:780:3: warning: memcpy writing 9 bytes into
a region of size 1 overflows the destination [-Wstringop-overflow=]
Change-Id: If4859756f19cb692bcc3584ff707c135749e73e4
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
2018-02-07 18:46:00 +08:00
Rocky Hao
cdf1300d50
arm64: dts: rockchip: px30: add basic thermal config
...
Change-Id: I4febd05098d1adb1cf26e20fa4929d6c3a65541f
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com >
2018-02-07 17:57:29 +08:00
Wyon Bi
8645f241e2
arm64: dts: rockchip: rk3326-evb-lp3-v10: add samsung,lsl070nl01 lvds panel
...
Change-Id: I491f42a1f4bcef37220225de42e6b5e32d7849cd
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com >
2018-02-07 17:56:42 +08:00
Wyon Bi
b7dc6245a7
drm/rockchip: lvds: Add support for PX30
...
Fixes: 35cd525521 ("drm/rockchip: lvds: Add support for PX30")
Change-Id: Ib71efbb6a063694d755df287568e0d14d6074238
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com >
2018-02-07 17:56:42 +08:00
Wyon Bi
7300f293eb
arm64: dts: rockchip: px30: correct reg address for lvds node
...
Change-Id: I40365c31fe801f29c5cb2ffa57b478d1fe63b2b0
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com >
2018-02-07 17:56:42 +08:00
Zorro Liu
fb0bdec10f
arm64: dts: rockchip: modify sensor layout value of rk3326-863-lp3-v10 board
...
Change-Id: Ida4cf4b314c34a5daf7706d74913505945584b1c
Signed-off-by: Zorro Liu <lyx@rock-chips.com >
2018-02-07 15:56:25 +08:00
Liang Chen
f283252018
clk: rockchip: px30: make clk_gpu_divnp5 critical
...
If disable clk_gpu_divnp5, we will get error below:
[ 3.699114] rockchip-pm-domain ff000000.power-management:power-controller: failed to get ack on domain
'pd_gpu', val=0x43c443c4
[ 3.700579] W : [File] : drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c; [Line] : 134; [Fu
nc] : kbase_platform_rk_init(); power-off-delay-ms not available.
[ 3.700880] Unhandled fault: synchronous external abort (0x96000010) at 0xffffff8009620000
[ 3.700897] Internal error: : 96000010 [#1 ] PREEMPT SMP
[ 3.703090] Modules linked in: bifrost_kbase(+)
[ 3.703524] CPU: 0 PID: 1 Comm: init Not tainted 4.4.112 #578
[ 3.704034] Hardware name: Rockchip rk3326 evb board (DT)
[ 3.704515] task: ffffffc00a308000 task.stack: ffffffc00a310000
[ 3.705362] PC is at kbase_reg_read+0xd0/0x1c8 [bifrost_kbase]
[ 3.706173] LR is at kbase_backend_gpuprops_get+0x24/0x20c [bifrost_kbase]
Change-Id: I481cdaa60b5174ae6763e11fb42f79ed9208c120
Signed-off-by: Liang Chen <cl@rock-chips.com >
2018-02-07 15:33:17 +08:00
Sandy Huang
78e60f5ad5
drm/rockchip: px30 vop: correct for alpha config
...
Change-Id: Ifc9741392e3b3fc2996917655e84535039e5ca00
Signed-off-by: Sandy Huang <hjc@rock-chips.com >
2018-02-07 14:09:49 +08:00
Wyon Bi
b1c013a231
phy/rockchip: mipi-dphy: Fix pclk handing
...
Change-Id: I6f57995cb65bdeb0aa750387107b8c4ba2080293
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com >
2018-02-07 12:15:00 +08:00
Zhangbin Tong
712e48b64a
arm64: dts: rockchip: rk3368-r88: enable dmc and dfi
...
Change-Id: I87f9c30778d4b58d4447abb89e01bc59b00b6ad0
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com >
2018-02-07 12:04:17 +08:00
Xinhuang Li
1cfda2f55e
clk: rockchip: rk3228: Add clock id for pclk_acodecphy
...
Change-Id: I289f2c2681e187eaed0cda1561544581409ffd07
Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com >
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
2018-02-07 12:03:35 +08:00
Zheng Yang
08ec13e4d0
drm: rockchip: dw-hdmi: fix 10bit not work when booting up with uboot logo
...
Default value of hdmi->colordepth is defined by input color mode,
so there is no need to set value again when color depth property
is created.
Change-Id: I2e242fabdaadc0c3b41e48f806cbded5f619c455
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com >
2018-02-07 12:02:59 +08:00
huangjc
6abfe1d617
drm: bridge: synopsys: Fix hdmi can't display in android
...
Change-Id: I2f3ee8176761b5227c30df25c569e4c34ae773e2
Signed-off-by: Jiancai Huang <huangjc@rock-chips.com >
2018-02-07 12:02:45 +08:00
Wyon Bi
1aa2618e86
drm/rockchip: dsi: support dual-link mode
...
Display Pipeline:
1) dual-channel mode
--> dsi0 --> dphy_tx0 -->
/ ! \
vopl/vopb --> dphy_pll --> panel
\ ! /
--> dsi1 --> dphy_tx1 -->
2) dual-link mode
vopb/vopl --> dsi0 --> dphy_tx0 --> panel0
!
dphy_pll
!
vopl/vopb --> dsi1 --> dphy_tx1 --> panel1
Change-Id: Iddbea22f121959e4afa969d74549d8fb66ab09f1
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com >
2018-02-07 12:02:27 +08:00
Zhou weixin
6837f6f0d6
arm64: dts: rockchip: fix panel for rk3326 863 tablet board
...
Change-Id: I8e5314fd606e135bfea1334d5c677b17cdae9c7f
Signed-off-by: Weixin Zhou <zwx@rock-chips.com >
2018-02-07 12:01:16 +08:00
Zhou weixin
15e470ac6b
arm64: dts: rockchip: add gt1x config for px30/rk3326 evb board
...
Change-Id: Ic13cf5d07ee6d5f42f02b801252a8aa0d26246b4
Signed-off-by: Weixin Zhou <zwx@rock-chips.com >
2018-02-07 12:01:01 +08:00
Wyon Bi
04f66170c1
arm64: dts: rockchip: rk3326-evb-lp3-v10: correct enable-gpios for panel
...
Change-Id: I5d8e10b0edc6a577b6e6c2836546b4c27d9386d0
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com >
2018-02-07 12:00:25 +08:00
Wyon Bi
2e4d140fe4
arm64: dts: rockchip: px30: update lvds and dsi node
...
Fixes: d79a942925 ("arm64: dts: rockchip: px30: update lvds and dsi node")
Change-Id: I767744e2c0aa9d9df184077ddc5ea69c2c11e8f1
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com >
2018-02-07 11:59:37 +08:00
Huibin Hong
21ac5604d3
soc: rockchip: fiq debugger: clear busy interrupt before ATF fiq init
...
If uart has busy interrupt before ATF fiq init, although IER is 0,
it would cause interrupt. Thus after enable uart fiq of gic during init,
it may cause infinite interrupt because there is no uart handler to clear
the interrupts.
Change-Id: If530d266068e25132206519e5bf41762f6a7c9bd
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com >
2018-02-07 10:23:18 +08:00
Finley Xiao
50dc19e1d9
arm64: dts: rockchip: px30: Enable power controller
...
Change-Id: Ib6ea75b967b7f54b0b7d7e3cc839abfd37590150
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
2018-02-07 09:20:13 +08:00
Finley Xiao
83ff2ccac7
soc: rockchip: power-domain: Fix wrong value when power up pd
...
Change-Id: I430db30743d7bf7b6fb5c3adc21591c5d22c0974
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
2018-02-07 09:16:24 +08:00
Finley Xiao
c1e9d2d5af
arm64: dts: rockchip: px30: Fix clocks reference error
...
Change-Id: Iabf143473893e32905055350e91b3b9f3b631718
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
2018-02-07 09:15:41 +08:00
Jianqun Xu
990d5872ed
drm/rockchip: alloc object with limit to 32bit when LPAE enabled
...
Change-Id: I049c52b1fcee2d14e9db477f4cb58d352d456da3
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com >
2018-02-06 19:21:22 +08:00
Joseph Chen
1a185964d4
arm64: rockchip_defconfig: enable CONFIG_INPUT_RK8XX_PWRKEY
...
Change-Id: I25ee47671ad9a65d8cffd2958f21f6d433cde20d
Signed-off-by: Joseph Chen <chenjh@rock-chips.com >
2018-02-06 16:14:44 +08:00
Liang Chen
78335d6eb7
arm64: dts: rockchip: px30-android: add pinctrl for fiq-debugger
...
Change-Id: I7845d43a9e6e90e75e10adb50cf59cc6bb527b14
Signed-off-by: Liang Chen <cl@rock-chips.com >
2018-02-06 16:13:20 +08:00
Liang Chen
66cbf767cc
arm64: dts: rockchip: add gpu regulator supply for px30/rk3326 board
...
Change-Id: I6fe2c5168dd9637f53bfd2647f65d55fe008b339
Signed-off-by: Liang Chen <cl@rock-chips.com >
2018-02-06 16:11:57 +08:00
Liang Chen
a869e09080
arm64: dts: rockchip: add cpu regulator supply for px30/rk3326 board
...
Change-Id: I961d5fa4dee43eb78b79357dca95b10c9753cec0
Signed-off-by: Liang Chen <cl@rock-chips.com >
2018-02-06 16:09:59 +08:00
Liang Chen
08097c03ee
arm64: dts: rockchip: add gpu opp-table for px30/rk3326
...
Change-Id: Ib169c4f15d2f0844b39b80554247675a29c1d356
Signed-off-by: Liang Chen <cl@rock-chips.com >
2018-02-06 16:08:34 +08:00
Liang Chen
ac8d6f24a8
arm64: dts: rockchip: add cpu opp-table for px30/rk3326
...
Change-Id: I7b70e534302a66d168a7902ca0759e7535767948
Signed-off-by: Liang Chen <cl@rock-chips.com >
2018-02-06 16:06:10 +08:00
Tony Xie
a36a41bf39
arm64: dts: rockchip: change the vdd_arm and vdd_logic node of px30/rk3326 board
...
change the vdd_arm and vdd_logic dts node for rk3326 and px30.
delete the pinctrl define for rk818 and rk809.
Change-Id: I4fcc10ac48b4b91f4225efc2efdb78227de005ba
Signed-off-by: Tony Xie <tony.xie@rock-chips.com >
2018-02-06 16:00:23 +08:00
David Wu
c2e122487d
pinctrl: rockchip: Fix the uart2 & uart3 route bit of px30
...
Uart2 and uart3 both have routed bit, use their rx pin to
switch m0 or m1.
Change-Id: I4d5251f88484b1d98ab29071d34e4f14819520d6
Signed-off-by: David Wu <david.wu@rock-chips.com >
2018-02-06 15:07:35 +08:00
Jung Zhao
f580090ea2
video: rockchip: vpu: fix crash bug when translate failed
...
when translate failed, driver will print the regs.
but kernel must use kernel memory, if we print user
memory, it will crash.
Change-Id: Icfe30e4b70485e2d20d0d75dca7d51d3b904e7cc
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com >
2018-02-06 14:47:54 +08:00
Sandy Huang
781b2a44f1
arm64: dts: rockchip: px30: add VOP PD control
...
Change-Id: Id9a7d2f5eb4bd69f9c02f2105591699a8a3b88cc
Signed-off-by: Sandy Huang <hjc@rock-chips.com >
2018-02-06 14:28:32 +08:00
Zhaoyifeng
1fa81ca9bf
drivers: rk_nand: fix nand driver shutdown issue
...
bug: if nand driver initialize fail, shutdown function will
will access undefined address and kernel will abnormal reset.
[ 2.793278] [<ffffff80080e738c>] __wake_up_common+0x28/0x90
[ 2.793775] [<ffffff80080e761c>] __wake_up+0x3c/0x54
[ 2.794231] [<ffffff8008884a88>] rknand_dev_shutdown+0x40/0x64
[ 2.794753] [<ffffff8008882ed8>] rknand_shutdown+0x24/0x2c
[ 2.795252] [<ffffff800851e0a8>] platform_drv_shutdown+0x20/0x28
[ 2.795796] [<ffffff800851a970>] device_shutdown+0x15c/0x1b0
[ 2.796308] [<ffffff80080c1ed4>] kernel_restart_prepare+0x34/0x3c
[ 2.796850] [<ffffff80080c1fc0>] kernel_restart+0x14/0x5c
[ 2.797337] [<ffffff80080c2300>] SyS_reboot+0x198/0x1f0
[ 2.797812] [<ffffff80080832f0>] el0_svc_naked+0x24/0x28
[ 2.798290] Code: 2a0103f6 2a0203f5 f8408e80 2a0303f7 (f85e8413)
[ 2.798856] ---[ end trace dac58c6cbecdc881 ]---
[ 2.645282] init: Reboot ending, jumping to kernel
[ 2.647526] rknand_shutdown...
Change-Id: I21b946f9ed790170be8024c2d39ed18bc2835994
Signed-off-by: Zhaoyifeng <zyf@rock-chips.com >
2018-02-06 14:28:25 +08:00
Tony Xie
2bb022aa28
arm64: dts: rockchip: enable i20 status and replace vccsys and vcc5v0_sys for px30/rk3326 board
...
Change-Id: I8ad097dbd3f82d8b5b9d456a37a3be8ed14ae144
Signed-off-by: Tony Xie <xxx@rock-chips.com >
2018-02-06 14:22:46 +08:00
Finley Xiao
263f468566
clk: rockchip: px30: Add clk_ddrmon_timer
...
Change-Id: I41cd72bb89b06e7239582f35a1e5455745b764d9
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
2018-02-06 11:44:20 +08:00
Finley Xiao
36726233ea
clk: rockchip: px30: Fix some clock div_width
...
Fix uart, tsadc and saradc div_width.
Fix saradc clksel_con.
Change-Id: Iafc4e4436e7d273a1cfc80d1d8ada3fce8239912
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
2018-02-06 11:44:05 +08:00
Finley Xiao
2a37a264e9
clk: rockchip: px30: Fix softrst register number
...
Change-Id: Ieefc9cedb56fbe7dc6810135e87592c6f65b7124
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
2018-02-06 10:58:33 +08:00
Wyon Bi
f242736258
drm/rockchip: lvds: Add a better description for rockchip_lvds_soc_data
...
Change-Id: I0750074515fd131abb17d7636b1183842199a9f5
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com >
2018-02-06 10:01:44 +08:00
Huang jianzhi
af2b840cfe
ARM: dts: rockchip: fixed vdd_log max and min value for rk3288-evb-android-rk808-edp
...
Change-Id: I21f4a06bcf30ff39bcbdf8b9bd60f4ad53e4c24d
Signed-off-by: Huang jianzhi <jesse.huang@rock-chips.com >
2018-02-06 09:23:46 +08:00
Zhou weixin
be5e47668c
arm64: dts: rockchip: enable tsadc for px30/3326
...
Change-Id: I93797773a49d2167c5d9d15d7ac7ab5a0f807240
Signed-off-by: Weixin Zhou <zwx@rock-chips.com >
2018-02-05 20:19:46 +08:00
Zhen Chen
b1ac6cb0f1
arm64: rockchip_defconfig: add MALI_BIFROST as m and relative configs
...
Change-Id: Iafd93df4a19ad6c1aa317817154d0aed0005f65d
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com >
2018-02-05 20:18:26 +08:00
Zhen Chen
a58d4bfdbb
drivers/gpu/arm: add bifrost/ into kernel build system
...
Change-Id: Ia5728750e6a98d3c366e116013fbd43bff1a1459
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com >
2018-02-05 20:18:26 +08:00
Zhen Chen
24b77886e3
bifrost: make it possible to build midgard and bifrost as module in one make
...
including :
modifications for changing patch from drivers/gpu/arm/midgard
to drivers/gpu/arm/bifrost;
rename output mali_kbase.ko to bifrost_kbase.ko;
rename configs, which have duplicated names in midgard, in Kconfig,
Kbuild and source files.
Change-Id: I127d8c8043db9010398946b3f4a90640ab1f13fe
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com >
2018-02-05 20:18:26 +08:00
Zhen Chen
07210d909f
MALI: bifrost: rk: ipa/: to fit current 'struct devfreq_cooling_power'
...
Need CONFIG_MALI_PWRSOFT_765 enabled
Change-Id: I96476f6b884bf48e46643685aa6d77dadcd80edb
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com >
2018-02-05 20:17:47 +08:00