Commit Graph

639476 Commits

Author SHA1 Message Date
Yue Wang
e9ddb10958 pcie: fix pcie reset pin request.
PD#147492: pcie: fix pcie reset pin request.

Change-Id: I12206e25d61a728f8a10da2315faf271b9d4d09e
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2017-07-12 23:01:29 -07:00
jianxin.pan
c91a6b3a68 defconfig: meson64: sync savedefconfig
PD#146811: generate meson64_defconfig with:
make ARCH=arm64 meson64_defconfig
make ARCH=arm64 savedefconfig
cp defconfig ./arch/arm64/configs/meson64_defconfig

Change-Id: I936db023d4812ae6d9b563e56d19e2c3023c8989
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
2017-07-12 21:23:51 -07:00
Qi Duan
f0e5c83324 USB: dwc3 controller not support lpm for some usb disk has lpm feature
PD#147335: USB: dwc3 controller not support lpm for some usb disk whitch has lpm feature [1/1]

Change-Id: I1cdd12d39fcc59ca50275f4c4e1f1cd674d47051
Signed-off-by: Qi Duan <qi.duan@amlogic.com>
2017-07-12 21:13:29 -07:00
jianxin.pan
4c8e5c3b48 script: update merge_pre_check.sh
PD#138174: update merge_pre_check script

Change-Id: I3340906ff4fc3a61ba720fb4dabecd3f623dfcae
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
2017-07-12 16:46:29 +08:00
jianxin.pan
5df5178ae7 extcon: wrap modifies with amlogic marco
PD#138714: wrap changs with CONFIG_AMLOGIC_MODIFY

Change-Id: I7ffff7940f13012a1d898635eefe75feb8c17268
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
2017-07-11 19:19:03 +08:00
Pan Jianxin
5c9ce44596 extcon: enable name set for extcon
PD#138714: enable name set for extcon
Without this change, name for extcon is always extcon0, extcon1, and
it can't be set by driver.

set extcon name before extcon_dev_register:
edev->name = "xxx";
dev_set_name(&edev->dev, "xxxxxx");

Change-Id: I22efce87f8fb50f1faf71d254cd03fe292ddb035
Signed-off-by: Pan Jianxin <jianxin.pan@amlogic.com>
2017-07-11 02:32:56 -07:00
Xing Wang
d80bb9f7fa audio: audio info for audio license query
PD#147297: audio: audio license query driver

Change-Id: I9a9db1c33c372bc58130a1c41addfd80303a5625
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
2017-07-11 01:34:35 -07:00
Pengcheng Chen
af82c9e477 osd: fix osd flicker issue on AXG
PD#146558: osd: fix osd flicker issue on AXG

1. osd: move reg update to vsync interrupt
2. osd: add osd hold line size to 24
3. osd: add read/wirte reg function
4. osd: add osd fps stat function

Change-Id: Iaa382bb8deba49ecb94732691a3608cec9fb9679
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-07-11 00:34:09 -07:00
Jiamin Ma
82062d5a49 script: update merge_pre_check.pl
PD#138714: update merge_pre_check.pl to compatible with checkpatch.pl

Change-Id: Ic3aa45a95d9b1c6c2a923a93b87d4a1590a9c066
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-07-11 12:26:57 +08:00
Yueguie He
759ef2088d nand: add mxic 128M(MX30LF1G18AC)
PD#147222: mtd:nand : add mxic 128M(MX30LF1G18AC)

Change-Id: I7a3f72245e3f1d80e902e22fb841053fc59332a3
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-07-10 19:41:34 -07:00
Zongdong Jiao
cb2e4c9171 hdmitx: update Kconfig of esm
PD#146107: using depends on at Kconfig file

Change-Id: I0ed025b43c16e02323cea980744d42feb7cc820a
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2017-07-10 18:38:10 +08:00
Zongdong Jiao
4d30950e5e hdmitx: sync with 3.14 driver
PD#146107: sync with the lastest 3.14 kernel driver

Change-Id: Ia87fdd4fb153e76fa9a2637a424527d03a736a9f
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
2017-07-10 18:00:04 +08:00
xingyu.chen
51f4c3671f pinctrl: update the number of pins in EE domain
PD#147162: pinctrl: update the number of pins in EE domain

