Commit Graph

638753 Commits

Author SHA1 Message Date
Nan Li
b559679884 sdio: slove sdio & emmc dealocks on m8b
PD#141217: slove sdio & emmc dealocks on m8b.
1) Add a semaphore to avoid emmc deadlocks occur and sdio
when they shared the same controller.
2) remove sd ro of dts.
3) add m400 dts support.

Change-Id: I5fe0a76517a341313513e5abdbc16366724cbbe9
Signed-off-by: Nan Li <nan.li@amlogic.com>
2017-06-05 19:38:43 -07:00
Xing Wang
2342337e4a audio: enable pdm module firstly
PD#142470: audio: ensure pdm module enable firstly
1) Ensure pdm clk and module enable firstly
2) add control that hcic shift gain would be fixed with coeff

Change-Id: I9c0dd7cf0e36d2e653c3f593c853f5d14d1dfdcf
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-06-05 06:31:47 -07:00
Shuai Li
197e4f880d audio: add tdm lanemask config
PD#142470: audio: add lanesmask

Change-Id: I56d01ff4f77c90c4fb5575fc654b3459fec1ed14
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2017-06-04 20:34:04 -07:00
Peifu Jiang
eea55b9463 security: arm: meson: add tee support [2/2]
PD#145094: security: arm: meson: add tee support

Change-Id: I8789ef2b6d774abb6252e60c0726e7384127339f
Signed-off-by: Peifu Jiang <peifu.jiang@amlogic.com>
2017-06-01 04:59:35 -07:00
Long Yu
65b59ca4e2 emmc: add emmc HS400 function
PD#142470: emmc: support hs400 busmode

1. refix source clock 400MHZ
2. add hs400 timming function

Change-Id: I9cc767262379ba2be5ab5d3e68aae87c1f18c242
Signed-off-by: Long Yu <long.yu@amlogic.com>
2017-06-01 04:10:30 -07:00
Weiguang Ruan
3c14d09194 dts: axg: s400,s420: support uart bt
PD#142470: bt: add s400 & s420 uart bt support

1. add bt power enable configuration: bt-dev
2. enable uart_a
3. add cts rts pin mux for uart_a

Change-Id: I96bbb3c885da3c860bc1015b2b33971ee9740b26
Signed-off-by: Weiguang Ruan <Weiguang.ruan@amlogic.com>
2017-06-01 14:27:46 +08:00
Xing Wang
6a466f3fc3 audio: add asoc auge driver for axg
PD#142470: audio: new Asoc driver
1) tdm module
2) spdif module
3) pdm module
4) audio clock

Change-Id: I064975f4cb036d013a7ca74d781a91c31e7c2436
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-05-31 03:51:02 -07:00
Alex Deng
a9109d5dda dts: s420; remove ethmac config
PD#142470: eth: A113x no eth

Change-Id: I39ee67276a4126b7ecf741285d1b5129eb12cf4b
Signed-off-by: Alex Deng <alex.deng@amlogic.com>
2017-05-27 07:25:15 -07:00
Weiguang Ruan
80b59a00c9 wifi: meson64: support ath10k pcie wifi and sdio wifi in s400/s420
PD#142470: wifi
1. add ath10k driver compile as module
add cfg80211_wext_compat to support wext command.

CONFIG_CFG80211_WEXT=y
CONFIG_ATH_COMMON=m
CONFIG_ATH10K=m
CONFIG_ATH10K_PCI=m

2. fix wifi enalbe & irq pin num
3. add pwm config for 32k
4. add 32k pin mux

Change-Id: I71872ceef147b6cc49a76bce837a9aff0d5be66f
Signed-off-by: Weiguang Ruan <Weiguang.ruan@amlogic.com>
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-05-27 04:05:41 -07:00
Bo Yang
05614edf3e dts: add watchdog support for axg
PD#142470: dts: add watchdog support for axg

Default disable watchdog.

Change-Id: I1d314594eff9773d04aeb4943a4e89604c35f100
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2017-05-27 03:49:08 -07:00
Yizhou Jiang
1844a9376c eth: add ethernet function for axg
PD#142470: eth: add ethernet for axg

1.for external phy
2.not set regs that did not exist in axg

Change-Id: I4d9f8732f35a0e9e605f1a4a4a9a0285236e705f
Signed-off-by: Yizhou Jiang <yizhou.jiang@amlogic.com>
2017-05-27 03:42:21 -07:00
xingyu.chen
6448cc6338 pinctrl: add enable interface for gpio request
PD#142470: pinctrl and fix tas5707 reset pin
1. add enable interface for gpio request
mux register be set '0x0' when pin requested as gpio
2. fix reset pin of gpio ao in dts.
3. fix gpio ctl when no reset pin defined in dts

