Commit Graph

600672 Commits

Author SHA1 Message Date
Huang, Tao
f63140be25 arm64: dts: rockchip: add cpuinfo support for rk3399-android
Change-Id: I0eba0017a88added1a84f9c3add1705d8079cd00
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2017-04-07 11:08:42 +08:00
Huang, Tao
c336f64cf9 soc: rockchip: add cpuinfo support
Set system_serial_low/high from eFuse ID.
Serial can read from /proc/cpuinfo.

Change-Id: If412fc5a89a5e5092b510452fc5a126fdd374ac2
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2017-04-07 11:08:32 +08:00
Finley Xiao
7f1808a6e2 arm: dts: rk3288-android: use secure efuse
Use a new compatible to match secure interface
when kernel is in no-secure mode.

Change-Id: I3994b2c86bb9e221f102766c2d1a341930628b5d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-04-07 10:41:52 +08:00
Finley Xiao
28ce472032 nvmem: rockchip-efuse: add support for rk3288 secure efuse
This adds the necessary data for handling secure efuse on the rk3288.
Need to use secure interface to access efuse when kernel is in no-secure
mode.

Change-Id: I1979f23ed8f85c9eb248de276b32adcbb165bd79
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-04-07 10:41:40 +08:00
Jianqun Xu
ff1bcea7f3 arm: dts: rk3288-evb: support board with rk818
Change-Id: Iea8b91289c335be8c8f620430837ccf42776abf5
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-04-07 10:39:36 +08:00
chenzhen
f1233ce0c6 arm64: rockchip_linux_defconfig: disable CONFIG_MALI400_DEBUG
Change-Id: I0fb379772f2f4d99a17439760fe997d0f5ab1eef
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-04-07 10:33:47 +08:00
Xu Xuehui
b3cc5f24d3 net: wireless: rockchip_wlan: update for ap6xxx wifi driver
fix compile warning when CONFIG_DEBUG_SECTION_MISMATCH=y

Change-Id: Iada73b82feed96279fed588adc4cbe47bd6be8f0
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
2017-04-07 10:19:51 +08:00
Tang Yun ping
3e61936275 clk: rockchip: optimizing ddrclk_scpi_recalc_rate behavior
Cat ddr frequency from rockchip_ddrclk_scpi_set_rate prior to
rockchip_ddrclk_scpi_recalc_rate, to optimizing running time and reduce
SCPI APIs usage rate.

Change-Id: Iba31d33a5920816b1cc230f639ea3a9503d451c8
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2017-04-07 10:15:55 +08:00
Tang Yun ping
6168e92bdd soc: rockchip: scpi: add new function for rk3368
1. amend return frequency for scpi_ddr_set_clk_rate.
2. add scpi_ddr_dclk_mode function for rk3368.

Change-Id: I0f3c42d74e34ccb740f2a9e68ef12bba98b7aab7
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2017-04-07 10:12:04 +08:00
Finley Xiao
f6dd9a1be5 PM / devfreq: rk3399_dmc: rename of_get_opp_table
The function doesn't get something from dts, it is more appropriate to
rename of_get_opp_table to rk3399_dmcfreq_init_freq_table.

Change-Id: I8c4994d45ff4d0654d034483e091bbb225a1ea61
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-04-07 10:01:06 +08:00
Finley Xiao
f72908d772 PM / devfreq: event: add support for rk3368 dfi
This adds the necessary data for handling dfi on the rk3368.
Access the dfi via registers provided by GRF (general register
files) module.

Change-Id: I96c2b4dcd34d90731b749ebdbe6922f01559d8e6
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-04-07 10:00:30 +08:00
algea.cao
18e0cc7e33 drm/sysfs: add audioformat to sysfs
Change-Id: Iccce2de5dc90ceabd1db7127d8ae53ef849af4c8
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
2017-04-07 09:39:50 +08:00
Huang, Tao
85be89ea61 arm64: cpuinfo: add system serial support
Change-Id: I4542f07226e47e67be1f2792cffaa71fd6401442
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2017-04-06 18:49:43 +08:00
Finley Xiao
43509cca48 clk: rockchip: rk3368: add ddrc clock support
Add a ddrc clock into clk branches, so we can do ddr frequency
scaling on rk3368 platform in future.

