Commit Graph

5430 Commits

Author SHA1 Message Date
Chris Zhong
07b7c37ca5 arm64: rockchip_linux_config: enable LEDS_IS31FL32XX
LEDS_IS31FL32XX is a led driver IC used by rk3308 evb.

Change-Id: I77c8dcd379e72bd85bffcad5f0ec51bbaf876274
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
2018-03-15 18:51:42 +08:00
Nickey Yang
8b4430021f arm64: dts: rockchip: add rk3399-videostrong board support
Change-Id: I0b24ee2f926f3be4bc8d93064c2f5f8e51ffe2de
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-03-15 14:25:46 +08:00
Tony Xie
adc3c2caca arm64: configs: rockchip_defconfig: enable CONFIG_PINCTRL_RK805
Change-Id: I57099822c273822aaf857f3d92a94fd4fcf03703
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
2018-03-15 11:29:25 +08:00
Sandy Huang
dc6a552956 arm64: rockchip_defconfig: enable CONFIG_ROCKCHIP_RGB
For RK3326/RK3308

Change-Id: I4a82988cdd9b72844b65d2ff35a56e4f10886d74
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-03-13 18:20:18 +08:00
Huibin Hong
f654b33256 arm64: dts: rockchip: Add spi node for rk3308
Change-Id: I5212c378e74da0159247a4dcf4bf66bb5b671f80
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-03-13 14:48:21 +08:00
Huibin Hong
2ed3cd686e arm64: dts: rockchip: Add uart node for rk3308
Change-Id: I3d3bacf0801154d2cd354e39dc2a6440fa616930
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-03-13 14:47:09 +08:00
Huibin Hong
a657105990 arm64: dts: rockchip: Add dma node for rk3308
Change-Id: I7337d230ae8d73805b478b4e7280cdf33c48a1fb
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-03-13 14:43:20 +08:00
Huibin Hong
a9e533b076 arm64: dts: rockchip: Add watch dog node for rk3308
Change-Id: I735a84dc5be18da47131c08cfdb2f66f698648b3
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-03-13 14:41:27 +08:00
XiaoDong Huang
b3bbd99a3f arm64: dts: rockchip: enable rockchip_suspend node for px30/rk3326 board
Change-Id: Ic0abae2f3c474e2d6f03bda3ae4a99d05cc53c30
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-03-12 19:55:55 +08:00
XiaoDong Huang
8e0f9d6184 arm64: dts: rockchip: px30: add rockchip-suspend node
Change-Id: Iac7fdbcf6ede75d8a987c8c618bce4ebc4f536cc
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-03-12 19:54:55 +08:00
Tao Huang
3430c68a33 Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
* linux-linaro-lsk-v4.4-android: (660 commits)
  ANDROID: keychord: Check for write data size
  ANDROID: sdcardfs: Set num in extension_details during make_item
  ANDROID: sdcardfs: Hold i_mutex for i_size_write
  BACKPORT, FROMGIT: crypto: speck - add test vectors for Speck64-XTS
  BACKPORT, FROMGIT: crypto: speck - add test vectors for Speck128-XTS
  BACKPORT, FROMGIT: crypto: arm/speck - add NEON-accelerated implementation of Speck-XTS
  FROMGIT: crypto: speck - export common helpers
  BACKPORT, FROMGIT: crypto: speck - add support for the Speck block cipher
  UPSTREAM: ANDROID: binder: synchronize_rcu() when using POLLFREE.
  f2fs: updates on v4.16-rc1
  BACKPORT: tee: shm: Potential NULL dereference calling tee_shm_register()
  BACKPORT: tee: shm: don't put_page on null shm->pages
  BACKPORT: tee: shm: make function __tee_shm_alloc static
  BACKPORT: tee: optee: check type of registered shared memory
  BACKPORT: tee: add start argument to shm_register callback
  BACKPORT: tee: optee: fix header dependencies
  BACKPORT: tee: shm: inline tee_shm_get_id()
  BACKPORT: tee: use reference counting for tee_context
  BACKPORT: tee: optee: enable dynamic SHM support
  BACKPORT: tee: optee: add optee-specific shared pool implementation
  ...

Conflicts:
	drivers/irqchip/Kconfig
	drivers/media/i2c/tc35874x.c
	drivers/media/v4l2-core/v4l2-compat-ioctl32.c
	drivers/usb/gadget/function/f_fs.c
	fs/f2fs/node.c

