Commit Graph

603813 Commits

Author SHA1 Message Date
Caesar Wang
2e2a36fadc clk: rockchip: add the needed cpuclk for rk3036
As the rk3036 supported the cpu opp table, we need add the related
frequency rates.

Change-Id: If50ed0fc02d3c8d0971d99bf392210616f1748c0
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2017-10-23 11:44:09 +08:00
ldq
fc81a90cf4 arm64: rockchip_defconfig: enable es8396 codec
Change-Id: If1992277c3f9f3ee97bd22c380dd6d41a8e11814
Signed-off-by: Li Dongqiang <david.li@rock-chips.com>
2017-10-23 11:05:04 +08:00
Wyon Bi
2a21a01636 drm/rockchip: dsi: add control of h2p bridge clock for rk3128
Change-Id: I16671a884d3d91b8f2e8cb0b11ba7ad0c0504df6
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-23 10:46:36 +08:00
Wyon Bi
0980cd2d00 ARM: dts: rockchip: rk312x: add h2p clock for dsi
Change-Id: I5a2291333a76d59a559fb8c014c2271c897fb066
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-23 10:46:21 +08:00
Alex Zhao
ab82abc4c1 net: wireless: rockchip_wlan: update bcmdhd driver to 1.579.77.41.2 (r)
1.add android 8.0 support
2.add VTS support

Change-Id: I19b99383e2b2cab243c2acfe0f9f175cde2bdf86
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
2017-10-23 10:45:19 +08:00
wlq
75f1d399fa ARM: rockchip_defconfig: add gslx680_d708 config
replace TOUCHSCREEN_GSLX680_VR

Change-Id: I7f85d53420b07b368787388c8fc388826811a56d
Signed-off-by: WuLiangqing <wlq@rock-chips.com>
2017-10-23 10:23:30 +08:00
Wyon Bi
ec52654825 ARM: dts: rockchip: rk3126-bnd-d708: correct init sequence for panel
Change-Id: Ibe6734721aad4250ea05a437935f1ca23a3ecf88
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-23 10:19:07 +08:00
Peng Zhou
bfd8339bc2 arm64: dts: rockchip: make rk3368 cru syscon
Change-Id: I5585401276ac1230c50b699e7e550fdbaa394f1e
Signed-off-by: Peng Zhou <benjo.zhou@rock-chips.com>
2017-10-23 10:09:16 +08:00
wlq
fd66488313 driver: input: touchscreen: add gslx680 for rk3126c d708
Change-Id: I59594bf83d2de744eb187fe0570366ddb56d8386
Signed-off-by: wlq <wlq@rock-chips.com>
2017-10-20 18:16:35 +08:00
Elaine Zhang
44288a2f13 clk: rockchip: rk3128: fix up the hclk_vio clk description
set hclk_vio_niu as critical clock.

Change-Id: Ib9e182ac93038df34eadae502fc18df5c0854ef9
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-10-20 18:10:11 +08:00
Randy Li
278e91efa2 clk: rockchip: rk3036: export the hevc core clock
The clock hevc core will be used to drive the hevc decoder.

Change-Id: Ic1298ce1edd07f86e5c243e3a2c9876481f4cba9
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2017-10-20 17:48:34 +08:00
langlang.wang
3ad1abbd51 arm64: dts: rockchip: rk3368-px5-evb-android add sensors for px5
Change-Id: Iad9ad2468a54e77bcf5b106c31168fc16f7aff2b
Signed-off-by: Wang, Langlang <langlang.wang@rock-chips.com>
2017-10-20 16:49:56 +08:00
Caesar Wang
b044448555 ARM: dts: rk3036: support wifi/bt for kylin
In order to support the ap6212 module with rockchip wlan driver,
the kylin dts has to change the below for working.

1) We should add the 'supports-sdio' property for mmc tuning,
that's the rockchip private property, not on the upstream.

2) We should add the wifi power control pin and wifi/bt data for dts,
Maybe the history issue, they like the old driver for power
contronlling, the upstream didn't need these for working. we should
remove it in the future.

