Commit Graph

596519 Commits

Author SHA1 Message Date
David Wu
7bef813023 pwm: rockchip: add rk_fb config_done for voppwm
Change-Id: Iea012bfcec972f4b722950ea06713d2df4690242
Signed-off-by: David Wu <david.wu@rock-chips.com>
2016-08-31 13:57:58 +08:00
wenping.zhang
914ca81004 video: rockchip: hdmi: add new hdmi resolution mode support for discrete vr device.
For some special hdmi pixclock we should add support for this clock in hdmi phy mpll table.

Add new format SUPPORT_RK_DISCRETE_VR for rockchip discrete vr device,if hdmi device
is rockchip discrete vr device, please set the vic = HDMI_VIDEO_DISCRETE_VR in hdmi timing.

Change-Id: I820f967a84fbb7737cd9e1c2951b89df63863298
Signed-off-by: wenping.zhang <wenping.zhang@rock-chips.com>
2016-08-31 09:46:27 +08:00
wenping.zhang
9c80b56db4 video: rockchip: hdmi: add SUPPORT_VESA_DMT feature support for rk3399 hdmi.
Change-Id: Idafd772831593285af864eb3adf045e99f3c8d4a
Signed-off-by: wenping.zhang <wenping.zhang@rock-chips.com>
2016-08-31 09:42:12 +08:00
Elaine Zhang
3517f21ca6 ARM64: dts: rk3399: syr82x: support vsel pin to en/disable dcdc
Set vsel pin to active to disable DCDC,
Set vsel pin to inactive to enable DCDC.

Change-Id: Ie7d98730e5f59ffe38f0b88388cfb5b852316fe3
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2016-08-30 15:21:10 +08:00
Elaine Zhang
4336ef5f14 regulator: fan53555: fix up the dcdc is disabled when reboot
Before reboot if the DCDC is disabled,
the DCDC is still disabled after restart.
We have an method to workaround:
Use vsel pin to switch the voltage between value in FAN53555_VSEL0
and FAN53555_VSEL1. If VSEL pin is inactive, the voltage of DCDC
are controlled by FAN53555_VSEL0, when we pull vsel pin to active,
they would be controlled by FAN53555_VSEL1.
In this case, we can set FAN53555_VSEL1 to disable dcdc,
So we can make vsel pin to active to disable dcdc,
VSEL pin is inactive to enable DCDC.

Change-Id: I14c823ed11dc3369044ad2ed0b53a6027acbccd0
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2016-08-30 15:21:02 +08:00
Zhou weixin
e54b749e80 arm64: dts: rockchip: set gpu and cpu power control in suspend on rk3399 mid
Change-Id: I0c96ccc04f18c3a5df3a045dde62c7741acbbfbd
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2016-08-30 10:47:21 +08:00
Herman Chen
d16a8c7220 rockchip/vcodec: fix crash on decoder buffer empty
On vpu2 register separate interrupt bit and enable bit to different
register. When decoder found a buffer empty error which means the input
stream is not enough for one complete frame decoder will not stop
reading input stream buffer until it reach the end of buffer. This will
cause mmu fault on the buffer end.

In order to avoid this case decoder need to clear the enable bit in the
enable register to stop decoder from reading.

Change-Id: I6133aa4611fab03f6545b4775e8ee2320552445f
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2016-08-29 19:46:26 +08:00
Shengqin.Zhang
849db440c5 rockchip/rga: add src1 mmu table config when ABB mode
when rga2 use alpha under mmu, it must config src1
mmu addr for src1 channel will read mmu table

Change-Id: I6131a546421a5195bf3ae183f6fc7cb50fb09cfc
Signed-off-by: Shengqin.Zhang <zsq@rock-chips.com>
Signed-off-by: Zhiqin Wei <wzq@rock-chips.com>
2016-08-29 17:57:58 +08:00
Huang, Tao
9274f2a4fc Revert "arm64: Increase the max granular size"
This reverts commit 9730348075.

All Rockchip SoCs only have 64 bytes cache line length, so
it is not need this patch, which increase memory consumption.

Change-Id: Idf684189e7f7011562337a70dc7d26c8dceee7a6
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-08-29 15:46:12 +08:00
Elaine Zhang
f873212d3e regulator: fan53555: add regulator-initial-mode to set default mode
regulator-initial-mode: default mode to set on startup
regulator-initial-mode is set as:
        REGULATOR_MODE_FAST                     0x1
        REGULATOR_MODE_NORMAL                   0x2
