Commit Graph

609756 Commits

Author SHA1 Message Date
Elaine Zhang
bfacad511d clk: rockchip: rk3328: Set max parent rate for i2s fractional divider
Set I2S clk parent to CPLL.

Change-Id: I2eaa920c6ab02cbec944b11f3aea2e7fe8551659
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-06-05 14:17:00 +08:00
Elaine Zhang
f2a73282ea Revert "clk: rockchip: fix up the freq overshoot"
This reverts commit c64eb759a8.
This commit make i2s clk setting error when
integer divider switching integer divider.

Change-Id: I927d6995d7b215fd412e147dff6a64c8fc4e2211
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-06-05 14:16:50 +08:00
Tao Huang
ca74123c69 Merge tag 'lsk-v4.4-18.05-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
LSK 18.05 v4.4-android

* tag 'lsk-v4.4-18.05-android': (605 commits)
  ANDROID: sdcardfs: Don't d_drop in d_revalidate
  goldfish: pipe: ANDROID: mark local functions static
  UPSTREAM: ANDROID: binder: prevent transactions into own process.
  goldfish: pipe: ANDROID: Add DMA support
  UPSTREAM: f2fs: clear PageError on writepage - part 2
  UPSTREAM: f2fs: avoid fsync() failure caused by EAGAIN in writepage()
  ANDROID: x86_64_cuttlefish_defconfig: Disable KPTI
  UPSTREAM: mac80211: ibss: Fix channel type enum in ieee80211_sta_join_ibss()
  UPSTREAM: mac80211: Fix clang warning about constant operand in logical operation
  UPSTREAM: nl80211: Fix enum type of variable in nl80211_put_sta_rate()
  UPSTREAM: sysfs: remove signedness from sysfs_get_dirent
  UPSTREAM: tracing: Use cpumask_available() to check if cpumask variable may be used
  BACKPORT: clocksource: Use GENMASK_ULL in definition of CLOCKSOURCE_MASK
  UPSTREAM: netpoll: Fix device name check in netpoll_setup()
  FROMLIST: staging: Fix sparse warnings in vsoc driver.
  FROMLIST: staging: vsoc: Fix a i386-randconfig warning.
  FROMLIST: staging: vsoc: Create wc kernel mapping for region shm.
  goldfish: pipe: ANDROID: Replace writel with gf_write_ptr
  goldfish: pipe: ANDROID: Use dev_ logging instead of pr_
  goldfish: pipe: ANDROID: fix checkpatch warnings
  ...

Conflicts:
	fs/f2fs/node.c
	scripts/Makefile.lib

Change-Id: Ib92d11938a383464249fe6f2dad3ab2a05bc4770
2018-06-04 20:16:28 +08:00
Rocky Hao
90d074f764 arm: dts: rockchip: thermal: update soc's sw/hw over temperature power off degree
to cope with Wide Temperature Range test, we maxamize
soc's sw/hw over temperature power off degree.

fow now, 115 degree Celsius is set to trigger sw powering off.
if sw function does not work and temperature is continuing to
grow up, and till 120 degree Celsius, hw powering off/reset
is triggered.

Change-Id: I751e9ea754f434bc20df39fdbdb40216a1582c39
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-06-04 17:17:38 +08:00
Dingqiang Lin
ba67486670 soc: rockchip: fix flash_vendor_storage _flash_read pointer null error
Change-Id: Ie7e8a937f9439aec6922b178026f3381c772a26f
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>
2018-06-04 16:49:14 +08:00
Ziyuan Xu
9bc2be6181 rtc: hym8563: fix the incorrect initialization
The **valid** is always false in __probe__ function, so that the time
will be invalid at the first time.

Fixes: 66af9943e3 ("rtc: hym8563: add initialization data")
Change-Id: Id7a245159ab0fc4e9980db5e538b05ff17a02d89
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2018-06-04 16:39:41 +08:00
Andy Yan
b8154f1fba Revert "arm64 Kconfig: Move LIST_POISON to a safe value"
This reverts commit 4003f6b715.

This is a redefine of commit bf0c4e047 (arm64: kconfig: Move LIST_POISON
to a safe value)

