firefly-linux-kernel-4.4.55.git
9 years agopwm: add min-duty = 0
许盛飞 [Mon, 10 Nov 2014 01:26:03 +0000 (09:26 +0800)]
pwm: add min-duty = 0

Signed-off-by: 许盛飞 <xsf@rock-chips.com>
9 years agohdmi & fb:
Zheng Yang [Fri, 7 Nov 2014 10:01:48 +0000 (18:01 +0800)]
hdmi & fb:
        For box, we need to set hdmi switch state when insert/remove,
        regardless of whether the device supports audio. So add function
        rk_fb_get_display_policy() to get display policy.

9 years agoRK3036/RK312x,
ljf [Fri, 7 Nov 2014 09:38:08 +0000 (17:38 +0800)]
RK3036/RK312x,
Reactivate hevc/vpu iommu when vpu/hevc start to work, can not work at
the same time.

Signed-off-by: ljf <ljf@rock-chips.com>
9 years agoadd protect mutex when activate iommu device. coresponse to iommu
ljf [Fri, 7 Nov 2014 07:15:50 +0000 (15:15 +0800)]
add protect mutex when activate iommu device. coresponse to iommu
modify.

Signed-off-by: ljf <ljf@rock-chips.com>
9 years agorockchip: iommu: update stall operation
Simon [Fri, 7 Nov 2014 06:04:07 +0000 (14:04 +0800)]
rockchip: iommu: update stall operation

1. Skip stall operation when invalid iommu tlb cache
   because it does not need enter stall mode

2. Add stall operation when detach device

9 years agork312x lcdc:
Zheng Yang [Thu, 6 Nov 2014 09:44:34 +0000 (17:44 +0800)]
rk312x lcdc:
Because rk312x lcdc is not support premul alpha when at
YUV overlay mode, we disable premul alpha under YUV overlay.

9 years agorockchip: iommu: move iommu_reset function to attach_device
Simon [Thu, 6 Nov 2014 08:42:47 +0000 (16:42 +0800)]
rockchip: iommu: move iommu_reset function to attach_device

If master power domain is disabled,at this time to r/w the
iommu register,it would failed.Master call the attach_deivce
means it must power on itself,so iommu_reset in attach_device
can guarantee the safety

Depend on this, we can remove the vpu/hevc GRF relative code

9 years agork3036: fix system halt when suspend
wdc [Thu, 6 Nov 2014 07:46:04 +0000 (15:46 +0800)]
rk3036: fix system halt when suspend

9 years agosar-adc: extra channel is channel-6 via datasheet
wdc [Mon, 3 Nov 2014 09:06:23 +0000 (17:06 +0800)]
sar-adc: extra channel is channel-6 via datasheet

9 years agork fb:
zwl [Thu, 6 Nov 2014 03:36:28 +0000 (11:36 +0800)]
rk fb:
* avoid get the delay of power-ctrl error when 'rockchip,delay' is not set on lcdc node at dts file

Signed-off-by: zwl <zwl@rock-chips.com>
9 years agork fb:
zwl [Wed, 5 Nov 2014 12:14:04 +0000 (20:14 +0800)]
rk fb:
* add support the regulator type of power control for lcd
Signed-off-by: zwl <zwl@rock-chips.com>
9 years agorockchip: iommu: fix some bugs
Simon [Wed, 5 Nov 2014 11:22:39 +0000 (19:22 +0800)]
rockchip: iommu: fix some bugs

1.rewrite irq function
2.rewrite dump_pgtable

9 years agork312x: sdk add temperature data
cl [Wed, 5 Nov 2014 10:45:46 +0000 (18:45 +0800)]
rk312x: sdk add temperature data

Signed-off-by: cl <cl@rock-chips.com>
9 years agork3126-sdk: update dvfs table
cl [Wed, 5 Nov 2014 09:13:11 +0000 (17:13 +0800)]
rk3126-sdk: update dvfs table

