Commit Graph

592787 Commits

Author SHA1 Message Date
wzq
74b38d3bd0 ARM64: dts: rk3366-tb: Enable rga device
Change-Id: I935033613e52edce6a479651fe0bc3ed2db5fb9c
Signed-off-by: Zhiqin Wei <wzq@rock-chips.com>
2016-03-10 11:50:23 +08:00
Xu Jianqun
e396b3a38a ARM64: dts: rockchip: add dts file for rk3399 chromebook
Change-Id: I17589cef588958601448ff7e3615b84ef95dd506
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
2016-03-10 11:42:55 +08:00
Huang, Tao
9663333f31 arm64: configs: update rockchip_defconfig by savedefconfig
Change-Id: I057bdbe89ed484f15295a0184f94f8a5acac8483
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-03-10 11:37:52 +08:00
Huang, Tao
c61cf05de3 video: rockchip: reorder config
Change-Id: Ie9e0f2e8a69c456f52003dd3f956ff0a44b981cd
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-03-10 11:36:17 +08:00
Huang, Tao
f2b7d4dfd8 video: rockchip: iep: do not default enable
Change-Id: I48747ec133f05ec6b1fa6d70187c4c641fed7ccd
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-03-10 11:19:07 +08:00
sayon.chen
0056b0505b ARM64: rockchip_defconfig: enable VCODEC
add CONFIG_RK_VCODEC=y

Change-Id: Ida687dceeb36488c8ddbbf02bd273dec2991993b
Signed-off-by: sayon.chen <sayon.chen@rock-chips.com>
2016-03-10 11:10:20 +08:00
sayon.chen
1a14c128f2 ARM64: dts: rk3366: add iep device
add iep device

Change-Id: Ie3c60a79aaddf308847f84b3acd55d529e22f352
Signed-off-by: sayon.chen <sayon.chen@rock-chips.com>
2016-03-10 11:09:38 +08:00
sayon.chen
b3b083153b ARM64: dts: rk3366: enable iep mmu
enable iep mmu

Change-Id: Ia70422fbdf60d5cea8deaa2695913ccf32b580a3
Signed-off-by: sayon.chen <sayon.chen@rock-chips.com>
2016-03-10 11:08:57 +08:00
sayon.chen
b7039db241 ARM64: dts: rk3366: add vpu device
add vpu_service and rkvdec device

Change-Id: I53dea4053fa61bd0cd4f6313d9ea7e87673f2ce4
Signed-off-by: sayon.chen <sayon.chen@rock-chips.com>
2016-03-10 11:08:12 +08:00
sayon.chen
a1c0066df1 ARM64: dts: rk3366: enable vpu mmu
enable vpu mmu

Change-Id: I07d0c0e251d726b76110ecab0f3276ba4e97ee33
Signed-off-by: sayon.chen <sayon.chen@rock-chips.com>
2016-03-10 10:59:08 +08:00
sayon.chen
0e6af837fe video: rockchip: vcodec: add vpu codec drivers
move vpu codec code to drivers/video/rockchip

Change-Id: Idf4100181200cf28a18990da7088bee495f10fcb
Signed-off-by: sayon.chen <sayon.chen@rock-chips.com>
2016-03-10 10:26:04 +08:00
Feng Xiao
ab7887703b ARM64: dts: rockchip: rk3366: modify the initial rate of wifi pll
There is a div2 behind wifi pll, so the initial rate should be 960MHz.

Change-Id: Ib90457a0b17907c3056adf58edd623ae462b06a3
Signed-off-by: Feng Xiao <xf@rock-chips.com>
2016-03-10 09:04:24 +08:00
xiaoyao
b01b93bf4e mmc: sdio: call mmc_power_cycle before re-init sdio devices
Change-Id: I4ae9bb385c9235eb184de0f3bf06719b056f4842
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2016-03-09 19:46:47 +08:00
xubilv
2faaab0815 video: screen-timeing: sdk mipi: The frame rate increased from 44 to 55
Change-Id: Id5fec461e1785b8cb713c7bb686deb2bb38973d9
Signed-off-by: xubilv <xbl@rock-chips.com>
2016-03-09 19:45:02 +08:00
Huang, Tao
7755a74444 Revert "ARM64: dts: rockchip: add emmc, sdio and sdmmc node for rk3399"
This reverts commit d3e94b6309.

