firefly-linux-kernel-4.4.55.git
9 years agowifi: support random mac address and save to file
hwg [Mon, 20 Apr 2015 08:09:08 +0000 (16:09 +0800)]
wifi: support random mac address and save to file

9 years agowifi driver: rtl8723bs, rtl8723bs-vq0, rtl8723bu, rtl8812au, modify custom mac addr...
hwg [Mon, 20 Apr 2015 08:07:18 +0000 (16:07 +0800)]
wifi driver: rtl8723bs, rtl8723bs-vq0, rtl8723bu, rtl8812au, modify custom mac addr error problem

9 years agobcmdhd wifi driver: support custom mac address
hwg [Wed, 15 Apr 2015 01:35:46 +0000 (09:35 +0800)]
bcmdhd wifi driver: support custom mac address

9 years agobcmdhd wifi driver: use kthread to run dhd_module_init, save time in initcall
hwg [Mon, 13 Apr 2015 00:37:27 +0000 (08:37 +0800)]
bcmdhd wifi driver: use kthread to run dhd_module_init, save time in initcall

9 years agoHDMI: calling rk_fb_switch_screen() to close vop related to HDMI
Zheng Yang [Sat, 11 Apr 2015 09:14:07 +0000 (17:14 +0800)]
HDMI: calling rk_fb_switch_screen() to close vop related to HDMI
      before calling switch_set_state() when HDMI is removed.
      For android hwcompser need to make sure vop is disabled when
      received hdmi removing event.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agork3036: usb: add support of wakeup by GRF linestate change
lyz [Fri, 10 Apr 2015 03:44:49 +0000 (11:44 +0800)]
rk3036: usb: add support of wakeup by GRF linestate change

9 years agoHDMI: call function hdmi->ops->disable() if it is disabled.
Zheng Yang [Thu, 9 Apr 2015 10:01:51 +0000 (18:01 +0800)]
HDMI: call function hdmi->ops->disable() if it is disabled.
      For system can not be wakeup under following case:
      step1. Disable HDMI.
      step2. set system to deep sleep mode.
      step3. remove HDMI connection.
      step4. wake up system.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agoHDMI: improve cec function:
Zheng Yang [Thu, 2 Apr 2015 08:56:40 +0000 (16:56 +0800)]
HDMI: improve cec function:
        1. To get logic address more stable, we ping 3 times to each
   logic address. If the result is NACK for two times, this
   logic address is not occupied.
        2. If transmmit cec data failed, retry immediately.
        4. set CECOP_IMAGE_VIEW_ON only taget to TV, not broadcasting.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agoHDMI: fix edid mode list error: set head->prev to edid->modelist.
Zheng Yang [Thu, 2 Apr 2015 08:49:50 +0000 (16:49 +0800)]
HDMI: fix edid mode list error: set head->prev to edid->modelist.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agomodify wifi: load driver when kernel bootup:
hwg [Wed, 1 Apr 2015 13:22:35 +0000 (21:22 +0800)]
modify wifi: load driver when kernel bootup:
 can increase speed of wifi open/close
 can solve memory alloc fail when open wifi

9 years agorockchip: rk312x: vop: fix iommu crash when resume
Mark Yao [Wed, 1 Apr 2015 06:11:43 +0000 (14:11 +0800)]
rockchip: rk312x: vop: fix iommu crash when resume

Maybe win is enabled and H/W address is not a vaild
iommu mapped addr, So we need delay to ensure H/W
switch done before enable iommu.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
9 years agovideo: rockchip: update display buffer dump
Mark Yao [Wed, 1 Apr 2015 01:54:02 +0000 (09:54 +0800)]
video: rockchip: update display buffer dump

Create a new sys node "/sys/class/graphics/fb0/dump_buf" to dump
display buffer.

