Commit Graph

648865 Commits

Author SHA1 Message Date
Jianxin Pan
b3aaaa3bee schedtune: fix crash when there is cpu boot fail in hmp [1/1]
PD#SWPL-7656

Problem:
crash when there is cpu boot fail in hmp

Solution:
fix crash when there is cpu boot fail in hmp

Verify:
W400

Change-Id: I0153975593adb0bfcbc3c3bd6543f0fb2e6bf2e0
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2019-08-29 12:03:59 +09:00
Long Yu
346f5df449 emmc: Clear the value of txdelay in legacy mode on the resume process [1/1]
PD#SWPL-7181

Problem:
switch to high-speed from hs200 failed for resume process.

Solution:
set tx_delay as 0 for legacy mode.
clear cfg_cmd_setup

Verify:
verify by TL1

Change-Id: I5dbb1bbc391da864464bf137837a2b0f54ccda42
Signed-off-by: Long Yu <long.yu@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2019-08-29 12:03:43 +09:00
Zhuo Wang
2db0bde60a ethernet: set tx_amp according chips [1/1]
PD#SWPL-7765

Problem:
g12b revb efuse not correct

Solution:
set tx_amp with chipid to work around

Verify:
verify on g12b skt board

Change-Id: Id1babce231d866293e4de52685834834a4b65227
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
2019-08-29 11:47:14 +09:00
Luan Yuan
ad667b4897 dts: add ppmgr for g12b [1/1]
PD#SWPL-6901

Problem:
lack of ppmgr in g12b

Solution:
add ppmgr

Verify:
verify by g12b

Change-Id: Id6d9894d2430cf286e42c90dc340dc10fd0f37c5
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2019-08-29 11:47:05 +09:00
Yan Wang
58470930d1 idle: sm1: enable sm1 idle function [1/1]
PD#SWPL-6255

Problem:
sm1 need enable idle for power.

Solution:
enable sm1 idle function.

Verify:
ac200

Change-Id: Ib106ac552660471f0275dc22374405939d521a62
Signed-off-by: Yan Wang <yan.wang@amlogic.com>
2019-08-29 11:46:50 +09:00
Yingyuan Zhu
53c2a579ba watchdog: fix watchdog get lefttime error [1/1]
PD#SWPL-6937

Problem:
1.get lefttime error by 'cat sys/class/watchdog/watchdog0/timeleft' cmd.
2.if DTS is configured to feed watchdog by Android, the system will
restart automatically after wake up.

Solution:
1.modify the code to get time.
2.when the system wakes up, first judge whether the watchdog runs,
and then decide whether to start the watchdog.

Verify:
test pass on u200

Change-Id: If64888ffdd5651e8cfcace5ea0d0da31641bb397
Signed-off-by: Yingyuan Zhu <yingyuan.zhu@amlogic.com>
2019-08-29 11:46:20 +09:00
Yi Zhou
d90e543336 hdr_prime: add interface of HDR Prime SL driver [1/1]
PD#SWPL-5475

Problem:
need to add interface of HDR Prime SL driver

Solution:
add interface of HDR Prime SL driver

Verify:
U212

Change-Id: If0e62b74ccbaa4ede490e7a9896d9f5915480d6f
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2019-08-29 11:45:55 +09:00
MingLiang Dong
481817edd3 amvecm: match uboot sdr2hdr function [1/1]
PD#OTT-2524

Problem:
enable sdr2hdr function, uboot logo have color change

Solution:
match uboot sdr2hdr function

Verify:
verify on G12A

Change-Id: I160cd6141d09a385d299ca96a89eb1ebf09c86e8
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2019-08-29 11:45:46 +09:00
Zongdong Jiao
ce9173967f hdmitx: move work_internal_intr to delayed_work [1/1]
PD#SWPL-6894

Problem:
Queue work 'work_internal_intr' cause the hdcp22 flicker

Solution:
Move work_internal_intr to delayed_work

Verify:
G12/U212

Change-Id: Ib05c82bb66c9ad7396790d5eb237ff486c56c980
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2019-08-29 11:44:06 +09:00
Jiamin Ma
3066e64136 earlycon: support aml-uart as the name for earlycon [1/1]
PD#SWPL-6969

Problem:
For some historical reason, aml-uart is configured as the earlycon
name in uboot, which is not recognized by 4.9 kernel

Solution:
support aml-uart as the name for earlycon

Verify:
Ampere

