Commit Graph

639194 Commits

Author SHA1 Message Date
Liang Zhao
d954fc1bc6 dts: axg: add D604 mic board led driver
PD#142470: add D604 mic board led driver

Change-Id: I81dd8ac3f46e0b0cbec6409328489a72d11c54ac
Signed-off-by: Liang Zhao <liang.zhao@amlogic.com>
2017-06-22 19:41:27 -07:00
Yixun Lan
7c6adea43c Makefile: generate kernel_full in seperate command
PD#144946: Makefile: generate kernel_full in seperate command

in certain cases/system, echo command will refuse to interpret backslash
without the '-e' option, so it will end up with one line
"4.9.11\n4.9.11-1234-g1234"

this patch will generate KERNELRELEASE & KERNELRELEASE_FULL in seperate file

Change-Id: I51699f193e893f9ea566251d4440edecf3de7ad8
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2017-06-23 10:22:11 +08:00
Yun Cai
96fd61ccf6 clk: update for pcie range setting
PD#146333: update for pcie range setting

Change-Id: Ic105ec91bd480ab0d4b980eda90ccbcd1d7baa2c
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-06-22 02:51:26 -07:00
binqi.zhang
0334b7ca81 dts: osd: add cma heap for ion
PD#146107: osd: add cma heap for ion on Android 8.0

Change-Id: I8ebb0c9068a93b9e1bae114a6d5231de5a2ee78f
Signed-off-by: binqi.zhang <binqi.zhang@amlogic.com>
2017-06-22 01:30:21 -07:00
Jian Hu
d8a28fe691 pwm: revert pwm e and f order
PD#146170: pwm: revert pwm e and f order

1.please ask me to get a patch when you are using pwm on axg.
2.new pwm driver is rebuilding.
3.add pwm e and f for axg,actually the hardware not support.

Change-Id: I3222380b700fbe9668c3d2da1dc8d878f22b30aa
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2017-06-22 00:22:34 -07:00
Xindong Xu
0d9a5f4413 dts: p212: add vendor & oem partition
PD#145255: dts: p212: add vendor & oem partition

Change-Id: I96312e567ef4f5b28740607e091283c70a80578f
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2017-06-22 14:47:16 +08:00
binqi.zhang
a4e22c6cb9 osd: add cma heap for ion
PD#146107: osd: add cma heap for ion on Android 8.0

Change-Id: Idf4371fd0dceecc883fd8402a656ed7724be1efd
Signed-off-by: binqi.zhang <binqi.zhang@amlogic.com>
2017-06-20 20:02:46 -07:00
Jian Hu
488c42edea pwm: fix several errors
PD#144476: pwm: fix pwm driver errors

1.change pwm e and f order
2.fix several errors

you can request like this:

	PWM A		0
	PWM B		1
	PWM C		2
	PWM D		3
	PWM AO A	4
	PWM AO B	5
	PWM AO C	6
	PWM AO D	7

Change-Id: Ic1ca7d1f0450db748569447140feab9b9d0c5c34
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2017-06-20 17:09:54 +08:00
Zan Peng
dfe573fb45 irblaster: add code and dts config for axg
PD#146157: irblaster : add code and dts config for axg
1. default dts config of irblater is disabled

Change-Id: I7cc4eece765d28dcac70e222bd2a36df2ba58183
Signed-off-by: Zan Peng <zan.peng@amlogic.com>
2017-06-20 16:18:42 +08:00
Jianxin Pan
6a0b4ba153 Merge "i2c: add auto test i2c master and slave on axg skt." into amlogic-4.9-dev 2017-06-20 00:32:33 -07:00
Xuhua Zhang
3fd64633be i2c: add auto test i2c master and slave on axg skt.
PD#142470: add i2c auto test on axg.

1. if uboot parm(i2c_auto_test) is "open",
   open the i2c auto test function.
2. before the test,we should connect i2c slave and master.

Change-Id: Ia37e080dc7995d31e46c9122b389be1ed21acc63
Signed-off-by: Xuhua Zhang <xuhua.zhang@amlogic.com>
2017-06-20 00:26:38 -07:00
Guosong Zhou
2b9b8a4012 amlvideo2: fix screen capture funciton
PD#145804: fix screen capture function

Change-Id: Icb857a889b53d74cfc85072cc88464fb46d283b3
Signed-off-by: Guosong Zhou <guosong.zhou@amlogic.com>
2017-06-20 00:19:47 -07:00
Yun Cai
c924fd661a clk: add ao clk for axg
PD#142470: add ao clk saradc for axg

Change-Id: Icadbbf6e631a6158daade2feb4bfae31bed3c471
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-06-20 15:06:04 +08:00
Lianghu Su
a0c464d95c cfg80211: wifi: force to skip cfg80211_leave_all
PD#145741: wifi: bcm: fix unable to enter deep suspend mode issue

for the wowlan (wake on wireless lan) function under Linux platfrom,
we have problem to configure it via wpa_supplicant as we do it at Android
platform. so here when it enter into suspend mode, we try to skip calling
cfg80211_leave_all() function at the wire core path.

