Commit Graph

653724 Commits

Author SHA1 Message Date
Dezhi Kong
13e6f8bf4f vdin: optimize game mode process [1/1]
PD#SWPL-2145

Problem:
HDMI Rx Video path display latency of Game mode and Normal mode

Solution:
optimize game mode

Verify:
T962X-R311

Change-Id: Ib0a41915dfb088495c976d56ab812f90e31602f4
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>

Conflicts:
	drivers/amlogic/media/vin/tvin/vdin/vdin_drv.c
2019-07-23 17:52:49 +09:00
Bencheng Jing
fc3b3a7e3d 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>

Conflicts:
	drivers/amlogic/media/enhancement/amvecm/amve.c
2019-07-23 17:52:49 +09:00
Jianxin Pan
e94805a646 dts: debug: enable ftrace_ramoops for new dts [1/1]
PD#SWPL-6028

Problem:
enable ftrce in ramoops for new dtbs

Solution:
enable ftrce in ramoops for new dtbs

Verify:
X301

Change-Id: I0643329a873a310d1078ebd898fec2d3cb75d43c
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2019-07-23 17:52:49 +09:00
Jianxin Pan
ac05ed73ef debug: enable ftrace_ramoops [1/2]
PD#SWPL-6028

Problem:
enable ftrce in ramoops

Solution:
enable ftrce in ramoops

Verify:
u200

Change-Id: I2403bf82c342416b7c34f2115b14dce623406997
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/axg_s400_v03gva.dts
	arch/arm/boot/dts/amlogic/axg_s400emmc_512m.dts
	arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
	arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
2019-07-23 17:52:49 +09:00
nengwen.chen
2b75a9c818 atv_demod: modify atv demod support multi tuner load [1/3]
PD#TV-1539

Problem:
modify atv demod support multi tuner load.

Solution:
1.add fine tune.
2.add set/get if info.
3.add tuner type set/get.
4.add multi tuner config in dts.
5.atv demod ver: V2.09.

Verify:
verified by x301

Change-Id: I23328bfab3d3508db67cef3e327002563eb1a87e
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
	arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts
	arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
	arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts
2019-07-23 17:52:49 +09:00
nengwen.chen
f5a2657d70 atv_demod: Fix ATV audio output noise when switching channels to play [1/1]
PD#SWPL-2297, PD#SWPL-5450, PD#TV-2311

Problem:
Fix ATV audio output noise when switching channels to play.

Solution:
1.Add the judgment of SNR to prevent the weak signal
  from entering the OV mode.
2.Wait for the signal to be completely stable before OV detection.
3.OV detection is turned off by default,
  and will be turned on again when non-standard signals are encountered.
4.The OV detection moves from afc timer to monitor.
5.Optimize detection of A2/FM.
6.atv demod ver: V2.08.

Verify:
verified by x301

Change-Id: I3064230472ce51e1192a2d08ef6cc6f4ba10abaa
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
nengwen.chen
9ddf9c182e atv_demod: Fix non standard for analog signal [1/1]
PD#TV-1549, PD#TV-2829, PD#TV-2830

Problem:
Fix non standard for analog signal.

Solution:
1.Add non standard config 3 for analog signal.
2.Fix non standard default value.
3.Fix audio control register an bits.
4.After correcting the frequency offset success,
 reset tuner to prevent audio from identifying errors.

Verify:
verified by x301

Change-Id: I65335dbe9ce9dc66d4ccaae3c1ff591660790616
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
nengwen.chen
590cc2a221 atv_demod: Add audio carrier offset detect [1/1]
PD#TV-2564

Problem:
Torture room teset report SND0810 sound carrier deviation

Solution:
Add audio carrier offset detect

Verify:
verified by x301

Change-Id: I2d715891fb268452f95e05f998864e9b7321ff38
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
nengwen.chen
536830727f atv_demod: modify atv demod code [1/1]
PD#SWPL-3469

Problem:
1.add mono audio only config.
2.fix offset -0.5M lose channel when scanning.
3.fix a2 audio mono mode detection threshold.
4.add audio detection when scanning.
5.Ver: V2.06.

