platform/kernel/linux-amlogic.git
6 years agolcd: add g12a support
weiming.liu [Fri, 2 Mar 2018 07:36:27 +0000 (15:36 +0800)]
lcd: add g12a support

PD#156734: lcd: add lcd driver for g12a

Change-Id: Ib859dfdc2a1785c7e1e2ab506bf1dfd0cad55887
Signed-off-by: weiming.liu <weiming.liu@amlogic.com>
6 years agopwm: meson-g12a: fix pwm xtal
Bo Yang [Sun, 4 Feb 2018 09:07:44 +0000 (17:07 +0800)]
pwm: meson-g12a: fix pwm xtal

PD#156734: pwm: meson-g12a: fix pwm xtal

Fix pwm xtal.
And update pwm dts compatible.

Change-Id: I0314ed1b628abfe4a3e303ca827bdd50f2a2c2e8
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agomedia: fixed the issure of mpeg12 playback.
Nanxin Qin [Sun, 4 Feb 2018 08:55:25 +0000 (16:55 +0800)]
media: fixed the issure of mpeg12 playback.

PD#156734:

Change-Id: I87d814707d864a8fc81bcb35712ef0c25fea65db
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
6 years agodts: meson-g12a: update hmditx i2c pinctrl
Bo Yang [Sun, 4 Feb 2018 08:45:16 +0000 (16:45 +0800)]
dts: meson-g12a: update hmditx i2c pinctrl

PD#156734: dts: meson-g12a: update hmditx i2c pinctrl

Remove repetitive i2c definition.

Change-Id: Ide1b6467385b0f31da30aeffe8244d3918d8a0f8
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agodi: di post wr&vpp link disaply ok
kele bai [Sun, 4 Feb 2018 08:27:20 +0000 (16:27 +0800)]
di: di post wr&vpp link disaply ok

PD#156734: di:
1) fix 0x1a0a error config in video.c
2) update gate control for if0

Change-Id: I6f1a7080b1f6f2d343ed3773ef55b2834d55d0d6
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agodts: g12a-skt: add touch device node
Sunny Luo [Sun, 4 Feb 2018 07:57:09 +0000 (15:57 +0800)]
dts: g12a-skt: add touch device node

PD#156734: dts: g12a-skt:
1. add and enable focaltech ftxx
2. add and enable goodix gtxx

Change-Id: Iff3a2d0a28c5ba78c93f23623b3c34b651bb2cae
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
6 years agoosd: make osd2 and osd3 work
Brian Zhu [Sat, 3 Feb 2018 21:24:26 +0000 (05:24 +0800)]
osd: make osd2 and osd3 work

PD#156734: osd:
1. fix the osd2 & osd3 init error
2. enable all mem_pd

Change-Id: Ib0d817e98ad5381fdd9dc436ff30bf4ed8bbbcca
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agovideo: enable ionvideo
Jiyu Yang [Sat, 3 Feb 2018 19:33:44 +0000 (03:33 +0800)]
video: enable ionvideo

PD#156734 enable ionvideo for online video play

Change-Id: I316d9abb2708538813cf2c09d47bb854676ed7e7
Signed-off-by: Jiyu Yang <jiyu.yang@amlogic.com>
6 years agovideo: disable blend ctrl when video off
Brian Zhu [Sat, 3 Feb 2018 15:29:41 +0000 (23:29 +0800)]
video: disable blend ctrl when video off

PD#156734: video: disable blend ctrl when video off

Change-Id: I31bc906212dde34dd684ba3953ae8ada59107734
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agonand: add clock for mtd nand driver
Liang Yang [Sat, 3 Feb 2018 14:40:51 +0000 (22:40 +0800)]
nand: add clock for mtd nand driver

PD#156734: nand: add clock and disable nand module in dts to
avoid conflit with sd_emmc_c.

Change-Id: I204bbc58960cbed47b1c55194e371cd1c61be12a
Signed-off-by: Liang Yang <liang.yang@amlogic.com>
6 years agoCPUFREQ: add cpufreq driver.
hong.guo [Fri, 2 Mar 2018 07:46:13 +0000 (15:46 +0800)]
CPUFREQ: add cpufreq driver.

PD#156734: cpufreq: add cpufreq driver[2/2].

Change-Id: If38dba0973aa7c0d4e9bbba1bee1af81e84ba6b8
Signed-off-by: hong.guo <hong.guo@amlogic.com>
6 years agodtsi: meson-g12a: add all pwm pinmux definitions
Bo Yang [Sat, 3 Feb 2018 09:59:26 +0000 (17:59 +0800)]
dtsi: meson-g12a: add all pwm pinmux definitions

PD#156734: dtsi: meson-g12a: add all pwm pinmux definitions

Replace pinctrl used by wifi and cpufreq.
Aand remove repetitive definitions.

Change-Id: Ia2eb89fac9fe6e960333ff3d3e691f7e7f1cfaa1
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agomedia: add the HEVC_DBLK_CFGE to hevc regs.
Nanxin.Qin [Sat, 3 Feb 2018 04:33:39 +0000 (12:33 +0800)]
media: add the HEVC_DBLK_CFGE to hevc regs.