Change-Id: Ie7fd2e8d8bdf8b9ff843ca13e848f772adaa109a
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-04-06 14:58:52 +08:00
Finley Xiao
968ccb6e83 clk: rockchip: support setting ddr clock via SCPI APIs
On rk3368, let a mcu scaling ddr clock via SCPI (System Control and
Power Interface) APIs.

Change-Id: I95342b876caad991e6d1319c5e4ec793365c7981
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-04-06 14:53:01 +08:00
Mark Yao
4019733062 drm/rockchip: vop: support CRTC_STEREO_DOUBLE mode
Change-Id: Ic9905248491a2d728da782d6cfa9679ca50dd6c4
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-04-06 14:48:37 +08:00
Mark Yao
26a079fe5c drm/rockchip: vop: use crtc_[h/v]display for vop
Change-Id: I1c1263accd419bb790ddb19da9323aaab8b9338e
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-04-06 14:48:30 +08:00
zzc
d7db16868d net: wireless: rockchip_wlan: add rtl8723cs support
update rtl8723cs wifi driver to version v5.2.1_21569.20170329_COEX20170214-1500

Change-Id: Iee0c342b4fb44a30be0004a2dcee40dea5e67269
Signed-off-by: zzc <zzc@rock-chips.com>
2017-04-06 12:01:56 +08:00
chenjh
57a85fb8ba arm64: rockchip_defconfig: enable CONFIG_FIQ_DEBUGGER_TRUST_ZONE
Change-Id: Id726ec446724de7176717d7ef37861dbea69be1c
Signed-off-by: chenjh <chenjh@rock-chips.com>
2017-04-06 10:42:37 +08:00
Huibin Hong
7f7614165d fiq_debugger: merge from linux 3.10
update some features:
1. rename sip smc function name;
2. add serial hw irq and phyical base address parse;
3. use FIQ_DEBUGGER_TRUST_ZONE for armv7 and armv8.

Change-Id: I920899f30cadf1ec8380a2e70f5d1e0e801ec5c2
Signed-off-by: chenjh <chenjh@rock-chips.com>
2017-04-06 10:40:58 +08:00
chenjh
b3cea1af8d firmware: rockchip: update sip interface
clean up code and add support for fiq debugger

Change-Id: I6dc0e4306a8554c49342207191005e55fb662b38
Signed-off-by: chenjh <chenjh@rock-chips.com>
2017-04-06 10:39:22 +08:00
Frank Wang
54aab96885 soc: rockchip: fixed compilation error
This adds fixed below errors when compiled rockchip_defconfig without
CONFIG_RK3368_SCPI_PROTOCOL select:

In file included from drivers/clk/rockchip/clk-ddr.c:23:0:
include/soc/rockchip/scpi.h:89:12: warning:
'scpi_sys_set_jtagmux_on_off' defined but not used [-Wunused-function]
error, forbidden warning: scpi.h:89
scripts/Makefile.build:258: recipe for target
'drivers/clk/rockchip/clk-ddr.o' failed
make[3]: *** [drivers/clk/rockchip/clk-ddr.o] Error 1

Change-Id: I5abc184554dcfc3697be82aede8dec27da2fcdd9
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2017-04-06 10:39:08 +08:00
chenjh
fdfa7d9d57 firmware: psci: remove fiq enable after cpu_suspend
Change-Id: I2fb6cd70ed462eb5abc36be790008daa134810d6
Signed-off-by: chenjh <chenjh@rock-chips.com>
2017-04-05 19:02:27 +08:00
Huibin Hong
2190d7a3f4 rk_fiq_debugger: map signal irq for fiq mode
Change-Id: I220067fa3b6efaf4a1e88208a596822fc7120376
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2017-04-05 19:02:26 +08:00
Huibin Hong
d9fec85144 fiq_debugger: add CONFIG_FIQ_DEBUGGER_EL3_TO_EL1 for arm v8
Change-Id: I6aecf2c7017c3e153d88fe33207f75510051d75c
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2017-04-05 19:02:25 +08:00
Huibin Hong
c04b4e2e77 irqchip/gicv2/3: add gic_retrigger
Change-Id: Ic87d4936317fb598c04e3ccc56a850c0c9e4e6ba
Signed-off-by: chenjh <chenjh@rock-chips.com>
2017-04-05 19:02:25 +08:00
chenzhen
cd4f987fd6 ARM64: dts: rk3328-evb: enable gpu device
And set its regulator.

