Commit Graph

406390 Commits

Author SHA1 Message Date
Huang, Tao
13b4f3e372 arm64: dts: Makefile: Add more rockchip target in dtbs list
Change-Id: I85902304639d6c938df2ff3f1702d5a2531b26d1
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-10 19:43:29 +08:00
Huang, Tao
e9bc5b18e5 ARM: dts: Makefile: Add more rockchip target in dtbs list
Change-Id: Ieaa459bed8b3a6f6b67b52c78d4a37d9e50836d3
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-10 17:47:34 +08:00
zhangqing
741e50a5c7 rk3228: clk: enable aclk_dmac_bus when clk init
modify enable aclk_dmac_bus control bits.
make aclk_dmac_bus enabled when clk init.

Change-Id: I670dbaabcf9ba6cf9ce683090b49c72e4cbd0410
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
2015-10-10 17:15:34 +08:00
Xiao Feng
f399038b27 arm: rockchip: rk3228: dts: add DMAC support
Change-Id: Ic6f8a106e8ecdcdf153873a65b90567b3edb48ad
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-10-10 15:32:26 +08:00
Shen Zhenyi
172981dc89 video: rockchip: lcdc: 3288: set iommu_status to 0, when all layer closed
Change-Id: I494c54017be89e48836870f015f420a0c148c980
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
2015-10-09 17:13:30 +08:00
xxh
162dcb32d0 esp8089: fix ESP8089 wifi can not work when use CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOT
Change-Id: Ib08bcc45f3c11e2de0f29c9739772d56071d467f
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
2015-10-09 17:12:36 +08:00
Zheng Yang
fa03aa63c8 video: rockchip: hdmi: v2: get phy register setting from dts
We can configurate phy setting in dts node "rockchip,phy_table"
with following format:

<maxfreq pre-emphasis slopeboost clklevel data0level data1level data2level>

Phy setting table must list from low freq to high freq and cover
all supported frequency, for example:

&hdmi {
	status = "okay";
	rockchip,phy_table =
		<165000000 0 0 17 17 17 17>,
		<340000000 0 0 14 17 17 17>,
		<594000000 0 0 9 17 17 17>;
};

If dts node is not exist, we use default setting defined in code.

Change-Id: I06731419057a2a8cf4d210bf566b1206edc39ea1
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-10-08 16:45:40 +08:00
Zheng Yang
98c0900674 video: rockchip: hdmi: fix error of 8/10 bit color depth selection
Change-Id: I3c9c35dced4db9b5f103d0d3de482f33d7257ae0
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-10-07 16:45:22 +08:00
Zheng Yang
d50205d8d2 video: rockchip: hdmi: redefine input/output color relationship
For YCbCr420 mode, input color and output color must be same as
HDMI_COLOR_YCBCR420.

Change-Id: I302c1a0572d706abdebf5d2d35bd100e0242edf9
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit c3ed688f02f76dfc5533124c41bbb8c016e3cc97)
2015-10-07 16:44:43 +08:00
Mark Yao
9d7998a86e rk3288: dts: support popmetal opensource board
Change-Id: I42fd55bfa73d25643a9e0435af93e311d3ed3206
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-10-07 15:39:51 +08:00
Mark Yao
6689f7b14a lcd: vga: add some vga timing
Change-Id: I6e54d0025b4622cdfcc3a4ceac443e441c7e1742
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-10-07 15:39:45 +08:00
Zheng Yang
a6aa91559f video: rockchip: lcdc: 312x: output color according to input screen parameter
Change-Id: I3d9b8982a247462ee3a6a0e00636881d35be9b4b
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-09-30 18:33:53 +08:00
David Wu
d07484d381 rk3x: i2c: prevent i2c xfer, when i2c shut down.
if rk818 driver's shutdown func called, it should not do i2c transfer.
And rk818's shutdown func is behind of i2c driver's shutdown func.

Change-Id: Iec96ad4640894f604493d8c764a2f98e75397885
Signed-off-by: David Wu <wdc@rock-chips.com>
2015-09-30 17:09:43 +08:00
Mark Yao
fb8635b535 rk3228: lcdc: default build-in rk3228 vop
Change-Id: Ia0d9ac5000122d8f782b4eebb21af3f427119978
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-09-30 14:28:10 +08:00
Mark Yao
d1a15dd76a rk3228-fpga: dts: add series nodes for display
rk_fb display need ion and backlight node,
so add ion and backlight node.

