Commit Graph

598885 Commits

Author SHA1 Message Date
Huang, Tao
d5aac6eae7 arm64: dts: rockchip: fix gic node name for rk3328
The unit-address should be ff811000.

Change-Id: Id363731458bf2210ca5d92d679c00bbfdd3f9de4
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-12-19 15:20:35 +08:00
Shawn Lin
df153a860a ARM64: dts: rockchip: add max-link-speed for rk3399
Per the errata of TRM, rk3399 won't support gen2 from
now on, so let's set max-link-speed to 1 in order not
to doing training for gen2.

Change-Id: I3fd455dc2427f2c67dc2dce8e8fabc4b521a49dd
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2016-12-19 15:04:45 +08:00
William Wu
a586e51a45 usb: gadget: composite: fix double freeing of freed memory
The following message can be observed on rk3399 nougat board
when switch MTP/charge mode with KASan backported :

=============================================================================
BUG kmalloc-192 (Not tainted): Object already free
-----------------------------------------------------------------------------

Disabling lock debugging due to kernel taint
INFO: Allocated in dwc3_gadget_ep_alloc_request+0x2c/0xf4 age=977 cpu=4 pid=1
alloc_debug_processing+0x128/0x17c
___slab_alloc.constprop.56+0x520/0x604
__slab_alloc.isra.53.constprop.55+0x24/0x34
kmem_cache_alloc_trace+0xa4/0x210
dwc3_gadget_ep_alloc_request+0x2c/0xf4
__ffs_func_bind_do_descs+0x15c/0x1b0
ffs_do_descs+0x50/0x180
ffs_func_bind+0x3e4/0x634
usb_add_function+0x78/0xe8
configfs_composite_bind+0x240/0x2d8
udc_bind_to_driver+0x38/0xcc
usb_udc_attach_driver+0x80/0xa8
gadget_dev_desc_UDC_store+0xa0/0xe4
configfs_write_file+0xfc/0x14c
__vfs_write+0x38/0xfc
vfs_write+0xac/0x174
INFO: Freed in dwc3_gadget_ep_free_request+0x84/0xbc age=4 cpu=4 pid=1
free_debug_processing+0x29c/0x36c
__slab_free+0x60/0x388
kfree+0x210/0x27c
dwc3_gadget_ep_free_request+0x84/0xbc
ffs_func_unbind+0x88/0xe4
purge_configs_funcs+0xa8/0x100
configfs_composite_unbind+0x34/0x5c
usb_gadget_remove_driver+0x74/0xa0
usb_gadget_unregister_driver+0x60/0xa4
unregister_gadget+0x24/0x48
gadget_dev_desc_UDC_store+0x7c/0xe4
configfs_write_file+0xfc/0x14c
__vfs_write+0x38/0xfc
vfs_write+0xac/0x174
SyS_write+0x54/0xa4
el0_svc_naked+0x24/0x28
Hardware name: Rockchip RK3399 Evaluation Board v3 edp (Android) (DT)
Call trace:
[<ffffff9008088490>] dump_backtrace+0x0/0x1c8
[<ffffff900808866c>] show_stack+0x14/0x1c
[<ffffff900835cbe4>] dump_stack+0x8c/0xac
[<ffffff900819f840>] print_trailer+0x188/0x198
[<ffffff900819f9bc>] object_err+0x3c/0x4c
[<ffffff90081a1fb8>] free_debug_processing+0x27c/0x36c
[<ffffff90081a2108>] __slab_free+0x60/0x388
[<ffffff90081a2c88>] kfree+0x210/0x27c
[<ffffff9008645a58>] composite_dev_cleanup+0x74/0xfc
[<ffffff900864789c>] configfs_composite_bind+0x2b8/0x2d8
[<ffffff900864953c>] udc_bind_to_driver+0x38/0xcc
[<ffffff9008649650>] usb_udc_attach_driver+0x80/0xa8
[<ffffff900864835c>] gadget_dev_desc_UDC_store+0xa0/0xe4
[<ffffff9008218144>] configfs_write_file+0xfc/0x14c
[<ffffff90081ac958>] __vfs_write+0x38/0xfc
[<ffffff90081ad290>] vfs_write+0xac/0x174
[<ffffff90081adc4c>] SyS_write+0x54/0xa4
[<ffffff90080826f0>] el0_svc_naked+0x24/0x28