Example:
 vdd_cpu_b: syr827@40 {
                compatible = "silergy,syr827";
                reg = <0x40>;
                vin-supply = <&vcc5v0_sys>;
                regulator-compatible = "fan53555-reg";
                regulator-name = "vdd_cpu_b";
                regulator-min-microvolt = <712500>;
                regulator-max-microvolt = <1500000>;
                regulator-ramp-delay = <1000>;
                fcs,suspend-voltage-selector = <1>;
                regulator-always-on;
                regulator-boot-on;
                regulator-initial-state = <3>;
                regulator-initial-mode = <1>;/*1:pwm 2: auto mode*/
                        regulator-state-mem {
                        regulator-off-in-suspend;
                };
        };

Change-Id: I4d3bbd50fd40531113f2cc6fe63905e24888a752
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2016-08-29 15:17:14 +08:00
Jianqun Xu
0f75dc4209 PM / devfreq: add to show current load of device
Calculate current load with busytime / totaltime from status,
also show the current frequency.

Change-Id: Ic310035db9c5478aa3d0b1e526b47c451fe09d23
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-08-29 14:58:21 +08:00
dalon.zhang
72f7047efc camera: rockchip: camsys driver 0.0x21.5
Change-Id: I4855b2e31fff158ae4690781ccc8e0ab0a20273c
Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>
2016-08-29 11:36:54 +08:00
Huang, Tao
58f443ef96 HACK: lib/kobject_uevent.c: ignore thermal uevent when suspend
Android healthd try to listen power_supply subsystem uevent,
but which will block system from suspend on big.LITTLE system
because thermal_cooling_device_unregister will called when
cpufreq_exit. So ignore this uevent when suspend.

Change-Id: I35948498916560d5ec75fe561c9e9d588663ad22
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-08-26 19:44:52 +08:00
Rocky Hao
83fb4e1f93 thermal: rockchip: add temperature dump when panic
Change-Id: I8cf3bbaea76d379dcfd1c89482254854df62cfea
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2016-08-26 17:26:48 +08:00
Sugar Zhang
e489b53214 ARM64: dts: rk3399: add pd control for i2s, spdif
Change-Id: Ifdf9b9432f66d54ce99888e41f86bd773df86dbb
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2016-08-26 16:53:21 +08:00
Peter Ujfalusi
7e867dd12a UPSTREAM: ASoC: simple-card: Add pm callbacks to platform driver
Set snd_soc_pm_ops for the pm ops to make sure that the ASoC level of PM
operations are going to happen. This is needed to get suspend/resume
working correctly when the audio is using simple-card.

Change-Id: Id0355673bc89456fedd3d035cbfd0f7f8f51d1da
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit 7c3767115a)
2016-08-26 16:53:21 +08:00
Zorro Liu
c490e7c0c2 ARM: dts: rockchip: vr-android: add spi1 sleep pinctrl
Change-Id: Ie3a4d8ea56dc2343a749ccc035002f0b25a356a3
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2016-08-26 16:40:35 +08:00
Jianhong Chen
8e56d04626 power: rk818-battery: remove zero algorithm init and add dump info
Change-Id: I47c02b4ac383de1b6943cd63a397fc99f594c9b9
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2016-08-26 15:52:53 +08:00
xuhuicong
f50b772b0a arm64: dts: rockchip: add cdn-dp-fb node for rk3399 android
Change-Id: Ie9651babf59d29547f6b506356cce5cd2618e5ae
Signed-off-by: xuhuicong <xhc@rock-chips.com>
2016-08-26 12:03:35 +08:00
xuhuicong
76cc443cfc arm64: rockchip: rockchip_defconfig enable dp with rk fb
Change-Id: I3208244641cb95fd14c6b814efe2cc6af214affd
Signed-off-by: xuhuicong <xhc@rock-chips.com>
2016-08-26 12:00:03 +08:00
xuhuicong
5f713d0f60 video: rockchip: dp: add cdn DP support for rk3399 with rk fb
Change-Id: Iaa36594e15d19e939f0929e2d6ee2ae99b6ce799
Signed-off-by: xuhuicong <xhc@rock-chips.com>
2016-08-26 11:55:55 +08:00
Lin Huang
289e55a533 ARM64: dts: rk3399: add dmc and dfi node
To support ddr frequency scaling function, we need
enable dmc and dfi node.

Change-Id: I84ea6bff679365d86937ff10bcdf466ea31901fb
Signed-off-by: Lin Huang <hl@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-08-26 11:28:29 +08:00
Huibin Hong
3510d70d3e spi: rockchip: set pinctrl state when suspend and resume
Change-Id: I3bfd641513dc8ad0112cb718383eb458c7659a84
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2016-08-26 10:46:22 +08:00
Jianqun Xu
fd3bb70480 ARM64: dts: rk3399: fix error address for wdt0
The address of wdt0 and wdt1 are swapped, let's fix it.

