firefly-linux-kernel-4.4.55.git
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 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 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

10 years agorockchip: mali400: change gpu to built-in temp
xxm [Mon, 4 Aug 2014 06:46:13 +0000 (14:46 +0800)]
rockchip: mali400: change gpu to built-in temp

10 years agork312x: set logic 1.2v
wdc [Mon, 4 Aug 2014 06:36:57 +0000 (14:36 +0800)]
rk312x: set logic 1.2v

10 years agork312x: fix i2c base address error
wdc [Mon, 4 Aug 2014 06:28:33 +0000 (14:28 +0800)]
rk312x: fix i2c base address error

10 years agospi:fix the bug while read one byte
luowei [Mon, 4 Aug 2014 01:14:23 +0000 (09:14 +0800)]
spi:fix the bug while read one byte

10 years agork312x lvds: fix no display
zwl [Mon, 4 Aug 2014 03:55:52 +0000 (11:55 +0800)]
rk312x lvds: fix no display

10 years agopinctrl:fix debug command bug for rk3036/rk312x
luowei [Mon, 4 Aug 2014 01:51:47 +0000 (09:51 +0800)]
pinctrl:fix debug command bug for rk3036/rk312x

cat /sys/kernel/debug/rockchip_pinctrl/registers

10 years agospi:fix the bug while read one byte
luowei [Mon, 4 Aug 2014 01:14:23 +0000 (09:14 +0800)]
spi:fix the bug while read one byte

10 years agoinv_mpu: only setup timer once.
郭毅 [Mon, 4 Aug 2014 01:06:22 +0000 (09:06 +0800)]
inv_mpu: only setup timer once.

10 years agork3036 lcdc:
Zheng Yang [Sat, 2 Aug 2014 11:03:44 +0000 (19:03 +0800)]
rk3036 lcdc:
        add set_overscan callback function to set overscan.

10 years agork312x lcdc: fix win vir_stride err
zwl [Sat, 2 Aug 2014 10:53:35 +0000 (18:53 +0800)]
rk312x lcdc: fix win vir_stride err

10 years agork312x lvds: fix no signal output
zwl [Sat, 2 Aug 2014 10:48:02 +0000 (18:48 +0800)]
rk312x lvds: fix no signal output

10 years agork312x: change BL-EN pin config
许盛飞 [Fri, 1 Aug 2014 10:46:33 +0000 (18:46 +0800)]
rk312x: change BL-EN pin config

Signed-off-by: 许盛飞 <xsf@rock-chips.com>
10 years agork3036 hdmi: add support HDMI CEC function
hjc [Fri, 1 Aug 2014 09:04:55 +0000 (17:04 +0800)]
rk3036 hdmi: add support HDMI CEC function

10 years agommc: rk_sdmmc: increase max_blk_count for edmac
lintao [Fri, 1 Aug 2014 08:55:15 +0000 (16:55 +0800)]
mmc: rk_sdmmc: increase max_blk_count for edmac

10 years agork312x tve: display is ok.
Zheng Yang [Fri, 1 Aug 2014 08:42:06 +0000 (16:42 +0800)]
rk312x tve: display is ok.

10 years agork312x: add rk3128-box.dts
陈亮 [Fri, 1 Aug 2014 08:09:25 +0000 (01:09 -0700)]
rk312x: add rk3128-box.dts

Signed-off-by: 陈亮 <cl@rock-chips.com>
10 years agork312x: support usb-uart debug
lyz [Fri, 1 Aug 2014 07:36:44 +0000 (15:36 +0800)]
rk312x: support usb-uart debug

10 years agork3036&rk312x:clk:modify gpu clk name for dvfs
张晴 [Fri, 1 Aug 2014 06:25:45 +0000 (14:25 +0800)]
rk3036&rk312x:clk:modify gpu clk name for dvfs

10 years agorockchip:mali400:fix gpu clk name:clk_gpu
xxm [Fri, 1 Aug 2014 06:26:10 +0000 (14:26 +0800)]
rockchip:mali400:fix gpu clk name:clk_gpu

10 years agork3036 hdmi:
Zheng Yang [Fri, 1 Aug 2014 05:36:25 +0000 (13:36 +0800)]
rk3036 hdmi:
When system power up, hdmi irq will be enabled twice for
hwc will call fb unblack notifier. So if hdmi is not in suspend
mode, it is no need to call rk3036_hdmi_early_resume when fb unblank
event is triggered.

