Commit Graph

609826 Commits

Author SHA1 Message Date
Finley Xiao
37ee7da560 arm64: dts: rockchip: rk3308: Add cpuinfo device node
Change-Id: If91b4a3945a368ad50914cb0fd0cfce41600d514
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-06-13 14:16:35 +08:00
Finley Xiao
9c203c967a arm64: dts: rockchip: rk3308: Add support to get cpu leakage
Change-Id: I55252c38a349b63bcc893dc913cb43c445bf8c94
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-06-13 14:16:35 +08:00
Finley Xiao
46e31d30f5 arm64: dts: rockchip: rk3308: Add otp device node
Change-Id: Ieceb70736c174410869180e6cf6307715619e8c9
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-06-13 14:16:35 +08:00
Finley Xiao
f5577b7361 nvmem: rockchip-otp: Add support for rk3308-otp
This adds the necessary data for handling efuse on the rk3308.

Change-Id: I0c986e632f8dcc27ac38a887df25241db4b9fa19
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-06-13 14:16:35 +08:00
Finley Xiao
00de83def8 soc: rockchip: cpuinfo: Add ROCKCHIP_OTP dependency
Change-Id: Ifa72e4e977ab66ed6a5e0acbabcfe6f1f8dca6d3
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-06-13 14:16:35 +08:00
Finley Xiao
0c68c12026 nvmem: rockchip-otp: Reset opt phy before access otp
It would be more stable to reset phy before use user interface to
access otp.

Change-Id: Icd5660db15f6da7bad0ef8d01970f88aeca369a2
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-06-13 14:16:35 +08:00
Finley Xiao
263dfde45f arm64: dts: rockchip: px30: Add resets property for otp
Change-Id: Iaba6d95674ae461e9ade4521e955869ff1dcc5c8
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-06-13 14:16:35 +08:00
Zhou weixin
c2c106fc84 arm64: dts: rockchip: add power control for gt1x on px30/rk3326 evb
Change-Id: I40bae62b0d11a7947d6da02aad9c44cf411bb28f
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-06-13 10:04:33 +08:00
Zhou weixin
420f585082 input: touchscreen: gt1x: fix i2c error when wakeup
Change-Id: I8575330a8f15573c6f11ddeaab1327382d302977
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-06-13 09:38:24 +08:00
Tao Huang
69830ffc12 ARM: configs: add rk3308_linux_aarch32[_debug]_defconfig
Add two defconfig for rk3308 on ARM.
One for release and one for debug.

Change-Id: I4492f7e28d7e85b1ee139b15371127c9f17053d3
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-06-13 09:01:54 +08:00
Meng Dongyang
c139ec131a UPSTREAM: usb: dwc3: gadget: cope with XferNotReady before usb_ep_queue()
If XferNotReady comes before usb_ep_queue() we will
set our PENDING request flag and wait for a
request. However, originally, we were assuming
usb_ep_queue() would always happen before our first
XferNotReady and that causes a corner case where we
could try to issue ENDTRANSFER command before
STARTTRANSFER.

Let's fix that by tracking endpoints which have been
started.

Change-Id: I8432a70fff0da1b4bc1ea7d86e13d491e89a05bb
Reported-by: Janusz Dziedzic <januszx.dziedzic@intel.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
(cherry picked from commit 6cb2e4e3de)
2018-06-12 15:49:56 +08:00
Meng Dongyang
4b36c00606 UPSTREAM: usb: dwc3: gadget: properly check ep cmd
The cmd argument we pass to
dwc3_send_gadget_ep_cmd() could contain extra
arguments embedded. When checking for StartTransfer
command, we need to make sure to match only lower 4
bits which contain the actual command and ignore the
rest.

Change-Id: I08056bf689f8a4ea1bcec242ffab296407d41bc8
Reported-by: Janusz Dziedzic <januszx.dziedzic@intel.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
(cherry picked from commit 5999914f22)
2018-06-12 15:49:56 +08:00
ayaka
9eca1c3e2d arm64: dts: rockchip: add support for rockpro64 board
PINE64 Rockpro 64 is a RK3399 development board, it
uses LPDDR4 memory.
http://wiki.pine64.org/index.php/ROCKPro64_Main_Page

CPU, GPU, memory, video codecs, audio codecs and HDMI
are verified and worked.

