Commit Graph

638515 Commits

Author SHA1 Message Date
Bo Yang
800af4adb9 jtag: fix mistake on state setup
PD#141217: jtag: fix mistake on state setup

Change-Id: If58925679b73a5af0f767797897fd0805644d356
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2017-05-05 00:28:37 -07:00
KeLe Bai
a669b5209c di: enable cma
PD#143278: use cma instead of reserved memory

Change-Id: Ic7629c8efeb4ffb02e6c7ca9af70948a95578a7f
Signed-off-by: KeLe Bai <kele.bai@amlogic.com>
2017-05-05 00:02:59 -07:00
Pengcheng Chen
b31e4885f9 osd: enable cma for osd
PD#143278: enable cma for osd

Change-Id: Ie5d82b070759e7bdea0323b3f06ea65bfa842b46
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-05-04 04:27:14 -07:00
Evoke Zhang
207ce431d1 hdmitx: correct 1080i vinfo field_height to 540
PD#143444: correct 1080i vinfo field_height to 540

Change-Id: Ie20516f7462bf001946a219bd2fb8e4de36ef8d8
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2017-05-04 04:13:50 -07:00
Bo Yang
a7ac4b71cb jtag: remodify jtag control mode
PD#141217: jtag: remodify jtag control mode

Jtag can be configured by boot parameter or device tree.
The boot parameter is prior to device tree.

If the gpios usded by jtag are in conflict with other module,
jtag will be failed to setup successfully.
It's not forced to remove the conflict.

The mmc_notify.h fot jtag is removed.
A new notify framework for jtag will be added in the future.

Change-Id: Iaedf3d4eb712192906b9cfe046a0cd408bfc169f
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2017-05-04 01:18:56 -07:00
Zongdong Jiao
d2c454706a hdmitx: hpd: trigger a HPD signal
PD#142803: trigger HPD signal to start reading EDID

Change-Id: I438e8159f76a7338079e5a9a2120225491549feb
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2017-05-03 22:23:56 -07:00
Tao Zeng
18e2ff6cc9 PD#143278: mm: increase default cma area size
1. default cma area size is 7, not enough for aml;
2. open cma debug sysfs.

Change-Id: I7937b3e1ca30b061ee7e0e00d8aea9abf712dc39
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2017-05-04 10:59:13 +08:00
Pengcheng Chen
13314e638e ge2d: merge ge2d code from amlogic-3.14-dev
PD#138714: merge ge2d code from amlogic-3.14-dev
1. add hwc ge2d compose mode
2. add txlx ge2d support
3. ge2d: fix ge2d destroy block issue
4. ge2d: fix green line issue

Change-Id: If21dcc41b61e70e5a49c1186d2410bd780f9bad5
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-05-03 07:05:24 -07:00
Pengcheng Chen
9dd0ee7708 osd: merge osd code from amlogic-3.14-dev
PD#138714: merge osd code from amlogic-dev-3.14
1. add osd direct render function
2. add txlx support
3. osd block issue when reboot
4  osd fix cursor out of UI screen border in 4K & cvbs mode

Change-Id: I1df3a2b424647e39986eaad88c319acee82eecd3
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-05-03 06:57:49 -07:00
Jianxin Pan
52ec2af13f reboot: add reboot driver for m8b
PD#141217: add reboot driver for m8b

Change-Id: I99201af1d13744278b30e11f37f1551ad3289ca3
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-05-02 03:01:54 -07:00
Jianxin Pan
7409424495 defconfig: meson32/64: generate meson32/64_defconfig with savedefconfig
PD#138714: generate meson32/64_defconfig with savedefconfig

Change-Id: Ibff2144142efd28da6f9d03667128b4ab3df5f55
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-05-02 02:59:15 -07:00
Yonghui Yu
1d908a31a9 nand: porting mtd for a111
PD#141217: porting env_old & key_old.

Change-Id: I30f43a5eb54531da5df307bd6a114c878ca03a24
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
2017-05-02 01:41:53 -07:00
Nanxin Qin
3ca7b09aa4 vpu: change vpu_intr clk gate init from mesonstream to vpu.
PD#143250: fix the osd can not open when the play end.

Change-Id: I2d76ea05316c15d2c5c51741757cc7ba4521a20b
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2017-05-02 01:05:15 -07:00
Jiamin Ma
543affd5f8 cpufreq: fix err reading of cur cpu freq after reboot
PD#141217: cpufreq: notify the update of armclk if sysclk is updated

Change-Id: If03de0741e8b8fe1e5ff5ff7859753b6fe24f07e
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-05-02 14:29:10 +08:00
Tao Zeng
afb6155beb PD#138714: cec: add wakeup source for cec driver
use kernel wake up api for cec driver

