Commit Graph

406680 Commits

Author SHA1 Message Date
Huang, Tao
f5905620fd Revert "phy: backport generic phy framework from kernel-3.18"
This reverts commit 23805582e3.
2015-11-11 14:22:45 +08:00
Huang, Tao
47e29b3e70 Revert "phy: merge and backport phy core from linux kernel 4.1"
This reverts commit 97c16b72f3.
2015-11-11 14:22:30 +08:00
Huang, Tao
c9caa1426f Revert "phy: phy-rockchip-usb: add support of rk33 usb phy"
This reverts commit 6d91a06b4e.

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

Conflicts:
	arch/arm64/configs/rockchip_defconfig
2015-11-11 14:21:06 +08:00
Chen Liang
d91ca21f9a ARM: rockchip: rk3228: implement function rk3228_restart
Change-Id: If6c5630a1ea9a8ebb95f527bd5d1aff082da079f
Signed-off-by: Chen Liang <cl@rock-chips.com>
2015-11-10 18:13:31 +08:00
Chen Liang
cbc7aedfc2 ARM: rockchip: rk3228: add cru definition
Change-Id: If9fef6aa30685b727f271644eafdebab2ba1e441
Signed-off-by: Chen Liang <cl@rock-chips.com>
2015-11-10 18:12:46 +08:00
Chen Liang
45081e2bc5 ARM: rockchip: rk3228: add efuse support
Change-Id: Ice2a00bd053d26303cc57c45fbc256b57eb95da0
Signed-off-by: Chen Liang <cl@rock-chips.com>
2015-11-10 18:04:17 +08:00
Roger Chen
a23d354fff net: rockchip: gmac: support RK3228
Change-Id: I1cf343d2d7768681b7ec2ad0d95484267d59b82b
Signed-off-by: Roger Chen <roger.chen@rock-chips.com>
2015-11-10 17:31:01 +08:00
Luca Porzio
c79431c702 mmc: remove bondage between REQ_META and reliable write
Anytime a write operation is performed with Reliable Write flag enabled,
the eMMC device is enforced to bypass the cache and do a write to the
underling NVM device by Jedec specification; this causes a performance
penalty since write operations can't be optimized by the device cache.

In our tests, we replayed a typical mobile daily trace pattern and found
~9% overall time reduction in trace replay by using this patch. Also the
write ops within 4KB~64KB chunk size range get a 40~60% performance
improvement by using the patch (as this range of write chunks are the ones
affected by REQ_META).

This patch has been discussed in the Mobile & Embedded Linux Storage Forum
and it's the results of feedbacks from many people. We also checked with
fsdevl and f2fs mailing list developers that this change in the usage of
REQ_META is not affecting FS behavior and we got positive feedbacks.
Reporting here the feedbacks:
http://comments.gmane.org/gmane.linux.file-systems/97219
http://thread.gmane.org/gmane.linux.file-systems.f2fs/3178/focus=3183

Change-Id: I2143841c439b47d6ce161ff3ad05277ea867f51b
Signed-off-by: Bruce Ford <bford@micron.com>
Signed-off-by: Luca Porzio <lporzio@micron.com>
Fixes: ce39f9d17c ("mmc: support packed write command for eMMC4.5 devices")
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2015-11-10 14:32:20 +08:00
xiaoyao
dc2d0dc624 ARM: dts: fix emmc/sdio/sd clkgates and offset for rk3228
Fixes: 2cb01afbb ("ARM: rk3228: dtsi: add SDCard/SDIO/eMMC ...")
Change-Id: Ie1fcd214d6dc3ec7e13ab54ada24dc71b8e7ffd3
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2015-11-10 11:48:15 +08:00
xiaoyao
0e522e603b ARM: dts: add sdmmc/sdio pinctrl for rk3228
Change-Id: I0c3f3159d46705de40ca6ff7de4a8aee6ea17a24
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2015-11-10 10:56:25 +08:00
xiaoyao
a3b0c6b8e2 mmc: rk_sdmmc: support RK3228 chip
Add a variable to distinguish between types of chips, eg:
DW_MCI_TYPE_RK3228. The purpose is to add a unique code
in the future.