Solution:
add mono audio only config

Verify:
verified by einstein

Change-Id: I774d7aa42ffbfcbec58b9b21f05368c5166331c8
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
nengwen.chen
9ed2178ee9 atv_demod: atv demod code optimization for audio [1/1]
PD#TV-1448

Problem:
1.atv demod code optimization for audio
2.amlogic-4.9-dev

Solution:
atv demod code optimization for audio

Verify:
verified by einstein

Change-Id: Ic1c6a26ef97fbaf288ae37f2761c0df83ec7cf1e
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>

Conflicts:
	drivers/amlogic/atv_demod/atv_demod_monitor.c
	drivers/amlogic/atv_demod/atvdemod_func.c
2019-07-23 17:52:49 +09:00
nengwen.chen
e1707ab901 atv_demod: reduce atv demod debug info when searching. [1/1]
PD#SWPL-2712

Problem:
reduce atv demod debug info when searching.

Solution:
reduce atv demod debug info when searching.

Verify:
verified by r311

Change-Id: I01f1cebabdacdea4bb7695c2133b99157d8db19d
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>

Conflicts:
	drivers/amlogic/atv_demod/atvdemod_func.c
2019-07-23 17:52:49 +09:00
nengwen.chen
cf6568a019 atv_demod: modify atv demod code [1/1]
PD#SWPL-2295

Problem:
1.modify atv demod code for coverity.
2.add ntsc-m ring filter for t962x2.
3.merge code optimization from android l.
4.add tuner compatible info in dts for tuner debug.

Solution:
1.modify atv demod code for coverity.
2.add ntsc-m ring filter for t962x2.
3.merge code optimization from android l.
4.add tuner compatible info in dts for tuner debug.

Verify:
verified by einstein

Change-Id: I9696aa628315ee11f0c9dd279c7cc03797f04331
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts
	arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts
	drivers/amlogic/atv_demod/atv_demod_access.c
	drivers/amlogic/atv_demod/atv_demod_driver.c
	drivers/amlogic/atv_demod/atv_demod_ops.c
	drivers/amlogic/atv_demod/atvdemod_func.c
2019-07-23 17:52:49 +09:00
nengwen.chen
3c693dd285 atv_demod: pc bad value in panic after change source [1/1]
PD#SWPL-1636

Problem:
1.pc bad value in kernel panic after change source.
2.System crash down when change source.

Solution:
optimize atv demod code.

Verify:
verified by p321

Change-Id: I655d1253950475dfb49ae1b174597797000adb73
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>

Conflicts:
	drivers/amlogic/atv_demod/atv_demod_ops.c
2019-07-23 17:52:49 +09:00
nengwen.chen
298aa2d9dd atv_demod: switch channel with the script, the ATV shows no signal [1/1]
PD#SWPL-791

Problem:
Switch channel with the script lasts 14 hours, the ATV shows no signal.

Solution:
To avoid conflict, don't need to check the CLK
and PLL states in atv demod write and read function.

Verify:
verified by p321

Change-Id: I033c54f14541ed540dfce1b9c4e21d2b5a8b9487
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>

Conflicts:
	drivers/amlogic/atv_demod/atv_demod_ops.c
2019-07-23 17:52:49 +09:00
Guosong Zhou
041b4d5d79 camera: add dvp camera [1/1]
PD#OTT-1204

Problem:
don't support dvp camera

Solution:
add dvp camera gc2145 camera driver

Verify:
test pass on U200

Change-Id: I5927d49a93952587af7bb460a5c405293d692153
Signed-off-by: Guosong Zhou <guosong.zhou@amlogic.com>

Conflicts:
	MAINTAINERS
	arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts
2019-07-23 17:52:49 +09:00
nengwen.chen
e7cd693aa9 camera: all sources are displayed as black screen except DTV.
PD#SWPL-3776

Problem:
all sources are displayed as black screen except DTV

Solution:
Revert "camera: add dvp camera [1/1]"

Verify:
verify by x301