Change-Id: I181bf0adcd14d20b71ef2a10bb169f131e6bec5d
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2017-05-01 23:01:51 -07:00
Haibing.An
b83b4ba8e3 dts: m400: add audio sound card
PD#141217: add audio sound card for M400

Change-Id: I1d20964c187c785c0da708ca01a490f49357ae20
Signed-off-by: Haibing.An <haibing.an@amlogic.com>
2017-04-28 02:10:04 -07:00
Bo Yang
e0cf5e4be0 defconfig: meosn32: enable watchdog for m8baby
PD#141217: defconfig: select CONFIG_MESON_WATCHDOG for m8baby

Change-Id: I8a956de9da2e6120c0bf4e9d894c0d30422cd14b
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2017-04-28 01:58:20 -07:00
Bo Yang
5a066ccfa9 led: add sys led support for m8baby
PD#141217: led: add sys led support for m8baby

Default disable sysled, because the io used by
sysled is conflicted with uart.

Change-Id: I0547711bae1e043726f5b205fdc514476b4025de
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2017-04-28 01:12:53 -07:00
Jianxin Pan
8ea33e5fc1 Revert "wifi: wifi work over sdio controller"
Wifi and sd card can not be ok at the same time because of sdio driver
problems.

Remove wifi to enable sd before sdio driver is correct.

This reverts commit 97c2d30b4b.

Change-Id: Ia439b0dff3ef7e0822ae8be3bb9502fb272e3864
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-04-28 00:07:07 -07:00
Bo Yang
63e326e8b3 jtag: add jtag support for m8baby
PD#141217: jtag: add jtag support for m8baby

Add new property select: disable|apao|apee.
Param jtag= is prior to dt select property.

Change-Id: I1633f672b27bb3b510a3fc0a7c5cad7af6f6005a
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2017-04-27 22:29:22 -07:00
Larson Jiang
2a4027beaa dst: gxl/gxm: enable uart_a and uart_b
PD#138714 : enable uart_a and uart_b

Change-Id: I5f16deaf50965b03039eacfb061a17818336bc77
Signed-off-by: Larson Jiang <larson.jiang@amlogic.com>
2017-04-27 20:40:59 -07:00
Qi Duan
e3806baea2 usb: usb compile buildin. 1/1
PD#138714: usb compile buildin
1.usb compile buildin
2.otg port mode is host default.
3.Can force device mode by get env. otg_device=1
4.default add config gadget:mtp,ffs,rndis

Change-Id: I613da307f904c58fba102d163e97dbaa253fb2a8
Signed-off-by: Qi Duan <qi.duan@amlogic.com>
2017-04-27 05:15:26 -07:00
Larson Jiang
97c2d30b4b wifi: wifi work over sdio controller
PD#138714: wifi work over sdio controller

Change-Id: I51997e23e4409565dacdd68972133048ed72d483
Signed-off-by: Larson Jiang <larson.jiang@amlogic.com>
2017-04-27 03:27:28 -07:00
Larson Jiang
75623db85c PD#138714: add bt/wifi config
Change-Id: Id1e0fcc80f7aa25db1768ac4c5e5987ba2dff4e3
Signed-off-by: Larson Jiang <larson.jiang@amlogic.com>
2017-04-27 17:14:36 +08:00
Ao Xu
522e990f33 defconfig: meson32: enable net configs
PD#141217: enable net configs
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=y
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=y
+CONFIG_XFRM_USER=y
+CONFIG_NET_KEY=y
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=y
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_ESP=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_TUNNEL=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_NETFILTER=y
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=y
+CONFIG_NF_CONNTRACK_FTP=y
+CONFIG_NF_CONNTRACK_H323=y
+CONFIG_NF_CONNTRACK_NETBIOS_NS=y
+CONFIG_NF_CONNTRACK_PPTP=y
+CONFIG_NF_CONNTRACK_SANE=y
+CONFIG_NF_CONNTRACK_TFTP=y
+CONFIG_NF_CT_NETLINK=y
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
+CONFIG_NETFILTER_XT_TARGET_MARK=y
+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
+CONFIG_NETFILTER_XT_TARGET_TPROXY=y
+CONFIG_NETFILTER_XT_TARGET_TRACE=y
+CONFIG_NETFILTER_XT_MATCH_COMMENT=y
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
+CONFIG_NETFILTER_XT_MATCH_HELPER=y
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
+CONFIG_NETFILTER_XT_MATCH_LENGTH=y
+CONFIG_NETFILTER_XT_MATCH_LIMIT=y
+CONFIG_NETFILTER_XT_MATCH_MAC=y
+CONFIG_NETFILTER_XT_MATCH_POLICY=y
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA=y
+CONFIG_NETFILTER_XT_MATCH_SOCKET=y
+CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
+CONFIG_NETFILTER_XT_MATCH_STRING=y
+CONFIG_NETFILTER_XT_MATCH_TIME=y
+CONFIG_NETFILTER_XT_MATCH_U32=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_NAT_IPV4=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_MATCH_AH=y
+CONFIG_IP_NF_MATCH_ECN=y
+CONFIG_IP_NF_MATCH_TTL=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_RAW=y
+CONFIG_IP_NF_ARPTABLES=y
+CONFIG_IP_NF_ARPFILTER=y
+CONFIG_IP_NF_ARP_MANGLE=y
+CONFIG_NF_CONNTRACK_IPV6=y
+CONFIG_NF_NAT_IPV6=y
+CONFIG_IP6_NF_IPTABLES=y
+CONFIG_IP6_NF_FILTER=y
+CONFIG_IP6_NF_TARGET_REJECT=y
+CONFIG_IP6_NF_MANGLE=y
+CONFIG_IP6_NF_RAW=y
+CONFIG_L2TP=y
+CONFIG_L2TP_DEBUGFS=y
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=y
+CONFIG_L2TP_ETH=y
+CONFIG_BRIDGE=y
+# CONFIG_BRIDGE_IGMP_SNOOPING is not set
+CONFIG_PHONET=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=y
+CONFIG_NET_SCH_INGRESS=y
+CONFIG_NET_CLS_U32=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_U32=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=y
+CONFIG_NET_ACT_MIRRED=y