PD#156734: media: add the HEVC_DBLK_CFGE to hevc regs.

Change-Id: I9e885017176502d0227a353cb049ddf0742e38fe
Signed-off-by: Nanxin.Qin <nanxin.qin@amlogic.com>
6 years agoeth: meson-g12a: add Ethernet driver support
Yixun Lan [Thu, 1 Feb 2018 11:58:02 +0000 (19:58 +0800)]
eth: meson-g12a: add Ethernet driver support

PD#156734: eth: meson-g12a: add Ethernet driver support

Enable the ethernet driver on G12A board, which tested
with RTL8211F 1000M PHY && Internal PHY.

And here we enable Internal PHY for g12a_skt board.

Change-Id: I839639ac92790c27117b9745275b346cd4ce40d7
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
6 years agocec: cec g12a bring up
hongmin hua [Fri, 12 Jan 2018 07:42:38 +0000 (15:42 +0800)]
cec: cec g12a bring up

PD#156734: cec: change interrupt/pinmux for g12a

Change-Id: I5f9f652addf81db4b792796d41f367073a8ac5b9
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
6 years agopcie: fix config spaces error
Zan Peng [Sat, 3 Feb 2018 09:11:42 +0000 (17:11 +0800)]
pcie: fix config spaces error

PD#156734: pcie: fix config spaces error

Change-Id: I217b0941a4facd874f4df74e4d0eefa5a72af527
Signed-off-by: Zan Peng <zan.peng@amlogic.com>
6 years agodts: g12a-skt: removed repetitive definition of i2c pinmux
Bo Yang [Sat, 3 Feb 2018 08:48:15 +0000 (16:48 +0800)]
dts: g12a-skt: removed repetitive definition of i2c pinmux

PD#156734: dts: g12a-skt: removed repetitive definition of i2c pinmux

Replace i2c3 pinctrl with standard definition.

Change-Id: I28f64dfde90ccb71f5b3fb12437b92f392de28ce
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agodts: g12a-skt: add i2c-0 enable
Bo Yang [Sat, 3 Feb 2018 08:36:03 +0000 (16:36 +0800)]
dts: g12a-skt: add i2c-0 enable

PD#156734: dts: g12a-skt: add i2c-0

Default freq 100k.

Change-Id: Id39713b7d06b885667e5daef0a012bfae1b9882e
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agordma: enable rdma mem_PD g12a
Brian Zhu [Sat, 3 Feb 2018 08:21:23 +0000 (16:21 +0800)]
rdma: enable rdma mem_PD g12a

PD#156734: rdma: enable rdma mem_PD g12a

Change-Id: I3e2f74b524f07372a54a172d7d05b5a55c8f01df
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agopcie: fix pcie reset gpio failed
Zan Peng [Sat, 3 Feb 2018 08:16:01 +0000 (16:16 +0800)]
pcie: fix pcie reset gpio failed

PD#156734: pcie: fix pcie reset gpio failed
1. config 1M spaces for I/O

Change-Id: I0ec9a6e920c5fd2fbf922e3f1338a19dbc373aa6
Signed-off-by: Zan Peng <zan.peng@amlogic.com>
6 years agodi: G12A add di nrds&pps&diwr support
kele bai [Fri, 2 Mar 2018 07:17:05 +0000 (15:17 +0800)]
di: G12A add di nrds&pps&diwr support

PD#156734: G12A add di nrds&pps&diwr support

1) move hdr&vd1&viu releated reg into di_regs.h
2) delete unuseful reg definition
3) add pps in post function
4) add new framereset

Change-Id: I49c58072cc90aa556ab368dcc616c3be4a692db4
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agodtsi: meson-i2c: add g12a i2c pinmux definitions
Bo Yang [Fri, 2 Mar 2018 07:39:29 +0000 (15:39 +0800)]
dtsi: meson-i2c: add g12a i2c pinmux definitions

PD#156734: dtsi: meson-i2c: add g12a i2c pinmux definitions

Change-Id: I24ef24db8214ce1c927d3a32571fe1ed96fa3ac1
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agoosd: enable lacth and use extern canvas mode
Brian Zhu [Fri, 2 Feb 2018 14:42:20 +0000 (22:42 +0800)]
osd: enable lacth and use extern canvas mode

PD#156734: osd: enable lacth and use extern canvas modeWq

Change-Id: Ia7506e04068f4980eee86b28acc65b8763b8f29a
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agoaudio: auge: fix tdm skew, pdm clk, spdif to hdmxtx clk inv
Xing Wang [Fri, 2 Feb 2018 14:33:27 +0000 (22:33 +0800)]
audio: auge: fix tdm skew, pdm clk, spdif to hdmxtx clk inv

PD#156734: audio: auge: fix tdm skew, pdm clk, spdif to hdmxtx clk inv