Change-Id: I866d29a96025811b1d0436eb5d157e4dff1ff7ca
Signed-off-by: xingyu.chen <xingyu.chen@amlogic.com>
Signed-off-by: Alex Deng <alex.deng@amlogic.com>
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-05-27 03:28:10 -07:00
Long Yu
ce92faa868 emmc/sdio: support emmc/sdio driver for new host controller
PD#142470: emmc/sdio: support emmc/sdio driver for new host controller
1. add emmc support
2. support emmc DDR52 Busmode
3. add sdio support
4: axg_s400: disabled emmc function


Change-Id: Iaccca580393477f0ad96e7638dfa4d9e2809c37d
Signed-off-by: Long Yu <long.yu@amlogic.com>
2017-05-27 03:06:04 -07:00
Qi Duan
37dd435946 dts: all uart dts setting [1/1]
PD#142470: all uart dts setting

all uart node added.default is disable
If want to enable, 1. status = okay 2.set the right pinmux

Change-Id: I744db5735212f3a3217a4b9e26f4ebe074aa5bdc
Signed-off-by: Qi Duan <qi.duan@amlogic.com>
2017-05-27 17:52:24 +08:00
Yonghui Yu
6dc75c7438 nand: update config for mtd driver
PD#142470: update nand config for mtd
1. update dts of skt&s400
2. update clock reg
3. update regbase
4. update bchmode for infopage
5. mtd: support desctrete uboot layout for slc
   change uboot layout for slc [3/3]

multi bootloaders were stored in mlc/slc/emmc.

For emmc/mlc, there's enough space at the begining.
bl2&fip can be stored together which we may call it
as compact mode.
    |bl2|fip|bl2|fip|bl2|fip|rsv|normal|

But for slc, space is restricted by romboot. bl2 and
fip had to be stored discretely.
    |bl2|bl2|bl2|bl2|rsv|fip|fip|fip|fip|normal|

If kernle want mtd driver use descrete mode.
1. bl_mode in dts should be set as 1.
2. fip_copies and fip_size should be the same as uboot which
   was described by marco CONFIG_TPL_COPY_NUM&CONFIG_TPL_SIZE_PER_COPY.
3. And the tpl partition should be added in mtd partition table whose
    offset and size are negligible.

when using, mtd0 is for bl2, mtd1 is for tpl(fip)

Change-Id: I0ed07168ba7497d674a7160f7966ebb484a123d5
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
2017-05-27 17:51:39 +08:00
Yixun Lan
e95ed5b571 Makefile: lock kernel version without localversion appended
PD#144946: Makefile: lock kernel version without localversion appended

after this change, we will lock kernel version to 4.x.y
but we can still get out the exact commit version from dmesg.

1) uname -r : 4.9.27
2) dmesg |grep "Linux version"
  [    0.000000@0] Linux version 4.9.27-638106-g5de5d7a  ....

Change-Id: I35072b399af403d3a1737300a8786cf36063c668
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2017-05-27 02:12:13 -07:00
Sunny Luo
f601b2e21a spicc: add spicc driver for axg
PD#142470: add spicc driver for axg and fix spicc-b
interrupt number error

Change-Id: Ibbda6d8526c4141992fcbe307d6f1e0fbc570cfe
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
2017-05-27 01:59:34 -07:00
Yue Wang
a524ac609f usb: dts: set otg switch for board axg
PD#142470: set otg switch for board axg

Change-Id: I97500402a2747910d82b9928a55419d35ce2f826
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2017-05-27 01:38:41 -07:00
Yue Wang
a417b7a6e4 pcie: add pcie driver for axg
PD#142470: add pcie driver for axg
1. update dts of skt&s400
2. update pcie driver

Change-Id: Ic569e8fed1a4434e54847580299703f0fe07cd9b
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2017-05-27 01:33:55 -07:00
Yun Cai
26efd0ca10 clk: update clk for axg
PD#142470:
1. add amlogic,axg-clkc.h for mesonaxg.dtsi
and fix clkc reg value
2. update pcie and hifi pll setting for axg

PD#142470: update hifi pll setting for axg

Change-Id: I34aac4ead8384e6a150ae8630034c247f53ac27a
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-05-27 01:20:49 -07:00
Matthew Shyu
63ff600db5 crypto: sha driver update
PD#142470: crypto: sha driver update for txlx and beyond

Change-Id: Ia5eb0c1750bedd0894e3db1e7f0796de23cce1dd
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
2017-05-27 01:02:27 -07:00
Xuhua Zhang
fc0562db58 i2c: add i2c support for axg
PD#142470: i2c: add i2c support fot axg and fix i2c_ao error on axg