Change-Id: I1ec756db193d335b363ea2a8adfcb458fa73c213
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2017-04-27 00:16:07 -07:00
Yonghui Yu
ac4c9b12bf nand: fix wait ready condition for samsung slc.
PD#142961: only status[7] of samsung indicate the R/B status, as others
using status[6:7].

Change-Id: I6b6030c868f81e250b4c96629025c1aeeb7b7d65
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
2017-04-26 23:03:30 -07:00
Xingyu Chen
f2821d4899 saradc: add interface to switch input voltage for ch7
PD#138714: add interface to switch input voltage for ch7

add /sys/class/saradc/ch7_mux

Change-Id: I5e1ef3666f76ff38fa2f1878c06dad5108be67e0
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2017-04-26 21:38:35 -07:00
Jiamin Ma
4e6661c904 compiler: solve section mismatch warning during compiling
PD#141217: compiler: solve section mismatch warning during compiling

Change-Id: Ifde0e48a08b61bf19cbe763f6accaf7cb9b53bc5
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-04-27 12:30:19 +08:00
Xingyu Chen
1de5a5d17c remote: report wakeup event after system resume
PD#138714: report wakeup event after system resume

Change-Id: Ie51f6594a7e27c207dee48e82538343888f781cc
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2017-04-26 20:09:58 -07:00
Qiufang Dai
c459e072c6 PM / sleep: Re-implement legacy early_suspend.
PD#138714: Re-implement legacy early_suspend for Amlogic driver.

1. re-implement early_suspend mechanism for legacy early_suspend driver code.
   The early_suspend/late_resume can be trigger via cmd:
   echo 1/0 > /sys/power/eary_suspend_trigger

2. Register wakeup source and report wakeup event for Remoute KEY_POWER

Change-Id: I07ba9861aa0c0c1126238e84248948f7707e9ae2
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2017-04-26 20:05:30 -07:00
Xing Wang
f6e11697b0 audio: config audio for m8b
PD#141217: audio: config audio for m8b

Change-Id: If837cf19bf3da0e54830fefd2267fd14445ca6f1
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-04-26 07:41:02 -07:00
Xing Wang
b8db114aca audio: fix pcm bclk
PD#141217: fix pcm bclk following sample rate, pcm format and slot number

Change-Id: I4e1547c6c7c133a46a8c8b9a9d595adb7aa2771c
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-04-26 06:50:49 -07:00
Yun Cai
f4bf7b7800 dts: add axg dts file
PD#142470: add dts for axg pxp

Change-Id: I0d5c77368b0583fcfa046f4c01ac936704e96434
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-04-26 04:28:13 -07:00
Larson Jiang
3b025d7ff5 bt: add bt support
PD#138714: initial add bt support for gxl and m8b

Change-Id: Ia243a220ec87ff7bb6242f21e8372b90a4f6456b
Signed-off-by: Larson Jiang <larson.jiang@amlogic.com>
2017-04-26 01:18:30 -07:00
Jianxin Pan
9d8654673c defconfig: meson32: enable CONFIG_DEBUG_INFO
PD#141217: enable CONFIG_DEBUG_INFO to add -g to KBUILD_CFLAGS

Change-Id: I4fa030ec02729d58ff5076c3ccf1e6c50385c1a5
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-04-26 00:10:24 -07:00
Yun Cai
d80fa6e36d clk: add clock measure for m8b
PD#141217: clkmsr support m8baby

