firefly-linux-kernel-4.4.55.git
7 years agoRK3368 MCU: add MCU suspend and resume function
Tang Yun ping [Mon, 11 May 2015 06:54:22 +0000 (14:54 +0800)]
RK3368 MCU: add MCU suspend and resume function

Signed-off-by: Tang Yun ping <typ@rock-chips.com>
7 years agork3288 lcdc: delete unused message and update coding style
hjc [Sat, 9 May 2015 08:27:50 +0000 (16:27 +0800)]
rk3288 lcdc: delete unused message and update coding style

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agork3288 lcdc: add overscan for extern screen
hjc [Sat, 9 May 2015 07:48:22 +0000 (15:48 +0800)]
rk3288 lcdc: add overscan for extern screen

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agork3368 lcdc: update deflick config for interlace mode ouput
hjc [Sat, 9 May 2015 08:16:52 +0000 (16:16 +0800)]
rk3368 lcdc: update deflick config for interlace mode ouput

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agork3368: ddrfreq: add compat_ioctl support
Xiao Feng [Fri, 8 May 2015 07:12:13 +0000 (15:12 +0800)]
rk3368: ddrfreq: add compat_ioctl support

Signed-off-by: Xiao Feng <xf@rock-chips.com>
7 years agork3x: pmic: rk818_battery: fix code style issues from checkpatch.pl
zhangqing [Fri, 8 May 2015 10:18:55 +0000 (03:18 -0700)]
rk3x: pmic: rk818_battery: fix code style issues from checkpatch.pl

Signed-off-by: chenjianhong <chenjh@rock-chips.com>
7 years agork3368-p9: dts: mdify dvfs table
guoyi [Fri, 8 May 2015 02:18:11 +0000 (10:18 +0800)]
rk3368-p9: dts: mdify dvfs table

7 years agork31xx lvds: make sure lvds do init in kernel
hjc [Thu, 7 May 2015 11:51:43 +0000 (19:51 +0800)]
rk31xx lvds: make sure lvds do init in kernel

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agocpufreq: rockchip_big_little: minor cleanups
Huang, Tao [Thu, 7 May 2015 11:14:06 +0000 (19:14 +0800)]
cpufreq: rockchip_big_little: minor cleanups

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agork818-battery: update version to 3.0.0
chenjh [Thu, 7 May 2015 08:51:04 +0000 (16:51 +0800)]
rk818-battery: update version to 3.0.0

Signed-off-by: chenjh <chenjh@rock-chips.com>
7 years agork3368-p9: dts: add property of rk818 battery node
chenjh [Thu, 7 May 2015 08:46:22 +0000 (16:46 +0800)]
rk3368-p9: dts: add property of rk818 battery node

Signed-off-by: chenjh <chenjh@rock-chips.com>
7 years agork3368 lcdc: add ccir656 output format support
hjc [Thu, 7 May 2015 00:50:21 +0000 (08:50 +0800)]
rk3368 lcdc: add ccir656 output format support

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agoarm64: rockchip: rk3368: cpu0 use rockchip timer
Huang, Tao [Wed, 6 May 2015 14:03:22 +0000 (22:03 +0800)]
arm64: rockchip: rk3368: cpu0 use rockchip timer

prepare for power off all cpu when idle

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agoclocksource: rockchip_timer: support percpu timer on ARM64
Huang, Tao [Wed, 6 May 2015 14:00:04 +0000 (22:00 +0800)]
clocksource: rockchip_timer: support percpu timer on ARM64

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agork fb: fix hdmi/cvbs display error when uboot display logo
hjc [Wed, 6 May 2015 08:18:36 +0000 (16:18 +0800)]
rk fb: fix hdmi/cvbs display error when uboot display logo

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agork3368 lcdc: fix system crash when in blank mode to update register
hjc [Wed, 6 May 2015 08:01:39 +0000 (16:01 +0800)]
rk3368 lcdc: fix system crash when in blank mode to update register

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agork fb: delay 200ms when extern display switch screen can fix mmu pagefault
hjc [Wed, 6 May 2015 07:56:58 +0000 (15:56 +0800)]
rk fb: delay 200ms when extern display switch screen can fix mmu pagefault