Change-Id: I15c00bc5833dd10c94562e939c6b53d0138ac231
Signed-off-by: Xuhua Zhang <xuhua.zhang@amlogic.com>
2017-05-27 00:02:19 -07:00
Jian Hu
ef90f94f4a pwm: add pwm support for axg
PD#142470: pwm: add pwm support fot axg

the pwm groups's addresses are the same with txlx,
just add several macros to support axg.

Change-Id: Iaefa3c2a31fc8f43e4dc80448c6548c2df62fa8f
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2017-05-27 14:08:05 +08:00
Yun Cai
ae23902138 dts: add dts for A113D socket and development boards
PD#142470: add axg_a113d_skt.dts axg_s400.dts and axg_s420.dts

Change-Id: If8c5b1e0fa5b6a21a91ce1323fa1107d608c4af7
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-05-27 14:06:57 +08:00
Yun Cai
63b8b9fc52 clk: add amlogic,axg-clkc.h for mesonaxg.dtsi
PD#142470: add amlogic,axg-clkc.h for mesonaxg.dtsi
and fix clkc reg value

Change-Id: Ib19288881241277b4146c89c49b6dce8639df411
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-05-24 19:56:23 +08:00
Xingyu Chen
5bd7ed321e pinctrl: add pinctrl&gpio support for axg
PD#142470: add pinctrl&gpio support for axg

1. meson8b keeps the same pin numbers as the gxl/gxm/axg
2. using base address of registers(Eg: mux gpio irq)
instead of offset address in dts for gxl/gxm

Change-Id: Ib64f9dc0e234884ec9ccab7673da5f2a3fdc1a98
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2017-05-24 18:34:36 +08:00
Yun Cai
d0d268c490 clk: add clk tree for axg
PD#142470: add axg basic clk and hifi_pll/pcie_refpll/
mipi_host/vpu/ge2d/sd_emmc clks, add clkmsr

Change-Id: I487c6b2792389c5df230df5af7b246e83f37f479
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-05-24 16:04:19 +08:00
Yixun Lan
4773556193 defconfig: android: enable fence/sw_sync support [2/2]
PD#138714: defconfig: android: enable fence/sw_sync support

also enable config CONFIG_AMLOGIC_MEDIA_FB_OSD_SYNC_FENCE

Change-Id: I9d801c20123fc18726d5ee8a49b0c615b04e241d
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2017-05-23 12:21:27 +08:00
Yun Cai
22f718c442 android: port fence driver from kernel-4.4 [1/2]
PD#138714: android: port fence from kernel-4.4 for booting android 8.0

Change-Id: I7c942cd5f990f7e0d5726eefe9c54b9cb6437e41
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-05-22 16:53:27 +08:00
Yixun Lan
9e5d724939 defconfig: meson64: enable android binder diver
PD#138714: defconfig: meson64: enable android binder diver

Change-Id: I1b7f7837bef0de3a2d4d23ca6ed87b4a0bd9fbed
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2017-05-22 15:35:45 +08:00
Yixun Lan
061e4db726 defconfig: meson64: enable low memory killer support
PD#138714: defconfig: meson64: enable low memory killer support

Change-Id: I921e8e16b9ba58c21788545b11285dceb4aae9a2
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2017-05-22 15:30:24 +08:00
Yixun Lan
08de3109a0 defconfig: meson64: enable anonymous shared memory support
PD#138714: defconfig: meson64: enable anonymous shared memory support

Change-Id: I9e35824ee2d5eeed6dfe798384bc11a96f414d21
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2017-05-22 13:57:29 +08:00
Victor Wan
fee5e90ff7 Merge branch 'android-4.9' into amlogic-4.9-dev 2017-05-18 14:52:37 +08:00
Nan Li
75a88ba14c sdio: add sdio driver support on m8b
PD#141217: add sdio dirver support on m8b
ultra high speed SDR104 85M

test on m8b_m200.

Change-Id: I1aea3a8d77039be92e1759cb06eac96ed2915524
Signed-off-by: Nan Li <nan.li@amlogic.com>
2017-05-16 00:43:56 -07:00
Tao Zeng
940abdab8c mm: change secmon reserved memory to CMA
PD#143278: change secmon reserved memory to CMA

Change-Id: Ia09a9a1b578f1a10e81d9431f829c723c68811d9
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2017-05-14 19:26:17 -07:00
Nanxin Qin
98454da295 video_sink: codec_mm: update video keeper from amlogic-3.14-dev
PD#142538: merge code form 49c80e32 in the amlogic-3.14-dev
fixed the issue of blurred screen when playback 4k H264 after seek end.

Change-Id: Ic276dac8472fef086628aa28ded8748a7378d26a
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2017-05-12 03:45:09 -07:00
liang.zhao
03f5728e7a dts: enable i2c_ao for expand gpio
PD#138714: enable i2c_ao for expand gpio

