Commit Graph

609075 Commits

Author SHA1 Message Date
Tao Huang
cd42ff828d ARM: rockchip_linux_defconfig: update by savedefconfig
Change-Id: I4d945da6d79b2ac0ebc9e6b00d7eeb62ecb899c8
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-05-28 11:02:41 +08:00
Dingxian Wen
8d3c5a467a arm64: dts: rockchip: rk3399-android: config pinctrl for cif_clkout
Change-Id: I36c99e72558cd532ea732b3eaff9aab864518c11
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
2018-05-28 10:58:07 +08:00
Tao Huang
87e5b2a712 arm64: dts: rockchip: add label to ramoops for rk3308
Change-Id: I5a8003ab1e600fc207c20f248cf626c9c3c39df3
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-05-25 19:55:37 +08:00
Tao Huang
343d0996d4 ARM: Make SWIOTLB selectable in Kconfig
Not all CPUs need SWIOTLB.

Change-Id: I561f35307c1fdd007a072cebee6306fda8272aea
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-05-25 19:51:13 +08:00
Tao Huang
234d421421 ARM: dma-mapping: silence warning if atomic_pool_size=0
Abort atomic_pool_init if atomic_pool_size=0, silence the following
warning:

[    0.113029] ------------[ cut here ]------------
[    0.113461] WARNING: CPU: 0 PID: 1 at mm/page_alloc.c:3062 __alloc_pages_nodemask+0xc1/0x474()
[    0.114248] Modules linked in:
[    0.114550] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.4.126 #114
[    0.115112] Hardware name: Generic DT based system
[    0.115570] [<c014289d>] (unwind_backtrace) from [<c0140133>] (show_stack+0xb/0xc)
[    0.116269] [<c0140133>] (show_stack) from [<c022bc73>] (dump_stack+0x5b/0x70)
[    0.116935] [<c022bc73>] (dump_stack) from [<c014dfd5>] (warn_slowpath_common+0x55/0x7c)
[    0.117677] [<c014dfd5>] (warn_slowpath_common) from [<c014e055>] (warn_slowpath_null+0xf/0x14)
[    0.118472] [<c014e055>] (warn_slowpath_null) from [<c01a2a39>] (__alloc_pages_nodemask+0xc1/0x474)
[    0.119305] [<c01a2a39>] (__alloc_pages_nodemask) from [<c014544f>] (__dma_alloc_buffer.constprop.6+0x1d/0x7a
)
[    0.120220] [<c014544f>] (__dma_alloc_buffer.constprop.6) from [<c054d165>] (atomic_pool_init+0x31/0xd8)
[    0.121089] [<c054d165>] (atomic_pool_init) from [<c0139725>] (do_one_initcall+0xa1/0x158)
[    0.121847] [<c0139725>] (do_one_initcall) from [<c054aa87>] (kernel_init_freeable+0x10b/0x150)
[    0.122646] [<c054aa87>] (kernel_init_freeable) from [<c040dc4f>] (kernel_init+0x7/0x9c)
[    0.123391] [<c040dc4f>] (kernel_init) from [<c013d541>] (ret_from_fork+0x11/0x30)
[    0.124105] ---[ end trace 1e6e8e7da2c45838 ]---
[    0.124529] DMA: failed to allocate 0 KiB pool for atomic coherent allocation

Change-Id: I3ebeb165d710d44c0493e471461daf82c6902222
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-05-25 19:51:01 +08:00
Tao Huang
ba14dd8c0b arm64: rk3308_linux_defconfig: remove IOMMU_SUPPORT
RK3308 don't have IOMMU. Save about 34KB.

Change-Id: I6fb00e0940c0c3710c8b832419cdc175fc3b0c7e
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-05-25 19:17:36 +08:00
Tao Huang
a77016ecf0 drm/rockchip: Remove depends on ROCKCHIP_IOMMU
Some CPUs without IOMMU but have VOP.

Change-Id: Ic11d1438851eb4773bc94e74879a2329964d012a
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-05-25 19:17:36 +08:00
Nickey Yang
d5d8157e25 arm: dts: rockchip: add rk3288-evb-rk1608 linux support
Change-Id: Ib19fb1acb5604157b35528ec87b727e43ef9dda6
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-05-25 16:40:18 +08:00
Dingqiang Lin
02a0d8d9cf drivers: rkflash: add Kconfig introduction and Kconfig detect
in order to distinguish with other nand drivers

Change-Id: Ifd64a3a839752758b1d2923a58bf569f5169bcdd
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>
2018-05-25 16:39:33 +08:00
Yifeng Zhao
9f091f9fc6 drivers: rk_nand: zftl static wear leveling strategy optimize
1. Garbage collection does not deal with the updated blocks.
2. Static wear considers the SLC mode erase count and XLC
mode erase count

Change-Id: I3a404a686e48f8ae44f5e7e507f6d1ef633671d4
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
2018-05-25 16:32:10 +08:00
Liang Chen
6bd134260e soc: rockchip: pvtm: correct bit_freq_done for rk3288
Change-Id: I6afb822149971be77c2fd7365771f43143691c8d
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-05-25 11:40:06 +08:00
Tao Huang
a49baba6eb ARM: rockchip: no build mach-rockchip when CONFIG_ARM_PSCI
There is not need to build mach-rockchip when PSCI is enabled.
Save about 5K text, 7K data and fix compilation error for THUMB2_KERNEL.