Signed-off-by: cl <cl@rock-chips.com>
9 years agodvfs: add leakage adjust volt support
cl [Wed, 5 Nov 2014 09:07:54 +0000 (17:07 +0800)]
dvfs: add leakage adjust volt support

Signed-off-by: cl <cl@rock-chips.com>
9 years agoinput:ir: request rk pwm irq with IRQF_NO_SUSPEND flag
huang zhibao [Wed, 5 Nov 2014 07:44:37 +0000 (15:44 +0800)]
input:ir: request rk pwm irq with IRQF_NO_SUSPEND flag

9 years agoAudio: add 192k samplerate support.
sugar [Wed, 5 Nov 2014 05:25:47 +0000 (13:25 +0800)]
Audio: add 192k samplerate support.

9 years agodvfs: add pvtm support
cl [Wed, 5 Nov 2014 02:00:00 +0000 (10:00 +0800)]
dvfs: add pvtm support

Signed-off-by: cl <cl@rock-chips.com>
9 years agork3288: fix i2c1 and i2c2 clk gating error
wdc [Wed, 5 Nov 2014 01:26:08 +0000 (09:26 +0800)]
rk3288: fix i2c1 and i2c2 clk gating error

9 years agork3036:add lcdc in aliases for uboot display
smj [Wed, 5 Nov 2014 00:56:26 +0000 (08:56 +0800)]
rk3036:add lcdc in aliases for uboot display

9 years agoefuse: add rockchip_process_version function
cl [Tue, 4 Nov 2014 08:02:14 +0000 (16:02 +0800)]
efuse: add rockchip_process_version function

Signed-off-by: cl <cl@rock-chips.com>
9 years agork3126-sdk: modify cd-gpios
lintao [Tue, 4 Nov 2014 07:19:30 +0000 (15:19 +0800)]
rk3126-sdk: modify cd-gpios

9 years agork3288-resume: save the wake-up time
许盛飞 [Mon, 3 Nov 2014 19:00:53 +0000 (03:00 +0800)]
rk3288-resume: save the wake-up time

Signed-off-by: 许盛飞 <xsf@rock-chips.com>
9 years agoadc-battery: add the function of auto-calibration the reference-voltage
许盛飞 [Mon, 3 Nov 2014 02:05:29 +0000 (10:05 +0800)]
adc-battery: add the function of auto-calibration the reference-voltage

Signed-off-by: 许盛飞 <xsf@rock-chips.com>
9 years agork312x camera : oneframe v0.1.9,pingpong v0.1.9
zyc [Mon, 3 Nov 2014 09:42:04 +0000 (17:42 +0800)]
rk312x camera : oneframe v0.1.9,pingpong v0.1.9

9 years agork312x:lcdc:
zwl [Fri, 31 Oct 2014 10:21:13 +0000 (18:21 +0800)]
rk312x:lcdc:
* set dither down according to primary screen face when DUAL display
  for fix the color gradation of display

Signed-off-by: zwl <zwl@rock-chips.com>
Signed-off-by: xzj <xzj@rock-chips.com>
9 years agork312x lcdc: kernel bcsh selete depend on uboot config
hjc [Fri, 31 Oct 2014 08:48:32 +0000 (16:48 +0800)]
rk312x lcdc: kernel bcsh selete depend on uboot config

9 years agospdif : disable the spdif debug print
smj [Fri, 31 Oct 2014 08:10:05 +0000 (16:10 +0800)]
spdif : disable the spdif debug print

9 years agork3036: update rk3036 rk88 dts
smj [Fri, 31 Oct 2014 02:35:01 +0000 (10:35 +0800)]
rk3036: update rk3036 rk88 dts

9 years ago及时清除cvbsformat位,保证CVBS待机唤醒能够设置TVE寄存器
ShenZhengyi [Fri, 31 Oct 2014 02:01:50 +0000 (10:01 +0800)]
及时清除cvbsformat位,保证CVBS待机唤醒能够设置TVE寄存器

