Nan Li [Wed, 28 Mar 2018 06:27:06 +0000 (14:27 +0800)]
sd: del sd no-use caps on g12a dts.
PD#162559: remove sd no-use caps, or UHS-I SD card will init
fail on g12a.
Change-Id: Ib4fede1e03fce87ad9766370b405eb34054f97e0
Signed-off-by: Nan Li <nan.li@amlogic.com>
Yalong Liu [Sun, 8 Apr 2018 09:19:18 +0000 (17:19 +0800)]
drm: add vblank sent while disable crtc
PD#163846: add vblank sent while disable crtc
shutdown results in hung atomic commit cause DRM hangup a few secs
Change-Id: I54dcbe33b05ab9cb3487ae0509ce23e61e67a4ca
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
pengcheng chen [Mon, 9 Apr 2018 07:32:49 +0000 (15:32 +0800)]
osd_drm: fix osd drm vsync irq error
PD#160546: osd_drm: fix osd drm vsync irq error
Change-Id: Ieebc611553142ccc41052d1395f323f693b9330a
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
Brian Zhu [Fri, 6 Apr 2018 14:15:16 +0000 (22:15 +0800)]
vpp: adjust the max process height by checking vpu clk
PD#163431: vpp: adjust the max process height by checking vpu clk
Change-Id: Ic7c264d9b287839a457b0cd4e2f090b459739a80
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
Ruixuan Li [Mon, 2 Apr 2018 03:37:27 +0000 (11:37 +0800)]
emmc: add dtb backup machinisim
PD#162119: emmc: add dtb backup machinisim
Change-Id: Ie8fd8f1a72f0e04c2ceacf5338add3c5c3862b84
Signed-off-by: Ruixuan Li <ruixuan.li@amlogic.com>
Tong Li [Mon, 9 Apr 2018 04:16:31 +0000 (12:16 +0800)]
g12a_u220_v1: g12a_u220_v1 bring up.[2/3]
PD#163870: g12a_u220_v1 bring up.
Change-Id: I9347c8f955c09186092ce73364378e2ff13956d0
Signed-off-by: Tong Li <tong.li@amlogic.com>
wenfeng.guo [Wed, 7 Mar 2018 11:34:52 +0000 (19:34 +0800)]
amvecm: modify dnlp algorithm
PD#161646: amvecm: modify dnlp algorithm
1. separate dnlp algorithm to dnlp_cal.c
2. modify dnlp algorithm
3. add dnlp curve debug interface
Change-Id: Ic5dd20f606b6cd612897c30ec09c6f0535ffefca
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
Zhe Wang [Thu, 5 Apr 2018 12:30:54 +0000 (20:30 +0800)]
audio & hdmi-rx: add hdmi-rx audio fifo reset and hdmi audio status[1/2]
PD#161408: reset hdmi-rx audio fifo
add hdmi audio status for audio driver.
Change-Id: I6616301b2468204d4c0d56162b11f3efedd0650e
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
Nanxin Qin [Thu, 22 Mar 2018 20:53:36 +0000 (04:53 +0800)]
frame_sync: the pcr value may be negative that should be avoided
PD#162854: the pcr value may be negative that should be avoided
Change-Id: I66fbe8866a23458ff1da9e2ec38ace8ae6325d48
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
libo [Wed, 4 Apr 2018 07:35:13 +0000 (15:35 +0800)]
bluetooth: fix some coverity error
PD#163690: driver defects cleanup
#254
#361
Change-Id: I6ba110926488bc598c37b462edbb3a1dee56a2dd
Signed-off-by: libo <bo.li@amlogic.com>
Tong Li [Mon, 2 Apr 2018 11:07:17 +0000 (19:07 +0800)]
u211: u211 net led open.[1/3]
PD#163344:
u211 net led open.
Change-Id: I4f99c9134f47f2e56a2ee1c76fa9b31252aa011b
Signed-off-by: Tong Li <tong.li@amlogic.com>
Qiufang Dai [Fri, 30 Mar 2018 13:47:16 +0000 (21:47 +0800)]
clk: update g12a pll parameters for Note 2.7
PD#163494: clk: update g12a sys/hifi/pcie/gp0 pll parameters
Change-Id: Ia1485943570614732c9f8e785d4cf0e50473f04e
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
Weiming Liu [Mon, 2 Apr 2018 06:10:06 +0000 (14:10 +0800)]
lcd: mipi_dsi parse error init_table gpio type
PD#163487: lcd: mipi_dsi parse error init_table gpio type
Change-Id: I32ebb84eb4804be65ff5548d3a0d78e271ea3956
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
Jian Wang [Mon, 12 Mar 2018 12:20:14 +0000 (20:20 +0800)]
ionvideo: fix ionvideo_thread panic [1/1]
PD# 161775: fix ionvideo_thread panic
merge from jintao.xu 3.14 jane commit:
[PATCH] NEEDLEPLAT-4635: fix ionvideo_thread panic[1/1]
[Problem]
Kernel panic (ionvideo_thread+0x5ac/0x6bc) in the field
[Solution]
Add ge2d timeout protect
[Platform]
Needle/Stark
[Test]
Change-Id: Iee8a6930bbb6b3a140db73e74aa287f2367b71b0
Signed-off-by: Jian Wang <jian.wang@amlogic.com>
Sebastian Andrzej Siewior [Thu, 11 Jan 2018 17:57:26 +0000 (18:57 +0100)]
serial: core: mark port as initialized after successful IRQ change
PD#163025: fix pwq null pointer
commit
44117a1d1732c513875d5a163f10d9adbe866c08 upstream.
setserial changes the IRQ via uart_set_info(). It invokes
uart_shutdown() which free the current used IRQ and clear
TTY_PORT_INITIALIZED. It will then update the IRQ number and invoke
uart_startup() before returning to the caller leaving
TTY_PORT_INITIALIZED cleared.
The next open will crash with
| list_add double add: new=
ffffffff839fcc98, prev=
ffffffff839fcc98, next=
ffffffff839fcc98.
since the close from the IOCTL won't free the IRQ (and clean the list)
due to the TTY_PORT_INITIALIZED check in uart_shutdown().
There is same pattern in uart_do_autoconfig() and I *think* it also
needs to set TTY_PORT_INITIALIZED there.
Is there a reason why uart_startup() does not set the flag by itself
after the IRQ has been acquired (since it is cleared in uart_shutdown)?
Change-Id: I8c86b0aeb36986195276d94abd68917a08758a3e
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Sebastian Andrzej Siewior [Sat, 3 Feb 2018 11:27:23 +0000 (12:27 +0100)]
serial: core: mark port as initialized in autoconfig
PD#163025: fix pwq null pointer
commit
714569064adee3c114a2a6490735b94abe269068 upstream.
This is a followup on
44117a1d1732 ("serial: core: mark port as
initialized after successful IRQ change").
Nikola has been using autoconfig via setserial and reported a crash
similar to what I fixed in the earlier mentioned commit. Here I do the
same fixup for the autoconfig. I wasn't sure that this is the right
approach. Nikola confirmed that it fixes his crash.
Change-Id: I33f2d6abd165db80a23eafe812634475e9b62865
Fixes:
b3b576461864 ("tty: serial_core: convert uart_open to use tty_port_open")
Link: http://lkml.kernel.org/r/20180131072000.GD1853@localhost.localdomain
Reported-by: Nikola Ciprich <nikola.ciprich@linuxbox.cz>
Tested-by: Nikola Ciprich <nikola.ciprich@linuxbox.cz>
Cc: <stable@vger.kernel.org>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Tested-by: Nikola Ciprich <nikola.ciprich@linuxbox.cz>
Acked-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Sahara [Wed, 13 Dec 2017 05:10:48 +0000 (09:10 +0400)]
pty: cancel pty slave port buf's work in tty_release
PD#163025: fix pwq null pointer
[ Upstream commit
2b022ab7542df60021ab57854b3faaaf42552eaf ]
In case that CONFIG_SLUB_DEBUG is on and pty is used, races between
release_one_tty and flush_to_ldisc work threads may happen and lead
to use-after-free condition on tty->link->port. Because SLUB_DEBUG
is turned on, freed tty->link->port is filled with POISON_FREE value.
So far without SLUB_DEBUG, port was filled with zero and flush_to_ldisc
could return without a problem by checking if tty is NULL.
CPU 0 CPU 1
----- -----
release_tty pty_write
cancel_work_sync(tty) to = tty->link
tty_kref_put(tty->link) tty_schedule_flip(to->port)
<< workqueue >> ...
release_one_tty ...
pty_cleanup ...
kfree(tty->link->port) << workqueue >>
flush_to_ldisc
tty = READ_ONCE(port->itty)
tty is 0x6b6b6b6b6b6b6b6b
!!PANIC!! access tty->ldisc
Unable to handle kernel paging request at virtual address
6b6b6b6b6b6b6b93
pgd =
ffffffc0eb1c3000
[
6b6b6b6b6b6b6b93] *pgd=
0000000000000000, *pud=
0000000000000000
------------[ cut here ]------------
Kernel BUG at
ffffff800851154c [verbose debug info unavailable]
Internal error: Oops - BUG:
96000004 [#1] PREEMPT SMP
CPU: 3 PID: 265 Comm: kworker/u8:9 Tainted: G W 3.18.31-g0a58eeb #1
Hardware name: Qualcomm Technologies, Inc. MSM 8996pro v1.1 + PMI8996 Carbide (DT)
Workqueue: events_unbound flush_to_ldisc
task:
ffffffc0ed610ec0 ti:
ffffffc0ed624000 task.ti:
ffffffc0ed624000
PC is at ldsem_down_read_trylock+0x0/0x4c
LR is at tty_ldisc_ref+0x24/0x4c
pc : [<
ffffff800851154c>] lr : [<
ffffff800850f6c0>] pstate:
80400145
sp :
ffffffc0ed627cd0
x29:
ffffffc0ed627cd0 x28:
0000000000000000
x27:
ffffff8009e05000 x26:
ffffffc0d382cfa0
x25:
0000000000000000 x24:
ffffff800a012f08
x23:
0000000000000000 x22:
ffffffc0703fbc88
x21:
6b6b6b6b6b6b6b6b x20:
6b6b6b6b6b6b6b93
x19:
0000000000000000 x18:
0000000000000001
x17:
00e80000f80d6f53 x16:
0000000000000001
x15:
0000007f7d826fff x14:
00000000000000a0
x13:
0000000000000000 x12:
0000000000000109
x11:
0000000000000000 x10:
0000000000000000
x9 :
ffffffc0ed624000 x8 :
ffffffc0ed611580
x7 :
0000000000000000 x6 :
ffffff800a42e000
x5 :
00000000000003fc x4 :
0000000003bd1201
x3 :
0000000000000001 x2 :
0000000000000001
x1 :
ffffff800851004c x0 :
6b6b6b6b6b6b6b93
Change-Id: I5ed9952cc1c9e20111546c9e50219823a06c82df
Signed-off-by: Sahara <keun-o.park@darkmatter.ae>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Gaurav Kohli [Tue, 23 Jan 2018 07:46:34 +0000 (13:16 +0530)]
tty: fix data race between tty_init_dev and flush of buf
PD#163025: fix pwq null pointer
commit
b027e2298bd588d6fa36ed2eda97447fb3eac078 upstream.
There can be a race, if receive_buf call comes before
tty initialization completes in n_tty_open and tty->disc_data
may be NULL.
CPU0 CPU1
---- ----
000|n_tty_receive_buf_common() n_tty_open()
-001|n_tty_receive_buf2() tty_ldisc_open.isra.3()
-002|tty_ldisc_receive_buf(inline) tty_ldisc_setup()
Using ldisc semaphore lock in tty_init_dev till disc_data
initializes completely.
Change-Id: I8a9d58a674e0267c2eda3c6bf58c7510e86e3b33
Signed-off-by: Gaurav Kohli <gkohli@codeaurora.org>
Reviewed-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jiamin Ma [Thu, 29 Mar 2018 10:56:01 +0000 (18:56 +0800)]
defect: driver defect cleanup
PD#163273: driver defect cleanup
435
477
478
479
480
482
485
486
487
488
555
573
594
617
648
650
678
855
Change-Id: Ifb2d89576e4cbb77449732d79f688c970bb0dca1
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
Dezhi Kong [Wed, 7 Mar 2018 12:06:08 +0000 (20:06 +0800)]
di: optimize di buf optimization
PD#161171: optimize di buf optimization
1.optimize di buf queue operation
2.add di task semaphone check
Change-Id: Ia60d1ebd57d839fb1783b1257d82300469038415
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
xianjun.liu [Thu, 29 Mar 2018 08:46:23 +0000 (16:46 +0800)]
emmc: fix coverity question in kernel_4.9
PD#163327: emmc: fix coverity question in kernel_4.9
coverity id: #698 #729 #546 #456 #446 #531 #862
Change-Id: Iac65949972de4ce5388730a703432f8213af2f69
Signed-off-by: xianjun.liu <xianjun.liu@amlogic.com>
Long Yu [Fri, 23 Mar 2018 03:31:39 +0000 (11:31 +0800)]
sdio: Adjust the location of the GXL best sampling point
PD#160789: sdio: optimizing the selection of sdio tuning sampling points
[problem] When all sampling points can be sampled correctly,
select 0 points as the best sampling point.M8 platform is normal,
but some S905 platform is not suitable.
[resolved] The GXL platfoarm selects the intermediate
point of all sampling points as the best sampling point
Change-Id: I59097daa8fe3d99f2f11a3e1347945c8eea4e1c9
Signed-off-by: Long Yu <long.yu@amlogic.com>
Chao Liu [Wed, 28 Mar 2018 05:44:00 +0000 (13:44 +0800)]
dts: add the attestationkeybox of unifykey[1/3]
PD#162644: Attestation key burn tool development
Change-Id: I53903436560957026b8dc1ab4b72c48b4b160399
Signed-off-by: Chao Liu <chao.liu@amlogic.com>
Qi Duan [Tue, 28 Mar 2017 02:21:22 +0000 (10:21 +0800)]
usb: compliance test partner
PD#163486: usb: compliance test parnter
Change-Id: If4f82e9a131af59187fed7df39b12630cb8db0f8
Signed-off-by: Qi Duan <qi.duan@amlogic.com>
kele bai [Wed, 28 Mar 2018 09:01:20 +0000 (17:01 +0800)]
di vpp: merge vskip condition from 3.14
PD#162624: di,vpp: merge vskip condition from 3.14
Change-Id: I2749a35758df814d4bf28806f7a9745801a0afbe
Signed-off-by: kele bai <kele.bai@amlogic.com>
Qiufang Dai [Fri, 30 Mar 2018 09:08:53 +0000 (17:08 +0800)]
clk: low clk mux printk message
PD#163212: clk: low clk mux printk message
make the printk message at debug level
Change-Id: Id7e7864755be4f8809e5c44d5eeea2f6a7c4b5c3
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
Signed-off-by: Jiyu Yang <jiyu.yang@amlogic.com>
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
tao zeng [Mon, 26 Mar 2018 02:54:55 +0000 (10:54 +0800)]
ddr: add driver for ddr bandwidth measure
PD#161475: ddr : add driver for ddr bandwidth measure
1. change dtsi for related chips;
2. porting driver for each dmc contoller;
3. export sysfs for debug and upper layer.
Change-Id: Iaac6ac671bae26d9bff9c7a480ef44e2b0912b3c
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
yicheng shen [Fri, 30 Mar 2018 07:39:35 +0000 (15:39 +0800)]
hdmirx: fix Coverity errors
PD#163391: hdmirx: fix Coverity errors
#629
#633~640
#643
#587
#691~692
#715
#721
#757~759
#761
#601
#861
Change-Id: I088bc5f13bcad837e26d6216363063cad2ac497c
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
Yi Zhou [Mon, 26 Mar 2018 07:53:21 +0000 (15:53 +0800)]
hdmitx: add prbs debug function
PD#163020: hdmitx: add prbs debug function
method(in kernel):
echo 444,8bit > /sys/class/amhdmitx/amhdmitx0/attr
echo 1080p60hz > /sys/class/display/mode
echo prbs > /sys/class/amhdmitx/amhdmitx0/debug
Change-Id: I07fe69166383105ec3df74fc7df24b95b1a3ab84
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Yi Zhou [Wed, 28 Mar 2018 11:23:14 +0000 (19:23 +0800)]
hdmitx: clean up deadcode
PD#163222: hdmitx: clean up deadcode
#457
#491~530
#579
#608
#610
#624~642
#842~843
Change-Id: I939566450c2c18ade53d4d7e6a264dccc4982872
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
hongmin hua [Tue, 27 Mar 2018 11:40:05 +0000 (19:40 +0800)]
cec: add the control of arc line[1/2]
PD#159184: cec: add the control of arc line
add audio control interface for switch
Change-Id: I7981451c449435e5974c8321d99fc6c31e66f957
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
Tong Li [Fri, 30 Mar 2018 05:47:55 +0000 (13:47 +0800)]
g12a_s905d2_skt: set the spicc1 disabled.[1/1]
PD#NONE:set the spicc1 disabled.
Change-Id: Ide96ade1278475d80548e87fa94361308ce7d2ba
Signed-off-by: Tong Li <tong.li@amlogic.com>
Xing Wang [Mon, 26 Mar 2018 03:31:07 +0000 (11:31 +0800)]
audio: auge: fix oe pin setting
PD#162710: audio: auge: fix oe pin setting
Change-Id: Ia3a19b1887a60653a1b1bd13018808496ce6f595
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Xing Wang [Tue, 27 Mar 2018 08:40:22 +0000 (16:40 +0800)]
audio: auge: share buffer only for playback
PD#162769: audio: auge: share buffer only for playback
Change-Id: I5313a52ef493ee699a173370a82657bf27a43008
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Bencheng Jing [Thu, 29 Mar 2018 04:17:20 +0000 (12:17 +0800)]
amvecm: optimize gamma table write
PD#163289: amvecm: optimize gamma table write
Change-Id: I2e97b37084c78a0dfb7109c4aeef8898c2bf94c6
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
Huan Biao [Fri, 23 Mar 2018 09:11:52 +0000 (17:11 +0800)]
dts: cooldev: enable gpu cooling devices.
PD#160967: dts: cooldev: enable g12a gpu cooling devices.
Change-Id: Ib04b1e835bdafe939015e4d085a3c76919d4a9fe
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
Lei Qian [Thu, 29 Mar 2018 11:20:03 +0000 (19:20 +0800)]
dts: add txlx_t962x_r311_720p.dts
PD#163339: dts: add txlx_t962x_r311_720p.dts
Change-Id: I007acf0b662b3dbcb8aad20c80bc968659a8f65f
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
Huan Biao [Fri, 23 Mar 2018 07:23:07 +0000 (15:23 +0800)]
cooldev: add gpu cooldev api set for mali ko.
PD#160967: cooldev: add g12a gpu cooldev api.
Change-Id: I5825afcdb22cebae885a373063b6ce9f4c6a9a7a
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
wenbiao zhang [Tue, 27 Mar 2018 03:36:53 +0000 (11:36 +0800)]
u200: set fb mem_alloc flag for mali test
PD#162862: u200: set fb mem_alloc flag for mali test
Change-Id: I129bf5cfb94f957a020cd957b85a1842321df0e0
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
Weiming Liu [Mon, 26 Mar 2018 08:32:40 +0000 (16:32 +0800)]
lcd: sync linux3.14 lcd driver
PD#163027: lcd: synchronous lcd driver from linux3.14
1.add the frame rate adaptive to each panel control alone
2.optimize vx1 phy large vswing
3.perfect the unifykey read way to improve efficiency
4.add i2c_pinmux for power sequence
Change-Id: I548591a5f54a9080e2d721b3b944d5bc511728cc
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
Brian Zhu [Tue, 27 Mar 2018 15:09:19 +0000 (23:09 +0800)]
stb_dv: fix the dv dual layer playing out-sync
PD#163116:
1. vfm: increase the receiver size from 16 to 32
2. vpp: put el vframe toggle when omx dropping frame
Change-Id: Iecb0686e08a0bfb66ef259ea5fc32333fbbbd3e4
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
Yi Zhou [Wed, 21 Mar 2018 13:13:55 +0000 (21:13 +0800)]
hdmitx: fix the zigzag problem in color depth mode
PD#160883: hdmitx: fix the zigzag problem in color depth mode
When reset HDMITX_DWC_MC_SWRSTZREQ directly, these pulses may not align.
Therefore, the following steps must be executed.
steps
1.disable video encoder output and controller clocks
2.reset HDMITX_DWC_MC_SWRSTZREQ
3.enable video encoder output and controller clocks
Change-Id: I6cebc299d0a61da878d7c87a131d06f2601b2989
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
wenbiao zhang [Wed, 28 Mar 2018 09:06:59 +0000 (17:06 +0800)]
ethernet: fix for ifconfig eth0 down error
PD#163006: ethernet: fix for ifconfig eth0 down error
Change-Id: I48bfbc8fe9b824269009c8d673cd097ccb85a5e4
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
Nanxin Qin [Wed, 28 Mar 2018 07:30:54 +0000 (15:30 +0800)]
media: fixes an issue that playback audio cause crash.
PD#161244: modify the short address of aiu fifo regs to match g12a.
Change-Id: Idfe935c1710d5a0f091a7796138a56f78fdfe7b4
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
zhilei.wu [Wed, 28 Mar 2018 06:59:41 +0000 (14:59 +0800)]
ge2d: disable src2 alpha with notsupport src2_alp
PD#162344: ge2d: disable src2 alpha with notsupport src2_alp
Change-Id: I049568f57c328ed6128e95ee83c6974226c36544
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
Jiacheng Mei [Wed, 28 Mar 2018 03:11:26 +0000 (11:11 +0800)]
dts: enable node amvenc_avc for encoder[1/2]
PD#162608: enable node amvenc_avc for encoder
Change-Id: If66e4d04b3803b22c638f38958f96db157c2ef14
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>
Xingyu Chen [Tue, 27 Mar 2018 10:59:13 +0000 (18:59 +0800)]
pinctrl: keep the same GPIO ID after adding GPIOV_0 for G12A
PD#163124: pinctrl: keep the same GPIO ID after adding GPIOV_0 for G12A
Change-Id: I45b99df3a15e2bf0f7ad34ae8705dc4a509c70a1
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
yu.fang [Wed, 21 Mar 2018 05:26:32 +0000 (13:26 +0800)]
DTS: partitions: change axg partitions for bringup android O
PD#158937: A113 Android O trunk bring up.
Change-Id: Ibdb605b5c17abe8165270621e6893ea1d2ab88ef
Signed-off-by: Yu Fang <yu.fang@amlogic.com>
Signed-off-by: yuehu mi <yuehu.mi@amlogic.com>
Xingyu Chen [Mon, 26 Mar 2018 09:04:10 +0000 (17:04 +0800)]
pinctrl: improve the eth groups for gxl
PD#163038: pinctrl: improve the eth groups for gxl
add "eth_link_led" and "eth_act_led" pin groups to eth function group
Change-Id: I28f434f100be7636ddbc9a5159418d6efb7f027a
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Sunny Luo [Sat, 24 Mar 2018 09:48:40 +0000 (17:48 +0800)]
spicc: support irregular bit-width
PD#162464: spicc: support irregular bit-width
some device work at a irregular bit-width for example,
11 bit-width and tx data is {0xa1, 0x62},
the LSB bit order is:
10100001 011 (0xa1 + 3 bits of 0x62)
the MSB bit order is:
01100010 101 (0x62 + 3 bits of 0xa1)
note: all case more than 16 bits will run at 4-byte-per-word though one
byte discarded.
to print the difference between tx and rx if mode[16]=1
Change-Id: Ibdd438c3fe764986c71b77ec2d4fa0db489dd439
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
Zhuo Wang [Mon, 26 Mar 2018 08:47:45 +0000 (16:47 +0800)]
ethernet: add eye pattern and phy default value
PD#163016: add eye pattern and modify internal phy status
Change-Id: I18e0164646b17b86187fe1fe5c0189c9c2302130
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
Xingyu Chen [Thu, 15 Mar 2018 03:11:12 +0000 (11:11 +0800)]
keypad: avoid repetition of reporting power key event
PD#160889: keypad: avoid repetition of reporting power key event
If the adc_keypad and gpio_keypad driver are enabled at the same time,
the system will report two power key event when it resumes, and the
second event will result in the system suspend again. The patch resolves
the bug.
Change-Id: Iea4d9e2bf6632e4603dc9743fce07e5af74d0273
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Weiming Liu [Tue, 20 Mar 2018 05:21:00 +0000 (13:21 +0800)]
lcd_extern: add tl050fhv02ct driver
PD#162533: lcd_extern: add tl050fhv02ct driver
Change-Id: Ie046eb45542327b77ad3897785ecd99378b689fd
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
Xingyu Chen [Mon, 26 Mar 2018 02:16:39 +0000 (10:16 +0800)]
pinctrl: add virtual GPIO "GPIOV_0" for g12a
PD#162992: pinctrl: add virtual GPIO "GPIOV_0" for g12a
The gpio is used to set the bit PERIPHS_PIN_MUX_2 BIT[17]. Please refer
the following method to use it.
1). set the PERIPHS_PIN_MUX_2 BIT[17] to <1>
mux_en {
groups = "sdio_dummy";
function = "sdio";
}
2). set the PERIPHS_PIN_MUX_2 BIT[17] to <0>
mux_dis {
groups = "GPIOV_0";
function = "gpio_periphs";
}
Change-Id: Ied0e6c71ed1ff8ab9a26cb76ec1508d83a4453d7
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Xingyu Chen [Fri, 23 Mar 2018 08:22:11 +0000 (16:22 +0800)]
pinctrl: add new pinconf attrs "output-high" and "output-low"
PD#162858: pinctrl: add new pinconf attrs "output-high" and "output-low"
we can refer the following example to use:
mux {
groups = "GPIOC_0", "GPIOC_1", "GPIOC_2",
"GPIOC_3", "GPIOC_4", "GPIOC_5";
function = "gpio_periphs";
output-high; // or output-low
}
output-high: GPIO_EN_N[pin]=<0> and GPIO_O[pin]=<1>
output-low : GPIO_EN_N[pin]=<0> and GPIO_O[pin]=<0>
Change-Id: I3f8ec1bd1eff7c7d6e7416b608e4c5d6c7b15955
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Yixun Lan [Fri, 19 Jan 2018 01:47:01 +0000 (09:47 +0800)]
clk: meson: axg: fix the od shift of the sys_pll
PD#159137: clk: meson: axg: fix the od shift of the sys_pll
According to datasheet, the od shift of sys_pll is 16,
fix the typo which introduced at previous commit.
Change-Id: I8d7e36b1178c0ab7f89791964fe4bb216c551d6d
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
Zhe Wang [Sat, 24 Mar 2018 09:09:06 +0000 (17:09 +0800)]
audio: fixed dts error for spdif out[1/1]
PD#162258: spdif out is no audio output
1) fixed pinmux error
2) add mute flag for Pause
Change-Id: Icb60dba86d5b305eedf78b0fd410e0a16800c503
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
Yi Zeng [Fri, 23 Mar 2018 06:28:12 +0000 (14:28 +0800)]
mtd: use sprintf instead of printk in show functions
PD#134355: mtd: use sprintf instead of printk in show functions
Remove the unused system attribute in dtb and env.
Change-Id: Ie7f7bda60ac1b192708a6b6fd0dc1c77ca1eb0e0
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
Kaifu Hu [Tue, 20 Mar 2018 09:14:45 +0000 (17:14 +0800)]
hdmitx: add enci clktree
PD#162219: hdmitx: add enci clktree
Add enci clktree support for 480i and 576i.
Change-Id: Id7bc3444bd634deb1a52c8faf7f3d2f017d33e73
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
wenbiao zhang [Thu, 22 Mar 2018 06:35:27 +0000 (14:35 +0800)]
g12a: add g12a buildroot dts.
PD#162359: g12a: add g12a buildroot dts.
Change-Id: Ie6013b3e5c3a9b04197599ae047f6806bfb9d37d
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
Yao.Liu [Tue, 20 Mar 2018 13:29:39 +0000 (21:29 +0800)]
video_sink: disable video_type_compress for resolution over 720p
PD#159581: video_sink: disable video_type_compress for resolution over 720p
Change-Id: Ie5909bc087a2770a93e0e617f319143f5cacaa7f
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
Yao.Liu [Thu, 22 Mar 2018 11:08:06 +0000 (19:08 +0800)]
codec_mm: clear scatter cache when codec_mm_codec_in failed
PD#158909: clear scatter cache when codec_mm_codec_in failed
Change-Id: Ie3f4da06699222b6dbd8caee6982dc71288881c1
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
zhilei.wu [Fri, 23 Mar 2018 05:59:19 +0000 (13:59 +0800)]
ge2d: revised q201 ge2d dts
PD#162855: ge2d: revised q201 ge2d dts
Change-Id: Ifd5878b720138e646377063a2707ef13c48ca94a
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
Yue Wang [Wed, 21 Mar 2018 04:18:12 +0000 (12:18 +0800)]
usb: fix u211 dts setting.
PD#162619: usb: fix u211 dts setting.
Change-Id: I098f9d857272ce94ddb9fe16d876b4e0b2e0d8e8
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
Yue Wang [Tue, 20 Mar 2018 07:40:50 +0000 (15:40 +0800)]
pcie: enable pcie legacy irq.
PD#162549: pcie: enable pcie legacy irq.
Change-Id: I46eaf7aadec8083b97f4cab103414ea302435fd8
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
Brian Zhu [Wed, 21 Mar 2018 08:08:22 +0000 (16:08 +0800)]
vpp: remove vd1 & vd2 mif gate setting
PD#161364: vpp remove vd1 & vd2 mif gate setting to avoid screen flicker
Change-Id: I6fa8eed89b33cbde698472167ba000f132c897ad
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
zhilei.wu [Wed, 21 Mar 2018 08:56:26 +0000 (16:56 +0800)]
dv: fixed compile error when disable CONFIG_DOLBYVISION
PD#162653: dv: fixed compile error when disable CONFIG_DOLBYVISION
Change-Id: Ia56e72deb9d4d47d38beff6295eee2d9e99b6d58
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
Ruixuan Li [Wed, 21 Mar 2018 09:24:25 +0000 (17:24 +0800)]
emmc: fix dtb backup mechanism
PD#162119: emmc: fix dtb backup mechanism
Change-Id: I32ca6ffb2c01bb5f50a5af3f0b2942077da61eb8
Signed-off-by: Ruixuan Li <ruixuan.li@amlogic.com>
Yue Wang [Mon, 12 Mar 2018 02:30:41 +0000 (10:30 +0800)]
usb: enable usb suspend.
PD#161622: usb: enable usb suspend.
Change-Id: I28e2ac7855dbdfe0299592189af179575a264272
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
Xingyu Chen [Thu, 15 Mar 2018 03:11:12 +0000 (11:11 +0800)]
arm64: dts: add adc and gpio keypad support for u200
PD#160889: arm64: dts: add adc keypad support for u200
Change-Id: I19e2e32023fdaf071bf0231de368e37be5e609f7
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Sunny Luo [Mon, 19 Mar 2018 09:20:40 +0000 (17:20 +0800)]
spicc: compatible modify for g12a
PD#162464: spicc: compatible modify for g12a
1. add dma wait cycle while high speed.
2. support auto dma threshold setting.
3. support pio LSB-FIRST mode.
4. change dma from LSB to MSB-FIRST mode.
5. support loop-back set by transfer mode.
6. delete some sys class entries unused.
Change-Id: Ic10ccb7e7459499c1b25ee074e069f157fb9c72c
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
Zhuo Wang [Mon, 19 Mar 2018 05:48:09 +0000 (13:48 +0800)]
ethernet: setup u200 as rgmii network
PD#162470: config u200 as rgmii network
Change-Id: I60f482f1d459c47dc81801bdeee9e5bf4ccda1d7
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
Yicheng Shen [Tue, 13 Mar 2018 08:01:49 +0000 (16:01 +0800)]
hdmirx: modify audio sample rate threshold value
PD#162077: modify audio sample rate threshold value
Change-Id: I60ce021825aeba2d963467dec6ec7b6a37a1c634
Signed-off-by: Yicheng Shen <yicheng.shen@amlogic.com>
Yi Zhou [Tue, 20 Mar 2018 09:30:41 +0000 (17:30 +0800)]
hdmitx: fix a null pointer in hdmitx_late_resume function
PD#162465: hdmitx: fix a null pointer in hdmitx_late_resume function
Change-Id: Ib4b3f55d2ca8274fb4c1000cf79f403006d7a475
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Sunny Luo [Mon, 19 Mar 2018 03:37:07 +0000 (11:37 +0800)]
dts: spicc: add node for g12a_s905d2 skt.
PD#162464: dts: spicc: add node for g12a_s905d2 skt
kernel4.9 still use the amlogic driver. DTS compatible name should be
"spicc" but not "meson-g12a-spicc" to avoid probing the upstream driver.
Change-Id: I0465f71f1504929a459ae1d912cc4bb1f397ccde
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
zhilei.wu [Wed, 21 Mar 2018 06:30:20 +0000 (14:30 +0800)]
dv: revised PQ calculation for vout panel
PD#157605: dv: revised PQ calculation for vout panel
Change-Id: I6a3d0a0fee30b82102e8344625669aab0f2f2965
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
yicheng shen [Tue, 20 Mar 2018 07:16:03 +0000 (15:16 +0800)]
hdmirx: enable edid overlay function
PD#161284: hdmirx: enable edid overload function
Change-Id: If8d88c0351d9d79b9fe9cf5737d8909fc12480fb
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
zhilei.wu [Tue, 20 Mar 2018 13:43:10 +0000 (21:43 +0800)]
dv: fixed core2 lut table error
PD#161010: dv: fixed core2 lut table error
Change-Id: Ic0ebdf677869ab1325f17fda36e0869329be37b8
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
MingLiang Dong [Fri, 16 Mar 2018 12:52:15 +0000 (20:52 +0800)]
amvecm: add G12A vdin/di HDR support
PD#162408: amvecm: add G12A vdin/di HDR support
Change-Id: I34c410b47eff0c8e5b9105bd890a57f0d659c89b
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
Yi Zhou [Mon, 19 Mar 2018 08:15:39 +0000 (16:15 +0800)]
hdmitx: add another SWRSTZREQ init after setting mode
PD#160883: hdmitx: add another SWRSTZREQ init after setting mode
Change-Id: I002fa45bb5d0459ba31051314a3500a7b47d9512
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
yicheng shen [Tue, 20 Mar 2018 07:20:33 +0000 (15:20 +0800)]
cec: change the return code of str to uint
PD#161284: cec: change the return code of str to uint
Change-Id: I88ac2b84574572f5a9ab82f111fdfe2e0ac60bc1
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
Evoke Zhang [Thu, 15 Mar 2018 08:12:59 +0000 (16:12 +0800)]
lcd: update pll setting for g12a
PD#162244: lcd: update pll setting for g12a
Change-Id: I8d406228a49dfe0354ef79f7cb27864114661d17
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Hang Cheng [Mon, 12 Mar 2018 06:33:03 +0000 (14:33 +0800)]
hdmirx: set pinmux for each port separately
PD#161978: hdmirx: set pinmux for each port separately
Change-Id: I51b933523cdc334f32662c4bb2ea75791adfad0b
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
Yi Zhou [Tue, 20 Mar 2018 05:58:00 +0000 (13:58 +0800)]
hdmitx: fix dv funciton of hdmitx doesn't work when initing system
PD#162091: hdmitx: fix dv funciton of hdmitx doesn't work
When the mode is set in uboot, the ready flag must be 1.
Change-Id: Ibb23efc6687246a417dda74bd731a25e5fcf0ae7
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
qi.yuan [Tue, 13 Mar 2018 08:02:06 +0000 (16:02 +0800)]
hdmi_tx: fix hdmitx event extcon_audio when rising
PD#161285: fix extcon_audio event occur before extcon_hdmi when rising
Change-Id: I70fd070f62cc36e76aeba260420b24df1b1fe29f
Signed-off-by: qi.yuan <qi.yuan@amlogic.com>
Xuhua Zhang [Fri, 16 Mar 2018 05:24:17 +0000 (13:24 +0800)]
vdin: use sprintf instead of printk in show functions
PD#134355: vdin: use sprintf instead of printk in show functions
Change-Id: I06abfe9acb27ba7ebe9e4e16aaf90a6e0e7e3601
Signed-off-by: Xuhua Zhang <xuhua.zhang@amlogic.com>
Dezhi Kong [Mon, 19 Mar 2018 06:53:04 +0000 (14:53 +0800)]
sr: fix video input h/v size config
PD#162346: sr: fix video input h/v size config
1.sr size config
2.fix height/width align issue
Change-Id: Ie91e92a9feff75cd1a67cf14be1a94c47478ef64
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
kele bai [Fri, 16 Mar 2018 02:11:19 +0000 (10:11 +0800)]
di: fix dumy buffer dismatch with normal buffer
PD#161859: di: fix dummy buffer dismatch with normal buffer
1) fix dummy buffer dismatch with normal buffer
2) add debug print support
Change-Id: I304f93f4ef7883928fbd9fa237fb2dfd24ef557a
Signed-off-by: kele bai <kele.bai@amlogic.com>
Renjun Xu [Fri, 16 Mar 2018 07:45:42 +0000 (15:45 +0800)]
sound: fix tas5756 volume invert
PD#161063: fix tas5756 volume invert
Change-Id: I354b063df203b89824dd36a99a93aae1b390b735
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
Renjun Xu [Fri, 16 Mar 2018 07:25:36 +0000 (15:25 +0800)]
sound: fix pcm186x driver playback/capture
PD#161075: fix pcm186x driver playback/capture
Change-Id: I04d66ca1987efcaaff2ed897593748cf101db921
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
kele bai [Fri, 16 Mar 2018 02:26:57 +0000 (10:26 +0800)]
di: disable recycle buffer when source switch
PD#160047: di: disable recycle buffer when source switch
1) atv&dtv will switch when channel switch,
mirror function need enable
2) disable full pack feature for 8 bit mode
Change-Id: Ifde5afb637b259c0d4d789b94228c0cb488b48f7
Signed-off-by: kele bai <kele.bai@amlogic.com>
Yi Zeng [Mon, 12 Mar 2018 07:38:55 +0000 (15:38 +0800)]
mtd: add a macro to hide the env region in rsv zone
PD#160529: mtd: add a macro to hide the env region in rsv zone
when we save the env data in normal partition, the env region
in the rsv zone is no needed anymore, so hide it with a macro.
Change-Id: Id1b92079d1127ffabf4c1f208b486daad0af3934
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
Jianxin Pan [Sun, 18 Mar 2018 03:06:44 +0000 (20:06 -0700)]
Merge "mtd: rebuild the code about add partition" into amlogic-4.9-dev
Xing Wang [Thu, 15 Mar 2018 07:19:40 +0000 (15:19 +0800)]
audio: auge: add i2s to hdmix port
PD#161826: audio: auge: add i2s to hdmix port
Change-Id: I0aca7160342810385ea0e531ab8fe31c948a80b6
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Yue Wang [Thu, 15 Mar 2018 02:28:35 +0000 (10:28 +0800)]
usb: gadget: ffs: Execute copy_to_user() with USER_DS set
PD#161764: usb: gadget: ffs: Execute copy_to_user() with USER_DS set
When using a AIO read() operation on the function FS gadget driver a URB is
submitted asynchronously and on URB completion the received data is copied
to the userspace buffer associated with the read operation.
This is done from a kernel worker thread invoking copy_to_user() (through
copy_to_iter()). And while the user space process memory is made available
to the kernel thread using use_mm(), some architecture require in addition
to this that the operation runs with USER_DS set. Otherwise the userspace
memory access will fail.
For example on ARM64 with Privileged Access Never (PAN) and User Access
Override (UAO) enabled the following crash occurs.
Address this by placing a set_fs(USER_DS) before of the copy operation
and revert it again once the copy operation has finished.
Change-Id: If523dac82905057607d3007de6a3974102d51e3f
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
Brian Zhu [Sun, 11 Mar 2018 10:50:36 +0000 (18:50 +0800)]
vpp: disable pps as default when scaler ratio is 1:1
PD#161937: vpp: disable pps as default when scaler ratio is 1:1
Change-Id: Iabec01db371218c954bfdae25dfea5292acae3e2
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
Zongdong Jiao [Mon, 12 Mar 2018 13:56:27 +0000 (21:56 +0800)]
hdmitx: update phy/clk parameters
PD#160984: hdmitx: update phy/clk parameters of g12a
1. use 5.94G instead of 2.97G to get high performance
2. add workaround of setting 4.5~6GHz
3. fine tune phy parameters
Change-Id: I99a7bb428e835316bd464aae421e074841156670
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Jian Hu [Wed, 14 Mar 2018 09:43:16 +0000 (17:43 +0800)]
i2c: fix writing w_token reg error
PD#161535: i2c: fix writing w_token reg error
1.fix writing w_token reg error
2.set default clock frequency 100khz
3.config i2c1 pinmux and change clock frequency to 300k
Change-Id: I9b3fe3ed404255e3897d7353c57770a6019e6f9b
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Yi Zhou [Tue, 16 Jan 2018 06:03:58 +0000 (14:03 +0800)]
hdmitx: add hdmitx driver in drm
PD#156257: hdmitx: add hdmitx driver in drm
1.add irq
2.add edid reading
3.set hdmi mode
4.update drm_edid.c
5.modify vout api
Change-Id: I7a6666c4884655e168dd5125c9d1eb1f6ecb7587
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Evoke Zhang [Tue, 16 Jan 2018 10:42:47 +0000 (18:42 +0800)]
drm: add drm driver lcd support
PD#160546: add drm driver lcd support
Change-Id: I3b5fa4c10b4ac542ccdfa8691e692e849f071145
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>