Commit Graph

611812 Commits

Author SHA1 Message Date
Jianqun Xu
97051b54af arm64: configs: rockchip: add defconfig for RK3399Pro npu
Add rk3399pro_npu_defconfig for RK3399Pro npu.

Change-Id: I25fac51ef61b1a1524e0fbf45a2694728d932106
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-14 18:32:01 +08:00
Binyuan Lan
6ed6151fbe arm64: dts: rockchip: add rk3326 ai-va v11 use i2s-dmic evaluation board
Change-Id: I005d9bac8ab0be82f7fd87b774fc4dc4269dad08
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2018-09-14 18:21:49 +08:00
Binyuan Lan
7b68e010f7 arm64: dts: rockchip: rk3326-ai-va board set vbus-supply = <&vcc5v0_host>
Change-Id: Ie2bd6d468547e2bc324be37ff9b7f5383b0db6b3
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2018-09-14 18:21:02 +08:00
Shunqing Chen
4752f415e0 drm/rockchip: add RGB support for rk618
Change-Id: Ieddeeb842ee9db11b8c56cb4171bd630b6b63acb
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-09-14 18:20:28 +08:00
Cai YiWei
923b9f5752 media: rockchip: isp1: MP/SP burst config with resolution
1.CIF_MI_CTRL_BURST_LEN same to isp specification define
2.memory base addresses are burst aligned with respect
to the configured burst length. configure different burst
length with different resolution.

Change-Id: I982cbef418cc55704049b2d113df923bee7cf9ef
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2018-09-14 18:17:49 +08:00
Wyon Bi
2e1fde79be arm64: dts: rockchip: rk1808-evb: Add support for dsi panel
Change-Id: I33ff66e1af9be7c821b66bd354accc663fedebc5
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-09-14 12:05:56 +08:00
Wyon Bi
27c3aab22e arm64: dts: rockchip: rk1808: Add #address/#size-cells to dsi
DTC warnings:
arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dtb: Warning (reg_format): "reg" property in
/dsi@ffb30000/panel@0 has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)
arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dtb: Warning (avoid_default_addr_size): Relying on
default #address-cells value for /dsi@ffb30000/panel@0
arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dtb: Warning (avoid_default_addr_size): Relying on
default #size-cells value for /dsi@ffb30000/panel@0

Change-Id: I257595e10120f960c7ab6ff169302b4f2e6a68be
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-09-14 12:04:53 +08:00
Sun ChuanHu
11a8b4171e arm64: dts: rockchip: rk3308-evb-amic-v11: enable adc group and vad channel
Change-Id: I3259bd83a7cb5b9af530808c9e23d145dbca02e3
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-09-14 11:56:04 +08:00
Shawn Lin
2e2e6c3a7a arm64: dts: rockchip: add SDIO support for rk1808-evb
Add more SDIO properties for rk1808 evb.

Change-Id: Ie15625641a8d1e12f026ebffec21ff48a916c091
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2018-09-14 08:34:02 +08:00
Shawn Lin
1cd9a5de11 arm64: dts: rockchip: add SDIO for rk1808
Add SDIO support for rk1808.

Change-Id: Iea5413e497673d310889b1aecb9877c539616505
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2018-09-14 08:33:45 +08:00
Leo Wen
314c9a8afc rockchip: isp1: Modify v4l2_capability card as video device name.
Change-Id: I85e58fe3be5c4c266eb0132f6263a00f2ec9e091
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-09-13 16:37:37 +08:00
Tao Huang
fe8169a722 rk: gcc-wrapper.py ignore halphyrf_8188e_ce.c:2208 and halphyrf_8723b_ce.c:2879
trigger by ARM_LPAE

Change-Id: I941ec62d2b9e1fe78af6807f63e2aa1d73cc0e41
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-09-13 15:17:27 +08:00
Cai YiWei
4c02a3ccfd media: i2c: gc0329: update to 30fps
Change-Id: Ib156183ebba412b0f3b0003dea4de7afdf8cfbd9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2018-09-13 14:28:37 +08:00
Jianqun Xu
7b00d84017 arm64: configs: rockchip: add defconfig for rk1808
Add rk1808_linux_defconfig for rk1808 evb runs on linuxos

