Commit Graph

600334 Commits

Author SHA1 Message Date
Zhou weixin
1690ce15bd arm64: dts: rockchip: config pwm polarity on rk3399-mid
Change-Id: Icbc406cb737c8ee00fd63b218bde3751611acc19
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2017-03-22 11:39:58 +08:00
dalon.zhang
4701514ad4 arm64: dts: rk3368-android: enable isp
Change-Id: Ib658fb798bb24b9686a78b4a2b64ab9fcc1a92f6
Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>
2017-03-22 11:38:23 +08:00
dalon.zhang
c1f06bff81 arm64: dts: rk3368: add isp config
Change-Id: I279afac575d17f534ce028ec13fbec7798b117d9
Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>
2017-03-22 11:38:06 +08:00
algea.cao
50b3052c04 drm: bridge: dw-hdmi: enable 3d mode
Change-Id: I45c4b0ded4aeaf24122d5cc6eb49b6bc72afc060
Signed-off-by: algea.cao <algea.cao@rock-chips.com>
2017-03-22 11:31:30 +08:00
dalon.zhang
df804a00a9 camera: rockchip: camsys v0.0x21.0xa
Change-Id: Ic9c5661ba76eaf8aee36e1a1822aa9bcd288e0ac
Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>
2017-03-22 09:48:24 +08:00
Rocky Hao
92f81f9d04 arm64: dts: rockchip: update thermal config for rk3368
add cpus' dynamic power coefficient and update alert temperature

Change-Id: I502e49d52268b63625e01103b50e6c18fb8da8b0
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2017-03-21 18:00:29 +08:00
Zorro Liu
7ad1fc1c43 arm64: dts: rockchip: enable tsadc node for rk3368 p9 board
Change-Id: I5d8b84248b0c713068143df303427ef31cb78963
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-03-21 17:10:58 +08:00
Jianqun Xu
1ab80996a7 arm64: dts: rk3368-android: debug uart id change to uart3
Change earlycon and console to uart3.

Change-Id: I7c6d7322e077b605b209dce4cf51afb26b9147dc
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-21 16:28:23 +08:00
Zorro Liu
a274596ac3 arm64: dts: rk3368: hdmi disabled default and remove hdmi node from p9 board
Change-Id: I034f119de02a04841b8b70746ef63c73a170988f
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-03-21 16:10:08 +08:00
Elaine Zhang
61e585b9ef arm64: dts: rockchip: rk3368: xin32k use the fixed clk
If xin32k use the rk808_clkout1, rk808 init is too late,
xin32k enable count and prepare count is not match with it's child clk.

Change-Id: I314776c5024fdf3373619968582497e0e2d5666f
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-03-21 16:09:43 +08:00
Rocky Hao
d63ab481f1 arm64: dts: rockchip: enable tsadc node for rk3368 sheep board
Change-Id: I82c8ef62f5e149d07c76e3a3d971e4222d9b8ecf
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2017-03-21 11:54:41 +08:00
Rocky Hao
112fa9a922 arm64: dts: rockchip: update tsadc node for rk3368
Change-Id: I0c99dcc6b5515639a496b915832542c3b844f4c8
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2017-03-21 11:54:41 +08:00
Rocky Hao
6cd7160544 arm64: configs: rockchip_defconfig: enable rk3368 thermal
Change-Id: Ied2658479d5cccc404623af39da2c6cbe028bae0
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2017-03-21 11:54:41 +08:00
Rocky Hao
fa07761ac3 thermal: rockchip: add rk3368 support
Change-Id: I970fedca9542c724d777c0bac788300c4fa21303
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2017-03-21 11:54:40 +08:00
Finley Xiao
d472b161d5 nvmem: rockchip-efuse: Fix dependencies
Not every rockchip efuse depends on ROCKCHIP_SIP, so delete
dependencies in Kconfig. It is more appropriate to add
dependencies for sip_smc_secure_reg_read/write.

