firefly-linux-kernel-4.4.55.git
10 years agork312x lvds: fix get pinctrl pins null pointer for RGB output
zwl [Tue, 12 Aug 2014 15:18:33 +0000 (23:18 +0800)]
rk312x lvds: fix get pinctrl pins null pointer for RGB output

10 years agocodec : add the general configuration to rk312x.dtsi
Sun Mingjun [Tue, 12 Aug 2014 12:42:13 +0000 (20:42 +0800)]
codec : add the general configuration to rk312x.dtsi

10 years agocodec : Support rk3126-sdk codec
Sun Mingjun [Tue, 12 Aug 2014 09:43:23 +0000 (17:43 +0800)]
codec : Support rk3126-sdk codec

10 years agoARM: rockchip: rk312x add cpu axi bus support
黄涛 [Tue, 12 Aug 2014 10:37:38 +0000 (18:37 +0800)]
ARM: rockchip: rk312x add cpu axi bus support

10 years agommc: fix err handle for release cd_irq
lintao [Tue, 12 Aug 2014 10:02:21 +0000 (18:02 +0800)]
mmc: fix err handle for release cd_irq

10 years agoMerge remote-tracking branch 'origin/develop-3.10-next' into develop-3.10
黄涛 [Tue, 12 Aug 2014 09:39:16 +0000 (17:39 +0800)]
Merge remote-tracking branch 'origin/develop-3.10-next' into develop-3.10

Conflicts:
arch/arm/mach-rockchip/vcodec_service.c
drivers/iommu/rockchip-iommu.c
drivers/iommu/rockchip-iovmm.c
drivers/net/ethernet/rockchip/gmac/stmmac_platform.c
include/linux/rockchip/sysmmu.h

10 years agoprepare for marging develop-3.10-next to develop-3.10
ljf [Tue, 12 Aug 2014 08:12:18 +0000 (16:12 +0800)]
prepare for marging develop-3.10-next to develop-3.10

10 years agocodec : Remove codec dts From rk312x.dtsi To rk3128-box.dtsi
Sun Mingjun [Tue, 12 Aug 2014 07:28:22 +0000 (15:28 +0800)]
codec : Remove codec dts From rk312x.dtsi To  rk3128-box.dtsi

10 years agork_serial: 4 bytes IO accesses
黄涛 [Thu, 7 Aug 2014 09:57:54 +0000 (17:57 +0800)]
rk_serial: 4 bytes IO accesses

RK3288 uart_dbg only support 4 bytes IO accesses

10 years agork818: disable otg and boost when in sleep mode
dkl [Tue, 12 Aug 2014 03:57:29 +0000 (11:57 +0800)]
rk818: disable otg and boost when in sleep mode

10 years agommc: 312x: disable sdio pull down
lintao [Tue, 12 Aug 2014 03:44:20 +0000 (11:44 +0800)]
mmc: 312x: disable sdio pull down

10 years agogmac: create /sys/class/vmac/exist
hwg [Tue, 12 Aug 2014 02:52:18 +0000 (10:52 +0800)]
gmac: create /sys/class/vmac/exist

10 years agogmac: move drive strength control from driver to dts
hwg [Tue, 12 Aug 2014 02:49:04 +0000 (10:49 +0800)]
gmac: move drive strength control from driver to dts

10 years agothe temporary of avoid null pinctrl pointer
zwl [Tue, 12 Aug 2014 02:27:18 +0000 (10:27 +0800)]
the temporary of avoid null pinctrl pointer

10 years agoethernet: update rk3128_box_defconfig for GMAC
roger [Tue, 12 Aug 2014 02:23:16 +0000 (10:23 +0800)]
ethernet: update rk3128_box_defconfig for GMAC

10 years agodts: disabled rk3128 box tve
hjc [Tue, 12 Aug 2014 02:00:50 +0000 (10:00 +0800)]
dts: disabled rk3128 box tve

10 years agoAdd rk312x codec config to rk3128_box_defconfig
Sun Mingjun [Tue, 12 Aug 2014 01:58:56 +0000 (09:58 +0800)]
Add rk312x codec config to rk3128_box_defconfig