Now can support trace multi frames and kernel logo dump.
More info see by "cat /sys/class/graphics/fb0/dump_buf"

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
9 years agortl8723bs rtl8723bu wifi: disable debug log
hwg [Tue, 31 Mar 2015 09:45:55 +0000 (17:45 +0800)]
rtl8723bs rtl8723bu wifi: disable debug log

9 years agoRevert "rk fb: add consider vop full mutile area for vsync register check"
hjc [Mon, 30 Mar 2015 10:18:44 +0000 (18:18 +0800)]
Revert "rk fb: add consider vop full mutile area for vsync register check"

This reverts commit e9f19a9255823d502c59f6a65c0643baeb070649.

9 years agork fb: add consider vop full mutile area for vsync register check
hjc [Mon, 30 Mar 2015 10:02:23 +0000 (18:02 +0800)]
rk fb: add consider vop full mutile area for vsync register check

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agoHDMI: rockchip-hdmiv2:
Zheng Yang [Thu, 26 Mar 2015 08:18:38 +0000 (16:18 +0800)]
HDMI: rockchip-hdmiv2:
Set i2c5_hdmi to gpio mode when suspend and reset
it to hdmi ddc mode when system resume.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agoHDMI: add dts node "rockchip,defaultmode" to define HDMI default output mode.
Zheng Yang [Thu, 26 Mar 2015 06:40:32 +0000 (14:40 +0800)]
HDMI: add dts node "rockchip,defaultmode" to define HDMI default output mode.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agohjc already fix this problem, so
Mark Yao [Thu, 26 Mar 2015 06:26:24 +0000 (14:26 +0800)]
hjc already fix this problem, so

Revert "rk_fb: fix kernel logo display"

This reverts commit 959b2148aedecebb9d41c9faae48a9235f2941c1.
fixed by:
  commit ad5ae9748644e16522b034a9a3ec5818cc10ec48
  Author: hjc <hjc@rock-chips.com>
  Date:   Thu Feb 26 18:27:40 2015 +0800

    rk fb: if uboot-logo-on set 1, open iommu when iommu en

9 years agork_fb: fix kernel logo display
Mark Yao [Thu, 26 Mar 2015 06:15:21 +0000 (14:15 +0800)]
rk_fb: fix kernel logo display

If we use origin kernel logo config, default path would not enable
iommu, we maybe get a black display.

so just enable iommu when we do fb_pan_display.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
9 years agomipi: correct coding style error of rk32_mipi_dsi.c
xubilv [Wed, 25 Mar 2015 09:51:07 +0000 (17:51 +0800)]
mipi: correct coding style error of rk32_mipi_dsi.c

Signed-off-by: xubilv <xbl@rock-chips.com>
9 years agoHDMI: fix feature SUPPORT_TMDS_600M filter error.
Zheng Yang [Wed, 25 Mar 2015 10:46:56 +0000 (18:46 +0800)]
HDMI: fix feature SUPPORT_TMDS_600M filter error.
For some sink device, it's max tmdsclk is only 300M, but
it support 4K YUV420 mode, so it can be filted by feature
SUPPORT_TMDS_600M under current code.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agoupdate 8723bu wifi driver
xxh [Wed, 25 Mar 2015 04:19:16 +0000 (12:19 +0800)]
update 8723bu wifi driver
1.Improve_P2P_compatibility for Android L
2.Fix_HiddenAP_handle
3.P2P ScanSparse For Miracas

9 years agork fb: add lut for CABC
hjc [Mon, 23 Mar 2015 08:29:34 +0000 (16:29 +0800)]
rk fb: add lut for CABC

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: only use iommu need to check config
hjc [Mon, 23 Mar 2015 08:08:43 +0000 (16:08 +0800)]
rk fb: only use iommu need to check config

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agoDMA: pl330: add chan_status to mutex between pl330_tasklet and pl330_control DMA_TERM...
Huibin Hong [Mon, 23 Mar 2015 09:11:09 +0000 (17:11 +0800)]
DMA: pl330: add chan_status to mutex between pl330_tasklet and pl330_control DMA_TERMINATE_ALL

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
9 years agocamsys_drv: v0.0x1e.0
dalon.zhang [Mon, 23 Mar 2015 08:43:14 +0000 (16:43 +0800)]
camsys_drv: v0.0x1e.0