This patch sets the usb_request pointer to NULL after the
free the usb_request buf. And the composite_dev_cleanup()
will check if the usb_request pointer is NULL before do
kfree and avoid double freeing freed menory.

Change-Id: I69df57553cb14d046b8b8206becd342a5e5fb7ba
Signed-off-by: William Wu <wulf@rock-chips.com>
2016-12-19 14:39:06 +08:00
Shengfei xu
49bf9467ca power_supply: Add support for TI BQ25700 charger chip
Change-Id: I362b5bb06455c2ddb9583bb5882ee349438ba799
Signed-off-by: Shengfei xu <xsf@rock-chips.com>
2016-12-19 14:17:08 +08:00
Shunqing Chen
2dae9d02b1 mfd: fusb302: add USB_FAST to notify PD information
Change-Id: I1d0e244ad087d83935953efb3fff095e5d36cc24
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2016-12-19 14:11:00 +08:00
Elaine Zhang
f90dde6dd4 UPSTREAM: clk: rockchip: validity should be checked prior to cpu clock rate change
If validity is not checked prior to clock rate change, clk_set_rate(
cpu_clk, unsupported_rate) will return success, but the real clock rate
change operation is prohibited in post clock change event. Alough post
clock change event will report error due to unsupported clock rate is
set, but this error message is ignored by clock framework.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Tested-by: Rocky Hao <rocky.hao@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(am from mmind/linux-rockchip.git branch v4.10-clk/next
 commit a554bb5fb0)

Change-Id: I521700f86fe1d9bf2d1bef4ebe0350cd6f558c0a
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-12-16 08:40:46 +08:00
Zhou weixin
59f1ccf234 ARM64: dts: rk3399: add some device support for tve1205g
1.add hid i2c toucpad
2.add hid i2c keyboard
3.add battery fuel gauge
4.add hall sensor
5.modify backlight polarity

Change-Id: I648d568a595324505f08684308197350a73d763e
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2016-12-15 17:48:47 +08:00
Mark Yao
0f0d7c9d07 ARM64: dts: rk3399-tve1205g: use simple-panel for edp panel
Edp controller support get timing from edid, so we can simple use
a dummy panel for display, so bootloader and kernel all can use same
timing from edid

Change-Id: I0cf19817aa1c38cae25603814c3605e6c16fe0f6
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-15 10:36:29 +08:00
Mark Yao
28269b219a drm/panel: support get bus_format from device-tree
copy include/uapi/linux/media-bus-format.h to include/dt-bindings/display/media-bus-format.h
So we can use media bus format on device-tree.

Change-Id: I8f63856c4d61c77958c24cd5a4436050b85a093c
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-15 10:32:12 +08:00
Zhou weixin
14c54b8c5e ARM64: dts: rk3399: fix coding style for tve1205g
Change-Id: I88ec89d500142f4292fba6cd94fb8802d960dcc1
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2016-12-14 19:15:57 +08:00
Huang Jiachai
998cc9d887 drm/rockchip: update pre dither down config
between vop big and hdmi/edp/dp connect mode is 10bit, so we disable
pre dither down, otherwise enable pre dither down.

Change-Id: If18ed05647d2eb3c6d5c159dd365ea66e55cd408
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2016-12-14 19:07:25 +08:00
Mark Yao
d118955910 drm/rockchip: boot_logo: add vop loader power protect
Change-Id: I018aef21831b7df05393cfe6dd4782bc1f4a8938
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-14 18:33:12 +08:00
Chen Liang
030e4e1584 arm64: dts add Rockchip RK3328 core dtsi and dts for EVB board
Change-Id: I7b0af1eff050262d38716ce83ec7debb6538b010
Signed-off-by: Chen Liang <cl@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: David Wu <david.wu@rock-chips.com>
2016-12-14 17:12:39 +08:00
Frank Wang
c590056b6a phy: rockchip-inno-usb2: usb remote wakeup support
This adds support usb remote wakeup both host-port and otg-port,
each port can detect linestate irq then wakeup the whole system.