Change-Id: I98f7d3c8ac7054b5fb3773cade1f31b56ce76a90
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-13 09:57:07 +08:00
Tao Huang
b63e1e68d8 net: wireless: rockchip_wlan: ssv6xxx: Fix gcc warning
drivers/net/wireless/rockchip_wlan/ssv6xxx/ssvdevice/ssv_cmd.c: In function 'ssv_cmd_dump':
drivers/net/wireless/rockchip_wlan/ssv6xxx/ssvdevice/ssv_cmd.c:387:3: error: argument 1 null where non-null expected [-Werror=nonnull]
   strcpy(ssv6xxx_result_buf, "ssv6xxx_result_buf = NULL!!\n");
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Change-Id: I883d9f17814c25c0d8f7611dc99944f6b072b002
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-09-12 21:02:47 +08:00
Wyon Bi
1a1369766b arm64: dts: rockchip: rk1808: Add support for display subsystem
Change-Id: I3bcf043cb39e05aa811aab483febc2a96c6187fa
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-09-12 18:35:44 +08:00
Weixin Zhou
14aa3e4860 arm64: dts: rockchip: rk3326-863-lp3-v10: modify audio card name for vts test
test cmd: run vts -m VtsKernelProcFileApi -t testProcAsoundCardsTest

test result:
shell_command: "cat /proc/asound/cards"
ERROR Failed to parse! Parsing error at token LexToken(COMMA,',',1,48) in line 1
I/ProcessHelper: [VtsKernelProcFileApi]
INFO [Test Case] testProcAsoundCardsTest FAIL

Change-Id: Ib70bf8bb0757a1773253931bb3e6f105eb518126
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-09-12 18:34:55 +08:00
Cai YiWei
870a5ee216 media: i2c: add gc2035 sensor
Change-Id: I228045130c9050e0e0b39001690763ab851e0539
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2018-09-12 18:34:09 +08:00
Wang Panzhenzhuan
fdabce9ecc ARM64: rockchip_defconfig: enable gc2145 gc0312 and rockchip_isp1
Change-Id: I057376ea93281e3dc84f65f9507f2b94a49b3c7e
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2018-09-12 15:06:49 +08:00
Weiguo Hu
25dcee7a3b net: wireless: rockchip_wlan: add config WIFI_GENERATE_RANDOM_MAC_ADDR
Change-Id: Ic0ceb1a839e691d5c2c25c96c34e9a234bc3654e
Signed-off-by: Weiguo Hu <hwg@rock-chips.com>
2018-09-12 14:53:39 +08:00
Jianqun Xu
9207ee49b6 arm64: dts: rockchip: rk1808 fix pincrl error
1. fix emmc_clkout/emmc_rstn to gpio1 RK_PB1/RK_PB3
2. fix sdmmc1_clk to gpio4 RK_PA7
3. fix to pull_up_8ma for spi_mosi_hs pins

Change-Id: Ib67d0c6ab485f38e282f1b6e4cfba16b73da1df5
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-12 14:07:17 +08:00
William Wu
cc301e475c usb: storage: add Genesys Logic 05e3:0749 to unusual_devs.h
When test more than three Genesys Logic usb3 storages
(VID : PID = 0x05e3 : 0x0749) on rockchip platforms with
usb3 host port (e.g. rk3328/rk3399) at the same time,

test commands like this:
for dev in `ls /dev/sd?1 | sed -e 's,1$,,'`; do
	echo dd if=$dev of=/dev/null
	dd if=$dev of=/dev/null &
	sleep 1
done

The test fail with the following error log:
xhci-hcd xhci-hcd.9.auto: xHCI host not responding to stop endpoint command.
xhci-hcd xhci-hcd.9.auto: Assuming host is dying, halting host.
xhci-hcd xhci-hcd.9.auto: Host not halted after 16000 microseconds.
xhci-hcd xhci-hcd.9.auto: Non-responsive xHCI host is not halting.
xhci-hcd xhci-hcd.9.auto: Completing active URBs anyway.
xhci-hcd xhci-hcd.9.auto: HC died; cleaning up

This patch sets the max_sectors to 128 (64K) to workaround
this issue, and it doesn't affect the transmission rate.

Change-Id: Idd9cc81659d27c12b142f6c4375558c2262e800d
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-09-11 14:35:11 +08:00
Zhou weixin
4450fa71d4 arm64: dts: rockchip: add dts file for RK3399Pro evb v10
Add support for RK3399Pro evb rev10.

Change-Id: Iaf431064238ff689004218c176afd4fad7d63eb7
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2018-09-11 14:32:44 +08:00
Jianqun Xu
2425f29223 arm64: dts: rockchip: add core dtsi for RK3399Pro SoCs
Add dts file support for RK3399Pro SoCs, include rk3399.dtsi

Change-Id: Ib724ba5e2d434731f2862f85b73908f226a47621
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-11 14:32:44 +08:00
Cai YiWei
8ec459b808 media: i2c: gc2145/gc0312 pwdn inactive during out of work
when multiple camera using same dvp data, pwdn shuld
be off during out of work.

Change-Id: I9a12c3e9f5d7b82922b0b5a797288da7ac486448
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2018-09-11 14:14:07 +08:00
Cai YiWei
01beb00127 media: rockchip/cif: fix cif restart not work
if stop cif timeout, stopping flag still true,
restart cif can't work.

