Commit Graph

611165 Commits

Author SHA1 Message Date
Elaine Zhang
25353ec005 thermal: rockchip: add tsadc support for rk1808
Change-Id: Icc0bb8a076a3fbd5f8ab70db8d7e032165528ae8
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-28 18:29:26 +08:00
Elaine Zhang
90a51eb7bc dt-bindings: thermal: rockchip-thermal: Support the RK1808 SoCs compatible
This patch set attempts to new compatible for thermal founding
on RK1808 SoCs.

Change-Id: I133218cd958e0aabf711a5d22fe5e5da2fbd59ce
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-28 18:29:20 +08:00
Tao Huang
2030cda396 rk: ARM: Fix build problem with O=
mkkrnlimg/resource_tool is build from source, don't use $(srctree)
on Makefile.
make modules when $(srctree) == $(objtree) otherwise build will
fail.

Change-Id: I7824d0e9cb60ca40925c4047a203242c6e50505d
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-28 18:27:24 +08:00
Tao Huang
197ccb6188 rk: arm64: Fix build problem with O=
mkkrnlimg/resource_tool is build from source, don't use $(srctree)
on Makefile.
make modules when $(srctree) == $(objtree) otherwise build will
fail.

Change-Id: If8461a30d450aef089ae7db5f5851d4837e7c303
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-28 17:35:57 +08:00
Jianqun Xu
9b864e79dc arm64: dts: rockchip: fix grf/pmugrf address
1. Correct grf/pmugrf mapping address.
2. Add xin32k node
3. Remove pmucru
4. Modify mapping address length of cru to 0x50000
5. Add sclk for gpio controllers
6. Add clock for sdmmc & emmc

Change-Id: I8d57f569edfd05559fe1719b7cc3d8d16f8b09c2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-08-28 14:47:10 +08:00
Tao Huang
2d48ae5b45 net: wireless: rockchip_wlan: rtl8723ds: Fix build problem with O=
Change-Id: I2f2a83ea635c267a74df48a46ebba9147e56b4a7
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-28 14:09:44 +08:00
Tao Huang
05c93810f4 net: wireless: rockchip_wlan: rtl8723bs: Fix build problem with O=
Change-Id: I9d17dbce96b649fd56298f66ff0da2afbdcf3f7e
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-28 14:08:47 +08:00
William Wu
d6dc21d7de usb: dwc3: support global Tx/Rx threshold control
According to "TX/RX Data FIFO Sizes and TX/RX Threshold Control
Register Settings" section in the DWC SuperSpeed USB 3.0 Controller
User Guide, for large latency systems, it may cause unnecessary
performance reduction, and having large TX/RX FIFOs alone is not
sufficient, to solve this issue, the controller provides a packet
threshold feature in the host mode.

For example, on rk3399 platforms, if we set aclk_perilp to 100 MHz,
the system usb bus latency is larger than 2.2 microseconds to access
a 1024-byte packet, to avoid underrun and overrun during the burst,
threshold and burst size control must be set through GTXTHRCFG and
GRXTHRCFG registers.

On rk3399 platforms, only a 4-packet TX FIFO and 3-packet RX FIFO
is implemented due to area constraints, so we can program the USB
Maximum TX Burst Size to 13 and the USB Transmit Packet Count to
4 to avoid TX FIFO underrun during an OUT burst. Similarly, set the
USB Maximum TX Burst Size to 10 and the USB Transmit Packet Count
to 2 to avoid RX FIFO overrrun. To enable the threshold control,
add "snps,gtx-threshold-cfg = <4>, <13>" in dts dwc3 node for Tx,
add "snps,grx-threshold-cfg = <2>, <10>" in dts dwc3 node for Rx.

Change-Id: I7535fe72e6527544a20c5921440b4888e1bada22
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-08-28 11:09:44 +08:00
William Wu
db1b25037e dt-bindings: usb: dwc3: add grx/gtx-threshold-cfg properties
Add snps,grx-threshold-cfg and snps,gtx-threshold-cfg properties
which provide values for global Rx/Tx threshold control.

Change-Id: Id470cdc8a1bcf7fe8048ecaa040f5b5662b8ce05
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-08-28 11:09:26 +08:00
Elaine Zhang
2e5468ac45 arm64: dts: rockchip: Improve the aclk_perilp0 frequency for rk3399
To improve the performance of dual USB transmission.