Change-Id: Id49de7ad77b8658a551a07659a8a2ddc9691874c
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2017-10-20 16:45:44 +08:00
Caesar Wang
ee4db4e2a3 ARM: dts: rk3036: add the aclk for hdmi
As the inno-hdmi driver introduced this clock, add it for dts supporting.

Change-Id: I43328a25f0ac72d5a5b7631cc8ff6ce98b78669a
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2017-10-20 16:42:36 +08:00
Caesar Wang
6b8580eca3 drm/rockchip: inno_hdmi: support the aclk_vio clock for rk3036
The aclk_vio is the vio noc, the HDMI accessed the register need this clock
enabled first.

Change-Id: Ib3073b73020e46c7d31b09225dd2bd39a289a4cc
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2017-10-20 16:32:46 +08:00
zain wang
fc19dcd36a mfd: fusb302: bring softreset to completion
Change-Id: I27e10b8b9197e6526d3fb59d0a88c28414637a9a
Signed-off-by: zain wang <wzz@rock-chips.com>
2017-10-20 16:22:38 +08:00
zain wang
a026f64e8b mfd: fusb302: Don't send hardreset when hot reset
FUSB302 default cc status is UFP. If we reset the UFP system,
the UFP PD status would be reset, but the DPF can't detecte
the disconnection since cc status did not changed. Reset UFP
would send hardreset to DPF due to wait power caps timeout.
And that would cause the power reset.

So, let's use softreset instead of hardreset in this case.

Change-Id: Ic896597569adb125bea3bf145c5c93712fa77539
Signed-off-by: zain wang <wzz@rock-chips.com>
2017-10-20 16:22:25 +08:00
wlq
ab66f809e9 ARM: dts: rockhip: rk3126c: add rk3126-bnd-d708.dts
Change-Id: I9dc96a187a102afc8af872c70f01f59de2f35a2e
Signed-off-by: wlq <wlq@rock-chips.com>
2017-10-20 16:22:12 +08:00
David Wu
3aa37c8fff pinctrl: rockchip: rk3328: Fix the correct routing config
If the gmac-m1 optimization(bit10) is selected, the gpio function
of gmac pins is not valid. We may use the rmii mode for gmac interface,
the pins such as rx_d2, rx_d3, which the rgmii mode used, but rmii not
used could be taken as gpio function. So gmac_rxd0m1 selects the bit2,
and gmac_rxd0m3 select bit10 is more correct.

Change-Id: I781bd29f2ce64ba0e8c1b139ac117fe124410d87
Signed-off-by: David Wu <david.wu@rock-chips.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2017-10-20 15:57:32 +08:00
David Wu
2fd80b1e06 pinctrl: rockchip: Fix the rk3399 gpio0 and gpio1 banks' drv_offset at pmu grf
The offset of gpio0 and gpio1 bank drive strength is 0x8, not 0x4.
But the mux is 0x4, we couldn't use the IOMUX_WIDTH_4BIT flag, so
we give them actual offset.

Change-Id: I8371c6432330bd73422c2e5c7a0719f4636eabae
Signed-off-by: David Wu <david.wu@rock-chips.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2017-10-20 15:57:27 +08:00
zain wang
7be531e0bd mfd: fusb302: Add notify when received attention HPD signal
Fix DP drivers can't get the HPD signal changed when DP mode is on.