Change-Id: I1140bfea4f812fd66d42efcd59ce884022e932f9
Signed-off-by: xingyu.chen <xingyu.chen@amlogic.com>
2017-07-10 17:35:01 +08:00
jianxin.pan
753d672212 chipid: add chipid to cpuinfo
PD#138714: add chipid for cpuinfo

Change-Id: I95da78a07d0806638768984542b3f9886571efd7
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
2017-07-09 21:14:10 +08:00
Bo Yang
1674fa1ab5 watchdog: meson_wdt: fix register and callback of reboot notfiy
PD#147089: watchdog: meson_wdt: fix register and callback of reboot notify

The function register_reboot_notifier() use the wrong notifier_block
variable. So the container_of in the callback can't get the right pointer
of the struct.

The watchdog is disable in case of system down. If the kernel panic, the
reboot notify should ignore that.

Change-Id: I3fd21590808f4b380ddd54883db576e5c13c04a1
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2017-07-07 20:13:59 -07:00
Bo Yang
4cc49ffb39 dts: axg: add label for the ee watchdog
PD#147071: dtsi: add label for the ee watchdog

So the node can be referrenced for changing.

Change-Id: I5198949ce550b7e8260cdfca3ae6164dcf5ad9c4
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2017-07-07 06:47:20 -07:00
Yueguie He
1fd12aa3c3 dts: add platform id
PD#147047: add s400 & s420 platform id

Change-Id: Id66685655b0708df87e02e23139f5592224801d3
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-07-06 11:05:51 +08:00
Yue Wang
8e8f283dbd pcie: support broadcom wifi ap6356p.
PD#146975: pcie: support broadcom wifi ap6356p.

Change-Id: Iec6877c0b34dbc213711071427ccca786396b12b
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2017-07-04 16:18:47 +08:00
Yonghui Yu
ac7c6cbd5d mtd: nand: fix rsv info save
PD#146160: mtd: nand: fix rsv info save operations
1. fix pages calculations
2. update valid flag after 1st write.

Change-Id: I498ff0b6e11939813d69141d8d18be30d15d8b1c
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
2017-07-03 21:14:54 -07:00
Victor Wan
63e4f22a8b Merge branch 'android-4.9' into amlogic-4.9-dev 2017-07-04 10:50:35 +08:00
Yueguie He
5c8d9cbf14 ddr window: add ddr window driver
PD#146791: add ddr window driver

Change-Id: Iad474cc1b82494748136e82734c93057954a4313
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-07-03 14:48:01 +08:00
jianxin.pan
f47fda21dc script: check defconfig and commit message before merge
PD#138714: check patch before merge
1) meson32/64_defconfig should generated from savedefconfig
2) commit message style

Change-Id: Ia7330533249f2a93e541f10981ec4caae9978879
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
2017-06-30 04:44:16 -07:00
Peipeng Zhao
06199f7378 dts: fix S400 & S420 dts unifykey number error
PD#146825: fix S400 & S420 dts unifykey number error

Change-Id: Iaa5382875c3e2a21e2cd038f2a92ca6f8e676d1f
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2017-06-30 18:48:37 +08:00
jianxin.pan
50bae7532d defconfig: sync defconfig with savedefconfig
PD#138714: sync meson_defconfig with savedefconfig

Change-Id: I3c464d1f56268530f254d64438df2a20817e8d7d
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
2017-06-30 02:27:31 -07:00
Yueguie He
353f6cbc26 nand id: add nand id
PD#146794: add nand id
          1. add nand id: W29N01HV

Change-Id: I4d3582b18df42d4b7f5f161a9c1a9504f9fd1da8
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-06-30 00:12:19 -07:00
Peipeng Zhao
1c4ee2443d audio: fix audio tdm mic noise and digital mic noise
PD#146748: audio capture noise on analog and digital mic

Change-Id: Id9820999399d3d933fc055fa45188fc702bba211
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2017-06-29 05:00:10 -07:00
Qi Duan
51153256b0 UART: setting clk81 gate and clock source by dts
PD#146725: UART: setting clk81 gate and clock source by dts [1/1]