Change-Id: I6ac953eb6a8a217dc1049fe67752ed075c1a6485
Signed-off-by: ayaka <ayaka@soulik.info>
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2018-06-12 15:48:09 +08:00
Randy Li
57bfc68e70 ARM: dts: rockchip: add serial Flash controller to rk3036
Serial Flash controller is used to control the data
transfer between this SoC and a serial nor or nand
flash device.

Change-Id: Ibe7c8c4a11410287c34c1a7dc5b232b330ee6751
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2018-06-12 15:47:20 +08:00
Dingqiang Lin
b526c9acf3 Documentation: bindings: adjust rockchip nandc compatible naming
Change-Id: I675492b321f6c4a658f0bf40c39bc32d231a5698
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>
2018-06-12 15:46:49 +08:00
Dingqiang Lin
01faef723d drivers: rkflash: fix rkflash ftl error
1.Modify the incompatibility of FTL in kernel 4.4;
2.Add arm v7 sftl lib and arm v8 sftl lib
3.Unified naming format and variable with code in u-boot

Change-Id: I43ec418bb278fc3590fcb73d50ae6f6c9281ecfa
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>
2018-06-12 15:46:32 +08:00
Liang Chen
47e4722af1 arm: dts: adjust opp-table by leakage for rk322x SoCs
Change-Id: Id24f82d037866502596a74f16ee5e414bc64256a
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-06-12 15:27:02 +08:00
Sugar Zhang
e959f14c5c arm64: dts: rockchip: rk3308-evb-dmic-i2s-v11: enable 6mic + 2loopback
Change-Id: I8e07e546d1a47e7f5f66519662fe90737dda5232
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-06-12 08:42:54 +08:00
Sugar Zhang
e66b0967dc arm64: dts: rockchip: rk3308-evb-dmic-pdm-*.dts: fix playback channel mapping
Change-Id: I28f073d9bfe92cf00b9883f7c02381ef97cd653b
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-06-12 08:42:54 +08:00
Sugar Zhang
1bd65de695 ASoC: rockchip: multi_dais: fixup channel min/max
This patch limit the channel min/max according channel mapping.

Change-Id: Ia66c276e41d1c6b6f8c78c1c8db3c9087b8c9ca8
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-06-12 08:42:54 +08:00
Sugar Zhang
eac82456bb ASoC: rockchip: multi_dais_pcm: drop dma chan if channel map is zero
Change-Id: I00606c0b5f57f6e3d10ab9c41fd51ce8f10e8b35
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-06-12 08:42:54 +08:00
Meng Dongyang
576b831ae1 usb: gadget: uac: correct f_audio_source.c to remove warning
If the CONFIG_USB_CONFIGFS is not define, the 'audio_source_bind_config'
may be unused. Corrcet warning of no previous prototype for
'audio_source_bind_config' by adding judgment of CONFIG_USB_CONFIGFS
macro definition.

Change-Id: I174ae996c1d53e78b76f72cf463bc1efb189675b
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
2018-06-11 18:18:33 +08:00
Meng Dongyang
cfb692c0ad usb: gadget: uac: stop sending audio when disconnect
The sending process may still work if disconnect from
PC, for the sending function is called in the complete
call back function. So set alt to 0 when disconnect or
reset, and stop follow-up sending in complete function
if alt is 0.

Change-Id: I073f122fe2ce2faf8cf6fb036fb983f9f3325f34
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
2018-06-11 18:18:27 +08:00
Meng Dongyang
d04e0d982b usb: gadget: uac: support 2 channel of audio source
This patch add support of 2 channel of uac, set min
channel number and max channel number to 2.

Change-Id: Ia3b45d3329ba6819339079b31ff42398464942b5
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
2018-06-11 18:18:19 +08:00
Meng Dongyang
a13b6c3967 usb: gadget: uac: add sample rate to attribute of uevent
Add sample rate to attribute of uevent when receive the command
of set interface.

Change-Id: I9cea17ebe57441209a99dec0b1dc279e274accc3
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
2018-06-11 18:18:11 +08:00
Meng Dongyang
ec644b51d9 usb: gadget: uac: fix error of uac unit and add control unit
Accordding to the "Universal Serial Bus Device Class Definition
for Audio Devices", there are some error in the f_audio_source
driver. The audio source can't be recognize by the Windows PC
if control unit is not support. In order to support Windows PC,
this patch fix error in f_audio_source driver and add support of
control unit.