Change-Id: I5efcf958131827548954deb9360b9e98aa4bd0bc
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2016-12-14 14:27:48 +08:00
Mark Yao
808129b95a drm/rockchip: fix compile warning unused private
Fix warning:
drivers/gpu/drm/rockchip/rockchip_drm_fb.c: In function 'rockchip_drm_fb_destroy':
drivers/gpu/drm/rockchip/rockchip_drm_fb.c:50:31:
      warning: unused variable 'private' [-Wunused-variable]

Change-Id: Id120d86173823a68b9136a99f17fe5415041e471
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-14 12:00:52 +08:00
WeiYong Bi
bc41bde50a drm/panel: simple: Add support for INNOLUX N125HCE-GPA 1920x1080 panel
The INNOLUX N125HCE-GPA is a 12.5' TFT Liquid Crystal Display NB module
with LED Backlight unit and 30 pins eDP interface. This module supports
1920x1080 FHD mode and can display 16.7M colors.

Change-Id: I72318ac3317cd03e2301a1cab61cf126cd2a401b
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2016-12-14 11:58:58 +08:00
William Wu
adb8d1ce47 phy: rockchip-inno-usb2: support otg vbus always powered on
Some platforms (e.g. RK3399 BOX board) otg port connector
interface is not standard, that is a Type-A connector with
vbus always powered on, looks like to work as host mode,
however, the otg port still need to support DRD mode.

In the current code, if otg vbus is always powered on, it
will cause USB2 PHY to detect a floating charger in error
case and power off USB2 PHY. This patch adds a new property
"rockchip,vbus-always-on" to fix this issue. With this patch,
we handle this case as otg host only mode, and avoid to do
charger detection and power off USB2 PHY.

Change-Id: I69e5e87021f3f2d654793e547264aec55ac664ef
Signed-off-by: William Wu <wulf@rock-chips.com>
2016-12-14 11:54:39 +08:00
Jianqun Xu
6573833677 ARM64: dts: rockchip: move rk3399 pmu-io-domain nodes to the pmugrf
Afer the "PM / AVS: rockchip-io: make io-domains a child of the GRF",
the pmu-io-domains should be a sub-node of the pmugrf simple-mfd.

Change-Id: Iebfe9041a604580ce3e5b028d7a143fcdbbdff25
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-12-13 19:53:25 +08:00
Jianqun Xu
949eacf000 ARM64: dts: rockchip: move rk3399 io-domain nodes to the grf
Afer the "PM / AVS: rockchip-io: make io-domains a child of the GRF",
the io-domains should be a sub-node of the grf simple-mfd.

Change-Id: Ic2a40726bccee8b795b5249e07f2537fd30b3f7b
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-12-13 19:26:18 +08:00
Huang, Tao
7b68923939 rk: gcc-wrapper.py ignore memcontrol.c:5355
Change-Id: Ic55a0e167d8158069efe136b5af61d49be17c17d
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-12-13 19:19:42 +08:00
Jianqun Xu
340362965f ARM64: dts: rockchip: remove isp support for rk3399 evb3
Enable isp will cause system to halt on android booting, which
is caused by wrong voltage for vdd_gpu.

isp will set gpio directly, unfortunatly, it sets the enable gpio
of dc-dc for gpu.

There has no good solution for isp to fix this issue, so let's
disable the isp node for rk3399 evb3 firstly to make board works
well.

Change-Id: I5dd8c367a192ce793ed388aaf143125550e90621
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-12-13 19:17:56 +08:00
WeiYong Bi
f712e42bd1 drm/panel: simple: Add support for AUO B125HAN03.1 1920x1080 panel
The AUO B125HAN03.1 panel is a 12.5' FHD 16:9 Color TFT-LCD
and 30 pins eDP interface.

Change-Id: Ic2be5f1d5a3e25d805e0752c1c1fad0decc4f2d0
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2016-12-13 19:15:54 +08:00
WeiYong Bi
f67be24239 drm/panel: simple: Add support for BOE NV124FHM-N73 1920x1080 panel
The BOE NV125FHM-N73 panel is a 12.5' FHD 16:9 Color TFT-LCD
and 30 pins eDP interface.