Change-Id: If4c0805aa5d1231b1dab6046a826fe41d9796872
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2018-09-11 14:14:07 +08:00
Cai YiWei
6bf40a2254 arm: dts: rk3126-bnd-d708: config gc0329 gc2145 and cif
Change-Id: Ib3bad1186527d79ee7831ec5f41fe2f10316e1cf
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2018-09-11 14:12:27 +08:00
Cai YiWei
e3497df56d ARM: rockchip_defconfig: enable gc2145 gc0329 and cif
Change-Id: I71f95ea09ff043067c5e6b85597e38cfc3102401
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2018-09-11 14:11:57 +08:00
Cai YiWei
a77b67c9f1 media: i2c: add gc0329 driver
Change-Id: I21b1d6a8a4cb06368ff1e4c64c174382b8c94880
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2018-09-11 14:11:36 +08:00
Shunqian Zheng
0ae0065586 ARM: config: enable INPUT_RK8XX_PWRKEY for rockchip_linux_defconfig
CONFIG_INPUT_RK8XX_PWRKEY is required for pmic power key.

Change-Id: I7ca3e364f6b3beaebabbd7a79e4914e866414663
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2018-09-11 11:01:57 +08:00
Tao Huang
bd30ecadeb MALI: utgard: RK: do not build ump on Kbuild
Save a lot of build time.

Change-Id: I0e63cfae3c3c2625b3100f016134120e5551a5b5
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-09-10 21:02:53 +08:00
Tao Huang
f3363cd81c MALI: utgard: RK: do not get GIT_REV on mali Kbuild
Disable build mali driver when just git commit change.

Change-Id: Ie659e2da02260079ccd5d2873f28afbe7f2b2761
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-09-10 21:02:17 +08:00
Nickey Yang
7aef04920b arm: dts: rk3288-linux: add adc-keys
Change-Id: I76de54ab7ab4d5a45ea803bddae45a20431c1e3a
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-09-10 19:28:28 +08:00
Hu Kejun
26d1373a40 media: rockchip: isp1: fix sp will stop to output after mp start in isp12
fix when sp and mp are configured to output the same size, sp will stop
to output after mp start in isp12.

Change-Id: Iec07aa8116ead608999f02dcb357f2dd2997d4a9
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-09-10 19:26:42 +08:00
Hu Kejun
2ff670508e media: rockchip: isp1: support for isp new version in rk3326
Change-Id: I226cc2d87053d1951252122c44b570030470ba42
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-09-10 19:25:58 +08:00
Jianqun Xu
ffbd3042bc soc: rockchip: add CONFIG_ROCKCHIP_OPP for rockchip_opp_select.c
Change-Id: I0cde56d1ad7482c8d4e8b518fc49cc028da6501b
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-09-10 18:38:51 +08:00
Tao Huang
c503a88127 soc: rockchip: opp_select: do not use _of_get_opp_desc_node
Which is come from Linaro. Use of_parse_phandle directly.

Change-Id: I7ca9de46e4ec88011165862936c00cb1b354907f
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-09-10 16:42:56 +08:00
shengfei Xu
d7c6b6bd61 mfd: rk809: the sw1 interconvert with sw2
The patch is in line with the latest SPEC.

Change-Id: I874ba2bea37c72745c34ca926a06881f605746ac
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2018-09-10 15:58:15 +08:00
Shunqian Zheng
cbd6ff3011 ARM: dts: rockchip: correct pwm2 pin mux of rk312x
rk312x pwm2 pin mux should be gpio0_d4.

Change-Id: I499d771c498de39ad9502642865c91e73aa0d904
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2018-09-10 15:56:42 +08:00
Zhangbin Tong
a51058aa1d arm: dts: rk3128x: Add rockchip,avs = <1> to the cpu0_opp_table node
Change-Id: I88206e2f6895b7e9e17cde417c39cb00a604886e
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-09-10 15:49:13 +08:00
Thierry Reding
43bf8703a7 UPSTREAM: net: stmmac: Use mutex instead of spinlock
Some drivers, such as DWC EQOS on Tegra, need to perform operations that
can sleep under this lock (clk_set_rate() in tegra_eqos_fix_speed()) for
proper operation. Since there is no need for this lock to be a spinlock,
convert it to a mutex instead.

Fixes: e6ea2d16fc ("net: stmmac: dwc-qos: Add Tegra186 support")
Reported-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Tested-by: Bhadram Varka <vbhadram@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 29555fa3de)