Change-Id: I0e8eefadb677e956cca4f62a4befa9ee47e7e013
Signed-off-by: zain wang <wzz@rock-chips.com>
2017-10-20 15:33:57 +08:00
ldq
71d4a8ffec ASoC: Add driver for codec es8396
Change-Id: I45b01dfa336e88b9eb74e65739fa0ed863c2da90
Signed-off-by: Li Dongqiang <david.li@rock-chips.com>
2017-10-20 15:30:18 +08:00
Finley Xiao
f08254d124 arm64: dts: rockchip: rk3368-px5-evb: add threshold frequency property for cpu
Change-Id: I172481d1a26f973a583df8423e93405b68bf47c5
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-10-20 15:22:23 +08:00
Finley Xiao
3907f0a360 cpufreq: rockchip: Adjust target frequency according to cpu threshold
Change-Id: I3733904c167478d903059625da85105211f35ab5
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-10-20 15:18:11 +08:00
Jacob Chen
45a3fd15ca arm64: configs: rockchip_linux_defconfig: upragde midgard drvier to r14
Change-Id: Ib41cbe8aabb01dd3ac465e7ec3966e13e0f7cb9d
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-10-20 15:15:59 +08:00
Jacob Chen
0d37d39fde arm: configs: rockchip_linux_defconfig: upragde midgard drvier to r14
Change-Id: Ia454e606a283bcfa302862472e52469e82157d31
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-10-20 15:15:59 +08:00
Wyon Bi
a5d7b429f4 ARM: dts: rockchip: rk312x-android: add route subnode
Change-Id: Ibab8290d4325e727e1a7b6bec9d20967261d3bf1
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-19 14:30:28 +08:00
Wyon Bi
ae8c318d1a ARM: dts: rockchip: rk312x: add support for dsi
Change-Id: Id77c3496b8548ea5bd0b9e6c9b32de7199494484
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-19 14:30:16 +08:00
Wyon Bi
76d1216b2c drm/rockchip: dsi: add support for rk3128
Change-Id: Idc36a7f847a5e23568dc629c3ea70dfd5adea4e6
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-19 14:29:46 +08:00
Wyon Bi
525eeb8fe4 phy: rockchip: mipi-dphy: add support for rk3128
Change-Id: I29578e117d187add559890871af5fcf1c537a460
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-19 14:29:22 +08:00
Wyon Bi
31ea603373 clk: rockchip: rk3128: remove CLK_IGNORE_UNUSED flag from clk_mipi_24m clock
This flag was in place to prevent important clocks from getting gated
while they had no users. Now that the driver supports clocks
properly, we can drop this.

Change-Id: Ied6ea7677ab38988c89100e3644d829cb5736356
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-19 14:29:01 +08:00
Joseph Chen
84445051da mfd: rk808: set rk816 interrupt status and mask register as volatile
Change-Id: I6b0b4d9bb5afcbe201973cf3406819465f26f648
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2017-10-19 14:27:02 +08:00
Steven Chen
a3befd2cc3 ARM: dts: rk3288-android: disable dmc auto-freq-en
Change-Id: Iaf43ad3f1eb17a431eda1d58d39aa4498de13b94
Signed-off-by: Steven Chen <cw@rock-chips.com>
2017-10-19 14:15:09 +08:00
Steven Chen
07ba151a3a ARM: dts: rk3288-android: add scene config for 4k 10bit video
Change-Id: I8fb2c966765854dbf25d0f39b44ffdf7886d212b
Signed-off-by: Steven Chen <cw@rock-chips.com>
2017-10-19 14:14:58 +08:00
Liang Chen
171dc94f71 ARM: configs: rockchip_defconfig: add CONFIG_INPUT_RK8XX_PWRKEY
Change-Id: Ie0e6b2ac5264c00dc49e6056fcf09419bfada2a7
Signed-off-by: Liang Chen <cl@rock-chips.com>
2017-10-18 17:46:44 +08:00
Wyon Bi
c9d26e763b PM / devfreq: rockchip_dmc: Fix compiler warning
drivers/devfreq/rockchip_dmc.c: In function 'rk3368_dmc_init':
drivers/devfreq/rockchip_dmc.c:649:7: warning: 'ret' may be used uninitialized in this function [-Wuninitialized]
drivers/devfreq/rockchip_dmc.c:639:6: note: 'ret' was declared here

Change-Id: I843b7a4a0804bcf02152ba3218dcefa26d047c95
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-18 14:32:48 +08:00
Mark Yao
248d0a0da2 ARM: dts: rk3288-android: force reserve vopb for hdmi
Only vop big support 4K resolution, and HDMI request it,

Beside resolution support, the other features are the same
on rk3288 vops.