Change-Id: I7f551f9fe71ced847657531e3c3cf418766fa3a4
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-03-21 10:41:53 +08:00
hero.huang
c1b18ddbbc arm64: dts: rockchip: add RK3399 Firefly Board for Linux Opensource
Add Firefly board dts file for Linux Opensource project

Change-Id: Ia525b7ff17f4d74990625e2e02c764996f57e520
Signed-off-by: hero.huang <hero.huang@rock-chips.com>
2017-03-20 19:14:21 +08:00
Zorro Liu
097c89626d arm64: dts: rk3368-p9: add usb host
Change-Id: Ief0045ac99d3af4db22042d468b67609d6fddf2f
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-03-20 16:29:01 +08:00
Jianqun Xu
1ae04305b6 arm64: dts: rk3368-p9&sheep: disable uart2
Disable uart2 since gpio mux on uart with sdmmc, and rk3368 use
fiq debugger, the uart2 could set to be disabled.

Change-Id: I2d784ccd6cf7526afc0f3bae54914e05febf91a6
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-20 14:35:48 +08:00
Jianqun Xu
b3c7d6f14c arm64: dts: rk3368-p9: enable sdmmc
Change-Id: Ib2849e2af020c744e33f0ab1baefbe50cecaa80b
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-20 14:35:10 +08:00
Maarten Lankhorst
6c59c5bb51 FROMLIST: drm/core: Reuse the reserved member in drm_event_vblank for crtc_id.
When doing a atomic commit affecting multiple crtc's, multiple events
are generated. The user_data member does not allow you to distinguish,
because they all have the same pointer.

I've chosen to use crtc_id, because using pipe would create ambiguity
when pipe = 0. A test for != 0 is easier to implement, and crtc_id
will never be 0.