Change-Id: I01427f2d512c0bf1972dd545dc71570919c5bc07
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2019-08-29 11:43:58 +09:00
Brian Zhu
906af4a2c4 vpp: don't overwrite on_pending state when enable vd layer [1/1]
PD#OTT-3244

Problem:
When vd layer state is on_pending, calling enable videolayer
function will overwrite the state. Then it will not enable video
layer really.

Solution:
Add the judgement to check if the state is on_pending.

Verify:
verified on W400

Change-Id: I0513a6610fdb108bec05858c7f6c7976be5e7edb
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2019-08-29 11:43:51 +09:00
Luan Yuan
ddb371d7e1 amvecm: add cm 12bit config for g12a/g12b/sm1
Change-Id: I82a2c54a5b7d7dc8fe0b2e7cc6c1a0af926c8ca3
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2019-08-29 11:43:42 +09:00
Bencheng Jing
a502990109 amvecm: fix CM/sat/bricon adjust not available [1/2]
PD#SWPL-6892

Problem:
fix CM/sat/bricon adjust not available

Solution:
fix CM/sat/bricon adjust not available

Verify:
U212

Change-Id: Ia6a1aebda35550801d4c7e16807714b8349431a4
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2019-08-29 11:43:35 +09:00
MingLiang Dong
d50bda4a1f amvecm: ioctrl get hist ave error [1/1]
PD#TV-1950

Problem:
VPP_IN_H_V_SIZE register is removed on TL1

Solution:
use preblend size to config hist stts size

Verify:
verify on TL1

Change-Id: I0afc9fd45f69318b2ebd42424aee20e60400d809
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2019-08-29 11:43:27 +09:00
Bencheng Jing
7697f9bfe9 amvecm: fix sm1 green screen when play videos [1/1]
PD#SWPL-7302

Problem:
sm1 green screen when play videos

Solution:
add chip support

Verify:
s905D3

Change-Id: I50c0a9f889d72b65157a973bfe1df8dce10db64a
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2019-08-29 11:43:18 +09:00
Bencheng Jing
0e3966d202 amvecm: add sharpness0 cvbs table in driver [1/2]
PD#OTT-2339

Problem:
Testing CVBS Video Index Part FAIL

Solution:
add sharpness0 cvbs table in driver

Verify:
U212

Change-Id: I91047de0e852c77e70ad95aad3e6830fde7097f4
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2019-08-29 11:43:09 +09:00
Chris KIM
b8f8affb91 ODROID-N2: defconfig: Sync odroidn2_defconfig
Change-Id: Ia26fcf329346ac6b9b829f0f84a0063baf9f6f6d
Signed-off-by: Chris KIM <codewalker@hardkernel.com>
s922_9.0.0_20190820
2019-08-19 09:47:49 +09:00
Chris Kim
33bf94f2b8 Merge "ODROID-N2: usb/gadget: validate null pointer of usb device" into odroidn2-4.9.y-android 2019-08-12 11:40:37 +09:00
Chris Kim
d53db331e7 Merge "ODROID-N2: usb/gadget: add 'compat_ioctl(...)' for 32bit Android" into odroidn2-4.9.y-android 2019-08-12 11:40:25 +09:00
Dongjin Kim
ed27397ede ODROID-N2: usb/gadget: validate null pointer of usb device
Change-Id: I83c1d224d443ca0c97ea02db189d2f8d0e7733e9
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
2019-08-08 19:03:46 +09:00
Dongjin Kim
bf21138fc2 ODROID-N2: usb/gadget: add 'compat_ioctl(...)' for 32bit Android
Change-Id: I0ff9c0c97feb7388db8bb8ec4fb283fceb088ee7
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
2019-08-08 19:00:57 +09:00
Chris KIM
de65935ca6 ODROID-N2: defconfig: Remove RTL8192 drivers
Change-Id: Ie14286a04ecf9cd280ddec61afba39c32b821f70
Signed-off-by: Chris KIM <codewalker@hardkernel.com>
s922_9.0.0_20190812
2019-08-07 16:36:54 +09:00
Luke Go
1407f7fe35 ODROID-N2: mem: Enable devmem.
Change-Id: I8440910e964df6571a25acb11a9b1de62d54a280
s922_9.0.0_20190719
2019-07-10 11:54:44 +09:00
Kevin Kim
42f258358a ODROID-N2: Merge amlogic BSP 2019.0415 (fix build err)
Change-Id: I1987cce33154a36658b066f44ce1463d267d0043
2019-07-03 13:53:32 +09:00
Zhe Wang
44d03cb80f audio: TM2 bringup: enable ADC for linein [1/1]
PD#SWPL-7027