Change-Id: Icecd73a515821b536fa3d81ea91b63d9b3699916
2018-03-09 19:10:14 +08:00
Rocky Hao
b8856eb8db arm64: dts: rockchip: rk3308: add tsadc node and basic thermal config
Change-Id: I483802c7c3e0e46f085eb3ef802ccdd9bdb89096
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-03-09 18:46:58 +08:00
Frank Wang
c687abf750 ARM64: dts: rockchip: add usb related nodes for rk3308
This change adds usb otg/host controllers and related phy nodes
on rk3308 SoC.

Change-Id: I5fd3acc44614cc3fcb58eb269c2e559ea24ab0f1
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2018-03-09 18:42:48 +08:00
Sandy Huang
df5cbcb5db arm64: dts: rockchip: rk3308: add display node
add display node: vop, rgb node.

Change-Id: I495079cb18170bd2437670fd6d6e3c7e22438895
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-03-09 17:50:43 +08:00
Wyon Bi
25f2631acc arm64: dts: rockchip: px30: set default driver strength for lcdc pins
Change-Id: I9b2b158576d43f4674922555ce7426bd6f3a82fd
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-03-09 17:45:20 +08:00
David Wu
e421fbd4cb arm64: dts: rockchip: Add saradc node for rk3308
Change-Id: I1b9671a2fd7b214b5268aabb3fdc7063f3ff99e3
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-03-09 14:11:36 +08:00
David Wu
ad2e5708ac arm64: dts: rockchip: Add io-domain node for rk3308
Change-Id: I57bbb420b8114850a16b3e7ad9f6c3564930d699
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-03-09 14:11:31 +08:00
shengfei Xu
bc22ab7830 arm64: dts: rockchip: rk3326/px30: add charge animation node
Change-Id: I2c013c6e1f94727de7031420e7cd15e022767171
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2018-03-09 14:10:02 +08:00
Shawn Lin
3327afc610 arm64: dts: rockchip: enable eMMC for RK3308 FPGA platform
Change-Id: Ib9a9d3161101cab867e5c838189003be6e45e15b
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2018-03-09 14:06:27 +08:00
YouMin Chen
4b93b8c29f arm64: dts: px30: update ddr_timing
Change-Id: I8c605c9b121695b9f91388767db9e7035a68fe59
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2018-03-09 09:47:41 +08:00
David Wu
9da65c6c17 arm64: dts: rockchip: Add pwm 4 channels for rk3308
Change-Id: Iba2e94d037c6d3e2fa5b4f1217d4e32ff7c35bca
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-03-08 18:34:19 +08:00
David Wu
8e1d938562 arm64: dts: rockchip: Add i2c nodes for rk3308
Change-Id: I44d19186fd334d6b38dae67cda64205e8a2407d0
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-03-08 18:33:26 +08:00
David Wu
a9673f1df7 arm64: dts: rockchip: Correct the gpio clock for rk3308
Change-Id: Ic7709d0a3f09249d574a15222656c29363d57d50
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-03-08 15:09:49 +08:00
David Wu
97648a4ce7 arm64: dts: rockchip: px30: Add 12ma strength for rmii mac_refclk pin
If the mac_refclk is provided from mac controller, the pin of mac_refclk
needs to setup 12ma strength, or the signal is not good.
If the mac_refclk is provided from phy, the pin of mac_refclk needs not
to setup 12ma strength, the phy would do it.

Change-Id: I4f6e6d081b4616363d10358c9e36d71cacbdb134
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-03-08 15:09:24 +08:00
Liang Chen
bd5e33aeb5 arm64: dts: rockchip: rk3328: Disable 400MHz and 600MHz for dmc
400MHz and 600MHz aren't supported at present.

This had submitted in commit a8c497e79d
("arm64: dts: rockchip: rk3328: Disable 400MHz and 600MHz for dmc")
but was modified in commit 59af91b563
("arm64: dts: rockchip: auto select opp-table by leakage for rk3328")
by mistake.