10 years agoSupport the Rk312X Codec & SPDIF
Sun Mingjun [Fri, 8 Aug 2014 07:59:44 +0000 (15:59 +0800)]
Support the Rk312X Codec & SPDIF

10 years agork312x lcdc: config a group of frc_lower value for the FRC mode of dither down
zwl [Mon, 11 Aug 2014 10:39:04 +0000 (18:39 +0800)]
rk312x lcdc: config a group of frc_lower value for the FRC mode of dither down

10 years agovpu: fix large resolution jpeg encode fault
ljf [Mon, 11 Aug 2014 09:50:08 +0000 (17:50 +0800)]
vpu: fix large resolution jpeg encode fault

10 years ago fix cbcr swap error
zsq [Mon, 11 Aug 2014 09:47:18 +0000 (17:47 +0800)]
 fix cbcr swap error

10 years agommc: fix no-tuning io_e to default recommand value
lintao [Mon, 11 Aug 2014 08:47:19 +0000 (16:47 +0800)]
mmc: fix no-tuning io_e to default recommand value

10 years agommc: fix 312x pinctrl
lintao [Mon, 11 Aug 2014 08:28:38 +0000 (16:28 +0800)]
mmc: fix 312x pinctrl

10 years agork312x lcdc: invert lvds dclk to fix disp bad
zwl [Mon, 11 Aug 2014 08:15:57 +0000 (16:15 +0800)]
rk312x lcdc: invert lvds dclk to fix disp bad

10 years agork3288dsti rga2 change to rk3288-rga2
zsq [Mon, 11 Aug 2014 07:33:14 +0000 (15:33 +0800)]
rk3288dsti rga2 change to rk3288-rga2

10 years ago rga mmu use ionmmu passed
zsq [Mon, 11 Aug 2014 07:24:58 +0000 (15:24 +0800)]
 rga mmu use ionmmu passed

10 years agommc: dump tuning result as BOOT info
lintao [Mon, 11 Aug 2014 07:02:52 +0000 (15:02 +0800)]
mmc: dump tuning result as BOOT info

10 years agork3036 hdmi: update hdmi pre emphasis for rk3128
hjc [Mon, 11 Aug 2014 03:51:00 +0000 (11:51 +0800)]
rk3036 hdmi: update hdmi pre emphasis for rk3128

10 years agommc: fix dts cd-gpio setting
lintao [Mon, 11 Aug 2014 02:46:25 +0000 (10:46 +0800)]
mmc: fix dts cd-gpio setting

10 years agork312x lcdc: add config the sclk for dual disp
zwl [Mon, 11 Aug 2014 02:40:56 +0000 (10:40 +0800)]
rk312x lcdc: add config the sclk for dual disp

10 years ago Support tve in rk3128_box_defconfig and rk3128-box.dts.
Zheng Yang [Sat, 9 Aug 2014 08:44:05 +0000 (16:44 +0800)]
Support tve in rk3128_box_defconfig and rk3128-box.dts.

10 years agork3036-sdk.dts: tve is enabled.
Zheng Yang [Sat, 9 Aug 2014 08:35:00 +0000 (16:35 +0800)]
rk3036-sdk.dts: tve is enabled.

10 years agork3128/rk3036 tve:
Zheng Yang [Sat, 9 Aug 2014 08:29:04 +0000 (16:29 +0800)]
rk3128/rk3036 tve:
1. improve tve PAL format display parameter.
2. use static var rk3036_tve->screen instead of dynamicly
   malloc/free memory, to avoid kernel crash whicc is caused
   by NULL pointer.

10 years agohdmi: uevent is bind to vitual display device.
Zheng Yang [Sat, 9 Aug 2014 08:26:11 +0000 (16:26 +0800)]
hdmi: uevent is bind to vitual display device.

10 years agoethernet: support GMAC driver for RK3128
roger [Fri, 8 Aug 2014 12:57:19 +0000 (20:57 +0800)]
ethernet: support GMAC driver for RK3128

10 years agoaudio: rk3036 codec output waveform abnormalities
dgl [Fri, 8 Aug 2014 10:09:23 +0000 (18:09 +0800)]
audio: rk3036 codec output waveform abnormalities

changed codec power up and codec start up time interval.
1. system power on and codec power on and codec initilize;
2. add delay work 15 second;
3. codec power up and codec initilize again;

Signed-off-by: dgl@rock-chips.com
10 years agowifi: modify the usb's wifi 8188eus gpio.
li bing [Fri, 8 Aug 2014 08:52:42 +0000 (16:52 +0800)]
wifi: modify the usb's wifi 8188eus gpio.

10 years ago.config: add rk3128 box defconfig.
li bing [Fri, 8 Aug 2014 08:51:02 +0000 (16:51 +0800)]
.config: add rk3128 box defconfig.

10 years agork312x: mistaken commit of rk312x-sdk.dtsi file in commit 45023a37a5cb1955210838ee54...
zyc [Fri, 8 Aug 2014 08:59:51 +0000 (16:59 +0800)]
rk312x: mistaken commit of  rk312x-sdk.dtsi file in commit 45023a37a5cb1955210838ee543f5b54ae1c522c,fix it

10 years ago fix rga/rga2 driver exist compile error /change rga/rga2 dsti name to rga_drv/rga2_drv
zsq [Fri, 8 Aug 2014 08:34:09 +0000 (16:34 +0800)]
 fix rga/rga2 driver exist compile error /change rga/rga2 dsti name to rga_drv/rga2_drv

10 years agork312x:cif: add cif and ov2659 driver.
zyc [Fri, 8 Aug 2014 07:26:16 +0000 (15:26 +0800)]
rk312x:cif: add cif and ov2659 driver.

10 years agork: fb: fix build error
xxm [Fri, 8 Aug 2014 07:14:56 +0000 (15:14 +0800)]
rk: fb: fix build error

10 years agork3288: get compatible name of iommu using macro defintion
ljf [Fri, 8 Aug 2014 06:59:23 +0000 (14:59 +0800)]
rk3288: get compatible name of iommu using macro defintion

10 years agork3288: modified for new iommu interface
ljf [Fri, 8 Aug 2014 05:55:51 +0000 (13:55 +0800)]
rk3288: modified for new iommu interface

10 years agocamsys_drv: update with iommu interface related changed
xxm [Fri, 8 Aug 2014 03:36:52 +0000 (11:36 +0800)]
camsys_drv: update with iommu interface related changed

10 years agork312x:rk818:modify sleep voltage status
张晴 [Fri, 8 Aug 2014 03:28:46 +0000 (11:28 +0800)]
rk312x:rk818:modify sleep voltage status

10 years agork: fb: 1.new intterupt set interface
xxm [Fri, 8 Aug 2014 03:13:52 +0000 (11:13 +0800)]
rk: fb: 1.new intterupt set interface
2.use macro from rockchip-iovmm.h instead of string to refer mmu compatible name

10 years agorockchip: iommu: change compatible name for iommu in rk3288.dtsi
xxm [Fri, 8 Aug 2014 03:02:50 +0000 (11:02 +0800)]
rockchip: iommu: change compatible name for iommu in rk3288.dtsi

10 years agork: ion: update iovmm_map to rockchip_iovmm_map
xxm [Fri, 8 Aug 2014 03:00:38 +0000 (11:00 +0800)]
rk: ion: update iovmm_map to rockchip_iovmm_map

10 years agorockchip: iommu:
xxm [Fri, 8 Aug 2014 02:45:50 +0000 (10:45 +0800)]
rockchip: iommu:
1.move out rockchip_get_sysmmu_device_by_compatible and platform_set_sysmmu
2.change compatible name in rk3288.dtsi,like "iommu,iep_mmu" to "rockchip,iep_mmu"
3.change iovmm_map etc to rockchip_iovmm_map

10 years agoARM: rockchip: rk3036_defconfig disable RGA2
黄涛 [Fri, 8 Aug 2014 02:36:23 +0000 (10:36 +0800)]
ARM: rockchip: rk3036_defconfig disable RGA2

10 years agoMerge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
黄涛 [Fri, 8 Aug 2014 02:21:50 +0000 (10:21 +0800)]
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

