Commit Graph

641935 Commits

Author SHA1 Message Date
Bencheng Jing
7556ba8a7e 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>
2017-12-27 02:20:19 -07:00
Nian Jing
878e0f00be 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>
2017-12-27 02:19:52 -07:00
Jiamin Ma
e5c989c180 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>
2017-12-27 02:19:35 -07:00
Xing Wang
edf886094e 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>
2017-12-27 02:19:06 -07:00
Evoke Zhang
514dfc0efc 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>
2017-12-27 02:17:41 -07:00
Evoke Zhang
9585305649 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>
2017-12-27 02:17:11 -07:00
pengcheng chen
c4e118637c 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>
2017-12-27 01:39:17 -07:00
Matthew Shyu
6185bf05f9 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>
2017-12-27 01:38:34 -07:00
Yue Wang
9695264269 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>
2017-12-26 23:39:35 -07:00
Jian Hu
ce1681b1ae 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>
2017-12-27 14:01:23 +08:00
Long Yu
ed9d4cf21d 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>
2017-12-26 19:12:57 -07:00
Evoke Zhang
9adda5c93c 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>
2017-12-26 03:47:56 -07:00
Long Yu
d0a5e915d2 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>
2017-12-26 00:26:37 -07:00
Long Yu
94e0d11b88 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>
2017-12-25 16:56:35 +08:00
Long Yu
d7e777497e 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>
2017-12-22 17:28:04 +08:00
Xingyu Chen
7ab8721cfc 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>
2017-12-22 00:50:50 -07:00
Bo Yang
a910157748 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>
2017-12-22 00:49:49 -07:00
Jian Hu
b31f931bf6 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>
2017-12-22 00:49:25 -07:00
Jian Hu
071b97fd8a 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>
2017-12-22 00:47:24 -07:00
Sunny Luo
812545a94f 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>
2017-12-22 00:46:51 -07:00
Bo Yang
8ad4f7756b watchdog: meson: add debug info
PD#154260: watchdog: meson: add debug info

Change-Id: I98cb723099bc05f721ba8d52002cb724d9c5a978
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2017-12-22 00:45:17 -07:00
Yue Wang
135e4dae04 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>
2017-12-22 00:44:40 -07:00
Jian Hu
e1e8711e7f 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>
2017-12-22 00:44:14 -07:00
Nan Li
69ed27ff47 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>
2017-12-22 00:43:24 -07:00
Xingyu Chen
f30c29856c 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>
2017-12-22 00:42:09 -07:00
Renjun Xu
137c7dd411 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>
2017-12-22 09:32:38 +08:00
Rongjun Chen
b6cf6a60cc PD# 156339 wifi: add prealloc mem size to fix vts test fail
Change-Id: I2c401e01c835626c16b271fc37d04a471e8d465a
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
2017-12-21 00:47:30 -07:00
Jianxin Pan
dd1e17fefc Merge "audio: check toddr and fix clk of tdmout for loopback" into amlogic-4.9-dev 2017-12-20 23:21:44 -08:00
Renjun Xu
e3307fd658 ledring: add ledring rgb case
PD#156869: add ledring rgb case

Change-Id: I4015a7c16ddac575eada958633f43fcffbc3a577
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
2017-12-20 23:47:47 -07:00
Xing Wang
7eae7770d0 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>
2017-12-20 23:47:24 -07:00
Jian Hu
70aee99c74 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>
2017-12-20 20:22:06 +08:00
Xingyu Chen
de48f69ab6 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>
2017-12-20 19:49:21 +08:00
Renjun Xu
672f0d3993 ledring: add ledring driver
PD#156869: add ledring driver

Change-Id: I162133eb7eedbf8705ec7c7cdd6ec401be9b92ea
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
2017-12-20 19:29:45 +08:00
Bencheng Jing
39627ff3ea di: modify true bypass conditions
PD#155786: di: modify true bypass conditions

Change-Id: I5e8ef74b87915870089497166d272830ceb453db
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2017-12-20 00:33:27 -07:00
Xingyu Chen
7f22cf4c89 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>
2017-12-19 04:36:44 -07:00
Bo Yang
370c8bf462 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>
2017-12-19 04:36:36 -07:00
Ao Xu
cae7a2e49c 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>
2017-12-19 04:35:56 -07:00
jianxin.pan
872270857a 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>
2017-12-19 04:11:48 -07:00
Yueguie He
0ad11cb314 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>
2017-12-19 03:55:59 -07:00
Yixun Lan
811719006f 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>
2017-12-19 03:55:49 -07:00
Yixun Lan
000e9115a9 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>
2017-12-19 03:39:30 -07:00
Jiamin Ma
e9fd448041 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>
2017-12-19 14:33:36 +08:00
Yi Zeng
58384aae5b 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>
2017-12-17 18:17:49 -07:00
Jiamin Ma
231ce0586c 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>
2017-12-15 07:10:53 -07:00
Zhi Zhou
abdb7453fb 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>
2017-12-15 15:03:07 +08:00
Yi Zeng
6facb53203 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>
2017-12-14 21:37:17 -07:00
wenbiao zhang
ed0298c9a2 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>
2017-12-14 19:04:57 -07:00
Jianxin Pan
d2e8bd39db Merge "clk: update clk total number [1/1]" into amlogic-4.9-dev 2017-12-14 18:04:34 -08:00
Yi Zeng
49832da244 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>
2017-12-14 05:05:06 -07:00
Hui Zhang
2dc5888c59 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>
2017-12-14 04:11:08 -07:00