Change-Id: I89ed88e429a2ea56e19bc12bc818ffba71f9e3b2
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-09-30 14:19:04 +08:00
Mark Yao
8fb1cd81b6 Documentation: add rockchip,rk3228-lcdc to rockchip_lcdc.txt
Change-Id: I0c81e8d340fd3d714dc1e85e0198bdee7dfd5bd6
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-09-30 14:15:08 +08:00
Mark Yao
6360549b2c rk_fb: video: add rk3228 vop support
Change-Id: Iaa8ea3da4de2746c4cff5e0e820b8f0508c44d55
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-09-30 14:15:01 +08:00
Mark Yao
9216969855 rk_fb: add output colorspace define
Change-Id: I2507bd1b17e782501fd7b4cb4f67d5ddbb45da90
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-09-30 14:03:34 +08:00
Mark Yao
5524124f21 rk_fb: add bt2020/bt709/bt601 colorspace support
Change-Id: I55177d4e40bb8111787efe654f18e3e21c016491
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-09-30 13:54:36 +08:00
Zhangbin Tong
1b7fb3f265 power_supply: cw2015_battery: Add msleep(200) when recover from sleep mode
Change-Id: I66f0ee349622f24646376822948d331922676ad3
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2015-09-29 11:21:48 +08:00
Huang Jiachai
519a6f8b7d dtsi: lcd-F402: CABC lut need the last 128 gray
Change-Id: Iff405b5f377826b6f6369f511b49689155f5acff
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
(cherry picked from commit c7d371ea3c2485a6b52b3bab51d1f6da5533f229)
2015-09-29 11:16:28 +08:00
Huang Jiachai
da6f2cbfc8 video: rockchip: lcdc: 3288: update CABC lut addr
Change-Id: Ifcd0e7c76962fff628c2c372057937809ee850da
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
(cherry picked from commit 92e3d58d7ffc7d0687e032409de56b93f2e30d51)
2015-09-29 09:30:37 +08:00
Zhangbin Tong
1df21c1635 power-supply: cw2015_battery: fix incorrect bracketing on a test
Change-Id: Id4910e148852ab64d9396b17d3daf403d1fcb4b2
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2015-09-29 09:22:34 +08:00
Huang, Tao
91c0b3f7a5 Merge tag 'lsk-v3.10-15.09-android'
LSK Android 15.09 v3.10
2015-09-28 19:16:34 +08:00
Zhangbin Tong
4e5b768771 power_supply: cw2015_battery: code style fixes
Change-Id: I3cf0af574e11b7fd32adaaecbd6dbe83e72c83c9
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2015-09-28 15:49:22 +08:00
alpha.lin
cfaf327bab IEP: add capabilities query interface
add capabilities query interface for userspace to query
iep device feature in current soc.

Change-Id: I377e686b2ce0357aa75445e4e47e9e4883a077ae
Signed-off-by: alpha.lin <alpha.lin@rock-chips.com>
2015-09-23 18:32:40 +08:00
Mark Yao
c8c06956fb rk_fb: rename yuv444 10bit
HAL_PIXEL_FORMAT_YCrCb_420_SP_10 means yuv444 10bit format, but its
name looks like yuv 420sp 10bit, that is wrong.

Change-Id: I71db8577df6e3d912427ddafe057905870622ab2
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-09-23 18:30:30 +08:00
Alpha Lin
44a10edbee IEP: re-caculate the uv address when 4k video input in iommu enable case.
In above case, old code will generate a fault address for
uv address if 4k video input or output.

Change-Id: I22e9793fbaa2da250097ba69a3fd4fdf58585b78
Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-09-23 18:13:18 +08:00
alpha.lin
0eb015892d VPU: Support both syscon and virtual address while access to grf resource.
If CONFIG_MFD_SYSCON macro define but no grf resource
define in dts will cause a error before this revision.

Change-Id: I70432530fba9c7a5d0b8f5a0c996d67237eb8198
Signed-off-by: alpha.lin <alpha.lin@rock-chips.com>
2015-09-23 18:09:36 +08:00
Huang Jiachai
7fde8d2fb3 video: rockchip: lcdc: 3288: update for VOP YUV420 to HDMI
Change-Id: I3dbe2208e10318acf99b66e858d853c3d4efab04
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2015-09-22 19:03:41 +08:00
Huang Jiachai
db350252e2 video: rockchip: lcdc: 3288: delele some special config for vop full v1.0
Change-Id: Iec4db13e5cde5567d9c9a96f3e063ceb3656b256
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2015-09-22 14:37:45 +08:00
Huang Jiachai
5f87823a49 video: rockchip: lcdc: 3288: update CABC config
Change-Id: I88dd84335943580cf81850cffe530ba73190fa7e
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2015-09-22 14:37:17 +08:00
Wu Liang feng
591df7e27b usb: gadget: accessory: add compatibility ioctl
Change-Id: I301c1f2f17c906d0a3912248fa16bc20b4a32b3c
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
2015-09-22 11:42:59 +08:00
Zheng Yang
9ce6f6b608 video: rockchip: hdmi: 3288/3368: set ddc clock to 50KHz.
Change-Id: I00ba32eb9115fe63606b6ccb441ca3b7e3378880
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-09-21 11:04:18 +08:00
Huang Jiachai
d90ec2f74e dtsi: lcd-F402: update cabc gamma lut
Change-Id: I799d6f607b953912755a4a6517b89a0bd659e6cc
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2015-09-21 10:23:30 +08:00
Huang Jiachai
662c3e55e3 video: rockchip: fb: vop driver struct select depend on lcdc id from extent screen
Change-Id: Ied1a53b86ee2e524707a017ba65cd5e648e93bae
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2015-09-21 10:23:29 +08:00
Huang Jiachai
4242177a79 video: rockchip: fbsys: add node to display a picture
1. su & stop;
    2. copy the picture bin to /data/fb0.bin;
    3. echo "n xsize ysize format" > /sys/class/graphics/fb0/dsp_buf;

    ps:
	a. n is the number of picture
	b. xsize and ysize is the picture resolution
	c. format:
	     RGBA=1,RGBX=2,RGB=3,YUV420_SP=17