9 years agoWifi:bcmdhd: fix p2p error after driver stop cmd.
gwl [Fri, 31 Oct 2014 01:17:26 +0000 (09:17 +0800)]
Wifi:bcmdhd: fix p2p error after driver stop cmd.

9 years agork fb:
zwl [Thu, 30 Oct 2014 09:58:06 +0000 (17:58 +0800)]
rk fb:
* fix fence timeout when set hdmi scaler or switch hdmi resolution if at ONE_DUAL display mode

Signed-off-by: zwl <zwl@rock-chips.com>
Signed-off-by: xzj <xzj@rock-chips.com>
9 years agork mipi: modify debugfs of mipi
chenyifu [Wed, 29 Oct 2014 10:05:12 +0000 (18:05 +0800)]
rk mipi: modify debugfs of mipi

  It outputed the debugfs info of mipi to UART earlier.
  But it is inconvenient.
  It can output the debugfs info of mipi's to the kmesg now.

9 years agousb: ehci: add attribute to start usb eye-pattern test
lyz [Wed, 29 Oct 2014 00:57:18 +0000 (08:57 +0800)]
usb: ehci: add attribute to start usb eye-pattern test

9 years agousb: dwc_otg: add attribute to start usb eye-pattern test
lyz [Tue, 28 Oct 2014 08:54:25 +0000 (16:54 +0800)]
usb: dwc_otg: add attribute to start usb eye-pattern test

9 years agommc: add more dbg info for dto
lintao [Wed, 29 Oct 2014 00:25:44 +0000 (08:25 +0800)]
mmc: add more dbg info for dto

9 years agoaudio : fix the problem of usb-audio code
smj [Tue, 28 Oct 2014 08:47:54 +0000 (16:47 +0800)]
audio : fix the problem of usb-audio code

9 years agoARM: rockchip: rk3288-tb_8846.dts: default disable spi
黄涛 [Tue, 28 Oct 2014 08:30:59 +0000 (16:30 +0800)]
ARM: rockchip: rk3288-tb_8846.dts: default disable spi

9 years agoARM: rockchip: rk3288.dtsi: default disable crypto clk
黄涛 [Tue, 28 Oct 2014 07:04:13 +0000 (15:04 +0800)]
ARM: rockchip: rk3288.dtsi: default disable crypto clk

9 years agoiio: rockchip_adc: dynamically control clk
黄涛 [Tue, 28 Oct 2014 07:00:57 +0000 (15:00 +0800)]
iio: rockchip_adc: dynamically control clk

9 years agoi2c: rockchip: dynamically control clk
黄涛 [Tue, 28 Oct 2014 06:59:58 +0000 (14:59 +0800)]
i2c: rockchip: dynamically control clk

9 years agohwmon: rockchip_tsadc: dynamically control pclk
黄涛 [Tue, 28 Oct 2014 06:59:08 +0000 (14:59 +0800)]
hwmon: rockchip_tsadc: dynamically control pclk

9 years agork: ion: add buffer mmap/munmap trace
CMY [Tue, 28 Oct 2014 08:17:57 +0000 (16:17 +0800)]
rk: ion: add buffer mmap/munmap trace

9 years agoaudio : fix usb audio no sound problem.
smj [Tue, 28 Oct 2014 06:46:03 +0000 (14:46 +0800)]
audio : fix usb audio no sound problem.

9 years agommc: remove useless pcl to udbg when routine card from mmc bus probe.
lintao [Tue, 28 Oct 2014 00:47:12 +0000 (08:47 +0800)]
mmc: remove useless pcl to udbg when routine card from mmc bus probe.