Change-Id: Ie20d17029e54d299cddadc7a286d9bf6c96b0fbb
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-28 11:07:05 +08:00
Jianqun Xu
00af4ed4fd dt-bindings: soc: rockchip: grf add support for rk1808
Change-Id: I59acc2aab6d117c4af96d7e1f57ef2a9b612d0ee
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-08-28 10:29:29 +08:00
Zhangbin Tong
b8f16e1421 arm: dts: rk3128x: Change cpu opp-microvolt form one entry to three
Single entry is for target voltage and three entries are for
<target min max> voltages. Change cpu opp-microvolt form one entry to
three entries and set maximum acceptable voltage to a high value so that
regulator device can supply multiple consumers at the same time.

Change-Id: Id74c570afe702e879504a597a3d9fb3754125f2f
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-08-28 10:22:22 +08:00
Wyon Bi
cd8d9f8e04 drm/rockchip: dsi: places the phy to shutdown mode in mipi_dphy_power_off()
Change-Id: Ia6d88237d3045fab135c6be7a4afdadb8b295236
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-08-28 10:19:41 +08:00
Lin Jinhan
ed18e5b57c arm: dts: rk3308-voice-module-v10-aarch32: Enable rng
Change-Id: I7623a0fa6df690cd03e019bd12052e8a7f96599d
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-08-28 10:12:43 +08:00
Lin Jinhan
97e17475d2 arm64: dts: rockchip: rk3308-evb-*: enable rng
Change-Id: I2800fa3b5de0bc1e02172bbcad848cf78d320142
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-08-28 10:12:25 +08:00
Lin Jinhan
0f9840082f arm64: dts: rockchip: rk3308: add rng node for crypto v2 hwrng
Change-Id: I66432ed414a47dc9f7ff1145564cd696cd93805b
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-08-28 10:01:34 +08:00
David Wu
50301b5f0e dt-bindings: net: rockchip-dwmac: Add gmac support for rk1808
This patch adds devicetree support to gmac of rk1808 with proper
devicetree compatible strings.

Change-Id: Id35523a10f987cbb9b9c33ad32ab23cb3c6d4e2b
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-08-28 09:47:06 +08:00
Jianqun Xu
6e00cbcba1 arm64: dts: rockchip: rk1808 add iomux
Change-Id: I4b84dc830cc65792445d0d05f139025878df634c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-08-28 09:45:19 +08:00
Finley Xiao
1b3dc6cdf9 Revert "Revert "arm64: dts: rockchip: rk3308-evb-v10: Add regulator-early-min-microvolt for core""
This reverts commit 46d3be8026.

This patch add a new 'regulator-early-min-microvolt' property to limit
the minimal voltage of regulator during kernel startup.

Change-Id: I580f0cceda280b9168e7f489f39785830cd28a28
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-08-28 09:43:26 +08:00
Finley Xiao
8726e76f58 Revert "regulator: of: Use regulator-init-microvolt as early minimum"
This reverts commit a4e0323d13.

If uboot needs a high cpu rate, the voltage should be set to a high
value, and the minimal voltage of regulator will also be set to this
value during kernel startup, so it will be failed to set voltage which
is less than this value when consumers change voltage, for example pvtm.

This patch add a new 'regulator-early-min-microvolt' property to limit
the minimal voltage of regulator during kernel startup and it will no
longer be restricted by uboot.

Change-Id: Ia50920b7627f886fab5c9f65a3fc19946debdff2
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-08-28 09:43:26 +08:00
Tao Huang
90cb7171b8 MALI: bifrost_for_linux: Fix build problem with O=
Change-Id: I6fdee0196ed321b23bffc6531f09c6e5885ce0a6
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-28 09:35:35 +08:00
Tao Huang
7a799e8df2 MALI: bifrost: Fix build problem with O=
Change-Id: I4f8625523f86b385d72857d06779669261aef6f9
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-28 09:24:06 +08:00
Jeffy Chen
30e452a1b0 rtc: rtc-rk-timer: Fix 64-bit counter read
Following arch_counter_get_cntvct_mem() in arm_arch_timer.c

Change-Id: I0d44edcb2cfcf2eb70aceccc57e147fa43eba34d
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2018-08-27 20:47:36 +08:00
Lin Jinhan
0001ceeba7 arm32: rk3308_linux_aarch32_defconfig: enable HW_RANDOM and HW_RANDOM_ROCKCHIP
Change-Id: Ic6545b6a780958659c947bb2c7319af2223e6469
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-08-27 20:12:13 +08:00
Lin Jinhan
3f8333a3b0 arm32: rk3308_linux_aarch32_debug_defconfig: enable HW_RANDOM and HW_RANDOM_ROCKCHIP
Change-Id: Ibc6f559f022ba299d378ec9fc2fb206a095157d6
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-08-27 20:12:08 +08:00
Lin Jinhan
75636c57a5 arm64: rk3308_linux_defconfig: enable HW_RANDOM and HW_RANDOM_ROCKCHIP
Change-Id: I05623888fb932e8c93f26888019328bebadf4369
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-08-27 20:11:58 +08:00
Lin Jinhan
1f1992c51a hwrng: rockchip - add support for Rockchip HW RNG
Change-Id: Ia14bd624716eb6531ef8674843ccfbada3197d8e
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-08-27 20:09:18 +08:00
Lin Jinhan
2a242a1602 dt-bindings: rng: Document the Rockchip HW RNG bindings
This adds documentation of device tree bindings for the Rockchip hardware
random number generator.

