Commit Graph

606789 Commits

Author SHA1 Message Date
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
Zhangbin Tong
8c9400b3a1 ARM: dts: rk322x-android: Add ramoops and drm-logo
Change-Id: Ia6bf599215ca8639ad7f407743f3868b89782efc
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-02-05 10:59:23 +08:00
Zhangbin Tong
13e8708f28 ARM: dts: rk322x-android: add partitions specified by fstab in device tree
Change-Id: I334ee5e8f4e0cbfa274bc72173aa89ac44a0c727
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-02-05 10:58:02 +08:00
Zhangbin Tong
0777e17b91 ARM: dts: rk322x: add lable for display-subsystem
Change-Id: I05d469eb8da0a9241f0ec3eff039039211c4b656
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-02-05 10:57:27 +08:00
Zhangbin Tong
05bfe0c86a ARM: dts: rk322x: add capture interrupts for pwm3
Change-Id: I38995345de2401b151e42a0c047ee3d31d72402e
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-02-05 10:57:06 +08:00
Zhangbin Tong
151d396a6f ARM: dts: rk322x: Fix typo for pwm3 #pwm-cells
Change-Id: Iefdd1b9838b7a6f633476634c7bef53fdcfba923
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-02-05 10:56:41 +08:00
Zhangbin Tong
cb3339cafb ARM: dts: rk322x: add rockchip,rk3228-grf compatible to grf
Change-Id: I8bf76e140150f90bd2656053ab27ddfec6361da3
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-02-05 10:56:35 +08:00
Finley Xiao
a198c95b94 clk: rockchip: rk3228: Fix armclk parent
Change-Id: I09830d96b37cca600f1782b9013b25e043467f97
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-05 10:05:24 +08:00
Tao Huang
e7f55d159a printk: add support show process information on printks
Change-Id: I34cf76388ceb2e1f6b6417638c82bf774641ebac
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-02-02 19:26:07 +08:00
Tao Huang
707eebb0c9 regulator: debugfs: Adding debugfs functions into regulator framework
This change allows the user to read and edit regulator information
in user space through the debugfs file system.

Base on msm work.

Change-Id: I4b40d4fd662e3d3d0856127e8e030fa60e938df9
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-02 19:21:32 +08:00
Finley Xiao
6cd300f795 clk: rockchip: rk3128: Fix aclk_peri_src parent
Change-Id: Id679e7235f78635233dc4d6bd59c75ce05dfc99e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-02 19:09:29 +08:00
Zheng Yang
ea56866919 drm: bridge: synopsys: update more hdmi status in dw_hdmi_bind
If hdmi is enabled in uboot, hdmi->disabled and bridge_is_on and
phy status need to be updated.

Change-Id: Ib21d894b673bf12b46a271c91d3e08fe7475ea89
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2018-02-02 19:09:12 +08:00
Zorro Liu
3726b810fe drivers: input: sensors: reset sensor rate
Change-Id: I3fc1fbe5c054867fe6ce93f64bc2dc14f6abeb9c
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-02-02 19:06:30 +08:00
Algea Cao
21c38316b3 drm/rockchip: Support tve uboot logo
Add tve connector port. If uboot logo is enabled,
dac will not be disabled when tve bind.

Change-Id: I5d87f9d1afc05481968dc34b0bd09dd82719a933
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-02-02 18:55:50 +08:00
David Wu
9d155c640f power: avs: rockchip-io-domain: Change the name from vccio0 to vccio6 for px30
Checked with ic colleague, the name should be same as the datasheet,
so need to change the name, they also change it at trm.

Change-Id: Ie98ba5397cf0e5a2dba4e07fc0ca31a3330f05a6
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-02-02 18:51:52 +08:00
Zhou weixin
3bc1d7d06f arm64: dts: rockchip: Auto match emmc and nand devices for px30/rk3326
Change-Id: I787e0cefdf8bc7d0f5ae1483233017edafa7ee31
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-02-02 18:49:57 +08:00
Finley Xiao
588ae5977e clk: rockchip: Adjust the order of cpu boost
Change-Id: I5fe78b451f9afaff276aeb251d68daf780c1eecf
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-02 18:36:40 +08:00
Finley Xiao
fe53e62332 clk: rockchip: px30: Fix boost mask
Change-Id: I507efe5bf432556a9e603275f03c81a5a8ef96ed
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-02 18:33:59 +08:00
Finley Xiao
f1ae3d9c5a clk: rockchip: px30: Fix wait boost recovery idle
Change-Id: If407926c5fedd1e91b1223a3926f3bb98f4cb17c
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-02 18:33:36 +08:00
Finley Xiao
b503ff5697 clk: rockchip: rk3368: Add clock id for tsp
Change-Id: I79a423f93f991aab43922e58ce34eac1754304e2
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-02 09:46:34 +08:00