Gongwei [Thu, 19 Jul 2018 11:07:58 +0000 (19:07 +0800)]
dts: g12b: add efusekey support [1/1]
PD#169961: dts: g12b: add efusekey support
Change-Id: Ideed83ddc3ad59370165079e2c8e236510507573
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>
shihong.zheng [Thu, 19 Jul 2018 02:31:05 +0000 (10:31 +0800)]
dts: audio: g12b audio config spdif_a;
PD#169619: dts: g12b audiobus tdmb samesource_sel config to 3.
Change-Id: I853d60297fa3b24989c160ec95c68e4ccd76623b
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
Qianggui Song [Wed, 4 Jul 2018 05:42:37 +0000 (13:42 +0800)]
touchscreen: optimize module init flow
PD#169285: touchscreen: optimize module init flow
1.Initializing/Uninitializing resource in probe/remove function is more
appropriate in this case.
2.Use module_i2c_driver to replace module_init/exit to make code more
compact.
verify on a311d_w400
Change-Id: If02f12a6c290a6346d439785060e60a6cd815c12
Signed-off-by: Qianggui Song <qianggui.song@amlogic.com>
nengwen.chen [Wed, 18 Jul 2018 11:30:41 +0000 (19:30 +0800)]
arm64: dts: txlx: modify the txlx adaptation to txl bringup
PD#168480: arm64: dts: txlx: modify the txlx adaptation to txl bringup
Change-Id: I85190803871ea9982a0ec41d87680c975c84d171
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
Xing Wang [Thu, 24 May 2018 15:30:01 +0000 (23:30 +0800)]
audio: auge: fix hdmi pop noise when bootup
PD#165171: audio: auge: fix hdmi pop noise when bootup
Change-Id: Ic8186b230c5c27966467e35d23b8c041309e6922
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Bo Yang [Tue, 17 Jul 2018 12:19:51 +0000 (20:19 +0800)]
arm64: dts: txl: initial add dt files for txl boards
PD#168480: arm64: dts: txl: initial add dt files for txl boards
Change-Id: Ie72d114ee83d97a71e485afea465d3db0f102347
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Xing Wang [Thu, 12 Jul 2018 14:17:24 +0000 (22:17 +0800)]
audio: meson: sdd sound card support for txl
PD#168480: audio: meson: add sound card support for txl
Change-Id: I89117e1cfee2bc99289b00f8ead4acb2f1b13a98
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
libo [Mon, 16 Jul 2018 08:12:47 +0000 (16:12 +0800)]
wifi: meson: fix kernel panic when dts not config wifi pwms
PD#168480: wifi: fix kernel panic when dts not config wifi pwms
Change-Id: I8907ec9f131034fbbe113e74ff3a760b6b8169e1
Signed-off-by: libo <bo.li@amlogic.com>
Jihong Sui [Tue, 17 Jul 2018 12:30:02 +0000 (20:30 +0800)]
dtv_demod: txl: add dtv demod support for txl
PD#168480 :dtv_demod: txl: add dtv demod support for txl
Change-Id: Ib2503aa5f626a5fff115104d0b246cc080fb1123
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
nengwen.chen [Tue, 17 Jul 2018 09:50:52 +0000 (17:50 +0800)]
atv_demod: txl: add atv demod support for txl
PD#168480: atv_demod: txl: add atv demod support for txl
Change-Id: I793946253ec9860473bdd57cf979168d9903f5df
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
Jihong Sui [Mon, 2 Jul 2018 05:02:58 +0000 (13:02 +0800)]
deinterlace: txl: add di support for txl
PD#168480: deinterlace: txl: add di support for txl
Change-Id: I09e6982258291fd36a9b551bc4a6f24d68107cd2
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
Jian Hu [Mon, 2 Jul 2018 09:52:37 +0000 (17:52 +0800)]
reboot: meson: standardize the compatible property
PD#168480: reboot: meson: standardize the compatible property
Use 'amlogic,reboot' instead of 'aml,reboot'.
'aml,reboot' will be removed later.
Change-Id: I7d16795c98aa293fe204121ccd7da41c7d078f77
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Nian Jing [Wed, 27 Jun 2018 08:18:02 +0000 (16:18 +0800)]
tvafe: meson: add support for txl
PD#168480:tvafe: meson: add support for txl
Add atv/avin function for txl.
Change-Id: I1e9727b2578a19a31436ae5cbe924b4311deae9d
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
Bo Yang [Thu, 28 Jun 2018 06:39:55 +0000 (14:39 +0800)]
watchdog: meson: add watchdog support for txl
PD#168480: add watchdog support for txl
Change-Id: I53ac23d1fedec155871ecec3229dedeb13ca7076
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
jiamin ma [Thu, 28 Jun 2018 05:50:51 +0000 (13:50 +0800)]
unifykey: txl: add unifykey support for txl
PD#168480: unifykey: txl: add unifykey for txl
Change-Id: If9d36e91f8fef0694bacc69e746163e2e96befc6
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
hongmin hua [Tue, 26 Jun 2018 12:40:42 +0000 (20:40 +0800)]
cec: txl: add cec support for txl
PD#168480: cec: txl: add cec support for txl
Change-Id: I76c4c241aa882f9a454fed8813fd0d733995bf5d
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
Evoke Zhang [Tue, 26 Jun 2018 05:56:12 +0000 (13:56 +0800)]
lcd: meson: add support for txl
PD#168480: lcd: meson: add support for txl
Change-Id: I8bf458282886f162e4777def4a74f661a0f9f4c0
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Xingyu Chen [Mon, 18 Jun 2018 08:33:34 +0000 (16:33 +0800)]
iio: adc: meson: add sar adc support for txl
PD#168480: iio: adc: meson: add sar adc support for txl
Change-Id: I9febffdb4fef582f5a91138491ae87d11ca240ee
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Hang Cheng [Tue, 26 Jun 2018 07:03:55 +0000 (15:03 +0800)]
hdmirx: txl: add support for txl
PD#168480: hdmirx: txl: add support for txl
Change-Id: Ia1216721f2732052c5c3a5384a3dc01ffacb9392
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
Xingyu Chen [Tue, 26 Jun 2018 07:13:33 +0000 (15:13 +0800)]
iomap: txl: add iomap support for txl
PD#168480: iomap: txl: add iomap support for txl
Change-Id: Icbd5a8811950cd806cf2b6a4b08dca37402e52e7
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Evoke Zhang [Mon, 25 Jun 2018 10:52:45 +0000 (18:52 +0800)]
vpu: txl: add vpu support for txl
PD#168480: vpu: txl: add vpu support for txl
Change-Id: I7562e0831e1f77c65c169c7292ee2a6d2bfc4472
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
bichao.zheng [Sat, 23 Jun 2018 08:41:49 +0000 (16:41 +0800)]
pwm: meson: add support for txl
PD#168480: pwm: meson: add support for txl
1、 add support for txl
2、 fix txl、txlx clock mux selection error issue
Change-Id: Iff7eeb16086604030414d4e350fd533a3d2328b1
Signed-off-by: bichao.zheng <bichao.zheng@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Xingyu Chen [Mon, 18 Jun 2018 06:45:20 +0000 (14:45 +0800)]
irqchip: meson: add gpio IRQ support for txl
PD#168480: irqchip: meson: add gpio IRQ support for txl
Change-Id: I03b32a3ffe4a7e9b63631ac5e593bcbf346b8765
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Jian Hu [Mon, 18 Jun 2018 03:42:16 +0000 (11:42 +0800)]
i2c: meson: add support for txl
PD#168480: i2c: meson: add support for txl
Change-Id: I0c4fe9d2e6caec0cfa812af28476774db69a4e89
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Xingyu Chen [Sat, 16 Jun 2018 12:14:16 +0000 (20:14 +0800)]
pinctrl: txl: add pinctrl & gpio support for txl
PD#168480: pinctrl: txl: add pinctrl & gpio support for txl
Change-Id: I2496cdebfc283e90825f5dd7d20b0e16f57158d2
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Jian Hu [Thu, 14 Jun 2018 09:44:24 +0000 (17:44 +0800)]
clk: txl: initial add clock driver
PD#168480: clk: txl: initial add clock driver
remove CLK_SET_RATE_PARENT flag for spicc.
If add CLK_SET_RATE_PARENT, it will change clk81 rate when set
spicc clock rate.
Change-Id: I80fec2c6d10611994ff40b06307e39b51ddb5a1a
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Ao Xu [Tue, 3 Jul 2018 11:29:16 +0000 (19:29 +0800)]
block: loop: enable loop partiton scanning
PD#168231: block: loop: enable loop partiton scanning
If max_part is given, partition scanning is globally
enabled for loop devices.
Change-Id: I7a8ca59eff85cf9ee97264c3d8ae8dceb198cf32
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
nengwen.chen [Thu, 12 Jul 2018 08:00:37 +0000 (16:00 +0800)]
atv_demod: fix nicam. [1/1]
PD#169523: fix nicam.
Change-Id: Ied4b6867b7993164cd156f120099767b12ab131a
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
Yi Zeng [Fri, 13 Jul 2018 07:33:31 +0000 (15:33 +0800)]
mtd: add new ATO slc nand support
PD#170048: mtd: add new ATO slc nand support
add a ATO slc nand: AFND2G08U3A
Change-Id: I0263682231008c862c9f3f77d02ef7512de3a46f
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
Nian Jing [Wed, 11 Jul 2018 08:34:59 +0000 (16:34 +0800)]
tvafe: fix wss issues
PD#169836: fix wss issues
wss detect slowly
aspect ratio unstable when set off on machine
aspect ratio 4:3 different with screen mode 4:3
Change-Id: I66d0aa393808513975885b86ee18e4c62bf10c88
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
wenfeng.guo [Tue, 26 Jun 2018 07:10:22 +0000 (15:10 +0800)]
di: fix coverity error
PD#169049: di: fix coverity error
Change-Id: I267ae15a1a72ad4255a182f4e7617ac641774c49
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
jiamin ma [Wed, 11 Jul 2018 08:17:25 +0000 (16:17 +0800)]
dts: enable ramoops for all boards
PD#169897: dts: add ramoops node
Change-Id: I1e4bce21a5740d3cc73ffefe803cded4b8a7e24c
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
Shuai Li [Mon, 16 Jul 2018 07:08:42 +0000 (15:08 +0800)]
audio: fix I2S noise at start-up
PD#168452: audio: fix I2S noise at start-up
Change-Id: I0c255509419773f57c09fcd814e72db2e5ad7beb
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
Yong Qin [Wed, 11 Jul 2018 08:44:27 +0000 (16:44 +0800)]
cec: disable cec module clear logic addr
PD#169892: cec: disable cec module clear logic addr
1.for replace "keep reset" when cec disable
Change-Id: I2af29cd4d89ffd13bf35a41fd41d2eb0dbf68e55
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
libo [Fri, 13 Jul 2018 02:20:59 +0000 (10:20 +0800)]
wifi: softirq: reduce ksoftirqd scheduled rate to improve TCP throughtput
PD#162113: improve ap62x8 rx tput
The reason why wifi TCP rx throughtput lower than kernel3.14 are as flollows:
On K3.14, RX has more time to work in ISR, but on K4.9, RX has more time to
work in kernel ksoftirqd thread, however, ksoftirqd has a very low priority.
On K4.9, a commit from upstream caused this difference, then revert it.
Revert "softirq: Let ksoftirqd do its job"
This reverts commit
4cd13c21b207e80ddb1144c576500098f2d5f882.
Change-Id: I094232dad5dfddbcd94c35ec42a5e3302ed52459
Signed-off-by: libo <bo.li@amlogic.com>
pengcheng chen [Mon, 16 Jul 2018 08:32:15 +0000 (16:32 +0800)]
osd: meson-axg: fix uboot logo flicker issue
PD#170129: osd: meson-axg: fix uboot logo flicker issue
Change-Id: I1604d716b1cb0bcf3804b0c7c89df38276c0cc2f
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
Evoke Zhang [Mon, 16 Jul 2018 07:00:04 +0000 (15:00 +0800)]
lcd: fix driver version null pointer mistake
PD#170130: lcd: fix driver version null pointer mistake
Change-Id: Ic3589a8261f57c3eb7a231b5fb778f2421601abe
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Zhi Zhou [Fri, 22 Jun 2018 04:43:20 +0000 (12:43 +0800)]
codec_mm: config: fixed config error crash bug.
PD#166937:
not return errors when not find config.
will crashed on:
[ 9.478046@0] task:
ffffffc05aea8d80 task.stack:
ffffffc05a498000
[ 9.484090@0] PC is at configs_config2str+0x2c/0x240
[ 9.489001@0] LR is at configs_get_node_path_str+0x78/0xd4
[ 9.494433@0] pc : [<
ffffff800982f8cc>] lr : [<
ffffff80098311c8>]
pstate:
20000145
[ 9.501935@0] sp :
ffffffc05a49baf0
[ 9.505386@0] x29:
ffffffc05a49baf0 x28:
ffffffc05a498000
Change-Id: Ia5985d3e5aa7aefecb6867e3d2ab29efc7592b9b
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
Bencheng Jing [Thu, 5 Jul 2018 13:25:37 +0000 (21:25 +0800)]
amvecm: hdr: optimaze set_hdr_matrix
PD#169610: amvecm: hdr: optimaze set_hdr_matrix
Change-Id: Ie3e79433234a76d20ec431814fe27a94b55924bb
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
Sunny Luo [Thu, 31 May 2018 06:12:04 +0000 (14:12 +0800)]
dts: change all txlx/axg/g12a/g12b dts to use spicc upstream driver.
PD#164751: dts: change all txlx/axg/g12a/g12b dts to use spicc upstream driver.
1. change to use the unified name "spicc0/1".
2. change axg compatible from "amlogic, spicc" to "amlogic,meson-axg-spicc"
to use upstream driver.
3. change txlx compatible from "amlogic, spicc" to "amlogic,meson-txlx-spicc"
to use upstream driver.
3. change g12a compatible from "amlogic, spicc" to "amlogic,meson-g12a-spicc"
to use upstream driver.
4. add node of "amlogic,meson-g12b-spicc" for g12b to use upstream driver.
Change-Id: I587127361fa2ada48332cc01857f2200709d597e
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
Nan Li [Tue, 22 May 2018 08:16:31 +0000 (16:16 +0800)]
sd: g12a: optimize sd & wifi TDMA
PD#166884: optimize sd inval irq error,
when sd insert wifi running. wifi is data1.
Change-Id: I6de4f519d3bacec7d9ab4eec4fc9b0cfc6b5d07d
Signed-off-by: Nan Li <nan.li@amlogic.com>
bichao.zheng [Fri, 6 Jul 2018 08:56:33 +0000 (16:56 +0800)]
pwm: meson: don't disable pwm when setting duty repeatedly
PD#169687: pwm: meson: don't disable pwm when setting duty repeatedly
There is an abnormally low about 20ms,when setting duty repeatedly.
Because setting the duty will disable pwm and then enable.Delete
this operation now.
Change-Id: I4bca5e61b4782da3160c14d8c73cd913d7e21db3
Signed-off-by: bichao.zheng <bichao.zheng@amlogic.com>
Hongmin Hua [Mon, 16 Jul 2018 03:36:31 +0000 (20:36 -0700)]
Revert "cec: modify the line check for g12a"
This reverts commit
b059eff24a7c5b434bcf521c164be0836ac47eb2.
Change-Id: I5fe67e218279d469e83231d2fd42cfaf0df23702
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
Yi Zhou [Fri, 13 Jul 2018 11:06:30 +0000 (19:06 +0800)]
hdmitx: hdmitx: fix a map size error when g12b return to trunk
PD#169639: hdmitx: fix a map size error when g12b return to trunk
Change-Id: If26755418cbed435533f8547f30859165b7518b2
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
hongmin hua [Thu, 5 Jul 2018 07:45:34 +0000 (15:45 +0800)]
cec: modify the line check for g12a
PD#168682: cec: modify the line check for g12a
Change-Id: Iad4b47e236f16313356dc9d719052c382311a913
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
Zhongfu Luo [Fri, 13 Jul 2018 10:21:59 +0000 (18:21 +0800)]
unifykey: fix bug for read/write efuse key
PD#168551: need to use unifykey to read/write efuse key
1.fix efuse config name to CONFIG_AMLOGIC_EFUSE
2.add correct efuse key read funciton
Change-Id: I415f1b68d5de090220b1bd96db299452af176626
Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>
Sunny Luo [Sat, 28 Apr 2018 02:15:15 +0000 (10:15 +0800)]
spicc: add dma and enhance features of axg/txhd/g12a/g12b.
PD#164751: spicc: add dma and enhance features of axg/txhd/g12a/g12b.
1. fix TESTREG bits defination error;
2. fix cs-gpio error in slave setup;
3. reset fifo to avoid successive fifo error before tansfer;
4. add enhance feature of cs-preload delay control;
5. add auto io delay control;
6. add enhance feature of tt/ti delay control;
7. fix clk error which occurred certainly when sencond spicc added;
8. surpport both auto core clk and fixed core clk rate setting:
set dts "fixed_core_rate = <
200000000(example)>" to use fixed
core rate. otherwise, to use auto core clk.
9. support loop-back mode;
10. support DMA transfer;
11. must delete 1000M from parent clk.
12. It will be wrong when enhance divider=2. we have to add a flag
CLK_DIVIDER_PROHIBIT_ZERO to shield against it.
Change-Id: I820a52e6d31d3fe2e3615a0f4c5a07c17d11914d
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
Ting Wang [Tue, 10 Jul 2018 09:19:47 +0000 (17:19 +0800)]
dts:add region_code key[1/2]
PD# 169693
add region_code key to change wifi local
Change-Id: I60b52e82b69128a90fbd9f72f0de8b46ccd04e7e
Signed-off-by: Ting Wang <ting.wang@amlogic.com>
yicheng shen [Thu, 12 Jul 2018 02:17:25 +0000 (10:17 +0800)]
hdmirx: hdcp1.4 force OESS mode
PD#169940: hdmirx: hdcp1.4 force OESS mode
Force OESS mode to fix Google Chromecast box
flashing black screen issue.
Change-Id: I1768f7b69ac1379166d88f605a4dcfab7a7044ea
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
Conglin Guo [Thu, 12 Jul 2018 09:36:19 +0000 (17:36 +0800)]
dts: media: add cpu ver info to dts
PD#168480: dts: media: add cpu type dts info
Change-Id: Ie1f4d023fd2c20e37677b710364b54c5f0937579
Signed-off-by: Conglin Guo <conglin.guo@amlogic.com>
Yi Zhou [Fri, 29 Jun 2018 11:05:07 +0000 (19:05 +0800)]
hdmitx: update register address when g12b return to trunk [3/3]
PD#169639: hdmitx: update register address [3/3]
Change-Id: Ibb37bd0c3e3611ad6e624fafbcb879e5a7d78a74
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Zhuo Wang [Thu, 12 Jul 2018 09:09:02 +0000 (17:09 +0800)]
ethernet: add exphy led function
PD#169970: exphy led for 4.9
Change-Id: I4e51298b98a2511fd7ab2d90d3a853d9d6d9e13c
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
Huan Biao [Tue, 3 Jul 2018 06:46:11 +0000 (14:46 +0800)]
thermal: fix thermal ipa mode data for g12b
PD#169024: update g12b thermal ipa mode data for match power
Change-Id: Iedcb16cc9da2a47777456e041831ff60f0229c5a
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
Zhongfu Luo [Thu, 12 Jul 2018 06:50:48 +0000 (14:50 +0800)]
efuse: support EFUSE pattern burning
PD#168568: G12A need to support EFUSE burning
1.add child node amlogic_set in efuse
2.node amlogic_set support EFUSE pattern burning
Change-Id: Ie20a8b61678e351cf32418879d4b40228e1d365f
Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>
Yinming Ding [Fri, 22 Jun 2018 09:36:05 +0000 (17:36 +0800)]
smartcard: modify smartcard driver for 8.1
PD#168901: smartcard modify smartcard driver for 8.1
Change-Id: Ib0b81009e434d5f6c513bfc52bbfeef48414ef39
Signed-off-by: Yinming Ding <yinming.ding@amlogic.com>
tao zeng [Thu, 12 Jul 2018 01:30:30 +0000 (09:30 +0800)]
ddr: fix overflow when ddr freq is high
PD#161475: ddr: fix overflow when ddr freq is high
Caculate of ddr freq will overflow if ddr freq is
over 1.5GHz, This commit fixed it.
Change-Id: Idc07b1022b52e3ec5c227c15afff1aaf21575ed7
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
tao zeng [Fri, 25 May 2018 10:23:37 +0000 (18:23 +0800)]
arm: enable AMLOGIC_MODIRY config
PD#165213:
This change can use some amlogic optimize on arm32
Change-Id: Ic364baab21431e83d9b224d0d6c58913404aed3c
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
Zhe Wang [Wed, 11 Jul 2018 02:48:27 +0000 (10:48 +0800)]
audio: make raw data from spdifin source to parser[1/1]
PD#166028: support dd/dd+ decoder from spdifin
Change-Id: Id2ef5a585427db2508e89f4bc595a8dc058e941b
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
Zhongfu Luo [Thu, 5 Jul 2018 10:33:38 +0000 (18:33 +0800)]
dts: G12A: add efuse support
PD#168568: G12A need to support EFUSE burning
Change-Id: If85af608a03450ca5fc8557ea7d2c2c5f71fff09
Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>
xuhua zhang [Fri, 22 Jun 2018 09:01:39 +0000 (17:01 +0800)]
tvafe: wss: add aspect ratio function[5/5]
PD#165626: add wss function at LitvTV
Change-Id: Ic95bb761b9de45dc35094ed8d1b4e1cee0c25ac8
Signed-off-by: xuhua zhang <xuhua.zhang@amlogic.com>
Jian Hu [Tue, 10 Jul 2018 11:43:49 +0000 (19:43 +0800)]
arm64: dts: g12a/g12b: correct i2c timeout interrupt number
PD#169865: arm64: dts: g12a/g12b: correct i2c timeout interrupt number
I2c timeout interrupt number has changed since g12a SoC, the timeout
interrupt have not used in i2c controller driver, the function will
probably be added later.
Change-Id: I2aca009bacfda0bc2636e48032de71c9aa42cacb
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Sunny Luo [Sat, 7 Jul 2018 07:04:12 +0000 (15:04 +0800)]
touchscreen: add goodix gt9xx touch for a311d_w400
PD#169723: touchscreen: add goodix gt9xx touch for a311d_w400
Change-Id: I2a3560b91bcf449e2c0f9e0a36e6ce9586adf8cf
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
Gongwei [Tue, 10 Jul 2018 11:44:23 +0000 (19:44 +0800)]
dts: build: add S905X2 1g DDR3 support
PD#169633: dts: build: add S905X2 1g DDR3 dts support
Change-Id: Ief4b2d5d0cfa4693e6ebdf851eb506f8bdb9402f
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>
Shunzhou Jiang [Fri, 6 Jul 2018 02:13:26 +0000 (10:13 +0800)]
clk: clock: add efuse clock for g12a
PD#168568: clock: add efuse clock
Change-Id: I4ef07515db93fd8bf7108bfbe622d0ce261ed2d6
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
Zongdong Jiao [Thu, 5 Jul 2018 12:08:51 +0000 (20:08 +0800)]
hdmitx: update extcon_hdmi_audio after resume
PD#169594: hdmitx: update extcon_hdmi_audio after resume
Under some corner case, extcon_hdmi_audio maybe as 0.
Change-Id: I497b5f8538ffd329e1fee4fcc44c09944e77cf64
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Yi Zhou [Thu, 28 Jun 2018 10:59:26 +0000 (18:59 +0800)]
hdmitx: add hdcp function in drm
PD#158474: hdmitx: add hdcp function in drm
1.update drm library files about hdcp
upstream (
24557865c8b1a6d0eaccaac47aabd9b23badf8fd)
2.add hdcp state machine
3.add hdcp 1.4
4.add hdcp 2.2
a) fix hdcp_tx22
b) add uevent for hdcp_tx22
Change-Id: If1254d2d42775ea45459b8e3072395f480bd6438
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
shihong.zheng [Thu, 5 Jul 2018 03:07:04 +0000 (11:07 +0800)]
dv: fixed dolbyvision video cannot play [2/2]
PD#169274: dv: merge some dv code from 3.14, add a dolbyvision
bypass el define and metadata parser return val check.
Change-Id: I2a687d0e3187d1f56880508b4d4a3263edcdc071
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
Hong Guo [Tue, 10 Jul 2018 03:27:34 +0000 (11:27 +0800)]
CPUFREQ: delete dvfs volate adjustment in cpufreq init.
PD#165143: cpufreq: delete dvfs volate adjustment in cpufreq init.
Change-Id: Ic9e2ad87c130a6f6c964c711148f9277b09ffcbc
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
jiamin ma [Tue, 10 Jul 2018 03:57:31 +0000 (11:57 +0800)]
configs: sync meson64_defconfig
PD#164745: verified boot for android P
Change-Id: I09e97dd174ce61f7cbf7b6d6926b7933184b6c86
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
Hanjie Lin [Fri, 6 Jul 2018 04:58:02 +0000 (12:58 +0800)]
perf_event: aml pmu interrupt issue fixup
PD#167574: perf_event: aml pmu interrupt issue fixup
amlogic arm pmu have a issue that all core's interrupts routes to
one gic SPI interrupt,
when some core raise a pmu interrupt(arm pmu counter overflow),
the global gic SPI interrupt will raise(default on cpu0),
and we can obtain core info which caused interrupt from
sys_cpu_status0 reg.
In global pmu interrupt handler we distinguish interrupts from other cpu,
then send a AML ipi interrupt and wait that cpu complete pmu interrupt.
Change-Id: I28ada689e5b94671c8cfb6189e46134c3c6804cd
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
Brian Zhu [Fri, 6 Jul 2018 19:51:25 +0000 (03:51 +0800)]
ge2d: fix wrong init the clock overflow as 400MHZ for 805x
PD#168119: fix wrong init the clock overflow as 400MHZ for 805x
Change-Id: I26cd7c11c0aa026bc253bb40bf05ca96dac9555d
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
Yue Wang [Mon, 9 Jul 2018 04:48:05 +0000 (12:48 +0800)]
pcie: fix check linkup timeout bug when pcie resume.
PD#169779: pcie: fix check linkup timeout bug when pcie resume.
Change-Id: Ia648c63447f101b71ae84dd960c0f414b80cbd32
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
Nanxin Qin [Mon, 29 Jan 2018 10:06:33 +0000 (18:06 +0800)]
media: adds the feature of the amvdec ports are based on v4l2.[1/2]
PD#153299:
1. amports has v4l for video decoding implemented upstream.
2. Only the decoding of h264 has been implemented at the moment.
3. the maximun resolution supports 1080p currently.
4. it is nv12 that the canvas data format of the decoder output.
5. the detailed description can be referred to wiki.
wiki: Media/The_V4L2_Amvdec_Ports_Instructions
Change-Id: Ie19311e1f44ae53b491500be9903f3d82c83b800
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
Tong Li [Mon, 9 Jul 2018 02:30:55 +0000 (10:30 +0800)]
g12b_skt: disable the pcie function for g12b_skt.[1/1]
PD#169764: disable the pcie function for g12b_skt..
Change-Id: I48ac1c5f94a483ab299ce77f416e2d05a9d5bd62
Signed-off-by: Tong Li <tong.li@amlogic.com>
zhilei.wu [Fri, 6 Jul 2018 12:32:10 +0000 (20:32 +0800)]
osd: fix osd suspend fail issue
PD#167373: osd: fix osd suspend fail issue
Change-Id: I705cb3b4ec3226cb6bfcf7c94920116ac6540c2e
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
David Zeuthen [Tue, 24 Jan 2017 18:17:01 +0000 (13:17 -0500)]
ANDROID: AVB2: Enable avb2 driver [3/6]
PD#164745
PD#168166
ANDROID: AVB error handler to invalidate vbmeta partition.
If androidboot.vbmeta.device is set and points to a device with vbmeta
magic, this header will be overwritten upon an irrecoverable dm-verity
error. The side-effect of this is that the slot will fail to verify on
next reboot, effectively triggering the boot loader to fallback to
another slot. This work both if the vbmeta struct is at the start of a
partition or if there's an AVB footer at the end.
This code is based on drivers/md/dm-verity-chromeos.c from ChromiumOS.
Example:
[ 0.000000] Kernel command line: rootfstype=ext4 init=/init console=ttyS0,115200 androidboot.console=ttyS0 androidboot.hardware=uefi_x86_64 enforcing=0 androidboot.selinux=permissive androidboot.debuggable=1 buildvariant=eng dm="1 vroot none ro 1,0 2080496 verity 1 PARTUUID=
6779df46-78f6-4c69-bf53-
59bb1fbf126b PARTUUID=
6779df46-78f6-4c69-bf53-
59bb1fbf126b 4096 4096 260062 260062 sha1
4f76354c86e430e27426d584a726f2fbffecae32 7e4085342d634065269631ac9a199e1a43f4632c 1 ignore_zero_blocks" root=0xfd00 androidboot.vbmeta.device=PARTUUID=
b865935d-38fb-4c4e-b8b4-
70dc67321552 androidboot.slot_suffix=_a androidboot.vbmeta.device_state=unlocked androidboot.vbmeta.hash_alg=sha256 androidboot.vbmeta.size=3200 androidboot.vbmeta.digest=14fe41c2b3696c31b7ad5eae7877d7d188995e1ab122c604aaaf4785850b91f7 skip_initramfs
[...]
[ 0.612802] device-mapper: verity-avb: AVB error handler initialized with vbmeta device: PARTUUID=
b865935d-38fb-4c4e-b8b4-
70dc67321552
[...]
[ 1.213804] device-mapper: init: attempting early device configuration.
[ 1.214752] device-mapper: init: adding target '0 2080496 verity 1 PARTUUID=
6779df46-78f6-4c69-bf53-
59bb1fbf126b PARTUUID=
6779df46-78f6-4c69-bf53-
59bb1fbf126b 4096 4096 260062 260062 sha1
4f76354c86e430e27426d584a726f2fbffecae32 7e4085342d634065269631ac9a199e1a43f4632c 1 ignore_zero_blocks'
[ 1.217643] device-mapper: init: dm-0 is ready
[ 1.226694] device-mapper: verity: 8:6: data block 0 is corrupted
[ 1.227666] device-mapper: verity-avb: AVB error handler called for PARTUUID=
b865935d-38fb-4c4e-b8b4-
70dc67321552
[ 1.234308] device-mapper: verity-avb: invalidate_vbmeta: found vbmeta partition
[ 1.235848] device-mapper: verity-avb: invalidate_vbmeta: completed.
[...]
Bug:
31622239
Test: Manually tested (other arch).
Change-Id: Idf6be32d6a3d28e15de9302aa26ad6a516d663aa
Signed-off-by: David Zeuthen <zeuthen@google.com>
Change-Id: I4b9229dbba3198ca55a00812e42762f424b59ec4
Signed-off-by: Mingyen Hung <mingyen.hung@amlogic.com>
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
Evoke Zhang [Thu, 7 Jun 2018 05:12:00 +0000 (13:12 +0800)]
backlight: ldim: optimize ldim algorithm for flicker issue
PD#167455: backlight: ldim: optimize ldim algorithm for flicker issue
also add driver and algorithm version recode.
Change-Id: I4b217f6d611c5689366170907db7e90b5a653a5e
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Sunny Luo [Thu, 5 Jul 2018 07:32:32 +0000 (15:32 +0800)]
clk: add CLK_DIVIDER_PROHIBIT_ZERO to prohibit value 0 of register.
PD#164751: clk: add CLK_DIVIDER_PROHIBIT_ZERO to prohibit value 0 of
register.
There is a possible error when spicc clk divider register value is 0.
It's easy and effective to resolve this problem with this flag.
Change-Id: I046f3ee6e35b98211a13be3390b847a5a75ec3c8
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
wenbiao zhang [Thu, 5 Jul 2018 06:44:30 +0000 (14:44 +0800)]
dts: g12b audio config spdif_a
PD#169544: dts: g12b audio config spdif_a
Change-Id: Ie102bdd9bdb75274cf089a4409684dec5d3322ef
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
Gongwei [Wed, 27 Jun 2018 07:37:34 +0000 (15:37 +0800)]
dts: build: add S905X2 1g DDR3 support
PD#169633: dts: build: add S905X2 1g DDR3 dts support
Change-Id: Ib0480f45c167cf7fd11991bc79383328aa16c6b4
Signed-off-by: Gongwei Chen <gongwei.chen@amlogic.com>
wei wang [Mon, 25 Jun 2018 02:27:14 +0000 (10:27 +0800)]
audio: set default value of gpio:AudioIn_Switch as spdif_in.[1/1]
PD#164102: there is no sound in spdif-in.
Change-Id: Ie26bde8a80b90ce67870669978874bb64e5cd5ed
Signed-off-by: wei wang <wei.wang@amlogic.com>
Matthew Shyu [Fri, 29 Jun 2018 10:21:06 +0000 (18:21 +0800)]
crypto: Use arm64 crypto for android net cts tests
PD#169014:
1. fix race condition in Aml HW crypto driver
A flag is added in irq handler for distinguishing
the source of interrupt since all crypto modules
share the same dma thread
2. Enable arm64 crypto
Arm64 crypto is synchronous and thus is able to
pass net cts tests for UDP
Change-Id: I2fe4f44a0b386e1e5d234d0ba07d17ffdc3224a7
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
Yong Qin [Thu, 5 Jul 2018 08:30:51 +0000 (16:30 +0800)]
cec: modify pinmux
PD#169602: cec: for g12b add pinmux
1.support transwich cec
2.support snps cec
Change-Id: I21b79e402a8580e97604874f25790b7659d44906
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
Yi Zhou [Thu, 5 Jul 2018 06:00:10 +0000 (14:00 +0800)]
drm: Add Content Protection property
PD#158474: drm: Add Content Protection property
This patch adds a new optional connector property to allow userspace to enable
protection over the content it is displaying. This will typically be implemented
by the driver using HDCP.
The property is a tri-state with the following values:
- OFF: Self explanatory, no content protection
- DESIRED: Userspace requests that the driver enable protection
- ENABLED: Once the driver has authenticated the link, it sets this value
The driver is responsible for downgrading ENABLED to DESIRED if the link becomes
unprotected. The driver should also maintain the desiredness of protection
across hotplug/dpms/suspend.
If this looks familiar, I posted [1] this 3 years ago. We have been using this
in ChromeOS across exynos, mediatek, and rockchip over that time.
Changes in v2:
- Pimp kerneldoc for content_protection_property (Daniel)
- Drop sysfs attribute
Changes in v3:
- None
Changes in v4:
- Changed kerneldoc to recommend userspace polling (Daniel)
- Changed kerneldoc to briefly describe how to attach the property (Daniel)
Changes in v5:
- checkpatch whitespace noise
- Change DRM_MODE_CONTENT_PROTECTION_OFF to DRM_MODE_CONTENT_PROTECTION_UNDESIRED
Changes in v6:
- None
commit
24557865c8b1a6d0eaccaac47aabd9b23badf8fd
Author: Sean Paul <seanpaul@chromium.org>
Date: Mon Jan 8 14:55:37 2018 -0500
Change-Id: Ief031a46681d88369454ebbc56ed0bb203258ab5
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Shunzhou Jiang [Thu, 5 Jul 2018 07:31:06 +0000 (15:31 +0800)]
dts: dts: Fix g12b skt version can't boot up
PD#169593: dts: disable irblaster
Change-Id: I9fe0a3042b6de8db27c9f71d76c43852c88fb8ad
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
pengcheng chen [Thu, 5 Jul 2018 08:31:39 +0000 (16:31 +0800)]
osd: fix osd freescale dummy caused black line issue
PD#169597: osd: fix osd freescale dummy caused black line issue
Change-Id: I47b76d707a8da20ac8eabfbd64e895c34c8dd599
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
Nian Jing [Tue, 3 Jul 2018 11:44:10 +0000 (19:44 +0800)]
dts: cvbsout: add clk path config in dts
PD#169489: add clk path config in dts
Change-Id: Id1ee72c9acf4030bff2e9f1c05e1420fdbe52131
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
Jian Hu [Wed, 27 Jun 2018 03:42:46 +0000 (11:42 +0800)]
clk: meson: remove CLK_SET_RATE_PARENT for spicc
PD#164751: clk: meson: remove CLK_SET_RATE_PARENT for spicc
If add CLK_SET_RATE_PARENT, set rate for spicc clock will
change clk81 rate.
Change-Id: If653169e26363e8015ae0547e899a9ea2b362a48
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Shunzhou Jiang [Mon, 25 Jun 2018 08:58:41 +0000 (16:58 +0800)]
clk: clock: meet spicc clk closest and not include 1G
PD#164751: clock: fix set spi clock set error
Change-Id: I06b9c195441e7b057dbd9bf7d5b864cf8ae44aa1
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
Bencheng Jing [Tue, 3 Jul 2018 13:31:21 +0000 (21:31 +0800)]
vlock: fix hdmi crash
PD#169483: vlock: fix hdmi crash
Change-Id: I0f2770f65789430f096e16637ba5b542bd670b16
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
Nian Jing [Mon, 2 Jul 2018 09:43:40 +0000 (17:43 +0800)]
cvbsout: add cvbsout pal_m pal_n support
PD#169423: add cvbsout pal_m pal_n display mode support
Change-Id: I6d0458f5e6fccf31c52957d23da9fe0e76471213
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
Weiguang Ruan [Tue, 3 Jul 2018 08:25:42 +0000 (16:25 +0800)]
audio: set tdma slot = 1 for s420&s400 [3/3]
PD#169480: audio: set tdma slot = 1 for s420&s400
Change-Id: Id4fa1993866e91bebabe29553c66196c65890c97
Signed-off-by: Weiguang Ruan <Weiguang.ruan@amlogic.com>
rongrong zhou [Thu, 28 Jun 2018 05:49:54 +0000 (13:49 +0800)]
codec_mm: alloc fail issue [1/2]
PD#167377
1. try_alloc_cma_size 4M -> 16M
2. dump free meminfo
Change-Id: Ideaf9f70067861d3b08b48336074b32213986cb6
Signed-off-by: rongrong zhou <rongrong.zhou@amlogic.com>
Hang Cheng [Wed, 27 Jun 2018 08:26:07 +0000 (16:26 +0800)]
hdmirx: add afifo threshold pass status for audio
PD#168492: hdmirx: add afifo threshold pass status for audio
when HDMI in,audio will check the fifo empty count to see
if the hdmirx fifo is empty,then audio hal will mute the dirty data
to avoid noise.
Change-Id: I37e19d1490c560ca9fb38ffa2c3c03793e81c9ae
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
Bencheng Jing [Tue, 3 Jul 2018 06:54:47 +0000 (14:54 +0800)]
amvecm: add 3d lut for g12b
PD#165090: amvecm: add 3d lut for g12b
Change-Id: If75d72d727d59d032617414b67403653d0650612
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
wenbiao zhang [Mon, 2 Jul 2018 07:04:27 +0000 (15:04 +0800)]
dts: add system led control for u200 buildroot
PD#169382: dts: add system led control for u200 buildroot
Change-Id: I56686581ff8f5e2e2d36cb91f77a418ae1f9479a
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
liangzhuo.xie [Mon, 25 Jun 2018 03:21:30 +0000 (11:21 +0800)]
dts: add w400 buildroot dts
PD#168687: add w400 buildroot dts
Change-Id: Ie2439ddee4df090014ec9bdb7b1f081a44233e0b
Signed-off-by: liangzhuo.xie <liangzhuo.xie@amlogic.com>
Qianggui Song [Thu, 28 Jun 2018 06:59:22 +0000 (14:59 +0800)]
arm64: dts: g12b: add focaltech touchpanel config
PD#169477: arm64: dts: g12b: add focaltech touchpanel config
Change-Id: Ia6ede5da68dad6994e537279b1e7edacf4203d63
Signed-off-by: Qianggui Song <qianggui.song@amlogic.com>
shuanglong.wang [Tue, 3 Jul 2018 03:27:19 +0000 (11:27 +0800)]
amlvideo: remove some print info
PD#169021: remove some print info
remove some print info, for interlace frame, bottom pts will be
zero in single mode and multi intstance force interlace.
Change-Id: Ie1e3285e11cca37a6be98aecf55a927186cc727c
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
Evoke Zhang [Wed, 20 Jun 2018 10:28:48 +0000 (18:28 +0800)]
lcd: fix code coverity
PD#168738: lcd: fix code coverity
Change-Id: I24eac191b7168a949c17fcb0478b4caee1453e4b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>