Change-Id: I2033bb0d0843eca309ad58483183293f1c4d92fa
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agousb: add usb otg driver support for g12a
Yue Wang [Sat, 3 Feb 2018 06:34:18 +0000 (14:34 +0800)]
usb: add usb otg driver support for g12a

PD#156734: usb: add usb otg driver support for g12a

Change-Id: I1af8d290568bca947a6612f31cef3b640c7cd927
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
6 years agoclock: g12a: add emmc portA and aoclkc
Qiufang Dai [Thu, 1 Feb 2018 15:38:17 +0000 (23:38 +0800)]
clock: g12a: add emmc portA and aoclkc

PD#156734: add emmc portA and aoclkc

Change-Id: Ib54a6eb113bdce21eacc7a2d460df23ee9129e92
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agoemmc: g12a: enable emmc at high speed mode
Yonghui Yu [Fri, 2 Feb 2018 14:22:34 +0000 (22:22 +0800)]
emmc: g12a: enable emmc at high speed mode

PD#156734: emmc: g12a: enable emmc at high speed mode

Change-Id: I8e314182afa3e7088818d4fd9a83f369bb29ba84
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
6 years agousb: add usb3.0 driver support for g12a
Yue Wang [Fri, 2 Feb 2018 11:41:59 +0000 (19:41 +0800)]
usb: add usb3.0 driver support for g12a

PD#156734: usb: add usb3.0 driver support for g12a

Change-Id: Iac057b29d041a5c80114407df0ccd965aae11ca1
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
6 years agovpp: config vdin/sr for g12a
Dezhi Kong [Mon, 1 Jan 2018 12:05:06 +0000 (20:05 +0800)]
vpp: config vdin/sr for g12a

PD#156734: vpp: config vdin/sr for g12a

1.config vd1 vpp patch default
2.add viuin debug path
3.merged sr from 3.14
4.add vdin support
5.enable sr for g12a

Change-Id: Ica1a7e7e31330e223528329accb149db74e00cf5
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
6 years agonand: mtd nand modification
Liang Yang [Fri, 2 Feb 2018 09:23:06 +0000 (17:23 +0800)]
nand: mtd nand modification

PD#156734: nand: modification
1)sync partition talbe with bootloadr setting.
2)keep compatibale with other platform(a113, etc) when setting lower clock.
3)add a new tested nand flash type

Change-Id: Iff277e6d22bb76c543db76747b22b38f3d60eb11
Signed-off-by: Liang Yang <liang.yang@amlogic.com>
6 years agoCPUFREQ: add cpufreq dts and config.
hong.guo [Fri, 2 Feb 2018 07:26:37 +0000 (15:26 +0800)]
CPUFREQ: add cpufreq dts and config.

PD#156734: cpufreq: add cpufreq dts and config[1/2].

Change-Id: I39fff8a6049d8cc0b6f9b4dbfa11d2b1be504339
Signed-off-by: hong.guo <hong.guo@amlogic.com>
6 years agomedia: add the cpu type of G12A and AVS2 vformat
Nanxin.Qin [Fri, 2 Feb 2018 08:20:06 +0000 (16:20 +0800)]
media: add the cpu type of G12A and AVS2 vformat

PD#156749:

Change-Id: I7fb09105a939d9a0c6cd3a66202ad29ab9c3c272
Signed-off-by: Nanxin.Qin <nanxin.qin@amlogic.com>
6 years agoaudio: codec: add ad82584f driver
Xing Wang [Fri, 2 Feb 2018 07:03:56 +0000 (15:03 +0800)]
audio: codec: add ad82584f driver

PD#156734: audio: codec: add ad82584f driver

Change-Id: I1e2d8b452e5560c84c60d965e7a916fa0ff03bf4
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agopcie: add pcie dts support for G12A
Zan Peng [Fri, 2 Feb 2018 08:02:07 +0000 (16:02 +0800)]
pcie: add pcie dts support for G12A

PD#156734: pcie: add pcie dts support for G12A

Change-Id: Ia437be3df71062fe89f8203778d5b1b42df37dba
Signed-off-by: Zan Peng <zan.peng@amlogic.com>
6 years agocvbs: cvbs bring up for g12a
Nian Jing [Wed, 3 Jan 2018 13:06:19 +0000 (21:06 +0800)]
cvbs: cvbs bring up for g12a

PD#156734: cvbs bring up for g12a

Change-Id: I8a69d85a921e78300db9ec96c2f93807f6f139b4
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agopcie: add pcie driver support for G12A
Zan Peng [Fri, 2 Feb 2018 04:42:02 +0000 (12:42 +0800)]
pcie: add pcie driver support for G12A

PD#156734: pcie: add pcie driver support for G12A

Change-Id: I497e17ac212448934416c8af73206cd88766e406
Signed-off-by: Zan Peng <zan.peng@amlogic.com>
6 years agoaudio: auge: avout and notify spdifb to hdmitx
Xing Wang [Thu, 1 Feb 2018 01:21:26 +0000 (09:21 +0800)]
audio: auge: avout and notify spdifb to hdmitx

