roger [Thu, 4 Sep 2014 05:42:36 +0000 (13:42 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
lintao [Thu, 4 Sep 2014 03:46:43 +0000 (11:46 +0800)]
mmc: remove unused muti calc
CMY [Thu, 4 Sep 2014 03:39:36 +0000 (11:39 +0800)]
rk: ion: shrink memory more positive
roger [Thu, 4 Sep 2014 03:40:41 +0000 (11:40 +0800)]
ethernet:gmac: pull low reset pin when suspend for saving power consumption
roger [Thu, 4 Sep 2014 03:27:07 +0000 (11:27 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
roger [Thu, 4 Sep 2014 03:27:02 +0000 (11:27 +0800)]
ethernet:gmac: add aclk_mac in dts for rk312x
zwl [Thu, 4 Sep 2014 01:25:24 +0000 (09:25 +0800)]
rockchip:hdmi: modify the screen to remove when hdmi remove
hjc [Thu, 4 Sep 2014 00:48:25 +0000 (08:48 +0800)]
rk312x lcdc: fix compile error
zwl [Wed, 3 Sep 2014 14:09:00 +0000 (22:09 +0800)]
rk fb: fix hdmi disp err when dts iommu is disable if disp mode is DUAL
wlf [Wed, 3 Sep 2014 12:00:50 +0000 (20:00 +0800)]
USB: fix usb ep0 OUT setup bug.
In ep0_complete_request, do setup in status phase
in DMA mode for ep0-OUT. It can solve that usb RNDIS
unable to connect with win7 or win8.
hjc [Wed, 3 Sep 2014 10:15:13 +0000 (18:15 +0800)]
rk312x lcdc: add support hwc layer
yxj [Wed, 3 Sep 2014 10:10:30 +0000 (18:10 +0800)]
rk3288 lcdc: add dsp_lut adjust support
yxj [Mon, 18 Aug 2014 12:12:35 +0000 (20:12 +0800)]
add vga support on rockchip platform
zyc [Wed, 3 Sep 2014 10:01:48 +0000 (18:01 +0800)]
rk312x : cif : cif driver v0.0x1.4
zyc [Wed, 3 Sep 2014 02:58:58 +0000 (10:58 +0800)]
rk312x : cif : cif driver v0.0x1.3
wdc [Wed, 3 Sep 2014 01:23:39 +0000 (09:23 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
wdc [Wed, 3 Sep 2014 01:21:24 +0000 (09:21 +0800)]
rk3036: fix wifi type error
lyz [Tue, 2 Sep 2014 12:34:28 +0000 (20:34 +0800)]
rk312x: usb power optimize by turning off differential receiver in suspend mode
许盛飞 [Tue, 2 Sep 2014 11:51:09 +0000 (19:51 +0800)]
pwm: to solve the bug :
[10:33:29:984]<4>[ 127.237239] [<
c07b5200>] (__mutex_lock_slowpath+0x1c0/0x22c) from [<
c07b529c>] (mutex_lock+0x30/0x48)
[10:33:30:000]<4>[ 127.237255] [<
c07b529c>] (mutex_lock+0x30/0x48) from [<
c057d32c>] (clk_prepare_lock+0x48/0xe0)
[10:33:30:015]<4>[ 127.237269] [<
c057d32c>] (clk_prepare_lock+0x48/0xe0) from [<
c057eea4>] (clk_prepare+0xc/0x24)
[10:33:30:031]<4>[ 127.237285] [<
c057eea4>] (clk_prepare+0xc/0x24) from [<
c0282df8>] (rk_pwm_config+0x20/0x74)
[10:33:30:031]<4>[ 127.237300] [<
c0282df8>] (rk_pwm_config+0x20/0x74) from [<
c0281904>] (pwm_config+0x54/0x60)
[10:33:30:031]<4>[ 127.237317] [<
c0281904>] (pwm_config+0x54/0x60) from [<
c02c0528>] (pwm_regulator_set_voltage+0xd0/0xf4)
zsq [Tue, 2 Sep 2014 10:04:16 +0000 (18:04 +0800)]
fix rga_plus rgb2yuv reg error
hjc [Tue, 2 Sep 2014 09:48:46 +0000 (17:48 +0800)]
audio: rk3036 codec: add init codec sample clock
hjc [Tue, 2 Sep 2014 07:48:42 +0000 (15:48 +0800)]
audio: rk3036 codec:
add rk3036 sound card unfinished function, If not,it not to
set I2S clk and div,and lead to no sound on some TV.
许盛飞 [Tue, 2 Sep 2014 07:07:26 +0000 (15:07 +0800)]
rk312x: not gating gpios clock
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
Zheng Yang [Tue, 2 Sep 2014 06:56:20 +0000 (14:56 +0800)]
rk3036/rk3128 tve: use module_init.
张晴 [Tue, 2 Sep 2014 06:11:51 +0000 (14:11 +0800)]
rk312x:clk:support clk_gpu parent can select clk_cpll
zyc [Tue, 2 Sep 2014 03:59:50 +0000 (11:59 +0800)]
rk312x : cif : cif driver v0.0x1.2
zyc [Tue, 2 Sep 2014 03:16:46 +0000 (11:16 +0800)]
rk312x : cif : cif driver v0.0x1.0
lxt [Tue, 2 Sep 2014 03:02:40 +0000 (11:02 +0800)]
rk312x : close i2s0 which not used
张晴 [Tue, 2 Sep 2014 01:44:26 +0000 (09:44 +0800)]
rk312x:clk:enable aclk_vio1_niu when clock init
许盛飞 [Tue, 2 Sep 2014 00:39:48 +0000 (08:39 +0800)]
rk3128: add rk3128box suspend dts config
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
许盛飞 [Mon, 1 Sep 2014 13:39:10 +0000 (21:39 +0800)]
rk3126suspend: arm continuous power-supply in suspend
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
黄涛 [Mon, 1 Sep 2014 13:11:13 +0000 (21:11 +0800)]
ARM: rockchip: rockchip_defconfig: enable ISO9660_FS and UDF_FS
li bing [Mon, 1 Sep 2014 11:57:51 +0000 (19:57 +0800)]
rk3128-box: arm->1.2g, gpu=480M.
hjc [Mon, 1 Sep 2014 11:38:15 +0000 (19:38 +0800)]
rk312x lcdc: win1 empty irq
hjc [Mon, 1 Sep 2014 10:28:12 +0000 (18:28 +0800)]
rk hdmi: add display_show_debug to fix warning
张晴 [Mon, 1 Sep 2014 08:41:07 +0000 (16:41 +0800)]
rk312x:rt5025:updata rt5025 drivers to 1.1.1_R
张晴 [Mon, 1 Sep 2014 08:04:25 +0000 (16:04 +0800)]
rk312x:clk:enable hclk_crypto when clock init
lintao [Mon, 1 Sep 2014 04:07:01 +0000 (12:07 +0800)]
mmc: update rto for cmd to CMD_FUNC
zwl [Sat, 30 Aug 2014 09:52:32 +0000 (17:52 +0800)]
rk312x:pinctrl: remove unsupport drive prop at GPIO2 pins
zwl [Sat, 30 Aug 2014 08:42:05 +0000 (16:42 +0800)]
rk312x:dts: modify hdmi dt node status at different dts
zwl [Sat, 30 Aug 2014 08:23:34 +0000 (16:23 +0800)]
rk312x/rk3288:lcdc: add win empty irq debug
zsq [Sat, 30 Aug 2014 01:14:42 +0000 (09:14 +0800)]
fix rga driver mmu table malloc crash bug
黄涛 [Fri, 29 Aug 2014 11:14:15 +0000 (19:14 +0800)]
ARM: rockchip: rk3288 better support eFuse init
黄涛 [Fri, 29 Aug 2014 11:06:40 +0000 (19:06 +0800)]
ARM: rockchip: fix common.h checkpatch warning
zhangqing [Fri, 29 Aug 2014 11:00:44 +0000 (19:00 +0800)]
rk312x:clk:not enable some clks when clock init
Zheng Yang [Fri, 29 Aug 2014 10:09:50 +0000 (18:09 +0800)]
rk3128-box.dts: only change ddr freq when suspend.
zwl [Fri, 29 Aug 2014 09:40:04 +0000 (17:40 +0800)]
rk312x dts: add set fb disp-mode prop
zwl [Fri, 29 Aug 2014 09:25:29 +0000 (17:25 +0800)]
rk312x lcdc: add get frame done time at rk312x_lcdc_isr function
hjc [Fri, 29 Aug 2014 08:54:27 +0000 (16:54 +0800)]
rk3036 hdmi: add debug interface
CMY [Fri, 29 Aug 2014 07:20:08 +0000 (15:20 +0800)]
rk: gpu: print more debug info for Android's memtrack
hjc [Fri, 29 Aug 2014 06:17:55 +0000 (14:17 +0800)]
rk3036 hdmi: fix audio abnormal when change video mode
Zheng Yang [Fri, 29 Aug 2014 06:31:38 +0000 (14:31 +0800)]
rk312x tve: improve electrical characteristics: K factor、
luminance nonlinearity and multiburst.
Zheng Yang [Fri, 29 Aug 2014 06:15:30 +0000 (14:15 +0800)]
fb: disable ion_unmap_iommu to improve iommu efficiency.
lyz [Fri, 29 Aug 2014 03:00:46 +0000 (11:00 +0800)]
usb: fix host20 clk gate
wdc [Thu, 28 Aug 2014 12:06:09 +0000 (20:06 +0800)]
rk3036: gpio0 clk should be enable for voltage adjust
wdc [Thu, 28 Aug 2014 11:23:48 +0000 (19:23 +0800)]
rk3066: fix clk_sel10 register error
Signed-off-by: wdc <wdc@rock-chips.com>
ljf [Thu, 28 Aug 2014 08:46:01 +0000 (16:46 +0800)]
rk312x: vpu select vdpu clk by default
陈亮 [Thu, 28 Aug 2014 08:39:11 +0000 (01:39 -0700)]
rk312x: disable unused clk
Signed-off-by: 陈亮 <cl@rock-chips.com>
Zheng Yang [Thu, 28 Aug 2014 08:13:18 +0000 (16:13 +0800)]
rk3036/rk312x tve: revert to module_init.
wdc [Thu, 28 Aug 2014 07:56:21 +0000 (15:56 +0800)]
rk3288: fix i2c1 and i2c2 gating error
wdc [Thu, 28 Aug 2014 07:51:20 +0000 (15:51 +0800)]
rk3036: Add pll slow mode, clock gating
Signed-off-by: wdc <wdc@rock-chips.com>
typ [Thu, 28 Aug 2014 04:51:50 +0000 (12:51 +0800)]
rk312x DDR:support LPDDR2
li bing [Thu, 28 Aug 2014 04:03:42 +0000 (12:03 +0800)]
wifi->esp8089: del 'INIT_DATT_CONF' config.
陈亮 [Thu, 28 Aug 2014 01:39:34 +0000 (18:39 -0700)]
rockchip: optimize pvtm test
Signed-off-by: 陈亮 <cl@rock-chips.com>
CMY [Thu, 28 Aug 2014 01:21:53 +0000 (09:21 +0800)]
rk: ion: Add IBUF debug info to check memory shared in vmalloc heap
陈亮 [Wed, 27 Aug 2014 13:10:33 +0000 (06:10 -0700)]
rockchip: add pvtm support and pvtm test
Signed-off-by: 陈亮 <cl@rock-chips.com>
luowei [Wed, 27 Aug 2014 10:56:41 +0000 (18:56 +0800)]
enable ddr auto-freq
Zheng Yang [Wed, 27 Aug 2014 10:33:03 +0000 (18:33 +0800)]
1. rk3128-box.dts: enable tve.
2. rk_fb: set_par did not covert display window infomation set from user space to
screen size, it will be calculate in user space.
zyk [Wed, 27 Aug 2014 08:40:02 +0000 (16:40 +0800)]
vtl tp firmware: move to dts
CMY [Wed, 27 Aug 2014 03:25:46 +0000 (11:25 +0800)]
rk: memory: set vmalloc size to 496MB by default, so:
1. if memory is 256MB, then: 256MB(lowmem)+744MB(vmalloc)+0MB(highmem)
2. if memory is 512MB, then: 512MB(lowmem)+488MB(vmalloc)+0MB(highmem)
3. if memory is large then 512MB, then: 512MB(lowmem)+488MB(vmalloc)+other(highmem)
li bing [Wed, 27 Aug 2014 05:47:38 +0000 (13:47 +0800)]
wifi->esp8089: open the 'DLOOKAHEAD'.
张晴 [Wed, 27 Aug 2014 03:04:30 +0000 (11:04 +0800)]
rk312x:clk:solve disable clk unused
zwl [Tue, 26 Aug 2014 14:11:14 +0000 (22:11 +0800)]
rk312x:lcdc: fix get dsp info err
zwl [Tue, 26 Aug 2014 12:16:31 +0000 (20:16 +0800)]
rockchip:lcdc: add set default fb_win_map order at dts
li bing [Tue, 26 Aug 2014 08:14:21 +0000 (16:14 +0800)]
rk3128 box: ap6210 : bluetooth to work normally.
陈亮 [Tue, 26 Aug 2014 06:20:16 +0000 (23:20 -0700)]
rk312x: since iommu is ok, set ion_cma size to 8M for cif
Signed-off-by: 陈亮 <cl@rock-chips.com>
陈亮 [Tue, 26 Aug 2014 06:12:02 +0000 (23:12 -0700)]
rk312x: pmu reset by second global soft reset
Signed-off-by: 陈亮 <cl@rock-chips.com>
li bing [Tue, 26 Aug 2014 03:33:14 +0000 (11:33 +0800)]
wifi->esp8089: add prealloc function.
黄涛 [Tue, 26 Aug 2014 03:27:42 +0000 (11:27 +0800)]
ARM: rockchip: cpu.h add rockchip_get/set_cpu_version
zwl [Tue, 26 Aug 2014 03:11:21 +0000 (11:11 +0800)]
rkfb sys: modify show_screen_info as cur_screen
lxt [Tue, 26 Aug 2014 00:25:03 +0000 (08:25 +0800)]
rk312x codec :
1 Optimized drive compatibility
2 modified the volume to dts
zwl [Tue, 26 Aug 2014 00:57:22 +0000 (08:57 +0800)]
rk3288:dtsi: modify default lcdc iommu-enabled prop to disable
zwl [Tue, 26 Aug 2014 00:51:00 +0000 (08:51 +0800)]
rk3288:lcdc: add support set default bcsh value which read from dts when open lcdc
zwl [Mon, 25 Aug 2014 14:45:32 +0000 (22:45 +0800)]
1.rockchip:screen: add color-mode node in screen timing and add prop at lcd-xxx.dtsi
2.rk312x:lcdc: modify set overlay mode according to the screen color-mode
zwl [Mon, 25 Aug 2014 08:05:36 +0000 (16:05 +0800)]
rk fb: fix disp size err when switch hdmi resolution if disp_mode is ONE_DUAL
zwl [Sun, 24 Aug 2014 09:40:59 +0000 (17:40 +0800)]
rk fb: modify rk_fb_switch_screen interface and remove unused code
黄涛 [Mon, 25 Aug 2014 10:21:55 +0000 (18:21 +0800)]
misc: SRAM: Add option to map SRAM as cacheable
lyz [Fri, 22 Aug 2014 03:57:21 +0000 (11:57 +0800)]
rk312x: usb-uart: support disable usb-uart bypass in DTS
黄涛 [Mon, 25 Aug 2014 08:13:17 +0000 (16:13 +0800)]
ARM: rockchip: rockchip_defconfig: enable zram
lintao [Mon, 25 Aug 2014 02:48:17 +0000 (10:48 +0800)]
trace: mmc: add event class for cmd and resp
Zheng Yang [Sat, 23 Aug 2014 08:12:43 +0000 (16:12 +0800)]
rk3036/rk312x tve: fix reg wirte error when disable dac.
Zheng Yang [Fri, 22 Aug 2014 12:19:25 +0000 (20:19 +0800)]
rk3036/rk312x tve: update reg value to improve performance.
黄涛 [Fri, 22 Aug 2014 10:31:41 +0000 (18:31 +0800)]
ARM: rockchip: rk3036: fix timer irq define
张晴 [Fri, 22 Aug 2014 09:46:34 +0000 (17:46 +0800)]
rk312x:clk:modify set cru_misc_con
simon [Fri, 22 Aug 2014 08:55:15 +0000 (16:55 +0800)]
rockchip: gpu: update version of midgard to 0x0b && mali400 to 0x02 to mark iommu enabled
张晴 [Fri, 22 Aug 2014 08:46:25 +0000 (16:46 +0800)]
rk312x:clk:select 480M for clk usb480m
张晴 [Fri, 22 Aug 2014 08:32:40 +0000 (16:32 +0800)]
rk32:rk808:modify kconfig for rk808_mfd
Zhaoyifeng [Fri, 22 Aug 2014 07:40:14 +0000 (15:40 +0800)]
Nand driver: Fix RK3288 supend issue.
issue: rk3288 have two nandc,and driver add two nandc devices
but with one mutex signal. The suspend function will be call twice,and crash.
Fix : Modify function rknand_suspend,rknand_resume and rknand_shutdown to Fix it.
Zheng Yang [Fri, 22 Aug 2014 07:42:26 +0000 (15:42 +0800)]
1. rk3036 lcdc: fix 1080i display error.
2. rk312x lcdc: fix compile error.
黄涛 [Fri, 22 Aug 2014 07:26:04 +0000 (15:26 +0800)]
ARM: rockchip: rockchip_defconfig: update by savedefconfig