When kernel booting for the first time, pcl may cause incorrect
state for bus timing which cause detect failure from bus porbe, and been
recoginzed well from driver probe. Check cd state, and avoid this action.
.
[    5.112563] dwmmc_rockchip 10214000.rksdmmc: data_over interrupt timeout!
[    5.112704] mmc1: error -84 whilst initialising SD card
...
[    5.201691] mmc1: new high speed SDHC card at address 0007
[    5.202583] mmcblk1: mmc1:0007 SD32G 29.3 GiB

Tested-and-acked-by: heyun <heyun@rock-chips.com>
Signed-off-by: lintao <lintao@rock-chips.com>
9 years agommc: only stop edmac if slot state really changed
lintao [Mon, 27 Oct 2014 05:53:16 +0000 (13:53 +0800)]
mmc: only stop edmac if slot state really changed

   This commit follow up with 27dc823e, avoid unnecessary emdac operation
in routine card of bh.

Signed-off-by: lintao <lintao@rock-chips.com>
9 years agoARM: rockchip: cpu.c support export cpu version
黄涛 [Mon, 27 Oct 2014 10:39:14 +0000 (18:39 +0800)]
ARM: rockchip: cpu.c support export cpu version

9 years agocamera : enable UVC camera configs as default.
zyc [Mon, 27 Oct 2014 08:08:07 +0000 (16:08 +0800)]
camera : enable UVC camera configs as default.

9 years agousb: dwc_otg: in some low-memory cases BURST_INCR16 mode will cause kernel crash
lyz [Mon, 27 Oct 2014 06:49:38 +0000 (14:49 +0800)]
usb: dwc_otg: in some low-memory cases BURST_INCR16 mode will cause kernel crash

9 years agork3036: gpu: build gpu as module
Simon [Mon, 27 Oct 2014 01:41:27 +0000 (09:41 +0800)]
rk3036: gpu: build gpu as module

9 years agork:pmic:rk808&rk818:modify some warning
张晴 [Fri, 24 Oct 2014 07:35:01 +0000 (15:35 +0800)]
rk:pmic:rk808&rk818:modify some warning

9 years agork312x mipi: enable the non-continued function for mipi
chenyifu [Fri, 24 Oct 2014 02:49:45 +0000 (10:49 +0800)]
rk312x mipi: enable the non-continued function for mipi

9 years agork312x:clk:support clk_cif set 24M
张晴 [Fri, 24 Oct 2014 01:09:26 +0000 (09:09 +0800)]
rk312x:clk:support clk_cif set 24M

9 years agork312x-dts: disable gmac
heyun [Fri, 24 Oct 2014 00:43:22 +0000 (08:43 +0800)]
rk312x-dts: disable gmac

9 years agork312x: lcdc:
zwl [Thu, 23 Oct 2014 10:11:01 +0000 (18:11 +0800)]
rk312x: lcdc:
        * add update dclk freq when uboot-logo-on is set

Signed-off-by: zwl <zwl@rock-chips.com>
9 years agork312x:rt5036:support power off when charge
张晴 [Thu, 23 Oct 2014 08:59:08 +0000 (16:59 +0800)]
rk312x:rt5036:support power off when charge

9 years agork3288: tb.dts: default disable gmac.
郭毅 [Thu, 23 Oct 2014 08:17:31 +0000 (16:17 +0800)]
rk3288: tb.dts: default disable gmac.

9 years agork312x dts: disable ethernet
heyun [Thu, 23 Oct 2014 02:07:40 +0000 (10:07 +0800)]
rk312x dts: disable ethernet

9 years agofb:box:
Zheng Yang [Thu, 23 Oct 2014 00:53:49 +0000 (08:53 +0800)]
fb:box:
When vop suspend, no need to check register value.

9 years agommc: Hynix 4.41 iNAND no trim quirk patch from mediatek
lintao [Wed, 22 Oct 2014 06:59:23 +0000 (14:59 +0800)]
mmc: Hynix 4.41 iNAND no trim quirk patch from mediatek