1.change dts open i2c_ao
2.change meson64_defconfig

Change-Id: Ifc5d035aefc02af132c1423f1182069c14d791dc
Signed-off-by: Liang Zhao <liang.zhao@amlogic.com>
2017-05-12 01:59:32 -07:00
Tao Zeng
496e4a5714 mm: avoid PFN busy when cma allocate
PD#144028: mm: avoid PFN busy when cma allocate

1. add cma_suitable function to check if GFP flags are
   suitable for fallback of CMA.
2. cma page free should be relink to migrate type of CMA
   freelist, not to MOVABLE freelist.
3. for block dev page cache, add GPF_BDEV flag to avoid
   it using CMA.
4. use CONFIG_AMLOGIC_MODIFY to wrap AMLOGIC modified kernel
   code.

Change-Id: I09daf9d7e3e62086e7b13654667e2db692f7ca08
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2017-05-12 16:51:58 +08:00
Jian Hu
064c428a2b pwm: fix pwm channel id definition for txlx
PD#143838: fix pwm channel id definition for txlx

For txlx previously, it may cause double channel pwm request failed.

Change-Id: I9787c4d79898edff88f4b27bc5fb5ff922f4faee
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2017-05-11 23:40:54 -07:00
Xing Wang
a33fcadc70 audio: add tas5707 codec driver
PD#144051: audio: add codec driver

Change-Id: I2290cf5684e0a22e7dd8aede9aa4f67570d39860
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-05-11 22:20:46 -07:00
Pengcheng Chen
262832b709 osd: add hw cursor support in osd
PD#138714: osd: add hw cursor support in osd

Change-Id: I88ba3530cdc605ae5a0f0f31b21578b588c04ff1
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-05-11 19:26:05 -07:00
Pengcheng Chen
0d8442c0b1 osd: risk of sleep in atomic
PD#143300: risk of sleep in atomic

spinlock_irq_save call block_notifier_call_chain caused sleep

Change-Id: I2f11d06681ab0b2322f7c38572dadfb732be343b
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-05-11 03:31:40 -07:00
Yun Cai
e6e44aa7d7 clk: m8b cpu_clk support more rates
PD#141217: m8b cpu_clk support more rates

Change-Id: I6ac361cd5e30fa3b51e2e58633952971d6e78206
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-05-11 17:34:00 +08:00
Xing Wang
4994780b8f audio: fix pcm clock fmt for master mode
PD#141217: fix pcm clock format

Change-Id: I14a0a6cafddffe515dce44e79c6506c288cdb156
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-05-11 01:28:30 -07:00
Pengcheng Chen
57e8e34df1 media: update some config info
PD#138714 media: update some config info

Change-Id: I1aca777f405de64163db14394ab36140d39da6f7
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-05-10 23:05:22 -07:00
Evoke Zhang
a456d2e663 vpu: optimize vpu_clkb gate control
PD#138714: vpu: optimize vpu_clkb gate control

Change-Id: Icf468db8218893de6c6ec0079d65d19279032281
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2017-05-10 22:50:18 -07:00
Lorenzo Colitti
f117eaf0a3 ANDROID: make PF_KEY SHA256 use RFC-compliant truncation.
When using the PF_KEY interface, SHA-256 hashes are hardcoded to
use 96-bit truncation. This is a violation of RFC4868, which
specifies 128-bit truncation, but will not be fixed upstream due
to backwards compatibility concerns and because the PF_KEY
interface is deprecated in favour of netlink XFRM (which allows
the app to specify an arbitrary truncation length).

Change the hardcoded truncation length from 96 to 128 so that
PF_KEY apps such as racoon will work with standards-compliant VPN
servers.

Bug: 34114242
Change-Id: Ie46bff4b6358f18117d0be241171d677d31d33f7
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
2017-05-11 03:10:45 +00:00
Gao Xiang
13fb093578 ANDROID: sdcardfs: fix sdcardfs_destroy_inode for the inode RCU approach
According to the following commits,
fs: icache RCU free inodes
vfs: fix the stupidity with i_dentry in inode destructors

sdcardfs_destroy_inode should be fixed for the fast path safety.

Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Change-Id: I84f43c599209d23737c7e28b499dd121cb43636d
2017-05-11 00:07:16 +00:00
Tao Zeng
2e9d45599c mm: clear reserved memory for ION
PD#143278: clear reserved memory for ION

Change-Id: Ie1acf50f5fdd49b0b8ad7ca493d986b161d959cc
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2017-05-10 02:15:21 -07:00
Yun Cai
64f2468de3 clk: fix m8b cpu_clk issue
PD#141217: cpu hang on while changing rate from 96M to 960M

Change-Id: Ib648cc22fdcbd490103ba3afab8d861a4c33a7e0
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-05-10 13:22:38 +08:00