Commit Graph

599552 Commits

Author SHA1 Message Date
Jacob Chen
02055be1ee multiple-os: don't disable timer6
It seems kernel will use it

Change-Id: Idcd61cdf4f3ee8e038883fc0e8699b422fd48ff5
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-02-21 09:03:11 +08:00
Jacob Chen
1ec20817f5 multiple-os: don't set rktimer in kernel
uboot will use rktimer

Change-Id: Icb9bdf6f04916198296433a67332f28f9b43674e
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-02-21 09:03:09 +08:00
Jacob Chen
7f0e7d3705 multiple-os: add uboot helper
setup clk for uboot

Change-Id: I1be359821a112d3e171423ee8b33dc84e92c4bd2
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-02-21 09:03:07 +08:00
Jacob Chen
ac6e6d50e9 arm: dts: board: leave resources for uboot
Change-Id: Ie36c4e4b735b78aab89f8e8d1cc0045fde8fca74
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-02-21 09:03:03 +08:00
Jacob Chen
4fd013e55c arm: dts: rk3288: disable cpu3
Change-Id: I66b0338c85e7e765b2112438071611e8c00ec4c2
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-02-21 09:02:51 +08:00
Jacob Chen
af967d8b77 virtual: leave cpu3 power alone
we don't care it in kernel, uboot will handle that

Change-Id: Id6ddd0307cd4f0812d86d19550459d0f202a9854
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-02-21 08:43:33 +08:00
Jacob Chen
63c35bf3fb Revert "pinctrl: rockchip: only enable gpio clock when it setting"
This reverts commit 07a06ae99e.
2017-02-21 08:43:33 +08:00
david.wu
3e00738277 arm64: dts: rockchip: add gmac support for rk3328-evb
Change-Id: I05e4eb2d904809a310b12f0de8ae274b90dd583a
Signed-off-by: david.wu <david.wu@rock-chips.com>
2017-02-17 18:41:21 +08:00
david.wu
f3c53dd38e arm64: dts: rockchip: add io-domain support for rk3328-evb
Change-Id: I15fb97655419e723ce001b8900b413dac3e291e8
Signed-off-by: david.wu <david.wu@rock-chips.com>
2017-02-17 18:39:45 +08:00
Luo wei
70e6774c3a arm64: dts: rockchip: modify auto dp rayken hwrotation for rk3399-box-rev2-disvr dts
Change-Id: Ia5fc077acba519c07f58456fde0257e313181197
Signed-off-by: Luo wei <lw@rock-chips.com>
2017-02-17 18:38:43 +08:00
Elaine Zhang
009949962c clk: rockchip: rk3328: add SCLK_HDMI_SFC id
Change-Id: Ic876175272cba40093e555ee815e9261bb39d510
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-02-17 18:32:09 +08:00
david.wu
f549d89454 arm64: dts: rockchip: add pwm support for rk3328
Change-Id: I20d150fb258f9eb7f09623189551b982b641e7ad
Signed-off-by: david.wu <david.wu@rock-chips.com>
2017-02-17 17:28:48 +08:00
david.wu
891c3e1524 pwm: rockchip: need the Distinguish between rk3328 and rk3288 for clk used
Change-Id: Ib6274a200640ab8829a99761ffbf60d530fe5653
Signed-off-by: david.wu <david.wu@rock-chips.com>
2017-02-17 17:28:41 +08:00
huweiguo
216c7fac8f Bluetooth: update rtk_btusb driver to v 4.1.2
Change-Id: I3627b1938c734cfe4ce32c269798037dc1ff8a32
Signed-off-by: huweiguo <hwg@rock-chips.com>
2017-02-17 17:25:49 +08:00
chenjh
2c7a28a62b mfd: rk808: add sysfs debug node "/sys/rk8xx/rk8xx_dbg"
Change-Id: I197dc97b7337414a7d52426da0e0cb8c7480c917
Signed-off-by: chenjh <chenjh@rock-chips.com>
2017-02-17 17:18:56 +08:00
david.wu
491ae057f1 arm64: dts: rockchip: add gmac support for rk3328
Change-Id: If46e67a05e2a54462b1a83433018385c5f52942c
Signed-off-by: david.wu <david.wu@rock-chips.com>
2017-02-17 14:40:30 +08:00
david.wu
f6f988e29b arm64: dts: rockchip: change the compatible for rk3328 i2c
Change-Id: I02e7c4088a7a14e233ce2fd907d6a249c18f3a7d
Signed-off-by: david.wu <david.wu@rock-chips.com>
2017-02-17 14:38:31 +08:00
david.wu
783c39e283 i2c: rk3x: Don't need to add rk3328 i2c compitiable
Change-Id: I32f9698fcfdce4ecd40b9be7b2ab7ffd82651b9b
Signed-off-by: david.wu <david.wu@rock-chips.com>
2017-02-17 14:37:35 +08:00
William Wu
48fdea5712 arm64: dts: rockchip: enable usb3 controller for rk3328-evb
Change-Id: I49c152476f6c87195e6b68a9477d84d8bfcc1a70
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-02-17 10:47:51 +08:00
William Wu
0cbdc8c1da usb: dwc3: add a new glue layer for rockchip SoCs with INNO PHY
This patch add a rockchip specific glue layer to support
USB 3.0 HOST only mode for rockchip USB 3.0 core wrapper
consisting of USB 3.0 controller IP from Synopsys and USB
3.0 PHY IP from Innosilicon.

