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>
Jian Hu [Fri, 29 Jun 2018 08:58:23 +0000 (16:58 +0800)]
clk: txlx: add lock protection on meson_clk_measure()
PD#168934: clk: txlx: add lock protection on meson_clk_measure()
Fix encl_clk_msr equal zero when switch to hdmirx
Change-Id: I95bf5c3e4c0b45b2884a87a4112893b64766cda3
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Tong Li [Tue, 26 Jun 2018 08:05:37 +0000 (16:05 +0800)]
s905d2_skt: reduce the Bootcomplete time for s905d2_skt.[2/2]
PD#169063: update dts for s905d2_skt.
Change-Id: I5825c1678da72b08aa5bf59e34e542811611a1f5
Signed-off-by: Tong Li <tong.li@amlogic.com>
hongmin hua [Mon, 11 Jun 2018 08:33:17 +0000 (16:33 +0800)]
cec: modfiy port info define for playback & audiosystem
PD#165588: cec: modfiy port info define for playback & audiosystem
Change-Id: I2305763107d2b99a767f688238fc51d4084d3b26
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
Nan Li [Wed, 27 Jun 2018 02:26:02 +0000 (10:26 +0800)]
sdio: optimize tuning retry.
PD#168926: add cmd_dly to tuning retry.
Change-Id: If78f557cd5302ee340dfc82bd269f51a7cce2abd
Signed-off-by: Nan Li <nan.li@amlogic.com>
Zongdong Jiao [Thu, 28 Jun 2018 06:29:39 +0000 (14:29 +0800)]
hdmitx: reactive I2C after resume [1/1]
PD#168111: hdmitx: reactive I2C after resume
Sometimes, TX devices suspend and close HDMI 5V power, then this
may cause I2C clock/data falls and hungup I2C waiting states.
Change-Id: Ifd83c19f91a7023a43cebb5654157e207013556c
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Evoke Zhang [Wed, 27 Jun 2018 05:49:13 +0000 (13:49 +0800)]
lcd: mipi-dsi: add operation_mode and read debug command support
PD#169193: lcd: mipi-dsi: add operation_mode and read debug command support
Change-Id: I5b1b781bc7700d0ced109c4e3ec171c91196604b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Wencai You [Mon, 2 Jul 2018 06:56:38 +0000 (14:56 +0800)]
dts: gxm: add bt-dev for q201
PD#169292: add bt-dev for q201
Change-Id: I7039ce8934dab1f02477d64246e3639b6aa96fd0
Signed-off-by: Wencai You <wencai.you@amlogic.com>
Mingyen Hung [Thu, 28 Jun 2018 04:20:59 +0000 (12:20 +0800)]
cec: modify dts pintrl selection to default
PD#158936: cec: modify dts pintrl selection to default
Fix kernel panic in aml_cec_probe() due to null pointer
reference on q200. (buildroot)
Change-Id: I926b22048cbdfe1524a2eda2410deac53aa4990e
Signed-off-by: Mingyen Hung <mingyen.hung@amlogic.com>
Bencheng Jing [Thu, 28 Jun 2018 02:20:00 +0000 (10:20 +0800)]
amvecm: rm satu_shift_by_con add hist_gamma_reset
PD#167359: amvecm: rm satu_shift_by_con add hist_gamma_reset
Change-Id: I8b4a0eeaedbcd2b2569e7f0db2c7f5da37de7473
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
MingLiang Dong [Thu, 17 May 2018 08:24:11 +0000 (16:24 +0800)]
amvecm: use rdma load vpp reg
PD#166562: amvecm: use rdma load vpp reg
Change-Id: Id0b61be776d91e1b6270699aeb9b24fd43d1a67d
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
Evoke Zhang [Thu, 21 Jun 2018 06:21:03 +0000 (14:21 +0800)]
vout_serve: add vinfo fr_adj_type support for vlock
PD#168809: vout_serve: add vinfo fr_adj_type support for vlock
Change-Id: Ib5b7b06110008a98a6cf9b16e2f14775aa3f1053
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
yicheng shen [Wed, 27 Jun 2018 06:30:19 +0000 (14:30 +0800)]
hdmirx: mute the audio when get avmute signal
PD#169041: hdmirx: mute the audio when get avmute signal
Change-Id: I5941d48a793974f7292d6648a70d7e7842944170
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
Xing Wang [Wed, 27 Jun 2018 06:24:21 +0000 (14:24 +0800)]
dts: audio: fix spdif_a share buffer with i2s
PD#160888: dts: audio: fix spdif_a share buffer with i2s
Change-Id: Id064feeaf20f3717e64f771ec1ae81b170000102
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Xing Wang [Thu, 17 May 2018 06:29:18 +0000 (14:29 +0800)]
audio: auge: only spdifin_event extcon for spdif_a in g12a
PD#165680: audio: auge: only spdifin_event extcon for spdif_a in g12a
Change-Id: Ie8486dc460a9452dc8a0f26a2a5acce83ee7bf26
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Bencheng Jing [Thu, 21 Jun 2018 03:17:23 +0000 (11:17 +0800)]
amvecm: clean coverity errors
PD#168792: amvecm: clean coverity errors
Change-Id: I1956c5e6b8bf3dff36e2820be4149f58dfa98f20
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
Dezhi Kong [Mon, 25 Jun 2018 08:20:58 +0000 (16:20 +0800)]
vpp: adjust vpp skip line limit for bandwidth
PD#167737: VPP: adjust vpp skip line limit for bandwidth
Change-Id: I18c4325750a3c266936db849e52d938adf00adda
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
pengcheng chen [Tue, 26 Jun 2018 05:50:42 +0000 (13:50 +0800)]
osd: fix not afbc ddr bandwidth too high issue
PD#164816: osd: fix not afbc ddr bandwidth too high issue
Change-Id: I0108ccf8fd2564da2974e95d065811f9682d3bdc
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
Evoke Zhang [Thu, 21 Jun 2018 05:23:55 +0000 (13:23 +0800)]
vout_serve: code coverity fix
PD#168799: vout_serve: code coverity fix
Change-Id: Id5358f4adc791980b14e2c22eff3443e9601a90e
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
sky zhou [Thu, 21 Jun 2018 04:49:06 +0000 (12:49 +0800)]
DRM: move irq request after crtc created.
PD#168985: fix vblank irq panic when crtc not created.
Change-Id: I369a8a0159549001ae0ef216391be730664a4690
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
Rongjun Chen [Mon, 25 Jun 2018 04:00:01 +0000 (12:00 +0800)]
WIFI: fix wifi disable issue when suspend [2/2]
PD#168416: increase the mem size
Change-Id: Ib5fac2941b870c6d3dcca320adef17893bb1ec78
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
Jianxin Qin [Tue, 26 Jun 2018 02:46:40 +0000 (10:46 +0800)]
usb: phy2: recovery analog status in PHY initial function
PD#164286: usb: phy2: recovery analog status during initial phase
If a USB device is enumerated done by Host, then the host system
reboot without power off, the AML USB PHY statue need to recovery,
or the USB device will be enumerated unsuccessfully.
Change-Id: If122e53b6a818be11be0ed6581ac485450244db0
Signed-off-by: Jianxin Qin <jianxin.qin@amlogic.com>
pengcheng chen [Mon, 11 Jun 2018 03:00:08 +0000 (11:00 +0800)]
osd: risk coverity bugs in osd module
PD#168947: osd: risk coverity bugs in osd module
Change-Id: Ia593f55c1debbd5dca271461336edb29123fae00
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
nengwen.chen [Thu, 7 Jun 2018 12:00:39 +0000 (20:00 +0800)]
atv_demod: Add ATV NICAM. [1/5]
PD#165624: Add ATV NICAM.
Change-Id: I2bcc018cd5ff7a611baa2f5473cfa1dbce28118d
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
MingLiang Dong [Fri, 29 Jun 2018 06:55:50 +0000 (14:55 +0800)]
vdin: fix hdmi input hlg video, vpp cannot get hlg flag
PD#167991: vdin: fix hdmi input hlg video, vpp cannot get hlg flag
Change-Id: I9071d6fd956ea70bcfde7cb781ec687fb0a81021
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
Xing Wang [Wed, 6 Jun 2018 02:55:57 +0000 (10:55 +0800)]
audio: support raw data even in touch sound[1/2]
PD#164738: audio: auge: check frddr src for each frddr
when output for raw data, disable the same frddrr src from other frddr
Change-Id: I930c84b0520ff404c6a323be79b26102699c817b
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Sunny Luo [Mon, 2 Jul 2018 07:18:15 +0000 (15:18 +0800)]
spicc: fix clk polarity error of amlogic driver
PD#169301: spicc: fix clk polarity error of amlogic driver
Change-Id: Icb257e3394da94bd44cd78b63218161cfae63c69
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
Yong Qin [Thu, 21 Jun 2018 10:35:26 +0000 (18:35 +0800)]
cec: fix coverity code warning
PD#166957: cec: fix code coverity warning
Change-Id: Ic0671b76c0b9f1a1bb25d67c6e5255cba2a0835c
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
Kaifu Hu [Mon, 25 Jun 2018 11:53:57 +0000 (19:53 +0800)]
hdmitx: parsing the env of frac_rate_policy [2/2]
PD#165862: hdmitx: parsing the env of frac_rate_policy
Uboot add the env frac_rate_policy,and kernel pasring that.
Change-Id: I4db60059738cd15fd32d2def5a4330f14b9fb118
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
Nian Jing [Fri, 22 Jun 2018 12:13:56 +0000 (20:13 +0800)]
tvafe: atv default not support ntsc 50
PD#167487: atv default not support ntsc 50
Change-Id: I723f2cf1b26056a4adef39eb76a22596ac878e69
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
Nian Jing [Wed, 27 Jun 2018 02:19:50 +0000 (10:19 +0800)]
tvafe: add hardware snow for txhd
PD#167605: add hardware snow for txhd
Change-Id: Ibd16773ddb304c813ed62ee14e828b30806f158a
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
Yi Zeng [Mon, 28 May 2018 10:32:48 +0000 (18:32 +0800)]
mtd: avoid skip bad block in last part when add partition
PD#167168: mtd: avoid skip bad block in last part when add partition
Change-Id: Ice1e8246f22dd0d275c9ffdb64dcf9f165097bab
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
Hang Cheng [Thu, 21 Jun 2018 04:20:25 +0000 (12:20 +0800)]
hdmirx: optimize for devices which send signal slowly
PD#168494: hdmirx: optimize for devices which send signal slowly
1.avoid rapid phy reset interference signal recognition
2.add 3d information parse of edid
Change-Id: Iafa38bad6907f287c0e021d5fb32d11e43c489a0
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
Yong Qin [Fri, 15 Jun 2018 06:05:23 +0000 (14:05 +0800)]
cec: clean cec task function
PD#168415: cec: clean cec rx buffer check
1.for new chip version, needn't check rx
buffer
Change-Id: Ieb49508f2563fd6212f97163d0fbb5b73c5486c5
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
Dezhi Kong [Thu, 21 Jun 2018 00:28:07 +0000 (08:28 +0800)]
di: fix time out issue
PD#167967: di: fix time out issue
Change-Id: Ic535742a4227704e289372401aa077290ddd1ed7
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
Brian Zhu [Tue, 19 Jun 2018 14:09:47 +0000 (22:09 +0800)]
picdec: enable yuv 444 output for txlx
PD#168464: picdec: enable yuv 444 output for txlx
Change-Id: If19381ce88bf0f367fa5583b9d7045484ee22bf6
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
jianxin.pan [Fri, 29 Jun 2018 09:46:53 +0000 (17:46 +0800)]
debug: disable irq_check_en by default
PD#165796: disable irq_check_en by default, because it may affect some
benchmark results.
It can be enabled by debugfs:
echo 1 > /sys/kernel/debug/lockup/irq_check_en
Change-Id: I6c39a9a6fc2f372eb71e0c1a0872865079e758cb
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
Brian Zhu [Fri, 22 Jun 2018 19:26:30 +0000 (03:26 +0800)]
osd: use f2v to calc osd pps filter
PD#167129: osd: use f2v to calc osd pps filter
Change-Id: I31fe220071269733b317bed87719843de30372dc
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
Brian Zhu [Thu, 17 May 2018 10:55:05 +0000 (18:55 +0800)]
stb_dv: send the correct hdmi packet in dv/hdr/sdr mode
PD#166555: stb_dv: send the correct hdmi packet in dv/hdr/sdr mode
hdmitx must clear hdr and dv enable bits when changing mode
Change-Id: I76131c8bdbf1f6a0144d481453f0fa18b3f558d1
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Evoke Zhang [Fri, 29 Jun 2018 08:32:36 +0000 (16:32 +0800)]
arm64: deconfig: smarthome: enable VOUT2_SERVE
PD#165090: arm64: deconfig: smarthome: enable VOUT2_SERVE
Change-Id: I7e1e97aecbf95847e48de7f5e79acbf1cd75cd1f
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Evoke Zhang [Thu, 21 Jun 2018 10:05:15 +0000 (18:05 +0800)]
g12b: dts: update specified panel support for basic board [2/2]
PD#165090: g12b: dts: update specified panel support for basic board
Change-Id: Id26c312f5fabbdb8221e9cb2a0a2824cfd07c13b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
xingwei.zhou [Fri, 22 Jun 2018 08:41:34 +0000 (16:41 +0800)]
NANOQ: add nanoq reg in dts config
PD#165090: NANOQ: nanoq reg for sram and size
Change-Id: I29a9a698383c02ed527f3dc2b2cd5b03cf8dee53
Signed-off-by: xingwei.zhou <xingwei.zhou@amlogic.com>
Xingyu Chen [Wed, 20 Jun 2018 09:25:40 +0000 (17:25 +0800)]
keypad: add gpio and adc keypad support
PD#165090: keypad: add gpio and adc keypad support
Change-Id: Icf4ea20d8523eefa76abf70b8b844922ab1ca43e
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Hong Guo [Wed, 30 May 2018 02:07:33 +0000 (10:07 +0800)]
CPUFREQ: modify cpufreq driver.
PD#165090: cpufreq: modify cpufreq driver.
Change-Id: I8583acfd74a52629e40b39d5e53ea8b30a6b28e1
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
Brian Zhu [Tue, 19 Jun 2018 18:57:41 +0000 (02:57 +0800)]
isp: add isp_sc dts config
PD#165090: isp: add isp_sc dts config
Change-Id: Ia03722bbbccf71c6b404395dabe4a3c89b299bf2
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
Shunzhou Jiang [Mon, 11 Jun 2018 04:08:22 +0000 (12:08 +0800)]
clk: clock: compatible clk count for different platform [1/1]
PD#165090: clock: fix clk count error
Change-Id: I3b7c181e159b2a028ddc53e7c72066ec3633fd75
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
Nian Jing [Tue, 12 Jun 2018 11:59:44 +0000 (19:59 +0800)]
cvbs: adjust output amplitude
PD#165090: cvbs
Change-Id: I031cbb04bb380e53bef6e5a8928244dcfbe25877
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
Jiacheng Mei [Fri, 15 Jun 2018 13:00:48 +0000 (21:00 +0800)]
dts: expand isp cma and mv pinmux to dts
PD#165090: 1.expand isp cma to 256M
2.mv clk12_24_z_pins from dtsi to dts
Change-Id: I3b17ee594967ea95e28bb2edc9d8eaaf7d8349dd
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>
Jiacheng Mei [Thu, 7 Jun 2018 09:06:23 +0000 (17:06 +0800)]
dts: add isp & mipi dts
PD#165090: add isp & mipi dts
Change-Id: I98a46f48ddd62db40350f8717961c047b5230410
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>
Larson Jiang [Fri, 15 Jun 2018 03:17:41 +0000 (11:17 +0800)]
dts: g12b: enable wifi
PD#165090: enable wifi
Change-Id: I1f769540c40602dff3c56811a10249684792f046
Signed-off-by: Larson Jiang <larson.jiang@amlogic.com>
pengcheng chen [Mon, 11 Jun 2018 05:50:30 +0000 (13:50 +0800)]
osd: add mali-afbc decode error statistics
PD#165090: osd: add mali-afbc decode error statistics
Change-Id: Idb3c37944d3a0ac48422ab901416279fc458b00b
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
Jian Hu [Wed, 6 Jun 2018 13:16:04 +0000 (21:16 +0800)]
pinctrl: add clk12_24 pin mux
PD#165090: pinctrl: add clk12_24 pin mux
Change-Id: Ia1226fd74449b0317dd57018188d50b06cfa6a69
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Larson Jiang [Wed, 13 Jun 2018 07:40:48 +0000 (15:40 +0800)]
wifi/bt: enable wifi
PD#165090: enable wifi for g12b
Change-Id: I067b4ba84e0d40d2332059adc988495072a75d84
Signed-off-by: Larson Jiang <larson.jiang@amlogic.com>
Jian Hu [Wed, 6 Jun 2018 09:23:44 +0000 (17:23 +0800)]
clk: add gpio 12m and 24m for g12a/b
PD#165090: clk: add gpio 12m and 24m for g12a/b
Change-Id: I2a3e8ed2f318eb13375415939d6216b0f30103a3
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Zongdong Jiao [Tue, 12 Jun 2018 02:34:38 +0000 (10:34 +0800)]
hdmitx: optimize hpll suspend
PD#165090: hdmitx: optimize hpll suspend
The BIT definition of RESET / ENABLE in G12A is different from
earlier chips.
HPLL suspend workflow:
1. set RESET as 1
2. delay 50us
3. set ENABLE as 0
Resume workflow is inverse, but no need anymore, it will be set
in set_disp_mode_auto().
Change-Id: Iefc7f7f026562f566c8a40325c74a53f46465b02
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
jianxin.pan [Wed, 6 Jun 2018 12:04:56 +0000 (20:04 +0800)]
schedutil: limit up/down init rate
PD#165090: schedutil: limit up/down min rate
Change-Id: Ib3aa6653d56056298df05bdede2e2bf6aea46882
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
zhilei.wu [Thu, 7 Jun 2018 11:10:14 +0000 (19:10 +0800)]
ge2d: enhanced hsc adv num
PD#165090: ge2d: enhanced hsc adv num
Change-Id: Ib4026d6883e70ddf38ab4d093fd37827b98f6c5e
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
Jiyu Yang [Wed, 6 Jun 2018 13:20:34 +0000 (21:20 +0800)]
gdc: add gdc driver
PD#165090: gdc add platform drivers base on the arm release.
TODO use v4l2 m2m device driver rewrite.
Change-Id: I1943f762041d005c17abd9b803b69ef68b08d290
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
Brian Zhu [Fri, 8 Jun 2018 11:00:43 +0000 (19:00 +0800)]
vpp: enable pps last line dummy fixing for g12b
PD#165090: vpp: enable pps last line dummy fixing for g12b
Change-Id: I276d34c1864c4d5265162c6af092b63e1a92efb9
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
Shunzhou Jiang [Thu, 7 Jun 2018 09:26:12 +0000 (17:26 +0800)]
G12B: clock: fix mipi_csi_phy clk parent error
PD#165090: clock: Change parent clk name
Change-Id: Ib2a3416481f828e6ddb93ffaf6dc1dd26a2f6d78
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
zhilei.wu [Wed, 6 Jun 2018 12:39:38 +0000 (20:39 +0800)]
dv: enable dolby vision driver
PD#165090: dv: enable dolby vision driver
Change-Id: If4e0f899dbf57a179180ee994af2ddaed25c71ed
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
Jiacheng Mei [Wed, 6 Jun 2018 08:00:41 +0000 (16:00 +0800)]
base: add CONFIG_AMLOGIC_MODIFY for EXPORT_SYMBOL
PD#165090: EXPORT_SYMBOL for dma_alloc_from_contiguous && dma_release_from_contiguous
Change-Id: I99720292a02e3f3939bd3ad274daa82d8bc485b2
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>
xingwei.zhou [Tue, 5 Jun 2018 08:15:44 +0000 (16:15 +0800)]
G12B: NANOQ: nanoq dts and clock tree modify
PD#165090: NANOQ: modify a311d platform dts and add nanoq clock tree
Change-Id: I62419ade33c2e10a03d12f1fe26f7f54a44364a4
Signed-off-by: xingwei.zhou <xingwei.zhou@amlogic.com>
Evoke Zhang [Mon, 4 Jun 2018 06:10:14 +0000 (14:10 +0800)]
vpu: udpate vpu mem_pd control for g12b
PD#165090: vpu: udpate vpu mem_pd control for g12b
Change-Id: I7ac907d8b00e2ef0884082c3a56afc6b66dd00d5
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
pengcheng chen [Mon, 4 Jun 2018 10:10:25 +0000 (18:10 +0800)]
viu2: add viu2 rotate
PD#165090: viu2: add viu2 rotate
Change-Id: Ib9804f7113a8da9fd97c653fcf367b46db5af778
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
Nian Jing [Mon, 28 May 2018 09:15:24 +0000 (17:15 +0800)]
cvbs: add cvbs support for g12b
PD#165090: g12b cvbs
Change-Id: I04c26993d96af570a9d3a3bbabd4211d706081b1
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
Nan Li [Fri, 1 Jun 2018 03:35:21 +0000 (11:35 +0800)]
sd: optimize sd_uart support
PD#165090: optimize sd_uart pinmux dts.
Change-Id: I89b1d96dee01082d686a3517ef81d9c85e03f3c0
Signed-off-by: Nan Li <nan.li@amlogic.com>
Long Yu [Thu, 31 May 2018 08:42:49 +0000 (16:42 +0800)]
emmc: set co-phase 1 for Highspeed busmode
PD#165090: emmc: set co-phase 1 for Highspeed busmode
Change-Id: Ia2d925121ee101eb3c706b79eae6b0464a3087e4
Signed-off-by: Long Yu <long.yu@amlogic.com>
Jian Hu [Thu, 31 May 2018 08:21:03 +0000 (16:21 +0800)]
arm64: dts: g12b: enable saradc
PD#165090: arm64: dts: g12b: enable saradc
Change-Id: If480dcec3c6eea7d32a480fdeadd7140626a7ec0
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Yixun Lan [Fri, 29 Jun 2018 07:15:36 +0000 (00:15 -0700)]
Merge "base: EXPORT_SYMBOL for dma_alloc_from_contiguous && dma_release_from_contiguous" into amlogic-4.9-dev