Change-Id: I864453d16596798e063a2c3569b260fd1a95c209
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-03-08 09:56:22 +08:00
Finley Xiao
5e4bf4ff0c arm64: dts: rockchip: px30: Enable pvtm
Change-Id: Ib2a0fe5bc2a9e80ea48d35fe526a9efe5df586e7
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-03-07 20:19:33 +08:00
Zhou weixin
8d7742eb92 arm64: dts: rockchip: rk3326-863-lp3-v10: adjust battery config
Change-Id: I8abb28863b4848ab900dddbd04447c098ffcfb84
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-03-07 17:21:25 +08:00
Shawn Lin
ed8bb5c154 arm64: dts: rockchip: Add MMC node for rk3308.dtsi
Change-Id: I9942f0ceb474d5411242fa79337782c0b15c7aa2
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2018-03-07 11:18:32 +08:00
Wyon Bi
5d9f7b3e1b arm64: dts: rockchip: Enable SD/SDIO 3.0 for px30-evb lvds board
Change-Id: I5c9006c7ae02fa8fca6025f1efd8ae902c294002
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-03-07 09:27:02 +08:00
Finley Xiao
81206a0348 arm64: dts: rockchip: rk3308: Add cru node
Change-Id: Ica80020436931a5b146581b26e419f49c0077635
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-03-06 18:17:49 +08:00
Thierry Reding
994fc5a045 UPSTREAM: arm64/efi: Make strnlen() available to the EFI namespace
Changes introduced in the upstream version of libfdt pulled in by commit
91feabc2e2 ("scripts/dtc: Update to upstream commit b06e55c88b9b") use
the strnlen() function, which isn't currently available to the EFI name-
space. Add it to the EFI namespace to avoid a linker error.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Rob Herring <robh@kernel.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

(cherry picked from commit 7f4e346263)
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2018-03-05 21:56:13 +05:30
Jiri Slaby
1919a3ef5a BACKPORT: exit_thread: remove empty bodies
Define HAVE_EXIT_THREAD for archs which want to do something in
exit_thread. For others, let's define exit_thread as an empty inline.

This is a cleanup before we change the prototype of exit_thread to
accept a task parameter.

[akpm@linux-foundation.org: fix mips]
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chen Liqin <liqin.linux@gmail.com>
Cc: Chris Metcalf <cmetcalf@mellanox.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: David Howells <dhowells@redhat.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Rich Felker <dalias@libc.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Steven Miao <realmz6@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

(cherry picked from commit 5f56a5dfdb)

Conflicts:
	arch/powerpc/kernel/process.c
	arch/xtensa/Kconfig
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2018-03-05 21:56:13 +05:30
Amit Pundir
24740dab5c Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

Conflicts:
    fs/f2fs/extent_cache.c
        Pick changes from AOSP Change-Id: Icd8a85ac0c19a8aa25cd2591a12b4e9b85bdf1c5
        ("f2fs: catch up to v4.14-rc1")

    fs/f2fs/namei.c
        Pick changes from AOSP F2FS backport commit 7d5c08fd91
        ("f2fs: backport from (4c1fad64 - Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)")
2018-03-05 20:20:17 +05:30
Tao Huang
efe187c0d4 arm64: dts: rockchip: include dt-bindings/pinctrl/rockchip.h for rk3399-tve1205g
we should not use dt-bindings/pinctrl/rk.h

Change-Id: Idb86c360ea005a48fc3e0ed6a824139eb2afa2ff
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-05 18:33:15 +08:00
Meng Dongyang
423ac27a94 arm64: dts: rockchip: px30: modify error of EHCI and OHCI DT
Modify the clock name of EHCI and OHCI controllers, add
property of "status" for OHCI.

Change-Id: I444a906bc26e26989f5f6011de949b816266b9c6
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
2018-03-05 18:29:36 +08:00
Finley Xiao
ece39c304d arm64: dts: rockchip: Assign SCLK_UART1_SRC to USB480M fox px30
Change-Id: Iab1c8af4289cf0767910d6301689ea52a4195067
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-03-05 14:54:33 +08:00
Huibin Hong
787343f9d7 arm64: dts: rockchip: spi pinctrl-1 with 8ma driver strength for px30
Change-Id: I8e8298e5f37e56585815a29fc0bf46f3a31ff334
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-03-05 09:37:13 +08:00
Alex Shi
825f312805 Merge tag 'v4.4.119' into linux-linaro-lsk-v4.4
This is the 4.4.119 stable release
2018-03-02 12:01:22 +08:00
Tony Xie
1ed201f3fa arm64: dts: rockchip: set dcdc auto mode for rk817&rk809
Change-Id: I149bd790e20eb89899e091a767ef8293f83ecdd6
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
2018-03-01 14:22:53 +08:00
Sandy Huang
621759cbea arm64: dts: rockchip: rk3328: add clk define for vop iommu
Change-Id: I1f6a2ad41455046e3de90be3a6026ac0afa2490d
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-03-01 14:22:04 +08:00
Xiao Yao
edda3bd7f2 arm64: dts: rockchip: add sample/drv clk for sdmmc/ext for rk3328 chip
Change-Id: I2c00f2e461e283abbc18b426f5298490dee4bdfe
Signed-off-by: Xiao Yao <xiaoyao@rock-chips.com>
2018-02-28 17:46:49 +08:00
Michael Weiser
56b57bd20f arm64: Disable unhandled signal log messages by default
commit 5ee39a71fd upstream.