9 years agork3288: lcdc:
zwl [Wed, 22 Oct 2014 02:07:58 +0000 (10:07 +0800)]
rk3288: lcdc:
* fix the register value of BCSH is different of the value configed at uboot

Signed-off-by: zwl <zwl@rock-chips.com>
9 years agommc: v2: fix wrong mszs calculation for edmac.
lintao [Wed, 22 Oct 2014 00:13:05 +0000 (08:13 +0800)]
mmc: v2: fix wrong mszs calculation for edmac.
Change log v2: update logical operation for FIFOTH

9 years agork312x:lcdc:
zwl [Tue, 21 Oct 2014 10:46:24 +0000 (18:46 +0800)]
rk312x:lcdc:
* fix screen flash when suspend like at charge ui init or pcba ui init
* set uboot logo on as open at dst node

Signed-off-by: zwl <zwl@rock-chips.com>
9 years agofb:
Zheng Yang [Tue, 21 Oct 2014 09:31:57 +0000 (17:31 +0800)]
fb:
Define dts node disp-policy vale:
DISPLAY_POLICY_SDK
DISPLAY_POLICY_BOX

9 years agohdmi:
Zheng Yang [Tue, 21 Oct 2014 08:58:42 +0000 (16:58 +0800)]
hdmi:
        Temporary diable YUV output. For some sink may not recognize
        yuv format correctly, then picture will mask a pink layer.
        Especially monitor device.

9 years agork3036: set clk_core to 1.2GHZ and clk_gpu to 400MHZ
smj [Tue, 21 Oct 2014 08:53:10 +0000 (16:53 +0800)]
rk3036: set clk_core to 1.2GHZ and clk_gpu to 400MHZ

9 years agommc: fix wrong mszs calculation for edmac.
lintao [Tue, 21 Oct 2014 07:14:13 +0000 (15:14 +0800)]
mmc: fix wrong mszs calculation for edmac.

Internal dmac set mszs from 0 ~ 7, means {1, 4, 8, 16,
32, 64, 128, 256} respectively. But mszs is difference from another
if it's edmac been used indeed.External dmac limit it from 0 ~ 16
, and we select mszs from FIFOTH calculated before to lookup table
in order to find mszs fitable for edmac.

Signed-off-by: lintao <lintao@rock-chips.com>
Tested-and-acked-by: lw <lw@rock-chips.com>
9 years agoRevert "mmc: lookup mszs for edmac, diff M base from idmac"
lintao [Tue, 21 Oct 2014 06:56:40 +0000 (14:56 +0800)]
Revert "mmc: lookup mszs for edmac, diff M base from idmac"

This reverts commit 006e7b478d3e63583f91598d5e28111c1ccb0df9.

9 years agork3036/rk312x lcdc:
Zheng Yang [Tue, 21 Oct 2014 06:37:40 +0000 (14:37 +0800)]
rk3036/rk312x lcdc:
        1. Disable some unused code.
        2. Fix actived layer status error when enable alpha mode.
        3. We need to update layer status in config_done when use
           RK_FBIOSET_CONFIG_DONE ioctl.

9 years agofb:
Zheng Yang [Tue, 21 Oct 2014 06:37:09 +0000 (14:37 +0800)]
fb:
        Add disp-policy in dts and disp_policy in struct rk_fb
        to distinguish box and sdk display policy.

9 years agommc: lookup mszs for edmac, diff M base from idmac
lintao [Tue, 21 Oct 2014 05:01:55 +0000 (13:01 +0800)]
mmc: lookup mszs for edmac, diff M base from idmac

9 years agoWifi: close the rtl8189es's debug log.
li bing [Tue, 21 Oct 2014 02:27:37 +0000 (10:27 +0800)]
Wifi: close the rtl8189es's debug log.

9 years agoethernet:vmac: enable vmac in rockchip_defconfig for rk3036
cz [Mon, 20 Oct 2014 08:13:18 +0000 (16:13 +0800)]
ethernet:vmac: enable vmac in rockchip_defconfig for rk3036