Change-Id: Id256bee73958b6ab6250a17a723b0b73e7197874
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2015-09-21 10:23:15 +08:00
Chen Liang
f1eb385d72 rk3228: add dts file for sdk
Change-Id: I628f67408e84974d88645363140f77b887143658
Signed-off-by: Chen Liang <cl@rock-chips.com>
2015-09-18 10:01:08 +08:00
Huibin Hong
812c5163e7 rk3368.dtsi: fiq debug baud rate comment, change 115000 to 115200
Change-Id: I55fe0e8f5cae2d5aa16952e9612331ecc928335d
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2015-09-17 19:04:26 +08:00
Chen Liang
8446bec195 rk3228: initialize platform data
Change-Id: Id7fd0d98ef70641a62bd8520b72214141b5cf199
Signed-off-by: Chen Liang <cl@rock-chips.com>
2015-09-17 18:54:55 +08:00
Huang Jiachai
6631b869a9 video: rockchip: lcdc: 3288: add support yuv420 output
Change-Id: Id1cdc222774b37594eec3ed15633f9c138e6e9b1
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2015-09-17 16:43:12 +08:00
Huibin Hong
7498ed6627 fiq debugger: driver update
1. Change fiq debugger trigger mode, enter “fiq” instead of
F5 with SecureCRT

Change-Id: I3b52ad435af3211675a8416c6e016147886def8d
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2015-09-16 19:45:54 +08:00
Zheng Yang
dbb4cc8d6e video: rockchip: fb: recalculate logo offset to match new screen size
Change-Id: I9f62088f4d0868a9284d1794718da8f5a044f24a
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-09-16 10:33:06 +08:00
Zheng Yang
44bc4fd736 video: rockchip: lcdc: 3288/3368: read screen regs in uboot mode
Change-Id: I36db50471140d041fd0220283bc4e6ce59ec9d74
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-09-16 10:31:42 +08:00
Tang Yun ping
52f8f5cff0 rk3368 ddr: add configure ddr timing function
1.add the function of configure ddr timing such us sr_idle, pd_idle, odt
disable frequency, dll bypass frequency, odt strength, driver strength in dts.
2.make sure commit 8be554a502 ("rk3368 dts: add ddr timing node in
rk3368.dtsi" add ddr timing node in dts that user can configure ddr timing in
dts file.) was merged.
3.bl30 must update to rk3368bl30_v2.11.bin.

Change-Id: Ie8ae559c8128eb01788271a4333c465e21954ab1
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2015-09-15 16:30:38 +08:00
Xiao Feng
1a1394ca73 dvfs: rockchip: modify the pvtm_info of RK3368_v0
Change-Id: If3216b4d8d220411e0c54a657357187315a5d4b5
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-09-15 15:51:18 +08:00
zhangqing
cccf1792d7 pmic: rk808: slove set voltage error
rk808 setting voltage had a overshoot question
so we set voltage must step by step.
support 12.5mv/step.

Change-Id: Idfce7b57d6717e51afaff2c170eff7bd16de23af
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
2015-09-15 15:49:20 +08:00
Chris Zhong
0f3661b46e ARM: dts: fix some code style issues
Change-Id: I3f1f5637729171079ca7d108ba59521018c9561d
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
2015-09-15 15:09:36 +08:00
Zheng Yang
f4859250d6 video: rockchip: hdmi: 3368: support vesa dmt mode
Change-Id: Ic2a910cd50beb9b49baff7bd732f6c1bdd78790f
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-09-15 14:10:01 +08:00
Zheng Yang
ae4c2644f3 video: rockchip: hdmi: 3288/3368: phy pll support more vesa dmt clock
Change-Id: I7382e5554664f2014bb5aa579a2524bf1738d971
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-09-15 14:09:08 +08:00