Change-Id: Ibde683271af2bc982f3727a98ebd1530fc503dd1
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2018-06-04 10:45:33 +08:00
Liang Chen
4d5707c35c arm: dts: adjust opp-table for rk3288
Change-Id: Ic5efeaf47883255072182aa8d1fdc1f1266c7dc8
Signed-off-by: Liang Chen <cl@rock-chips.com>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-06-01 17:10:17 +08:00
Finley Xiao
37c0570133 cpufreq: rockchip: implement get_soc_info() for rk3288 SoCs
Change-Id: Idefa7baa977cb062c0030538e24b555b9df58b0a
Signed-off-by: Liang Chen <cl@rock-chips.com>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-06-01 17:09:58 +08:00
Finley Xiao
71e634507f soc: rockchip: opp_select: Add support to adjust power scale
Change-Id: I2358d75c2fdada7cfe385e85d2106370f9aa5ea3
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-06-01 16:58:27 +08:00
XiaoDong Huang
a487158ec0 arm64: dts: rockchip: px30: disable bus0 auto div
Change-Id: Ie96ad61d3069c8045b26c08f336e63c2d4f68fef
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-06-01 16:01:42 +08:00
Elaine Zhang
0ac3e9a00b clk: rockchip: rk3288: fix up the 594M pll vco
Modify VCO within safe limits(600M-3200M).

Change-Id: I76b69091ee1ff9a0d88f17a1e4dabda6e267caad
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-06-01 15:49:59 +08:00
Rocky Hao
24d10acefc thermal: rockchip: tune tsadc parameter of temperature prediction
init temp_last with a more suitable value. also we eliminate
the steady state error by ajusting the temp calc fomular.
extra useful log is added to mark tsadc is probed successfully.

Change-Id: If88031c10646437fa7b5152c70aeaebf93e4df05
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-06-01 14:36:32 +08:00
Sugar Zhang
f113aefebc ASoC: rockchip: multi_dais_pcm: prepare dma cyclic buffer
This patch prepare dma cyclic with total buffersize,
and let the dmaengine to handle the interlace buffer.

Change-Id: Ic0ee647e006c72c7eedc77a30d1e2d0eb902f120
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-06-01 11:16:50 +08:00
Sugar Zhang
191583d95b dmaengine: pl330: add support for interlace cyclic xfer
Change-Id: I7336afd2f7c1c501e275cff3e78326111277e2bd
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-06-01 11:16:50 +08:00
Tao Huang
e64bab1c12 mfd: rk818: remove unused rk818 driver
Change-Id: I4390e73f0e4ab6e723ed3a44e93e891204044d85
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-06-01 11:05:38 +08:00
XiaoDong Huang
08f918733a Revert "arm64: dts: rockchip: px30: disable cpu CLUSTER_SLEEP"
This reverts commit 3a13a2ae52.

Change-Id: I2e02f350ffb9b1b39cd21786b3683622729b2ec8
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-06-01 10:01:46 +08:00
Huang jianzhi
94b431d697 arm64: dts: rk3328-box-liantong: fixed otg vbus gpio
Change-Id: I40c6b200fb6edf26e651cec697dbd26e24dbba9e
Signed-off-by: Huang jianzhi <jesse.huang@rock-chips.com>
2018-05-31 21:07:35 +08:00
Xing Zheng
41d67a9e2c arm64: dts: rockchip: add rockchip,adc-grps for RK3308 EVB
By default, we enable all of ADC groups on RK3308 EVB.

Change-Id: Id89adab1c7d9cde22fb4ac3d5dcd3b18a8a96da3
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-05-31 20:50:49 +08:00
xiaoyao
ef8edc4005 net: wifi: cypress: fix some issues
1: remove chipvendor id
  2: disable auto sleep
  3: add rockchip_wifi_get_oob_irq_flag

Change-Id: I28161c12ebd6e625815d09a0b670a923eda475d9
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2018-05-31 18:40:30 +08:00
Huang jianzhi
c416f3aa48 arm64: dts: rk3328-box-liantong: add rtc fake node
Change-Id: If84707460ef0c9b89b62aa89a9213682480d3584
Signed-off-by: Huang jianzhi <jesse.huang@rock-chips.com>
2018-05-31 15:41:32 +08:00
Xing Zheng
6fd65382b4 ASoC: rk3308_codec: add rockchip,adc-grps-route property
Change-Id: Ib59fa2c8693fec5ac006523a2aec36300b34b401
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-05-31 15:07:30 +08:00
Xing Zheng
1b5d8861ab ASoC: rk3308_codec: add supports ADC groups route mapping
There are 3 I2S that can be connected to aocdec on RK3308:
- i2s2_8ch
- i2s3_4ch
- i2s1_2ch

We can change the order of i2s sdis to meet different
customized requirements.

Change-Id: I62b2e953ea76e71590bcd4244883b391a9bec345
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-05-31 14:54:51 +08:00
Xing Zheng
62ef9e37df ASoC: rk3308_codec: add rockchip,adc-grps property
Change-Id: I646ad745f5891a93a172ad17925c5b1d5177dad9
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-05-31 14:54:51 +08:00
Xing Zheng
1796c149f5 ASoC: rk3308_codec: add supports assign ADC groups
This patch supports ADC groups for assignments that
need to be used, we don't need to enable all of ADC
channels, so that the runtime power consumption
will also be improved.

By the way, clean up the useless structure members
and source codes.

Change-Id: I7c559543eb9344f0022ce99a6938114084ac17db
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-05-31 14:54:51 +08:00
Finley Xiao
3c460646d5 PM / devfreq: rockchip_bus: Add support for rk3288, rk3368 and rk3399
Change-Id: I920e220b406f9cfa8d34359465fed4683e3a4eae
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-05-31 14:17:29 +08:00
Finley Xiao
618d89da2b arm64: dts: rockchip: Enable bus_apll node for px30/rk3326
Change-Id: I5b94d18f61daf92414ee5da666674576d6dc0c4d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-05-31 14:17:29 +08:00
Finley Xiao
9c4e21b035 PM / devfreq: rockchip_bus: Add clkfreq and cpufreq policy
Change-Id: Ibba74a5d6bc4326155b628c8d4238fed93c44b14
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-05-31 14:17:29 +08:00
Finley Xiao
0b318ea183 arm64: dts: rockchip: px30: Add bus_apll device node
Change-Id: I6f2ea99e58069962bd04461b959d208c8453f42b
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-05-31 14:17:29 +08:00
Xing Zheng
f0b53eb6a4 arm64: dts: rockchip: remove #sound-dai-cells for RK3308 EVB acodec
The RK3308 codec is attached with multi-codec machine
driver, not simple-card, so we don't need use the
property #sound-dai-cells any more.

Change-Id: Ie1afdc6bf2820efbb0054ea5e6d91d9c9025351e
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-05-31 14:14:35 +08:00
David Wu
979e825fe8 pwm: pwm-rockchip-i2s: Add the PWM driver for rockchip i2s controller
Make the i2s controller to implement the PWM continuous mode, use
I2S's Left/right two channel, each channel is only 32bits, so the
precision of duty percent is 1/64.

Change-Id: Ie134d964cdf33573e918b2f79cc8e53118f50a1e
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-05-31 12:56:22 +08:00
Sugar Zhang
da58eea77a arm64: configs: rk3308_linux_defconfig: enable multi-dais
Change-Id: I1a1b2f2b4079646f20a2fbf9e915ac397fb1b846
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-05-31 10:38:51 +08:00
Sugar Zhang
8dc69247be ASoC: rockchip: add support for multi-dais driver
This patch add support for combine several audio digital interface
into a mix-dai, for example, we can combine two 8ch i2s into a 16ch dai.
or combine 6ch pdm and 2ch i2s into a 8ch dai.

Change-Id: I4e920c0cdf9c8d954c12b48938a48926cfe403b0
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-05-31 10:38:51 +08:00
Sugar Zhang
ddd2e87ad4 dmaengine: pl330: add support for interlace size config
Change-Id: Ia1008d689591f80ee2b3c08e1596b83ccd762f63
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-05-31 10:38:51 +08:00
Huang jianzhi
9d1e605ec4 arm: rockchip_defconfig: add fake rtc
Change-Id: I4b6bb5ad61de71a5d7efc7d58ef5b6f478a40d2c
Signed-off-by: Huang jianzhi <jesse.huang@rock-chips.com>
2018-05-31 10:30:54 +08:00
Huang jianzhi
a273cc6746 arm64: rockchip_defconfig: add fake rtc
Change-Id: I8dff1ae3e033f3123ea078fb9d5611680aa4eab6
Signed-off-by: Huang jianzhi <jesse.huang@rock-chips.com>
2018-05-31 10:30:54 +08:00
Huang jianzhi
7160f0aed7 rtc: rtc-fake: add fake rtc driver
Change-Id: Ia06db4f5d967338c3f74fed9d35d2cd05209d746
Signed-off-by: Huang jianzhi <jesse.huang@rock-chips.com>
2018-05-31 10:30:54 +08:00
Binyuan Lan
b62b2da7bd ASoC: rockchip: rk817-codec: fixup spk-volume and pdm bug
Change-Id: Idd7ac0b0a12c75d8c43a57d8c8f9ecfccd399894
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2018-05-31 10:06:32 +08:00
Algea Cao
af008c375a drm/rockchip: dw-hdmi: Set 4K x 2k 60Hz/50Hz color to YUV420 if tmdsclk over the limit
When 4K x 2k 60Hz/50Hz tmds clock is above the max tmds clock, setting its
color to YUV420. A few TV edid declare that they can't support
4K x 2k 60Hz/50Hz YUV420, we still set color to YUV420 or 4K x 2k 60Hz/50Hz
tmds clock will over the limit.