Change-Id: Id7e471353f235a6b8f69d46ed0250afe4479990d
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-04-25 23:54:04 -07:00
Yun Cai
224e893fbb clk: m8b add clks for mpll/media/gpu/misc/store/test
PD#141217: add mpll/media/gpu/misc/store/test clks for meson8b

Change-Id: I95268d46395d78419d311f1b9a5add9c593da810
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-04-26 14:19:58 +08:00
Xuhua Zhang
e6f70bd47b i2c: modify i2c config on gxl&gxm.
PD#138714: fix i2c error on gxl/gxm

Change-Id: Ic1e8685b4cf853749808707266d0cec98db99496
Signed-off-by: Xuhua Zhang <xuhua.zhang@amlogic.com>
2017-04-25 16:11:32 +08:00
Zan Peng
aa49a5ed73 remote: add remote driver to meson8b
PD#141217: enable remote driver for meson8b

Change-Id: I0c09ce5a71fdc34eb010d03efd35be683c8d224c
Signed-off-by: Zan Peng <zan.peng@amlogic.com>
2017-04-24 19:34:13 -07:00
Jian Hu
5b92a08fd6 pwm: update pwm driver
PD#138714: update pwm driver

update driver for gxtvbb/gxl/gxm/txl dts parse error

Change-Id: I673e791f1ec46aba2a1916cafeb01526dd90505d
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2017-04-23 23:40:14 -07:00
Yun Cai
9a06b057e8 dts: add gxl skt dts
PD#138714: add gxl_skt.dts

Change-Id: I0ca48f72267eed4f7f4dc2264c7e88483744740f
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-04-21 20:00:02 +08:00
Frank Chen
1b3655bb46 dts: fix i2c pinmux for gxl
PD#138714: fix i2c pinmux

Change-Id: I8956c0910a643ecddea72b6585445d14810850f7
Signed-off-by: Frank Chen <frank.chen@amlogic.com>
2017-04-21 02:19:52 -07:00
Evoke Zhang
c7e263e9af vout: remove FB config for axis sysfs node
PD#138714: remove FB config for axis sysfs node

Change-Id: I2f8c657ef46d184062bb2b09fbc0f2a1ba0770e1
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2017-04-21 00:31:14 -07:00
Victor Wan
d935baa065 Merge branch 'android-4.9' into amlogic-4.9-dev
Conflicts:
	fs/ext4/inode.c
2017-04-21 15:25:31 +08:00
MingLiang Dong
2286b5158a amvecm: add amvecm driver
PD#138714: add amvecm driver

Change-Id: Ieb0be7a4b02b7a8daa549544a97ee23e0daeb6da
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2017-04-21 14:23:19 +08:00
Evoke Zhang
73f330b0b8 hdmitx: update vmode_is_supported function to avoid invalid mode setting
PD#138714: update vmode_is_supported function to avoid invalid mode setting,
adjust hdmitx probe before vout serve.
also add NULL pointer protection in vout serve API.

Change-Id: I0815dfe35fa00ae8805d0ab6a9ae7b189a1b2af5
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2017-04-20 22:17:21 -07:00
Jianxin Pan
7fca780826 Merge "osd: free uboot logo memory when kernel loaded" into amlogic-4.9-dev 2017-04-20 22:17:10 -07:00
Pengcheng Chen
518bb18904 osd: free uboot logo memory when kernel loaded
PD#139665: free uboot logo memory when kernel loaded

Change-Id: I78c46946f3a06078a41491196a79f72e56cdc795
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-04-20 22:11:31 -07:00
Jin Qian
67f252c89d ANDROID: uid_sys_stats: reduce update_io_stats overhead
Replaced read_lock with rcu_read_lock to reduce time that preemption
is disabled.

Added a function to update io stats for specific uid and moved
hash table lookup, user_namespace out of loops.

Bug: 37319300
Change-Id: I2b81b5cd3b6399b40d08c3c14b42cad044556970
Signed-off-by: Jin Qian <jinqian@google.com>
2017-04-20 21:47:08 +00:00
Jiebing Li
6b4bbab071 ANDROID: usb: gadget: fix MTP enumeration issue under super speed mode
MTP function doesn't show as a drive in Windows when the device
is connected to PC's USB3 port, because device fails to respond
ACK to BULK OUT transfer request.

This patch modifies MTP OUT request length as multiple of MaxPacketSize
per databook requirement in order to fix this issue.

Patchset: mtp

Change-Id: I090d7880ff00c499dc5ba7fd644b1fe7cd87fcb5
Signed-off-by: Jiebing Li <jiebing.li@intel.com>
Signed-off-by: Wang, Yu <yu.y.wang@intel.com>
Signed-off-by: Russ Weight <russell.h.weight@intel.com>
2017-04-20 12:43:54 -07:00