PD#156734: audio: auge: avout and notify spdifb to hdmitx

Change-Id: I63b9fe4d18979b33907a3ed848f99abf42ae8972
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agoosd: disable out fence and wait infence
Jiyu Yang [Thu, 22 Feb 2018 09:33:40 +0000 (17:33 +0800)]
osd: disable out fence and wait infence

PD#156734: osd: disable out fence and wait infence

Change-Id: Id0390f5c6667a64915d202362af87db761ef2783
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
6 years agovideo: disable vd1 post and pre as default
Brian Zhu [Thu, 1 Feb 2018 16:28:21 +0000 (00:28 +0800)]
video: disable vd1 post and pre as default

PD#156734

Change-Id: I43b372d55e4997999fe7c99ea9d0ab4f7b8a5e57
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agohdmitx: update hdmitx mode parameters
Yi Zhou [Thu, 22 Feb 2018 09:08:40 +0000 (17:08 +0800)]
hdmitx: update hdmitx mode parameters

PD#156734: hdmitx: update hdmitx mode parameters

1.update 6G signal
2.add hpd interrupt
3.add ddc channel
4.enable every mode output

Change-Id: I7d505f41b4f182324e6d8c560a17fb0b2bbb6b7a
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agoremote in: add remote dtsi config for G12A
Yu Tu [Fri, 2 Feb 2018 04:23:57 +0000 (12:23 +0800)]
remote in: add remote dtsi config for G12A

PD#156734: remote in: add remote dtsi config for G12A

Change-Id: Ia38c95bf8b16be9bafad396fc681405c98d6bc35
Signed-off-by: Yu Tu <yu.tu@amlogic.com>
6 years agowifi/bt: add wifi bt config [1/1]
Weiguang.ruan [Thu, 1 Feb 2018 15:16:55 +0000 (23:16 +0800)]
wifi/bt: add wifi bt config [1/1]

PD#156734: wifi/bt: add wifi bt config

1. add wifi/bt configure

2. set pwm e for 32k clock

3. enable cts/rts of uart_a

Change-Id: I94800030a95119ed8ff0c60171faa2cca8eca287
Signed-off-by: Weiguang.ruan <Weiguang.ruan@amlogic.com>
6 years agosdcard: g12a: enbable hotplug
Yonghui Yu [Thu, 1 Feb 2018 17:36:02 +0000 (01:36 +0800)]
sdcard: g12a: enbable hotplug

    PD#156734: sdcard: g12a: enable hotplug on skt.

Change-Id: I04d42895bb526134ea6d9c2a5222e1acbae533a0
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
6 years agoiio: saradc: add support for g12a
Xingyu Chen [Thu, 18 Jan 2018 08:25:35 +0000 (16:25 +0800)]
iio: saradc: add support for g12a

PD#156734: iio: saradc: add support for g12a

Add period sampling mode for g12a and next, here are a brief overview:

1. Enable period sampling mode

echo 1  > /sys/bus/iio/devices/iio:device0/buffer/enable

2. Set the sampling interval
The sampling interval can be set in dts by the two params:
<1> amlogic,delay-per-tick
<2> amlogic,ticks-per-period

If there are no define the params above, and the channel list is
sampled every 1ms by default.

3. Read sampling data from buffer
this currently provides no buffer events so it is up to userspace to
work out how often to read from the buffer. therefore, if you want to
read continuous sampling data from buffer, please use application.

Eg:
[kernel]/tools/iio/iio_generic_buffer.c

Change-Id: I27f904e2736768eacc9d73ff24078bd659e37049
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
6 years agousb: add usb host & device driver support for g12a
Yue Wang [Thu, 1 Feb 2018 15:21:39 +0000 (23:21 +0800)]
usb: add usb host & device driver support for g12a

PD#156734: usb: add usb host & device driver support for g12a

Change-Id: Ia12b63f85fb6d980a7c7906664ae2db7c4ddb86b
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
6 years agonand: mtd nand initial version
Liang Yang [Thu, 1 Feb 2018 15:53:39 +0000 (23:53 +0800)]
nand: mtd nand initial version

PD#156734: nand: add nand support for G12A

Change-Id: Ic696edd8ca00ec3010e17b25a842788cb95fd166
Signed-off-by: Liang Yang <liang.yang@amlogic.com>
6 years agoUART: G12A: verify all uart port on skt dts.[1/1]
qi duan [Thu, 1 Feb 2018 11:55:48 +0000 (19:55 +0800)]
UART: G12A: verify all uart port on skt dts.[1/1]

PD#156734: UART: G12A: verify all uart port on skt dts.

Change-Id: I2fb272d7803d0c21e16a10c3ccb535b4244e6e6b
Signed-off-by: qi duan <qi.duan@amlogic.com>
6 years agoclock: G12A: fine-tune pcie/common pll parameters
Qiufang Dai [Wed, 31 Jan 2018 09:53:16 +0000 (17:53 +0800)]
clock: G12A: fine-tune pcie/common pll parameters

PD#156734: clock: G12A: fine-tune pcie/common pll parameters