Change-Id: Ie508141f032adecfbe2e951ad36d9b8c271b28ba
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
2018-06-11 18:18:00 +08:00
Meng Dongyang
199b577d8d usb: gadget: uac: add support of different sample rate
The sample rate is force to 44100 in current code. This
code add numbers of sample rate up to 15 and support
set or get by PC.

Change-Id: I543d84f3081f82a4c96071c2b2442d37a9a835fb
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
2018-06-11 18:18:00 +08:00
Meng Dongyang
fd61a2db4c usb: gadget: uac: add uevent of setting interface
Add uevent of setting interface to notify the application.
In some cases that the application want to get the change event
and state of alt immediately when to select the next operation,
but current code doesn't have the interface for it. So this patch
sent a uevent when setting interface and report the state of alt
throw attribute of uevent.

Change-Id: I47084f99bc046dede86d6b5777677f3799056c03
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
2018-06-11 18:18:00 +08:00
Randy Li
daf1165257 MALI: rockchip: remove the out of time midgard
The midgard for linux is used for mali r9 library, which is not
used and update anymore.

Change-Id: I446c9b223b5235b40eb28cd8001d318578b16ba2
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2018-06-11 17:13:19 +08:00
jesse.huang
77f4e1dd32 arm64: dts: rk3328-box-liantong: modify dmc all system status freq to 786M
Change-Id: I6aeb15f2678913cb0249b7739faf3d0b08bc1eab
Signed-off-by: jesse.huang <jesse.huang@rock-chips.com>
2018-06-11 16:38:43 +08:00
Hu Kejun
ed98f0b4e5 media: rk-isp10: support RGB24(xRGB8888) format of SP Path
Change-Id: I44dbe1f385a16c461368afe8af93bf7c6136302e
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-06-11 16:07:11 +08:00
Sugar Zhang
27205a6f66 ASoC: rockchip: vad: chmod 0644 for voice_inactive_frames
This patch add write permission for user.

Change-Id: I4dad9394aaea485693732196c7e52702c61fbe8b
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-06-11 15:56:56 +08:00
Sugar Zhang
f54e077659 ASoC: rockchip: pcm: fix wrong voice_inactive_frames when playback
Change-Id: I07a70aa95fa075819d5dd96570c0b3c52f44593e
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-06-11 15:56:56 +08:00
Binyuan Lan
6a9bb29aa0 arm64: dts: rockchip: add rk3326 ai-va v11 evaluation board
Change-Id: I65312d5ee47980f27de78538c6ee5cdf61f5d66f
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2018-06-11 11:10:11 +08:00
Binyuan Lan
ae6416c0e5 ASoC: rockchip: rk817-codec: change channels_max to 8
Change-Id: If6b91244e0c7d028ba3f2af5c2f76382913d9ffa
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2018-06-11 11:07:40 +08:00
Shunqian Zheng
93b94b9579 arm: dts: rockchip: add saradc keys for px3se evb
The px3se evb board has a adc keyboard including Vol+, Vol-,
ESC, Home, Menu, Reserve.

