Commit Graph

606808 Commits

Author SHA1 Message Date
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
Algea Cao
6c17c7592a ARM64: dts: rockchip: rk3328-android: Enable tve uboot logo
Change-Id: If2855f3fc8215c7b4ab9edc2d97dbac5b1c086ef
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-02-05 18:35:46 +08:00
Zhen Chen
1d3cef672c MALI: bifrost: rk: not to use sg_dma_len in bifrost DDK r8p0-01rel0
When CONFIG_NEED_SG_DMA_LENGTH is enabled,
sg_dma_len is defined as follow :
"#define sg_dma_len(sg)             ((sg)->dma_length)"
But, dma_length is not used by the framework indeed.

Change-Id: I93b4ceed28882236dc252fcabb7c7710153804a0
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2018-02-05 17:08:31 +08:00
Zhou weixin
52a3c97e1d arm64: dts: rockchip: remove duplicate and reorder nodes for px30
Change-Id: I36bd28ad6859f19a59de627f8b81acf5dc3fd27c
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-02-05 17:02:04 +08:00
Liang Chen
74645caeb7 arm64: dts: rockchip: add parameters in CommandLine for px30-android
Some parameters in rk-parameter are not included in gpt mode, so we
need move these parameters into CommandLine.

Change-Id: Ia17d7bfc8841531c0cce0d257ff12efdef9f4c64
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-02-05 17:01:24 +08:00
shengfei Xu
7839478969 arm64: dts: rockchip: add rk817 battery config for rk3326
Change-Id: I76c998abe9b6c6f34365c0b5aedd304af28f58e3
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2018-02-05 16:42:01 +08:00
shengfei Xu
554fe49f4a arm64: dts: rockchip: add rk817 charger config for rk3326
Change-Id: I7bbbce5cfa934328ec2f108f079f0649ca8a66f2
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2018-02-05 16:42:01 +08:00
Zhen Chen
7481e8328c MALI: bifrost: add rk_platform_specific_code
Copyed from midgard/platform/rk at commit 77a680a3.

Change-Id: Iaa218e2183e5fc6ef34f50678fc34376a54a29a4
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2018-02-05 16:36:56 +08:00
Zhen Chen
2152419621 MALI: midgard: RK: rename output mali_kbase.ko to midgard_kbase.ko
Some optimizations on files of KBuild in addition.

Change-Id: I1db012e116b8b69897a2791ae610da35365a1a61
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2018-02-05 16:35:07 +08:00
Zhen Chen
865ddcf6c8 arm64: rockchip_defconfig: change CONFIG_MALI_MIDGARD from y to m
Change-Id: Ibd59ece75821729b16b42c92a3ad0f5f818c1488
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2018-02-05 16:35:07 +08:00
Zhong Yichong
05f148f30f camera: rockchip: camsys_drv: v0.0x26.0
fix iommu resource not been released when process mediaserver
crashes unexpectly.

Change-Id: Ia8209f7d0a60f6a86d273e313260b87d5facecc3
Signed-off-by: Zhong Yichong <zyc@rock-chips.com>
2018-02-05 16:34:34 +08:00
shengfei Xu
3e1d04be48 arm64: rockchip_defconfig: enable CONFIG_BATTERY_RK817
Change-Id: Iec1ff6aad066f3d137168983104767b27c8037ef
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2018-02-05 16:32:13 +08:00
shengfei Xu
92e570a84f power: rk817: support rk817 battery driver
Change-Id: Ie0e2f4baab33949506ef835e068a10610863ab73
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2018-02-05 16:25:34 +08:00
shengfei Xu
828352f6eb arm64: rockchip_defconfig: enable CONFIG_CHARGER_RK817
Change-Id: I49ad5dcddb06e17e9e9eaa03992851cdf159732d
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2018-02-05 16:24:10 +08:00
shengfei Xu
90aca5321d power: rk817: support rk817 charger driver
Change-Id: I2c1aca9706ee43f0b119cf775140a11fdb837e47
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2018-02-05 16:22:18 +08:00
tony.xie
4a56c8edc7 mfd: RK817 & RK809: Add new mfd driver for RK817 & RK809
The RK817 & RK809 chip is a power management IC for multimedia and handheld
devices. It contains the following components:

- Regulators
- RTC
- Clkout
- Pinctrl
- Powerkey

The RK817 & RK809 core driver is registered as a platform driver and provides
communication through I2C with the host device for the different
components.

The following is the different between the RK817 and the RK809.
1、The dcdc-buck5 is a boost dcdc for RK817 and is a buck for RK809.
2、The RK817 have one switch but The Rk809 have two.
3、The RK817 have a charger and powerpatch function but RK809 not.

Change-Id: I132029c5b28978db7ae06e13c327a1edf70f5b69
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
2018-02-05 16:18:20 +08:00
Huicong Xu
1cb8aa091d drm/bridge/synopsys: restore bus_width as 8 when disable hdmi encoder
to modify bus width error sometime plug out hdmi and switch cvbs output

Change-Id: Iaa7914fbccc99991fbfbc5495ba647f97997c8ba
Signed-off-by: Huicong Xu <xhc@rock-chips.com>
2018-02-05 16:02:37 +08:00
Sandy Huang
ac4076851c drm/rockchip: vop: fix wait frame start timeout
In the following case will lead to wait frame start timeout:

uboot(HDMI output 4K(DCLK: 594HZ))
    -> kernel start(unplug HDMI)
        ->drm driver probe(plug HDMI)enable crtc(set dclk to 27Mhz)
            ->VOP timing register is frame effect
                ->VOP working at 4k output but dclk is 27M
                    -> VOP frame time 16.6ms * 574 / 27 = 354ms

Change-Id: Ic98af0029a15fbeef78e4f3abe4e739e760ab471
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-02-05 16:00:53 +08:00
Zhou weixin
64ef3da372 arm64: dts: rockchip: add io-domain config for px30/rk3326
Change-Id: I8b0c76dfc388068782f613285f3b0c5e5314cd32
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-02-05 15:45:09 +08:00
tony.xie
bffbb0ee12 arm64: dts: rockchip: add rk817 config for rk3326
Change-Id: Ia7c18fddccb02148c997659f4684b25d3d1ce5c8
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
2018-02-05 15:44:09 +08:00
Tony Xie
f6ee06ee9c arm64: dts: rockchip: add rk809 config for px30
Change-Id: I800930de092077f96873304b17aa218fa791813a
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
2018-02-05 15:40:59 +08:00
Zhen Chen
142f58d546 MALI: rockchip: add arm release of Bifrost DDK r8p0-01rel0
Change-Id: If8d2c3a903a205e3a7c101c4383735940439c9d0
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2018-02-05 14:28:39 +08:00
Zhangbin Tong
5e64a923d9 ARM: dts: rockchip: Add android board dts file for rk3229 evb
Change-Id: Ic6459c66119e5c8e1785cf2f47dfc12c20560f2e
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-02-05 10:59:34 +08:00