With this patch, we can support for XHCI integrated in
DWC3 IP on rockchip platforms. Because some INNO USB 3.0
PHY can't detect disconnection by PHY IP, and cause USB3
device unrecognized when replugged again. So we depend on
the HUB core driver to detect the disconnection, and send
notifier to DWC3 driver from USB PHY driver, then we can
do phy reset and remove/add hcd to reinit HCD.

Change-Id: I6972c6f9f8f7160dbd74ad531b843a65ccec5dc0
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-02-17 10:47:51 +08:00
William Wu
99cf21043d arm64: dts: rockchip: add usb3 controller node for rk3328
Change-Id: I350f46a839ec2266a129c8902aebe3a0480c074d
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-02-17 10:47:51 +08:00
William Wu
1b67e01442 usb: dwc3: rockchip-inno: add devicetree bindings documentation
This patch adds the devicetree documentation required for Rockchip
USB 3.0 core wrapper consisting of USB 3.0 controller IP from Synopsys
and USB 3.0 PHY IP from Innosilicon.

It supports DRD mode, and could operate in device mode (SS, HS, FS)
and host mode (SS, HS, FS, LS).

Change-Id: Ia240627c31cd3ff2f2d7f1a1faa9c7d88207d04f
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-02-17 10:47:51 +08:00
William Wu
020b3e1a10 phy: rockchip-inno-usb3: workaround for USB3 PHY disconnection det issue
The rk322xh USB3 PHY has a problem to detect disconnection,
it loses the ability to detect an absence of a far-end
receiver termination specified in USB3 spec Table 6-21,
and this causes the linkstate to change between SS.Inactive
and Polling state, but not return to correct state Rx.detect.

To workaround this bug, we depends on the hub_event to
detect the port linkstate change and do soft disconnect.
And then do USB3 PHY reset and reinit HCD to recovery
the whole USB3.

The workaround process is:
Plug out USB3 device -> hub_event detect PLC and find
USB 3.0 port in the Inactive -> call usb_remove_device()
to do soft disconnect -> call usb_phy_notify_connect()
-> send notifier to DWC3 controller driver to do USB3
PHY reset and reinit HCD.

Change-Id: Icb975581c6fbbb34a7da90ddca47e04a46e5da48
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-02-17 10:47:51 +08:00
William Wu
1c6c74e1dd phy: rockchip-inno-usb3: select USB_PHY
Some rockchip SoCs (e.g. rk322xh/rk3328) integrated with
INNO USB 3.0 PHY have a problem to detect disconnection
correctly. So we need to depend on the usb phy framework
to handle the disconnection.

Change-Id: Ie3bd015c89e1fb8d46f69fe8d274e29462bfb763
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-02-17 10:47:51 +08:00
William Wu
cb1a2c2b7b arm64: dts: rockchip: enable usb3 phy for rk3328-evb
Change-Id: I5ab06e9db355575e828ce004c1d3ce65e4717c95
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-02-17 10:47:51 +08:00
William Wu
aef07fe9b0 arm64: rockchip_linux_defconfig: enable INNO USB 3.0 PHY
Change-Id: I4eb6f75fa0149fb40a3acc5aa6425b1efdf14239
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-02-17 10:47:51 +08:00
William Wu
0a88814642 phy: rockchip-inno-usb3: add a new driver for Rockchip USB 3.0 PHY
This patch implements a USB 3.0 PHY driver for Rockchip
platform (e.g. rk3328) with Innosilicon IP block.

Change-Id: Ia6ed5df6b7b9eecebd5a5c8a4c4a6df7d26b7422
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-02-17 10:47:51 +08:00
William Wu
544c91647f arm64: dts: rockchip: add usb3 phy nodes for rk3328
This patch adds USB 3.0 PHY grf node and apb node
for rk3328 USB 3.0 module.