since this modify the wifi core code, it will also affect other
wifi drivers (not only bcm wifi).

Change-Id: I51eb9b2864afe1bb478ab9411eb7c590f995cd6e
Signed-off-by: Lianghu Su <lianghu.su@amlogic.com>
2017-06-19 06:54:57 -07:00
Jian Hu
8de01ae28c wifi: add pwm configuration for wifi 32k
PD#146170: wifi: add pwm configuration for wifi 32k

Change-Id: If35f0a495b5b3f9a3ced9cf73ddb0ec7dc1f8ea6
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2017-06-19 16:45:35 +08:00
Evoke Zhang
c966c5d0b7 lcd: add lcd driver for axg
PD#142470: lcd: add lcd driver for axg

Change-Id: I58e2a2af474bafbbe3718f51493c9b46cb07cf31
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2017-06-15 22:10:53 -07:00
Yonghui Yu
8b769d45af mtd: nand: fix oob read pannic.
PD#145890: nand: fix oob read

When reading oob by nandread from toolbox of andriod,
the oob should be protected. so we read back the whole
page with ecc on, and copy out oob only.

Change-Id: I08f35396015316a35631727dfbfedb862567d913
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
2017-06-15 21:55:35 -07:00
Yonghui Yu
08fb3d0741 mtd: nand: enhance the robust of env
PD#145594: nand: enhance the robust of env

1)enhance sudden power lost and ecc-error protection
2)add mtd env mutex for kernel

Change-Id: I0a454149c408f882924543d84db5d46591230d3d
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
2017-06-15 21:43:09 -07:00
Pengcheng Chen
44a77d4de8 osd: add osd driver for axg
PD#146066: osd: add osd driver for axg bringup

Change-Id: Iea6889046d2a0bd0d7c79f106e4d89ed9828d035
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-06-15 21:33:16 -07:00
Yue Wang
d640e7be13 pcie: add pcie reset mode.
PD#142470: pcie: add pcie reset mode.

Change-Id: I76999754af16890a7c74d0f31978db69b7710191
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2017-06-15 21:20:26 -07:00
Yue Wang
5818620abf pcie: power on pcie in the probe.
PD#146002: pcie: power on pcie in the probe.

Change-Id: I36ec41c19a7d6bfbe364ddefeaa2c48f181d5d3b
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2017-06-15 03:16:57 -07:00
Lianghu Su
aee8008bdd dts: gxl: disable uart_B
PD#145722: gpio conflict between uart_B and sysled, both of them use
GPIODV_24.

Change-Id: I75ff92b8166244044034a94cd79e4cfc24a39f81
Signed-off-by: Lianghu Su <lianghu.su@amlogic.com>
2017-06-13 21:50:43 -07:00
Yun Cai
5e57727788 clk: fix mpll3 jitter too large
PD#142470: fix mpll3 jitter too large

Change-Id: I106bf9c627a0125ec61ec221d02c0689e547c965
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-06-12 17:07:30 +08:00
xingyu.chen
d39d45ead6 pinctrl&gpio: add new interface to set pull-down/up
PD#142470: pinctrl&gpio: add new interface to set pull-down/up

1. add property file 'pull' in directory /sys/class/gpio/gpioX/
pull-up:      echo up > pull
pull-down:    echo down > pull
pull-disable: echo disable > pull

2. add new functions, as follows:
+ gpiod_set_pull(struct gpio_desc *desc, int value)
+ gpiod_set_pull_cansleep(struct gpio_desc *desc, int value)

'value' can be set:
GPIOD_PULL_DIS
GPIOD_PULL_DOWN
GPIOD_PULL_UP

Change-Id: Iba750729288651a897ebac827093ebc6c143f16b
Signed-off-by: xingyu.chen <xingyu.chen@amlogic.com>
2017-06-09 20:16:29 -07:00
Evoke Zhang
b462fea81d vpu: add vpu support for axg
PD#142470: add vpu support for axg

Change-Id: I9be3f440ac25f09e393544121aa33446ff76ff58
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2017-06-08 19:53:15 -07:00
xingyu.chen
a6228d3944 pinctrl: fixed some pull configuration errors for gxl/gxm
PD#138714: pinctrl: fixed some pull configuration errors for gxl/gxm

Change-Id: I77db8754c17efcdf139a79086ef9009cb7488929
Signed-off-by: xingyu.chen <xingyu.chen@amlogic.com>
2017-06-08 19:15:36 -07:00
Yun Cai
05c824e5e1 clkmsr: add special setting for axg audio
PD#142470:
1. add special setting for axg audio for AXG
2. update iomap for axg

Change-Id: I1a6ca7bd440aabd1010c854ba0c700b63a105d01
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-06-08 10:55:47 -07:00
xingyu.chen
6f39c07cc6 pinctrl: avoid requesting the same pin for mux and gpio
PD#142470: pinctrl: avoid requesting the same pin for mux and gpio

