Nan Li [Tue, 9 Jan 2018 11:44:58 +0000 (19:44 +0800)]
emmc: optimize emmc driver configs.
PD#158348: modify emmc dts config data to match data.
Change-Id: Id1f29a8f5b47342376cfa976c6dba7e88bcc5514
Signed-off-by: Nan Li <nan.li@amlogic.com>
Yueguie He [Wed, 10 Jan 2018 05:22:33 +0000 (13:22 +0800)]
audio: tdm: set tdmin max channals by dts
PD#158473: set tdmin max channals by dts
Change-Id: Ia6ff262fec6b3c156ac35f89b72cd690621f12fc
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
kele bai [Wed, 20 Dec 2017 02:12:46 +0000 (10:12 +0800)]
di: add protection for no mirror function
PD#157314: di: add protection for no mirror function
1) disable mirror function, set keep frame to 0 avoid post process
buffer
2) modify for keep function, avoid crash caused by calling de post
in blankout mode
3) move mutex operation out of tasklet
4) remove framereset in hw disable function
Change-Id: I6166a855a7fe6ad38a21c570e9ad0a6f9a204424
Signed-off-by: kele bai <kele.bai@amlogic.com>
Renjun Xu [Tue, 9 Jan 2018 07:53:15 +0000 (15:53 +0800)]
led: modify ledring for mic board
PD#157849: modify ledring for mic board
Change-Id: I81c8400ee559dcf6f2bc3620d75e449c360df4f3
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
Rongjun Chen [Tue, 5 Dec 2017 06:12:35 +0000 (14:12 +0800)]
wifi: add wifi build in support[2/2]
PD#158061: wifi: add wifi build in supportD
Change-Id: I42987b8579035cc0ca83d286f7a46fc0b83047e9
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
hong.guo [Tue, 9 Jan 2018 08:36:07 +0000 (16:36 +0800)]
alarm: fixed the tiemerE counter's reading order
PD#157845: fixed the tiemerE counter's reading order
Change-Id: Ieccfc2fded45da398fa45e957497eff670790fa6
Signed-off-by: hong.guo <hong.guo@amlogic.com>
Peipeng Zhao [Mon, 8 Jan 2018 11:51:22 +0000 (19:51 +0800)]
audio: add headphone and microphone detect feature
PD#158258: audio: add headphone and microphone detect feature
Change-Id: Iaf6170904470753b5c826fdbcbd4fac3c7884c8c
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
Zhi Zhou [Tue, 9 Jan 2018 06:28:24 +0000 (14:28 +0800)]
media: codec_mm: del a printk info
PD#157881: disabled a debug msg info.
this msg is not a bug.
Change-Id: I043c57955646bcff92ee2dd9dbe41b8485e7c136
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
Yicheng Shen [Thu, 4 Jan 2018 02:56:31 +0000 (10:56 +0800)]
hdmirx: enable the hdmirx module and code optimize
PD#158047: hdmirx: enable the hdmirx module and code optimize
1.Enable hdmirx in meson64_defconfig;
2.Remove useless code;
3.Add EXTCON interface(communicate with systemcontrol);
4.Modify dump esm log methode;
5.Modify esm/skp clk handle(use clk tree);
6.Fix coding style errors;
Change-Id: I62982ab8f5a6a3b1f482759cd8c2c79236951783
Signed-off-by: Yicheng Shen <yicheng.shen@amlogic.com>
Xing Wang [Mon, 8 Jan 2018 08:17:38 +0000 (16:17 +0800)]
audio: dts: disabled dmic
PD#157997: audio: dts: disabled dmic
Change-Id: I7d43dccdfea30eb3de6e6243bbc64c279a4edb6b
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Victor Wan [Mon, 8 Jan 2018 10:44:19 +0000 (18:44 +0800)]
Merge branch 'android-4.9' into amlogic-4.9-dev
Conflicts:
arch/arm/configs/omap2plus_defconfig
drivers/Makefile
drivers/android/binder.c
Bencheng Jing [Thu, 28 Dec 2017 09:30:07 +0000 (17:30 +0800)]
di: move enable pre mif before frame reset avoid timeout
PD#154836: di: move enable pre mif before frame reset avoid timeout
1) enable pre mif before&after frame reset for
mc mif will be clear by pre frame reset
Change-Id: Ied15c337c4b28a62a873bd36361357b8fecdaf32
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
Nan Li [Thu, 4 Jan 2018 08:09:31 +0000 (16:09 +0800)]
sd: add the polling method of sd card_detect
PD#156898: add the polling method of sd card_detect,
because gpio irq remove raising & falling trigger method.
Change-Id: If270d27619d2686e74fe5e6d02748242faec4ce8
Signed-off-by: Nan Li <nan.li@amlogic.com>
Xingyu Chen [Thu, 14 Dec 2017 13:04:29 +0000 (21:04 +0800)]
pinctrl: define the pinmux with the same format [4/4]
PD#157965: pinctrl: define the pinmux with the same format.
there are two different pin controllers in Meson Soc Series, one of
them uses continuous 4-bit register to select function for each pin
(Eg: AXG and next), the other use indefinite bits that maybe from
different registers (Eg: Before AXG and GXLX)
previously, the driver use two different format to define the pinmux,
as follows:
[1] Before AXG and GXLX:
mux {
groups = "uart_ao_tx_a", "uart_ao_rx_a";
function = "uart_ao_a";
}
[2] AXG and next
mux {
pins = "GPIOAO_0", "GPIOAO_1";
function = "uart_ao_a";
}
which is a little confusing，and in this patch define the pinmux with
one format[1].
Change-Id: I04fb256294e1b664224c50a1baa622eb3a50b1c1
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Xingyu Chen [Thu, 14 Dec 2017 07:59:11 +0000 (15:59 +0800)]
pinctrl: separate soc drivers [3/4]
PD#157965: pinctrl: separate soc drivers
When meson pinctrl is enabled, all meson platforms pinctrl drivers are
built in the kernel, with a significant amount of data.
This leads to situation where pinctrl drivers targeting an architecture
are also compiled and shipped on another one (ex: meson8 - ARM - compiled
and shipped on ARM64 builds). This is a waste of memory we can easily
avoid.
This change makes 3 pinctrl drivers (1 per SoC) out the original single
driver, allowing to compile and ship only the ones required.
porting from the upstream v4.15-rc2, commits as follows:
commit
277d14eb815fdfb95a72ea126bc09f75a2bd58fd
Change-Id: I68832eaf4a86233f89b8c32c44aaaab3593711d7
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Xingyu Chen [Thu, 14 Dec 2017 05:03:27 +0000 (13:03 +0800)]
pinctrl: get rid of unneeded domain structures [2/4]
PD#157965: pinctrl: get rid of unneeded domain structures
porting from the upstream v4.15-rc2, commits as follows:
commit
db80f0e158e62164308a857bce442dfeddb5c29e
Change-Id: I7c65b6844159378b7ef766569cb373fb78997d51
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Xingyu Chen [Wed, 13 Dec 2017 12:05:49 +0000 (20:05 +0800)]
pinctrl: remove offset and pin_base from pinctrl [1/4]
PD#157965: pinctrl: remove offset and pin_base from pinctrl
porting from the upstream v4.15-rc2, commits as follows:
commit
634e40b0c2bde81051e309cdfe4c26bbca3164ec
commit
70e5ecb1b994f2704c234cb12366d45474b98f32
commit
40833a84faed72f333b1626f00f59e6bebea4d98
commit
6affd6981ca5d2b1d3d9d5191b18bd4a692587fe
Change-Id: Ia856617fc202589199a9fc47664886a25779e8a0
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Xingyu Chen [Sat, 30 Sep 2017 06:53:15 +0000 (14:53 +0800)]
irqchip: replace the gpio IRQ driver with upstream
PD#151900: irqchip: replace the gpio IRQ driver with upstream v4.15-rc2
1) separate the driver from the pinctrl driver
2) add support for GPIOAO* of M8B as interrupt source
3) irq lines of GPIOAO* maximum up to eight
4) remove the GPIO IRQ Controller in AO domain
note that the driver does not support for detecting the double-edge signal
through the pin，if you have related needs, please consider using polling.
test pass on axg_skt, p212
Change-Id: Iaa8da8a0cbfa0fe90d26fc8c2b775e045c8768f2
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
tao zeng [Wed, 3 Jan 2018 04:32:54 +0000 (12:32 +0800)]
mm: fix first 256MB lost problem
PD#157955: fix first 256MB lost problem
1. add Makefile.boot for define of ZRELADDR/
PARAMS_PHYS/INITRD_PHYS
2. remove config of ARM_PATCH_PHYS_VIRT/AUTO_ZRELADDR
to avoid boot panic when first 256MB memory enabled
Change-Id: I0495803f22bcfaa550437169a345adc988b40ef7
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
Xingyu Chen [Mon, 25 Dec 2017 05:54:14 +0000 (13:54 +0800)]
dts: add dts for r311 with memory 1G
PD#158049: dts: add dts for r311 with memory 1G
1. add pinmux definition of lcd in dts for r311
2. disable hdmitx for r311
Change-Id: I827f2a4ce1b2408166983d41b75b4b0b1ea9651b
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Peipeng Zhao [Tue, 2 Jan 2018 11:19:40 +0000 (19:19 +0800)]
sound: meson: add audio split mmap mode
PD#157943: sound: add audio split mmap mode on meson directory for gxl chip
1. i2s in mmap
2. pdm in mmap
3. pdm in supports sample rate
4. if enable to mmap, please enable CONFIG_AMLOGIC_SND_SPLIT_MODE_MMAP
Change-Id: I08e94c0332269db7c3fa1e42e02a9b17cb4a4b84
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
Larson Jiang [Wed, 3 Jan 2018 05:37:18 +0000 (13:37 +0800)]
wifi/bt: for wifi/bt share the power pin
PD#156561: for wifi/bt share the power pin
Change-Id: Id10edb58cf6d6d8658c40b6d1ec7004838527efe
Signed-off-by: Larson Jiang <larson.jiang@amlogic.com>
Xing Wang [Fri, 29 Dec 2017 13:46:25 +0000 (21:46 +0800)]
audio: meson: fixed kenerl panic and no sound card issue
PD#157797: audio: meson: fixed kenerl panic and no sound card issue
1. fixed kernel panic for txlx codec when reboot
2. solve pinmux conflicted for dmic
3. fix i2s mpll of dts config
3. fix tv sound card name of dts config
Change-Id: I88537ac7a3ee9e949cb89c5cd047b9bd9f4ef169
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Zhiwei Gong [Tue, 2 Jan 2018 04:45:27 +0000 (12:45 +0800)]
dts: fix q201 build error
PD#156681: dts: fix q201 build error
fix q201 build error
Change-Id: Ifca66ee62f30251399bbcda82b24b9e8e033ae7c
Signed-off-by: Zhiwei Gong <zhiwei.gong@amlogic.com>
Ao Xu [Mon, 25 Dec 2017 08:19:30 +0000 (16:19 +0800)]
USB: gadget: add mtp 32bit ioctl support
PD#156196: USB: gadget: add mtp 32bit ioctl support
Change-Id: Ic83ca7f6b6736070e8ac435630a16a5a80014922
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
Zhiwei Gong [Tue, 21 Nov 2017 02:20:46 +0000 (10:20 +0800)]
dts: Add gxm q201 dts
PD#156681: dts: Add gxm q201 dts for s912 bringup
Add gxm q201 dts
Change-Id: Idcd0ff7ded99c196e362d966062bcfb09d41a378
Signed-off-by: Zhiwei Gong <zhiwei.gong@amlogic.com>
Weiming Liu [Thu, 21 Dec 2017 10:16:25 +0000 (18:16 +0800)]
lcd_extern: add st7701 driver
PD#157223: lcd_extern: add st7701 driver for CES
Change-Id: I49d6930c4a4358a8a97a73cbe0194a77f39f55e3
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
tao zeng [Thu, 21 Dec 2017 10:07:37 +0000 (18:07 +0800)]
mm: fix lowmem issue
PD#157252: mm: fix lowmem issue
1. add statistics for CMA pages;
2. reduce cma print and not protect cma unless driver called;
3. fix cma usage policy in alloc path;
4. increase file scan ratio in kswapd;
5. using NOOP for default IO-scheduler;
6. change alloc flags of ZRAM to retry harder.
Change-Id: If7b0363da03da1682efe3996c69bb9d511299209
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
Weiming Liu [Mon, 20 Nov 2017 05:24:27 +0000 (13:24 +0800)]
lcd: add lcd support for txlx
PD#154260: lcd: add txlx support
Add panel dtsi for txlx r311.
Also add backlight local dimming driver.
Change-Id: I8d6cbc0a2099c17de1adc4087a3f58e1c34264ae
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
Yi Zhou [Fri, 22 Dec 2017 09:13:24 +0000 (17:13 +0800)]
hdmitx: fix the non_hdr effect in UI
PD#156644: hdmitx: fix the non_hdr effect in UI
Change-Id: I9b31757838a422bdf2e8c67bb838bb1bbc8dc497
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
tao zeng [Thu, 28 Dec 2017 09:07:53 +0000 (17:07 +0800)]
WenCai You [Wed, 27 Dec 2017 11:03:50 +0000 (19:03 +0800)]
dts: add p241 partition table for cts [1/2]
PD#156150: dts: add p241 partition table for cts
cts require data partition at least 4G
1. change system to 1024M
2. change cache to 600M
Change-Id: I9a7e32fc863d58c5fd0b17e28aa7d35193c1dffb
Signed-off-by: WenCai You <wencai.you@amlogic.com>
Yixun Lan [Tue, 5 Sep 2017 04:17:20 +0000 (12:17 +0800)]
eth: phy: add the debug interface to read/write regs
PD#150437: eth: phy: add the debug interface to read/write regs
Change-Id: I206760b46c63fcea544cbfb2c127a6488ce4ad8f
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
tao zeng [Mon, 25 Dec 2017 02:36:14 +0000 (10:36 +0800)]
mmext: fix panic caused by page trace
PD#157417: mmext: fix panic caused by page trace
stackframe.graph is not init if CONFIG_FUNCTION_GRAPH_TRACER
is opened.
Change-Id: Iea270dadd4579e71a778d0da764c4da27323938e
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
Kaifu Hu [Thu, 21 Dec 2017 08:18:45 +0000 (16:18 +0800)]
hdmitx: update hdmitx driver
PD#154260: hdmitx: update hdmitx driver
1. using pr_info or pr_debug instead of printk.
2. remove unuse code.
3. change modulepara to sysfs.
4. use iomap api for read and write reg
Change-Id: I523329d7b26cd7c6675bdae55cda76a6a11c533e
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
hongmin hua [Tue, 21 Nov 2017 12:53:39 +0000 (20:53 +0800)]
cec: add cec support for txlx
PD#154260: cec: add cec support for txlx
Change-Id: I16465d59fe73e85f7e760a660260590bc179ee53
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
Xingyu Chen [Fri, 22 Dec 2017 11:53:28 +0000 (19:53 +0800)]
iomap: enable hiu interface for gxl/gxm
PD#154260: iomap: enable hiu interface for gxl/gxm
Change-Id: I0df51f9d782b17901a6b1ea7e6c5aa8a43703583
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
MingLiang Dong [Thu, 14 Dec 2017 10:57:13 +0000 (18:57 +0800)]
amvecm: add bitdepth config and keystone for txlx
PD#154260: amvecm: add bitdepth config and keystone for txlx
1. add bitdepth 10bit/12bit config for txlx
2. add keystone alg for txlx
Change-Id: Id3c31199dde9df9585c7d7a9d7ff5aab20d32d1f
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
Nian Jing [Thu, 30 Nov 2017 11:15:25 +0000 (19:15 +0800)]
tvin: tvafe: add tvafe driver support
PD#154260: tvin: tvafe: add tvafe driver support
1. palm paln pq adjust.
2. ntsc50 pq adjust.
Change-Id: I03b2e301d70a82560a37791457e524b916db3b16
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
kele bai [Wed, 22 Nov 2017 07:00:32 +0000 (15:00 +0800)]
di: merge latest di driver
PD#154260: di: add latest driver
1) add nr4&cue
2) remove pq releated hard-code
3) add pq load support
4) remove timerc, add hrtimer
5) remove tffbff detection
6) remove extern & global variables
7) move pulldown detection to separate directory
8) update amvecm head file
9) up to commit of PD#154436
Change-Id: I9cde21bb1fd4b4ee08ea88e883ef1c5368ad5b5d
Signed-off-by: kele bai <kele.bai@amlogic.com>
Yicheng Shen [Mon, 20 Nov 2017 04:18:58 +0000 (12:18 +0800)]
hdmirx: add hdmirx support for txlx
PD#154260: hdmirx: add hdmirx support for txlx
Change-Id: I26a0dee8aa79eec5f09d72b899ee067949380b12
Signed-off-by: Yicheng Shen <yicheng.shen@amlogic.com>
Bencheng Jing [Tue, 28 Nov 2017 05:00:01 +0000 (13:00 +0800)]
vdin: amlogic: add vdin driver support
PD#154260: vdin: amlogic: add vdin driver support
Merge from kernel 3.14.
Optimize and fix memset error.
Change-Id: I0707de5cb6313da4e1ff8a3a1e91dfb098234529
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
Nian Jing [Fri, 17 Nov 2017 12:14:34 +0000 (20:14 +0800)]
cvbs: add cvbs driver support for txlx
PD#154260: add cvbs driver support for txlx
Update dts for all platforms.
1. Remove get_cpu type api and support dts match table data.
2. Add clock tree support.
3. Add performance property in device node.
4. Add protection flag for clk_gate on/off.
Change-Id: I082e48ecbbb44cfec5deb31a3a73b67b31370798
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
Jiamin Ma [Fri, 22 Dec 2017 01:48:58 +0000 (09:48 +0800)]
unifykey: refine codes
PD#154260: refine unifykey codes
1. delete calling of cpu version related apis
2. replace self-implemented list with kernel-implemented one
3. delete unused MACRO defination
4. replace global variables with private data structure
5. define pr_fmt in each module
6. fix code defects:
e438
e527
e550
e570
e650
7. add safe guard
Change-Id: I3dc93e3fef8ccfe3593d3275a69e0e21786e3ef1
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
Xing Wang [Thu, 21 Dec 2017 14:10:21 +0000 (22:10 +0800)]
audio: meson: add sound driver support for txlx
PD#154260: audio: meson: add sound driver support for txlx
1. add sound driver support for txlx
2. add amaudio/amaudio2 driver
3. optimizing sound card driver
Change-Id: I726a139e6e34b82891ee4e72832dc529789f8ce7
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Evoke Zhang [Thu, 16 Nov 2017 10:39:56 +0000 (18:39 +0800)]
vout: update vout info support
PD#154260: vout: update vout info support
1. add htotal, vtotal support.
2. optimize dv_info, fresh_tx_pkt to vout_device.
3. add vinfo_base struct for vout IOCTL support.
4. set default invalid for hdmimode.
Change-Id: If9d99fd99b5f2d00eaee17504697c2dba3d47d6d
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Evoke Zhang [Tue, 14 Nov 2017 01:22:38 +0000 (09:22 +0800)]
vpu: add vpu support for txlx
PD#154260: vpu: add vpu support for txlx
Update dts for all platforms.
1. add support for txlx
2. add clktree support for clk change
3. remove unused vpu module for mem_pd
4. remove vpu_parent "vid_pll","mpll1","mpll2"
Change-Id: I43aa2435305fd02664ae825bc2f62664ffb526be
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
pengcheng chen [Fri, 17 Nov 2017 03:24:33 +0000 (11:24 +0800)]
osd: meson-txlx: add osd support
PD#154260: osd: meson-txlx: add osd support
Change-Id: I4c899bea555b7d654d8888a0c7433eb6c44893ad
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
Matthew Shyu [Tue, 7 Nov 2017 09:10:22 +0000 (17:10 +0800)]
crypto: meson-txlx: enable amlogic crypto dma
PD#154260: enable crypto driver
restructure crypto driver on top of dma and enable it on txlx
Change-Id: I0ffc0aaf9ad94c9652b9141bf92201c92463a893
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
Yue Wang [Tue, 26 Dec 2017 10:27:52 +0000 (18:27 +0800)]
usb: fix usb PLL set.
PD#157680: usb: fix usb PLL set.
meson-txlx: fix usb PLL set.
Change-Id: I3580e6d24a4bd9d22d4173fc370d5263339486f1
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
Jian Hu [Sat, 23 Dec 2017 06:23:45 +0000 (14:23 +0800)]
i2c: meson8b: add i2c surpport
PD#154260: i2c: meson8b: add i2c surpport
PD#157452: i2c: meson8b: add i2c surpport
1. add i2c surpport.
2. update gx/axg/txlx dts.
3. setup i2c b pinctrl for all platforms of axg.
Change-Id: I7fe41b7f42c741cb70cce1c4b7dd57d288deafa7
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Long Yu [Tue, 26 Dec 2017 08:13:48 +0000 (16:13 +0800)]
emmc: fixed emmc compatible in p241 dts
PD#157611: emmc: fixed emmc compatible in p214 dts
Change-Id: I6f45bf56770a7f4f936c79389f4755a85d7f8c64
Signed-off-by: Long Yu <long.yu@amlogic.com>
Evoke Zhang [Thu, 21 Dec 2017 10:58:23 +0000 (18:58 +0800)]
vout_serve: add extcon for display mode change.[1/2]
PD#157561: vout_serve: add extcon for display mode change
add extcon in vout_serve and eliminate the same mode in hdmitx
Change-Id: I1063facae39534d93720632cf441b45680da954c
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Long Yu [Tue, 26 Dec 2017 05:09:38 +0000 (13:09 +0800)]
emmc: refixed support for sdio wifi
PD#154260: emmc: refixed support for sdio wifi
1. adjust sdio timing parameters
Change-Id: Iecd400b0570c363cc1df450bc09f8dfa2d7fa533
Signed-off-by: Long Yu <long.yu@amlogic.com>
Long Yu [Mon, 25 Dec 2017 08:56:21 +0000 (16:56 +0800)]
emmc: refixed how to get host->data variable in M8bab
PD#154260: emmc: refixed how to get host->data variable for M8b
1. refixed how to get host->data variable
2. Compatible m8b and 905
Change-Id: I647fb191f71a3a4b6b63eee29be1a91e6581af12
Signed-off-by: Long Yu <long.yu@amlogic.com>
Long Yu [Fri, 22 Dec 2017 09:27:53 +0000 (17:27 +0800)]
emmc: add host->data variable in M8baby
PD#154260: emmc: Add host->data variable in M8b platform
1. add host->data variable in M8baby
Change-Id: I5ed70f3f1af96b225f018cbcf030c68e49929e1a
Signed-off-by: Long Yu <long.yu@amlogic.com>
Xingyu Chen [Fri, 17 Nov 2017 10:05:23 +0000 (18:05 +0800)]
iio: adc: meson-txlx: add sar adc support
PD#154260: iio: adc: meson-txlx: add sar adc support
Change-Id: I2a692adddcf3721fac1e24af251d14932ea7e0a5
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Bo Yang [Wed, 29 Nov 2017 13:17:37 +0000 (21:17 +0800)]
arm64: meson64_defconfig: add leds configuration
PD#154260: arm64: meson64_defconfig: add leds configuration
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PWM=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_TRIGGER_TRANSIENT=y
+CONFIG_LEDS_TRIGGER_PANIC=y
Change-Id: I9da3dfd9e61b16a50e25daffc3fb10094b06f63e
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Jian Hu [Tue, 21 Nov 2017 11:49:28 +0000 (19:49 +0800)]
arm64: dts: update i2c device node name for all platforms
PD#154260: arm64: dts: update i2c device node name for all platforms
This commit base on previous commit of i2c.
Change-Id: Ie5a3619db4739d7b9c9574f5628775b274681047
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Jian Hu [Mon, 18 Sep 2017 06:44:13 +0000 (14:44 +0800)]
i2c: meson: add i2c driver
PD#154260: i2c: meson: add i2c driver
Initial add i2c driver reference to upstream i2c.
Change-Id: I69c5b6e451c10232c183343b97a26a56cd3ba226
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Sunny Luo [Mon, 27 Nov 2017 03:37:25 +0000 (11:37 +0800)]
spicc: meson: add spicc driver support for txlx
PD#154260: spicc: meson: add spicc driver support for txlx
Move from upstream linux 4.14.
Change-Id: Ia5e4c76194974397bfb39d863b7a36f44ad4ecee
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
Bo Yang [Wed, 6 Dec 2017 07:17:25 +0000 (15:17 +0800)]
watchdog: meson: add debug info
PD#154260: watchdog: meson: add debug info
Change-Id: I98cb723099bc05f721ba8d52002cb724d9c5a978
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Yue Wang [Fri, 17 Nov 2017 07:40:15 +0000 (15:40 +0800)]
usb: meson-txlx: add usb host & device driver
PD#154260: usb: meson-txlx: add usb host & device driver
Change-Id: Ie7a1deba06bf97eb6e7f1ddc7876206d8b0a336d
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
Jian Hu [Tue, 21 Nov 2017 08:12:24 +0000 (16:12 +0800)]
pwm: meson-txlx: add pwm driver support
PD#154260: pwm: meson-txlx: add pwm driver support
Verified on pwm d channel,gpiodv_2 pin.
Change-Id: I8e2f5506a9f37791824c5dc1888a9fe2a3245b0e
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Nan Li [Thu, 23 Nov 2017 12:01:41 +0000 (20:01 +0800)]
emmc: use device data matching for different platform
PD#154260: emmc: use device data matching for different platform
Use device data matching for different platforms.
Optimize suspend & resume clksrc switch.
Optimize clksrc on HS400.
Change-Id: I6b927edf85062e1ddffe75e08331feff0b3de805
Signed-off-by: Nan Li <nan.li@amlogic.com>
Xingyu Chen [Sun, 12 Nov 2017 07:06:50 +0000 (15:06 +0800)]
arm64: dts: add dts for txlx
PD#154260: ARM64: dts: add dts for txlx
Change-Id: I4e6d7eca99a80b40bba23ee599d08a12489a07f0
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Renjun Xu [Fri, 22 Dec 2017 01:32:29 +0000 (09:32 +0800)]
dts: sync axg_s400.dts and axg_s400_v03.dts
PD#157225: sync axg_s400.dts and axg_s400_v03.dts
Change-Id: I851550eeb1b2c1d8c61f98435d83eb5b0d489667
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
Rongjun Chen [Tue, 19 Dec 2017 05:57:17 +0000 (13:57 +0800)]
PD# 156339 wifi: add prealloc mem size to fix vts test fail
Change-Id: I2c401e01c835626c16b271fc37d04a471e8d465a
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
Jianxin Pan [Thu, 21 Dec 2017 07:21:44 +0000 (23:21 -0800)]
Merge "audio: check toddr and fix clk of tdmout for loopback" into amlogic-4.9-dev
Renjun Xu [Thu, 21 Dec 2017 06:05:36 +0000 (14:05 +0800)]
ledring: add ledring rgb case
PD#156869: add ledring rgb case
Change-Id: I4015a7c16ddac575eada958633f43fcffbc3a577
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
Xing Wang [Tue, 12 Dec 2017 07:58:06 +0000 (15:58 +0800)]
audio: check toddr and fix clk of tdmout for loopback
PD#155103: audio: fix toddr checking and tdm clks for loopback
1) check toddr whether for loopback
2) fix clks of tdmout for loopback
Change-Id: Ifd5ddc88114ebb8e7dcf5a0e991ead9b190c8621
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Jian Hu [Fri, 10 Nov 2017 07:51:52 +0000 (15:51 +0800)]
clk: meson-txlx: add clock tree driver
PD#154260: clk: meson-txlx: add clock tree driver
Change clkc driver init order
The loading order of vpu driver is postcore_initcall,
but clock order is device_initcall.clock order should
be higher,change macro CLK_OF_DECLARE instead
Optimizing mux/div/gate descriptions.
Change-Id: I20cd8111ac6bd60f350cdddc224bad48c13fcfb1
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Xingyu Chen [Wed, 15 Nov 2017 08:21:52 +0000 (16:21 +0800)]
pinctrl: meson-txlx: add pinctrl & gpio driver
PD#154260: pinctrl: meson-txlx: add pinctrl & gpio driver
Change-Id: I279691096150ac3ed74660f1bcf602ae86b6b1e4
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Renjun Xu [Wed, 20 Dec 2017 11:29:25 +0000 (19:29 +0800)]
ledring: add ledring driver
PD#156869: add ledring driver
Change-Id: I162133eb7eedbf8705ec7c7cdd6ec401be9b92ea
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
Bencheng Jing [Tue, 19 Dec 2017 05:26:30 +0000 (13:26 +0800)]
di: modify true bypass conditions
PD#155786: di: modify true bypass conditions
Change-Id: I5e8ef74b87915870089497166d272830ceb453db
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
Xingyu Chen [Mon, 13 Nov 2017 06:49:51 +0000 (14:49 +0800)]
cpuid: amlogic: add cpu id for gxlx and txhd
PD#154260: add cpu id for gxlx and txhd
Change-Id: I346ba42dc3473626ab70e86bb8847e926e465576
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Bo Yang [Tue, 19 Dec 2017 09:21:39 +0000 (17:21 +0800)]
script: amlogic: add new build script
PD#154260: script: amlogic: add new build script
Add new kernel build script.
mkimage_32.sh for arm
mkimage_64.sh for arm64
Usage: mkimage_xx.sh [-k def] [-d dts | -p chip] [-f rootfs] [-c] [-h]
Examples:
# build kernel using default meson32_defconfig
mkimage_32.sh
# build kernel using default meson64_defconfig
mkimage_64.sh
# build kernel using defconfig specified by the option -k
# with full name.
mkimage_64.sh -k meson64_defconfig
# build all dtb for the board with prefix or suffix <p320>
# specified by the option -d
mkimage_64.sh -d p320
# build all dtb for the chip with prefix <txl>
# specified by the option -p
mkimage_64.sh -p txl
# make distclean and build kernel and dtb
mkimage_64.sh -k meson64_defconfig -d p320 -c
# make distclean
mkimage_64.sh -c
# print help
mkimage_64.sh -h
Change-Id: I617a2546a40ab74e741706f4625afb924421953a
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Ao Xu [Mon, 4 Sep 2017 02:07:34 +0000 (10:07 +0800)]
defconfig: add module version support
PD#149771: add module version support
A module compiled for one kernel won't load if
you boot a different kernel. If you're having
trouble loading the modules because of versioning
errors, compile a kernel with modversioning turned off.
Change-Id: Id00f10af84426a8f26a3439796d2de56e28fb9c6
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
jianxin.pan [Sun, 17 Dec 2017 15:21:14 +0000 (23:21 +0800)]
module: skip sublevel and crc when ver check
PD#157069: skip SUBLEVEL and crc when ver check durning insmod
When CONFIG_MODVERSIONS enabled, vermagic and crc are checked
durning insmod.
Change-Id: I6eb7bdda5b771afa754f7b783a7bbfe1be7cedd1
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
Yueguie He [Mon, 18 Dec 2017 13:48:49 +0000 (21:48 +0800)]
USB: add mass stoarge function
PD#157133: USB: add mass storage function
1. add udisk partition to s400 emmc dts
2. add mass storage config
Change-Id: I8e90403c2803e216b7f11a420c5087b3ef859746
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
Yixun Lan [Wed, 13 Dec 2017 05:48:50 +0000 (13:48 +0800)]
config: disable nfs client option [2/2]
PD#156770: config: disable nfs client option
this attempt to make android 8.1 compatible
Change-Id: I47d84695df00a9ab83a203565f3dd3cfd1a0159a
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
Yixun Lan [Wed, 13 Dec 2017 05:47:35 +0000 (13:47 +0800)]
config: enable BFP option [1/2]
PD#156770: config: enable BFP option
this attempt to make android 8.1 compatible
Change-Id: I2b0b91fe33902fc5680ffec62f2dc205c0b7c5f3
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
Jiamin Ma [Tue, 19 Dec 2017 06:33:26 +0000 (14:33 +0800)]
rng: replace abandoned rng register with new one
PD#157034: enable hw random generator for meson AXG
Change-Id: I0012465da1e7d22fc04a61de374277b2d6af32fd
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
Yi Zeng [Wed, 13 Dec 2017 07:55:43 +0000 (15:55 +0800)]
nand: add a error handler in aml_nand_add_partition
PD#156335: nand: add a error handler in aml_nand_add_partition
add a error handler in aml_nand_add_partition to avoid the endless
loop, when dts config a over size partition.
Change-Id: I8375990283bc6b36a09e09a37d041ebd929990d6
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
Jiamin Ma [Fri, 15 Dec 2017 12:42:07 +0000 (20:42 +0800)]
rng: enable hw random generator for meson AXG
PD#157034: enable hw random generator for meson AXG
Change-Id: Ie72368b25a1d028627d4212d31b49da33be3185f
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
Zhi Zhou [Fri, 15 Dec 2017 07:01:26 +0000 (15:01 +0800)]
media: codec mm scatter used reserved first.
PD#155696: if have reserved used reserved first
so we can init&play fast.
Change-Id: Id3c5319acef88d373ac1bf76bbb26163ab0c12d5
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
Yi Zeng [Fri, 17 Nov 2017 05:41:05 +0000 (13:41 +0800)]
nand: add three new slc-nand support
PD#154862: nand: add three new slc-nand support
According to new customer demand, we need add this three new nand into
our code:
1. GD 9FU1G8F2AMGI
2. Winbond W29N04GVSIAA
3. Samsung k9f2g08u0d
Change-Id: Ibb098fa79edca50613bbafb3ebcd706a86c46c3e
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
wenbiao zhang [Wed, 29 Nov 2017 05:55:06 +0000 (13:55 +0800)]
dts: add p241 buildroot v2 dts [1/2]
PD#154923: dts: add p241 v2 dts for v2 hardware
support multi dts for v1/v2 hardware
Change-Id: Ie0fade5d0d8cbfa200e7717219b1b0ba29e66da4
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
Jianxin Pan [Fri, 15 Dec 2017 02:04:34 +0000 (18:04 -0800)]
Merge "clk: update clk total number [1/1]" into amlogic-4.9-dev
Yi Zeng [Tue, 28 Nov 2017 11:55:50 +0000 (19:55 +0800)]
mtd: fix the macro of BCH mode index
PD#155673: mtd: fix the macro of BCH mode index
Change-Id: Iee7d1b11569411c2edcd43e2355299735b7dd1d1
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
Hui Zhang [Mon, 11 Dec 2017 06:16:55 +0000 (14:16 +0800)]
codec_mm: fixed scatter def setting [1/1]
PD#155696: fixed scatter def setting
Change-Id: I2c3299bd7003c340079622369e51407a823ce80e
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
Zhi Zhou [Thu, 16 Nov 2017 03:21:06 +0000 (11:21 +0800)]
media: fixed codec_mm fast play bug
PD#155696:
1. if no res & have cma_res, may crashed on
codec_mm alloc.
2. if cma res is not set the has_res, some module may alloc failed
on no res.
3. scatter memory fast wait used complete.
Change-Id: I2104ec948762ca587d0c90f221c811de6bc4d3c4
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
wenbiao zhang [Wed, 29 Nov 2017 12:48:08 +0000 (20:48 +0800)]
clk: update clk total number [1/1]
PD#152261: clk: update clk total number
add bt656 clk, but total number not update
Change-Id: I24f2f17e4e773a883bab3f564144a49768fc16d5
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
kele bai [Thu, 14 Dec 2017 06:57:49 +0000 (14:57 +0800)]
di: remove bypass pre print [1/1]
PD#156889: di: remove bypass pre process print
Change-Id: If9f6d4af26088b18d67072a01011aad3e64552cd
Signed-off-by: kele bai <kele.bai@amlogic.com>
pengcheng chen [Tue, 12 Dec 2017 05:46:20 +0000 (13:46 +0800)]
osd: fix cursor support with 32bit app[1/2]
PD#156057: osd: fix cursor support with 32bit app
Change-Id: I69f4c94ea16efca4e130af665e0fc7e4b05c5312
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
Luan Yuan [Mon, 11 Dec 2017 02:34:36 +0000 (10:34 +0800)]
dts: optimize p241 fb addr error [1/2]
PD#156267: optimize p241 fb addr error
Change-Id: I652fc5e2c068383700be58a0cc36be5fefaca14c
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
binqi.zhang [Fri, 8 Dec 2017 12:04:25 +0000 (20:04 +0800)]
revert "sync_file: Return consistent status in SYNC_IOC_FILE_INFO [2/3]"
This reverts commit
fe912ab314899e3add2993c630c15d28638a3348.
This reverts part commit of ARM and reserved original commit in upstread.
Change-Id: I4e0f39bee86342cd89aa2fb8f10c81f92e4b1985
Signed-off-by: binqi.zhang <binqi.zhang@amlogic.com>
Lianlian Zhu [Sat, 9 Dec 2017 11:18:56 +0000 (19:18 +0800)]
audio: fixed multi ch pcm switch to passthrough mute issue[3/3]
PD#154595: fixed multi ch pcm out to IEC raw out mute issue
Change-Id: I2a6643975bea0970e9fecbd59cc6282886eacdbb
Signed-off-by: LianLian Zhu <lianlian.zhu@amlogic.com>
Jian Hu [Fri, 8 Dec 2017 03:06:29 +0000 (11:06 +0800)]
arm64: dts: fix pwm c/d base reg for gx SoCs
PD#156419: arm64: dts: fix pwm c/d base reg for gx SoCs
Change-Id: Ie3d17330d2d460a1071c09efb9ce5521b8c80837
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
tao zeng [Mon, 11 Dec 2017 05:45:31 +0000 (13:45 +0800)]
mm: correct page stat API
PD#156236: mm: correct page stat API
Using mod_zone_page_state instead of __mod_zone_page_state to
avoid SMP warning of __this_cpu_preempt_check
Change-Id: I3f95768beabf5d330d13189d189b32aef39448cd
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
projects / platform / kernel / linux-amlogic.git / log