Change-Id: I2446b5d6800e8da7388b71d87a7a3fd05c10f31f
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-10-18 11:06:30 +08:00
Mark Yao
a03c3bf4c1 ARM: dts: rockchip: firefly-rk808: clean up
Change-Id: I36ebd45dca45e5ee0a8e93376c22a2b97be215e4
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-10-18 11:06:09 +08:00
Mark Yao
b10524817b ARM: dts: rockchip: firefly: don't delete display node
Change-Id: Iba623a8afab69ee7ee542f81b2d7fd644a02d656
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-10-18 11:06:04 +08:00
Mika Penttilä
a508f5c317 UPSTREAM: ARM: 8544/1: set_memory_xx fixes
Allow zero size updates. This makes set_memory_xx() consistent with x86, s390 and arm64 and makes apply_to_page_range() not to BUG() when loading modules.
(cherry-pick from f474c8c857)

Change-Id: I96a846a30d34077a85f36289b7b935e02f725591
Signed-off-by: Mika Penttilä mika.penttila@nextfour.com
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-10-18 09:12:11 +08:00
Randy Li
aefa4a4728 drm/rockchip: free memory in vop bandwidth interface
The array won't be used again, it is quite safe to free
it there.

Change-Id: I3bc201fbdead819cc47a08848acd66797c82e0f5
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2017-10-18 09:08:43 +08:00
Tao Huang
6432a58d1b Revert "cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions"
This reverts commit 273daee0be.

Needs to be reverted since system_server no longer has CAP_SYS_RESOURCE.

Change-Id: I121ac09db2f4f55349d1596c14315b98d246b3d7
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2017-10-17 19:10:13 +08:00
Huibin Hong
c28bfb3c34 spi: rockchip: set dma tx burst 8
If it is 16, and DMATDLR is 15, it would cause tx fifo
overflow.

Change-Id: I14592492be2ebd65ee47e916e25a60f0905d3eca
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2017-10-17 16:56:32 +08:00
Shawn Lin
1701f276af arm64: dts: rockchip: correct vqmmc voltage for rk3399 platforms
The vcc_sd is used for IO voltage for sdmmc interface on rk3399
platform have a limitation that it can't be larger than 3.0v, otherwise
it has a potential risk for the chip. Correct all of them.

Change-Id: I8d4ee2202fb32d30734c98a3b514c315e62859b4
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2017-10-17 14:40:27 +08:00
Yankun Zheng
9e295197d8 ARM: dts: rk3229-gva: modify wifi power pin for SoM hardware
Change-Id: Id18e0849076cd70f8f5e5b8b057face550f1ffc4
Signed-off-by: Yankun Zheng <zyk@rock-chips.com>
2017-10-17 11:06:16 +08:00
Alex Zhao
5fda03d4a9 net: rfkill: rockchip: add vbat_gpio to control the wifi power supply
Change-Id: I4746fd5c46c5e1a7df2bb18f80f5a8efee20605f
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
2017-10-17 11:05:46 +08:00
Tao Huang
053de347cd rk: remove unused PIE support
Change-Id: Ib7793724ef4e1c681898813e4ca5dd47a1960ae2
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2017-10-16 17:55:00 +08:00
Elaine Zhang
fba107bd06 clk: rockchip: rk3368: set clk parent npll to dummy_npll
npll is just for dclk_vop, others clk not allowed to set npll as parent.

Change-Id: I11e1770acab5486acaebafd56a0c57847f7f533c
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-10-16 17:25:42 +08:00
kenjc.bian
914276d56b ARM64: dts: rockchip: rk3368-android: Enable verity-boot on vendor partition node for Android Oreo Treble.
Change-Id: I5c247812d785183c59ec787e1a4cfe25e6b54397
Signed-off-by: kenjc.bian <kenjc.bian@rock-chips.com>
2017-10-16 10:27:42 +08:00
Wenping Zhang
ae4ed36190 ARM: dts: rockchip: improve bus speed of eMMC for rk3229-gva.
add mmc hs200/ddr mode support and increase the max clock frequence.

Change-Id: I7e81dfaf364d88a3e8bf0278a8f771a8179c6627
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
2017-10-13 18:13:03 +08:00