Change-Id: I3f094ed18de4be382798515e5c68eb5505df2373
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>

Conflicts:
	MAINTAINERS
	arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts
	drivers/amlogic/media/camera/common/vm.c
	drivers/amlogic/media/camera/gc2145.c
2019-07-23 17:52:49 +09:00
Guosong Zhou
bbbf5c116e camera: add dvp camera [1/1]
PD#OTT-1204

Problem:
don't support dvp camera

Solution:
add dvp camera gc2145 camera driver

Verify:
test pass on U200

Change-Id: I0451160d013cd15b32a11469926fe8be4c35c466
Signed-off-by: Guosong Zhou <guosong.zhou@amlogic.com>

Conflicts:
	MAINTAINERS
	arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts
	drivers/amlogic/media/camera/common/vm.c
	drivers/amlogic/media/camera/common/vm.h
	drivers/amlogic/media/camera/gc2145.c
2019-07-23 17:52:49 +09:00
Hang Cheng
de6ccab8c8 cec: remove func that may cause deadlock [1/1]
PD#SWPL-5836

Problem:
kernel panic when read cec reg

Solution:
remove func that might cause sleep in spinlock,
so as to avoid deadlock

Verify:
S805X-P241

Change-Id: I8394f69bdbeff6673c795a221c08ef76164c5bdb
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>

Conflicts:
	drivers/amlogic/cec/hdmi_ao_cec.h
2019-07-23 17:52:49 +09:00
Yong Qin
98d3127523 cec: ceca register access fail [1/1]
PD#SWPL-4133

Problem:
cec a register access fail and cause watchdog reboot

Solution:
reduce wait counter, and check clk register

Verify:
P215

Change-Id: Ic9d97e1eca9428ffd0c4a6bfe008cd9d8303075b
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

Conflicts:
	drivers/amlogic/cec/hdmi_ao_cec.c
2019-07-23 17:52:49 +09:00
Yong Qin
590814cd2c cec: framework suspend condition error [1/1]
PD#SWPL-3715

Problem:
set startup to TV,when DVD power on,the platform
autoshutdown after enter HDMI source

Solution:
suspend condition is wrong when not in suspend mode.

Verify:
TL1 (X301_T962x2)

Change-Id: I057cfe6b9a7f5806fa54eac063c02a7e3dc0179e
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

Conflicts:
	drivers/amlogic/cec/hdmi_ao_cec.c
	drivers/amlogic/cec/hdmi_ao_cec.h
2019-07-23 17:52:49 +09:00
Yong Qin
6d0682cd8e cec: auto shutdown case crash [1/1]
PD#SWPL-2258

Problem:
1.running autoshutdown cause device crashed

Solution:
1.optimize cec power on proble flow

Verify:
1.p212

Change-Id: Ia78c76cdb4b72a1a275628b3ad77ea6d71696d89
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

Conflicts:
	drivers/amlogic/cec/hdmi_ao_cec.h
2019-07-23 17:52:49 +09:00
Yong Qin
c0102386e4 cec: for support multi-logical address [1/1]
PD#SWPL-418

Problem:
cec: support multi-logical address

Solution:
if working on multi-logical address, enable two ip
1.enable cec_a, cec_b
2.enable two interrupt
3.enable two pinmux oa_7, ao_8
4.cec_a only send all msg
5.cec_b only receive all msg
6.discard ceca broadcast msg

Verify:
r311
r321
p321

Change-Id: I1dc93429876ede951657102bcd7d41a500946719
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

Conflicts:
	drivers/amlogic/cec/hdmi_ao_cec.c
	drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h
2019-07-23 17:52:49 +09:00
Lei Qian
472272230e cec: revert changesy [1/1]
PD#SWPL-418

Problem:
TXL can't bootup

Solution:
revert it

Verify:
p321

Revert "cec: for support multi-logical address [2/2]"
This reverts commit cc185dc81d.

Revert "cec: for support multi-logical address [1/2]"
This reverts commit b7922078ea.

Change-Id: I1cef0ac194464d75ffff3fe765f15b5f944406b2
Signed-off-by: Lei Qian <lei.qian@amlogic.com>

