Commit Graph

646611 Commits

Author SHA1 Message Date
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
Evoke Zhang
1241edd3bc 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>
2018-07-06 01:11:57 -07:00
Sunny Luo
157284b916 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>
2018-07-05 22:51:45 -07:00
wenbiao zhang
fbc8bd75e6 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>
2018-07-05 22:48:03 -07:00
Gongwei
5b851da867 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>
2018-07-05 19:50:30 -07:00
wei wang
611f19dfb9 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>
2018-07-05 19:18:10 -07:00
Matthew Shyu
fdb21d3613 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>
2018-07-05 06:42:46 -07:00
Yong Qin
2de19904f8 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>
2018-07-05 05:47:44 -07:00
Yi Zhou
3f042f7a3f 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 24557865c8
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>
2018-07-05 05:19:57 -07:00
Shunzhou Jiang
3b447a7155 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>
2018-07-05 05:16:33 -07:00
pengcheng chen
8330fd9a4a 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>
2018-07-05 16:38:31 +08:00
Nian Jing
590761c98f 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>
2018-07-05 01:16:10 -07:00
Jian Hu
1346a36b3f 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>
2018-07-05 14:44:01 +08:00
Shunzhou Jiang
a66b3c3abc 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>
2018-07-04 23:19:22 -07:00
Bencheng Jing
2d2870dd3f vlock: fix hdmi crash
PD#169483: vlock: fix hdmi crash

Change-Id: I0f2770f65789430f096e16637ba5b542bd670b16
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-07-04 22:36:52 -07:00
Nian Jing
838b871442 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>
2018-07-04 22:35:50 -07:00
Weiguang Ruan
a01ad754e6 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>
2018-07-04 22:33:59 -07:00
rongrong zhou
07fd155411 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>
2018-07-04 06:33:38 -07:00
Hang Cheng
cda6cea915 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>
2018-07-04 03:18:22 -07:00
Bencheng Jing
4df893b750 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>
2018-07-04 03:16:06 -07:00
wenbiao zhang
2d766ad31b 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>
2018-07-04 01:21:46 -07:00
liangzhuo.xie
36f3b8de0b dts: add w400 buildroot dts
PD#168687: add w400 buildroot dts

Change-Id: Ie2439ddee4df090014ec9bdb7b1f081a44233e0b
Signed-off-by: liangzhuo.xie <liangzhuo.xie@amlogic.com>
2018-07-04 01:21:23 -07:00
Qianggui Song
729bd5a565 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>
2018-07-04 01:11:14 -07:00