wlq [Tue, 18 Apr 2017 07:14:31 +0000 (15:14 +0800)]
ARM64: dts: rk3368-android: enabled mailbox/mailbox_scpi
Change-Id: I664f6d928ec86990222de64baf0f50ab2f8584da
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
wlq [Tue, 18 Apr 2017 07:06:02 +0000 (15:06 +0800)]
ARM64: dts: rk3368-p9: set vccio_wl to 1.8v
Change-Id: I8683049b689f97af8ff36948db6ce7887b308a85
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Meng Dongyang [Tue, 18 Apr 2017 02:37:51 +0000 (10:37 +0800)]
phy: rockchip-inno-usb2: tuning USB 2.0 PHY when resume
The USB 2.0 PHY may lose tuning config after resume if the
PD turn off its power when suspend. So we need to tune USB
2.0 PHY again when resume.
Change-Id: Ib34de165ccd7d22598e77e5ac0fed1233e7adba0
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
Mark Yao [Tue, 18 Apr 2017 07:40:58 +0000 (15:40 +0800)]
drm/rockchip: logo: fix logo memory end on free
It's mistake using logo size as logo memory end, and that would cause:
[ 8.443899] BUG: Bad page state in process recovery pfn:7dcc3
[ 8.443903] page:
effb3860 count:0 mapcount:3 mapping:
eebdf784 index:0x15
[ 8.443907] flags: 0x4004007c(referenced|uptodate|dirty|lru|active|swapbacked)
[ 8.443918] page dumped because: PAGE_FLAGS_CHECK_AT_FREE flag(s) set
[ 8.443922] bad because of flags:
[ 8.443924] flags: 0x60(lru|active)
[ 8.443930] Modules linked in:
[ 8.443935] CPU: 0 PID: 170 Comm: recovery Tainted: G B 4.4.55 #70
[ 8.443939] Hardware name: Rockchip (Device Tree)
[ 8.443947] [<
c010f55c>] (unwind_backtrace) from [<
c010b7ec>] (show_stack+0x10/0x14)
[ 8.443955] [<
c010b7ec>] (show_stack) from [<
c03bc3a8>] (dump_stack+0x7c/0x9c)
[ 8.443963] [<
c03bc3a8>] (dump_stack) from [<
c01eb430>] (bad_page+0xe4/0x114)
[ 8.443971] [<
c01eb430>] (bad_page) from [<
c01eb550>] (free_pages_prepare+0xf0/0x294)
[ 8.443978] [<
c01eb550>] (free_pages_prepare) from [<
c01ed654>] (free_hot_cold_page+0x28/0x14c)
[ 8.443987] [<
c01ed654>] (free_hot_cold_page) from [<
c01ed954>] (free_reserved_area+0x90/0xdc)
[ 8.443996] [<
c01ed954>] (free_reserved_area) from [<
c04749f4>] (rockchip_free_loader_memory+0xf0/0x118)
[ 8.444006] [<
c04749f4>] (rockchip_free_loader_memory) from [<
c0475b14>] (rockchip_drm_fb_destroy+0xbc/0xd0)
[ 8.444015] [<
c0475b14>] (rockchip_drm_fb_destroy) from [<
c04581e0>] (drm_mode_set_config_internal+0xa8/0xc4)
[ 8.444024] [<
c04581e0>] (drm_mode_set_config_internal) from [<
c045ce24>] (drm_mode_setcrtc+0x3a8/0x464)
[ 8.444032] [<
c045ce24>] (drm_mode_setcrtc) from [<
c044f634>] (drm_ioctl+0x278/0x43c)
[ 8.444039] [<
c044f634>] (drm_ioctl) from [<
c023ea58>] (do_vfs_ioctl+0x564/0x6a0)
[ 8.444047] [<
c023ea58>] (do_vfs_ioctl) from [<
c023ebe0>] (SyS_ioctl+0x4c/0x74)
[ 8.444055] [<
c023ebe0>] (SyS_ioctl) from [<
c0107180>] (ret_fast_syscall+0x0/0x3c
Change-Id: I833a27464d9d33f6864039faa61e7500a3b936b3
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Elaine Zhang [Mon, 17 Apr 2017 08:57:21 +0000 (16:57 +0800)]
clk: rockchip: rk3288: fix up the hclk_vio register
fix up the hclk_vio register order,
before setting clk critical.
Change-Id: Ia3a4d2fcb8ee8164dfe621d2d081076000a30937
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Jianqun Xu [Tue, 11 Apr 2017 08:41:28 +0000 (16:41 +0800)]
arm: dts: rk3288-evb: remove limit usage for vopb
There are many notes - Don't use vopb for HDMI, save it for eDP,
let's remove them for kinds of products.
Change-Id: Id8ef9ec8ac853e7b68527f59a9a8870b5a45d8f2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Meng Dongyang [Mon, 17 Apr 2017 06:11:58 +0000 (14:11 +0800)]
phy: rockchip-inno-usb2: tuning USB 2.0 squelch detection threshold
According to USB 2.0 Spec Table 7-7, the High-speed squelch
detection threshold Min 100mV and Max 150mV, and we set USB
2.0 PHY0 and PHY1 squelch detection threshold to 150mV by
default, so if the amplitude of differential voltage envelope
is < 150 mV, the USB 2.0 PHYs envelope detector will indicate
it as squelch.
On RK3399 box, if we connect usb device with a 4 meter cable,
we can see that the impedance of U2 cable is too big according
to the eye-diagram test report, and this cause serious signal
attenuation at the end of receiver, the amplitude of differential
voltage falls below 150mV.
This patch aims to reduce the PHY0 and PHY1 otg-ports squelch
detection threshold to 125mV (host-ports still use 150mV by
default), this is helpful to increase USB 2.0 PHY compatibility.
Change-Id: Iec8b4043a3440d6f2a5fb18ff59ac0f4988019e9
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
Jianqun Xu [Wed, 12 Apr 2017 05:55:37 +0000 (13:55 +0800)]
video: rockchip: rk322x_lcdc: fix error condition
Change-Id: I1c28a815beb74a7566886aef666454ec1513970b
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
xuhuicong [Mon, 17 Apr 2017 07:43:59 +0000 (15:43 +0800)]
drm/rockchip: fix hdmi no display when resume or switch resolution
spelling mistake cause hdmi phy configure error, now correct it
Change-Id: I548d76dd44e8d39e35b95138ec3d25b358cf3376
Signed-off-by: xuhuicong <xhc@rock-chips.com>
Sugar Zhang [Fri, 14 Apr 2017 01:07:33 +0000 (09:07 +0800)]
ARM64: configs: rockchip_linux: enable rk3328 internal codec
Change-Id: I03ad95e771a4b506d6462be5dade0553eb121fcc
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Sugar Zhang [Fri, 7 Apr 2017 06:38:13 +0000 (14:38 +0800)]
ARM64: dts: rk3328-evb: add spdif sound
Change-Id: I76adc6286d831f513da3f5547975d7fcd3c392e9
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Sugar Zhang [Fri, 7 Apr 2017 03:37:35 +0000 (11:37 +0800)]
ARM64: configs: rockchip: enable rk3328 internal codec
Change-Id: I7c71d81e768fcd58b935f9f40d71c5834d04573d
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Sugar Zhang [Fri, 7 Apr 2017 03:35:57 +0000 (11:35 +0800)]
ARM64: dts: rk3328-evb: add support for internal codec sound
Change-Id: I8b1705f592d42e2f1d351ce5a7880993f7757b94
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Sugar Zhang [Fri, 7 Apr 2017 03:34:53 +0000 (11:34 +0800)]
ARM64: dts: rk3328: add acodec node
Change-Id: I5d564066fa1d399c2c4fabf753eb6f698136a52c
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Sugar Zhang [Fri, 31 Mar 2017 02:56:10 +0000 (10:56 +0800)]
ASoC: codecs: add support for rk3328
Change-Id: I66ff61c18fe70135fd7ac0569954263743263a3a
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
WeiYong Bi [Fri, 14 Apr 2017 06:49:21 +0000 (14:49 +0800)]
drm/panel: Change dlen from u16 to u8
U8_MAX payload length can meet most requirements
Change-Id: I77e5780bde72b4229ab36d961dc7498f7c78a468
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
Mark Yao [Mon, 17 Apr 2017 03:00:18 +0000 (11:00 +0800)]
drm/bridge: analogix: fix edid not works
Change-Id: I1a964b51d0d137e66ad5d073a2eef2fb22770bba
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Finley Xiao [Fri, 14 Apr 2017 04:37:35 +0000 (12:37 +0800)]
ARM: rockchip_defconfig: enable DEVFREQ_GOV_SIMPLE_ONDEMAND
Change-Id: I3cdcceca0f5c743b84ab1ec159bb576a7a5ab5a5
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Huang, Tao [Mon, 17 Apr 2017 03:14:57 +0000 (11:14 +0800)]
ARM: rockchip_defconfig: update by savedefconfig
Change-Id: I4b5ec60a8beeb014754855a4865bc7fc26f2fddd
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
WeiYong Bi [Tue, 11 Apr 2017 07:58:33 +0000 (15:58 +0800)]
drm/panel: support transmit DSI packet
Change-Id: I6115479eebc05b44a8c01cd72919db0e5a6cb1f9
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
WeiYong Bi [Tue, 11 Apr 2017 10:10:46 +0000 (18:10 +0800)]
phy: rockchip-inno-mipi-dphy: Add fixed timing param table
Change-Id: Ia6a92833f4b597ac5f9af694644714a7b71b3375
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
LuoXiaoTan [Fri, 14 Apr 2017 09:48:43 +0000 (02:48 -0700)]
ASoC: rockchip: add rt5651_tc358749x driver
add rockchip_rt5651_tc358749x machine driver to
support HDMIIn function
Change-Id: Ieb0e046bec60ea0a27ee49ce1204b032ad646724
Signed-off-by: LuoXiaoTan <lxt@rock-chips.com>
LuoXiaoTan [Fri, 14 Apr 2017 09:44:58 +0000 (02:44 -0700)]
ASoC: codecs: add tc358749x codec driver
add tc358749x codec driver for hdmiin function
Change-Id: I819ac80ced59b5d81d547f7ba2c7ebc7bee7f845
Signed-off-by: LuoXiaoTan <lxt@rock-chips.com>
Jianqun Xu [Fri, 14 Apr 2017 07:36:14 +0000 (15:36 +0800)]
arm: dts: rk3288-evb-rk818: set tsadc default pinctrl to gpio
When rockchip,hw-tshut-mode is 0, means that tshut mode is CRU,
then the pinctrl should default to be GPIO.
If the tshut mode is GPIO, then the pinctrl should default to be
OTP_OUT.
Change-Id: Ic6e53a96823baf4671f9bad261ed34586512634f
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Jianqun Xu [Tue, 11 Apr 2017 10:19:21 +0000 (18:19 +0800)]
arm: dts: rk3288-android: set PWM_POLARITY_INVERTED to 0
Change-Id: I47623781f93f2f325f76e1fa4a7ffe515623064e
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
William Wu [Fri, 14 Apr 2017 09:51:27 +0000 (17:51 +0800)]
usb: dwc_otg_310: support vbus controlled by both gpio and pmic
On some rockchip platforms (e.g. rk3368), usb vbus 5v is controlled
by both gpio and pmic at the same time. So we need to set gpio and
pmic when enable/disable usb vbus power.
Change-Id: I327a87f16662026eaab1b6577d0b0116c4b2671f
Signed-off-by: William Wu <wulf@rock-chips.com>
xiaoyao [Thu, 13 Apr 2017 12:06:52 +0000 (20:06 +0800)]
arm64: dts: rk3368: fix string error for sdio
Change-Id: Ia7a122bd52d71442c31f71677ae24c52c83631cd
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
Sugar Zhang [Fri, 14 Apr 2017 01:05:53 +0000 (09:05 +0800)]
ARM64: configs: update rockchip_linux_defconfig by savedefconfig
Change-Id: I82e2827c8356e0577bd6426d7275339ef6a83152
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
LuoXiaoTan [Tue, 21 Mar 2017 07:45:50 +0000 (00:45 -0700)]
arm64: rockchip_defconfig: enable RT5651_TC358749
enable CONFIG_SND_SOC_ROCKCHIP_RT5651_TC358749
for HDMIIn function
Change-Id: I5c77b3f03d75ea1c51a89a2396ff6472554025a5
Signed-off-by: LuoXiaoTan <lxt@rock-chips.com>
LuoXiaoTan [Thu, 6 Apr 2017 09:29:32 +0000 (02:29 -0700)]
ASoC: rt5651: add alc5651 ASRC switch for HDMIIn
Change-Id: I447228656d5ee56b2c4b04c515ad71f34e107ba0
Signed-off-by: LuoXiaoTan <lxt@rock-chips.com>
LuoXiaoTan [Tue, 11 Apr 2017 05:49:02 +0000 (22:49 -0700)]
arm64: dts: rk3399-sapphire: enable isp0 isp1
Enable isp0 & isp1 for HDMIIn video function
Change-Id: I1f46c413f198acdce7a08702c42f0142d6eabfd6
Signed-off-by: LuoXiaoTan <lxt@rock-chips.com>
LuoXiaoTan [Fri, 14 Apr 2017 03:27:30 +0000 (20:27 -0700)]
arm64: dts: rk3399-sapphire: add HDMIIn sound dev
sable rt5651 simple-audio-card and we will write
a machine driver for rt5651 tc358749x HDMIIn function.
And add rt5651-tc358749x-sound for HDMIIn function
Change-Id: I983fa9171bfa1fb3bf0ab492354e471046c08e93
Signed-off-by: LuoXiaoTan <lxt@rock-chips.com>
LuoXiaoTan [Fri, 14 Apr 2017 03:24:51 +0000 (20:24 -0700)]
arm64: dts: rk3399-sapphire: add tc358749x device
add tc358749x i2c dev & pin control for HDMIIn function
base on board (RK_EXCAVATOR_MAIN_V12_2016_11_11_FZB)
Change-Id: I5548a31d78e4d7cc9ecae0dc89f2ee2dcd0e75b4
Signed-off-by: LuoXiaoTan <lxt@rock-chips.com>
LuoXiaoTan [Thu, 6 Apr 2017 07:07:38 +0000 (00:07 -0700)]
arm64: dts: rk3399-sapphire: add iomux for hdmiin
add pinctrl for tc358749x power control
Change-Id: I4e72b936fb7190791f13d83799155f80e257a117
Signed-off-by: LuoXiaoTan <lxt@rock-chips.com>
LuoXiaoTan [Fri, 14 Apr 2017 03:18:13 +0000 (20:18 -0700)]
Documentation: DT: ASoC: add toshiba tc358749x
Change-Id: Id03458c15f5f87aeeacb21645d37bb95978ee57f
Signed-off-by: LuoXiaoTan <lxt@rock-chips.com>
LuoXiaoTan [Tue, 11 Apr 2017 05:43:48 +0000 (22:43 -0700)]
Documentation: DT: ASoC: add for rockchip HDMIIn
Change-Id: I984999e66ae24919335b2aef5c732022e78c7e47
Signed-off-by: LuoXiaoTan <lxt@rock-chips.com>
buluess.li [Fri, 7 Apr 2017 02:29:26 +0000 (10:29 +0800)]
arm64: dts: rk3399-box: compatible for rev2 board which cpu_b's vdd gpio is different
Change-Id: Ie7088b526a1a384435136933a5f57c957e2bb5b0
Signed-off-by: buluess.li <buluess.li@rock-chips.com>
huweiguo [Thu, 13 Apr 2017 09:04:33 +0000 (17:04 +0800)]
arm64: rockchip_defconfig: enable TCP SYN_COOKIES
solve some vst video apk can't play video with kmsg:
"TCP: request_sock_TCP: Possible SYN flooding on port 9000. Dropping request. Check SNMP counters."
Change-Id: I4fc94307195464c8e8180217eccb9a590eb3c5b6
Signed-off-by: huweiguo <hwg@rock-chips.com>
Sugar Zhang [Thu, 13 Apr 2017 07:38:49 +0000 (15:38 +0800)]
ARM64: dts: rk3399-android: change i2s2 bclk to 128fs for hdmi
Change-Id: I6345cf044aaf5d617f4a7cd77eca98c473eb9195
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Sugar Zhang [Thu, 13 Apr 2017 07:37:21 +0000 (15:37 +0800)]
drm: bridge/dw-hdmi: add support for hdmi bitstream audio
Change-Id: Ib1f6c5dba6451f3fbb029b5472dbfbf5694cff68
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Sugar Zhang [Thu, 13 Apr 2017 07:26:40 +0000 (15:26 +0800)]
ASoC: codec: hdmi-codec: add support for audio mode config
Change-Id: I4813e6204fee894ef4f40b3e3b768a1ad94d0a29
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Sugar Zhang [Thu, 13 Apr 2017 07:25:14 +0000 (15:25 +0800)]
ASoC: rockchip: hdmi_dp: add support for 192k
Change-Id: Ib50106f9c44ef86f2e20cf2b2206b54c8c966a29
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Sugar Zhang [Thu, 13 Apr 2017 07:23:27 +0000 (15:23 +0800)]
ASoC: rockchip: i2s: increase dma maxburst to 16
Change-Id: I84898fced94141b29e88f2e8f8f9328881090c25
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
algea.cao [Mon, 10 Apr 2017 11:30:48 +0000 (19:30 +0800)]
drm: bridge: dw-hdmi: optimize edid reading process
1.change SDA high level holding time to 3us.
2.when plug in,add timer to avoid unstable state.
Change-Id: Idc6faec710137ac9f8e589d75cbc1b85f7a45faf
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
wlq [Wed, 12 Apr 2017 03:27:31 +0000 (11:27 +0800)]
arm64: dts: rk3399-mid: rk818 enabled boost_otg fix ota vcc5v poweroff when susppend
Change-Id: I2d11a76a21d7a8fe18124312c68b744f4364f4fd
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
wlq [Wed, 12 Apr 2017 03:19:18 +0000 (11:19 +0800)]
arm64: dts: rk3368: rk818 enabled boost_otg fix ota vcc5v poweroff when susppend
Change-Id: I0626a47da5487d34c0701d2b21cfab5b9b3fb425
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Huang, Tao [Tue, 11 Apr 2017 09:42:48 +0000 (17:42 +0800)]
arm64: dts: rockchip: add L2 cache node for rk3368
This patch adds the L2 cache topology on RK3368.
RK3368 has two clusters, each cluster has its own L2 cache.
Change-Id: Ibee5a39889d4924e439c9b0c249df052f63e9242
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Huang, Tao [Tue, 11 Apr 2017 09:04:58 +0000 (17:04 +0800)]
arm64: dts: rockchip: remove unneeded idle-states for rk3368
ATF and Linux support system suspend, so we don't need define
idle-states to support suspend. RK3368 don't support any
idle state other then WFI. Just remove it.
Change-Id: Ifa95862b4998287560cd2214ff6b5763a9d6ce02
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Jacob Chen [Wed, 12 Apr 2017 01:50:14 +0000 (09:50 +0800)]
arm: configs: enable some touchscreen driver
Change-Id: I44cc2ef0a230dea6c60cddf2e6aa7195985468ed
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Jacob Chen [Wed, 12 Apr 2017 01:49:56 +0000 (09:49 +0800)]
arm: configs: linux: enable wifi load driver when boot kernel
if we don't enable it, driver init order might be wrong
Change-Id: I0d75b6fcdb762a77f8c27111da642cdba255fc4e
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
algea.cao [Tue, 11 Apr 2017 07:36:50 +0000 (15:36 +0800)]
drm/sysfs: fix up memory leak problem
Change-Id: I2b4617412b0d5b2897c3cce2ef612a11a9762ba2
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
Rocky Hao [Thu, 30 Mar 2017 07:03:06 +0000 (15:03 +0800)]
arm: dts: rockchip: update thermal config for rk3288
add cpus' dynamic power coefficient. rename the thermal zone's config
and make it more readable. update temperature pooling interval and
make the temperature control more effective.
Change-Id: I75d21601b7e3f41a32d10bbcbb1fa9b47ed7da0f
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
Rocky Hao [Thu, 30 Mar 2017 03:46:15 +0000 (11:46 +0800)]
arm64: dts: rockchip: add tsadc's working clock rate for rk3288
add tsadc's working clock rate for rk3288. if not set, tsadc
will work at the default rate of 1k hz.
Change-Id: I1b26351c3fb97f5ceb4657c2356c2f5649ad140c
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
Elaine Zhang [Thu, 6 Apr 2017 07:17:01 +0000 (15:17 +0800)]
ARM64: dts: rockchip: rk3399: set dummy_cpll and dummy_vpll as fixed clk
to fix up :
[ 0.000000] clk: couldn't get clock 4 for /clock-controller@
ff760000
[ 0.000000] rockchip_clk_of_add_provider: could not register clk provider
The cause of the error:
struct clk *__clk_create_clk(struct clk_hw *hw, const char *dev_id,
const char *con_id, bool with_orphans)
{
/* This is to allow this function to be chained to others */
if (!hw || IS_ERR(hw))
return (struct clk *) hw;
if (hw->core->orphan && !with_orphans)
return ERR_PTR(-EPROBE_DEFER);
return clk_hw_create_clk(hw, dev_id, con_id);
}
if clk is orphan and not have the with_orphans flag, it will
register clk provider failed.
Change-Id: I87ca9ec087611a5425545bfc857b09d8438218b5
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Elaine Zhang [Fri, 31 Mar 2017 08:01:00 +0000 (16:01 +0800)]
clk: defer clk_gets on orphan clocks
Orphan clocks or children of orphan clocks don't have rate information at
all and can produce strange results if they're allowed to be used and the
parent becomes available later on.
This change, based on one from Stephen Boyd, defers __clk_create_clk()
calls on orphan clocks in all regular cases.
One special case that gets handled, is accessing such orphan clocks when
handling assigned-clocks configurations. In the boot-defaults it may be
the case that a clock is connected to an orphan parent which then might
be needed to get reparented to an actually usable clock using
assigned-clock-parents. In this case even orphaned clocks should be
usable, but only for the set-parent case.
The added of_clk_get_from_provider_with_orphans() is only available
to ccf internal parts to prevent abuse.
(am from https://patchwork.kernel.org/patch/
7690221/)
Change-Id: I2e603dab191fa8a431adebad1f9d482d52b7deeb
Signed-off-by: Heiko Stuebner <heiko.stuebner@collabora.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Elaine Zhang [Thu, 30 Mar 2017 03:31:34 +0000 (11:31 +0800)]
arm64: dts: rockchip: rk3368: revert xin32k use the fixed clk
This reverts commit
61e585b9ef7f0aa9bce9f004771becda795aa563.
Change-Id: Id46aa6bf2822c1b9e53de544b349b42645cb6a5a
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
hero.huang [Mon, 27 Mar 2017 10:03:20 +0000 (18:03 +0800)]
arm64: dts: rockchip: add gsl3680 and mpu6050 for RK3399 Firefly Board
Change-Id: I8e6f4802d4c1b10873c655cc620e6d7be47efee7
Signed-off-by: hero.huang <hero.huang@rock-chips.com>
Elaine Zhang [Tue, 11 Apr 2017 03:11:56 +0000 (11:11 +0800)]
clk: rockchip: rk3288: fix up the clk register for hclk_vio
Change-Id: If07e27b1f88974fa0dcb2c8f719df6ba3c35dbcd
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Elaine Zhang [Tue, 11 Apr 2017 03:08:15 +0000 (11:08 +0800)]
clk: rockchip: add ACLK_VIO0\1 HCLK_VIO id for rk3288 vio
Add the needed id for the vio clock.
Change-Id: I2c4009d8214e1560da1213f224610882c2cd06e7
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Chen Liang [Fri, 7 Apr 2017 09:25:45 +0000 (17:25 +0800)]
ARM64: dts: rockchip: add cpuinfo support for rk3328
Change-Id: Iaaa400c09c2fb7c0d5e96fa4217065fa14066fc1
Signed-off-by: Chen Liang <cl@rock-chips.com>
Finley Xiao [Thu, 30 Mar 2017 12:41:42 +0000 (20:41 +0800)]
arm64: dts: rockchip: add efuse device node for rk3328
Add a efuse node in the device tree for the ARM64 rk3328 SoC.
Change-Id: I8610ae9e06131f042681edf68432485e8a35832f
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Finley Xiao [Thu, 30 Mar 2017 12:35:07 +0000 (20:35 +0800)]
nvmem: rockchip-efuse: add support for rk3328-efuse
This adds the necessary data for handling efuse on the rk3328.
Change-Id: Ica66635977163f380b7d96d73d3a2423d1e08298
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Chen Liang [Tue, 11 Apr 2017 07:51:23 +0000 (15:51 +0800)]
nvmem: rockchip-efuse: add optional property to get efuse size
The exact efuse size is defined in property <reg> before, this assume
that the length of registers is equal to efuse size, but it not true
for some chips, so we need anothor property to redefine efuse size.
Change-Id: I9cdab8adc2a13b55cfcacc3c2248295c4387a806
Signed-off-by: Chen Liang <cl@rock-chips.com>
Jianqun Xu [Tue, 11 Apr 2017 06:55:39 +0000 (14:55 +0800)]
arm: dts: rk3288-evb-rk818: fix tshut prority to HIGH
Depends on hardware design, the PWR_HOLD should be high
for board with rk818 pmic.
Change-Id: Ib18f530d435f08ac98fbf6a9481eb483b7fadece
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Jianqun Xu [Tue, 11 Apr 2017 06:58:20 +0000 (14:58 +0800)]
arm: dts: rk3288-evb-rk818: fix 32k out to xin32k
Change-Id: Ib4f0925e0b801d993bb76f1c7e9287b2b60fb919
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
William Wu [Fri, 7 Apr 2017 10:36:22 +0000 (18:36 +0800)]
usb: dwc_otg_310: fix usb vbus power controlled by pmic
On rockchip platforms, usb vbus 5V can be controlled by
gpio or pmic while otg work as host mode. If vbus 5v is
supplied from pmic, and usb charger circuit also connect
to pmic, we need to ensure usb vbus is disconnected from
external power source (e.g. PC or USB adapter) before
power on vbus 5v from pmic, otherwise, the pmic may be
broken by the external power. It always happens with rk816
which support usb charge and usb vbus power function.
With this patch, if we use pmic for usb vbus 5v, it needs
to add a new property 'rockchip,usb-pmic-vbus' in dts usb
node, like this:
&usb0 {
rockchip,usb-pmic-vbus;
};
Change-Id: I1055f637e77fb5dd681994ff440293a6682b2a12
Signed-off-by: William Wu <wulf@rock-chips.com>
Jianqun Xu [Tue, 11 Apr 2017 02:58:53 +0000 (10:58 +0800)]
arm: dts: rk3288: add mipi support
if want enable mipi,
you should to okay mipi_dsi, dsi_panel and route_mipi.
also you should to disabled edp, edp_phy and edp_panel.
Change-Id: I037cb76c7a1d08bcd09219072aeb359e0d460a1c
Signed-off-by: xubilv <xbl@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Jianqun Xu [Tue, 11 Apr 2017 02:50:56 +0000 (10:50 +0800)]
arm: dts: rk3288-evb: modify panel to edp_panel
Change-Id: I5a62c8fa933e9852d88646411d13e67075d63b02
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Randy Li [Thu, 22 Dec 2016 09:08:14 +0000 (17:08 +0800)]
arm: dts: rk3288-evb-act8846: add power supply for eDP
Change-Id: I3928b44d91c2135c854460317f73ef8857c8ccd4
Signed-off-by: Randy Li <randy.li@rock-chips.com>
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
Rocky Hao [Mon, 10 Apr 2017 10:33:34 +0000 (18:33 +0800)]
arm64: dts: rockchip: rk3368: add latency-bound property
add latency-bound property to ease user's config and debugging
Change-Id: I76fd2945e4fdecf251ea2f4b15bd6e90fd154145
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
Rocky Hao [Mon, 10 Apr 2017 02:45:22 +0000 (10:45 +0800)]
thermal: rockchip: rk3368: ajust tsadc's data path according request of qos
we dynamically ajust data path according to request of qos to do
the balance between system's performance and tsadc's precision.
Change-Id: Iec6d6af6efce3932f894d9a07298daa9653cc87e
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
William Wu [Mon, 10 Apr 2017 12:33:06 +0000 (20:33 +0800)]
usb: dwc3: rockchip: fix possible circular deadlock
This patch aims to fix possible unsafe locking scenario when
dwc3 probe failed. The possible deadlock warning info is:
[4.254320] ======================================================
[4.254327] [ INFO: possible circular locking dependency detected ]
[4.254334] 4.4.55 #20 Not tainted
[4.254339] -------------------------------------------------------
[4.254346] kworker/4:1/47 is trying to acquire lock:
[4.254352] (&rockchip->lock){+.+.+.}, at: [<
ffffff8008730d58>] dwc3_rockchip_otg_extcon_evt_work+0x30/0x42c
[4.254382]
[4.254382] but task is already holding lock:
[4.254388] ((&rockchip->otg_work)){+.+...}, at: [<
ffffff80080b7a78>] process_one_work+0x1c4/0x6ac
[4.254411]
[4.254411] which lock already depends on the new lock.
[4.254411]
[4.254418]
[4.254418] the existing dependency chain (in reverse order) is:
[4.254424]
-> #1 ((&rockchip->otg_work)){+.+...}:
[4.254440] [<
ffffff80080f6a58>] __lock_acquire+0x15b4/0x1950
[4.254452] [<
ffffff80080f75fc>] lock_acquire+0x190/0x250
[4.254461] [<
ffffff80080b88c8>] flush_work+0x4c/0x274
[4.254471] [<
ffffff80080b8cd8>] __cancel_work_timer+0x130/0x1c0
[4.254480] [<
ffffff80080b8d78>] cancel_work_sync+0x10/0x18
[4.254489] [<
ffffff8008731648>] dwc3_rockchip_probe+0x4f4/0x59c
[4.254498] [<
ffffff8008525a9c>] platform_drv_probe+0x58/0xa4
[4.254509] [<
ffffff800852397c>] driver_probe_device+0x118/0x2b0
[4.254521] [<
ffffff8008523b80>] __driver_attach+0x6c/0x98
[4.254531] [<
ffffff80085229d8>] bus_for_each_dev+0x80/0xb0
[4.254543] [<
ffffff80085234b0>] driver_attach+0x20/0x28
[4.254554] [<
ffffff8008523040>] bus_add_driver+0xe8/0x1ec
[4.254565] [<
ffffff8008524a9c>] driver_register+0x94/0xe0
[4.254576] [<
ffffff80085259f4>] __platform_driver_register+0x48/0x50
[4.254585] [<
ffffff8009130bf4>] dwc3_rockchip_driver_init+0x18/0x20
[4.254598] [<
ffffff8008082ba8>] do_one_initcall+0x180/0x19c
[4.254609] [<
ffffff8009100e58>] kernel_init_freeable+0x208/0x2c0
[4.254621] [<
ffffff8008c00748>] kernel_init+0x10/0xf8
[4.254632] [<
ffffff80080826d0>] ret_from_fork+0x10/0x40
[4.254641]
-> #0 (&rockchip->lock){+.+.+.}:
[4.254656] [<
ffffff80080f3af8>] print_circular_bug+0x64/0x2c4
[4.254666] [<
ffffff80080f6728>] __lock_acquire+0x1284/0x1950
[4.254675] [<
ffffff80080f75fc>] lock_acquire+0x190/0x250
[4.254685] [<
ffffff8008c03aac>] mutex_lock_nested+0x80/0x3d0
[4.254695] [<
ffffff8008730d58>] dwc3_rockchip_otg_extcon_evt_work+0x30/0x42c
[4.254704] [<
ffffff80080b7bec>] process_one_work+0x338/0x6ac
[4.254714] [<
ffffff80080b90e8>] worker_thread+0x300/0x428
[4.254723] [<
ffffff80080bead8>] kthread+0xf4/0xfc
[4.254732] [<
ffffff80080826d0>] ret_from_fork+0x10/0x40
[4.254741]
[4.254741] other info that might help us debug this:
[4.254741]
[4.254749] Possible unsafe locking scenario:
[4.254749]
[4.254755] CPU0 CPU1
[4.254760] ---- ----
[4.254765] lock((&rockchip->otg_work));
[4.254775] lock(&rockchip->lock);
[4.254786] lock((&rockchip->otg_work));
[4.254796] lock(&rockchip->lock);
[4.254805]
[4.254805] *** DEADLOCK ***
[4.254805]
[4.254813] 2 locks held by kworker/4:1/47:
[4.254818] #0: ("events"){.+.+.+}, at: [<
ffffff80080b7a78>] process_one_work+0x1c4/0x6ac
[4.254839] #1: ((&rockchip->otg_work)){+.+...}, at: [<
ffffff80080b7a78>] process_one_work+0x1c4/0x6ac
[4.254860]
[4.254860] stack backtrace:
[4.254869] CPU: 4 PID: 47 Comm: kworker/4:1 Not tainted 4.4.55 #20
[4.254875] Hardware name: Rockchip RK3399 Evaluation Board v3 (Android) (DT)
[4.254885] Workqueue: events dwc3_rockchip_otg_extcon_evt_work
[4.254893] Call trace:
[4.254902] [<
ffffff8008088a1c>] dump_backtrace+0x0/0x1c8
[4.254909] [<
ffffff8008088bf8>] show_stack+0x14/0x1c
[4.254917] [<
ffffff80083a5fa0>] dump_stack+0xb0/0xec
[4.254925] [<
ffffff80080f3d3c>] print_circular_bug+0x2a8/0x2c4
[4.254931] [<
ffffff80080f6728>] __lock_acquire+0x1284/0x1950
[4.254938] [<
ffffff80080f75fc>] lock_acquire+0x190/0x250
[4.254946] [<
ffffff8008c03aac>] mutex_lock_nested+0x80/0x3d0
[4.254952] [<
ffffff8008730d58>] dwc3_rockchip_otg_extcon_evt_work+0x30/0x42c
[4.254960] [<
ffffff80080b7bec>] process_one_work+0x338/0x6ac
[4.254967] [<
ffffff80080b90e8>] worker_thread+0x300/0x428
[4.254973] [<
ffffff80080bead8>] kthread+0xf4/0xfc
[4.254979] [<
ffffff80080826d0>] ret_from_fork+0x10/0x40
[4.275124] rockchip-dwc3 usb@
fe800000: USB peripheral connected
Change-Id: I9d34724e1c2af9b8472f79bfe4b088cbdde6394d
Signed-off-by: William Wu <wulf@rock-chips.com>
Xu Jianqun [Fri, 7 Apr 2017 03:13:33 +0000 (11:13 +0800)]
arm: dts: rk3288-android: add fiq-debugger support
Use irq mode for rk3288 fiq-debugger.
Change-Id: I15a5b5ac45a4f20811f97249dae77e86402f4cec
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
Mark Yao [Tue, 11 Apr 2017 02:15:17 +0000 (10:15 +0800)]
video/rockchip: rga2: force rga version if hardware not support
Change-Id: I95323b5f46228561266b2352815f0d15851fa6ce
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Xu Jianqun [Fri, 7 Apr 2017 03:03:54 +0000 (11:03 +0800)]
arm: dts: rk3288-android: add pstore support
Reserved memory start from 128M for pstore.
Change-Id: Ie61103004c4f0a7e20f3900db3c44905f7b92955
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
algea.cao [Mon, 10 Apr 2017 07:45:44 +0000 (15:45 +0800)]
arm64: dts: rk3399-box-rev2: add hdmi phy config table
Change-Id: Id4a9c97c9cfba977a521d86e1ba438d8be6945d6
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
algea.cao [Fri, 17 Mar 2017 07:56:47 +0000 (15:56 +0800)]
drm/rockchip: dw_hdmi-rockchip: get phy config from dts
Change-Id: I6903f3b9498be32f9d4936beb2d6d2aa5db43d09
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
hero.huang [Mon, 27 Mar 2017 05:56:05 +0000 (13:56 +0800)]
arm64: dts: rockchip: remove device out of board for RK3399 Firefly
Change-Id: I53b7ac3716dc4b005caaba7b8eb6838afa6d0c46
Signed-off-by: hero.huang <hero.huang@rock-chips.com>
dalong.zhang [Fri, 7 Apr 2017 03:40:53 +0000 (11:40 +0800)]
arm64: dts: rockchip: update isp-flash gpio for rk3399-android-6.0
Change-Id: If4bcebe0022d0bb3d46cdb1858340082bb16b404
Signed-off-by: dalong.zhang <dalon.zhang@rock-chips.com>
dalong.zhang [Fri, 7 Apr 2017 03:37:38 +0000 (11:37 +0800)]
arm64: dts: rockchip: update isp-flash gpio for rk3399-android
Change-Id: I43138294c6171077fd8800b465cd07996c12f57d
Signed-off-by: dalong.zhang <dalon.zhang@rock-chips.com>
Xu Xuehui [Mon, 10 Apr 2017 01:19:31 +0000 (09:19 +0800)]
arm: dts: rk3288-evb: 32.768K clk node for BT
Change-Id: Id7da26efcf59c4b1e3dc82190d7fe58854a29ee4
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
Sugar Zhang [Fri, 7 Apr 2017 03:33:50 +0000 (11:33 +0800)]
clk: rockchip: rk3328: add pclk for acodec
Change-Id: Ia07f22997875e874037cb06fea6a3f25e6ab46dc
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Sugar Zhang [Fri, 7 Apr 2017 03:32:44 +0000 (11:32 +0800)]
dt-bindings: clock: rk3328: add pclk_acodec id
Change-Id: I3b0e2d2da5f919ed88f599823784aefa5e9a330c
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Sugar Zhang [Fri, 7 Apr 2017 03:28:59 +0000 (11:28 +0800)]
dt-bindings: clock: rk3328: fixup HCLK_I2S1 id
Change-Id: I40e6543988e1c1a0cbb475eacbb5f3f985da55e7
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Elaine Zhang [Fri, 7 Apr 2017 09:37:55 +0000 (17:37 +0800)]
arm64: dts: rockchip: rk3368: init aclk_cci_pre 576M
Change-Id: Ieb53a2e3e777a5f478a0475a72dcd9c1d39ec2dc
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Elaine Zhang [Fri, 7 Apr 2017 09:35:28 +0000 (17:35 +0800)]
clk: rockchip: rk3368: add aclk_cci_pre ID
Change-Id: I855e79023a9e244c2db37af88a075a4ef4c36aec
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
chenjh [Fri, 31 Mar 2017 03:47:01 +0000 (11:47 +0800)]
arm64: dts: rk3328-evb: enable fiq mode
Change-Id: Ic0f6f95488b6575ebb9c4466fd43bf14f7214210
Signed-off-by: chenjh <chenjh@rock-chips.com>
WeiYong Bi [Wed, 29 Mar 2017 09:42:51 +0000 (17:42 +0800)]
arm64: dts: rockchip: Add reset property for rk3368 mipi
Change-Id: I12a3bf9cdd61c6da3d0675d68d4ffd9bbfd9ffd8
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
Xu Jianqun [Fri, 7 Apr 2017 03:30:40 +0000 (11:30 +0800)]
arm: rockchip: remove setting for rk timer
Change-Id: I74200f86a5fe3cc023282b7b0e452826554dd102
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
Jianqun Xu [Thu, 6 Apr 2017 00:23:41 +0000 (08:23 +0800)]
arm: dts: rk3288-android: add nand support
Change-Id: I26ba461f04b79a6e86abe2998aafea00a2e367c3
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
hero.huang [Tue, 28 Mar 2017 02:33:41 +0000 (10:33 +0800)]
drm/panel: add support for Sharp F402 2048x1536 panel
dt-bindings: consolidate display related bindings
Change-Id: I92788135d110b44185d93f3a5a54d800b4d55a1c
Signed-off-by: hero.huang <hero.huang@rock-chips.com>
WeiYong Bi [Fri, 31 Mar 2017 03:38:17 +0000 (11:38 +0800)]
phy: rockchip-inno-mipi-dphy: fix code style and removed unneeded code
Change-Id: I28803c6064705baa05786cfcd817dd6f02464dcf
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
WeiYong Bi [Wed, 29 Mar 2017 09:48:09 +0000 (17:48 +0800)]
phy: rockchip-inno-mipi-dphy: use phy_set_bus_width() to set the lane mbps
We use phy_set_bus_width() to set the lane rate that the PHY supports.
The controller driver may then use phy_get_bus_width() to fetch the
PHY lane rate in order to properly configure the controller.
Change-Id: I116f0d82ad187806914c0d566eab92b922f143ef
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
WeiYong Bi [Wed, 29 Mar 2017 09:36:58 +0000 (17:36 +0800)]
drm/rockchip: dw-mipi: use phy_get_bus_width to fetch the lane_mbps for rk3368
1) If using the third part PHY, we use phy_get_bus_width() to fetch the
PHY lane rate in order to properly configure the controller.
2) Removed unneeded code.
Change-Id: I5c245e65f58665aa5fc025d6579e8bb331554458
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
WeiYong Bi [Wed, 29 Mar 2017 08:14:56 +0000 (16:14 +0800)]
phy: rockchip-inno-mipi-dphy: Add reset control for PHY APB
Change-Id: I02915f0c5a291a1aa13c7e3ed45421667a19940d
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
WeiYong Bi [Wed, 29 Mar 2017 08:12:34 +0000 (16:12 +0800)]
drm/rockchip: dw-mipi: Add reset control for APB
Change-Id: I740b5f6311bfaa6303870ef726be3b1a42b7c4d7
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
hero.huang [Tue, 28 Mar 2017 01:58:27 +0000 (09:58 +0800)]
input: touchscreen: add touch screen of gslx680 for rk3399-firefly-edp
Change-Id: Ic4fa205f8f71353c4703d745e96ec9056181c198
Signed-off-by: hero.huang <hero.huang@rock-chips.com>
Finley Xiao [Mon, 27 Mar 2017 12:13:24 +0000 (20:13 +0800)]
PM / devfreq: rk3399_dmc: rename driver and internals to rockchip
In future it will be modified to support more rockchip platforms.
Change-Id: I5cd7ce555eefe08b12fbfcda8ef445c4b169e8c6
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Finley Xiao [Mon, 27 Mar 2017 10:17:40 +0000 (18:17 +0800)]
PM / devfreq: rk3399_dmc: remove unused variable and fix code style
Change-Id: If1a49276430d2ef9dd77cadc7248096ec2ef0d17
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Finley Xiao [Wed, 1 Mar 2017 10:00:48 +0000 (18:00 +0800)]
PM / devfreq: rk3399_dmc: initialize min_freq and max_freq
In order to get correct results from sysfs, e.g.:
cat /sys/class/devfreq/dmc/min_freq
cat /sys/class/devfreq/dmc/max_freq
Change-Id: Id5921fdbacd0977c0b5378ccf0de068f0195b557
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>