7 years agoHDMI: improve EDID parse.
Zheng Yang [Wed, 6 May 2015 09:15:24 +0000 (17:15 +0800)]
HDMI: improve EDID parse.

1. For some sink device, there is no available video mode
   in EDID. hdmi driver will crash under such case.
2. There are some video mode is not defined in EDID extend
   block, so we need to check first block data.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
7 years agophy: phy-rockchip-usb: add support of rk33 usb phy
lyz [Mon, 4 May 2015 06:06:17 +0000 (14:06 +0800)]
phy: phy-rockchip-usb: add support of rk33 usb phy

The usb phy of rk33's ehci usb controller usb genernic phy
subsystem to handle suspend and resume

Signed-off-by: lyz <lyz@rock-chips.com>
7 years agophy: merge and backport phy core from linux kernel 4.1
lyz [Tue, 28 Apr 2015 09:49:12 +0000 (17:49 +0800)]
phy: merge and backport phy core from linux kernel 4.1

Signed-off-by: lyz <lyz@rock-chips.com>
7 years agoHDMI: rk3368/rk3288: If HDCP is enabled in uboot, do not set again.
Zheng Yang [Tue, 5 May 2015 10:25:21 +0000 (18:25 +0800)]
HDMI: rk3368/rk3288: If HDCP is enabled in uboot, do not set again.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
7 years agodisplay-sys: fix code style
Zheng Yang [Tue, 5 May 2015 10:08:27 +0000 (18:08 +0800)]
display-sys: fix code style

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
7 years agodisplay-sys: list supported 3d format of all resolution.
Zheng Yang [Tue, 5 May 2015 09:56:57 +0000 (17:56 +0800)]
display-sys: list supported 3d format of all resolution.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
7 years agork1000 codec: fixed rk1000 av startup pop
huang zhibao [Tue, 5 May 2015 09:44:13 +0000 (17:44 +0800)]
rk1000 codec: fixed rk1000 av startup pop

7 years agoUSB: gadget: rndis: fix compilation warning
Huang, Tao [Tue, 5 May 2015 09:36:46 +0000 (17:36 +0800)]
USB: gadget: rndis: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agousb: gadget: mtp: add new ioctl for compat
Rohith Seelaboyina [Wed, 5 Mar 2014 10:40:00 +0000 (16:10 +0530)]
usb: gadget: mtp: add new ioctl for compat

Define a new ioctl for MTP_SEND_EVENT, as its
ioctl numbers depends on the size of struct
mtp_event, which varies in ARCH32 and ARCH64.

Bug 1466403

Change-Id: I1d172aae422ca483b00c6dd59e739166f40c53ce
Signed-off-by: Rohith Seelaboyina <rseelaboyina@nvidia.com>
Reviewed-on: http://git-master/r/377800
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
7 years agoRevert "usb: ftp: fix the bug of ftp ioctrl args problem with 32bit userspace on...
Huang, Tao [Tue, 5 May 2015 08:11:36 +0000 (16:11 +0800)]
Revert "usb: ftp: fix the bug of ftp ioctrl args problem with 32bit userspace on 64bit platforms"

This reverts commit c04cdecff9f7283308b286e1bc1dbf0edfe4453b.

7 years agork3368 lcdc: update gather config
hjc [Tue, 5 May 2015 09:13:09 +0000 (17:13 +0800)]
rk3368 lcdc: update gather config

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agork3368 lcdc: fix system crash when send reboot cmd in sleep mode
hjc [Tue, 5 May 2015 06:40:00 +0000 (14:40 +0800)]
rk3368 lcdc: fix system crash when send reboot cmd in sleep mode

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agoHDMI: 3288/3368: hdcp check firmware pointer.
Zheng Yang [Mon, 4 May 2015 08:26:33 +0000 (16:26 +0800)]
HDMI: 3288/3368: hdcp check firmware pointer.
If firmware is NULL, HDCP is disabled.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
7 years agolinux os can config sleep mode
xxx [Tue, 5 May 2015 03:37:20 +0000 (11:37 +0800)]
linux os can config sleep mode

7 years agoRevert "staging: Remove the Android logger driver"
Huang, Tao [Tue, 5 May 2015 02:54:10 +0000 (10:54 +0800)]
Revert "staging: Remove the Android logger driver"

This reverts commit 4f8c75c8d90e9b65ead2eb6d92aaa6f4e43adef8.