Change-Id: I715d181b8984a72ad234d4c1389154f15b60738a
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-08-26 10:25:29 +08:00
Huang Jiachai
3018fa691e video: rockchip: lcdc: add support dmc
Register dmc notify after than dmc driver.

Change-Id: I11c7daee1b4882da87d209854f0bda980c14551b
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-08-25 21:22:12 +08:00
jerry.zhang
b403b6bc55 arm64: dts: rockchip: modify l-sensor node for rk3399 tablet product
Change-Id: I41c90b8d24b79009cbb1320e19de2e4a1a400a97
Signed-off-by: jerry.zhang <jerry.zhang@rock-chips.com>
2016-08-25 21:02:30 +08:00
jerry.zhang
bcc129a3a5 arm64: dts: rockchip: change N key to home for rk3399 VR product
Change-Id: Ie173ee9fedec12cc1ef19e90673488d54e887807
Signed-off-by: jerry.zhang <jerry.zhang@rock-chips.com>
2016-08-25 21:02:19 +08:00
Jianqun Xu
b35f4b240e ARM64: configs: rockchip_defconfig: enable rk3399 dmc
Change-Id: I1e9a35d65d44a5f82c36546e5520ea5072b2231d
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-08-25 20:51:07 +08:00
Jianqun Xu
edce4a4919 PM / devfreq: rockchip-dfi: disable irqs during accessing ddr monitor
Change-Id: Ie4817a77fcb1283f37f41ab097f02ed7dc9cd18c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-08-25 20:30:07 +08:00
Jianqun Xu
e92cf67a4c PM / devfreq: rockchip: rk3399 dmc get opp table from dts
Get opp table from device node for rk3399 dmc table.

Change-Id: I689078d60ebdadf0954b60de70d05bc56a8d6597
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-08-25 20:29:02 +08:00
huang lin
200781e81d FROMLIST: PM / devfreq: rockchip: add devfreq driver for rk3399 dmc
Base on dfi result, we do ddr frequency scaling, register
dmc driver to devfreq framework, and use simple-ondemand
policy.

Change-Id: I4cc6bd9218f6fe0ae09d79c23516c6dbdaa59af2
Signed-off-by: Lin Huang <hl@rock-chips.com>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-08-25 20:25:52 +08:00
huang lin
6b37710281 FROMLIST: Documentation: bindings: add dt documentation for rk3399 dmc
This patch adds the documentation for rockchip rk3399 dmc driver.

Change-Id: Icaff8fa2173ded5c64a08e877d32a8eca1a0c3be
Signed-off-by: Lin Huang <hl@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-08-25 19:04:37 +08:00
huang lin
2439c1562a FROMLIST: PM / devfreq: event: support rockchip dfi controller
on rk3399 platform, there is dfi conroller can monitor
ddr load, base on this result, we can do ddr freqency
scaling.

Change-Id: I85efe7f626e636606508fdd171b14275591c0612
Signed-off-by: Lin Huang <hl@rock-chips.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-08-25 19:04:37 +08:00
huang lin
3cb977e186 FROMLIST: Documentation: bindings: add dt documentation for dfi controller
This patch adds the documentation for rockchip dfi devfreq-event driver.

Change-Id: Ib5704cdef0c7a53abe3afda126cb1a1adba43b3a
Signed-off-by: Lin Huang <hl@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-08-25 19:04:37 +08:00
huang lin
eaab9a9982 FROMLIST: clk: rockchip: rk3399: add ddrc clock support
Add ddrc clock setting, so we can do ddr frequency
scaling on rk3399 platform in future.

Change-Id: Ib743ffb642fe0c7c0a3b7db14389803595d868b3
Signed-off-by: Lin Huang <hl@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-08-25 19:04:37 +08:00
huang lin
00fed37569 FROMLIST: clk: rockchip: add new clock-type for the ddrclk
On new rockchip platform(rk3399 etc), there have dcf controller to
do ddr frequency scaling, and this controller will implement in
arm-trust-firmware. We add a special clock-type to handle that.