Change-Id: I4548f480d5e89499f527a1f37047404b910b6c88
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-08-27 20:06:16 +08:00
William Wu
12d14b5959 usb: uas: Add JMicron JMS583 and CHIPFANCIER to unusual device
These two devices give the following error on detection.
Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
xhci-hcd xhci-hcd.5.auto: ERROR Transfer event for disabled endpoint
or incorrect stream ring

The same error is not seen when it is added to unusual_device
list with US_FL_NO_REPORT_OPCODES and US_FL_BROKEN_FUA passed.

Change-Id: Ia1035ea597c65ad7112f68f5cbdd792875ee2995
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-08-27 19:41:44 +08:00
Wu Liangqing
5e89a41104 arm: dts: rockchip: rk312x: remove PLL_CPLL set in cru
cpll just for display no need to init. init will result in dispaly error
in next-dev uboot

Change-Id: Ie63c8d44aa6b54fb81abfb3a32d71995b8426c7d
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2018-08-27 19:40:36 +08:00
Hu Kejun
c58b89505f media: i2c: gc0312: fix fps isn't exactly 30fps
Change-Id: I6a50c976341ad6c838230735a66a8b0ee71c61da
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-08-27 19:34:31 +08:00
Sugar Zhang
8ea3f97aab dmaengine: pl330: _loop_cyclic: fixup loopcnt is too large
This patch fixup dma transfer data lost if loop cnt is larger
than 256.

Change-Id: Id49302cdcc1ac871d03070ce07eaa7653e54408c
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-08-27 19:33:33 +08:00
David Wu
a53ba77948 net: ethernet: stmmac: dwmac-rk: Sync with upstream for dwmac
Change-Id: I845fbf2d51e6617347d28b1e2f9422e0e8c99cf2
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-08-27 19:28:49 +08:00
YueHaibing
14dbb04f70 UPSTREAM: net: stmmac: Remove useless test before clk_disable_unprepare
clk_disable_unprepare() already checks that the clock pointer is valid.
No need to test it before calling it.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 93120eba48)

Change-Id: Ic318108658809fb54a954c688db4f6c9876c422f
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-08-27 19:27:50 +08:00
Leo Wen
6eb53f5eb2 media: rockchip: isp1: add ISP parameters is cleared when stopping stream
Change-Id: Ibd38147ff22d2ef71bfb91978c5b5d7f4734fe02
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-08-27 15:01:42 +08:00
Leo Wen
2d1723bd9b arm: dts: rockchip: rk3288-evb-rk808-linux: config dvp regulator to be 1v8
Change-Id: Ie0e04b957cd5b4bffba2a8a964bed0d76e138079
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-08-27 10:08:45 +08:00
Zhangbin Tong
0f59a24e43 arm64: dts: rockchip: rk3328: Add kpti=0 to kernel bootargs
Change-Id: I1be893667fec0d9bf8edd7c29150aa2084b72000
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-08-24 18:18:47 +08:00
Bian Jin chen
4ea55de3a8 arm: dts: rk312x: rk3126-bnd-d708: Separate android fireware.
Split DT source files to separate out android fireware for Android Pip & Oreo

Change-Id: I6fe9ad626ea05d2f5ae29ff2e8ee314d9833bbca
Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Signed-off-by: Hao Xiaowei <hxw@rock-chips.com>
2018-08-24 15:29:48 +08:00
Zhangbin Tong
dcf8989b7d arm64: dts: rockchip: rk3328: Add swiotlb=1 to kernel bootargs
Change-Id: I18dbb6730dbb9e639b6827c5653afcdcc5b52661
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-08-24 15:00:16 +08:00
Sugar Zhang
dccb11bc4c ASoC: rockchip: vad: add judgement for vad stop
This patch add the judgement for vad stop, do nothing
if vad was stopped.