Conflicts:
	drivers/amlogic/cec/hdmi_ao_cec.c
2019-07-23 17:52:49 +09:00
Yong Qin
42565ac96b cec: for support multi-logical address [2/2]
PD#SWPL-418

Problem:
cec: support multi-logical address

Solution:
1.enable cec_a, cec_b
2.enable two interrupt
3.enable two pinmux oa_7, ao_8
4.cec_a only send all msg
5.cec_b only receive all msg
6.discard ceca broadcast msg

Verify:
r311 r321

Change-Id: I8f983ed6ad329ca5ec0144587a7ad1f03ad68031
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

Conflicts:
	drivers/amlogic/cec/hdmi_ao_cec.c
2019-07-23 17:52:49 +09:00
Yong Qin
faad940baf cec: for support multi-logical address [1/2]
PD#SWPL-418

Problem:
cec: for support mult-logical address

Solution:
1.add interface: remove logical address
2.for support multi-logical address

Verify:
r311 r321

Change-Id: I9ea8b1004f43fb84855d41dd684c117fa5cbd7ae
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

Conflicts:
	drivers/amlogic/cec/hdmi_ao_cec.c
	drivers/amlogic/cec/hdmi_ao_cec.h
2019-07-23 17:52:49 +09:00
Long Yu
a96b816a30 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>

Conflicts:
	arch/arm/boot/dts/amlogic/mesontl1.dtsi
	arch/arm64/boot/dts/amlogic/mesontl1.dtsi
2019-07-23 17:52:49 +09:00
long yu
8e0290520c emmc: backward compatible with all HS400 clock sources [1/1]
PD#SWPL-6294

Problem:
TL1 and G12B uses clkin3,TXLX uses clkin2

Solution:
unifying the HS400 source clock name in DTS

Verify:
TL1-T962X2_X301 G12B-Reva G12B-Revb

Change-Id: I7acaf7b4392d757955f43a0b17ac1fad84f53d26
Signed-off-by: Long Yu <long.yu@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/mesontm2.dtsi
	arch/arm64/boot/dts/amlogic/mesontm2.dtsi
2019-07-23 17:52:49 +09:00
long yu
00f6381291 storage: emmc: Add HS400 busmode support for G12B-RevB [1/1]
PD#SWPL-5040

Problem:
not support HS400 busmode

Solution:
add HS400 busmode support for G12B-RevB

Verify:
T962X-R311,TL1-T962X2_X301,G12B-W400

Change-Id: I11a1f47b9473fa341c7d754a51d6e270551758a7
Signed-off-by: long yu <long.yu@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/mesong12b.dtsi
	arch/arm64/boot/dts/amlogic/mesong12b.dtsi
	drivers/amlogic/mmc/aml_sd_emmc_v3.c
	drivers/mmc/core/mmc.c
2019-07-23 17:52:49 +09:00
yuegui.he
9dd11cea14 dts: emmc: uboot enable emmc config [2/3]
PD#SWPL-736

Problem:
The s400 emmc platform uboot cannot be loaded
into kernel normally

Solution:
enable enable emmc node in dtb by fdt command.
    and modify malloc max size to 18M.

Verify:
s400

Change-Id: Iaef58f1b05a952793d414eb82ac476d88d910fe1
Signed-off-by: yuegui.he <yuegui.he@amlogic.com>

Conflicts:
	MAINTAINERS
	arch/arm/boot/dts/amlogic/axg_s400_v03gva.dts
	arch/arm/boot/dts/amlogic/axg_s400emmc_512m.dts
2019-07-23 17:52:49 +09:00
Nian Jing
145da5c2c8 vbi: fix vbi teletext no vcnt [1/1]
PD#TV-3444

Problem:
vbi teletext no vcnt
vbi dump failed
adc dump failed

Solution:
set 0x126[26]=1
fix dump issue
fix adcdump issue

Verify:
test on x301

Change-Id: I7111a86f0259d2e57f06f885a1c8058d9578dc88
Signed-off-by: Nian Jing <nian.jing@amlogic.com>