Change-Id: Ieb17867592d7d49a8b983dc5c7e8d1d1df14d864
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-05-25 09:12:28 +08:00
Tao Huang
d2bc46a703 ARM: rockchip: support CPU config
CACHE_L2X0/TWD/ARM_GLOBAL_TIMER are only available on Cortex-A9.
DW_APB_TIMER_OF only use on rk3066a.

Change-Id: Ied2f49b5d308e961ce5af72eb577aac23e3eb890
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-05-25 09:10:22 +08:00
Tao Huang
f1cb4fc186 soc: rockchip: all cpu support ARM
Let ARMv8 CPU that support AARCH32 selected on ARM.
But disabled by default.

Change-Id: I1db422c8ed3fcaf761c9ef9d6d5d68356696e4ab
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-05-25 09:10:02 +08:00
Tao Huang
bfe1e6e631 ASoC: rockchip: i2s_tdm: Cast pointer to uintptr_t to fix warning on 32-bit
On 32-bit:
sound/soc/rockchip/rockchip_i2s_tdm.c:155:18: warning:
cast from pointer to integer of different size [-Wpointer-to-int-cast]

Cast the pointer to uintptr_t instead of u64 to fix this.

Change-Id: Ie7dbbb59da68fadfe8ad639d93c513e38ab00b38
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-05-25 09:09:33 +08:00
Tao Huang
76a299b90c clk: rockchip: pll: Fix compile error when !DEBUG_FS
Change-Id: I49be8f1772e28ab7f3cc343b0a81f258d739fdfb
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-05-24 19:37:29 +08:00
Wang Panzhenzhuan
49b5045634 camera: rockchip: camsys_drv: v0.0x29.0
Fix crash in rk3288w mid sample machine when switch to
front soc camera,such as: gc2035

Change-Id: I94fb4f29834f6e9b54db025059d558c3813a2a33
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2018-05-24 16:49:54 +08:00
Shawn Lin
001cdfec71 mmc: core: Allow adding software debounce via mmc_gpiod_request_cd()
mmc_gpio_request_cd() allow host drivers to add bigger software
debounce from the drivers themself, but we might allow the same
behaviour from the fwnode.

Change-Id: Icc994aa9b58b0b8836a2fb60ac1a87ac3c7e676a
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2018-05-24 16:47:45 +08:00
Zain Wang
5d600c5c23 BACKPORT: ARM: dts: rockchip: Add Crypto node for rk3288
Add Crypto node for rk3288 including crypto controller and dma clk.

Signed-off-by: Zain Wang <zain.wang@rock-chips.com>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry picked from commit c2cb616129ba28a530eb286c1e9c5bf9da042924)

Change-Id: I3e56c3bd6831248b724487ddfa8e468308f79476
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-05-24 14:07:59 +08:00
Zain Wang
10691369e3 UPSTREAM: crypto: rockchip - add DT bindings documentation
Add DT bindings documentation for the rk3288 crypto drivers.

Signed-off-by: Zain Wang <zain.wang@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit e81c1b4646149c1e67610c83e8770a7217491a13)

Change-Id: Iaea953b6a7fe59c957377f6b963ffc6e700cf592
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-05-24 14:07:59 +08:00
Zain Wang
5ad9ae1478 UPSTREAM: crypto: rockchip - Don't dequeue the request when device is busy
The device can only process one request at a time. So if multiple
requests came at the same time, we can enqueue them first, and
dequeue them one by one when the device is idle.

Signed-off-by: zain wang <wzz@rock-chips.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 5a7801f6634b1e2888bcb1a85bedc50e46dcd757)

Change-Id: Ie155271c181cd9b6174708e8ebc36bf65c0d49c8
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-05-24 14:07:59 +08:00
Zain Wang
d0733c029c UPSTREAM: crypto: rockchip - return the err code when unable dequeue the crypto request
Sometime we would unable to dequeue the crypto request, in this case,
we should finish crypto and return the err code.

Signed-off-by: zain wang <wzz@rock-chips.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 9a42e4eed3fcd7ba8dff6622384cd08bfe5ef707)

Change-Id: If3cd08dbd48beb66539a3ac6bbe1c3d2656c8a7b
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-05-24 14:07:59 +08:00
Zain Wang
deadc80be3 UPSTREAM: crypto: rockchip - move the crypto completion from interrupt context
It's illegal to call the completion function from hardirq context,
it will cause runtime tests to fail. Let's build a new task (done_task)
for moving update operation from hardirq context.

Signed-off-by: zain wang <wzz@rock-chips.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 641eacd15696a65b08880985701c8082872da136)

Change-Id: Iddfdf48c5dc823817d7e15fc5d04bef96506c3be
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-05-24 14:07:59 +08:00
Sudip Mukherjee
5321d2f8eb UPSTREAM: crypto: rockchip - use devm_add_action_or_reset()
If devm_add_action() fails we are explicitly calling the cleanup to free
the resources allocated.  Lets use the helper devm_add_action_or_reset()
and return directly in case of error, as we know that the cleanup function
has been already called by the helper if there was any error.

Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 16d56963e832339fc2dff6a4afce14138fb61932)

Change-Id: I9fd5d7c0659744243b313693615bf332a2b5e05c
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-05-24 14:07:59 +08:00
Zain Wang
2e5c80594b UPSTREAM: crypto: rockchip - add hash support for crypto engine in rk3288
Add md5 sha1 sha256 support for crypto engine in rk3288.

Signed-off-by: Zain Wang <zain.wang@rock-chips.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit bfd927ffa219ac81082b2dcc61a1c4037869befc)

Change-Id: Ifabff24170064187aaffcf396d50c22007ac48bc
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-05-24 14:07:59 +08:00