7 years agoRevert "staging: Remove the Android alarm-dev driver"
Huang, Tao [Tue, 5 May 2015 02:53:55 +0000 (10:53 +0800)]
Revert "staging: Remove the Android alarm-dev driver"

This reverts commit 013845fd73a5cbefec6e2234d873ea11c320c655.

7 years agoRevert "staging: Remove logger and alarm-dev from android Makefile"
Huang, Tao [Tue, 5 May 2015 02:53:44 +0000 (10:53 +0800)]
Revert "staging: Remove logger and alarm-dev from android Makefile"

This reverts commit a290c3e430b1e5c7ddacc3e126e93a008c682cd4.

7 years agoMerge tag 'lsk-v3.10-15.04-android'
Huang, Tao [Tue, 5 May 2015 02:51:31 +0000 (10:51 +0800)]
Merge tag 'lsk-v3.10-15.04-android'

Conflicts:
drivers/base/cpu.c
drivers/misc/Kconfig
drivers/misc/Makefile

7 years agodma: pl330: silence a compile warning
Dan Carpenter [Fri, 8 Nov 2013 09:51:16 +0000 (12:51 +0300)]
dma: pl330: silence a compile warning

On 64 bit systems GCC warns that:

drivers/dma/pl330.c: In function ‘pl330_filter’:
drivers/dma/pl330.c:2317:21: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]

It's harmless and I have casted it away.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
(cherry picked from commit 2f986ec6fa57a5dcf77f19f5f0d44b1f680a100f)

7 years agodma: pl330: use dma_addr_t for describing bus addresses
Will Deacon [Mon, 10 Jun 2013 18:34:38 +0000 (19:34 +0100)]
dma: pl330: use dma_addr_t for describing bus addresses

The microcode bus address (pl330_dmac.mcode_bus) is currently a u32,
which fails to compile when building on a system with 64-bit bus
addresses.

This patch uses dma_addr_t to represent the address instead.

Cc: Jassi Brar <jaswinder.singh@linaro.org>
Cc: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
Acked-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
(cherry picked from commit fed8c45727abd273fd74b3e78b35be4929121334)

7 years agork: gcc-wrapper.py ignore psci.c
Huang, Tao [Mon, 4 May 2015 13:04:37 +0000 (21:04 +0800)]
rk: gcc-wrapper.py ignore psci.c

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agorfkill-bt: fix compilation warning
Huang, Tao [Mon, 4 May 2015 13:03:48 +0000 (21:03 +0800)]
rfkill-bt: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agoinput: gt9xx: fix compilation warning
Huang, Tao [Mon, 4 May 2015 12:59:30 +0000 (20:59 +0800)]
input: gt9xx: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agommc: rk_sdmmc: fix compilation warning
Huang, Tao [Mon, 4 May 2015 12:54:41 +0000 (20:54 +0800)]
mmc: rk_sdmmc: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agoinv_mpu: fix compilation warning
Huang, Tao [Mon, 4 May 2015 12:50:42 +0000 (20:50 +0800)]
inv_mpu: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agomedia: camsys_marvin: fix compilation warning
Huang, Tao [Mon, 4 May 2015 12:46:20 +0000 (20:46 +0800)]
media: camsys_marvin: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agoinput: vtl_ts: fix compilation warning
Huang, Tao [Mon, 4 May 2015 12:25:39 +0000 (20:25 +0800)]
input: vtl_ts: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agoiommu: rockchip-iovmm: fix compilation warning
Huang, Tao [Mon, 4 May 2015 12:22:22 +0000 (20:22 +0800)]
iommu: rockchip-iovmm: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agoarm: rockchip: pm: fix compilation warning
Huang, Tao [Mon, 4 May 2015 12:02:11 +0000 (20:02 +0800)]
arm: rockchip: pm: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agoarm: rockchip: ddr_freq: fix compilation warning
Huang, Tao [Mon, 4 May 2015 11:51:17 +0000 (19:51 +0800)]
arm: rockchip: ddr_freq: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agoarm64: cpuinfo: compat task get hwcap from compat_hwcap_str
Huang, Tao [Mon, 4 May 2015 11:43:13 +0000 (19:43 +0800)]
arm64: cpuinfo: compat task get hwcap from compat_hwcap_str

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agomedia: rk_camsys: fix compilation warning
Huang, Tao [Mon, 4 May 2015 11:06:37 +0000 (19:06 +0800)]
media: rk_camsys: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agork: gcc-wrapper.py ignore compat_binfmt_elf.c:58
Huang, Tao [Mon, 4 May 2015 11:00:03 +0000 (19:00 +0800)]
rk: gcc-wrapper.py ignore compat_binfmt_elf.c:58

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agorkwifi: dhd_config: fix compilation warning
Huang, Tao [Mon, 4 May 2015 10:22:14 +0000 (18:22 +0800)]
rkwifi: dhd_config: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agovideo: rk32_mipi_dsi: fix compilation warning
Huang, Tao [Mon, 4 May 2015 10:17:27 +0000 (18:17 +0800)]
video: rk32_mipi_dsi: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agomedia: camsys_soc_rk3368: fix compilation warning
Huang, Tao [Mon, 4 May 2015 10:14:39 +0000 (18:14 +0800)]
media: camsys_soc_rk3368: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agothermal: rockchip: fix compilation warning
Huang, Tao [Mon, 4 May 2015 10:11:47 +0000 (18:11 +0800)]
thermal: rockchip: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agospi: rockchip: fix compilation warning
Huang, Tao [Mon, 4 May 2015 10:05:49 +0000 (18:05 +0800)]
spi: rockchip: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agospi: rockchip: todos spi-rockchip-test.c
Huang, Tao [Mon, 4 May 2015 09:50:33 +0000 (17:50 +0800)]
spi: rockchip: todos spi-rockchip-test.c

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agoRK3368 DDR:Add lcdc type detect for mcu DCF
Tang Yun ping [Mon, 4 May 2015 01:56:14 +0000 (09:56 +0800)]
RK3368 DDR:Add lcdc type detect for mcu DCF