9 years agork3036 hdmi:
Zheng Yang [Mon, 20 Oct 2014 06:22:09 +0000 (14:22 +0800)]
rk3036 hdmi:
Add 20ms delay between irq and work thread to make
sure hdmi connection status stable.

9 years agork3036:
li bing [Mon, 20 Oct 2014 03:41:19 +0000 (11:41 +0800)]
rk3036:
      1.add uart0 & bluetooth.
      2.add 'wifi_chip_type' note.
rk3128:
      2.add 'wifi_chip_type' note.

9 years agowifi->esp8089: update driver ver 1.8:
li bing [Mon, 20 Oct 2014 02:18:31 +0000 (10:18 +0800)]
wifi->esp8089: update driver ver 1.8:
  1.Repair the coexistence of bluetooth module (unused coexistence agreement possible WIFI does not work).
  2.increasing the compatibility of kernel3.10.
  3.strengthen SoftAP and P2P GO the performance of the model.

9 years agork fb: fix get fb info addr error if at fb0-win1 map when close fb
zwl [Mon, 20 Oct 2014 02:53:03 +0000 (10:53 +0800)]
rk fb: fix get fb info addr error if at fb0-win1 map when close fb

9 years agorockchip_defconfig: support rk3036 lcdc.
Zheng Yang [Mon, 20 Oct 2014 02:31:18 +0000 (10:31 +0800)]
rockchip_defconfig: support rk3036 lcdc.

9 years agork3036 : add the rk3036 sound config to rochchip_defconfig
smj [Mon, 20 Oct 2014 02:27:58 +0000 (10:27 +0800)]
rk3036 : add the rk3036 sound config to rochchip_defconfig

9 years agofix rga2 dst yuv offset addr generate error
zsq [Mon, 20 Oct 2014 00:26:32 +0000 (08:26 +0800)]
fix rga2 dst yuv offset addr generate error

9 years agork312x:lcdc: the temporary solution for fix charge display flash
zwl [Fri, 17 Oct 2014 08:40:03 +0000 (16:40 +0800)]
rk312x:lcdc: the temporary solution for fix charge display flash

9 years agork312x box: enable gpio_poweroff driver
smj [Fri, 17 Oct 2014 07:59:04 +0000 (15:59 +0800)]
rk312x box: enable gpio_poweroff driver

9 years agospi:improve spi dma burst
Luowei [Fri, 17 Oct 2014 03:26:01 +0000 (11:26 +0800)]
spi:improve spi dma burst

9 years agork fb:
zwl [Fri, 17 Oct 2014 03:04:11 +0000 (11:04 +0800)]
rk fb:
* fix get share dma buf fd failed when stop and start system

Signed-off-by: zwl <zwl@rock-chips.com>
9 years agochargedisplay: add for adc-battery-driver
许盛飞 [Fri, 17 Oct 2014 02:36:52 +0000 (10:36 +0800)]
chargedisplay: add for adc-battery-driver

Signed-off-by: 许盛飞 <xsf@rock-chips.com>
9 years agoDMA:pl330: add burst length config
hhb [Fri, 17 Oct 2014 01:17:41 +0000 (09:17 +0800)]
DMA:pl330: add burst length config

9 years agork3036/rk3128 tve: fix compile error.
Zheng Yang [Fri, 17 Oct 2014 00:52:40 +0000 (08:52 +0800)]
rk3036/rk3128 tve: fix compile error.

9 years agork312x_lcdc.c
Zheng Yang [Thu, 16 Oct 2014 09:42:33 +0000 (17:42 +0800)]
rk312x_lcdc.c
1. Fix code style.
2. We need to stanby vop when reconfigure vop output timing.
3. Disabling win0 instead of stanby vop when enable iommu at
   uboot logo mode.

