zwl [Tue, 18 Mar 2014 15:31:44 +0000 (23:31 +0800)]
rk_fb: add support hdmi display for new rk fb
Zhaoyifeng [Tue, 18 Mar 2014 13:24:31 +0000 (21:24 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
Zhaoyifeng [Tue, 18 Mar 2014 13:23:10 +0000 (21:23 +0800)]
add rknand base file for ko.
wlf [Tue, 18 Mar 2014 13:16:41 +0000 (21:16 +0800)]
USB: fix RK3288 usb_det_wakeup_work bug.
wlf [Tue, 18 Mar 2014 12:58:58 +0000 (20:58 +0800)]
USB: Modify RK3188 && RK3288 clk.
xxx [Tue, 18 Mar 2014 11:58:52 +0000 (19:58 +0800)]
fixed: pm-rk3188.c
xxx [Tue, 18 Mar 2014 11:56:56 +0000 (19:56 +0800)]
fixed: pm-rk3288.c
xxx [Tue, 18 Mar 2014 11:41:09 +0000 (19:41 +0800)]
fixed: pm.c pm-pie.c pm.h
yxj [Tue, 18 Mar 2014 10:40:37 +0000 (18:40 +0800)]
rk3188 lcdc: fix suspend
dkl [Tue, 18 Mar 2014 10:14:31 +0000 (18:14 +0800)]
rk3288: add clock info to lcdc node in dts
yxj [Tue, 18 Mar 2014 09:47:32 +0000 (17:47 +0800)]
lcdc rk3188: fix panic temporarily
ljf [Tue, 18 Mar 2014 09:41:23 +0000 (17:41 +0800)]
add dts node clock name for hevc vpu and iep
luowei [Tue, 18 Mar 2014 09:28:48 +0000 (17:28 +0800)]
enable spi defconfig and rk3288 pinctrl clocks
yxj [Tue, 18 Mar 2014 08:59:18 +0000 (16:59 +0800)]
rk3288: fix lvds/edp clk
许盛飞 [Tue, 18 Mar 2014 08:59:22 +0000 (16:59 +0800)]
pwm: the driver of rk-pwm
hjc [Tue, 18 Mar 2014 06:12:02 +0000 (14:12 +0800)]
rk3288 lcdc: modify lcdc display interface
hjc [Tue, 18 Mar 2014 02:09:02 +0000 (10:09 +0800)]
rk fb: del some unused stagement
zyw [Tue, 18 Mar 2014 07:19:35 +0000 (15:19 +0800)]
chromium: add chromium defconfig
gwl [Tue, 18 Mar 2014 07:25:39 +0000 (15:25 +0800)]
wifi: fix rkwifi_sys_iface.c compile error.
luowei [Tue, 18 Mar 2014 07:13:18 +0000 (15:13 +0800)]
pinctrl:modify rk3288 dts function name
dkl [Tue, 18 Mar 2014 06:27:54 +0000 (14:27 +0800)]
clk: rockchip: fix rk3288 pll settings
xbw [Tue, 18 Mar 2014 05:49:17 +0000 (13:49 +0800)]
SDMMC: Delete unused files
xbw [Tue, 18 Mar 2014 05:43:42 +0000 (13:43 +0800)]
SDMMC: add the SDIO_IRQ for sdio
xbw [Tue, 18 Mar 2014 05:40:08 +0000 (13:40 +0800)]
SDMMC: add the capabilities and ocr_avail of RK-host
dkl [Tue, 18 Mar 2014 02:54:24 +0000 (10:54 +0800)]
clk: rockchip: fix rk3288 clock dts
1. Shorten some clock name which is too long.
2. Add #clock-init-cells in some clocks.
zwl [Tue, 18 Mar 2014 02:24:34 +0000 (10:24 +0800)]
HDMI: modify dts file and add hdmi pclk
gwl [Tue, 18 Mar 2014 02:21:53 +0000 (10:21 +0800)]
wifi:rfkill:bcmdhd: insmod wifi driver after android started.
lintao [Tue, 18 Mar 2014 01:48:32 +0000 (09:48 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
lintao [Tue, 18 Mar 2014 01:43:18 +0000 (09:43 +0800)]
mmc: core: export sysmbol "mmc_host_rescan"
We find some SDIO devices(especially Wi-Fi) need to triger software
rescan flow instead of hardware interrupt routine comfirmed by MMC spec.
Pls refer to the comments ahead of function for detailed.
张晴 [Tue, 18 Mar 2014 01:24:59 +0000 (09:24 +0800)]
linux3.10:io_domain:modify io_vol_domain
zwl [Mon, 17 Mar 2014 13:17:00 +0000 (21:17 +0800)]
HDMI: modify rk3288 hdmi phy config and add 4kx2k timing
hjc [Mon, 17 Mar 2014 11:28:19 +0000 (19:28 +0800)]
rk3288 lcdc:
1.fix x_mirror and y_mirror init error;
2.post config default set at loader screen;
hjc [Mon, 17 Mar 2014 11:26:56 +0000 (19:26 +0800)]
modify rk3288.dtsi rk3288-tb.dts rk3188-tb.dts
黄涛 [Mon, 17 Mar 2014 11:41:25 +0000 (19:41 +0800)]
ARM: rockchip: fix some build error when some configs no selected
黄涛 [Mon, 17 Mar 2014 11:39:24 +0000 (19:39 +0800)]
rk: FIQ_DEBUGGER_CONSOLE depends on TTY
luowei [Mon, 17 Mar 2014 11:35:11 +0000 (19:35 +0800)]
pinctrl:add vol_domain and iomux operation for RK3288
luowei [Mon, 17 Mar 2014 11:33:19 +0000 (19:33 +0800)]
fix sdmmc building error
黄涛 [Mon, 17 Mar 2014 10:50:55 +0000 (18:50 +0800)]
ARM: rockchip: rk3288 support save/restore QOS when power domain on/off
dkl [Mon, 17 Mar 2014 09:53:33 +0000 (17:53 +0800)]
clk: rockchip: fix rk_dump_cru func
xbw [Mon, 17 Mar 2014 09:55:48 +0000 (17:55 +0800)]
SDMMC: delete the unuse aliases
xbw [Mon, 17 Mar 2014 09:30:43 +0000 (17:30 +0800)]
SDMMC: to support rk3288
xbw [Mon, 17 Mar 2014 09:29:41 +0000 (17:29 +0800)]
SDMMC: use aliases of sdmmc in rk3188-tb.dts file.
dkl [Mon, 17 Mar 2014 08:57:25 +0000 (16:57 +0800)]
clk: rockchip: add clocks_init in rk3288.dtsi
陈亮 [Mon, 17 Mar 2014 08:54:34 +0000 (01:54 -0700)]
rk3188 : disable ddr freq && disable nand suspend && disable power onoff pll for sleep err
lyz [Mon, 17 Mar 2014 08:31:14 +0000 (16:31 +0800)]
usb: add usb charger detect to rk3188
lyz [Mon, 17 Mar 2014 06:36:04 +0000 (14:36 +0800)]
usb: add battery charger detect regs to rk3288.dtsi
wlf [Mon, 17 Mar 2014 08:31:18 +0000 (16:31 +0800)]
USB: rename RK3288 interrupt-names bvalid to otg_bvalid.
黄涛 [Mon, 17 Mar 2014 08:01:35 +0000 (16:01 +0800)]
ARM: rockchip: rk3288 support msch setup
dkl [Mon, 17 Mar 2014 06:33:00 +0000 (14:33 +0800)]
clk: rockchip: fix aclk_peri,aclk_cpu in RK3188
张晴 [Mon, 17 Mar 2014 03:39:27 +0000 (11:39 +0800)]
linux3.10:pwm:renamed rk30/rk29-pwm-regulator to rockchip-pwm-regulator
张晴 [Mon, 17 Mar 2014 03:11:08 +0000 (11:11 +0800)]
linux3.10:pwm:modify config rk30_PWM_RERGULATOR to ROCKCHIP_PWM_REGULATOR
张晴 [Mon, 17 Mar 2014 02:31:10 +0000 (10:31 +0800)]
rk3288:pmic&pwm:set defult voltage
xxm [Mon, 17 Mar 2014 02:18:13 +0000 (10:18 +0800)]
support rockcihp iommu
xbw [Mon, 17 Mar 2014 01:45:52 +0000 (09:45 +0800)]
SDMMC: Deleted file will no longer be used
xbw [Mon, 17 Mar 2014 01:36:45 +0000 (09:36 +0800)]
SDMMC: separate the board-definition from platform-definition
dkl [Sun, 16 Mar 2014 04:09:58 +0000 (12:09 +0800)]
clk: rockchip: add rk3288-clocks.dtsi
hjc [Sat, 15 Mar 2014 10:30:51 +0000 (18:30 +0800)]
defconfig: rockchip_defconfig default suport rk3288 lcdc
hjc [Sat, 15 Mar 2014 08:30:49 +0000 (16:30 +0800)]
rk3288 lcdc:
1.add suspend and resume func;
2.add x and y mirror func;
3.rename some unresonable define.
zwl [Sat, 15 Mar 2014 10:12:10 +0000 (18:12 +0800)]
HDMI: rk3288 hdmi modify video and audio config
xbw [Sat, 15 Mar 2014 09:36:32 +0000 (17:36 +0800)]
SDMMC: Add the judgment on soc differences between rk3188 and rk32XX
hjc [Sat, 15 Mar 2014 06:47:59 +0000 (14:47 +0800)]
rk3288 lcdc: add support vop mmu
hjc [Sat, 15 Mar 2014 06:37:03 +0000 (14:37 +0800)]
fix rk3288 pinctrl compile error
xbw [Sat, 15 Mar 2014 02:45:24 +0000 (10:45 +0800)]
SDMMC: close the debug log. continue with commit-
0ae1a062d
xbw [Fri, 14 Mar 2014 12:59:47 +0000 (20:59 +0800)]
SDMMC: printk independently the each information of individual controller
luowei [Fri, 14 Mar 2014 11:30:06 +0000 (19:30 +0800)]
pinctrl:divide address of pinctrl dts
Yonghua Zheng [Mon, 26 Aug 2013 15:38:35 +0000 (23:38 +0800)]
HID: hidraw: Add spinlock in struct hidraw to protect list
It is unsafe to call list_for_each_entry in hidraw_report_event to
traverse each hidraw_list node without a lock protection, the list
could be modified if someone calls hidraw_release and list_del to
remove itself from the list, this can cause hidraw_report_event
to touch a deleted list struct and panic.
To prevent this, introduce a spinlock in struct hidraw to protect
list from concurrent access.
Signed-off-by: Yonghua Zheng <younghua.zheng@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
lyz [Fri, 14 Mar 2014 10:18:09 +0000 (18:18 +0800)]
usb: remove usbless file
lyz [Fri, 14 Mar 2014 10:13:48 +0000 (18:13 +0800)]
usb: add rk32 usb charger detect
lyz [Thu, 13 Mar 2014 06:42:41 +0000 (14:42 +0800)]
rk3188&rk3288: usb: add otg detect irq handlers
lyz [Thu, 13 Mar 2014 01:33:50 +0000 (09:33 +0800)]
usb-uart: add support 3188&3288 kernel-3.10
张晴 [Fri, 14 Mar 2014 10:14:56 +0000 (18:14 +0800)]
linux3.10:pwm:support pwm set voltage by regulator
wlf [Fri, 14 Mar 2014 09:42:25 +0000 (17:42 +0800)]
USB: fix qtd->qh poison overwritten.
CMY [Fri, 14 Mar 2014 09:41:32 +0000 (17:41 +0800)]
rk: ion: support cache ops for CMA heap
wlf [Fri, 14 Mar 2014 09:27:28 +0000 (17:27 +0800)]
USB: delete unused mdelay in probe funciton to reduce initialization time
yxj [Fri, 14 Mar 2014 09:09:54 +0000 (17:09 +0800)]
rk fb:fix pwr_ctr_parse_dt
xbw [Fri, 14 Mar 2014 08:22:19 +0000 (16:22 +0800)]
SDMMC:
1.Optimizing operational processes SDMMC.
2.Eliminate the normal error message.
yxj [Fri, 14 Mar 2014 07:43:42 +0000 (15:43 +0800)]
modify rk3288.dtsi rk3288-tb.dts for display subsystem
zyk [Fri, 14 Mar 2014 07:06:14 +0000 (15:06 +0800)]
ARM: rockchip: update rk3288-tb.dts
黄涛 [Fri, 14 Mar 2014 04:57:02 +0000 (12:57 +0800)]
ARM: rockchip: rk3288-fpga.dts no include rk3288.dtsi
黄涛 [Fri, 14 Mar 2014 03:36:57 +0000 (11:36 +0800)]
ARM: rockchip: add rk3288-tb.dts
黄涛 [Fri, 14 Mar 2014 03:16:21 +0000 (11:16 +0800)]
ARM: rockchip: rk3188: rk3188.dtsi include more common files
yxj [Fri, 14 Mar 2014 02:16:59 +0000 (10:16 +0800)]
move screen power control to board dts,because it's board specifc
黄涛 [Fri, 14 Mar 2014 02:18:57 +0000 (10:18 +0800)]
rk: add resource_tool, upstream commit
63eb39a
zsq [Fri, 14 Mar 2014 01:43:25 +0000 (09:43 +0800)]
fix rga DMA buf ref error
lintao [Fri, 14 Mar 2014 01:26:54 +0000 (09:26 +0800)]
mmc: core: If controller drv had not registed shutdown callback,
mmc_bus_shutdown SHOULD NOT fall throught it
We find kernel panic when rebooting system for nandflash based machine
[ 105.821908] PC is at mmc_bus_shutdown+0xc/0x18
[ 105.826376] LR is at device_shutdown+0x114/0x174
[ 105.831015] pc : [<
c03e1818>] lr : [<
c02c94a0>] psr:
600f0013
[ 105.831015] sp :
cf0d9e58 ip :
00000000 fp :
00036864
[ 105.842499] r10:
cdd888fc r9 :
cf0d8000 r8 :
c09e001c
[ 105.847738] r7 :
c0f9edd4 r6 :
cdd8f1c8 r5 :
cdd888c8 r4 :
cdd888d4
[ 105.854275] r3 :
00000000 r2 :
00000001 r1 :
00000002 r0 :
cdd888c0
[ 105.860815] Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user
[ 105.867963] Control:
10c53c7d Table:
6df9004a DAC:
00000015
.....
[ 106.799170] [<
c03e1818>] (mmc_bus_shutdown+0xc/0x18) from [<
c02c94a0>] (device_shutdown+0x114/0x174)
[ 106.808341] [<
c02c94a0>] (device_shutdown+0x114/0x174) from [<
c003ec10>] (kernel_restart+0xc/0x50)
[ 106.817331] [<
c003ec10>] (kernel_restart+0xc/0x50) from [<
c003edbc>] (SyS_reboot+0x160/0x1dc)
[ 106.825891] [<
c003edbc>] (SyS_reboot+0x160/0x1dc) from [<
c000da80>] (ret_fast_syscall+0x0/0x48)
黄涛 [Fri, 14 Mar 2014 01:11:01 +0000 (09:11 +0800)]
rk: support make resource.img
zsq [Fri, 14 Mar 2014 01:01:50 +0000 (09:01 +0800)]
fix rga support DMA buf error
gwl [Thu, 13 Mar 2014 13:04:35 +0000 (21:04 +0800)]
BT: add rts control.
luowei [Thu, 13 Mar 2014 12:43:28 +0000 (20:43 +0800)]
fix pinctrl bug for voltage domain setting
CMY [Thu, 13 Mar 2014 11:51:59 +0000 (19:51 +0800)]
rk: ion: resive build error if CONFIG_CMA is disable
yxj [Thu, 13 Mar 2014 03:29:55 +0000 (11:29 +0800)]
Revert "lvds: add rk319x lvds"
This reverts commit
46f66629d7db9336a95e56bb2007107174392b3a.
Conflicts:
drivers/video/rockchip/transmitter/Kconfig
drivers/video/rockchip/transmitter/Makefile
yxj [Thu, 13 Mar 2014 03:26:38 +0000 (11:26 +0800)]
update rk3188/rk3288 dts
yxj [Thu, 13 Mar 2014 03:21:13 +0000 (11:21 +0800)]
rk transmitter: dp anx6345、dp rk32、lvds rk32 implement rk_fb_trsm_ops interface
yxj [Thu, 13 Mar 2014 03:18:00 +0000 (11:18 +0800)]
rk fb: add rk_fb_trsm_ops
yxj [Wed, 12 Mar 2014 23:28:20 +0000 (07:28 +0800)]
clean up rk screen
yxj [Wed, 12 Mar 2014 23:25:40 +0000 (07:25 +0800)]
rk3188 lcdc: early suspend/resume in blank
yxj [Tue, 11 Mar 2014 08:29:35 +0000 (16:29 +0800)]
add rk32 lvds support
yxj [Fri, 7 Mar 2014 02:57:39 +0000 (10:57 +0800)]
rk32 edp:remove unused code
ZHW [Thu, 26 Dec 2013 12:56:00 +0000 (20:56 +0800)]
lvds: add rk319x lvds
xxx [Thu, 13 Mar 2014 07:24:12 +0000 (15:24 +0800)]
rk3188 pm support