10 years agork3036: set cma reverse memory o kb
wdc [Fri, 1 Aug 2014 03:51:50 +0000 (11:51 +0800)]
rk3036: set cma reverse memory o kb

10 years agorockchip:mali400:enable gpu pd
xxm [Fri, 1 Aug 2014 03:32:38 +0000 (11:32 +0800)]
rockchip:mali400:enable gpu pd

10 years agork312x:clk:support clk pd,set cpll for any freq
张晴 [Fri, 1 Aug 2014 02:48:01 +0000 (10:48 +0800)]
rk312x:clk:support clk pd,set cpll for any freq

10 years agork3036 lcdc: update lcdc resume and suspend func
hjc [Fri, 1 Aug 2014 02:22:20 +0000 (10:22 +0800)]
rk3036 lcdc: update lcdc resume and suspend func

10 years agoset clk_ignore_unused, disable core dvfs
陈亮 [Thu, 31 Jul 2014 13:18:55 +0000 (06:18 -0700)]
set clk_ignore_unused, disable core dvfs

Signed-off-by: 陈亮 <cl@rock-chips.com>
10 years agoRevert "rk312x: set clk_ignore_unused = true"
陈亮 [Thu, 31 Jul 2014 13:07:55 +0000 (06:07 -0700)]
Revert "rk312x: set clk_ignore_unused = true"

This reverts commit f0db0fef3bf5caac542281f13c1d449d9b0f975d.

10 years agork312x: set clk_ignore_unused = true
陈亮 [Thu, 31 Jul 2014 13:06:33 +0000 (06:06 -0700)]
rk312x: set clk_ignore_unused = true

Signed-off-by: 陈亮 <cl@rock-chips.com>
10 years agork312x:add pwm0 status-okay
许盛飞 [Thu, 31 Jul 2014 12:49:36 +0000 (20:49 +0800)]
rk312x:add pwm0 status-okay

Signed-off-by: 许盛飞 <xsf@rock-chips.com>
10 years agoMerge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10...
陈亮 [Thu, 31 Jul 2014 12:37:07 +0000 (05:37 -0700)]
Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10-next

10 years agork fb: fix error judge for screen1
zwl [Thu, 31 Jul 2014 12:32:53 +0000 (20:32 +0800)]
rk fb: fix error judge for screen1

10 years agork312x: init rockchip_pmu_ops
陈亮 [Thu, 31 Jul 2014 12:21:43 +0000 (05:21 -0700)]
rk312x: init rockchip_pmu_ops

10 years agork312x dts: different lcdc dt node config for rk3126 and rk3128
zwl [Thu, 31 Jul 2014 12:02:14 +0000 (20:02 +0800)]
rk312x dts: different lcdc dt node config for rk3126 and rk3128

10 years agork321x.dtsi: add tve node.
Zheng Yang [Thu, 31 Jul 2014 10:06:34 +0000 (18:06 +0800)]
rk321x.dtsi: add tve node.

10 years agork3036 tve: register fb notifier.
Zheng Yang [Thu, 31 Jul 2014 10:05:01 +0000 (18:05 +0800)]
rk3036 tve: register fb notifier.

10 years agocamsys_drv : v0.0x12.0 ,camsys_head : v0.0x8.0
zyc [Thu, 31 Jul 2014 09:58:15 +0000 (17:58 +0800)]
camsys_drv : v0.0x12.0 ,camsys_head : v0.0x8.0

10 years agoRevert "rk: cma: attempt to allocate same range memory while cma allocation failure"
CMY [Tue, 22 Jul 2014 07:35:12 +0000 (15:35 +0800)]
Revert "rk: cma: attempt to allocate same range memory while cma allocation failure"

This reverts commit 17beed5e65b338169ff45cfc6f9c4f28f86b3899.

10 years agorockchip:iommu:1,fix build error 2,disable invalid tlb when iovmm_unmap
xxm [Thu, 31 Jul 2014 09:35:15 +0000 (17:35 +0800)]
rockchip:iommu:1,fix build error 2,disable invalid tlb when iovmm_unmap

10 years agorockchip:iommu:fix build error when iommu disabled
xxm [Thu, 31 Jul 2014 08:16:47 +0000 (16:16 +0800)]
rockchip:iommu:fix build error when iommu disabled