9 years agork3036/rk312x hdmi:
Zheng Yang [Thu, 16 Oct 2014 09:42:09 +0000 (17:42 +0800)]
rk3036/rk312x hdmi:
        We need to check hdmi connect status in probe hdmi. If hdmi is
        enable in uboot, and is removed before kernel, we will power
        down hdmi, and set it as disconnected.

9 years agork3036/rk3128 tve: support uboot logo display.
Zheng Yang [Thu, 16 Oct 2014 09:36:03 +0000 (17:36 +0800)]
rk3036/rk3128 tve: support uboot logo display.

9 years agork3036 :
smj [Thu, 16 Oct 2014 09:23:24 +0000 (17:23 +0800)]
rk3036 :

    - Audio : spdif: add spdif card or not according dts define.
    - Other : enable gpio_poweroff driver.

9 years agork3126-86v: disable usb uart bypass function
cl [Thu, 16 Oct 2014 08:49:47 +0000 (16:49 +0800)]
rk3126-86v: disable usb uart bypass function

Signed-off-by: cl <cl@rock-chips.com>
9 years agoblock: support embedded device command line partition
Cai Zhiyong [Wed, 11 Sep 2013 21:20:09 +0000 (14:20 -0700)]
block: support embedded device command line partition

Read block device partition table from command line.  The partition used
for fixed block device (eMMC) embedded device.  It is no MBR, save
storage space.  Bootloader can be easily accessed by absolute address of
data on the block device.  Users can easily change the partition.

This code reference MTD partition, source "drivers/mtd/cmdlinepart.c"
About the partition verbose reference
"Documentation/block/cmdline-partition.txt"

[akpm@linux-foundation.org: fix printk text]
[yongjun_wei@trendmicro.com.cn: fix error return code in parse_parts()]
Signed-off-by: Cai Zhiyong <caizhiyong@huawei.com>
Cc: Karel Zak <kzak@redhat.com>
Cc: "Wanglin (Albert)" <albert.wanglin@huawei.com>
Cc: Marius Groeger <mag@sysgo.de>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Artem Bityutskiy <dedekind@infradead.org>
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Conflicts:
block/partitions/Kconfig
block/partitions/Makefile
block/partitions/check.c

9 years agocpufreq: set suspend volt to 1.1V for 40nm process, fix reboot err when vdd_arm regul...
cl [Thu, 16 Oct 2014 03:13:05 +0000 (11:13 +0800)]
cpufreq: set suspend volt to 1.1V for 40nm process, fix reboot err when vdd_arm regulator is not registered

Signed-off-by: cl <cl@rock-chips.com>
9 years agorockchip: add gpio_poweroff driver
cl [Thu, 16 Oct 2014 02:47:26 +0000 (10:47 +0800)]
rockchip: add gpio_poweroff driver

Signed-off-by: cl <cl@rock-chips.com>
9 years agork3036:enable uboot display
Sun Mingjun [Thu, 16 Oct 2014 02:01:24 +0000 (10:01 +0800)]
rk3036:enable uboot display

9 years agork fb: add rk_fb_par data struct to store more fb info
zwl [Thu, 16 Oct 2014 02:02:46 +0000 (10:02 +0800)]
rk fb: add rk_fb_par data struct to store more fb info

9 years agork312x : audio : fix the box audio crash bug when recording
Sun Mingjun [Thu, 16 Oct 2014 00:39:31 +0000 (08:39 +0800)]
rk312x : audio : fix the box audio crash bug when recording

9 years agork: ion: add drm heap for secure buffer allocation
CMY [Tue, 14 Oct 2014 10:32:42 +0000 (18:32 +0800)]
rk: ion: add drm heap for secure buffer allocation

9 years agork3036 lcdc: fix uboot display logo kernel open iommu splash
Zheng Yang [Wed, 15 Oct 2014 06:31:21 +0000 (14:31 +0800)]
rk3036 lcdc: fix uboot display logo kernel open iommu splash