Conflicts:
arch/arm/mach-rockchip/vcodec_service.c
drivers/input/Makefile

10 years agousb: fix otg_drv/host_drv gpio in device tree
lyz [Fri, 8 Aug 2014 02:05:47 +0000 (10:05 +0800)]
usb: fix otg_drv/host_drv gpio in device tree

10 years agork3036, rk312x: add iommu switch in dts for vcodec and iep
ljf [Fri, 8 Aug 2014 01:46:48 +0000 (09:46 +0800)]
rk3036, rk312x: add iommu switch in dts for vcodec and iep

10 years agork fb:modify iommu interface to match upstream request
yxj [Fri, 8 Aug 2014 01:41:08 +0000 (09:41 +0800)]
rk fb:modify iommu interface to match upstream request

10 years agork3128 box dts: add screen dt node
zwl [Fri, 8 Aug 2014 01:20:17 +0000 (09:20 +0800)]
rk3128 box dts: add screen dt node

10 years agork312x lcdc: set uv offset for hdmi/cvbs
zwl [Thu, 7 Aug 2014 10:11:00 +0000 (18:11 +0800)]
rk312x lcdc: set uv offset for hdmi/cvbs

10 years agork312x dts: move lcdc pinctrl and screen from dtsi to dts
zwl [Thu, 7 Aug 2014 10:02:57 +0000 (18:02 +0800)]
rk312x dts: move lcdc pinctrl and screen from dtsi to dts

10 years ago fix rga2 compile error when 2 drives exist
zsq [Thu, 7 Aug 2014 08:39:07 +0000 (16:39 +0800)]
 fix rga2 compile error when 2 drives exist

10 years agoadd iommu switch in dts for iep
ljf [Thu, 7 Aug 2014 08:38:31 +0000 (16:38 +0800)]
add iommu switch in dts for iep

10 years agoadd iommu switch in dts for vcodec driver. disable iommu_unmap.
ljf [Thu, 7 Aug 2014 08:35:40 +0000 (16:35 +0800)]
add iommu switch in dts for vcodec driver. disable iommu_unmap.

10 years agousb: fix RK3036 bvalid irq Num
lyz [Thu, 7 Aug 2014 08:20:05 +0000 (16:20 +0800)]
usb: fix RK3036 bvalid irq Num

10 years agoRevert "usb: fix RK3036 bvalid irq Num"
lyz [Thu, 7 Aug 2014 08:18:00 +0000 (16:18 +0800)]
Revert "usb: fix RK3036 bvalid irq Num"

This reverts commit 5c81c74ca685ed7ef3c85247232a87bf1b16b57f.

10 years agousb: fix RK3036 bvalid irq Num
lyz [Thu, 7 Aug 2014 08:15:29 +0000 (16:15 +0800)]
usb: fix RK3036 bvalid irq Num

10 years agofiq_debugger: rockchip: enlarge kmsg buffer size
黄涛 [Thu, 7 Aug 2014 08:08:09 +0000 (16:08 +0800)]
fiq_debugger: rockchip: enlarge kmsg buffer size

10 years agork3036: enable zram defconfig
wdc [Thu, 7 Aug 2014 08:06:36 +0000 (16:06 +0800)]
rk3036: enable zram defconfig

10 years agork312x: implement rk312x_restart() function
陈亮 [Thu, 7 Aug 2014 08:05:00 +0000 (01:05 -0700)]
rk312x: implement rk312x_restart() function

Signed-off-by: 陈亮 <cl@rock-chips.com>
10 years agoARM: rockchip: fiq-debugger: add UART_USR macro
黄涛 [Tue, 5 Aug 2014 09:47:32 +0000 (17:47 +0800)]
ARM: rockchip: fiq-debugger: add UART_USR macro

10 years ago add rga2 driver for dsti to diff
zsq [Thu, 7 Aug 2014 06:13:38 +0000 (14:13 +0800)]
 add rga2 driver for dsti to diff

10 years agork3128-box:add pwm_regulator,lcdc,dvfs dts support
luowei [Thu, 7 Aug 2014 05:57:06 +0000 (13:57 +0800)]
rk3128-box:add pwm_regulator,lcdc,dvfs dts support

10 years agork312x: vcodec driver revision for rk312x
ljf [Thu, 7 Aug 2014 05:53:40 +0000 (13:53 +0800)]
rk312x: vcodec driver revision for rk312x

10 years agoopen rga driver
zsq [Thu, 7 Aug 2014 05:44:43 +0000 (13:44 +0800)]
open rga driver

10 years agoinput: rk3128 support pwm remote control
huang zhibao [Thu, 7 Aug 2014 03:52:08 +0000 (11:52 +0800)]
input: rk3128 support pwm remote control

10 years agork312x:rk818:open rk818
张晴 [Thu, 7 Aug 2014 03:17:45 +0000 (11:17 +0800)]
rk312x:rk818:open rk818

10 years agousb: fix RK312x bvalid irq Num
lyz [Thu, 7 Aug 2014 03:03:20 +0000 (11:03 +0800)]
usb: fix RK312x bvalid irq Num

10 years agork312x:support pwm set arm and logic voltages
张晴 [Thu, 7 Aug 2014 02:54:52 +0000 (10:54 +0800)]
rk312x:support pwm set arm and logic voltages

10 years agork3036 hdmi: add support yuv input and output
hjc [Wed, 6 Aug 2014 00:36:51 +0000 (08:36 +0800)]
rk3036 hdmi: add support yuv input and output

10 years agork312x lcdc: when in hdmi/cvbs mode ,vop overlay in yuv domain
zwl [Thu, 7 Aug 2014 00:45:54 +0000 (08:45 +0800)]
rk312x lcdc: when in hdmi/cvbs mode ,vop overlay in yuv domain

10 years agork312x lvds: fix ttl rgb mode no output
zwl [Wed, 6 Aug 2014 10:28:28 +0000 (18:28 +0800)]
rk312x lvds: fix ttl rgb mode no output

10 years agoinput: support ir long press
huang zhibao [Wed, 6 Aug 2014 10:11:43 +0000 (18:11 +0800)]
input: support ir long press

10 years agoMerge tag 'lsk-v3.10-android-14.07' into develop-3.10
黄涛 [Wed, 6 Aug 2014 07:34:14 +0000 (15:34 +0800)]
Merge tag 'lsk-v3.10-android-14.07' into develop-3.10

LSK v3.10 Android 14.07 release

Conflicts:
drivers/clocksource/arm_arch_timer.c
lib/Makefile

10 years agommc: disable force_jtag when card been inserted
lintao [Wed, 6 Aug 2014 02:57:11 +0000 (10:57 +0800)]
mmc: disable force_jtag when card been inserted
3126 had no controller-cd pin for auto jtag/sdmmc selection

10 years agoTP: sdk support goodix
xjh [Tue, 5 Aug 2014 09:21:04 +0000 (17:21 +0800)]
TP: sdk support goodix

10 years agork312x: usb: use dwc as default host controller
lyz [Fri, 1 Aug 2014 10:12:08 +0000 (18:12 +0800)]
rk312x: usb: use dwc as default host controller

10 years agork312x:rk818:support usb and ac charger
张晴 [Tue, 5 Aug 2014 08:00:14 +0000 (16:00 +0800)]
rk312x:rk818:support usb and ac charger

10 years agopinctrl:fix rk312x gpio2c_iomux2 offset error
luowei [Tue, 5 Aug 2014 07:20:37 +0000 (15:20 +0800)]
pinctrl:fix rk312x gpio2c_iomux2 offset error

10 years agork3128 dts: fix lcd_cs gpio pin err
zwl [Tue, 5 Aug 2014 06:34:11 +0000 (14:34 +0800)]
rk3128 dts: fix lcd_cs gpio pin err

10 years agofix rga dssi compile error
zsq [Tue, 5 Aug 2014 05:53:18 +0000 (13:53 +0800)]
fix rga dssi compile error

10 years agommc: fix rk3126 support
lintao [Tue, 5 Aug 2014 04:29:23 +0000 (12:29 +0800)]
mmc: fix rk3126 support
(1) Add cd_gpio support
(2) defconf IDMAC