Conflicts:
	drivers/amlogic/media/vin/tvin/tvafe/tvafe.h
2019-07-23 17:52:49 +09:00
Qianggui Song
0f40816dec ir: add ir learning function [1/1]
PD#SWPL-4130

Problem:
No ir learning function in current source code

Solution:
Provide two ways to use ir learning function
1. sysfs
	/*start learning*/
	echo 1 > /sys/class/remote/amremote/ir_learnning
	/*get data*/
	cat /sys/class/remote/amremote/learned_pulse
	/*stop learning*/
	echo 0 > /sys/class/remote/amremote/ir_learnning
2. ioctl
	/*start/stop learnning 1/0*/
	REMOTE_IOC_SET_IR_LEARING
	/*get raw data*/
	REMOTE_IOC_GET_RAW_DATA

Verify:
U200 and W400

Change-Id: Ibb03838402d9baa6e910b3162ffcc63b57048890
Signed-off-by: Qianggui Song <qianggui.song@amlogic.com>

Conflicts:
	drivers/amlogic/input/remote/remote_meson.h
2019-07-23 17:52:49 +09:00
Hong Guo
77215197e0 supsend: update gx_pm driver [1/1]
PD#SWPL-7226

Problem:
update gx_pm driver

Solution:
update gx_pm driver

Verify:
test pass on tl1_x309

Change-Id: If078b0744cb8ce46029d77512d5755f4d40c2014
Signed-off-by: Hong Guo <hong.guo@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/mesontxl.dtsi
	arch/arm64/boot/dts/amlogic/mesontl1.dtsi
	arch/arm64/boot/dts/amlogic/mesontxl.dtsi
2019-07-23 17:52:49 +09:00
Xiaoming Sui
c7d4cff22f 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-23 17:52:49 +09:00
Yong Qin
4c4a043503 vlock: disable some log [1/1]
PD#SWPL-6994

Problem:
disable some log

Solution:
disable some log

Verify:
tl1

Change-Id: I53ceafbd35445f60d6c59ff9fd2632e8a6fc794f
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Yeping Miao
22daa717ba dts: Improve axg_s400_v03sbr.dts [1/1]
PD#SWPL-6696

Problem:
  Pad key '+' cannot work

Solution:
  Add to pad key support list
  Add more key support for SBR remote

Verify:
  S400 S400_SBR A113D

Change-Id: I9bdc3053f2b3ce778e9c2f682fcf31ac054887b4
Signed-off-by: Yeping Miao <yeping.miao@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
c73ef5f430 vlock: add phase lock pll mode [1/1]
PD#SWPL-6899

Problem:
enable vlock phase lock function in pll mode

Solution:
1.when phase lock on, and when phase lock flag not assert
disable ss.
2.after phase lock flag assert, restore ss

Verify:
tl1

Change-Id: I2f9f6ec76468b1043c1b7ec99b2daa4f9d69ae60
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

Conflicts:
	drivers/amlogic/media/enhancement/amvecm/vlock.c
2019-07-23 17:52:49 +09:00
Tao Zeng
f82abc7940 ramdump: write compressed data [2/2]
PD#SWPL-6193

Problem:
ramdump need write compressed data to persist storage device.
But if we write it under uboot, it may cause journal and block
bitmap mismatch due to different version of file system. This
caused kernel panic after ramdump finished.

Solution:
Write compressed data under kernel.
This change also removed some extern function of ramdump since
we use sticky register to store ramdump information.

Verify:
p212

Change-Id: Idd83ec6ead4783918b90a39cf716fd3117402278
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/mesonaxg.dtsi
	arch/arm/boot/dts/amlogic/mesong12a.dtsi
	arch/arm/boot/dts/amlogic/mesongxl.dtsi
	arch/arm/boot/dts/amlogic/mesongxm.dtsi
	arch/arm/boot/dts/amlogic/mesontl1.dtsi
	arch/arm/boot/dts/amlogic/mesontxl.dtsi
	arch/arm/boot/dts/amlogic/mesontxlx.dtsi
	arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
	arch/arm64/boot/dts/amlogic/mesong12a.dtsi
	arch/arm64/boot/dts/amlogic/mesongxl.dtsi
	arch/arm64/boot/dts/amlogic/mesongxm.dtsi
	arch/arm64/boot/dts/amlogic/mesontxl.dtsi
	arch/arm64/boot/dts/amlogic/mesontxlx.dtsi
	drivers/amlogic/memory_ext/ram_dump.c
	include/linux/amlogic/ramdump.h