Change-Id: I5d1bacb9d59db250372100fc93263b1f0412027f
Signed-off-by: Qi Duan <qi.duan@amlogic.com>
2017-06-29 03:26:54 -07:00
Yueguie He
2008f7e1df irblaster: add irblaster config & dts
PD#146700: add irblaster config & dts
1. add irblaster config
2. add irblaster dts

Change-Id: I2c82b43c904041a89c3eb1521970c3c8ac37d3e1
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-06-28 23:49:50 -07:00
jianxin.pan
c73e3e3c08 script: remove error for change-id when checkpatch
PD#138714: remove the following error when checkpatch
Remove Gerrit Change-Id's before submitting upstream

Change-Id: I7276a44cef37d7cc4906be996d6eb9a19ae1102a
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
2017-06-28 23:20:41 -07:00
Yueguie He
4fbb13fd67 dts: axg: add unifykey
PD#146698: add unifykey
1. add unifykey,usid,mac,secure_boot_set,mac_bt,mac_wifi,deviceid.
2. enable efuse.

Change-Id: Ifcc902aae8d019235ef506fb6ba864feb29f3a3b
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-06-28 23:03:55 -07:00
xingyu.chen
c9ce8a78a0 adc_keypad: update interface to access adc and add sysfs interface
PD#146614: adc_keypad: update interface to access adc and add sysfs interface

1.use sysfs interface to set dynamic key
inquire key map:
cat /sys/devices/platform/adc_keypad/table

set key:
echo [name]:[code]:[channel]:[value]:[tolerance] >
			/sys/devices/platform/adc_keypad/table

2. use the consumer interface of the IIO to access sar adc

Change-Id: I0357e84720340b0fee4baa882f41f0aa7f36a9a1
Signed-off-by: xingyu.chen <xingyu.chen@amlogic.com>
2017-06-28 21:06:14 -07:00
Alex Deng
9165ab2e1c audio: fix tlv320adc3101 support S24_LE and 16k
PD#146653: fix tlv320adc3101 support S24_LE and 16k

Change-Id: I54daeb69125f83e53164c03b39cfb5c8af742e95
Signed-off-by: Alex Deng <alex.deng@amlogic.com>
2017-06-28 04:43:39 -07:00
Xing Wang
a415232a01 audio: tdm fmt set
PD#146652: audio: set tdm fmt when hw_param

Change-Id: I5383554d6db58a5dd465c8c65fb974c92b1bac81
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-06-28 04:25:06 -07:00
Yan Wang
7158c37867 dts: axg: dtsi update for idle.
PD#146619: AXG fail or hard lock up when idle enable.

Change-Id: I688e134f22a1fed67aae98a7a99242c54db5aab7
Signed-off-by: Yan Wang <yan.wang@amlogic.com>
2017-06-28 02:05:41 -07:00
Xing Wang
f048dbda0f audio: clock only enable in runtime for power consumption
PD#146592: audio: clock only enable in runtime for power consumption

1. clocks for tdm in & out/spdif in & out/pdm in, only enable when runtime
2. remove unused codes

Change-Id: Ic75ab4557b9e1c26fa032a5b14a7a39ae53f6a06
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-06-28 16:39:09 +08:00
Shuai Li
189e32aa66 audio: add new audio features
PD#145715: new audio features:
1. mute gpio
2. tas575x driver
3. multi-codec prefix name
4. tlv320adc3101 can revert bclk
5. set clkmsr to check mclk for AXG tdm

Change-Id: Ibd3d9ed8086715439c4bebeb574b998c1ffd1e45
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2017-06-28 11:18:53 +08:00
Yonghui Yu
abb7e885c1 mtd: nand: add slc nand support.
PD#142177: mtd: nand: add slc ids.

1. Toshiba 128MB TC58BVG1S3HTA00
2. Spansion 256MB S34ML02G1-MLO2G100BH1OO
3. Spansino 256MB S34ML02G1-MLO2G200BH1OO
4. Mxic 256MB MX30LF2G18AC
5. MXic 512MB MX30LF4G18AC
6. Samsung 512MB K9F4G08U0F
7. Toshiba 512MB TH58NVG2S3HTA