Signed-off-by: Tang Yun ping <typ@rock-chips.com>
7 years agommc: sdhci-of-arasan: Omit superfluous error messages
Mike Looijmans [Tue, 28 Oct 2014 07:53:21 +0000 (08:53 +0100)]
mmc: sdhci-of-arasan: Omit superfluous error messages

sdhci_add_host and sdhci_platfm_init already report failure,
so don't emit error messages when a failure occurs. This prevents
occurences of "deferred" messages when required power supplies
are not ready for operation yet.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
7 years agommc: sdhci-of-arasan: Use signed formatting in error messages
Mike Looijmans [Thu, 23 Oct 2014 11:31:00 +0000 (13:31 +0200)]
mmc: sdhci-of-arasan: Use signed formatting in error messages

"ret" is a signed int, so use "%d" in format strings instead of "%u".
This prevents cryptic codes in error messages like this:
sdhci-arasan e0101000.sdhci: platform register failed (4294966779)

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
7 years agommc: sdhci-of-arasan: Call OF parsing for MMC
Michal Simek [Tue, 7 Apr 2015 05:57:32 +0000 (07:57 +0200)]
mmc: sdhci-of-arasan: Call OF parsing for MMC

Also check MMC OF properties. The controller supports MMC too.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
7 years agommc: arasan: Add driver for Arasan SDHCI
Soren Brinkmann [Mon, 2 Dec 2013 18:02:36 +0000 (10:02 -0800)]
mmc: arasan: Add driver for Arasan SDHCI

Add a driver for Arasan's SDHCI controller core.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: Rob Herring <rob.herring@calxeda.com> [binding]
Acked-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Chris Ball <chris@printf.net>
Conflicts:
MAINTAINERS

7 years agoMIPI: Provide a function,get screen type,for frequency conversion.
xubilv [Thu, 30 Apr 2015 06:48:03 +0000 (14:48 +0800)]
MIPI: Provide a function,get screen type,for frequency conversion.

Signed-off-by: xubilv <xbl@rock-chips.com>
7 years agocpufreq: rockchip_big_little: update current policy cpu before cpufreq_cpu_get
Xiao Feng [Thu, 30 Apr 2015 03:39:52 +0000 (11:39 +0800)]
cpufreq: rockchip_big_little: update current policy cpu before cpufreq_cpu_get