Change-Id: Iea9fa635d38644335ba30c821460c11d8526a7a6
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-08-24 14:55:33 +08:00
Sugar Zhang
6e1f2fba64 ASoC: rockchip: vad: enable vad when system suspend
This patch move vad start action into suspend process.

Change-Id: Icc1ad0b49b89e3b768bc9270da7fadd12070b758
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-08-24 14:55:33 +08:00
Sugar Zhang
af178019f0 ALSA: pcm: vad: copy vad buffer to dma buffer
This patch copy vad buffer to dma buffer and recaculate
the hw pointer to support mmap access. in the mmap mode,
the buffer is handled by userspace, leading to prefetch
the vad data is impossible, so vad buffer data should be
copied to dma buffer. the only restriction is the dma buf
size should be larger than vad buf size.

Change-Id: I2ef6156fe8a791563a4bd02962c61d4b57c5329e
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-08-24 14:55:33 +08:00
Sugar Zhang
31ed99d1b4 ASoC: rockchip: vad: add snd_pcm_vad_memcpy
Change-Id: I43c7e317f94e08aee0d55da1400493f510ff6e77
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-08-24 14:55:33 +08:00
Sugar Zhang
f6af151bc0 arm64: dts: rockchip: rk3308-evb-amic-*: enable vad card default
Change-Id: I71958666fdb860952f33e68ab247b014b0b3a9f1
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-08-24 14:55:33 +08:00
Jerome Brunet
7915428b9b UPSTREAM: clk: bulk: silently error out on EPROBE_DEFER
In clk_bulk_get(), if we fail to get the clock due to probe deferal, we
shouldn't print an error message. Just be silent in this case.

Change-Id: I48eff4c17c48e336aafc0d4faf21e56d3e2e61be
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 329470f2d5)
2018-08-24 14:42:19 +08:00
Dong Aisheng
6d2c4f3a6d UPSTREAM: clk: add more __must_check for bulk APIs
we need it even when !CONFIG_HAVE_CLK because it allows
us to catch missing checking return values in the non-clk
compile configurations too. More test coverage.

Change-Id: Ibc620a329c849361dba72f41ff8a6f2f83d45abd
Cc: Stephen Boyd <sboyd@codeaurora.org>
Suggested-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 6e0d4ff458)
2018-08-24 14:42:19 +08:00
Bjorn Andersson
3058b948f4 UPSTREAM: clk: Export clk_bulk_prepare()
Allow clk_bulk_prepare() to be referenced by kernel modules by adding
the missing EXPORT_SYMBOL_GPL().

Change-Id: If3cc2a965cbecc98dd4b2f859265329d7b131235
Fixes: 266e4e9d91 ("clk: add clk_bulk_get accessories")
Reported-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 9792bf5ad5)
2018-08-24 14:42:19 +08:00
Bjorn Andersson
511f7b03fe UPSTREAM: clk: Provide bulk prepare_enable disable_unprepare variants
This extends the existing set of bulk helpers with prepare_enable and
disable_unprepare variants.

Change-Id: I38d42d5d028f3d096cbd5b7b8d369ff250f038dc
Cc: Russell King <linux@armlinux.org.uk>,
Cc: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 3c48d86cc9)
2018-08-24 14:42:19 +08:00
Dong Aisheng
2a0b3c4802 UPSTREAM: clk: add managed version of clk_bulk_get
This patch introduces the managed version of clk_bulk_get.

Change-Id: Idd7ef3cb3825573821c9b7736ad459e8a4e25beb
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Anson Huang <anson.huang@nxp.com>
Cc: Robin Gong <yibin.gong@nxp.com>
Cc: Bai Ping <ping.bai@nxp.com>
Cc: Leonard Crestez <leonard.crestez@nxp.com>
Cc: Octavian Purdila <octavian.purdila@nxp.com>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 618aee02e2)
2018-08-24 14:42:19 +08:00
Dong Aisheng
c26eceeb47 UPSTREAM: clk: add clk_bulk_get accessories
These helper function allows drivers to get several clk consumers in
one operation. If any of the clk cannot be acquired then any clks
that were got will be put before returning to the caller.

This can relieve the driver owners' life who needs to handle many clocks,
as well as each clock error reporting.

Change-Id: I6dd3e713af340be51b29c7dc852c1d51ee090c32
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Anson Huang <anson.huang@nxp.com>
Cc: Robin Gong <yibin.gong@nxp.com>
Cc: Bai Ping <ping.bai@nxp.com>
Cc: Leonard Crestez <leonard.crestez@nxp.com>
Cc: Octavian Purdila <octavian.purdila@nxp.com>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 266e4e9d91)
2018-08-24 14:42:19 +08:00