aarch64 unhandled signal kernel messages are very verbose, suggesting
them to be more of a debugging aid:

sigsegv[33]: unhandled level 2 translation fault (11) at 0x00000000, esr
0x92000046, in sigsegv[400000+71000]
CPU: 1 PID: 33 Comm: sigsegv Tainted: G        W        4.15.0-rc3+ #3
Hardware name: linux,dummy-virt (DT)
pstate: 60000000 (nZCv daif -PAN -UAO)
pc : 0x4003f4
lr : 0x4006bc
sp : 0000fffffe94a060
x29: 0000fffffe94a070 x28: 0000000000000000
x27: 0000000000000000 x26: 0000000000000000
x25: 0000000000000000 x24: 00000000004001b0
x23: 0000000000486ac8 x22: 00000000004001c8
x21: 0000000000000000 x20: 0000000000400be8
x19: 0000000000400b30 x18: 0000000000484728
x17: 000000000865ffc8 x16: 000000000000270f
x15: 00000000000000b0 x14: 0000000000000002
x13: 0000000000000001 x12: 0000000000000000
x11: 0000000000000000 x10: 0008000020008008
x9 : 000000000000000f x8 : ffffffffffffffff
x7 : 0004000000000000 x6 : ffffffffffffffff
x5 : 0000000000000000 x4 : 0000000000000000
x3 : 00000000004003e4 x2 : 0000fffffe94a1e8
x1 : 000000000000000a x0 : 0000000000000000

Disable them by default, so they can be enabled using
/proc/sys/debug/exception-trace.

Cc: <stable@vger.kernel.org>
Signed-off-by: Michael Weiser <michael.weiser@gmx.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-02-28 10:17:23 +01:00
Wyon Bi
920ec4576e arm64: dts: rockchip: rk3326-863-lp3-v10: enable logo display
Change-Id: I54091b5a0becf970623178ce0967579ebbf22f05
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-02-28 11:07:10 +08:00
Xiao Yao
63c84030be arm64: dts: rockchip: fix clock name for sdmmc_ext for rk3328 chip
Change-Id: I915aed1122b41c3f766968ea8d74d98aa8bb22ed
Signed-off-by: Xiao Yao <xiaoyao@rock-chips.com>
2018-02-28 10:34:50 +08:00
Zhou weixin
651cd90eaa arm64: dts: rockchip: disable virtual power for rk3326-863-lp3-v10
Change-Id: Ib558805bc8923f8485c36edf51535f17ea997573
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-02-28 10:34:28 +08:00
Xinhuang Li
1000befc2d arm64: dts: rockchip: rk3328: add aclk&hclk for h265e_mmu
Change-Id: I46bd3817219f80fddd097ec37e10a3a29209e21f
Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com>
2018-02-28 09:32:25 +08:00
Liang Chen
1400bae5b6 arm64: dts: rockchip: add support of gpu opp 550M for rk3326
Change-Id: Ib8722d53bd37374d7ac7458ee861b3f2b154403b
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-02-28 09:32:25 +08:00
Finley Xiao
090a42caf7 arm64: rockchip: px30: Remove the initial value of PLL_CPLL and BOOST
If show logo in uboot, can't change vop clocks.

Change-Id: I84fc1138b54b1c7b3c798f1bc4fb7d0f332e6895
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-27 18:02:53 +08:00
Shawn Lin
94d9c15c89 arm64: dts: rockchip: Add SD(IO) 3.0 support for rk3326-863-lp3-v10
Change-Id: I046c2dadfe20861c45c27b068b4c4dc427a36eee
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2018-02-27 11:31:31 +08:00
Tao Huang
3d73d4ef98 arm64: rockchip_defconfig: remove rkfb config
For new android, these configs is not needed anymore:

CONFIG_FB_ROCKCHIP
CONFIG_LCDC_RK3368
CONFIG_LCDC_RK322X
CONFIG_LCDC_LITE_RK3X
CONFIG_LCD_MIPI
CONFIG_RK_TRSM
CONFIG_RK32_DP
CONFIG_MIPI_DSI
CONFIG_RK32_MIPI_DSI
CONFIG_RK_HDMI
CONFIG_ROCKCHIP_DP
CONFIG_SND_SOC_DW_HDMI_AUDIO

Change-Id: I0023e0455712b00131a90a24837731e4b2cfeb43
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-02-26 17:30:38 +08:00