Signed-off-by: Xiao Feng <xf@rock-chips.com>
7 years agoRK3368 GPU version: Rogue L 0.15
zxl [Thu, 30 Apr 2015 02:32:32 +0000 (10:32 +0800)]
RK3368 GPU version: Rogue L 0.15
1. Fix lock bug in hrtimer.
2. Add USE_KTHREAD to simulate timer.Now open USE_HRTIMER instead of USE_KTHREAD by default.

Signed-off-by: zxl <zhuangxl@rock-chips.com>
7 years agork fb: kfree envp[1], if we not do real switch screen
hjc [Wed, 29 Apr 2015 06:39:18 +0000 (14:39 +0800)]
rk fb: kfree envp[1], if we not do real switch screen

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agork fb: fix iommu page fault when in video test
hjc [Wed, 29 Apr 2015 05:54:42 +0000 (13:54 +0800)]
rk fb: fix iommu page fault when in video test

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agork3368 lcdc: update win state
hjc [Wed, 29 Apr 2015 05:53:58 +0000 (13:53 +0800)]
rk3368 lcdc: update win state

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agocpufreq: rockchip_big_little: check cpufreq_cpu_get return value
Huang, Tao [Wed, 29 Apr 2015 01:05:09 +0000 (09:05 +0800)]
cpufreq: rockchip_big_little: check cpufreq_cpu_get return value

fix panic when cpu up/down

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
7 years agoHDMI: rk3368: add function for HDCP2.2.
Zheng Yang [Tue, 28 Apr 2015 11:17:27 +0000 (19:17 +0800)]
HDMI: rk3368: add function for HDCP2.2.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
7 years agorockchip: video: fix logo display when switch screen
Mark Yao [Tue, 28 Apr 2015 06:52:23 +0000 (14:52 +0800)]
rockchip: video: fix logo display when switch screen

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
7 years agoRevert "video: rockchip: logo: copy loader to framebuffer"
Mark Yao [Tue, 28 Apr 2015 03:18:43 +0000 (11:18 +0800)]
Revert "video: rockchip: logo: copy loader to framebuffer"

This reverts commit a9085919caeb58941c216e63a2bdef458d549f4d.

7 years agoRevert "video: dts: add disp fullscreen for box logo"
Mark Yao [Tue, 28 Apr 2015 03:18:39 +0000 (11:18 +0800)]
Revert "video: dts: add disp fullscreen for box logo"

This reverts commit b8667979fa6e142bae9d1731039a250525b7a05a.

7 years agork3368: add the hdmi nlpcm and hbr mode for direct output
smj [Sat, 25 Apr 2015 02:11:44 +0000 (10:11 +0800)]
rk3368: add the hdmi nlpcm and hbr mode for direct output

Signed-off-by: smj <smj@rock-chips.com>
7 years agodts: delete node rockchips,hdmi_audio_source.
Zheng Yang [Mon, 27 Apr 2015 09:01:48 +0000 (17:01 +0800)]
dts: delete node rockchips,hdmi_audio_source.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
7 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>
Conflicts:
include/linux/rk_fb.h

7 years agodelete unused file drivers/video/rockchip/rk_fb.c.rej
hjc [Sun, 26 Apr 2015 08:45:14 +0000 (16:45 +0800)]
delete unused file drivers/video/rockchip/rk_fb.c.rej

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agosofia3gr: ion: fix this issue, the reason is ion_import_dma_buf may be invoked concur...
Sugar Zhang [Tue, 31 Mar 2015 07:19:59 +0000 (15:19 +0800)]
sofia3gr: ion: fix this issue, the reason is ion_import_dma_buf may be invoked concurrently.