Change-Id: I0703ee39059a5d63a5bc259cfc66ca6203819015
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-04-05 17:32:27 +08:00
chenzhen
bbe889871a arm64: rockchip_defconfig: enable MALI450
Change-Id: I8b6d073da859ac064b2c641539b49104393df2e9
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-04-05 17:15:11 +08:00
chenzhen
abd58d9ca3 arm64: rockchip_linux_defconfig: enable MALI450
Change-Id: I914e4c341f096107def5f76621f9b82ee1f94fe7
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-04-05 17:15:11 +08:00
chenzhen
1837bc7aa0 ARM64: dts: rk3328: add mali-450 GPU device
GPU and DDR share vdd_logic.
DDR DVFS is not ready yet, to ensure DDR could work stably,
vdd_logic(vdd_gpu) should be higher than 1.05V.
This would be optimized after DDR DVFS is ready.

Change-Id: I2749484c7f6f86dde850f0f85d606e1c1ab85c17
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-04-05 17:15:10 +08:00
chenzhen
bf96e75ed3 MALI: utgard: RK: reconstruct platform specific code for devfreq DVFS
Change-Id: I1ddf7be0868fb885784098c14feb16634d76dcd9
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-04-05 17:15:09 +08:00
chenzhen
522a988e99 MALI: utgard: upgrade DDK to r7p0-00rel0
Change-Id: Ia1dc7b104a7bbb743e46d25e2c434e92c5596353
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-04-05 17:16:29 +08:00
chenzhen
25b0332fe6 MALI: utgard: upgrade DDK to r6p1-01rel0
Change-Id: I88e8aba740ec223c1107def64eb004390b7fd940
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-04-05 17:16:10 +08:00
chenzhen
fe2c9f20c2 MALI: utgard: RK: remove core_scaling in "platform specific code"
DDK integrate_guide says
"not to use core_scaling on r5p0-01rel0 and later."

Change-Id: Ibb3eddac75548bb9f6763dc4dc9bad540746191f
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-04-05 17:15:52 +08:00
chenzhen
c0778d1eb7 MALI: utgard: RK: use late_initcall_sync instead of module_init
Some dependences of mali device driver should be initialized first.

Change-Id: I76f1d8b029345801bf0a68266889ec1c5a28b524
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-04-05 17:14:55 +08:00
chenzhen
3c56220563 MALI: utgard: RK: fix compile errors under arm64
Change-Id: I88df540e9822f148703aa07f74fbea59fbbf3350
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-04-05 17:14:44 +08:00
Jianqun Xu
c3b4c5336b arm: dts: rockchip: rk3288-android delete rk timer
Change-Id: Icf045a05ea07c735200d1a54aa7b2576ada82609
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-04-05 16:55:03 +08:00
William Wu
b48faff0d2 arm64: rockchip_linux_defconfig: enable CONFIG_USB_UAS
Some rockchip platforms (e.g. rk3399, rk3328) xHCI controller
support stream for UASP (USB Attached SCSI PROTOCOL), use of
UAS generally provides faster transfers compared to the older
USB Mass Storage Bulk-Only Transport (BOT) drivers.

Change-Id: I67ce5cdb821413d3c4d018be31c892d20d831470
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-04-05 16:34:38 +08:00
William Wu
19352d08d9 arm64: rockchip_defconfig: enable CONFIG_USB_UAS
Some rockchip platforms (e.g. rk3399, rk3328) xHCI controller
support stream for UASP (USB Attached SCSI PROTOCOL), use of
UAS generally provides faster transfers compared to the older
USB Mass Storage Bulk-Only Transport (BOT) drivers.