Problem:
audio path AVin is on audio

Solution:
enable ADC for linein

Verify:
Verify on AB311

Change-Id: Iea1d694e0b605d62596635d85416d33f56dbbcb2
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
	arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
	arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
	arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
	sound/soc/codecs/amlogic/ad82584f.c
2019-07-03 13:53:32 +09:00
Zhe Wang
5cb5cb7873 audio: TM2: bringup AMP ti5805 on ab301 [1/1]
PD#SWPL-7074

Problem:
speaker doesn't work

Solution:
bringup AMP ti5805 on ab301

Verify:
Verified on T962x3_ab301

Change-Id: Icb27691b4fd5a1e54070c4a6d3d3c68cdf3a60b7
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>

Conflicts:
	arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
2019-07-03 13:53:32 +09:00
Zhe Wang
30a5909fa7 audio: TM2 audio basic function bringup [1/1]
PD#SWPL-6721

Problem:
TM2 bringup

Solution:
audio basic function bringup

Verify:
Verified on T962e2_ab311

Change-Id: Ic48ded3964ea87e40c4d683d71a50bbdc1975f91
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>

Conflicts:
	arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
2019-07-03 13:53:32 +09:00
Zhe Wang
bf6c152e02 audio: support 16ch i2s playback for SM1 [1/1]
PD#SWPL-5430

Problem:
new function lane 6 and lane 8

Solution:
support max 16 channel playback

Verify:
sm1_ac200, verify pass

Change-Id: I3af42a0b68bca8804afa042ad4a506a379b9bf86
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>

Conflicts:
	sound/soc/amlogic/auge/tdm.c
2019-07-03 13:53:32 +09:00
Xing Wang
3b88fb7750 audio: auge: support earc rx for sm1 [1/2]
PD#SWPL-5389

Problem:
earc rx dmac reset and clk issue

Solution:
fix earc rx dmac and clk

Verify:
ac200

Change-Id: Ie8e5582f1ee358a8cf694965c9963ae1eeb6685a
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2019-07-03 13:53:32 +09:00
Xing Wang
5f2d2f624f audio: auge: add sound card for sm1 [2/2]
PD#SWPL-6151

Problem:
sound card for sm1

Solution:
add sound card for sm1

Verify:
ac200

Change-Id: I4f65472af7a8399fb6fe003db608158e11bed566
Signed-off-by: Xing Wang <xing.wang@amlogic.com>

Conflicts:
	sound/soc/amlogic/auge/ddr_mngr.c
	sound/soc/amlogic/auge/ddr_mngr.h
	sound/soc/amlogic/auge/spdif.c
	sound/soc/amlogic/auge/tdm.c
2019-07-03 13:53:32 +09:00
yujie.wu
28979f105f audio: Merge code from RSR project [1/2]
PD#SWPL-5495

Problem:
  There is some improvement code on RSR
  project, we need to merge them back to
  trunk.

Solution:
  Merge the code from rsr branch

Verify:
  A113

Change-Id: I0ba11c8ff412db659ff2f10bfc00d63c49f84bb5
Signed-off-by: yujie.wu <yujie.wu@amlogic.com>

Conflicts:
	sound/soc/amlogic/auge/tdm.c
2019-07-03 13:53:32 +09:00
Xing Wang
2615bd4e2e dts: tl1: enable resample for tl1 [1/2]
PD#SWPL-3365

Problem:
not resample for audio in, so output in wrong sample rate

Solution:
1. enable resample in dts
2. fix to check whether resample is needed

Verify:
x301

Change-Id: I99238cc21a00ab53df6a1f8ab1703bc9ab48cbaa
Signed-off-by: Xing Wang <xing.wang@amlogic.com>

Conflicts:
	sound/soc/amlogic/auge/ddr_mngr.c
	sound/soc/amlogic/auge/resample.c
	sound/soc/amlogic/auge/spdif.c
2019-07-03 13:53:32 +09:00
Xing Wang
c6017751c3 audio: auge: fix sharebuffer channel map [1/1]
PD#SWPL-2645

Problem:
play ddp source, then play pcm source, no sound

Solution:
1. fix same source control and channel map issue
2. i2s 8ch, spdif 2ch, channels are not mapped, make spdif 8 channel mask
3. when same source used, keep mpll use same mpll

Verify:
x301

Change-Id: I2fe4bbcbcbfff0a1c1a6cebf61d1da5aba9b7a9d
Signed-off-by: Xing Wang <xing.wang@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
	arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
	arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
	arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
	sound/soc/amlogic/auge/ddr_mngr.c
	sound/soc/amlogic/auge/sharebuffer.c
	sound/soc/amlogic/auge/spdif_hw.c
	sound/soc/amlogic/auge/spdif_hw.h
2019-07-03 13:53:32 +09:00
Xiaoming Sui
f13656ff13 avsync: spdif: fix the avsync for ms12 [1/4]
PD#SWPL-5837

Problem:
dtv is out of avsync when dolby ms12 certificate

Solution:
when the audio is played, recalculate the apts to sync
pcrsrc when pcrmaster.

Verify:
X301

Change-Id: I199383aa1c0de1b4f0ec646d9d066910b3bb2b42
Signed-off-by: Xiaoming Sui <xiaoming.sui@amlogic.com>
2019-07-03 13:53:32 +09:00
bing.jiang
c982a597ca dts: Add new dts files for S400 SBR [1/3]
PD#SWPL-4435

Problem:
    adapt Soundbar solution to S400 SBR platform

Solution:
    new dts file axg_s400_v03sbr.dts changed from axg_s400_v03.dts
    add reference remote control mapping in mesonaxg.dtsi
    add tas5782m

Verify:
    S400+D621 A113D

Change-Id: I6feee3993192656eb66b7ee5a9ff6c85d22075e4
Signed-off-by: bing.jiang <bing.jiang@amlogic.com>
Signed-off-by: yujie.wu <yujie.wu@amlogic.com>

Conflicts:
	MAINTAINERS
	sound/soc/codecs/amlogic/tas5782m.c
2019-07-03 13:53:32 +09:00
Shuai Li
21768da866 audio: enable hw resmaple pause thd [1/1]
PD#TV-4638

Problem:
Speaker output high frequency howling
after change from pattern 615 to pattern 1 on chroma22294.
The hw resampler keeps sending noise if it has no input.

Solution:
Enable the hw resample pause thd by default.

Verify:
TL1 X301.

Change-Id: Ib6f0924025e155eaa8ba0e3681b307f7ff56b449
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2019-07-03 13:53:32 +09:00
Jianxin Pan
32118e848b Revert "audio: enable hw resmaple pause thd [1/1]"
This reverts commit 8398f8a917.

Change-Id: I76a3c8fc66b528b62e57630603ad3887b0b3abdc
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2019-07-03 13:53:32 +09:00
Shuai Li
e6d20c3605 audio: enable hw resmaple pause thd [1/1]
PD#TV-4638

Problem:
Speaker output high frequency howling
after change from pattern 615 to pattern 1 on chroma22294.
The hw resampler keeps sending noise if it has no input.

Solution:
Enable the hw resample pause thd by default.

Verify:
TL1 X301.

Change-Id: I076d1b80c6482661fdc3fd5808f1cc231666d07e
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2019-07-03 13:53:32 +09:00
Zhe Wang
5a4ab4e8a4 audio: fixed kernel panic when resample is disabled [1/1]
PD#SWPL-7039

Problem:
Kernel Panic when resample A is disabled

Solution:
When resample is disabled,don't init resample

Verify:
Verified on T962e2_ab311

Change-Id: Id9552ffc6be40f133b828dbded4ad3f15d177ab0
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
2019-07-03 13:53:32 +09:00
Shuai Li
c52565790e audio: always on DDR arb [1/1]
PD#TV-3452

Problem:
Toddr stuck after a long time playback.

Solution:
For debug usage.

Verify:
No need.

Change-Id: Ibf4446148f5e028040d7d6527c7695f23f964f7c
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
2019-07-03 13:53:32 +09:00
Shuai Li
6ade3942fb audio: add HW resample for HDMIRX [1/1]
PD#SWPL-6118

Problem:
No resample will cause mismatch between
input and output if they are not at same
samplerate.

Solution:
Add resample for hdmirx case

Verify:
Local tested.

Change-Id: I298e401578bf49484d6b75fd736d2a74c38508e4
Signed-off-by: Shuai Li <shuai.li@amlogic.com>

Conflicts:
	sound/soc/amlogic/auge/ddr_mngr.c
	sound/soc/amlogic/auge/ddr_mngr.h