10 years agork3288: Adjust the temp-limit to 100 degrees Celsius
郭毅 [Thu, 31 Jul 2014 03:41:29 +0000 (11:41 +0800)]
rk3288: Adjust the temp-limit to 100 degrees Celsius

10 years agork312x dtsi: enable hdmi dt node
zwl [Thu, 31 Jul 2014 07:31:56 +0000 (15:31 +0800)]
rk312x dtsi: enable hdmi dt node

10 years agork312x: fix i2c3 pclk
wdc [Thu, 31 Jul 2014 07:27:53 +0000 (15:27 +0800)]
rk312x: fix i2c3 pclk

10 years agork312x hdmi: add support rk312x at hdmi driver
zwl [Thu, 31 Jul 2014 07:18:45 +0000 (15:18 +0800)]
rk312x hdmi: add support rk312x at hdmi driver

10 years agork312x lvds: remove some unused code
zwl [Thu, 31 Jul 2014 07:12:07 +0000 (15:12 +0800)]
rk312x lvds: remove some unused code

10 years agork312x pinctrl: add rk312x lcdc_d pinctrl for rgb output
zwl [Thu, 31 Jul 2014 06:50:16 +0000 (14:50 +0800)]
rk312x pinctrl: add rk312x lcdc_d pinctrl for rgb output

10 years agork312x: include pinctrl at dtsi
wdc [Thu, 31 Jul 2014 06:21:42 +0000 (14:21 +0800)]
rk312x: include pinctrl at dtsi

10 years agoARM: rockchip: rk312x: enable rockchip timer as broadcast timer
黄涛 [Thu, 31 Jul 2014 05:59:15 +0000 (13:59 +0800)]
ARM: rockchip: rk312x: enable rockchip timer as broadcast timer

10 years agork: ion: dts: add ion configure to rk312x dts file
CMY [Thu, 31 Jul 2014 03:49:02 +0000 (11:49 +0800)]
rk: ion: dts: add ion configure to rk312x dts file

10 years agork312x lvds: add pinctrl set for rgb output
zwl [Thu, 31 Jul 2014 03:43:11 +0000 (11:43 +0800)]
rk312x lvds: add pinctrl set for rgb output

10 years agorockchip:iommu:define function use inline instead of #define when iommu disabled
xxm [Thu, 31 Jul 2014 03:32:35 +0000 (11:32 +0800)]
rockchip:iommu:define function use inline instead of #define when iommu disabled

10 years agork312x: add pie init
陈亮 [Thu, 31 Jul 2014 01:58:07 +0000 (18:58 -0700)]
rk312x: add pie init

Signed-off-by: 陈亮 <cl@rock-chips.com>
10 years agoadd rk312x-sdk.dtsi for the common between 3126&&3128, add rk3128-sdk.dts for 3128
陈亮 [Thu, 31 Jul 2014 01:43:49 +0000 (18:43 -0700)]
add rk312x-sdk.dtsi for the common between 3126&&3128, add rk3128-sdk.dts for 3128

Signed-off-by: 陈亮 <cl@rock-chips.com>
10 years agork312x lvds: add iomux to lcdc_d for RGB
zwl [Wed, 30 Jul 2014 14:48:32 +0000 (22:48 +0800)]
rk312x lvds: add iomux to lcdc_d for RGB

10 years agork312x: add rk818-battery
许盛飞 [Wed, 30 Jul 2014 12:04:14 +0000 (20:04 +0800)]
rk312x: add rk818-battery

Signed-off-by: 许盛飞 <xsf@rock-chips.com>
10 years agork312x dts: add reset node in dts
dkl [Wed, 30 Jul 2014 11:54:01 +0000 (19:54 +0800)]
rk312x dts: add reset node in dts

10 years agork3036: remove mutex lock in irq service
ljf [Wed, 30 Jul 2014 11:55:49 +0000 (19:55 +0800)]
rk3036: remove mutex lock in irq service

10 years agork312x: add usb
lyz [Wed, 30 Jul 2014 10:30:52 +0000 (18:30 +0800)]
rk312x: add usb

10 years agorockchip:iommu:fix build error when iommu disabled
xxm [Wed, 30 Jul 2014 09:28:33 +0000 (17:28 +0800)]
rockchip:iommu:fix build error when iommu disabled