<4>[ 3123.242655] WARNING: CPU: 2 PID: 2648 at drivers/staging/android/ion/ion.c:512 ion_handle_add+0xb4/0xc0()
<7>[ 3123.252189] ion_handle_add: buffer already found.
<7>[ 3123.256694] Modules linked in: iwlmvm iwlwifi mac80211 cfg80211 compat
<7>[ 3123.263195] CPU: 2 PID: 2648 Comm: TimedEventQueue Tainted: G        W    3.14.0 #7
<7>[ 3123.270868]  00000000 00000000 9a3efd2c 80faf273 9a3efd6c 9a3efd5c 80935dc9 811d7fd3
<7>[ 3123.278405]  9a3efd88 00000a58 812208a0 00000200 80e128d4 80e128d4 8d4ae00c a8cd8600
<7>[ 3123.286065]  a8cd8094 9a3efd74 80935e0e 00000009 9a3efd6c 811d7fd3 9a3efd88 9a3efd9c
<7>[ 3123.293867] Call Trace:
<7>[ 3123.296159]  [<80faf273>] dump_stack+0x48/0x69
<7>[ 3123.300537]  [<80935dc9>] warn_slowpath_common+0x79/0x90
<7>[ 3123.305913]  [<80e128d4>] ? ion_handle_add+0xb4/0xc0
<7>[ 3123.310694]  [<80e128d4>] ? ion_handle_add+0xb4/0xc0
<7>[ 3123.315703]  [<80935e0e>] warn_slowpath_fmt+0x2e/0x30
<7>[ 3123.320586]  [<80e128d4>] ion_handle_add+0xb4/0xc0
<7>[ 3123.325450]  [<80e144cc>] ion_import_dma_buf+0x8c/0x110
<7>[ 3123.330490]  [<80c517c4>] reg_init+0x364/0x7d0
<7>[ 3123.334975]  [<80993363>] ? futex_wait+0x123/0x210
<7>[ 3123.339607]  [<80992e0e>] ? get_futex_key+0x16e/0x1e0
<7>[ 3123.344692]  [<8099308f>] ? futex_wake+0x5f/0x120
<7>[ 3123.349245]  [<80c51e19>] vpu_service_ioctl+0x1e9/0x500
<7>[ 3123.354508]  [<80994aec>] ? do_futex+0xec/0x8e0
<7>[ 3123.358885]  [<80971080>] ? prepare_to_wait_event+0xc0/0xc0
<7>[ 3123.364503]  [<80c51c30>] ? reg_init+0x7d0/0x7d0
<7>[ 3123.368955]  [<80a22562>] do_vfs_ioctl+0x2d2/0x4c0
<7>[ 3123.373816]  [<80b198ad>] ? inode_has_perm.isra.41+0x2d/0x40
<7>[ 3123.379278]  [<80b199cf>] ? file_has_perm+0x7f/0x90
<7>[ 3123.384217]  [<80b1a5f7>] ? selinux_file_ioctl+0x47/0xf0
<7>[ 3123.389351]  [<80a227a8>] SyS_ioctl+0x58/0x80
<7>[ 3123.393754]  [<80fb45e8>] syscall_call+0x7/0x7
<7>[ 3123.398043]  [<80fb0000>] ? mmc_do_calc_max_discard+0xab/0xe4
<4>[ 3123.404220] ---[ end trace bd195cf65df321ce ]---

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: CMY <cmy@rock-chips.com>
7 years agoTP: gt9xx: support early suspend&resume
guoyi [Thu, 23 Apr 2015 09:20:10 +0000 (17:20 +0800)]
TP: gt9xx: support early suspend&resume

7 years agoMerge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Alex Shi [Thu, 23 Apr 2015 06:55:22 +0000 (14:55 +0800)]
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

7 years agoarm64: respect mem= for EFI
Mark Rutland [Thu, 15 Jan 2015 16:42:14 +0000 (16:42 +0000)]
arm64: respect mem= for EFI

When booting with EFI, we acquire the EFI memory map after parsing the
early params. This unfortuantely renders the option useless as we call
memblock_enforce_memory_limit (which uses memblock_remove_range behind
the scenes) before we've added any memblocks. We end up removing
nothing, then adding all of memory later when efi_init calls
reserve_regions.

Instead, we can log the limit and apply this later when we do the rest
of the memblock work in memblock_init, which should work regardless of
the presence of EFI. At the same time we may as well move the early
parameter into arm64's mm/init.c, close to arm64_memblock_init.

Any memory which must be mapped (e.g. for use by EFI runtime services)
must be mapped explicitly reather than relying on the linear mapping,
which may be truncated as a result of a mem= option passed on the kernel
command line.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 6083fe74b7bfffc2c7be8c711596608bda0cda6e)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
7 years agodts: rk3368 box r88 add power led
huang zhibao [Thu, 23 Apr 2015 02:45:37 +0000 (10:45 +0800)]
dts: rk3368 box r88 add power led