ERROR (reg_format): "reg" property in /phy has invalid length (8 bytes) (#address-cells == 2, #size-cells == 2)

Change-Id: I92c498906248c08aade2e36967f896fdd1094abc
2016-03-09 19:11:57 +08:00
Feng Xiao
123d41d1dd clk: rockchip: add video noc clk to the list of rk3366 critical clocks
The clocks of VPU NOC and RKVEDC NOC interact with each other.
If one of VPU and RKVDEC is working, they all must be opened.

Change-Id: I966df107ae72fbbb99f1e660a79bfd07476e8539
Signed-off-by: Feng Xiao <xf@rock-chips.com>
2016-03-09 19:04:06 +08:00
sayon.chen
b685e88e61 ARM64: rockchip_defconfig: enable IEP
enable IPE

Change-Id: Id4f8f8a91106269b6d8e4f0e0dc7ec1d499c2ce2
Signed-off-by: sayon.chen <sayon.chen@rock-chips.com>
2016-03-09 18:42:20 +08:00
sayon.chen
23e9578703 video: rockchip: iep: iep code modify
fix iep code compile fail in kernel-4.4

Change-Id: Iba105baecff5fe474cd0d9c02dc9b7970e9c9990
Signed-off-by: sayon.chen <sayon.chen@rock-chips.com>
2016-03-09 18:41:34 +08:00
chenzhen
e7438c1518 MALI: add midgard src dir
Change-Id: I9938fe0377fc57e030c9e5109c216d6c62dbeef0
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2016-03-09 16:51:03 +08:00
chenzhen
d82d3c4def arm64: configs: rockchip_defconfig enable configs for MALI midgard.
Change-Id: Idec65015b7dfd73926e713a74daf15f46ea409eb
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2016-03-09 16:09:30 +08:00
chenzhen
770f0de976 arm64: dts: rk3366: add node of GPU.
Change-Id: Id545de4b7a2747e6b2c46cbedfdc160c3552c105
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2016-03-09 15:50:45 +08:00
chenzhen
2b339dd153 MALI: rockchip: not to use sg_dma_len.
When CONFIG_NEED_SG_DMA_LENGTH is enabled,
sg_dma_len is defined as follow :
"#define sg_dma_len(sg)             ((sg)->dma_length)"
But, dma_length is not used by the framework indeed.

Change-Id: Ibfd3223b38b96701f839cdc91207a49f20789fec
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2016-03-09 15:26:53 +08:00
Rocky Hao
9f751bed52 ARM64: dts: rockchip: add watchdog node for rk3366
Change-Id: I44f6fc21d9b55f2229fef0fd8fe0091367c2a8fa
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2016-03-09 14:30:38 +08:00
Sugar Zhang
fb2723796e ASoC: rt5640: fix rt5640_i2c_probe fail sometimes
if the codec is not initialized completely, i2c transfer will be
failed, so we just return PROBE_DEFER to let codec have chance to
be probed later.

Change-Id: I68922ffa7ddf048ebe3f95be9349d38b7b059982
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2016-03-09 14:27:37 +08:00
xiaoyao
91270fe3f5 ARM64: dts: rk3366-tb: Add wifi node and enable it
Change-Id: I7e76d78439828a21cdc2d936ee22eab7789a50e6
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2016-03-09 13:07:56 +08:00
xiaoyao
dbf5c5c4cd ARM64: dts: rk3366-tb: add sdio_pwrseq for sdio wifi
Change-Id: I0490827fa88a680cc449c367772bbc337ebe507e
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2016-03-09 13:06:14 +08:00
xiaoyao
f0d60cd9b0 arm64: configs: rockchip_defconfig enable wireless devices
Change-Id: Icc4126588bd69e6e7b09fe051a719d182ad9b087
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2016-03-09 12:14:32 +08:00
xiaoyao
e1ba522e71 net: rkwifi: initialize code to support rkwifi
Change-Id: Id8ad92690bb1565ecae45ecf1f9edba71292dfc0
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2016-03-09 11:57:39 +08:00
chenzhen
457a0b7e49 MALI: rockchip: tidy 'platform specific code'.
We use devfreq to implement DVFS of GPU, instead of 'legacy_dvfs'.

Change-Id: If5c8ef05c8f37c88a5c22779468b21315d71eda0
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2016-03-09 11:52:25 +08:00
Simon
8ad3d6962f iommu: rk-iovmm: fix back to back sg entries condition
Change-Id: Ie493d3d8b34ac4229b3a5a2a84cd52568425f106
Signed-off-by: Simon <xxm@rock-chips.com>
2016-03-09 09:29:00 +08:00
chenzhen
e0958c3066 MALI: rockchip: modify to build in kernel 4.4.
Change-Id: Ib462c42337e655607b2e222d7d97064dfc1c76c4
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2016-03-08 17:52:12 +08:00
chenzhen
b096c7187a MALI: rockchip: upgrade DDK to r8p0-02rel0.
Change-Id: I85a3bedf89a3fc27971b1d26e7bfa9a8bee32d06
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2016-03-08 17:34:30 +08:00
chenzhen
a9f9e723bc MALI: rockchip: upgrade to DDK r7p0-02rel0.
Conflicts:

	drivers/gpu/arm/midgard/mali_kbase_config.h

Change-Id: I2d93041a0525ce6f1399c3a456c4c8f7be22243e
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2016-03-08 17:31:21 +08:00
xiaoyao
5049902024 net: wifi: rockchip: update broadcom drivers for kernel4.4
Change-Id: I5a764afc5abdf8cae4ba12181ebd36a03cdcb110
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2016-03-08 17:25:42 +08:00
Huang, Tao
e089966464 Revert "UPSTREAM: regulator: core: avoid unused variable warning"
This reverts commit 40e4c35358.

Please refer to commit 70a7fb80e8
("regulator: core: Fix nested locking of supplies")

Change-Id: If0bee255621a7480cfc6fa232f65081c4d904897
2016-03-08 16:27:08 +08:00
David Wu
e18a0d0cd7 ARM64: dts: rockchip: add i2c2, i2c4 gpio func support for rk3366
Change-Id: I8a3c5dac5c23d90706c21ffb48f4ac15e4f1cffb
Signed-off-by: David Wu <david.wu@rock-chips.com>
2016-03-08 04:13:56 +08:00
David Wu
35053e7126 ARM64: configs: rockchip: add support i2c gpio config
Change-Id: If44b02f93559ddbbf8b266cc945b648d7cd7fffd
Signed-off-by: David Wu <david.wu@rock-chips.com>
2016-03-08 14:02:36 +08:00
Huang, Tao
aae68f3b3f arm64: configs: rockchip_defconfig enable CPU_FREQ_DEFAULT_GOV_INTERACTIVE
Change-Id: I7e241acad10a5b4dc2b7e46e75dfc4043e794f8f
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-03-07 21:11:42 +08:00
Huang, Tao
94c3274d64 arm64: configs: rockchip_defconfig enable ARM_CPUIDLE
Change-Id: I6d2181de4c9489da65117fa817942962b74469bf
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-03-07 18:11:11 +08:00
Huang, Tao
e440f60b33 arm64: configs: update rockchip_defconfig by savedefconfig
Change-Id: I5380b58e9053238f16ca8ed11f7c9459083e1798
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-03-07 18:03:14 +08:00
Rocky Hao
857ad0187f cpufreq: interactive: fix cpufreq object duplicate creatation in sysfs
[    4.216722] sysfs: cannot create duplicate filename '/devices/system/cpu/cpufreq'
[    4.233798] ------------[ cut here ]------------
[    4.244376] WARNING: at fs/sysfs/dir.c:31
[    4.253556]
[    4.256975] CPU: 3 PID: 1 Comm: swapper/0 Not tainted 4.4.0 #156
[    4.270730] Hardware name: Rockchip SDK tb board (DT)
[    4.282302] task: ffffffc039670000 ti: ffffffc039678000 task.ti: ffffffc039678000
[    4.299444] PC is at sysfs_warn_dup+0x5c/0x78
[    4.309422] LR is at sysfs_warn_dup+0x5c/0x78

Change-Id: Id21fe74dc082ec6c94fcb3e0cc11b78226549f7d
Fixes: bc68f6c4ef ("cpufreq: interactive: build fixes for 4.4")
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2016-03-07 17:49:18 +08:00
Wu Liang feng
275af0eee4 FROMLIST: usb: dwc3: Enable support for 64-bit system
Add 64-bit DMA operation support to the USB DWC3 driver.
First attempt to set the coherent DMA mask for 64-bit DMA.
If that failed, attempt again with 32-bit DMA.

Change-Id: I6d8e0e35ed606aa38d1dbadbb48f5629c1b39552
Signed-off-by: Thang Q. Nguyen <tqnguyen@apm.com>
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
(am from https://patchwork.kernel.org/patch/8109031/)
2016-03-07 15:26:35 +08:00
Wu Liang feng
bd88043dd7 FROMLIST: usb: dwc3: pass arch data to xhci-hcd child
The xhci-hcd child node needs to inherit archdata attribute to use
dma_ops functions and attributes. This patch enables the USB DWC3
driver to pass archdata attributes to its xhci-hcd child node.

Signed-off-by: Thang Q. Nguyen <tqnguyen@apm.com>

Change-Id: I82abc58fd8d01d2233499958713dd69ed58dedb5
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
(am from https://patchwork.kernel.org/patch/8109041/)
2016-03-07 15:26:00 +08:00
Andy Yan
f410957952 FROMLIST: ARM64: dts: rockchip: add syscon-reboot-mode DT node
Add syscon-reboot-mode driver DT node for rk3368 platform

Change-Id: I050579c2392fad6c7756d0d8a5dfc1a8a36023e4
Tested-by: Caesar Wang <caesar.upstream@gmail.com>
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2016-03-07 15:16:16 +08:00
David Wu
bd9e614eb8 ARM64: dts: rockchip: add gt9xx touchscreen support
need to modify the i2c4 scl and sda connection in hardware.

Change-Id: I57981a3891047412b9ea61112fbf5ff4a23223b3
Signed-off-by: David Wu <david.wu@rock-chips.com>
2016-03-07 15:12:33 +08:00
Wenlong Zhuang
8d9ad6296b video: rockchip: vop-lite: fix get clock source failed
Rename clock name and fix deadlock when VOP irqs are disabling.

Signed-off-by: Wenlong Zhuang <daisen.zhuang@rock-chips.com>
Signed-off-by: Xubilv <xbl@rock-chips.com>
Change-Id: Ib794128e9e0dda0fc7b4c48d52d196e8ba70c11d
2016-03-07 15:11:28 +08:00
John Youn
ebe05c6cd2 UPSTREAM: usb: dwc3: Fix assignment of EP transfer resources
The assignement of EP transfer resources was not handled properly in the
dwc3 driver. Commit aebda61871 ("usb: dwc3: Reset the transfer
resource index on SET_INTERFACE") previously fixed one aspect of this
where resources may be exhausted with multiple calls to SET_INTERFACE.
However, it introduced an issue where composite devices with multiple
interfaces can be assigned the same transfer resources for different
endpoints. This patch solves both issues.

The assignment of transfer resources cannot perfectly follow the data
book due to the fact that the controller driver does not have all
knowledge of the configuration in advance. It is given this information
piecemeal by the composite gadget framework after every
SET_CONFIGURATION and SET_INTERFACE. Trying to follow the databook
programming model in this scenario can cause errors. For two reasons:

1) The databook says to do DEPSTARTCFG for every SET_CONFIGURATION and
SET_INTERFACE (8.1.5). This is incorrect in the scenario of multiple
interfaces.

2) The databook does not mention doing more DEPXFERCFG for new endpoint
on alt setting (8.1.6).

The following simplified method is used instead:

All hardware endpoints can be assigned a transfer resource and this
setting will stay persistent until either a core reset or hibernation.
So whenever we do a DEPSTARTCFG(0) we can go ahead and do DEPXFERCFG for
every hardware endpoint as well. We are guaranteed that there are as
many transfer resources as endpoints.

This patch triggers off of the calling dwc3_gadget_start_config() for
EP0-out, which always happens first, and which should only happen in one
of the above conditions.

Fixes: aebda61871 ("usb: dwc3: Reset the transfer resource index on SET_INTERFACE")
Cc: <stable@vger.kernel.org> # v3.2+
Reported-by: Ravi Babu <ravibabu@ti.com>
Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
(cherry picked from commit c450960187)

Change-Id: I804cb4d2f3b79b3cfd4be5b0942ed6f866c1e580
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
2016-03-06 21:42:58 +08:00
Jianqiang Tang
6c7a659098 UPSTREAM: usb: dwc3: gadget: set the OTG flag in dwc3 gadget driver.
This patch is needed in order to pass one test case
defined in the OTG Automated Compliance Test specification.

Specification location:
http://www.usb.org/developers/onthego/otgeh_compliance_plan_1_2.pdf

This test case uses PET Tool, and PET Tool is one USB hardware
equipment provided by MQP Electronics.

Test case id is 6.8.3 B-UUT Bypass Capacitance.

We must set this otg flag in order to be able to return OTG
descriptor during enumeration, otherwise this test case with
failed with below error: "Get OTG descriptor request stalled".

Signed-off-by: Jianqiang Tang <jianqiang.tang@intel.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
(cherry picked from commit 6a4290cc28)

Change-Id: If264c2a878ee8520edc57876ab2325dce4ca869e
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
2016-03-06 21:41:09 +08:00
Felipe Balbi
6b51105e1c UPSTREAM: usb: dwc3: of-simple: fix build warning on !PM
if we have a !PM kernel build, our runtime
suspend/resume callbacks will be left defined but
unused. Add a ifdef CONFIG_PM guard.

Signed-off-by: Felipe Balbi <balbi@ti.com>
(cherry picked from commit 5072cfc40a)

Change-Id: I6a7ceb1a90162b132afce17423888ab0cbdf897b
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
2016-03-06 21:39:28 +08:00
John Youn
64f6e3af25 UPSTREAM: usb: dwc3: gadget: don't send extra ZLP
If the request->length is zero, a ZLP should already be sent due to that
and another ZLP is not needed to terminate the transfer.

Fixes: 04c03d10e5 ("usb: dwc3: gadget: handle request->zero")
Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
(cherry picked from commit d9261898a4)

Change-Id: Ib976552f93321f6ea52d3f0151c66fd6f2db8b17
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
2016-03-06 21:37:24 +08:00