Change-Id: I765cd11cb9c7dd00e5a269e0dc526df536252ff8
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
2017-06-27 03:35:07 -07:00
Qiufang Dai
292936ea96 clk: axg: add pll disable op [1/1]
PD#146411: add disable op for pcie_gp0/hifi pll

1. add clks NULL pointer check.
2. add pll disable op.

Change-Id: Ib32e45e582b45f43b057e1188d83037628c84587
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2017-06-27 03:25:51 -07:00
Xingyu Chen
30e7250dfd saradc: refactor the driver based on the iio sub-system
PD#146222: saradc: refactor the driver based on the iio sub-system

the sar adc driver has been moved from directory input/saradc
into directory iio/adc, and is refactored base on the standard
iio sub-system.

the iio sub-system provide two ways to access sar adc resources:
1. standard api for consumer driver
it can be found at the file "include/linux/iio/consumer.h".

2. sysfs interface for user space(X: 0-7)
  - obtain 10-bit sample value:
  cat sys/bus/iio/devices/iio:device0/in_voltage[X]_input

  - obtain raw sample value(10-bit or 12-bit):
  cat sys/bus/iio/devices/iio:device0/in_voltage[X]_raw

  - obtain mean raw sample value:
  cat sys/bus/iio/devices/iio:device0/in_voltage[X]_mean_raw

test pass on the gxl skt, axg skt, m200.

Change-Id: I6c8877c782c51a01993557cabc0d43f212a8e524
Signed-off-by: xingyu.chen <xingyu.chen@amlogic.com>
2017-06-27 02:31:03 -07:00
Yue Wang
99a3f48127 usb: fix adb reboot panic.
PD#146539: usb: fix adb reboot panic.

Avoid kernel panic caused by race condition. For example,
1. In the ffs_epfile_io function, data buffer is allocated
for non-halt requests and the address of this buffer is
writed to usb controller registers.
2. After adb process be killed, data buffer is freed and
this memory is allocated for the other. But the address
is hold by the controller.
3. Adbd in PC is running. So, the controller receive the
data and write to this memory.
4. The value of this memory is modified by the controller.
This could cause the kernel panic.

To avoid this, during FunctionFS mount, we allocated the
data buffer for requests. And the memory resources has
been released in kill_sb.

Change-Id: I494988e48bb40a21d57adcf38d41c126f9b71978
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2017-06-26 19:08:16 -07:00
Long Yu
70d09082cc emmc: refixed error reading dtb character device
PD#146144: emmc: refixed error reading dtb character device

1. corrected the boot0 and boot1 partition property

2. refixed error reading dtb character device

Change-Id: Icebdf35cbd7e779573a16ca0230015c907135d52
Signed-off-by: Long Yu <long.yu@amlogic.com>
2017-06-26 03:59:58 -07:00
Pengcheng Chen
dfcd0d80a0 ge2d: add ge2d driver for axg bringup
PD#146096: ge2d: add ge2d driver for axg bringup

Change-Id: Iac19fca564ebb564372445c6011143968f2c9739
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-06-26 03:47:55 -07:00
Yixun Lan
7996a06730 Makefile: fix generation dependency for utsrelease.h
PD#144946: Makefile: fix generation dependency for utsrelease.h

we need to explicitly generate kernel.release_full first, before
creating utsrelease.h

Change-Id: I9e25d2511026dba8a5d3135468a53340ee3a59de
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2017-06-26 15:08:24 +08:00
Yun Cai
82a31ab5c1 clk: add saradc clk for gxl
PD#146222: add saradc clk for gxl

Change-Id: I5c82dfc4bc44908c10d96056b0d7a0cf3a64c46e
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-06-23 19:42:04 +08:00
Dezhi Kong
f1755a3750 PD#145804: vdin: optimize vdin mem & clk control
Change-Id: I08c96702a1c5716393907f311be2f9b9f6b5c8cd
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2017-06-22 22:34:10 -07:00
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