10 years ago3126: add key node at dts file
wdc [Wed, 30 Jul 2014 08:45:09 +0000 (16:45 +0800)]
3126: add key node at dts file

10 years agoRevert "312x: add key dts node"
wdc [Wed, 30 Jul 2014 08:38:30 +0000 (16:38 +0800)]
Revert "312x: add key dts node"

This reverts commit 1b62e7546ef43aeb6eab7f5eafd2392c4a8e80bb.

10 years agork3036 hdmi: update hdcp coding style
hjc [Wed, 30 Jul 2014 07:35:59 +0000 (15:35 +0800)]
rk3036 hdmi: update hdcp coding style

10 years agork3036 hdmi: add support HDCP function
hjc [Wed, 30 Jul 2014 03:55:11 +0000 (11:55 +0800)]
rk3036 hdmi: add support HDCP function

10 years ago312x: add key dts node
wdc [Wed, 30 Jul 2014 07:30:48 +0000 (15:30 +0800)]
312x: add key dts node

10 years agork312x dts: add hdmi in dts.
Zheng Yang [Wed, 30 Jul 2014 05:52:29 +0000 (13:52 +0800)]
rk312x dts: add hdmi in dts.

10 years agoblock: partitions: add rockchip partition support
lintao [Wed, 30 Jul 2014 03:16:42 +0000 (11:16 +0800)]
block: partitions: add rockchip partition support

10 years agork312x dts: fpga use RGB screen
zwl [Wed, 30 Jul 2014 01:17:23 +0000 (09:17 +0800)]
rk312x dts: fpga use RGB screen

10 years agork312x: add TP at dts
xjh [Wed, 30 Jul 2014 00:43:23 +0000 (08:43 +0800)]
rk312x: add TP at dts

10 years agoTP: add 312x sdk TP
xjh [Tue, 29 Jul 2014 07:09:33 +0000 (15:09 +0800)]
TP: add 312x sdk TP

10 years agork312x dts: fix fpga dts compile err
zwl [Tue, 29 Jul 2014 09:40:34 +0000 (17:40 +0800)]
rk312x dts: fix fpga dts compile err

10 years agork3036 lcdc: map fb0 to win1 and fb1 to win0.
Zheng Yang [Tue, 29 Jul 2014 09:38:41 +0000 (17:38 +0800)]
rk3036 lcdc: map fb0 to win1 and fb1 to win0.

10 years agoKconfig: add rk312x lcdc and rk31xx lvds option
zwl [Tue, 29 Jul 2014 09:30:41 +0000 (17:30 +0800)]
Kconfig: add rk312x lcdc and rk31xx lvds option

10 years agork312x lcdc: fix compile err
zwl [Tue, 29 Jul 2014 09:22:47 +0000 (17:22 +0800)]
rk312x lcdc: fix compile err

10 years agork3036 hdmi: add hdmi driver register for hdmi status
hjc [Tue, 29 Jul 2014 09:11:59 +0000 (17:11 +0800)]
rk3036 hdmi: add hdmi driver register for hdmi status

10 years agorockchip:midgard:1,update gpu version to r4p1-00rel0 2,add input handler when runtim...
xxm [Tue, 29 Jul 2014 06:15:25 +0000 (14:15 +0800)]
rockchip:midgard:1,update gpu version to r4p1-00rel0  2,add input handler when runtime on/off 3,version to 0x09

10 years agork31xx lvds: change defined 'BIT' to 'BITS'
zwl [Tue, 29 Jul 2014 06:17:19 +0000 (14:17 +0800)]
rk31xx lvds: change defined 'BIT' to 'BITS'

10 years agork312x dts: add screen disp_timings
zwl [Tue, 29 Jul 2014 03:38:57 +0000 (11:38 +0800)]
rk312x dts: add screen disp_timings

10 years agork312x dts: add fb/screen/lcdc/lvds dt node
zwl [Tue, 29 Jul 2014 03:30:00 +0000 (11:30 +0800)]
rk312x dts: add fb/screen/lcdc/lvds dt node

10 years agoUSB: Fix usb debug log
wlf [Tue, 29 Jul 2014 02:32:44 +0000 (10:32 +0800)]
USB: Fix usb debug log

10 years agork3036 lcdc: bcsh is ok.
Zheng Yang [Tue, 29 Jul 2014 02:31:26 +0000 (10:31 +0800)]
rk3036 lcdc: bcsh is ok.