Change-Id: Idc15fb7126bf778fd23a766b01c2d5cf9760d4f3
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2016-12-13 19:13:24 +08:00
Zhou weixin
7ec612d17e ARM64: dts: rk3399: add new dts for tve1205g
Change-Id: I698a0cb3efa998c3c5cd53e238c656fba82e15cc
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2016-12-13 16:45:41 +08:00
Simon
31889ca7f5 iommu/rockchip: Ignore isp reset when isp mmu attach
Reset isp mmu would failed when attach,just ignore reset operation

Change-Id: Ib323db151e7313635524526d5304e16b9b504201
Signed-off-by: Simon <xxm@rock-chips.com>
2016-12-13 10:52:39 +08:00
Finley Xiao
b226c47d09 cpufreq: dt: fix the warning occurred when upped cpu5 before cpu4
root@rk3399:/ # echo 0 > /sys/devices/system/cpu/cpu4/online
CPU4: shutdown
psci: CPU4 killed.
root@rk3399:/ # echo 0 > /sys/devices/system/cpu/cpu5/online
IRQ17 no longer affine to CPU5
CPU5: shutdown
psci: CPU5 killed.
root@rk3399:/ # echo 1 > /sys/devices/system/cpu/cpu5/online
Detected PIPT I-cache on CPU5
CPU5: found redistributor 101 region 0:0x00000000fefa0000
CPU5: update cpu_capacity 1024
CPU5: Booted secondary processor [410fd082]
cpu cpu5: opp_list_debug_create_link: Failed to create link
cpu cpu5: _add_opp_dev: Failed to register opp debugfs (-12)
cpu cpu5: dev_pm_opp_get_max_volt_latency: Invalid regulator (-6)

Change-Id: I9b066f9712b7f8426561e03a538a9a5c45138ab0
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2016-12-12 21:13:23 +08:00
Mark Yao
e6615d9e47 drm/rockchip: vop: fix win ext config offset
Use win->offset for window ext config is wrong,
cause yuv color space display abnormal.

Change-Id: I425c412767ad1014cff0707e549d17534fa8059b
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-12 19:32:50 +08:00
Jianqun Xu
24bf1a2745 UPSTREAM: dt-bindings: add bindings for Rockchip grf
Add devicetree bindings for Rockchip grf which found on
Rockchip SoCs.

Change-Id: Iac0913b71925f7ddc0edd10b34024b049aace964
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry picked from commit fe95effb4c)
2016-12-12 19:26:14 +08:00
Huang Jiachai
fa7ef80efb video: rockchip: fb: add more debug message
Change-Id: Id096dec3a60cee14fecd16f37407fa10f8d8b90e
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2016-12-12 16:06:11 +08:00
David Wu
cc4eebc3ea pinctrl: rockchip: Add rk3328 pinctrl support
Change-Id: I3b5b69e46b555ab3578d611e5d480ced9c493666
Signed-off-by: David Wu <david.wu@rock-chips.com>
2016-12-12 13:08:22 +08:00
Finley Xiao
69b4c53327 PM / AVS: check initial rate only once
The patch fixes the warring when rk3399-vr resume:

CPU4: found redistributor 100 region 0:0x00000000fef80000
CPU4: update cpu_capacity 1024
CPU4: Booted secondary processor [410fd082]
rk3x-i2c ff3c0000.i2c: timeout, ipd: 0x10, state: 1
rk3x-i2c ff3c0000.i2c: timeout, ipd: 0x10, state: 1
rk3x-i2c ff3c0000.i2c: timeout, ipd: 0x10, state: 1
cpu cpu4: _set_opp_voltage:
failed to set voltage (800000 800000 800000 mV): -110
cpu cpu4: failed to set volt 800000
CPU4 is up
Detected PIPT I-cache on CPU5
CPU5: found redistributor 101 region 0:0x00000000fefa0000
CPU5: update cpu_capacity 1024
CPU5: Booted secondary processor [410fd082]
CPU5 is up