Change-Id: I6608ae7af0579343cabe92deddefe73b8e5d2194
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2015-11-10 10:55:33 +08:00
Huang zhibao
8c16fc0cf1 arm: rockchip: rk3228: dts: add pwm regulator, i2c rtc, wifi & bt
Change-Id: I2836ddab4e214ec43c9969457b7209a6fe948184
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
2015-11-10 10:10:33 +08:00
Chen Liang
981250553d ARM: rockchip: rk3228: add grf definition
Change-Id: Ifea3e16e7d0141b09d9df26a247e884d0c9f72e7
Signed-off-by: Chen Liang <cl@rock-chips.com>
2015-11-10 09:21:25 +08:00
Huang, Tao
5013a8fe97 rk: restore file mode
Change-Id: I3ac6ae87fc7ed90fa5ece0b6cb0ffe1a2561fa1d
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-11-09 17:00:56 +08:00
Huang, Tao
6c49ea3d40 ASoC: restore spdif_receiver.c and spdif_transciever.c
Change-Id: I2eeca8b4be12c35bcc3d172f8b165c417a2561c8
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-11-09 16:32:40 +08:00
Huang Jiachai
e66d1eb972 rk_fb.h: remove multiple definitions
Change-Id: I34b7d0a4db251521693a5d13ace0d33ccad1717e
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2015-11-09 09:56:16 +08:00
Yunzhi Li
bd6af9ff78 ARM: dts: rk3228: add usb node
Change-Id: I4ccd1fb9ad2cd5b036d0cfde736fe990ad0673d0
Signed-off-by: Yunzhi Li <lyz@rock-chips.com>
2015-11-06 14:52:40 +08:00
Jaehoon Chung
60f8440c9b mmc: dw_mmc: fix the CardThreshold boundary at CardThrCtl register
According to DesignWare DoC file, CardThreshold bit should be
bit[27:16].
So it's correct to use (0xFFF << 16), not (0x1FFF << 16).

Change-Id: I184fff75e6e72624a22cdfc6b0ffcc236ffb07c2
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2015-11-06 11:40:30 +08:00
Tang Yun ping
f09cbe4c13 ARM: dtsi: rk3228: add dram timing node
Change-Id: Ieb7c43f6e546e75e72c7db99894d6ca0cfbb31a1
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2015-11-06 10:13:33 +08:00
Mark Yao
7c69b8f008 video: lcdc: rk3228: fix colorspace for output YCBCR
Change-Id: I192a85c6d60a09c5f9a80b518690f0aac025becd
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-11-06 08:36:28 +08:00
Mark Yao
245c3c536f video: lcdc: rk3228: add vop tvout support
Change-Id: Ibfa16c73735132e0a50f7b52efb75681e61d9b20
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-11-06 08:36:28 +08:00
Mark Yao
a60b6e8e10 video: lcdc: rk3228: fix interlace display
New version H/W don't need yszie div 2 anymore.

Change-Id: I1c8927ad5dd00fd1af16ef9ca60c9979b4db696e
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-11-06 08:36:27 +08:00
Mark Yao
2b0be80c6a video: hdmi: judge interlace mode from vmode bit mask
Vmode is a flag with bit mask, we can't judge interlace mode
from equal compare, need mask its bit.

Change-Id: Iad69bd52173c5ea179639deaff25f9a4ed3fc5d3
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-11-06 08:36:27 +08:00
Mark Yao
05d226be7e video: lcdc: judge interlace mode from vmode bit mask
Vmode is a flag with bit mask, we can't judge interlace mode
from equal compare, need mask its bit.