2019-07-23 17:52:49 +09:00
Zhuo Wang
c1fe5f2713 ethernet: reset ethernet when resume [1/1]
PD#SWPL-6608

Problem:
system will report tx error somethime after resume

Solution:
reset ethernet when resume

Verify:
verify on u200 board

Change-Id: I9863a8a50c08addd4e2d8c024f46a2e7568c28b4
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>

Conflicts:
	drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
2019-07-23 17:52:49 +09:00
Yeping Miao
e0a7cb799d dts: GVA on SBR platform [1/1]
PD#SWPL-4760

Problem:
  Port GVA on S400 SBR platform

Solution:
  Port GVA on S400 SBR platform

Verify:
  S400_SBR A113D

Change-Id: I615e9457ba83df1c30829aa8ce01b6bc6072929f
Signed-off-by: Yeping Miao <yeping.miao@amlogic.com>

Conflicts:
	MAINTAINERS
2019-07-23 17:52:49 +09:00
Nian Jing
abad8a7c46 tvafe: add control for tvconfig snow config [1/1]
PD#SWPL-5985

Problem:
display snow when snow config disabled

Solution:
add control for tvconfig snow config

Verify:
verify it on x301

Change-Id: I3466efc98577f2403f3a6cd638ad7dbf70ce34dc
Signed-off-by: Nian Jing <nian.jing@amlogic.com>

Conflicts:
	include/linux/amlogic/media/frame_provider/tvin/tvin.h
2019-07-23 17:52:49 +09:00
Jiamin Ma
a752a685cd cpu_affinity: restore the original cpu affinity correctly [1/1]
PD#SWPL-5595

Problem:
set_cpus_allowed_ptr(current, cpu_all_mask) is always errorly
called to retore CPU affinity for current task. In some cases,
the current may be a bounded kworker thread, and we should not
set its CPU affinity to all CPUs

Solution:
Save the original CPU affinity and restore it

Verify:
W400 revB

Change-Id: I3cd65e79791563af9dacc09639b8645b97979c44
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>

Conflicts:
	drivers/amlogic/efuse/efuse_hw64.c
2019-07-23 17:52:49 +09:00
Nan Li
7c17db27ab sd: optimize sduart not supported flag [1/1]
PD#SWPL-4858

Problem:
Soc not support sduart

Solution:
add not supported flag in dts

Verify:
verify by tl1 skt

Change-Id: Ifd1f975bd13b150aac9d99f60423ab4f0b903c98
Signed-off-by: Nan Li <nan.li@amlogic.com>

Conflicts:
	drivers/amlogic/mmc/amlsd.c
2019-07-23 17:52:49 +09:00
Hong Guo
036f4aecf8 CPUFREQ: Setting different cpufreq tables. [1/1]
PD#SWPL-4035

Problem:
Setting different cpufreq tables.

Solution:
Setting different cpufreq tables.

Verify:
g12a_u200, verify pass

Change-Id: If93f1baa1f50aeeed6e3d7f9d2ffeb1e0a5b4e02
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2019-07-23 17:52:49 +09:00
qingwei.xu
e150b88405 dts: Ion and vdin0 CMA Memory Optimization [1/1]
PD#SWPL-5896

Problem:
The memory consumption of modules ion and vdin0 is too large

Solution:
Ion CMA memory optimization to 32M,vdin0 to 160M

Verify:
X301、T309