Change-Id: I9d4e6c6d6792ac5fd6c2a4d7cc902f1ff0cf4ef1
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-02-17 10:47:51 +08:00
William Wu
b6b5b403ca Documentation: bindings: add dt doc for Rockchip USB 3.0 PHY
This patch adds a binding that describes the Rockchip USB 3.0
PHY designed by Innosilicon.

Change-Id: Ia5b9f18743c7a7ed1b9d33420608a2f12a086aee
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-02-17 10:47:51 +08:00
William Wu
618e21ee40 usb: dwc3: rockchip: delete unused binding documentation
We have cherry-pick new binding documentation for dwc3
from upstream, so delete the legacy one.

Change-Id: I292447c96c741445669139478c769e356d1b8d9e
Signed-off-by: William Wu <wulf@rock-chips.com>
2017-02-17 10:47:51 +08:00
Shawn Lin
5ed0c1764e block/partitions/rk: extend the property setting for NVMe
In order not to cause ABI regression, let's invent a new
androidboot.mode for NVMe instead. Just elaborate a bit more
that we now doesn't support mtd devices, otherwise we should
rework it to make it more scalable.

Change-Id: I115ffd0e5c4986f2e76fcbcf6700c31f297f7950
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2017-02-16 20:33:12 +08:00
Elaine Zhang
7ed6c953e7 clk: rockchip: rk3328: fix up the describe error for aclk_usb3otg
Change-Id: Ie323c8934205bf71360d779717bb3e34c36a9dc6
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-02-16 13:55:57 +08:00
Huang, Tao
c78208fe16 arm64: dts: rockchip: Fix indentation of rk3399-android-next
Change-Id: I93cce96446bd89634eef21e1dae633734660c686
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2017-02-16 10:08:29 +08:00
zhangjun
d006f4bf26 ASoC: bt-sco: Compatible stereo format
Compatible the platform which unsupported mono channel

Change-Id: Ica417b0c544b0750e6367fdeab45254542135bc4
Signed-off-by: zhangjun <zhangjun@rock-chips.com>
2017-02-15 17:07:36 +08:00
Zheng Yang
eb1056fb41 video: rockchip: hdmi: add dts property rockchip,defaultdepth
To modify hdmi default output color depth, use following dts:

&hdmi {
	rockchip,defaultdepth = <10>;
}

rockchip,defaultdepth could be following value:
<0>  auto select color depth, prefer 8bit
<8>  8bit
<10> 10bit

Change-Id: Idce0bd080c042edf3939c5c38b76d4d1860b7a9f
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit 905228ba1e)
2017-02-15 16:58:37 +08:00
Zheng Yang
03c69056bc video: rockchip: hdmi: support set hdr metedata
Use following command to set hdr metadata:

cd /sys/class/display/HDMI
echo "hdrmdata=1 2 3 4 5 6 7 8 9 10 11 12" > color

Use following command to get current hdr metadata

cat /sys/class/display/HDMI/color

Change-Id: I81a5000801b558728689be912c1a642f3b237e65
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit 09210b8aa1)
2017-02-15 16:58:23 +08:00
Zheng Yang
55116b1535 video: rockchip: hdmi: support modify color mode and depth simultaneously
Use following command:

echo mode=<value> > /sys/class/display/HDMI/mode

<value> is decimal digits, lower 8bit is color mode, upper 8bit is depth.
For example:
	value = 131 = 0x83 means YCbCr444 8bit output
	value = 164 = 0xa4 means YCbCr422 10bit output
	value = 0 means restore auto mode(8bit, priority YCbCr444)

Change-Id: I256906d91f7075defb4d785cfc15926ca5627093
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit c3620a88e5)
2017-02-15 16:58:09 +08:00
Zheng Yang
7f1c063e91 video: rockchip: hdmi: fix compile warning
fix warning: switch condition has boolean value [-Wswitch-bool]

Change-Id: I11d7a9fe2a07f6681dacf4a1d800b16497339297
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit 66f72e45db)
2017-02-15 16:57:50 +08:00
Zheng Yang
4307a0e7db video: rockchip: hdmi: v2: fix some format check error
Change-Id: I3432060aed93ccf8745fa7afebd0a5322f8d4121
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit d3dfca100e)
2017-02-15 16:57:33 +08:00
Zheng Yang
fb96568f28 video: rockchip: hdmi: fix can not disable hdr error
Change-Id: I53f809d78a8a151a6b6985266ec73026bdc0b3a2
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit b60715d9a0)
2017-02-15 16:57:13 +08:00
Zheng Yang
53af51be75 video: rockchip: hdmi: fix CTS HF1-53 HDR test
1. HDR MetaData HB2 is 26.
2. Under HF1-53, HDR MetaData should be sent and
PB1 value should be exist in EDID.