Change-Id: I768aa7d8ffa2792c14c7d932314328d2475c0574
Signed-off-by: xingyu.chen <xingyu.chen@amlogic.com>
2017-06-08 01:59:22 -07:00
Nanxin Qin
e0212b0843 PD#145277: ge2d: export the symbo of the ge2d funs to media modules.
Change-Id: I4e87b8550869ebeb62ab2fe5252601dd7ac9d40e
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2017-06-08 01:20:50 -07:00
Victor Wan
012fa222d9 Merge branch 'android-4.9' into amlogic-4.9-dev 2017-06-08 10:59:07 +08:00
Pengcheng Chen
86f8c2a640 osd: osd support cma, reserved, and ion memory depend on dts config
PD#143435: osd support cma, reserved, and ion memory depend on dts config

Change-Id: I79f1a8cebccdb016cee6a6ca54c0356d19fb2657
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-06-07 04:14:27 -07:00
Peipeng Zhao
b020e59c86 dts: m400: audio: disable i2sclk disable on startup
PD#141217: audio: fix M400 board noise when device startup

Change-Id: I7030a2648df5e49580d72eaa784fe2c3d0bbdc81
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2017-06-07 01:01:49 -07:00
Yue Wang
f8a52fe548 pcie: add pcie phy control register access.
PD#142470: pcie: add pcie phy control register access.

Change-Id: I832b05763a722c074980f19682c6249915c0363d
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2017-06-07 00:51:39 -07:00
Tao Zeng
ccb6b33083 dts: axg: add thermal config
PD#142470: thermal: enable thermal for axg

1. add thermal node for all axg devices;
2. calculate thermal parameters for all axg device.

Change-Id: I78b7fbe24bfb7910fa52223ade63c93265a6d6e1
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2017-06-07 00:16:23 -07:00
Jiamin Ma
a81899595b unifykey: initial add unifykey driver for m8bb
PD#141217: initial add unifykey driver for m8bb

known issues:
	1. do not support efuse mode for key storage
	2. do not support nand key storage
	3. do not suppot unifykey ops in multi-thread env
changelists:
	1. use internal sha apis
how to use:
	su
	cd /sys/class/unifykeys
	echo 1 > attach
	echo mac > name
	echo 001122 > write
	echo mac > name
	cat read

Change-Id: I0586f1a41ded72553afe3cc4cc199dbc4b563bf1
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-06-06 23:19:40 -07:00
xingyu.chen
00388de1d5 pinctrl: fix some errors and add new function groups for gxl/gxm
PD#138714: pinctrl: fix some errors and add new function groups

Change-Id: I25a99b8715d22c887f07f0cbbbe5b9a3ba42f927
Signed-off-by: xingyu.chen <xingyu.chen@amlogic.com>
2017-06-06 21:33:29 -07:00
Yonghui Yu
9d2449dd33 nand: enable 8 copies bl2 for axg by default[3/3]
PD#145459: nand: write 8 copies info-page for axg by default

Change-Id: Id53907f6219678a73581ac9725721d5795993051
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
2017-06-06 20:45:39 -07:00
Zan Peng
656e4b6eba dtsi: axg: add remote config
PD#142470: dtsi: axg add remote config

Change-Id: Idb10aea3385d5f48f89fe0dd9fa8c76d4bb49fac
Signed-off-by: Zan Peng <zan.peng@amlogic.com>
2017-06-06 19:44:10 -07:00
xingyu.chen
5695170ffd pinctrl: add TEST_N and GPIOCLK bank pins support
PD#142470: pinctrl: add TEST_N and GPIOCK bank pins support

1. add TEST_N pin support for axg and gxl/gxm
2. add GPIOCLK bank pins support for gxl/gxm

Change-Id: I8248ffe94b883a38f971ce07910258602b488cf2
Signed-off-by: xingyu.chen <xingyu.chen@amlogic.com>
2017-06-06 07:24:42 -07:00
Peipeng Zhao
b3a48d09e0 dts: S400: change tdm-b for audio capture
PD#145484: audio: support snd_soc_dai_set_sysclk for mutli codec

Change-Id: I3a2e24e1321e9251029e0abe79e97a9852a68450
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2017-06-06 05:03:34 -07:00
Peipeng Zhao
c1403bcff9 audio: add pcm186x, ssm3515, ssm3525 codec driver
PD#145486: audio: add codec driver

Change-Id: Ief27ff9892ffabba81f676f4bed2ec6b4ead74f5
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2017-06-06 04:21:13 -07:00
Peipeng Zhao
7ca387861a dts: m400: add wifi/bt config
PD#141217: add wifi/bt config on dts for board M400

Change-Id: I241607a40ab2341748b22072806f744c7a24f873
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2017-06-06 02:14:44 -07:00
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
Chenbo Feng
3fe100ef0c BACKPORT [FROMLIST] New getsockopt option to get socket cookie
Cherry-pick from linux net-next branch commit
http://patchwork.ozlabs.org/patch/747590/

Introduce a new getsockopt operation to retrieve the socket cookie
for a specific socket based on the socket fd.  It returns a unique
non-decreasing cookie for each socket.
Tested: https://android-review.googlesource.com/#/c/358163/

Test: Unit test added in kernel/tests

Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Chenbo Feng <fengc@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-05-31 00:53:04 +00:00