9 years agork fb: box product not need to load screen when switch screen par enable is zero
hjc [Mon, 23 Mar 2015 07:20:27 +0000 (15:20 +0800)]
rk fb: box product not need to load screen when switch screen par enable is zero

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: fix open hdmi open backlight again in no dual mode
hjc [Tue, 16 Dec 2014 02:00:55 +0000 (10:00 +0800)]
rk fb: fix open hdmi open backlight again in no dual mode

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork3368 lcdc: support win mirror and update NO_DUAL mode
hjc [Fri, 12 Dec 2014 07:01:28 +0000 (15:01 +0800)]
rk3368 lcdc: support win mirror and update NO_DUAL mode

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: compatible when 32bit system call used on 64bit kernel
hjc [Thu, 25 Dec 2014 03:26:52 +0000 (11:26 +0800)]
rk fb: compatible when 32bit system call used on 64bit kernel

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork3368 lcdc: add CABC mode config
hjc [Fri, 9 Jan 2015 06:44:04 +0000 (14:44 +0800)]
rk3368 lcdc: add CABC mode config

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agorevert drivers/hid/uhid.c of commit 522c0bb37a66e65b704a4bd0f1bee7fec526dd32
hwg [Mon, 23 Mar 2015 06:53:04 +0000 (14:53 +0800)]
revert drivers/hid/uhid.c of commit 522c0bb37a66e65b704a4bd0f1bee7fec526dd32
  solve uhid Bad address error in 64bit cpu

9 years agork fb: if not want the config effect,set reserved[3] bit[0] 1
hjc [Mon, 9 Mar 2015 10:09:37 +0000 (18:09 +0800)]
rk fb: if not want the config effect,set reserved[3] bit[0] 1

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: if uboot-logo-on set 1, open iommu when iommu en
hjc [Thu, 26 Feb 2015 10:27:40 +0000 (18:27 +0800)]
rk fb: if uboot-logo-on set 1, open iommu when iommu en

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: update pixclock init value and scale mode only support ONE_DUAL mode
hjc [Wed, 18 Mar 2015 08:26:49 +0000 (16:26 +0800)]
rk fb: update pixclock init value and scale mode only support ONE_DUAL mode

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: add win mirror pos config
hjc [Tue, 23 Dec 2014 06:26:48 +0000 (14:26 +0800)]
rk fb: add win mirror pos config

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: add support phy address config
hjc [Fri, 20 Mar 2015 02:53:50 +0000 (10:53 +0800)]
rk fb: add support phy address config

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: compatible with 32 bit system
hjc [Tue, 17 Mar 2015 06:31:01 +0000 (14:31 +0800)]
rk fb: compatible with 32 bit system

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agodvfs: add gpu temperate control
Xiao Feng [Thu, 12 Mar 2015 11:56:11 +0000 (19:56 +0800)]
dvfs: add gpu temperate control

Signed-off-by: Xiao Feng <xf@rock-chips.com>
9 years agofix rga timeout mmu buf free bug
zsq [Thu, 19 Mar 2015 08:22:23 +0000 (16:22 +0800)]
fix rga timeout mmu buf free bug

9 years agocamsys_drv: v0.0x1d.0
dalon.zhang [Thu, 19 Mar 2015 08:17:47 +0000 (16:17 +0800)]
camsys_drv: v0.0x1d.0

9 years agowifi: remove make modules configs
hwg [Thu, 19 Mar 2015 00:51:22 +0000 (08:51 +0800)]
wifi: remove make modules configs

9 years agocamsys_head: v0.0xb.0
dalon.zhang [Wed, 18 Mar 2015 13:22:06 +0000 (21:22 +0800)]
camsys_head: v0.0xb.0