10 years agork312x: overwrite adc channel
wdc [Tue, 5 Aug 2014 03:52:22 +0000 (11:52 +0800)]
rk312x: overwrite adc channel

10 years agork312x: enable saradc clk 7 pclk
wdc [Tue, 5 Aug 2014 03:34:44 +0000 (11:34 +0800)]
rk312x: enable saradc clk 7 pclk

10 years agoWifi: Esp8089: modify kernel version 3.06 -> kernel version 3.10.
li bing [Tue, 5 Aug 2014 02:33:30 +0000 (10:33 +0800)]
Wifi: Esp8089: modify kernel version 3.06 -> kernel version 3.10.

10 years agork312x: enable core dvfs, fix gpu dvfs table error
陈亮 [Tue, 5 Aug 2014 02:53:21 +0000 (19:53 -0700)]
rk312x: enable core dvfs, fix gpu dvfs table error

Signed-off-by: 陈亮 <cl@rock-chips.com>
10 years agork312x.dtsi: fix syntax err
陈亮 [Tue, 5 Aug 2014 02:32:00 +0000 (19:32 -0700)]
rk312x.dtsi: fix syntax err

Signed-off-by: 陈亮 <cl@rock-chips.com>
10 years agoddr_rk32.c: reinit reserve_t when chang freq success
陈亮 [Tue, 5 Aug 2014 01:08:25 +0000 (18:08 -0700)]
ddr_rk32.c: reinit reserve_t when chang freq success

Signed-off-by: 陈亮 <cl@rock-chips.com>
10 years agousb: udc: receive 1 SETUP packet in BDMA mode
lyz [Tue, 5 Aug 2014 01:06:13 +0000 (09:06 +0800)]
usb: udc: receive 1 SETUP packet in BDMA mode

10 years agoadd rga define to rk312x.dtsi
zsq [Tue, 5 Aug 2014 00:35:02 +0000 (08:35 +0800)]
add rga define to rk312x.dtsi

10 years agork312x: reserve memory for ION, call rockchip_ion_reserve()
陈亮 [Mon, 4 Aug 2014 09:56:07 +0000 (02:56 -0700)]
rk312x: reserve memory for ION, call rockchip_ion_reserve()

Signed-off-by: 陈亮 <cl@rock-chips.com>
10 years agoMerge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
黄涛 [Mon, 4 Aug 2014 08:52:07 +0000 (16:52 +0800)]
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

Conflicts:
drivers/staging/android/ion/ion.c
include/linux/rockchip/sysmmu.h

10 years agozram: don't grab mutex in zram_slot_free_noity
Minchan Kim [Mon, 12 Aug 2013 06:13:56 +0000 (15:13 +0900)]
zram: don't grab mutex in zram_slot_free_noity

[1] introduced down_write in zram_slot_free_notify to prevent race
between zram_slot_free_notify and zram_bvec_[read|write]. The race
could happen if somebody who has right permission to open swap device
is reading swap device while it is used by swap in parallel.

However, zram_slot_free_notify is called with holding spin_lock of
swap layer so we shouldn't avoid holing mutex. Otherwise, lockdep
warns it.

This patch adds new list to handle free slot and workqueue
so zram_slot_free_notify just registers slot index to be freed and
registers the request to workqueue. If workqueue is expired,
it holds mutex_lock so there is no problem any more.

If any I/O is issued, zram handles pending slot-free request
caused by zram_slot_free_notify right before handling issued
request because workqueue wouldn't be expired yet so zram I/O
request handling function can miss it.

Lastly, when zram is reset, flush_work could handle all of pending
free request so we shouldn't have memory leak.

NOTE: If zram_slot_free_notify's kmalloc with GFP_ATOMIC would be
failed, the slot will be freed when next write I/O write the slot.

[1] [57ab0485, zram: use zram->lock to protect zram_free_page()
    in swap free notify path]

* from v2
  * refactoring

* from v1
  * totally redesign

Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: stable@vger.kernel.org
Signed-off-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit a0c516cbfc7452c8cbd564525fef66d9f20b46d1)

Conflicts:
drivers/staging/zram/zram_drv.c