Change-Id: I9e15dd9e01ab1c51a639a6a59391cd5e0de383b7
Signed-off-by: Lin Huang <hl@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-08-25 19:04:37 +08:00
Zhou weixin
8f81216321 arm64: dts: rockchip: disable ldo8 and center in suspend on rk3399 mid
Change-Id: I5e269cc3827a203bc1e11a344557515aa57fe1c2
Signed-off-by: Yankun Zheng <zyk@rock-chips.com>
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2016-08-25 15:34:29 +08:00
Jianqun Xu
b28ea989d6 ARM64: dts: rk3399-evb2: ajust cpu opp table to make evb2 more stable
Since evb2 couple with ES1, the power consumption is large enough to
shutdown device in some case.

Let's reduce it's support lists to make things simple.

Change-Id: I145aa0c6a21e41b3c8e6ff32fd15839baa15f81e
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-08-25 14:13:06 +08:00
Bin Yang
4a34c58891 arm64: dts: rockchip: remove unused usb node for rk3399 mid
Change-Id: Ie8883d36a829b08d0963cbd7dbe183404b761093
Signed-off-by: Bin Yang <yangbin@rock-chips.com>
2016-08-25 14:00:51 +08:00
David Wu
a96cdb46d9 ethernet: rockchip: add pd_gmac support for rk3399
Change-Id: I990e02f585ae9b2ecf99a7e996cd23041ca19a2b
Signed-off-by: David Wu <david.wu@rock-chips.com>
2016-08-25 11:44:20 +08:00
Jacob Chen
76f0eddbd3 ARM: dts: rockchip: enable tsadc for fennec
Change-Id: Id177ffb022046e569c23bf46a5546ac64450e801
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2016-08-24 19:50:23 +08:00
Zhou weixin
cc9843b1ee arm64: dts: rockchip: use vop_pwm on rk3399-mid-818-android
To control backlight for support cabc.

Change-Id: I8f980174e57c91e264f0ddfb754a670196649b62
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2016-08-24 19:29:22 +08:00
Huang Jiachai
099974363c video: rockchip: vop: 3399: cabc mode indicate whether cabc enable or not
Change-Id: Ia4911d746c934b91a887881660373e4b4824f314
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2016-08-24 19:27:21 +08:00
Huang Jiachai
f4f1e0ae85 video: rockchip: fb: add function for vop pwm config done
Change-Id: I80350293c644fc0db1f613b3de14e34b7f3bc0f2
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2016-08-24 19:27:08 +08:00
Shawn Lin
a8b00ad1cc arm64: dts: rockchip: disable PCIe and PCIe-phy on rk3399-evb
Let's disable it as the auto link training of PCIe
take quite long time without add-in card or M.2
devices available.

Change-Id: I4a48a44574b68da75845a6e614a9970bb5d6685b
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2016-08-24 18:42:01 +08:00
Shawn Lin
d04a2e0a16 arm64: dts: rockchip: fix pcie and pcie-phy support for rk3399
Fix them for matching what the new drivers want.

Change-Id: I6ce43379ab9cf3d274b6b414ec014e431db588b7
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2016-08-24 18:40:58 +08:00
Shawn Lin
65d9e9a6ab PCI: rockchip: Add Rockchip PCIe controller support
Add support for the Rockchip PCIe controller found on RK3399 SoC platform.

Change-Id: Ic924a0defaef195575beba4dfc92c33b6b5bc3e7
[Shawn: manually backport to 4.4 with some minor changes]
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Brian Norris <briannorris@chromium.org>
2016-08-24 18:24:29 +08:00
Bjorn Helgaas
3c6d612196 UPSTREAM: PCI: Add devm_request_pci_bus_resources()
Several host bridge drivers iterate through the list of bridge windows to
request resources.  Several others don't request the window resources at
all.

Add a devm_request_pci_bus_resources() interface to make it easier for
drivers to request all the window resources.  Export to GPL modules (from
Arnd Bergmann <arnd@arndb.de>).

Change-Id: I4b89f0739d66d6027bfd2a01e9e93f5218ade617
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit 950334bcf1)
2016-08-24 18:24:18 +08:00
Shawn Lin
d1328c43c5 phy: add a driver for the Rockchip SoC internal PCIe PHY
This patch to add a generic PHY driver for rockchip PCIe PHY.
Access the PHY via registers provided by GRF (general register
files) module.

Change-Id: Ieba96d9cdf0d96302f38d29789615e2ec93f3440
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2016-08-24 18:23:48 +08:00
Nickey Yang
7bc7cbf91c ARM: dts: rockchip: fix i2s&spdif interrupts on rk3288
These must be translated from the values in the TRM by subtracting 32,
which has not been done.

Change-Id: I8d26bd63d39009b60b310e7ccbcd5de814863861
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2016-08-24 16:07:00 +08:00