Change-Id: Id57c9313ab52973927c578d0eb2a7b1b30cb9ec1
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-05-31 09:13:53 +08:00
Tao Huang
374318f000 ARM: rockchip: Locate kernel add 0x00058000 if CPU_RK3308
128+64KB at the beginning of RAM reserved for ATF.
128KB for pstore.

Change-Id: I1306daec44c65258ff6668f6760be4981d7ca932
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-05-30 19:44:51 +08:00
Tao Huang
98ff84daa2 ARM: decompressor: fix start of RAM alignment
256KB alignment is not work for (textofs & 0xf0000) > 0x40000.
Change to 1MB.

Change-Id: I9803b22d7d64a244842dcc811e47e214d247fc0c
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-05-30 19:42:44 +08:00
Sugar Zhang
d86472234c ASoC: rockchip: add 'rockchip,no-dmaengine' for i2s/tdm/pdm
This patch add support for property 'rockchip,no-dmaengine'.
it is a boolean property. if present, driver will do not
register pcm dmaengine, only just register dai. if the dai
is part of multi-dais, the property should be present. Please
refer to rockchip,multidais.txt about multi-dais usage.

Change-Id: I9aa2ddb15f5a27202f90bf32804f214435cc0b73
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-05-30 17:53:03 +08:00
Mengdong Lin
51e355f13b UPSTREAM: ASoC: Add kerneldoc comments for snd_soc_find_dai
snd_soc_find_dai() has been exported and so add the kerneldoc comments
for it.

Change-Id: Iaeb085bd8eebc26075558b4db4cfa4fe9d058e83
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit fbb88b5ca1)
2018-05-30 15:13:53 +08:00
Mengdong Lin
0e9a1da83f UPSTREAM: ASoC: Export snd_soc_find_dai()
This API can be used by topology to find an existing BE dai by name
and further configure it.

Topology will also check DAI ID to avoid wrong match.

Change-Id: I5651b280ef8352dd20bdb9e6ffa747d0b5a4e088
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit 305e9020f0)
2018-05-30 15:13:19 +08:00
Sugar Zhang
8644cf7f0d ASoC: codec: dummy-codec: change channels_max to 384
Change-Id: I4b7fd55fc01f2c65f1cd5c8c60238957b759566b
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-05-30 15:11:23 +08:00
Tao Huang
cddd5eff01 ARM: Makefile: make [z]boot.img without load addr
Set base and kernel_offset breaks u-boot.

Change-Id: I1e7fdfb722782702d5141f89936127ed340642e6
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-05-30 14:26:09 +08:00
Hans Yang
e2e7ae2203 arm64: defconfig: rk3308_linux_defconfig: enable CONFIG_CYW_BCMDHD
Change-Id: I1b84e84df31f502cdad23b30390f8f0bc24d9c44
Signed-off-by: Hans Yang <yhx@rock-chips.com>
2018-05-30 11:24:47 +08:00
Alex Zhao
6a7eddd528 arm: rockchip_defconfig: remove CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP
Change-Id: I22ff998806919f364d0338415bb585c21d966736
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
2018-05-30 10:28:24 +08:00
Alex Zhao
41dcb2d174 arm64: rockchip_defconfig: remove CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP
Change-Id: I369574059ecb6984596d39c1b8d696eaa41330e5
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
2018-05-30 10:28:24 +08:00
zain wang
4258959427 mfd: fusb302: add DP UFP_D support
Add DP UFP_D support so that we can get the right
DP pin cap for DISCOVERY_MODES cmd.

Change-Id: I564453d2bdf1485acdd65dddb814aae5012c9097
Signed-off-by: zain wang <wzz@rock-chips.com>
2018-05-29 20:31:12 +08:00