firefly-linux-kernel-4.4.55.git
10 years agoadd ft tst func
xxx [Thu, 26 Jun 2014 10:19:48 +0000 (18:19 +0800)]
add ft tst func

10 years agoadd arm pll rate conf
xxx [Thu, 26 Jun 2014 10:17:08 +0000 (18:17 +0800)]
add arm pll rate conf

10 years agofixed not define CONFIG_PM warning
xxx [Thu, 26 Jun 2014 10:15:27 +0000 (18:15 +0800)]
fixed not define CONFIG_PM warning

10 years agoddr_rk32.c:fixed warning
xxx [Thu, 26 Jun 2014 10:13:16 +0000 (18:13 +0800)]
ddr_rk32.c:fixed warning

10 years agork: dts: more convenient to modify CMA region
CMY [Thu, 26 Jun 2014 10:01:34 +0000 (18:01 +0800)]
rk: dts: more convenient to modify CMA region

10 years agoWiFi:bcmdhd: fix wifi driver endless loop when initialization fail.
gwl [Thu, 26 Jun 2014 07:55:05 +0000 (15:55 +0800)]
WiFi:bcmdhd: fix wifi driver endless loop when initialization fail.

10 years agofixed: suspend gpios setting
xxx [Thu, 26 Jun 2014 07:15:58 +0000 (15:15 +0800)]
fixed: suspend gpios setting

10 years agofixed : rkpm_ddr_regs_dump
xxx [Thu, 26 Jun 2014 07:11:41 +0000 (15:11 +0800)]
fixed : rkpm_ddr_regs_dump

10 years agork: ion: enable CMA that placed in highmem zone by default
CMY [Thu, 26 Jun 2014 06:47:09 +0000 (14:47 +0800)]
rk: ion: enable CMA that placed in highmem zone by default

10 years agork: p977: adjust lowmem/vmalloc area to 496/504 MB
CMY [Thu, 26 Jun 2014 06:29:01 +0000 (14:29 +0800)]
rk: p977: adjust lowmem/vmalloc area to 496/504 MB

10 years agork: ion: Add support cma heap placed in highmem zone
CMY [Thu, 26 Jun 2014 03:21:41 +0000 (11:21 +0800)]
rk: ion: Add support cma heap placed in highmem zone

Add CONFIG_ION_CMA_HIGHMEM to support cma that placed in highmem zone.

Use dma_alloc_attrs() with DMA_ATTR_NO_KERNEL_MAPPING to alloc memory from
cma heap that placed in highmem zone, and use dma_free_attrs() with
DMA_ATTR_NO_KERNEL_MAPPING to free the memory.

Use ion_heap_map_kernel/ion_heap_unmap_kernel for map/unmap to the kernel
when support cma in highmem.

10 years agork: dma-mapping: Add support DMA allocate memory without mapping
CMY [Thu, 26 Jun 2014 03:18:23 +0000 (11:18 +0800)]
rk: dma-mapping: Add support DMA allocate memory without mapping

reserved DMA(CMA) regions may be large than 512MB for devices, placed it
in the highmem zone is appropriate, but according to the existing
mechanism, memory allocation with mapping will cause vmalloc area not
enough.

Now we don't do mapping if the DMA_ATTR_NO_KERNEL_MAPPING is set.

10 years agork3288 hdmi: fix some tv have no display if switch resolution several times
zwl [Thu, 26 Jun 2014 03:33:24 +0000 (11:33 +0800)]
rk3288 hdmi: fix some tv have no display if switch resolution several times

10 years agofix some warning for mpu6050
ywj [Thu, 26 Jun 2014 02:59:32 +0000 (10:59 +0800)]
fix some warning for mpu6050

10 years agoasix usb ethernet:
hwg [Thu, 26 Jun 2014 02:13:06 +0000 (10:13 +0800)]
asix usb ethernet:
 avoid kernel panic when alloc skb fail in lowmemory case