Change-Id: Ifbd8d07928deeebaa35c4f950efc290b1648394e
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agohdmitx: update 1080p60hz parameters
Yi Zhou [Thu, 1 Feb 2018 09:28:11 +0000 (17:28 +0800)]
hdmitx: update 1080p60hz parameters

PD#156734: hdmitx: update 1080p60hz parameters

Change-Id: Ic715b177c9320f97066187725a576780d656305d
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agovideo: enable vd1 scaler mem_pd for g12a
Brian Zhu [Thu, 1 Feb 2018 10:06:12 +0000 (18:06 +0800)]
video: enable vd1 scaler mem_pd for g12a

PD#156734

Change-Id: I8cfcf9fea8513eb5bd13cf292a7c378063247159
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agodi: G12A skt dts add di support
kele bai [Tue, 30 Jan 2018 08:04:44 +0000 (16:04 +0800)]
di: G12A skt dts add di support

PD#156734: di: G12A skt dts add di support

Change-Id: I95baa216f26af8e2e4da195ef8682cee04ef8660
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agoaudio: auge: add sound driver for g12a
Xing Wang [Fri, 5 Jan 2018 10:02:51 +0000 (18:02 +0800)]
audio: auge: add sound driver for g12a

PD#156734: audio: auge: add sound driver for g12a

Change-Id: Ic2e9bf734ea33fbbf2911d0d9168934974f37b07
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agodi: G12A add di support
kele bai [Thu, 4 Jan 2018 11:20:30 +0000 (19:20 +0800)]
di: G12A add di support

PD#156734: G12A add di support
1) add new mtn&cont&mcinfo&mv&if0 mif
2) add nr downscale
3) post viu link case
4) add pps

Change-Id: Id9ce920323d4324f0e1429df787f8af2dad07318
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agovpu: optimize get_vpu_clk with clktree api
Evoke Zhang [Mon, 26 Feb 2018 07:05:15 +0000 (15:05 +0800)]
vpu: optimize get_vpu_clk with clktree api

PD#156734: vpu: optimize get_vpu_clk with clktree api
use clk_hw_get_rate instead of clk_get_rate.

Change-Id: Ib2d72c04d4df9acbacf06d189bbbce378f582716
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoosd: compatible with previous chip
Brian Zhu [Wed, 31 Jan 2018 10:58:09 +0000 (18:58 +0800)]
osd: compatible with previous chip

PD#156734:

Change-Id: I4f0ea8121af271fb9e8fd60876fe6c59fe9faaaf
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agodts: add g12a skt dts
Qiufang Dai [Mon, 29 Jan 2018 11:52:46 +0000 (19:52 +0800)]
dts: add g12a skt dts

PD#156734: dts: add g12a skt dts

Change-Id: I40ce169cabd1c53f7b7b8299bb3e11adbe29a35f
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agosdcard: enable sdcard for G12A
Yonghui Yu [Sun, 28 Jan 2018 13:52:19 +0000 (21:52 +0800)]
sdcard: enable sdcard for G12A

PD#156734: clock tree, pinmux tested.

Change-Id: I11088ea6d27c1788516c1b55c4ec81ade99ca112
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
6 years agovpp: init viu1 path for g12a
Brian Zhu [Sat, 24 Feb 2018 05:02:45 +0000 (13:02 +0800)]
vpp: init viu1 path for g12a

PD#156734: G12A: vpp: init viu1 path for g12a

Change-Id: Ide96b364aa86638597e606c3b53401c84b7e201d
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agoosd: add osd support for g12a
pengcheng chen [Thu, 14 Dec 2017 11:21:23 +0000 (19:21 +0800)]
osd: add osd support for g12a

PD#156734: osd: add osd support for g12a

Change-Id: I7192f0377da899846219af8d934a50f57fecbe29
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agosecmon: G12A: enable secmon driver in dts
Qiufang Dai [Fri, 26 Jan 2018 11:05:54 +0000 (19:05 +0800)]
secmon: G12A: enable secmon driver in dts

PD#156734: secmon: enable secmon driver in dts

Change-Id: I32a3d5c3505de1c44c8be6b82a7e10ec1fc0a3de
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agoclock: G12A: new add decode, t_sensor clock & vclk2 clk tree
Qiufang Dai [Fri, 26 Jan 2018 02:59:07 +0000 (10:59 +0800)]
clock: G12A: new add decode, t_sensor clock & vclk2 clk tree

PD#156734: clock: G12A: new add decode, t_sensor clock & vclk2 clk tree

Change-Id: I1a76bb870ecb5793ae7b560472fd2c2aa3f3651f
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agovpu: update mem_pd control for g12a
Evoke Zhang [Sat, 24 Feb 2018 02:44:13 +0000 (10:44 +0800)]
vpu: update mem_pd control for g12a

PD#156734: vpu: update mem_pd control for g12a
also add vpu power on init function to avoid uboot coupling