9 years agork_sdmmc: recalculate audib rx_wmark
xiaoyao [Wed, 18 Mar 2015 03:43:16 +0000 (11:43 +0800)]
rk_sdmmc: recalculate audib rx_wmark
AudiB contain a less limitation in rx_wmark.

Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
Signed-off-by: lintao <lintao@rock-chips.com>
9 years agousb: dwc_otg: enable clk and exit suspend when usb_core_reset
lyz [Tue, 17 Mar 2015 10:10:24 +0000 (18:10 +0800)]
usb: dwc_otg: enable clk and exit suspend when usb_core_reset

Avoid this warning message "WARN::dwc_otg_core_reset:5543:
dwc_otg_core_reset() HANG! AHB Idle GRSTCTL=4000020"

9 years agommc: use ilog2 for fifoth calculation
lintao [Tue, 17 Mar 2015 08:49:37 +0000 (16:49 +0800)]
mmc: use ilog2 for fifoth calculation

Signed-off-by: lintao <lintao@rock-chips.com>
9 years agodtsi: sdmmc: add card_detect for udbg
lintao [Sat, 7 Mar 2015 07:14:10 +0000 (15:14 +0800)]
dtsi: sdmmc: add card_detect for udbg

Signed-off-by: lintao <lintao@rock-chips.com>
9 years agowifi: use buildin instand of ko for compatibility
hwg [Tue, 17 Mar 2015 03:43:32 +0000 (11:43 +0800)]
wifi: use buildin instand of ko for compatibility

9 years agodts: add work and power led in rk3128-box.dts
huang zhibao [Tue, 17 Mar 2015 01:29:06 +0000 (09:29 +0800)]
dts: add work and power led in rk3128-box.dts