10 years agommc: host: rk_sdmmc: add data-over-int timeout for data_busy
lintao [Tue, 24 Jun 2014 09:20:42 +0000 (17:20 +0800)]
mmc: host: rk_sdmmc: add data-over-int timeout  for data_busy
If devices fall in bad state make data_busy be hold too long,
dto interrupt will not be present, which leading  mmc-core wait for it forever.

 [<c06d42e4>] (__schedule+0x48c/0x554) from [<c06d275c>] (schedule_timeout+0x1c/0x260)
 [<c06d275c>] (schedule_timeout+0x1c/0x260) from [<c06d3c10>] (wait_for_common+0xd0/0x164)
 [<c06d3c10>] (wait_for_common+0xd0/0x164) from [<c044a4bc>] (mmc_wait_for_req_done+0x1c/0xe0)
 [<c044a4bc>] (mmc_wait_for_req_done+0x1c/0xe0) from [<c0453730>] (mmc_io_rw_extended+0x218/0x294)
 [<c0453730>] (mmc_io_rw_extended+0x218/0x294) from [<c0454590>] (sdio_io_rw_ext_helper+0xc8/0x194)
 [<c0454590>] (sdio_io_rw_ext_helper+0xc8/0x194) from [<c04546b0>] (sdio_memcpy_toio+0x1c/0x20)
 [<c04546b0>] (sdio_memcpy_toio+0x1c/0x20) from [<c032e96c>] (sdioh_request_packet+0x664/0x7e8)
 [<c032e96c>] (sdioh_request_packet+0x664/0x7e8) from [<c032fc78>] (sdioh_request_buffer+0x1a8/0x210)

10 years agork3288: set "rockchip,clocks-uboot-has-init" "aclk_vio0" as default.
dkl [Wed, 25 Jun 2014 12:21:16 +0000 (20:21 +0800)]
rk3288: set "rockchip,clocks-uboot-has-init" "aclk_vio0" as default.

This commit corresponds to commit debf1d2237185a26503d737d54db730f62cf5ea5.

10 years agork: ion: fix build warning for iommu API
CMY [Tue, 24 Jun 2014 02:48:50 +0000 (10:48 +0800)]
rk: ion: fix build warning for iommu API

10 years agocamera: change isp ddr freq from 400M to 533M
zyc [Wed, 25 Jun 2014 00:44:42 +0000 (08:44 +0800)]
camera: change isp ddr freq from 400M to 533M

10 years agoclk: rk3288: modify RK3288_LIMIT_PLL_VIO0/1
dkl [Tue, 24 Jun 2014 10:00:38 +0000 (18:00 +0800)]
clk: rk3288: modify RK3288_LIMIT_PLL_VIO0/1

This commit corresponds to commit debf1d2237185a26503d737d54db730f62cf5ea5.

10 years agorockchip:midgard:1,katom->fence NULL workaround 2,version to 4
xxm [Tue, 24 Jun 2014 08:42:20 +0000 (16:42 +0800)]
rockchip:midgard:1,katom->fence NULL workaround 2,version to 4

10 years agocamsys: v0.e.0
ddl [Tue, 24 Jun 2014 07:24:06 +0000 (15:24 +0800)]
camsys: v0.e.0

10 years agodisable vdd_gpu when early suspend
陈亮 [Tue, 24 Jun 2014 06:11:32 +0000 (23:11 -0700)]
disable vdd_gpu when early suspend

Signed-off-by: 陈亮 <cl@rock-chips.com>
10 years agork3288 dts: modify lcdc0 as prmry(LCD) and lcdc1 as extend(HDMI) that just used for MID
zwl [Tue, 24 Jun 2014 06:15:09 +0000 (14:15 +0800)]
rk3288 dts: modify lcdc0 as prmry(LCD) and lcdc1 as extend(HDMI) that just used for MID

10 years agork fb: modify the judgement of vertical screen for hdmi
zwl [Tue, 24 Jun 2014 02:58:17 +0000 (10:58 +0800)]
rk fb: modify the judgement of vertical screen for hdmi

10 years agorockchip:iommu:fix compiling warning when iommu enabled
xxm [Tue, 24 Jun 2014 02:51:07 +0000 (10:51 +0800)]
rockchip:iommu:fix compiling warning when iommu enabled

10 years agommc: host: rk_sdmmc: clk_prepare/unprepare should be used in non-atomic context
lin tao [Tue, 24 Jun 2014 02:15:34 +0000 (10:15 +0800)]
mmc: host: rk_sdmmc: clk_prepare/unprepare should be used in non-atomic context

10 years agousb: dwc_otg: fix BUG: scheduling while atomic
lyz [Tue, 24 Jun 2014 01:02:18 +0000 (09:02 +0800)]
usb: dwc_otg: fix BUG: scheduling while atomic

10 years agoscripts/checkpatch.pl: update to ae3ccc4678fec2d270a4c54981831c7b8a2da9cd
黄涛 [Mon, 23 Jun 2014 11:22:25 +0000 (19:22 +0800)]
scripts/checkpatch.pl: update to ae3ccc4678fec2d270a4c54981831c7b8a2da9cd

10 years agoUSB: Fix usb battery charger detect bug.
wlf [Mon, 23 Jun 2014 09:46:59 +0000 (17:46 +0800)]
USB: Fix usb battery charger detect bug.

In some case, if usb connect with otg cable,
and set OTG_VBUS_DRV high to output 5V,it
will lead to usb bc detecting wrongly.
Check otg_id to avoid this bug.

10 years agoUSB: Fix RK3288 USB HOST2(DWC_OTG) remote wakeup bug.
wlf [Mon, 23 Jun 2014 07:20:24 +0000 (15:20 +0800)]
USB: Fix RK3288 USB HOST2(DWC_OTG) remote wakeup bug.

When the HOST2 DWC_OTG core detects a USB remote wakeup
sequence, the core starts driving resume signal but
the usb phy is halted. So try to do soft reset phy.

10 years agoARM: rockchip: support reboot fastboot
黄涛 [Mon, 23 Jun 2014 06:25:05 +0000 (14:25 +0800)]
ARM: rockchip: support reboot fastboot

10 years agork: lowmemorykiller: calculator free pages exclude CMA's free
CMY [Mon, 23 Jun 2014 02:11:35 +0000 (10:11 +0800)]
rk: lowmemorykiller: calculator free pages exclude CMA's free

10 years agorga2 driver add x_mirr/y_mirr feature support
zsq [Mon, 23 Jun 2014 02:11:28 +0000 (10:11 +0800)]
rga2 driver add x_mirr/y_mirr feature support

10 years agork fb: modify fb rotate config read from dts
zwl [Fri, 20 Jun 2014 03:38:20 +0000 (11:38 +0800)]
rk fb: modify fb rotate config read from dts

10 years agork fb: modify get_prmry_screen_ft in case ft is zero
zwl [Thu, 19 Jun 2014 13:05:45 +0000 (21:05 +0800)]
rk fb: modify get_prmry_screen_ft in case ft is zero

10 years agoupdate rkwifi driver to version 4.80.WFD.OOB
hwg [Thu, 19 Jun 2014 07:34:41 +0000 (15:34 +0800)]
update rkwifi driver to version 4.80.WFD.OOB
 use pre alloc memory for driver, solve memory alloc fail problem

10 years agousb: dwc_otg hcd driver: fix a race condition
lyz [Thu, 19 Jun 2014 03:42:25 +0000 (11:42 +0800)]
usb: dwc_otg hcd driver: fix a race condition

When pannic occurs,
PC is at dwc_otg_hcd_urb_enqueue+0x118/0x184
LR is at dwc_otg_hcd_urb_enqueue+0xf4/0x184
There may be more than one threads running function
dwc_otg_hcd_urb_enqueue().So we should use a spinlock to protect the
dwc_otg_qh_t struct against a use-after-free bug.

10 years agoTold to update this issue to avoid midgard compile warning
xxm [Thu, 19 Jun 2014 02:40:55 +0000 (10:40 +0800)]
Told to update this issue to avoid midgard compile warning

10 years agoddr_freq: fix Division by zero in kernel
陈亮 [Wed, 18 Jun 2014 12:15:42 +0000 (05:15 -0700)]
ddr_freq: fix Division by zero in kernel

10 years agork3288: new ddrfreq policy, change freq by vop request
陈亮 [Wed, 18 Jun 2014 02:01:42 +0000 (19:01 -0700)]
rk3288: new ddrfreq policy, change freq by vop request

10 years agork fb: modify wait_event to wait_event_timeout for update_regs_wait
zwl [Wed, 18 Jun 2014 01:29:14 +0000 (09:29 +0800)]
rk fb: modify wait_event to wait_event_timeout for update_regs_wait

10 years agoclk: rockchip: pll: use reg offset instead of reg
dkl [Wed, 18 Jun 2014 01:24:02 +0000 (09:24 +0800)]
clk: rockchip: pll: use reg offset instead of reg

10 years agoMIPI: 1. cmd length up to 1kB long; 2. sync to uboot MIPI
xjh [Tue, 17 Jun 2014 09:01:11 +0000 (17:01 +0800)]
MIPI: 1. cmd length up to 1kB long; 2. sync to uboot MIPI

10 years agork3288: fix wdt dts wrong config
陈亮 [Tue, 17 Jun 2014 08:40:23 +0000 (01:40 -0700)]
rk3288: fix wdt dts wrong config

10 years agork: gcc-wrapper.py ignore atags_to_fdt.c:96
黄涛 [Tue, 17 Jun 2014 04:53:45 +0000 (12:53 +0800)]
rk: gcc-wrapper.py ignore atags_to_fdt.c:96

10 years agommc: fix warning
lin tao [Tue, 17 Jun 2014 03:23:52 +0000 (11:23 +0800)]
mmc: fix warning

10 years agoARM: rockchip: rockchip_pm: fix compilation warning
黄涛 [Tue, 17 Jun 2014 02:44:17 +0000 (10:44 +0800)]
ARM: rockchip: rockchip_pm: fix compilation warning

10 years agoARM: rockchip: ddr_rk32: fix compilation warning
黄涛 [Tue, 17 Jun 2014 02:40:33 +0000 (10:40 +0800)]
ARM: rockchip: ddr_rk32: fix compilation warning

10 years agoARM: rockchip: ddr_rk30: fix compilation warning
黄涛 [Tue, 17 Jun 2014 02:40:00 +0000 (10:40 +0800)]
ARM: rockchip: ddr_rk30: fix compilation warning

10 years agorkpm remove warning
xxx [Tue, 17 Jun 2014 01:55:24 +0000 (09:55 +0800)]
rkpm remove warning

10 years agofiq_debugger: disable usb uart by pass during booting time, when uart irqs are too...
wdc [Tue, 17 Jun 2014 01:21:17 +0000 (09:21 +0800)]
fiq_debugger: disable usb uart by pass during booting time, when uart irqs are too many

10 years agommc: host: rk_sdmmc:
lin tao [Tue, 17 Jun 2014 00:44:28 +0000 (08:44 +0800)]
mmc: host: rk_sdmmc:
Support poll-hw-reset for emmc devices with vccq always on,
that may fail boot since devices cannot enter pre-idle in this case.
No sense send CMD12 and wait DTO when booting recommended by dw-spec.
Default no attribute poll-hw-reset in dts.

10 years agork: add gcc-wrapper
黄涛 [Mon, 16 Jun 2014 14:03:54 +0000 (22:03 +0800)]
rk: add gcc-wrapper

10 years agovideo: rockchip: display-sys: fix compilation warning
黄涛 [Mon, 16 Jun 2014 13:48:58 +0000 (21:48 +0800)]
video: rockchip: display-sys: fix compilation warning

10 years agoinput: touchscreen: k29_i2c_goodix: fix compilation warning
黄涛 [Mon, 16 Jun 2014 13:14:15 +0000 (21:14 +0800)]
input: touchscreen: k29_i2c_goodix: fix compilation warning

10 years agoinput: touchscreen: vtl_ts: fix compilation warning
黄涛 [Mon, 16 Jun 2014 13:11:58 +0000 (21:11 +0800)]
input: touchscreen: vtl_ts: fix compilation warning

10 years agork fb: move read mirror prop position to fix system crash
zwl [Mon, 16 Jun 2014 12:55:37 +0000 (20:55 +0800)]
rk fb: move read mirror prop position to fix system crash

10 years agospi: rockchip: fix compilation warning
黄涛 [Mon, 16 Jun 2014 12:54:10 +0000 (20:54 +0800)]
spi: rockchip: fix compilation warning

10 years agoinput: keyboard: rk_keys: fix compilation warning
黄涛 [Mon, 16 Jun 2014 12:44:31 +0000 (20:44 +0800)]
input: keyboard: rk_keys: fix compilation warning

10 years agoinput: touchscreen: fix tp_suspend.h compilation warning
黄涛 [Mon, 16 Jun 2014 12:26:56 +0000 (20:26 +0800)]
input: touchscreen: fix tp_suspend.h compilation warning

10 years agoARM: rockchip: dvfs: fix compilation warning
黄涛 [Mon, 16 Jun 2014 12:22:54 +0000 (20:22 +0800)]
ARM: rockchip: dvfs: fix compilation warning

10 years agopinctrl: rockchip: fix compilation warning
黄涛 [Mon, 16 Jun 2014 12:16:15 +0000 (20:16 +0800)]
pinctrl: rockchip: fix compilation warning

10 years agoclk: rockchip: add support for uboot display
dkl [Mon, 16 Jun 2014 11:47:27 +0000 (19:47 +0800)]
clk: rockchip: add support for uboot display

10 years agork32 lcdc: modify the mirror prop read
zwl [Mon, 16 Jun 2014 11:19:52 +0000 (19:19 +0800)]
rk32 lcdc: modify the mirror prop read

10 years agonand : move nand config form dtsi to dts,add nandc0reg config for sn read api.
Zhaoyifeng [Mon, 16 Jun 2014 10:27:35 +0000 (18:27 +0800)]
nand : move nand config form dtsi to dts,add nandc0reg config for sn read api.

10 years ago nand:remove compile warnings and add error handle.
Zhaoyifeng [Mon, 16 Jun 2014 10:25:23 +0000 (18:25 +0800)]
   nand:remove compile warnings and add error handle.

10 years agork32 dts: fix lcdc node some warning
zwl [Mon, 16 Jun 2014 09:10:51 +0000 (17:10 +0800)]
rk32 dts: fix lcdc node some warning

10 years agork fb: fix the error vir_stride in hdmi fb if rotate
zwl [Mon, 16 Jun 2014 08:20:44 +0000 (16:20 +0800)]
rk fb: fix the error vir_stride in hdmi fb if rotate

10 years agorockchip:midgard:1,compatible with rk3288 ft project 2,version to 3
xxm [Mon, 16 Jun 2014 08:18:14 +0000 (16:18 +0800)]
rockchip:midgard:1,compatible with rk3288 ft project  2,version to 3

10 years agommc: host: rk_sdmmmc: fix rk32xx H/W reset
lin tao [Mon, 16 Jun 2014 08:11:13 +0000 (16:11 +0800)]
mmc: host: rk_sdmmmc: fix rk32xx H/W reset

10 years agommc: remove unused macro tag
lin tao [Mon, 16 Jun 2014 07:46:50 +0000 (15:46 +0800)]
mmc: remove unused macro tag

10 years agork fb: fix compile warning
zwl [Mon, 16 Jun 2014 07:35:18 +0000 (15:35 +0800)]
rk fb: fix compile warning

10 years agork3288:pmic:rk808&act8846&ricoh619:fixed msleep to mdelay in shutdown function
张晴 [Mon, 16 Jun 2014 06:39:00 +0000 (14:39 +0800)]
rk3288:pmic:rk808&act8846&ricoh619:fixed msleep to mdelay in shutdown function

10 years agork lcdc: fix compile warning
zwl [Mon, 16 Jun 2014 06:24:00 +0000 (14:24 +0800)]
rk lcdc: fix compile warning

10 years agort5616 : add hp change pump config and spk io control remove
qjb [Mon, 16 Jun 2014 05:45:10 +0000 (13:45 +0800)]
rt5616 : add hp change pump config and spk io control remove

10 years agork hdmi: fix compile warnning
zwl [Mon, 16 Jun 2014 03:18:30 +0000 (11:18 +0800)]
rk hdmi: fix compile warnning

10 years agommc: host: rk_sdmmc:
lin tao [Mon, 16 Jun 2014 02:40:18 +0000 (10:40 +0800)]
mmc: host: rk_sdmmc:
Support physical level three transfer.

10 years agork32 hdmi: no pull down i2c5 when suspend
zwl [Mon, 16 Jun 2014 02:15:56 +0000 (10:15 +0800)]
rk32 hdmi: no pull down i2c5 when suspend

10 years agoaudio:fix last audio commit
zyh [Mon, 16 Jun 2014 01:49:49 +0000 (09:49 +0800)]
audio:fix last audio commit

10 years agop977: Revert "rk3288:pmic:modify gpu not always on by defult"
郭毅 [Mon, 16 Jun 2014 01:36:28 +0000 (09:36 +0800)]
p977: Revert "rk3288:pmic:modify gpu not always on by defult"

10 years agommc: fix compile warning
lin tao [Sun, 15 Jun 2014 23:59:53 +0000 (07:59 +0800)]
mmc: fix compile warning

10 years agoMIPI: 1. update dts; 2. remove warnings
xjh [Sat, 14 Jun 2014 12:06:01 +0000 (20:06 +0800)]
MIPI: 1. update dts; 2. remove warnings