2019-07-03 13:53:32 +09:00
Zhe Wang
1679242634 audio: add tdm and spdif clk fine tuning interface [1/1]
PD#SWPL-5518

Problem:
In DTV passthrough, the output clk drifts from input

Solution:
add clk fine tuning interface

Verify:
verify by X301

Change-Id: I969d3eb865fb1aba90f155965548454cc3040c99
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>

Conflicts:
	sound/soc/amlogic/auge/tdm.c
2019-07-03 13:53:32 +09:00
Shuai Li
a69fa11073 audio: add spdif/HDMI mute ctrl [1/1]
PD#TV-3016

Problem:
HDMI SPDIF mute interface has no effect.

Solution:
Add these interfaces for auge platform.

Verify:
Tested locally.

Change-Id: I168c0940e0f2b3d94091d43c6b8190f6f833c0f1
Signed-off-by: Shuai Li <shuai.li@amlogic.com>

Conflicts:
	arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
	sound/soc/amlogic/auge/spdif.c
2019-07-03 13:53:32 +09:00
Xing Wang
e5ee5e3673 audio: auge: transfer audio data to wake word algorithm [1/3]
PD#TV-3389

Problem:
add vad wake engine in kernel

Solution:
transfer audio data to wake engine

Verify:
x301

Change-Id: I7f44d0141141775bb40f01dbc344a295a72c9d87
Signed-off-by: Xing Wang <xing.wang@amlogic.com>

Conflicts:
	MAINTAINERS
2019-07-03 13:53:32 +09:00
Zhe Wang
ac376f6761 audio: add soc DRC tune interface [1/3]
PD#SWPL-5904

Problem:
Audio DRC in SOC is out of work

Solution:
Add DRC tune interface

Verify:
Verify on X301

Change-Id: I5e8ecc6dafd7fc3805b0c3e60a6ec4c945729119
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
2019-07-03 13:53:32 +09:00
Shuai Li
e2b4a32030 faudio: add I2S samesrc channel mapping to spdif [1/1]
PD#SWPL-6147

Problem:
I2S has 8 channels but spdif only 2.
Need map every single i2s lane to spdif sharebuffer.

Solution:
Add the DTS setting MASKS as former does.

Verify:
Local tested.

Change-Id: If212fc1b9c937a42778682948773874951b8a55a
Signed-off-by: Shuai Li <shuai.li@amlogic.com>

Conflicts:
	sound/soc/amlogic/auge/tdm.c
2019-07-03 13:53:32 +09:00
yujie.wu
cb576aede8 audio: Add Mute function for tas5782 [1/1]
PD#SWPL-5961

Problem:
  There is no mute control for tas5782

Solution:
  Add mute function for tas 5782

Verify:
  A113

Change-Id: I75f8b82a359778f28494636fe76c7bc4db848643
Signed-off-by: yujie.wu <yujie.wu@amlogic.com>
2019-07-03 13:53:32 +09:00
Shuai Li
d7900b5335 audio: fix H-voltage when tdm disable [1/1]
PD#SWPL-2952

Problem:
High voltage will cause the tdmout
data pin wrong I2S data which cause pop.

Solution:
Disable the bias of gpio.

Verify:
I2S data will be low when I2s closed.

Change-Id: If5d68e0f30df074f528dfec21cbe297795bc4ea7
Signed-off-by: Shuai Li <shuai.li@amlogic.com>

Conflicts:
	arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
	arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
	sound/soc/amlogic/auge/tdm.c
2019-07-03 13:53:32 +09:00
Zhe Wang
59d82acd6c audio: tune audio volume slew time [1/1]
PD#SWPL-5845

Problem:
audio playback too slow

Solution:
change audio volume slew time

Verify:
Locally test on X301

Change-Id: I48c920037cac852aaa01818bb02eaa8991c1df6b
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
2019-07-03 13:53:32 +09:00
yujie.wu
18d13a7a46 audio: Add tas5782 volume control [1/1]
PD#SWPL-4734

Problem:
  There is no volume control for tas5782

Solution:
  Add ch1/ch2 volume control for tas5782

Verify:
  A113

Change-Id: I1e866a2bc024713278aea0c19cc8c91084a24b90
Signed-off-by: yujie.wu <yujie.wu@amlogic.com>

Conflicts:
	sound/soc/codecs/amlogic/tas5782m.c
2019-07-03 13:53:32 +09:00