Change-Id: Idcf435d7ec2c0e49f2b115102fba10ae9ee86b9d
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoarm64: dts: meson-g12a: add i2c DT info [2/2]
Jian Hu [Tue, 9 Jan 2018 12:57:56 +0000 (20:57 +0800)]
arm64: dts: meson-g12a: add i2c DT info [2/2]

PD#156734: arm64: dts: meson-g12a: add i2c DT info

Change-Id: I9ff9a61319bbac54722e15c84fa3a19653c481ce
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agodts: add dvalin config
Jiyu Yang [Mon, 25 Dec 2017 06:26:45 +0000 (14:26 +0800)]
dts: add dvalin config

PD#156734: add dvalin gpu config

Change-Id: Ib30694b302ae9e2839cb2f64e076934c041f9ff0
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
6 years agoge2d: add ge2d support for g12a
zhilei.wu [Sat, 24 Feb 2018 07:44:27 +0000 (15:44 +0800)]
ge2d: add ge2d support for g12a

PD#156734: ge2d: add ge2d support for g12a

support src2 blend

Change-Id: I5b8acd95d54d4c6160290a7d0254f8e96e20ce4b
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
6 years agowatchdog: add meson watchdog driver v3
Bo Yang [Sun, 21 Jan 2018 09:52:18 +0000 (17:52 +0800)]
watchdog: add meson watchdog driver v3

PD#156734: watchdog: add meson watchdog driver v3

Change-Id: I5aac3393fd56b9961d669ca990dea0b7d42ee016
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agoarm64: dts: meson-g12a: add pwm DT info [2/2]
Jian Hu [Mon, 8 Jan 2018 13:36:16 +0000 (21:36 +0800)]
arm64: dts: meson-g12a: add pwm DT info [2/2]

PD#156734: arm64: dts: meson-g12a: add pwm DT info

Change-Id: Iff1ed3709c66e97ac0334290d873b8a67544a6f2
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agomedia: add codec_io and canvas module for g12a
Brian Zhu [Tue, 16 Jan 2018 12:25:59 +0000 (20:25 +0800)]
media: add codec_io and canvas module for g12a

PD#156734: G12A: media: add codec_id and canvas module

Change-Id: Ib0e4ef05c237c313f483ebe2b029bf50f57d1c0a
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agopwm: meson-g12a: add pwm support [1/2]
Jian Hu [Mon, 8 Jan 2018 13:02:08 +0000 (21:02 +0800)]
pwm: meson-g12a: add pwm support [1/2]

PD#156734: pwm: meson-g12a: add pwm support

Change-Id: I30b996a96e9c731379c10b4a09c4ff751d84140b
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agoi2c: meson-g12a: add i2c support [1/2]
Jian Hu [Tue, 9 Jan 2018 12:33:41 +0000 (20:33 +0800)]
i2c: meson-g12a: add i2c support [1/2]

PD#156734: i2c: meson-g12a: add i2c support

Change-Id: I10ac105b99f7a426e23fef501741a62d3b887985
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agoG12A: psci: enable psci in dts
Qiufang Dai [Thu, 11 Jan 2018 08:41:15 +0000 (16:41 +0800)]
G12A: psci: enable psci in dts

PD#156734: G12A: psci: enable psci in dts

Change-Id: I448e6a85e2ecf0ed8870c9b883b598c51f5d7b74
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agoclock: G12A: add sys_pll/hifi_pll/gp0_pll table
Qiufang Dai [Mon, 8 Jan 2018 13:10:53 +0000 (21:10 +0800)]
clock: G12A: add sys_pll/hifi_pll/gp0_pll table

PD#156734: pll freq table which 3G < DCO < 6G

Change-Id: Ia1cadbd13af57d45a3a6d7b1bf65b8a055f4f91f
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agohdmitx: hdmitx bringup for g12a
Yi Zhou [Sat, 24 Feb 2018 02:11:54 +0000 (10:11 +0800)]
hdmitx: hdmitx bringup for g12a

PD#156734: hdmitx: hdmitx bringup for g12a

Change-Id: Ie99915e69c90e3335183692611d8b92f7d3620ef
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agovout_serve: add vout, vout2 support for g12a
Evoke Zhang [Tue, 2 Jan 2018 03:27:09 +0000 (11:27 +0800)]
vout_serve: add vout, vout2 support for g12a

PD#156734: vout_serve: add vout, vout2 support for g12a

Change-Id: I1cb45beca5325f9013901687d7d995bfb9a25766
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agovpu: add vpu support for g12a
Evoke Zhang [Fri, 29 Dec 2017 14:11:10 +0000 (22:11 +0800)]
vpu: add vpu support for g12a

PD#156734: vpu: add vpu support for g12a

Change-Id: I65f559e34408a6c2ecf2ff8b34a3fe1f9d1e440a
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agopinctrl: add pinctrl&gpio support for g12a
Xingyu Chen [Sat, 24 Feb 2018 06:22:42 +0000 (14:22 +0800)]
pinctrl: add pinctrl&gpio support for g12a

PD#156734: pinctrl: add pinctrl&gpio support for g12a