9 years agoMerge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
huang zhibao [Tue, 17 Mar 2015 01:18:32 +0000 (09:18 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10

9 years agoMerge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
huang zhibao [Mon, 16 Mar 2015 09:39:19 +0000 (17:39 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10

9 years agousb: dwc_otg: fix bug in device_init routine
lyz [Mon, 16 Mar 2015 09:11:48 +0000 (17:11 +0800)]
usb: dwc_otg: fix bug in device_init routine

1.wait epenable bit timeout decrease from 10s to 1s
2.fix bug, without 'j++' this loop never break if there is some
problem with ep state

9 years agousb: ehci: fix suspend bug
lyz [Wed, 11 Mar 2015 09:33:17 +0000 (17:33 +0800)]
usb: ehci: fix suspend bug

9 years agousb: dwc_otg: change method of checking urb dequeue status
lyz [Wed, 11 Mar 2015 09:44:14 +0000 (17:44 +0800)]
usb: dwc_otg: change method of checking urb dequeue status

According to commit e9df41c5c, change dwc_otg driver to call
usb_hcd_link_urb_to_ep() and usb_hcd_unlink_urb_from_ep() routine
for checking urb dequeue status instead check for null pointer
by hcd driver to test address.

TEST:
1.rk3126 run host/device change script for 10000 times

9 years agork818-battery: add calibration of charge and discharge
许盛飞 [Mon, 16 Mar 2015 01:20:41 +0000 (09:20 +0800)]
rk818-battery: add calibration of charge and discharge

Signed-off-by: 许盛飞 <xsf@rock-chips.com>
9 years agork818-battery: enable parse battery params
许盛飞 [Mon, 16 Mar 2015 01:19:02 +0000 (09:19 +0800)]
rk818-battery: enable parse battery params

Signed-off-by: 许盛飞 <xsf@rock-chips.com>
9 years agork818-battery: reconstruct the voltage discharge algorithm
许盛飞 [Mon, 16 Mar 2015 01:16:57 +0000 (09:16 +0800)]
rk818-battery: reconstruct the voltage discharge algorithm

Signed-off-by: 许盛飞 <xsf@rock-chips.com>
9 years agork32xx lvds: add support lvds 10bit mode
hjc [Fri, 13 Mar 2015 11:37:26 +0000 (19:37 +0800)]
rk32xx lvds: add support lvds 10bit mode

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agoMerge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
huang zhibao [Fri, 13 Mar 2015 06:58:46 +0000 (14:58 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10

9 years agoafter support different wifi bt chip auto compatible commit for android 5.0, compatib...
hwg [Fri, 13 Mar 2015 02:32:05 +0000 (10:32 +0800)]
after support different wifi bt chip auto compatible commit for android 5.0, compatible with android 4.4

9 years agousb: fix compliation warning without CONFIG_RK_DEBUG_UART
lyz [Thu, 12 Mar 2015 14:15:33 +0000 (22:15 +0800)]
usb: fix compliation warning without CONFIG_RK_DEBUG_UART

9 years agork3288:tsadc:enable tsadc chn3
zhangqing [Thu, 12 Mar 2015 16:32:00 +0000 (09:32 -0700)]
rk3288:tsadc:enable tsadc chn3

9 years agork312x lcdc: add to get hwc layer status
hjc [Thu, 12 Mar 2015 08:16:56 +0000 (16:16 +0800)]
rk312x lcdc: add to get hwc layer status

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agobattery: enable dc charge
许盛飞 [Thu, 12 Mar 2015 04:21:54 +0000 (12:21 +0800)]
battery: enable dc charge

Signed-off-by: 许盛飞 <xsf@rock-chips.com>
9 years agoupdate rtl8188eu wifi driver to v4.3.0.8_13522.20150213_beta
hwg [Wed, 11 Mar 2015 06:00:13 +0000 (14:00 +0800)]
update rtl8188eu wifi driver to v4.3.0.8_13522.20150213_beta
 solve android 5.0 ctsverify wifi direct test fail problem

9 years agobmp_helper: fix bmp rle8 display abnormal
Mark Yao [Tue, 10 Mar 2015 11:22:43 +0000 (19:22 +0800)]
bmp_helper: fix bmp rle8 display abnormal

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
9 years agoESP8089 sdio premalloc default config
xxh [Tue, 10 Mar 2015 11:17:29 +0000 (19:17 +0800)]
ESP8089 sdio premalloc default config

9 years agowifi: support ap6212 ap6354
hwg [Tue, 10 Mar 2015 08:23:07 +0000 (16:23 +0800)]
wifi: support ap6212 ap6354

9 years agoUpdate RTL8723BS wifi driver
xxh [Tue, 10 Mar 2015 04:35:45 +0000 (12:35 +0800)]
Update RTL8723BS wifi driver
1.Refine IQK handle
2.Fix RX error handle to avoid system hang problem
3.Fix IQK restore fail issue
4.Fix running out of RX resource in some case
5.Fix HiddenAP still in driver scan queue after disconnect

9 years agoEspressi esp8089 WIFI
xxh [Tue, 10 Mar 2015 01:44:22 +0000 (09:44 +0800)]
Espressi esp8089 WIFI
1.modify copyright info for ESP8089 WIFI driver
2.update esp_premalloc driver to V2.5

9 years agoupdate wifi bcmdhd driver:
hwg [Mon, 9 Mar 2015 09:17:20 +0000 (17:17 +0800)]
update wifi bcmdhd driver:
 solve kernel panic when use gmac and hotspots at same time

9 years agork fb: add fbdc data format: HAL_PIXEL_FORMAT_FBDC_RGBA888
hjc [Mon, 9 Mar 2015 07:44:14 +0000 (15:44 +0800)]
rk fb: add fbdc data format: HAL_PIXEL_FORMAT_FBDC_RGBA888

9 years agork fb: define data format for fbdc
hjc [Fri, 26 Dec 2014 10:57:32 +0000 (18:57 +0800)]
rk fb: define data format for fbdc

Signed-off-by: hjc <hjc@rock-chips.com>
Conflicts:
drivers/video/rockchip/lcdc/rk3368_lcdc.c
drivers/video/rockchip/rkfb_sysfs.c
include/linux/rk_fb.h

9 years agork fb: add memsize check
hjc [Mon, 9 Mar 2015 04:10:48 +0000 (12:10 +0800)]
rk fb: add memsize check

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork lcdc: if win not support scale, make sure dsp size equal to act size
hjc [Mon, 9 Mar 2015 03:34:40 +0000 (11:34 +0800)]
rk lcdc: if win not support scale, make sure dsp size equal to act size

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: add support yuv420sp nv21 data format
hjc [Mon, 9 Mar 2015 03:14:14 +0000 (11:14 +0800)]
rk fb: add support yuv420sp nv21 data format

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: make sure win close state take effect when update regs
hjc [Mon, 9 Mar 2015 02:38:07 +0000 (10:38 +0800)]
rk fb: make sure win close state take effect when update regs

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agoHDMI: Modify color output policy.
Zheng Yang [Mon, 9 Mar 2015 03:11:52 +0000 (11:11 +0800)]
HDMI: Modify color output policy.
        Introduce feature SUPPORT_YCBCR_INPUT. If VOP can
        output YCbCr, VOP output color mode is equal to HDMI
        output color mode. Otherwise, VOP just output RGB,
        HDMI will conver color space.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agoHDMI: add mutex lock when hdmi is set to auto mode, to avoid
Zheng Yang [Mon, 9 Mar 2015 03:07:28 +0000 (11:07 +0800)]
HDMI: add mutex lock when hdmi is set to auto mode, to avoid
      system crash by NULL pointer.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agosolve bluetooth hid problem:
hwg [Sat, 7 Mar 2015 08:11:29 +0000 (16:11 +0800)]
solve bluetooth hid problem:
 when bluetooth hid device connected, the key is delayed to be reponse about 5 second

9 years agousb: can be wakeup by linestate change interrupt from GRF
lyz [Mon, 2 Mar 2015 03:23:43 +0000 (11:23 +0800)]
usb: can be wakeup by linestate change interrupt from GRF

9 years agorockchip: i2s: fix i2s mclk set fail when using multi i2s.
Sugar Zhang [Fri, 6 Mar 2015 03:16:01 +0000 (11:16 +0800)]
rockchip: i2s: fix i2s mclk set fail when using multi i2s.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
9 years agortl8723bu wifi: solve need long time to resume
hwg [Fri, 6 Mar 2015 02:45:03 +0000 (10:45 +0800)]
rtl8723bu wifi: solve need long time to resume

9 years agowifi: update broadcom wifi driver bcmdhd to 1.201.34.2
hwg [Thu, 5 Mar 2015 00:46:05 +0000 (08:46 +0800)]
wifi: update broadcom wifi driver bcmdhd to 1.201.34.2

9 years agoMerge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
huang zhibao [Wed, 4 Mar 2015 03:04:47 +0000 (11:04 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10

9 years agoadd support rk1000 codec and tvencoder
huang zhibao [Wed, 4 Mar 2015 02:52:18 +0000 (10:52 +0800)]
add support rk1000 codec and tvencoder

9 years agork: ion: fix compilation warning without CONFIG_COMPAT
CMY [Wed, 4 Mar 2015 01:27:51 +0000 (09:27 +0800)]
rk: ion: fix compilation warning without CONFIG_COMPAT

Signed-off-by: CMY <cmy@rock-chips.com>
9 years agork: ion: fix compilation error without CONFIG_COMPAT
Huang, Tao [Tue, 10 Feb 2015 08:48:02 +0000 (16:48 +0800)]
rk: ion: fix compilation error without CONFIG_COMPAT

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit 52315d4d540dd3ef6db618b6856ceee0b5af8d98)

Signed-off-by: CMY <cmy@rock-chips.com>
9 years agork: ion: fix compile warnning
CMY [Tue, 3 Mar 2015 05:56:52 +0000 (13:56 +0800)]
rk: ion: fix compile warnning

Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit ee9707a058c52a0d0c27f5804db9e9e96075d363)

Signed-off-by: CMY <cmy@rock-chips.com>
9 years agork: uboot_mem_reserve: lost a '=' in 'if' statement
CMY [Mon, 2 Mar 2015 07:42:55 +0000 (15:42 +0800)]
rk: uboot_mem_reserve: lost a '=' in 'if' statement
(cherry picked from commit b9721d0365d9e88d0c16c3f0c2aff4b2c09c9dec)

Signed-off-by: CMY <cmy@rock-chips.com>
9 years agork: uboot_mem_reserve: fix print format
CMY [Mon, 2 Mar 2015 03:33:35 +0000 (11:33 +0800)]
rk: uboot_mem_reserve: fix print format

Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit c9bbb3032c50e9b9ecaca58a4aa06ef4192bdbba)

Signed-off-by: CMY <cmy@rock-chips.com>
9 years agork: ion: allow the cacheable buffer to map iommu
CMY [Fri, 27 Feb 2015 09:59:00 +0000 (17:59 +0800)]
rk: ion: allow the cacheable buffer to map iommu

Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit db95a55ffa214b0bab8643454875a42d655a8ad7)

Signed-off-by: CMY <cmy@rock-chips.com>
9 years agork: ion: assign sg's dma_length in ion allocation if CONFIG_NEED_SG_DMA_LENGTH is set
CMY [Sat, 14 Feb 2015 10:05:01 +0000 (18:05 +0800)]
rk: ion: assign sg's dma_length in ion allocation if CONFIG_NEED_SG_DMA_LENGTH is set
(cherry picked from commit c85ce1ade533fe0d02b7539dbe85d55b69386125)

Signed-off-by: CMY <cmy@rock-chips.com>
9 years agoARM64: ion: ION_IOC_GET_PHYS compat 32bit userspace app.
CMY [Wed, 7 Jan 2015 07:42:54 +0000 (15:42 +0800)]
ARM64: ion: ION_IOC_GET_PHYS compat 32bit userspace app.

Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit 92ad540611e8599b7fb386a28793c77b410c81c6)

Signed-off-by: CMY <cmy@rock-chips.com>
9 years agoion: export ion_device for some kernel modules
CMY [Thu, 25 Dec 2014 03:39:38 +0000 (11:39 +0800)]
ion: export ion_device for some kernel modules
(cherry picked from commit c32433f1e0847cffdee4e0c04c6d8ee7d64392bc)

Signed-off-by: CMY <cmy@rock-chips.com>
9 years agosolve make clean error causeed by wifi driver
hwg [Wed, 4 Mar 2015 02:37:27 +0000 (10:37 +0800)]
solve make clean error causeed by wifi driver

9 years agommc: rk_sdmmc: edmac limit FIFOTH when mburst exceed limitation
lintao [Tue, 3 Mar 2015 13:31:10 +0000 (21:31 +0800)]
mmc: rk_sdmmc: edmac limit FIFOTH when mburst exceed limitation

Signed-off-by: lintao <lintao@rock-chips.com>
9 years agorfkill-wlan.c use CONFIG_MFD_SYSCON to compatible rk3368 and rk3288
hwg [Tue, 3 Mar 2015 09:56:58 +0000 (17:56 +0800)]
rfkill-wlan.c use CONFIG_MFD_SYSCON to compatible rk3368 and rk3288

9 years agorfkill-wlan.c: support rk3368
hwg [Thu, 12 Feb 2015 07:22:38 +0000 (15:22 +0800)]
rfkill-wlan.c: support rk3368

Conflicts:
net/rfkill/rfkill-wlan.c

9 years agoupdate rkwifi bcmdhd to version 1.201.34.1
hwg [Thu, 12 Feb 2015 07:21:52 +0000 (15:21 +0800)]
update rkwifi bcmdhd to version 1.201.34.1

Conflicts:
drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile