Commit Graph

653713 Commits

Author SHA1 Message Date
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
Nian Jing
564ce6cd68 tvafe: fix pali recognize for palcn [1/1]
PD#SWPL-3395

Problem:
recognized fsc358 flag when signal weak

Solution:
increase fsc358-flag recognized threshold
avoid fsc443 be recognized as fsc358

Verify:
verify on x301

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

Conflicts:
	drivers/amlogic/atv_demod/atv_demod_ops.c
	drivers/amlogic/atv_demod/atvdemod_func.c
2019-07-23 17:52:49 +09:00
Huan Biao
fb722a947a arm: dts: add ipa parameter [1/1]
PD#SWPL-5198

Problem:
tl1 thermal cts case fail.

Solution:
tl1 add thermal dts.

Verify:
tl1 x301 pass.

Change-Id: I47f8e295f0ddc546f4540a8edd96556755ceef66
Signed-off-by: Huan Biao <huan.biao@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
	arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
2019-07-23 17:52:49 +09:00
Hong Guo
ccca5b9ee3 CPUFREQ: Setting different cpufreq tables according to efuse information. [1/1]
PD#SWPL-4035

Problem:
Setting different cpufreq tables according to efuse information.

Solution:
Setting different cpufreq tables according to efuse information.

Verify:
g12a_u200, verify pass

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

Conflicts:
	drivers/amlogic/cpufreq/meson-cpufreq.c
2019-07-23 17:52:49 +09:00
Wenfeng Guo
b1f23539d7 deinterlace: fix 480i error into pulldown [1/1]
PD#TV-1949

Problem:
480i error into pulldown (by yanling)

Solution:
1. add flm22_comlev3 (by yanling);

Verify:
tl1 txlx

Change-Id: Ib5c168deb1327df0e803831dcf9f13e05faaa915
Signed-off-by: Wenfeng Guo <wenfeng.guo@amlogic.com>

Conflicts:
	drivers/amlogic/media/deinterlace/deinterlace.c
2019-07-23 17:52:49 +09:00
Yinming Ding
5da86d3349 device: amlogic: Add config for dtv tuner si2169 [2/3]
PD#SWPL-2763

Problem:
Add config for dtv tuner si2169

Solution:
Add dtv tuner si2169 as default
Temp disable spdif pin mux and uart_A because GPIO conflict

Verify:
Verified by R314

Change-Id: I2557043e9d34ef8db8048eab9cd53d04c26c29c4
Signed-off-by: Yinming Ding <yinming.ding@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts
	arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts
2019-07-23 17:52:49 +09:00
bing.jiang
16bcc9b900 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-23 17:52:49 +09:00
Nian Jing
b0848aa3b8 vbi: use dma alloc instead reserved memory [1/1]
PD#SWPL-4510

Problem:
do not use reserved memory

Solution:
use dma_alloc_coherent instead reserved memory

Verify:
x301

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

Conflicts:
	arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
	arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
2019-07-23 17:52:49 +09:00
changqing.gao
8df003b1c1 mm: The first 1MB mem is wasted for CPU series coming after TXLX [1/1]
PD#SWPL-3744

Problem:
For the previous Amlogic CPU series(before TXLX), the CPU booting vector
locates at physical address starting from 0x00. To avoid influencing cpu
booting procedure, we have to reserve the first 1MB physical memory. But
it has changed since TXLX, the normal text section can safely use 0~1M
physical address. So it's no need to reserve the first 1MB in DTS.

Solution:
Change the starting address of usable memory from 0x100000 to 0x0 for CPU
series coming after TXLX.

Verify:
Locally on W400

Change-Id: I2df7859a38feca48abd58459e8b231ee15ada9e2
Signed-off-by: changqing.gao <changqing.gao@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts
2019-07-23 17:52:49 +09:00
Jianxiong Pan
a46317b63e dts: g12b: copy g12b dts [1/1]
PD#SWPL-5020

Problem:
copy g12b dts.

Solution:
copy.

Verify:
local.

Change-Id: Ibd6423bd0cc99e98bf1d6359068f9f0719ad177f
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
Signed-off-by: Hong Guo <hong.guo@amlogic.com>

Conflicts:
	MAINTAINERS
	arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
	arch/arm/boot/dts/amlogic/g12b_pxp.dts
	arch/arm/boot/dts/amlogic/g12b_pxp_a.dts
	arch/arm/boot/dts/amlogic/mesong12b_a.dtsi
	arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
	arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts
	arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts
	arch/arm64/boot/dts/amlogic/g12b_pxp.dts
	arch/arm64/boot/dts/amlogic/g12b_pxp_a.dts
	arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi
2019-07-23 17:52:49 +09:00
Bichao Zheng
641b2bb082 arm: dts: update vddcpu pwm regulator voltage-table [1/1]
PD#SWPL-4225

Problem:
TL1 hardware update DCDC of vddcpu

Solution:
update vddcpu voltage-table
[old]
voltage range: 1021mv - 721mv  step size: 10mv step: 30

[new]
voltage range: 1049mv - 689mv  step size: 10mv step: 36

Verify:
test pass on tl1_X301_v1 tl1_skt_v1

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

Conflicts:
	arch/arm64/boot/dts/amlogic/mesontm2.dtsi
	arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
	arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
2019-07-23 17:52:49 +09:00
Nan Li
cc50262270 sd: add sduart not supported flag [1/1]
PD#SWPL-4858

Problem:
tl1 not support sduart

Solution:
add not supported flag in match_data

Verify:
verify by tl1 skt

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

Conflicts:
	arch/arm/boot/dts/amlogic/tl1_pxp.dts
	arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
	drivers/amlogic/mmc/amlsd.c
2019-07-23 17:52:49 +09:00