Change-Id: I69e10d3f55c03c411cd9efcef9a7fd9f8ccb9a53
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-04-05 16:33:54 +08:00
Jianqun Xu
57faa510c2 arm: dts: rockchip: rk3288 use android dtsi
Change-Id: I7ec75cca855d6c4a697584cec33cb0ac45f00364
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-04-05 16:08:56 +08:00
Frank Wang
51abcbf5c1 soc: rockchip: amend rk3368-mbox related *.h to soc/rockchip
This adds move rk3368-mbox related *.h files from linux/rockchip
to soc/rockchip.

Change-Id: I2d57b6baa64d531e89766a5384d8c217cf347ebf
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2017-04-05 15:10:42 +08:00
Yakir Yang
172e5e89c3 CHROMIUM: drm: bridge/dw_hdmi: assign CD field to zero
When the color depth is 24 bits per pixel video, the CD
field in General Control Packet should be "Color Depth
not indicated", then the colordepth in register vp_pr_cd
& csc_scale should assign to zero.

Signed-off-by: Yakir Yang <ykk@rock-chips.com>

BUG=chrome-os-partner:38212
TEST=speedy board, Test with Agilent Technologies U4002A
     HDMI Protocal Analyzer

Change-Id: Ifd5767d339fdbff11e234ec0891c8f3df1dd66a5
Reviewed-on: https://chromium-review.googlesource.com/261850
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Yakir Yang <ykk@rock-chips.com>
Commit-Queue: Yakir Yang <ykk@rock-chips.com>
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2017-04-05 15:06:12 +08:00
Hao Xiaowei
df2235a1b1 arm64: dts: rockchip: Modify rockchip_suspend config for rk3399-mid
Change-Id: I0db8c1ab12cc1e76e0e5730b65dffb4f203e5c37
Signed-off-by: Hao Xiaowei <hxw@rock-chips.com>
2017-04-05 14:07:45 +08:00
Zhangbin Tong
a735c0386b arm: dts: rockchip: add mpu6050 to rk3288-evb-act8846
The evaluation board using the mpu6050 as the sensor, which
combine a 3-axis gyroscope and a 3-axis accelerometer

Change-Id: Ia41d2c038e38de3cb6d24d81d4b018670935d39a
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2017-04-05 10:53:41 +08:00
Xu Jianqun
fc5c742fb2 arm: configs: rockchip_defconfig select CONFIG_RTC_DRV_HYM8563
Change-Id: I0510946469bd10a7ec2f3439505e7b3b7851f4b7
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
2017-04-01 18:47:29 +08:00
Randy Li
600e11061e ARM: dts: rockchip: enable 1000Mbps of rk3288
Because of the bad quality of EVB board, its phy will
fail at the GMAC mode. While I have verified the ASUS
tinker, it doesn't have such problem.

Change-Id: I3306b918363dff513e279762482f1ce1eaa30df8
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2017-04-01 18:42:50 +08:00
Jianqun Xu
7f0e5b3d27 arm: dts: rk3288-android: add psci v1.0 support
Add psci v1.0 support to rk3288, support it to call into
secure world through psci APIs.

Change-Id: I1dc98fbdcc544a2bf0ec09544e946756757d2d80
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-04-01 18:27:19 +08:00
Mark Yao
b52e568407 drm/rockchip: fix some loader logo bugs
fix some bugs:
  1, If all connector failed to display, loader logo can't free.
  2, if first route failed to display, loder logo free unexpect,
     cause iommu crash.

Change-Id: I838c9fd6768a5ac48d8ce4175038b4620a95cd42
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-04-01 18:26:31 +08:00
Mark Yao
285e2a5602 drm/rockchip: dw-mipi: add power protect for loader logo
Change-Id: I3bdd70d357324c8f526122dcab1bc44fe0ae0ff2
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-04-01 18:25:28 +08:00
Mark Yao
b238376cc9 drm/rockchip: don't restore to fbdev when display kernel logo
Change-Id: Ie0f53364c51924feb589fa2e8550ef5b423bb4cd
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-04-01 18:25:06 +08:00