10 years agodp anx6345, dp rk32:fix warining
yxj [Sat, 14 Jun 2014 07:45:28 +0000 (15:45 +0800)]
dp anx6345, dp rk32:fix warining

10 years agoaudio:fix some compile log
zyh [Fri, 13 Jun 2014 13:15:44 +0000 (21:15 +0800)]
audio:fix some compile log

10 years agospdif:fix hclk
zyh [Fri, 13 Jun 2014 12:37:46 +0000 (20:37 +0800)]
spdif:fix hclk

10 years agoresolve the warning: initialization from incompatible pointer type
许盛飞 [Fri, 13 Jun 2014 11:21:41 +0000 (19:21 +0800)]
resolve the warning: initialization from incompatible pointer type

10 years agoRevert "diable vdd_gpu when early suspend"
陈亮 [Fri, 13 Jun 2014 10:36:43 +0000 (03:36 -0700)]
Revert "diable vdd_gpu when early suspend"

This reverts commit 8b0f7177ae661d6579ef71d85b72ba1bcc85403d.

10 years agoRevert "rk3288:pmic:modify gpu not always on by defult"
陈亮 [Fri, 13 Jun 2014 10:36:18 +0000 (03:36 -0700)]
Revert "rk3288:pmic:modify gpu not always on by defult"

This reverts commit ec490fda1f7c40e91143b090c622e504d420b178.

10 years agoRevert "ARM: rockchip: rk3288: power down GPU domain by default"
陈亮 [Fri, 13 Jun 2014 10:35:51 +0000 (03:35 -0700)]
Revert "ARM: rockchip: rk3288: power down GPU domain by default"

This reverts commit 875c39be53ac090fd52c410081e99d2ea17873b9.

10 years agorockchip-cpufreq.c: remove warning
陈亮 [Fri, 13 Jun 2014 10:20:56 +0000 (03:20 -0700)]
rockchip-cpufreq.c: remove warning

10 years agosensor: modify some warnings of sensor_dev.c
郭毅 [Fri, 13 Jun 2014 08:50:38 +0000 (16:50 +0800)]
sensor: modify some warnings of sensor_dev.c

10 years agoUSB: fix compile warnings.
wlf [Fri, 13 Jun 2014 08:47:32 +0000 (16:47 +0800)]
USB: fix compile warnings.

10 years agocamsys_drv: v0.0x11.0
ddl [Fri, 13 Jun 2014 08:24:40 +0000 (16:24 +0800)]
camsys_drv: v0.0x11.0

10 years agommc: host: rk_sdmmc:
lin tao [Fri, 13 Jun 2014 07:23:50 +0000 (15:23 +0800)]
mmc: host: rk_sdmmc:
verid: 270A, Complete H/W Reset programming sequence.

10 years agoi2c: rockchip: fix using smp_processor_id() in preemptible warning
黄涛 [Fri, 13 Jun 2014 07:22:58 +0000 (15:22 +0800)]
i2c: rockchip: fix using smp_processor_id() in preemptible warning

Fix this warning when DEBUG_PREEMPT is selected:
BUG: using smp_processor_id() in preemptible [00000000] code: cfinteractive/72
caller is rockchip_i2c_doxfer+0x58/0x3cc

10 years agocw2015_battery : modify some warnings
郭毅 [Fri, 13 Jun 2014 03:38:54 +0000 (11:38 +0800)]
cw2015_battery : modify some warnings

10 years agoARM: rockchip: rockchip_defconfig enable DMA_CMA
黄涛 [Thu, 12 Jun 2014 13:11:30 +0000 (21:11 +0800)]
ARM: rockchip: rockchip_defconfig enable DMA_CMA

10 years agoMerge tag 'lsk-android-14.05' into develop-3.10
黄涛 [Thu, 12 Jun 2014 13:04:26 +0000 (21:04 +0800)]
Merge tag 'lsk-android-14.05' into develop-3.10

lsk 14.05 android release

Conflicts:
arch/arm/common/Kconfig
arch/arm64/include/asm/arch_timer.h
drivers/staging/android/fiq_debugger/fiq_debugger.c
drivers/usb/Kconfig

10 years agoiclk: rk3288: set hclk_vio when clk_3288_dclk_lcdc0_set_rate
dkl [Thu, 12 Jun 2014 09:59:55 +0000 (17:59 +0800)]
iclk: rk3288: set hclk_vio when clk_3288_dclk_lcdc0_set_rate