Change-Id: I0cc53503198f98dc58369f4c9e6dd78b47095968
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-11-06 08:36:27 +08:00
Mark Yao
849343d1a7 rk_fb: add RGB BT709/BT2020 format
Change-Id: I9581f78955c3efe77375bfa5e8ac571ac1d5aae4
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-11-06 08:36:26 +08:00
Mark Yao
ddcff9a5c3 rk_fb: set interlace flag for dts timing
Change-Id: I8711cefdf224af88214ed39d9ae225be8bc62304
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-11-06 08:36:26 +08:00
zyc
67214f7efa camera: rk_camsys: rk3288: change gpio map method in camsys_gpio.h
rk3288 gpio bank0 only has 24 pins not 32 pins,so modify the gpio map
method for rk3288.

Change-Id: I1d59b25d9acb0f51f9a1ad8ec74db2952534b1f2
Signed-off-by: ZhongYichong <zyc@rock-chips.com>
2015-11-05 14:14:45 +08:00
Zhaoyifeng
31d8fc59d8 ARM: dts: rk3228-sdk: enable nandc
Change-Id: I449544595eb93f6cb9d7154aced253bebe1dceb7
Signed-off-by: Zhaoyifeng <zyf@rock-chips.com>
2015-11-04 12:03:12 +08:00
Zhaoyifeng
f5509c80dd ARM: dts: rk3228: add nandc support
Change-Id: I40ddba4f4ce56a34ca5e448f1dfbcc06c2ad445c
Signed-off-by: Zhaoyifeng <zyf@rock-chips.com>
2015-11-04 11:35:02 +08:00
Romain Izard
6a6bfd15df mmc: Allow forward compatibility for eMMC
As stated by the eMMC 5.0 specification, a chip should not be rejected
only because of the revision stated in the EXT_CSD_REV field of the
EXT_CSD register.

Remove the control on this value, the control of the CSD_STRUCTURE field
should be sufficient to reject future incompatible changes.

Change-Id: Ib69314bee902a4036183ef9a3565d9f0423ec971
Signed-off-by: Romain Izard <romain.izard.pro@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2015-11-04 09:45:30 +08:00
Jianhong Chen
8777e58b88 ARM: dts: rk3228-sdk: enable psci
Change-Id: I0d965a15e2938f8b54d056d0b7e21ec9ce33ee57
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-11-02 14:56:04 +08:00
Jianhong Chen
2aef250139 ARM: dtsi: rk3228: add psci support
This is just add psci code into kernel, if you want to enable psci,
you must add psci=enable in the Command Line.

Change-Id: Iaf0e0116cbaba0d210cb99d59c0ee82768bf54bb
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-11-02 14:56:03 +08:00
Jianhong Chen
9ad64eb2bf ARM: rockchip: support arch32 psci suspend
Change-Id: I0341d1c019b8c00376af574cd9f51e87fafa8601
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-11-02 14:56:03 +08:00
Huang zhibao
11d43ed737 arm: rockchip: rk3228: dts: add pwm remote-ctrl
Change-Id: Iccb31c2472238887b24ca61d7c7bdcb54a1e0778
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
2015-11-02 09:40:33 +08:00
Zheng Yang
209c26642c video: rockchip: fb: delete DISPLAY_POLICY_BOX_TEMP
Change-Id: I59147b833754d5417d2813eb902923b4f700a9b0
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-10-30 16:52:16 +08:00
Zheng Yang
83611653ad ARM: dts: rk3288-box: set disp-policy to DISPLAY_POLICY_BOX
Change-Id: I3ede07d2c26aaef44ec7165353a3b3d6a6177f6e
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-10-30 16:47:59 +08:00
Zheng Yang
6b99398a8e ARM64: dts: rk3368-box: set disp-policy to DISPLAY_POLICY_BOX
Change-Id: Ib97c581b7488926d5f4203ea1d61ff706118bcc5
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-10-30 16:42:54 +08:00
David Wu
67e6de73b6 i2c: rockchip: fix power off issue for rk818
The power off sequence is behind of i2c bus shutdown func,
it would prevent the rk818 to do power off action. The irq was
disabled when rk818 power off, it could let rk818 to power off
through i2c bus.