Change-Id: Ie2daba50f711f298872f15498b8d46dedb38c0ff
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Stone <daniels@collabora.com>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
(am from https://patchwork.kernel.org/patch/9272895/)
2017-03-20 11:10:55 +08:00
Zikim,Wei
b8ee4085ec arm64: dts: rk3368-android: enable rga
Change-Id: I869f4bae54f72dc384c644fe3a0a499db2af3dbf
Signed-off-by: Zikim,Wei <wzq@rock-chips.com>
2017-03-20 10:53:00 +08:00
Mark Yao
8c677f9c19 arm64: dts: rk3368-sheep: fix sheep backlight
Change-Id: Ief2603afd33a65158bf6e86f08e53f96573ce486
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-20 10:49:56 +08:00
Mark Yao
e16d8ea934 video: backlight: pwm_bl: fix backlight polarity
Backlight polarity not works without pwm_adjust_config.

Change-Id: I11e5eefe340f758b6721021f13238306b3721270
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-20 10:49:34 +08:00
Mark Yao
b20e10aa93 arm64: dts: rk3368: enable uboot loader logo
Change-Id: I4807ac2aafd9cf319e37eacd184c1eae3ea36242
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-20 10:48:44 +08:00
Zhou weixin
92fb96cb16 ARM64: dts: rk3368: p9: fix dc detect failed
Change-Id: Ia4cd3528725dd4de250b9417295e7705eb16c412
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2017-03-17 19:27:20 +08:00
Jianqun Xu
68865315a5 arm64: dts: rk3368-sheep: support mipi display
Change-Id: Ibeadd258ccbcd68a6c96fb08e7bfbcea79e5e6c6
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-17 16:06:20 +08:00
Jianqun Xu
00f65d6c96 arm64: dts: rk3368-android: reserve memory for drm-logo
Change-Id: I81b401d5561c67012f4d42d1640a6b1176490ca4
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-17 15:59:16 +08:00
WeiYong Bi
02a0a43f01 ARM64: dts: rk3368: p9: Add MIPI DSI panel support
Change-Id: I0d42d9ccd7ba09338c3074d1328ab5ec18079c27
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-17 15:30:25 +08:00
Jianqun Xu
f78164b394 arm64: dts: rk3368-android: enable display and vop
Change-Id: Iad1bd3544191d3badc8d0d8b8d9be363e3ac6ed6
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-17 15:30:25 +08:00
Elaine Zhang
d072a98be5 clk: rockchip: rk3368: add CLK_SET_RATE_PARENT flag for dclk_vop
dclk_vop only allowed on NPLL.

Change-Id: I5325a530d3052de1e8685c39b90357291f0f4fb3
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-03-17 15:24:30 +08:00
Finley Xiao
a2b002f666 nvmem: Fix dependencies for ROCKCHIP_EFUSE
On some rockchip platforms, need use secure interface to access efuse.

Change-Id: I49a4d5e547b689ff1665f1eb29a1dbbba5ef2595
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-03-17 15:23:50 +08:00
chenjh
45568625fe firmware: Kconfig: ROCKCHIP_SIP depends on HAVE_ARM_SMCCC and ARCH_ROCKCHIP
HAVE_ARM_SMCCC is default selected by ARM(if CPU_V7) or ARM64

Change-Id: I4bc64d4c98de5fad3179b3121b0f361d6337732c
Signed-off-by: chenjh <chenjh@rock-chips.com>
2017-03-17 15:18:54 +08:00
WeiYong Bi
14a8620d9b arm64: rockchip_defconfig: enable CONFIG_PHY_ROCKCHIP_INNO_MIPI_DPHY
Change-Id: Iba7bd03c86691670990102e2202bf5c4e2a718b8
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-03-17 15:11:20 +08:00
Mark Yao
d6ba614691 clk: rockchip: rk3368: remove the flag ROCKCHIP_PLL_SYNC_RATE for NPLL
NPLL is used for vop dclk, sync rate flag would cause loader display
abnormal.

Change-Id: Ia170a8d0b7d1f39e2c9dcbc10b5d33fd1886d5f7
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-17 15:10:54 +08:00
Zorro Liu
d1838ce8ee ARM64: dts: rk3368-android: remove rkfb related nodes
Change-Id: I6a180419aabd705736fa1274c3463bad0cb95304
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-17 15:02:53 +08:00
Mark Yao
03b9791af3 arm64: dts: rk3368: don't assign clock rates for display pll
NPLL is used for display pixelclock, assign clock rates would overlap
loader pll setting, cause display abnormal.

Change-Id: Iaf1094c43526c7ca7b364608fa7153d03f84326c
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-17 14:19:58 +08:00
Mark Yao
90b26dec64 arm64: dts: rk3368: assign clock rates for aclk_vop and hclk_vop
Change-Id: I1d8559f09cd2df516aa8d479aa1b7407418916aa
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-03-17 14:19:39 +08:00
WeiYong Bi
edd4032b64 ARM64: dts: rk3368: Add MIPI DSI support
Change-Id: Ia74bb0726cb23acc914f976acf76849f0e764280
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-03-17 11:30:43 +08:00
WeiYong Bi
6ee9b7d6fb drm/rockchip/dsi: dw-mipi: Add support for RK3368 MIPI DSI Controller Host
Change-Id: I6c16b5a51451cdfc112a0bdefb44ad5a4b216c4f
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-03-17 11:28:39 +08:00
WeiYong Bi
35a788ded3 phy: Add support for INNO MIPI D-PHY
The INNO MIPI D-PHY is built in witch a standard digital interface
to talk to any third part Host controller.That is part of Rockchip SoCs,
like rk3368.

Change-Id: I9806882e0e3fb6b20348015d0f34923d1bc46b89
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-03-17 11:26:29 +08:00
Jianqun Xu
94ea732c72 arm64: dts: rockchip: rk3368 enable pmu node
Change-Id: I031fb437a84b19bb7cc389acb2404777f732cf6c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-17 10:49:26 +08:00
Elaine Zhang
81ea6550cc arm64: dts: rockchip: rk3368: add qos node
when pd power on/off, the qos regs need to save and restore.

Change-Id: I34146660e75609517463d679271386b536401b20
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-03-17 10:48:49 +08:00
chenjh
30a9b9fd67 firmware: rockchip: fix AARCH32 compile warning
Change-Id: I31924c9a1180d7fe034233c7ebd90413a7fa0fc3
Signed-off-by: chenjh <chenjh@rock-chips.com>
2017-03-16 16:43:52 +08:00
Jianqun Xu
4fa5180387 arm64: dts: rk3368: set higher voltage for gpu dvfs
As GPU share voltage domain with DDR and the minimum voltage of DDR
696MHz is 1100mV, GPU's voltage must be equal or greater than 1100mV.

After add ddr frequency scaling support, we can change them again.

Change-Id: I761931675265aac75425bf1cc9c7280a33f91e16
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-16 14:30:34 +08:00
Bin Yang
c374936464 drm/bridge: dw_hdmi: clear ih_mute register when system resume
HDMI PD is power off when system suspend, so ih_mute register
bit0 mute_all_interrupt will be reset to 1 when system resume.
HPD interrupt will be mask, that would cause hdmi plugin could
not be detected.

Change-Id: I3bf2e6116e902cd516a7ac69fbe8569ca943e853
Signed-off-by: Bin Yang <yangbin@rock-chips.com>
2017-03-16 14:26:48 +08:00
Finley Xiao
f030ff821d arm64: dts: rockchip: modify cpu's opp table for rk3368
Change-Id: I2f7f15f9b3a9e6190e5e8895e9e4fe939d284b43
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-03-16 11:33:00 +08:00
Jianqun Xu
4f9bae4246 FROMLIST: arm64: dts: rockchip: rk3368 swap clust0 and clust1
Before this patch, clust1 has little core0~3, clust0 has big core0~3
cpu_l | cpu0 |
cpu_l | cpu1 | clust1
cpu_l | cpu2 |
cpu_l | cpu3 |
----------------------
cpu_b | cpu4 |
cpu_b | cpu5 | clust0
cpu_b | cpu6 |
cpu_b | cpu7 |

With this patch, clust0 will have little core0~3, clust1 will have big core0~3
cpu_l | cpu0 |
cpu_l | cpu1 | clust0
cpu_l | cpu2 |
cpu_l | cpu3 |
----------------------
cpu_b | cpu4 |
cpu_b | cpu5 | clust1
cpu_b | cpu6 |
cpu_b | cpu7 |

It makes no other change, just keep same with other SoCs definations.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
(am from https://patchwork.kernel.org/patch/9625109/)

Change-Id: I1beea4d3e75409d3a1f1614b0b86f1a929db4eee
2017-03-16 11:32:49 +08:00
Shawn Lin
03150c2ba8 arm64: dts: rockchip: add linux,pci-domain for PCIe
We need this to ask PCIe bus allocater to always
assign 0 to our root bus isntead of increasing it
, otherwise the hierarchy would be wrong if we unbind
and bind the root port.

Change-Id: I4ada61c89e617c7bccd92c5f9fa3334cae40603e
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2017-03-16 11:30:35 +08:00
Sinan Kaya
3694d7d0d0 UPSTREAM: PCI: Add pci_unmap_iospace() to unmap I/O resources
Add pci_unmap_iospace() to undo what pci_remap_iospace() did.

This is needed to support hotplug removal of host bridges that use
pci_remap_iospace().

Change-Id: Iee5d778cb8ddfedab59c55c227a8c60825786854
[bhelgaas: changelog]
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
Signed-off-by: Tomasz Nowicki <tn@semihalf.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
(cherry picked from 4d3f138459)
Conflicts:
	drivers/pci/pci.c
2017-03-16 11:25:48 +08:00
Shawn Lin
946c054110 UPSTREAM: PCI: rockchip: Fix rockchip_pcie_probe() error path to free resource list
rockchip_pcie_probe() calls of_pci_get_host_bridge_resources() to parse
resources from DT and build a resource list.  The caller is responsible for
disposing of the resource list.  This is normally done by
pci_release_host_bridge_dev() when the host bridge is removed.

If the host bridge probe fails, dispose of the resource list in the probe
error path.

Change-Id: Iefc17963a6ce99c64f2940d8dc2ba93bd00fe120
[bhelgaas: changelog]
Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
(cherry picked from f1d722b607)
2017-03-16 11:25:30 +08:00