Change-Id: I36f1b5d23c8d2436e20765d699dfde9eb8cf74fa
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2016-12-12 13:01:10 +08:00
Finley Xiao
1949a7b99a PM / OPP: fix the errors occurred during getting or setting voltage
Change-Id: Iae0695d780b7f8f75c6d49bde5ee09beb04e1d80
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2016-12-12 12:59:44 +08:00
Zikim,Wei
3b72af3ea7 arm64: dts: rk3399-android-next: Use original rga
Change-Id: Ie3d5de2158e888546102bf131a9bd16f8701693e
Signed-off-by: Zikim,Wei <wzq@rock-chips.com>
2016-12-12 12:53:17 +08:00
David Wu
8f1f938370 i2c: rk3x: Add i2c support for rk3328
Change-Id: I04597a8acde38699b910cd7f3a688c501a0cf571
Signed-off-by: David Wu <david.wu@rock-chips.com>
2016-12-12 11:40:16 +08:00
Elaine Zhang
3e26fda535 clk: rockchip: add clock controller for rk3328
Add the clock tree definition for the new rk3328 SoC.
Fix up the pll setting to support rk3328 SoC.

Change-Id: Icf887625697515cf3e2cd2f7da7956a57c7e558a
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2016-12-12 10:55:39 +08:00
Elaine Zhang
2cecbe21eb clk: rockchip: add dt-binding header for rk3328
Add the dt-bindings header for the rk3328, that gets shared between
the clock controller and the clock references in the dts.
Add softreset ID for rk3328.

Change-Id: I8e6301fd854fe5c9a820fe76d7826db2c1c08b4e
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2016-12-12 10:54:22 +08:00
Jung Zhao
ea6527dba9 arm64: dts: rk3399-android-next: add iommu_enabled property in vpu&rkvdec node
camera will query this property, this is historical issue!!!

Change-Id: Ida221e9f5781dcc5562cad69e2ac437290b946bb
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2016-12-12 10:45:32 +08:00
Huang Jiachai
a8332c3a4c video: rockchip: fb: add dataspace for hdr
Change-Id: I65fb95a550d6afecf6b45f65afbd24047e8d5097
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2016-12-09 18:54:14 +08:00
Jacob Chen
a92273c7a9 UPSTREAM: ARM: dts: rockchip: Setup rk3288 ethernet0 alias for u-boot
Add an ethernet0 alias for the RK3288 mac interface so
that u-boot can find the device-node and fill in the mac address on
boards that support a wired network interface.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

Change-Id: Ie8c4e0d90b62278485446f614fce0c95145432d9
(cherry picked from commit 85ef8d611f)
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2016-12-09 18:37:13 +08:00
Jacob Chen
ef8d344bae UPSTREAM: ARM: dts: rockchip: add interrupt for Wake-on-Lan on RK3288
In order to use Wake-on-Lan on RK3288 integrated MAC, we need to wake-up
the CPU on the PMT interrupt when the MAC and the PHY are in low power mode.
Adding the interrupt declaration.

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Change-Id: Iec2637cc0448b6d93b895ca8f4176bab0a1f2dfb
(cherry picked from commit d5bfbeb809)
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2016-12-09 18:35:35 +08:00
Jacob Chen
4cad1381be UPSTREAM: ARM: dts: rockchip: drop unneeded properties from mipi node
The mipi controller node does contain an unused reg property as well as
unnecessary #address-cells and #size-cells properties for subnodes
not using addresses, so remove those to also make dtc happy.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Rob Herring <robh@kernel.org>

Change-Id: I48166c93f7746fa88fe2b35c3a040048926cadf7
(cherry picked from commit 6b241fcccb)
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2016-12-09 18:34:10 +08:00
Jacob Chen
92c9ba6c8e UPSTREAM: ARM: dts: rockchip: add mipi_dsi to VIO power domain on rk3288
The MIPI controllers are part of the VIO power domain so add the
necessary property to indicate this for the controller we support.

Signed-off-by: John Keeping <john@metanate.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