the new pin feature (drive-strength) is first introduced in Meson
Series SoC [G12A]. we can refer the following example to use:
mux {
groups = "uart_ao_tx_a", "uart_ao_rx_a";
function = "uart_ao_a";

drive-strength = <1>;
}

the value of drive-strength can be set to 0/1/2/3, the larger
the value, the faster the slew rate.

Change-Id: I22c6967aa1d5de1b3f6acb84cb18a79b05c0403b
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
6 years agoirqchip: add gpio IRQ support for g12a
Xingyu Chen [Tue, 2 Jan 2018 04:01:40 +0000 (12:01 +0800)]
irqchip: add gpio IRQ support for g12a

PD#156734: irqchip: add gpio IRQ support for g12a

Change-Id: I6eac421ca9ac9d908f3c52f0417da32fdde74c57
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
6 years agoclock: G12A media/gpu/fclk_div2p5 clk
Qiufang Dai [Tue, 2 Jan 2018 11:56:29 +0000 (19:56 +0800)]
clock: G12A media/gpu/fclk_div2p5 clk

PD#156734: G12A media/gpu/fclk_div2p5 clk

Change-Id: I804fdfff57f841a9628bc4a35cbc2ba63fe076c6
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agoclock: clock tree for G12A
Qiufang Dai [Sat, 23 Dec 2017 09:32:27 +0000 (17:32 +0800)]
clock: clock tree for G12A

PD#156734: base clock tree for G12A,
include clk81, ee gate, sdemmc clock, fix/hifi/syspll/pcie plls, mpll, clkmsr

Change-Id: I9fe7c1d64d9db5d384070f5dcefdc69f5f60dbd2
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agocpuinfo: cputype api for G12A
Qiufang Dai [Mon, 18 Dec 2017 13:56:00 +0000 (21:56 +0800)]
cpuinfo: cputype api for G12A

PD#156734: cpuinfo: cputype api for G12A

Change-Id: Ib21038d4c622d0ca48c714f3773e63c89c408929
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agoG12A: initial clk headfile for pxp
Qiufang Dai [Wed, 13 Dec 2017 03:56:38 +0000 (11:56 +0800)]
G12A: initial clk headfile for pxp

PD#156734: G12A: initial clk headfile for pxp

Change-Id: I82b549cea704d9d1b94b36dfb27eaf5547bcf172
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agoG12A: initial dts porting for pxp
Qiufang Dai [Tue, 12 Dec 2017 11:55:02 +0000 (19:55 +0800)]
G12A: initial dts porting for pxp

PD#156734: G12A: initial dts porting for pxp

Change-Id: I84d9bd5eb97c0ae0e04f17cd1e41b68fead0ed05
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agoARM64: DTS: drop the q200 dts
Yixun Lan [Fri, 23 Feb 2018 07:19:28 +0000 (15:19 +0800)]
ARM64: DTS: drop the q200 dts

PD#NONE: ARM64: DTS: drop the q200 dts

This will revert the Merge commit fa121b2d3444 which introduced
by accident. After this is done, the result version is equal to
commit cc1dabc1824c

Change-Id: I0a4e5b9a41c09f9fc6eaaf55c4453219c17c59ab
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
6 years agoPD#NONE: test git right
Yalong Liu [Fri, 23 Feb 2018 06:12:34 +0000 (14:12 +0800)]
PD#NONE: test git right

Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
6 years agoMerge branch 'amlogic-4.9-dev' of git://git.myamlogic.com/kernel/common into amlogic...
Yalong Liu [Thu, 22 Feb 2018 02:15:48 +0000 (10:15 +0800)]
Merge branch 'amlogic-4.9-dev' of git://git.myamlogic.com/kernel/common into amlogic-4.9-dev

6 years agomedia: codec_mm: fixed some bugs
Zhi Zhou [Wed, 20 Sep 2017 03:31:55 +0000 (11:31 +0800)]
media: codec_mm: fixed some bugs

PD#154520: media: fixed some bugs
1. codec_mm: fixed alloc & free statistics error bug
2. codec_mm: when some buffers have used. a big size alloc failed,
   because of faragmented.
   add retry for alloc small size.
   and del some dump infos
3. codec_mm: fixed codec_mm fast play bug
4. don't used system's cma pool

Change-Id: I047f1bed75729cf6fe14040243d82906832c9497
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
6 years agohdmirx: fix hdmirx soundless issue
Yicheng Shen [Wed, 14 Feb 2018 02:49:21 +0000 (10:49 +0800)]
hdmirx: fix hdmirx soundless issue

PD#159963 hdmirx: fix hdmirx soundless issue

Change-Id: I60a63af785d3a9c737814ad2d079905e4f0f07a8
Signed-off-by: Yicheng Shen <yicheng.shen@amlogic.com>
6 years agodi: decoder buffer mangement changed for multi decode
kele bai [Tue, 13 Feb 2018 07:44:13 +0000 (15:44 +0800)]
di: decoder buffer mangement changed for multi decode

PD#152765: di: no put decoder buffer after unreg

