Commit Graph

609808 Commits

Author SHA1 Message Date
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
Liang Chen
ee423348ff arm: dts: adjust opp-table by different bin for rk3288 SoCs
Change-Id: I3e84e8c33237bde39cb5db34f68cea7255c41eae
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-06-08 09:52:33 +08:00
Sugar Zhang
c6273e1069 mmc: dw_mmc: initialize zero for dma_slave_config
This fixes uninitialized variable introduced by commit ddd2e87ad4
("dmaengine: pl330: add support for interlace size config")

Change-Id: Ib1bbec21053fbcccf85a339d8ed7eec0bbe77727
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-06-07 19:42:38 +08:00
Algea Cao
c249223475 drm/bridge: synopsys: dw-hdmi: Select formula1 for csc decimation
Formula3 and Formula2 for csc decimation will cause hdmi yuv422
display err.

Formula3:
The pixel color of left 0-14 columns and right 0-12 columns is
err.

Formula2:
The pixel color of left 0-2 columns is err.

Change-Id: I94fdd5fd962a24fde02dde1fe3ac10437ad117ad
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-06-07 16:18:39 +08:00
Shunqing Chen
72159f9038 power: charger: add dc detect support for sy6982c
Change-Id: I4050eb8b8760a12a2a2df6ce3c38dc801e822b9f
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-06-07 09:32:42 +08:00
Meng Dongyang
f6fac8b68a phy: rockchip: rockchip-inno-usb2: flush otg work when exit
The controller will be reinit when suspend and resume in device
mode if not connect to PC. And the U2PHY must be keep in power
on state during the init process. But The 'otg_sm_work' may be
schedule immediately and power off the U2PHY if system suspend
and resume between the delay time of schedule 'otg_sm_work', so
it will result in the error when init controller as below:

dwc2_core_reset() HANG! Soft Reset GRSTCTL=80000001

So flush the otg work in exit function to finish power control
of U2PHY.

Change-Id: I79c4b6a877196abd2f2201b2f984c9ea22e48fec
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
2018-06-07 09:22:50 +08:00
chenjh
6c93daca40 power: rk816-battery: otg switch to dc charger power when init
Without this, otg supply is always provided by PMIC and PMIC
can not enter charge mode, because charge or otg supply output
is exclusive, only one choice at one time.

Change-Id: I4c00392d93abdf55b2b663e8a6a8822249c64d74
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-06-06 15:00:42 +08:00
Joseph Chen
72d2f69981 power: rk816-battery: use otg_pmic5v to record otg power supply state
without this patch, we use otg_in to stands for otg attach and power
supply state(from dc or pmic), there is something wrong with code logic,
let's make it clear.

Change-Id: I080e6b137811b2335e0985e786ddfc4eed52e8d6
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-06-06 15:00:42 +08:00
Joseph Chen
93c6099369 power: rk816-battery: fix CDP charger recoginze as DCP charger
CDP charger should be treat as SDP charger, but charge current 1.5A(not 450mA).

Change-Id: I9892e8ce7cb26a1990b344a9ea83ce55a9a1b81a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-06-06 15:00:42 +08:00
Joseph Chen
6f4998696e power: rk818-battery: fix CDP charger recoginze as DCP charger
CDP charger should be treat as SDP charger, but charge current 1.5A(not 450mA).

Change-Id: I3091ba599ffbb417ea89169d9ab59853f8280f53
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-06-06 15:00:42 +08:00
Joseph Chen
efe2ccf9f4 power: rk818-charger: otg switch to dc charger power when init
Without this, otg supply is always provided by PMIC and PMIC
can not enter charge mode, because charge or otg supply output
is exclusive, only one choice at one time.

Change-Id: I445c1ec6aac9520593bfb53aa7681352417f0543
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-06-06 15:00:42 +08:00
Joseph Chen
62a9f46448 power: rk818-charger: use otg_pmic5v to record otg power supply state
without this patch, we use otg_in to stands for otg attach and power
supply state(from dc or pmic), there is something wrong with code logic,
let's make it clear.

Change-Id: I1cdcd3be521039b75badc3b805e70f202ebcac77
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-06-06 15:00:42 +08:00
Zorro Liu
be49c6964e drivers: input: sensor: update for akmxxxx compass chips
Change-Id: Iba164016e01c7741d5cf99f207829e6654ab43ff
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-06-06 14:31:23 +08:00
Liang Chen
d362c39d5d arm64: dts: rockchip: adjust opp-table by leakage for rk3328 SoCs
Change-Id: Ic827fe9f868a71e6f7a69f91df43d5f7a23bc5d3
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-06-06 10:54:26 +08:00
zain wang
b72c852580 mfd: fusb302: fix dp can't be recognized through typec.
Add notify state to the struct vdm_state, otherwise, we
couldn't notify DP because vdm_state_ready would be ignored
by IS_VDM_ACTIVE.

Change-Id: Ib03dae2ebdfbfba0061af0e9ae2928c0c9123192
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Signed-off-by: zain wang <wzz@rock-chips.com>
2018-06-06 09:39:23 +08:00
Tao Huang
f9c6555008 ARM: dts: rockchip: add rk3308-evb-dmic-i2s-v10-aarch32
Add RK3308 EVB demo dts for ARM.

Change-Id: I6ffcf84289fc15a6479335e21c0d598e0520d4b1
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-06-06 09:34:31 +08:00
Xing Zheng
57c9f73233 arm64: dts: rockchip: remove useless 'rockchip,adc-grps' for RK3308 EVB
Change-Id: I69eb2ac35feb9b0fb0957f94b6f68761e9481378
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-06-05 15:08:12 +08:00
Xing Zheng
b0884beee4 ASoC: rk3308_codec: update properties
Remove 'rockchip,adc-grps' and add 'rockchip,enable-all-adcs'

Change-Id: Ic838df1b26fa4d5837368025b5c335b8cad5226c
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-06-05 15:08:12 +08:00
Xing Zheng
12324e6c5c ASoC: rk3308_codec: configure ADC/DAC flexibility on hw_params
We need to know how many channels that are needed
to enable on hw_params for ADC groups, it's more
reasonable and more flexible.

By the way, clean up some coding styles.

Change-Id: Ia13b1667492dd60a63fc17130ff09b6b1b01b8df
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-06-05 15:08:12 +08:00