Change-Id: Id3794d7a845f7c5364900865440a731d162a9ad0
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2018-06-11 10:24:45 +08:00
shengfei Xu
cc20bc020b power: rk817_charger: fix NULL pointer dereference in rk817_charger_evt_worker
Power supply is not registered, however calling power_supply_changed()
directly from rk817_charger_evt_worker(). This may cause kernel panic
with the following log:
[    0.951781] Unable to handle kernel NULL pointer dereference at virtual address 0000040c
[    0.952499] pgd = ffffff80092c5000
[    0.952813] [0000040c] *pgd=000000007fffe003, *pud=000000007fffe003, *pmd=0000000000000000
[    0.953582] Internal error: Oops: 96000005 [#1] SMP
[    0.954020] Modules linked in:
[    0.954322] CPU: 0 PID: 34 Comm: kworker/0:1 Not tainted 4.4.132 #36
[    0.954881] Hardware name: Rockchip rk3326 evb linux board (DT)
[    0.955427] Workqueue: events rk817_charger_evt_worker
[    0.955899] task: ffffffc00029b600 task.stack: ffffffc07d124000
[    0.956433] PC is at do_raw_spin_lock+0x20/0x164
[    0.956856] LR is at _raw_spin_lock_irqsave+0x28/0x38

Change-Id: I49454ded72f6679a10df499511a4c7a40324dc85
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2018-06-11 09:20:07 +08:00
Tao Huang
aa6998b51a ARM: hw_breakpoint: Workaround for Cortex-A12/A17
It seems Cortex-A12/A17 do not report report watchpoint hit address
that matches the watchpoint set as ARM64. Add this workaround for
pass Android 8+ CTS bionic ptrace watchpoint_imprecise.

Change-Id: I22f08a081d1436931cbed4e8b340237799299737
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-06-08 19:24:04 +08:00
Tao Huang
c01766299f ASoC: rockchip: i2s_tdm: add writeq for ARM
Change-Id: Ieaa6dbeeac69f65e88dc3af4217d1e7e49b585b9
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-06-08 18:29:27 +08:00
Sugar Zhang
9d7f95ceee arm64: dts: rockchip: rk3308-evb-*.dts: update for vad
Change-Id: I31f38d170324397f818fc7b7ec3946e88d80d7bf
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-06-08 14:38:07 +08:00
Sugar Zhang
76d3a9a031 ASoC: rockchip: pcm: add vad preprocess
Change-Id: I6b5e2f36e30c033e68019bde8c94a3c2c569a60d
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-06-08 14:38:07 +08:00
Sugar Zhang
4365303d2d ASoC: rockchip: vad: optimize vad process
* support vad preprocess
* support buffer-time config
* support channel map
* support data convert

Change-Id: I0728838b3bb2c8a0537560483cab1fb3dd8a4d9c
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-06-08 14:38:07 +08:00
Sugar Zhang
e36f5051fa ASoC: rockchip: add support for vad preprocess
Change-Id: I46d1ac01cb21d7a1f5406859d22864568f3756de
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-06-08 14:38:07 +08:00
Xing Zheng
d1b463ef19 ASoC: rk3308_codec: using default gains on startup
We don't need to set gains when enable/disable ADC
and DAC, keep gains at last time.

And add hpout fade-in when enable DAC, and clean up
a bit of coding style for gains.

Change-Id: I2d8cdc1b0d87b55714177a1208a8f7a4e655a732
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-06-08 14:10:56 +08:00
Ziyuan Xu
427ff35065 arm64: configs: rk3308_linux_defconfig: enable initrd support
Change-Id: I81d91a25af09a222f013e28fe643482857d6a9d3
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2018-06-08 14:09:29 +08:00
Caesar Wang
72cfae1e1f arm64: dts: rockchip: enable ddrfreq for rk3326 linux evb board
As the other boards had support the dmc function, maybe the owner
was missing this dts configure.

In order to be better the power consumption and performance, this patch
enables the dmc and dfi to support the ddrfreq,

Change-Id: I2623943085d098a65ba6e0ad7102f671f0cedd3e
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2018-06-08 14:08:48 +08:00
Caesar Wang
a11e5c2d32 arm64: dts: rockchip: Set pmic-reset-func to 1 for rk3326 linux
As the config reset registers only for rk817 and rk809.

Change-Id: Id8e8ae3b816c783df92510083c36156595d230ae
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2018-06-08 14:08:48 +08:00
Caesar Wang
147393b185 arm64: rk3326_linux_defconfig: add the missing RK8xx configigure
This patch enables the gpio and powerkey configure for Rockchip
RK8xx PMIC.

Change-Id: Iab4f9303922387ae6e412f06aa098cdf53331e87
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2018-06-08 14:08:48 +08:00
Caesar Wang
36e91fd98f arm64: rockchip_linux_defconfig: add the missing RK8xx configigure
This patch enables the gpio and powerkey configure for Rockchip RK8xx
PMIC.

Change-Id: I09b5469f0263e00e9c467afea0f3a639c4eef105
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2018-06-08 14:08:48 +08:00
Liang Chen
1de78e5b09 arm: dts: disable avs as default for rk3288 SoCs
Change-Id: Ie12023ed22722d1424f60be20928f376957c37e1
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-06-08 09:52:33 +08:00