Change-Id: Ifb68b53ab35ac94905b59b0400213814a5ee6ec9
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agohdmi_tx: solve audiopolicy update at flash plug issue[1/1]
Lianlian Zhu [Wed, 7 Feb 2018 14:08:16 +0000 (22:08 +0800)]
hdmi_tx: solve audiopolicy update at flash plug issue[1/1]

PD#155057: add a delay of 2000ms for disconect to filt the flash plug

Change-Id: Ic5402ccf9f03293a87ee0321c7f8754b2a1c5310
Signed-off-by: Lianlian Zhu <lianlian.zhu@amlogic.com>
6 years agovdin: fix black screen caused by vdin_check_vs
Bencheng Jing [Fri, 9 Feb 2018 14:55:08 +0000 (22:55 +0800)]
vdin: fix black screen caused by vdin_check_vs

PD#160716: vdin: fix black screen caused by vdin_check_vs

1.add vdin msrclk in dts
2.remove vdin_check_vf

Change-Id: Ie0a63821f2eea85cf8f67202b067e4f2b491066c
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
6 years agodrm: enable q200 drm dts
Yalong Liu [Tue, 23 Jan 2018 05:57:35 +0000 (13:57 +0800)]
drm: enable q200 drm dts

PD#158474: enable q200 drm dts

Change-Id: If9f08e4b78c9cd0ba4c3307740ad9b53dc73937a
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
6 years agosound: resove external loopback for 2ch pdm + 2ch loopback on axg
Peipeng Zhao [Sun, 11 Feb 2018 07:07:19 +0000 (15:07 +0800)]
sound: resove external loopback for 2ch pdm + 2ch loopback on axg

PD#160814: sound: resove external loopback for 2ch pdm + 2ch loopback

Change-Id: I7a558dcc3850d4d174faa3c9259394b78bf8f45b
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
6 years agodi: fix pulldown crash caused by wrong pointer
Bencheng Jing [Thu, 1 Feb 2018 13:33:01 +0000 (21:33 +0800)]
di: fix pulldown crash caused by wrong pointer

PD#160099: di: fix pulldown crash
1) fix pulldown info bit error

Change-Id: I9c111cda6efb7b3161f601d6ffe3c17838108b4a
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
6 years agotvafe: fix palm/n flash on adjust CROSS
Nian Jing [Wed, 7 Feb 2018 03:40:59 +0000 (11:40 +0800)]
tvafe: fix palm/n flash on adjust CROSS

PD#160251: fix palm/n flash on adjust CROSS

Change-Id: Ic4a122b45a0bbeba7cbc277d73fc720e8c4d212e
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agohdmitx: remove unused print message
Zongdong Jiao [Wed, 7 Feb 2018 07:21:55 +0000 (15:21 +0800)]
hdmitx: remove unused print message

PD#160315: hdmitx: remove unused print message
1. if current cmd is correct, no need print extra info any more.
2. correct cmd judgement

Change-Id: I088ace66eba224359b57f6cf190eefee3076304b
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
6 years agoDRM: fix gem_prime_get_sg_table
Yalong Liu [Tue, 6 Feb 2018 08:24:48 +0000 (16:24 +0800)]
DRM: fix gem_prime_get_sg_table

PD#158474: fixed gem_prime_get_sg_table

modified gem_prime_get_sg_table by allocating
a sg_table for this GEM object through
sg_alloc_table and sg_set_page APIs

Change-Id: Idb7446e8ffa8700a2b8e2a2b2db1c5c3c4d62eb5
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
6 years agomm: Improve page trace and mm debug function
tao zeng [Wed, 7 Feb 2018 02:18:07 +0000 (10:18 +0800)]
mm: Improve page trace and mm debug function

PD#160479: mm: Improve page trace and mm debug function

1. Use page->flags to store trace value in 64bit Kernel;
   And this feature can be enabled default, without any
   memory usage increase;
2. Sort and optimize common caller find function in pagetrace;
3. Add some debug print for secmon/of-reserved memory.

Change-Id: I70ce1629889934a5bf31b91df570afa537339479
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
6 years agotvafe: modify avdetect config process
Nian Jing [Wed, 3 Jan 2018 03:19:44 +0000 (11:19 +0800)]
tvafe: modify avdetect config process

PD#154265: modify avdetect config process

Change-Id: I889e4244abf1a8e3ed83e7cb3d1a2d4983dc09ba
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agoMerge "amvecm: fix pq load fail" into amlogic-4.9-dev
Jianxin Pan [Tue, 6 Feb 2018 02:29:17 +0000 (18:29 -0800)]
Merge "amvecm: fix pq load fail" into amlogic-4.9-dev

6 years agoamvecm: fix pq load fail
MingLiang Dong [Sat, 3 Feb 2018 05:54:10 +0000 (13:54 +0800)]
amvecm: fix pq load fail

PD#158996: amvecm: fix pq load fail

Change-Id: I23d26427ebff2d13c2ea95ffa0b97c9b9a14f865
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>