Change-Id: I1d51ba1b91dcacb4dfbd6a23d3e609cb66b9426e
 (cherry picked from commit 1946a201b3)
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2016-12-09 18:30:45 +08:00
Jacob Chen
53cefa30c2 UPSTREAM: ARM: dts: rockchip: add channels properties for i2s
add playback and capture properties to compatible various chips.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Change-Id: I7bc186f631212b0b2f3355aa2e371c52a0a99ede
 (cherry picked from commit e241657de0)
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2016-12-09 18:30:17 +08:00
Jacob Chen
b722d4d508 UPSTREAM: ARM: dts: rockchip: move the rk3288 thermal data into rk3288.dtsi
In order to be standard to manage for rockchip SoCs,  move the thermal
data into rk3288 dtsi, we needn't to add a new file for thermal.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Change-Id: I2b11b46d1cfb9b70882d1062dedc5b8ff1bd5adf
(cherry picked from commit f87305fa00)
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2016-12-09 18:24:56 +08:00
Jacob Chen
fd99e06e3f UPSTREAM: ARM: dts: rockchip: fix rk3288 power-domain unit names
The power-domain sub-nodes do have reg properties, but so far are
missing the expected unit names. So add the missing ones.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Rob Herring <robh@kernel.org>

Change-Id: I03d82afdc2f170c7ecce9685e15b418ca5d30d5a
(cherry picked from commit 95cface95b)
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2016-12-09 18:21:51 +08:00
Jacob Chen
36fe783695 UPSTREAM: ARM: dts: rockchip: fix missing usbphy unit-names
The usbphy subnodes do have a reg property but no unitname, add them.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Rob Herring <robh@kernel.org>
Change-Id: I5b48e289b332397ab7c383b839b875aeefa9f114
 (cherry picked from commit a8f0fa2764)
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2016-12-09 18:19:34 +08:00
Jacob Chen
f5feba517b UPSTREAM: phy: rockchip-usb: should be a child device of the GRF
The usb-phy is fully enclosed in the general register files (GRF).
Therefore as seen from the device-tree it shouldn't be a separate
platform-device but instead a sub-device of the GRF - using the
simply-mfd mechanism.

As the usb-phy is part of the kernel for some releases now, we keep
the old (and now deprecated) binding for compatibility purposes.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

Change-Id: I747a18fba361d6c6f161b6572e43955e18593a34
 (cherry picked from commit a0da445aab)
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2016-12-09 18:17:52 +08:00
Jacob Chen
5619148306 UPSTREAM: phy: rockchip-dp: should be a child device of the GRF
The displayport-phy is fully enclosed in the general register files (GRF).
Therefore as seen from the device-tree it shouldn't be a separate platform-
device but instead a sub-device of the GRF - using the simply-mfd mechanism.

The driver entered the kernel in the current merge-window, so we can still
adapt the binding without needing a fallback, as the binding hasn't been
released with a full kernel yet.

While the edp phy is fully part of the GRF, it doesn't have any separate
register set there, so doesn't get any register-area assigned.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Yakir Yang <ykk@rock-chips.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

Change-Id: I44a857051be195386fc888b2c713bedc948d5c95
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 (cherry picked from commit 0311c76e47)
2016-12-09 18:14:14 +08:00
Jacob Chen
7362631009 UPSTREAM: PM / AVS: rockchip-io: make io-domains a child of the GRF
IO-domain handling is part of the general register files, so should live
under the grf directly. This change allows the grf to be a simple-mfd and
the io-domains fetching the syscon regmap from that parent-node.

The old binding is of course preserved, though deprecated.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Kevin Hilman <khilman@baylibre.com>
Tested-by: David Wu <david.wu@rock-chips.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Change-Id: I562e293fc96283edc868771851f15dba0e80d3bc
(cherry picked from commit bc19b9a81d)
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2016-12-09 18:12:59 +08:00
Jacob Chen
31c917aebe UPSTREAM: arm: dts: rockchip: add reset node for the exist saradc SoCs
SARADC controller needs to be reset before programming it, otherwise
it will not function properly.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Change-Id: Iaafd41b163ebd853278baea5c1c10dc82c54792b
 (cherry picked from commit 3d4267a5a3)
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2016-12-09 18:05:58 +08:00