Change-Id: If9e54390baeda6d330bb2c96b14ef3975333a2f1
Signed-off-by: qingwei.xu <qingwei.xu@amlogic.com>
2019-07-23 17:52:49 +09:00
Bichao Zheng
4cc9254223 irblaster: meson: refactored irblaster driver [1/1]
PD#SWPL-1856

Problem:
refactored irblaster code

Solution:
1. Refactor the code according to the core, provider, and consumer
   frameworks.
2. Provide software encode to let irblaster work according to different
   protocols
3. Provide a unified consumer interface to allow other consumer drivers
   to use irblaster.

Verify:
test pass on g12a_u200_v1

Change-Id: Ifd841ef0ed741b7fd721defc25691744ea2103f0
Signed-off-by: Bichao Zheng <bichao.zheng@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/mesontxl.dtsi
	arch/arm64/boot/dts/amlogic/axg_s410.dts
	arch/arm64/boot/dts/amlogic/mesontxl.dtsi
2019-07-23 17:52:49 +09:00
Zongdong Jiao
2c1e50bcca hdmitx: add dongle_mode case for low power [2/2]
PD#SWPL-5302

Problem:
For dongle products, it is connected to TV directly, and some
parameters are different from mbox.

Solution:
Add dongle mode for driver's usage

Verify:
U211/S905Y2

Change-Id: Ibe45b167800d3b830d78ca8e9d7b67efd64d8564
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>

Conflicts:
	drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c
	drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_g12a.c
2019-07-23 17:52:49 +09:00
shaochan.liu
45845922e5 lcd: add lcd_driver support for tm2 [2/2]
PD#SWPL-6398

Problem:
add lcd_driver support

Solution:
add lcd_chip_tm2 and panel.dtsi

Verify:
ab301

Change-Id: I3cb5b67826ea2612e69b206168497771d5ced4b2
Signed-off-by: shaochan.liu <shaochan.liu@amlogic.com>

Conflicts:
	MAINTAINERS
	arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
	drivers/amlogic/media/vout/lcd/lcd_debug.c
	drivers/amlogic/media/vout/lcd/lcd_phy_config.c
	drivers/amlogic/media/vout/lcd/lcd_tablet/lcd_drv.c
	drivers/amlogic/media/vout/lcd/lcd_tcon.c
	drivers/amlogic/media/vout/lcd/lcd_tv/lcd_drv.c
2019-07-23 17:52:49 +09:00
Evoke Zhang
52398cc6ca backlight: ldim: add dev reg access api support [1/1]
PD#TV-1481

Problem:
need ldim_dev reg access uniform api

Solution:
add ldim_dev reg access uniform api

Verify:
x301

Change-Id: I72756d178ef70aac1f8b7fef842468f2e27a0ffe
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>

Conflicts:
	drivers/amlogic/media/vout/backlight/aml_ldim/ldim_dev_drv.c
2019-07-23 17:52:49 +09:00
Evoke Zhang
0abca5cf8f backlight: ldim: add analog pwm support [1/1]
PD#SWPL-3702

Problem:
local dimming need analog pwm function

Solution:
add analog pwm support

Verify:
x301

Change-Id: I502bb7505947c1f3670f44d0d307f9546f1d57fd
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>

Conflicts:
	drivers/amlogic/media/vout/backlight/aml_ldim/ldim_dev_drv.c
	include/linux/amlogic/media/vout/lcd/aml_ldim.h
2019-07-23 17:52:49 +09:00
Evoke Zhang
445dee0e6b backlight: update ldim setting for tl1 [1/1]
PD#SWPL-2762

Problem:
ldim is changed for tl1

Solution:
update ldim setting for tl1

Verify:
x301

Change-Id: I21b10f27f4d1776db664c62fa7358b38801c7f53
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/mesontl1_t309-panel.dtsi
	arch/arm/boot/dts/amlogic/mesontl1_x301-panel.dtsi
	arch/arm64/boot/dts/amlogic/mesontl1_t309-panel.dtsi
	arch/arm64/boot/dts/amlogic/mesontl1_x301-panel.dtsi
	drivers/amlogic/media/vout/backlight/aml_ldim/ldim_drv.h
2019-07-23 17:52:49 +09:00