7 years agork3368: i2c: add i2c sleep pinctrl
David Wu [Tue, 21 Apr 2015 18:21:04 +0000 (02:21 +0800)]
rk3368: i2c: add i2c sleep pinctrl

Signed-off-by: David Wu <wdc@rock-chips.com>
7 years ago NAND : update dts config for nand.
Zhaoyifeng [Tue, 21 Apr 2015 05:03:24 +0000 (13:03 +0800)]
   NAND : update dts config for nand.
   nandc0reg are unused now,rknand_base.c will check boot media,if
boot form emmc,nand porbe will not enable clock.

7 years ago NAND : add boot media check
Zhaoyifeng [Tue, 21 Apr 2015 04:57:56 +0000 (12:57 +0800)]
NAND  : add boot media check
    Add boot media check , if boot from EMMC,no need to enable nand clock.

7 years agoRK3368 GPU version: Rogue L 0.14 Remove 'Instead kmalloc to kzalloc'
zxl [Tue, 21 Apr 2015 03:01:13 +0000 (11:01 +0800)]
RK3368 GPU version: Rogue L 0.14 Remove 'Instead kmalloc to kzalloc'

Signed-off-by: zxl <zhuangxl@rock-chips.com>
7 years agoes8316: fix spk no sound.
Sugar Zhang [Tue, 21 Apr 2015 02:12:24 +0000 (10:12 +0800)]
es8316: fix spk no sound.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
7 years ago NAND : Fix 3368 dts nand clock config
Zhaoyifeng [Tue, 21 Apr 2015 01:50:33 +0000 (09:50 +0800)]
NAND : Fix 3368 dts nand clock config
    hclk_emem_peri need config for nand.

7 years agork3368 lcdc: add support serial RGB888 and RGB888 DUMY output
hjc [Mon, 20 Apr 2015 12:54:07 +0000 (20:54 +0800)]
rk3368 lcdc: add support serial RGB888 and RGB888 DUMY output

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agovideo: dts: add disp fullscreen for box logo
Mark Yao [Mon, 20 Apr 2015 09:55:06 +0000 (17:55 +0800)]
video: dts: add disp fullscreen for box logo

7 years agovideo: rockchip: logo: copy loader to framebuffer
Mark Yao [Mon, 20 Apr 2015 08:46:05 +0000 (16:46 +0800)]
video: rockchip: logo: copy loader to framebuffer

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
7 years agovideo: rga: rga use fs_initcall to init early
Mark Yao [Mon, 20 Apr 2015 08:42:38 +0000 (16:42 +0800)]
video: rga: rga use fs_initcall to init early

We want to use rga for loader logo copy, need rga driver init before
lcdc init.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
7 years agork3368 lcdc: enable dither up default
hjc [Mon, 20 Apr 2015 08:26:15 +0000 (16:26 +0800)]
rk3368 lcdc: enable dither up default

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agork fb: extend output mutex lock in win config
hjc [Sat, 18 Apr 2015 06:01:06 +0000 (14:01 +0800)]
rk fb: extend output mutex lock in win config

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agork3368 lcdc: fix some hidden trouble maybe lead to abnormal when shutdown
hjc [Sat, 18 Apr 2015 05:46:43 +0000 (13:46 +0800)]
rk3368 lcdc: fix some hidden trouble maybe lead to abnormal when shutdown

Signed-off-by: hjc <hjc@rock-chips.com>
7 years agowifi: support random mac address and save to file, solve compile warning
hwg [Mon, 20 Apr 2015 08:17:57 +0000 (16:17 +0800)]
wifi: support random mac address and save to file, solve compile warning

7 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

7 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

7 years agork1000: rk1000 Standby power consumption processing
huang zhibao [Sat, 18 Apr 2015 07:08:06 +0000 (15:08 +0800)]
rk1000: rk1000 Standby power consumption processing

7 years agoMerge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Alex Shi [Sat, 18 Apr 2015 05:37:44 +0000 (13:37 +0800)]
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

7 years agoMerge branch 'linux-3.10.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable...
Alex Shi [Sat, 18 Apr 2015 05:36:38 +0000 (13:36 +0800)]
Merge branch 'linux-3.10.y' of git://git./linux/kernel/git/stable/linux-stable into linux-linaro-lsk