Change-Id: I616b4cdcf321ea0080b845c868d1f4cd4881fd14
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit 39c34527e7)
2017-02-15 16:57:01 +08:00
Zheng Yang
c227098074 video: rockchip: hdmi: improve hdr function when out of sink tmds clk
If output tmdsclk is out of sink max tmds clk, we need to set output
mode to 8bit or YCbCr422.

For example, sink max tmds clk is 600M, but 3840x2160p-60 10bit tmdsclk
is 594*1.25 > 600, we set output mode to YCbCr422 10bit which tmds clk
is 594, so we can get max picture quality.

Change-Id: I13fe30dad06757ec52de8d367f1e10a56e63ad92
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit 0c3397a9b8)
2017-02-15 16:56:48 +08:00
Zheng Yang
ea7b3fd24c video: rockchip: hdmi: enable hdr when resolution is not 4K
Change-Id: If3ab93cd0ef822c82d6d482cb3ed2dc29f6613d8
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit 62a423c5a0)
2017-02-15 16:56:31 +08:00
Zheng Yang
ec1daf23e4 video: rockchip: hdmi: support hdr function
HDR is introduced by HDMI2.0a, which need parsing HDR Static
Metedata data Block defined in EDID, and send Dynamic Range
and Mastering InfoFrame to inform TV to switch to HDR mode.

If TV support HDR, it's EOTF is shown in sysfs node
/sys/class/display/HDMI/color with key word "Supported EOTF:".

For example, "Support EOTF: 0x7" means support following EOTF:
BIT0: Traditional gamma - SDR
BIT1: Traditional gamma - HDR
BIT2: ST_2084

To switch eotf mode, you can use following command:
echo hdr=value > /sys/class/display/HDMI/color
value could be:
	0 - Disable sending Dynamic Range and Mastering InfoFrame
	1 - Traditional gamma - SDR
	2 - Traditional gamma - HDR
	4 - ST_2084
0、1 both means SDR mode, 4 is HDR10/Dolby HDR mode.

Change-Id: Ia3d19bbca9b9368cde8dcb11265fbff4684ac603
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit 08ea9d12f3)
2017-02-15 16:56:17 +08:00
Shen Zhenyi
0bcd6fb191 video: rockchip: hdmi: change the way to enable debug log
user can change hdmi_dbg_level value to printf log which you want.
1 : cec
2 : hdmi
3 : hdcp
such as, echo 2 > /sys/module/rockchip_hdmi_sysfs/parameters/hdmi_dbg_level

Change-Id: Iaa5a66c2926789694e0d544196bedc81fb3a755a
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
(cherry picked from commit 919cb0208a)
2017-02-15 16:56:03 +08:00
Shen Zhenyi
e597832a0c video: rockchip: hdmi: contrast uboot and kernel resolution
When box is starting, if kernel resolution is different from uboot,
need to clear hdmi->uboot

Change-Id: Iec56862fe20dcaccc12fefae21de55b56ab2fe54
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
(cherry picked from commit 899bf65ac0)
2017-02-15 16:55:49 +08:00
Shen Zhenyi
e154cae591 video: rockchip: hdmi: yuv420 resolution retain 4K 50/60HZ
Change-Id: I75ae87bbd274af10b7da9b6699d5892e6f864dba
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
(cherry picked from commit 6acb6585c0)
2017-02-15 16:55:17 +08:00
Zheng Yang
5bbc1f6637 video: rockchip: hdmi: delete cec grf register operation
CEC GRF register can be replaced by hdmi cec register
CEC_CTRL BIT 5.

Change-Id: Ic27eb242e23c4a9b4de6a77032372eac11b5247c
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit 3a94990c47)
2017-02-15 16:55:03 +08:00
Elaine Zhang
e436a0784e Revert "mfd: fusb302: avoid sending notifier to USB/DP during PM suspend"
This reverts commit 082f43af91.

Change-Id: Iae816df6de573c03cf87b0091fb920c4673dbb54
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-02-15 16:53:54 +08:00
Elaine Zhang
0b02304fee PM / Domains: Keep the pd status during system PM phases
If a PM domain is powered off before system suspend,
we hope do nothing in system runtime suspend noirq phase
and system runtime resume noirq phase.

Change-Id: Id72b1f92e10449c48006aced0d49612637402210
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-02-15 16:53:36 +08:00