Commit Graph

646633 Commits

Author SHA1 Message Date
Ao Xu
116bf34754 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>
2018-07-18 02:20:22 -07:00
nengwen.chen
ad2d480821 atv_demod: fix nicam. [1/1]
PD#169523: fix nicam.

Change-Id: Ied4b6867b7993164cd156f120099767b12ab131a
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2018-07-18 02:06:45 -07:00
Yi Zeng
5a8f3c6232 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>
2018-07-18 00:50:27 -07:00
Nian Jing
86fbf24a70 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>
2018-07-17 23:02:58 -07:00
wenfeng.guo
9b63b94884 di: fix coverity error
PD#169049: di: fix coverity error

Change-Id: I267ae15a1a72ad4255a182f4e7617ac641774c49
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
2018-07-17 21:27:16 -07:00
jiamin ma
47a83da964 dts: enable ramoops for all boards
PD#169897: dts: add ramoops node

Change-Id: I1e4bce21a5740d3cc73ffefe803cded4b8a7e24c
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
2018-07-17 19:23:25 -07:00
Shuai Li
4382d6c271 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>
2018-07-17 07:08:42 -07:00
Yong Qin
ae0631efa2 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>
2018-07-17 03:09:16 -07:00
libo
60e98ef37d 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 4cd13c21b2.

Change-Id: I094232dad5dfddbcd94c35ec42a5e3302ed52459
Signed-off-by: libo <bo.li@amlogic.com>
2018-07-17 02:03:45 -07:00
pengcheng chen
345436f394 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>
2018-07-17 00:28:19 -07:00
Evoke Zhang
32e74e4ad6 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>
2018-07-16 20:30:35 -07:00
Zhi Zhou
b9e7965b50 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>
2018-07-16 19:07:15 -07:00
Bencheng Jing
866f6f1da6 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>
2018-07-16 03:22:42 -07:00
Sunny Luo
d40f0ec497 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>
2018-07-16 02:39:02 -07:00
Nan Li
59bc6ce4ed 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>
2018-07-16 02:16:49 -07:00
bichao.zheng
11573cdb34 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>
2018-07-16 01:11:54 -07:00
Hongmin Hua
1d6a58a251 Revert "cec: modify the line check for g12a"
This reverts commit b059eff24a.

Change-Id: I5fe67e218279d469e83231d2fd42cfaf0df23702
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
2018-07-15 20:37:32 -07:00
Yi Zhou
d479f7d934 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>
2018-07-13 04:10:21 -07:00
hongmin hua
b059eff24a 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>
2018-07-13 03:54:52 -07:00
Zhongfu Luo
178d20b9c9 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>
2018-07-13 03:52:44 -07:00
Sunny Luo
34616dd660 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>
2018-07-12 23:40:37 -07:00
Ting Wang
7ef26fb586 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>
2018-07-12 20:04:26 -07:00
yicheng shen
3bf2bf8357 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>
2018-07-12 20:03:50 -07:00
Conglin Guo
a173b19b08 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>
2018-07-12 19:32:13 -07:00
Yi Zhou
d67e679876 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>
2018-07-12 19:55:22 +08:00
Zhuo Wang
a1d38e2837 ethernet: add exphy led function
PD#169970: exphy led for 4.9

Change-Id: I4e51298b98a2511fd7ab2d90d3a853d9d6d9e13c
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
2018-07-12 03:20:42 -07:00
Huan Biao
39939b6c71 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>
2018-07-12 03:10:14 -07:00
Zhongfu Luo
797ca58e55 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>
2018-07-12 14:55:06 +08:00
Yinming Ding
a3f21fe9fb 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>
2018-07-11 19:35:48 -07:00
tao zeng
7a67df5813 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>
2018-07-12 09:42:56 +08:00
tao zeng
6613b42a3d 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>
2018-07-11 02:58:48 -07:00
Zhe Wang
fbb58ac56b 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>
2018-07-11 01:25:46 -07:00
Zhongfu Luo
36221137c1 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>
2018-07-10 23:55:22 -07:00
xuhua zhang
1e4600cd89 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>
2018-07-10 23:54:11 -07:00
Jian Hu
04bc92f23a 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>
2018-07-10 23:52:14 -07:00
Sunny Luo
8c4f33e3a9 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>
2018-07-10 23:17:36 -07:00
Gongwei
cfdc84aab8 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>
2018-07-10 19:27:59 -07:00
Shunzhou Jiang
5d4de95a06 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>
2018-07-10 18:39:11 -07:00
Zongdong Jiao
14dc230878 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>
2018-07-10 01:54:55 -07:00
Yi Zhou
9cfc62a329 hdmitx: add hdcp function in drm
PD#158474: hdmitx: add hdcp function in drm

1.update drm library files about hdcp
upstream (24557865c8)
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>
2018-07-10 00:54:19 -07:00
shihong.zheng
20c6fe0f8f 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>
2018-07-10 00:25:28 -07:00
Hong Guo
fb070e508a 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>
2018-07-09 22:35:33 -07:00
jiamin ma
4a7ca377a5 configs: sync meson64_defconfig
PD#164745: verified boot for android P

Change-Id: I09e97dd174ce61f7cbf7b6d6926b7933184b6c86
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
2018-07-10 11:58:02 +08:00
Hanjie Lin
4e32d573ac 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>
2018-07-10 10:29:22 +08:00
Brian Zhu
fb0db73474 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>
2018-07-09 02:26:51 -07:00
Yue Wang
50dedb3321 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>
2018-07-09 00:50:39 -07:00
Nanxin Qin
53a66f642c 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>
2018-07-09 00:40:09 -07:00
Tong Li
367fdeee43 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>
2018-07-08 22:44:43 -07:00
zhilei.wu
347fa9b90f 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>
2018-07-08 22:32:13 -07:00
David Zeuthen
4efc1b8a17 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>
2018-07-09 11:31:20 +08:00