Change-Id: I84200908368916c588f9154278486fcb1d22f8a0
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-09-10 15:35:35 +08:00
Algea Cao
0495591680 drm/bridge: synopsys: dw-hdmi: Fix crush when system suspend
If HDMI HPD detect delayed work won't be cancel, system will
crush because clk and PD has been disabled. So HDMI HPD detect
workqueue should be flushed when system suspend.

Change-Id: Idb8018c2efcffc3aee5fd80872f1270360809235
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-09-10 15:24:06 +08:00
Finley Xiao
15c0dfe938 video: rockchip: vpu: Fix div error in rkvdec_set_clk()
Only use rkvdec_set_clk() when devfreq is enabled and move static div to
vpu_service_info.

Fixes: b2849bcc8d ("video: rockchip: vpu: Add devfreq feature for rk322x")
Change-Id: I34fcdbe913a17511cc18388bf82b4df416ccd14d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-09-10 09:31:16 +08:00
Tao Huang
75654db877 Merge branch 'linux-linaro-lsk-v4.4' of git://git.linaro.org/kernel/linux-linaro-stable.git
* linux-linaro-lsk-v4.4: (519 commits)
  Linux 4.4.154
  cdrom: Fix info leak/OOB read in cdrom_ioctl_drive_status
  iscsi target: fix session creation failure handling
  scsi: core: Avoid that SCSI device removal through sysfs triggers a deadlock
  scsi: sysfs: Introduce sysfs_{un,}break_active_protection()
  MIPS: lib: Provide MIPS64r6 __multi3() for GCC < 7
  MIPS: Correct the 64-bit DSP accumulator register size
  kprobes: Make list and blacklist root user read only
  s390/pci: fix out of bounds access during irq setup
  s390/qdio: reset old sbal_state flags
  s390: fix br_r1_trampoline for machines without exrl
  x86/spectre: Add missing family 6 check to microcode check
  x86/irqflags: Mark native_restore_fl extern inline
  pinctrl: freescale: off by one in imx1_pinconf_group_dbg_show()
  ASoC: sirf: Fix potential NULL pointer dereference
  ASoC: dpcm: don't merge format from invalid codec dai
  udl-kms: fix crash due to uninitialized memory
  udl-kms: handle allocation failure
  udl-kms: change down_interruptible to down
  fuse: Add missed unlock_page() to fuse_readpages_fill()
  ...

Conflicts:
	Makefile
	arch/arm64/mm/init.c
	fs/squashfs/block.c
	include/uapi/linux/prctl.h
	kernel/sys.c

Change-Id: Ie03b5adfbbb4ab2bf16bc55d99f0d8a9c540a53b
2018-09-07 17:34:34 +08:00
Weiguo Hu
78585b99a3 net: wireless: rockchip_wlan: ssv6051 add change_interface ops
Change-Id: Ifac667de307f2867c2b3a03949484be2d25722c0
Signed-off-by: Weiguo Hu <hwg@rock-chips.com>
2018-09-07 17:25:33 +08:00
Sandy Huang
532e3f8dc3 arm64: dts: rockchip: move reserved-memory to evb dtsi file
The board dts file no need to care about the reserved-memory,
so we move this from rk1808-evb-v10.dts to rk1808-evb.dtsi.

Change-Id: I5ac8ef8e3278491b78d8a46fe839a250017f31dd
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-09-07 14:59:37 +08:00
Sandy Huang
6d3144af78 drm/rockchip: 3288 vop: fix lose frame start interrupt
rk3288 bcsh and auto gating can't be used at same time.
this will lead to vop lose frame start and lead to fence
time out.

Change-Id: I1957d24fab7295b2c73e092d63d9f323cd1127df
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-09-07 11:12:52 +08:00
Joseph Chen
4bb30cefbd arm: dts: rk3308-dot-rk816-v10-aarch32: update battery information
The board battery is attached, so update battery hardware info.

Change-Id: Ife9630c61c712d21ff4461cb53175833b3d4c779
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-09-07 10:40:40 +08:00
Joseph Chen
7083a3390f mfd: rk808: initial rk816 LDOs write mask bit 1.
RK816 ldo write mask bit is always 1 after setting finished, but
when system start, the write mask bit is 0 even enable bit is 1.

So that rk816 regulator driver '.is_enabled()' returns disabled state
even the ldo is power on when system start, we need to initial write
mask bit as 1.

Change-Id: I8b5b83f33d668e4bdd1f96d77208931d25b8f6d9
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-09-07 10:40:40 +08:00
Joseph Chen
849dfb0d85 power: rk816-battery: fix charge current value fixed issue
Without this patch, when sample resistor is 20mR, battery charge
current is fixed in 1000mA which is lower than user configure at
the most time.

Change-Id: Idc93f5becfefd55992ea791a65c565feb313b779
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-09-07 10:40:40 +08:00