Change-Id: Ia6155f137ab2fa36dbe19e06878b0228670b1398
Signed-off-by: David Wu <wdc@rock-chips.com>
2015-10-30 16:25:50 +08:00
Shen Zhenyi
22cd957182 hdmi: cec: add HDMI_IOCTL_CECWAKESTATE
android HDMI CEC HAL need to know cec state when resume,
so we add the HDMI_IOCTL_CECWAKESTATE.

Change-Id: Iff942c6085d10891200cd873cc2ba53e9a2d6cad
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
2015-10-30 15:24:38 +08:00
Xiao Feng
40b2e9e44d arm64: rockchip: rk3368: dts: modify dvfs_table for core
Change-Id: I73c4a277b9fa38160f5206ebd8603984535f0ade
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-10-30 11:29:00 +08:00
David Wu
d189d8cf8c pinctrl: rockchip: fix crashed issue during pinctrl suspend
if the chip was rk3288, it didn't use pinctrl-rk3368.c,
but pinctrl-rockchip.c, driver of pinctrl-rk3368 was not registered.
It would make the NULL pointer at pinctrl-rk3368 suspend func.

Change-Id: I09dd4fb9b8bf001a4222ed9bef62347785b9906f
Signed-off-by: David Wu <wdc@rock-chips.com>
2015-10-30 09:11:59 +08:00
chenzhen
1009af00c3 rk312x, mali_400: upgrade rk_ko_ver to 5.
Change-Id: If1851d44e75ef16e1b916ecb910526f749822be0
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2015-10-29 16:29:09 +08:00
Jianqun Xu
773a19827f ion: rockchip-ion: add API to set memory region secured
Add ion ioctl command -ION_IOC_SET_SECURED
for user to set memory region secured.

Change-Id: Ic4a7432ab8d2fd9f60fdfe7457e92f7c99768e12
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2015-10-29 09:36:18 +08:00
Jianqun Xu
c35ed767ce ARM: rockchip-psci: add interface for ion to set memory secured
Add function "psci_set_memory_secure" for device to set memory
region secured.

Change-Id: Ife807c91d37ae66a5e1a0a3d8263c68cd601937d
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2015-10-29 09:35:34 +08:00
chenzhen
1804151a2e rk312x, mali_400: make it more 'difficult' to dump down in mali_dvfs_list.
Change-Id: If5fd646aa6ca7f7383db70c84ff71f1570fe23b1
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2015-10-28 17:18:10 +08:00
Huang, Tao
d852f860d0 ARM: rockchip: rockchip_defconfig enable IP_MULTICAST
Change-Id: Ic40cb94753f9fedc548ae6a77b36d0bed5754d88
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-28 16:43:20 +08:00
Huang, Tao
dd52f9d076 ARM: rockchip: rockchip_defconfig enable UID_CPUTIME
Change-Id: Ifb92e539e868ed15561ae8698b226422fae5fee8
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-28 16:43:10 +08:00
Huang, Tao
7f34bc7954 ARM: rockchip: rockchip_defconfig enable kernel-mode NEON and NEON based cypto
Change-Id: Ie3975cd780bbbedaaa2e3384d49e9f90734b65fe
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-28 16:36:06 +08:00
Jianqun Xu
f6e70b0e4e ARM: rockchip-psci: add function id for secure memory set
Change-Id: I73c0b2c603a4b72f07804c684cd89bc82e5529c4
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2015-10-28 15:53:47 +08:00
Jianhong Chen
3be2246332 ARM: rockchip: psci support arch32 and arch64 smc call
Change-Id: I736c6c15cbb41d52aa9ef1e98cb9ebdd6ac9ebfc
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-10-28 15:06:53 +08:00