Commit Graph

60949 Commits

Author SHA1 Message Date
zyc
f1634b7e9e camsys_drv : v0.0x12.0 ,camsys_head : v0.0x8.0 2014-07-31 18:01:30 +08:00
xxm
7f0ffc5dbc rockchip:iommu:fix build error when iommu disabled 2014-07-31 16:16:47 +08:00
xxm
6da6bf7d78 rockchip:iommu:define function use inline instead of #define when iommu disabled 2014-07-31 11:32:35 +08:00
xxm
3bc178e8bc rockchip:iommu:fix build error when iommu disabled 2014-07-30 17:28:33 +08:00
dkl
e41271d341 pmic: rk818: modify shutdown function and fix compile errors
1. Modify the rk818 shutdown function refering to rk808.
2. Fix some compile errors.
2014-07-25 16:23:54 +08:00
zwl
6269d4f44c rk fb: add support 4k video rotate and cancel map rotate fb 2014-07-18 10:40:59 +08:00
lintao
bfc40850c4 mmc: support drv_e and sr modify 2014-07-09 18:09:20 +08:00
dkl
b83cf632f3 rockchip: dvfs: switch regulator mode dynamically as rate changes 2014-07-07 20:13:24 +08:00
lintao
00b34deba4 mmc: host: rk_sdmmc: prepare for next Soc(s)
fix edma slave config phy regs
2014-07-07 16:43:00 +08:00
dkl
3207637c8d rockchip: add reset-rockchip driver to support Generic Reset Controller framework 2014-07-02 19:30:37 +08:00
黄涛
7bce321881 ARM: rockchip: fix compilation error when SENSORS_ROCKCHIP_TSADC is not selected 2014-07-01 15:51:57 +08:00
zwl
373657e263 rk fb: add set screen status for ddr change 2014-07-01 10:32:18 +08:00
lintao
78f99b8039 mmc: core: rk_sdmmc: prepare for next Soc(s)
Merge branch from develop-3.10-next into develop-3.10
2014-06-26 21:27:48 +08:00
xxx
d966cddbfd fixed: suspend gpios setting 2014-06-26 15:15:58 +08:00
lintao
fbfdff1f46 mmc: host: rk_sdmmc: add data-over-int timeout for data_busy
If devices fall in bad state make data_busy be hold too long,
dto interrupt will not be present, which leading  mmc-core wait for it forever.

 [<c06d42e4>] (__schedule+0x48c/0x554) from [<c06d275c>] (schedule_timeout+0x1c/0x260)
 [<c06d275c>] (schedule_timeout+0x1c/0x260) from [<c06d3c10>] (wait_for_common+0xd0/0x164)
 [<c06d3c10>] (wait_for_common+0xd0/0x164) from [<c044a4bc>] (mmc_wait_for_req_done+0x1c/0xe0)
 [<c044a4bc>] (mmc_wait_for_req_done+0x1c/0xe0) from [<c0453730>] (mmc_io_rw_extended+0x218/0x294)
 [<c0453730>] (mmc_io_rw_extended+0x218/0x294) from [<c0454590>] (sdio_io_rw_ext_helper+0xc8/0x194)
 [<c0454590>] (sdio_io_rw_ext_helper+0xc8/0x194) from [<c04546b0>] (sdio_memcpy_toio+0x1c/0x20)
 [<c04546b0>] (sdio_memcpy_toio+0x1c/0x20) from [<c032e96c>] (sdioh_request_packet+0x664/0x7e8)
 [<c032e96c>] (sdioh_request_packet+0x664/0x7e8) from [<c032fc78>] (sdioh_request_buffer+0x1a8/0x210)
2014-06-25 21:42:19 +08:00
zwl
a33266695a rk fb: modify fb rotate config read from dts 2014-06-20 11:38:20 +08:00
lin tao
c580ac7deb mmc: host: rk_sdmmc:
Support physical level three transfer.
2014-06-16 10:56:00 +08:00
lin tao
086c795117 mmc: fix compile warning 2014-06-16 08:00:18 +08:00
郭毅
1549b588c5 sensor: modify some warnings of sensor_dev.c 2014-06-13 16:50:55 +08:00
黄涛
ee25a425b9 Merge tag 'lsk-android-14.05' into develop-3.10
lsk 14.05 android release

Conflicts:
	arch/arm/common/Kconfig
	arch/arm64/include/asm/arch_timer.h
	drivers/staging/android/fiq_debugger/fiq_debugger.c
	drivers/usb/Kconfig
2014-06-12 21:04:26 +08:00
张晴
a05c3a3973 rk3288:pmic:act8846&syr82x:modify some warnings 2014-06-12 15:38:12 +08:00
张晴
75e9568f06 rk3288:pmic:ricoh619:modify some warnings 2014-06-12 15:33:37 +08:00
zwl
bed6221bcc rk fb: add get frame time interface that is used for ddr change 2014-06-11 16:29:24 +08:00
lintao
bc9c115f09 Revert "mmc: host: rk_sdmmc:"
This reverts commit 4821809db2.
2014-06-11 14:40:09 +08:00
lintao
4821809db2 mmc: host: rk_sdmmc:
[IMPORTANT COMMIT | NEED_EXPERIMENTAL | CAN_REVERT]

     <1> Support SDIO 3.0, workaround for non-standard behaviour(AP6335) Temporarily.
     <2> Support SD3.0, and SDXC card  should use  exfat filesystem.
     <3> Non-emmc devices that turning fail would not bug kernel.
         Hotplug and poweroff-able (wifi,SD,MMC) devices support re-insert and try it again.
     <4> note:
         (a) card & io aware devices, f_max = 2 * clock, e.g USH_SDR104 means
             support max 208MHz clock in standard.
         (b) setup_bus doesn't need update clk in svi flow
         (c) card_busy: bascially should check CMD,DATA[0:3], however we use
             toggle tags to match svi flow now.
         (d) shorter wait busy and remove  dump_stack in vsi flow.
             Card should be busy until clk re-enable and svi complete.

      All behaviour follow the protocol, enjoy it!
2014-06-11 14:14:55 +08:00
zwl
2b5f7c07cb rk fb: add support fence sync and async switch 2014-06-11 11:42:29 +08:00
gwl
384134cb60 NFC: Add to support ap6441 & ap6493 nfc function. 2014-06-11 09:14:43 +08:00
qjb
0774031f52 audio soc dma : add audio getposition dma 2014-06-10 09:17:55 +08:00
zyc
68aee7b787 camsys_drv:v0.c.0 camsys_head:v0.7.0 2014-06-09 09:40:28 +08:00
zwl
e957da03a7 rk32-lcdc: improve the cabc function 2014-06-05 08:52:16 +08:00
qjb
127d33d136 dma soc audio : add support dma infiniteloop mode
soc audio rockchip default use infiniteloop mode
2014-06-04 18:17:08 +08:00
hcy
51d7acb84f fix system reboot stop at DDR_DEBUG information 2014-06-03 16:54:13 +08:00
hjc
af1283a6fd rk3288 lcdc: add support BCSH func 2014-05-27 16:15:47 +08:00
陈亮
cc1cd797fa 1.add rk_system_status.c, listen system status ,and prepare something for new status. 2.serialize ddrfreq, ensure that change ddrfreq is done before enter new status 2014-05-26 23:32:01 -07:00
Mark Brown
064aff2f72 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-05-24 14:11:36 +01:00
Mark Brown
088d7dadf9 Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
Conflicts:
	arch/arm64/Kconfig
2014-05-24 14:11:01 +01:00
Mark Brown
ea3518bfc0 Merge remote-tracking branch 'lsk/v3.10/topic/arm64-dma' into lsk-v3.10-arm64-misc
Conflicts:
	arch/arm64/Kconfig
	arch/arm64/mm/dma-mapping.c
	mm/Kconfig
2014-05-24 14:04:44 +01:00
Mark Salter
fbc223483b mm: create generic early_ioremap() support
This patch creates a generic implementation of early_ioremap() support
based on the existing x86 implementation.  early_ioremp() is useful for
early boot code which needs to temporarily map I/O or memory regions
before normal mapping functions such as ioremap() are available.

Some architectures have optional MMU.  In the no-MMU case, the remap
functions simply return the passed in physical address and the unmap
functions do nothing.

Signed-off-by: Mark Salter <msalter@redhat.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Cc: Borislav Petkov <borislav.petkov@amd.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 9e5c33d7ae)
Signed-off-by: Mark Brown <broonie@linaro.org>

Conflicts:
	mm/Kconfig
	mm/Makefile
2014-05-23 19:27:34 +01:00
Mark Salter
b029d45783 add generic fixmap.h
Many architectures provide an asm/fixmap.h which defines support for
compile-time 'special' virtual mappings which need to be made before
paging_init() has run.  This support is also used for early ioremap on
x86.  Much of this support is identical across the architectures.  This
patch consolidates all of the common bits into asm-generic/fixmap.h
which is intended to be included from arch/*/include/asm/fixmap.h.

Signed-off-by: Mark Salter <msalter@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jonas Bonn <jonas.bonn@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit d57c33c5da)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-05-23 19:27:34 +01:00
Jan Kara
f51667e9c7 bdi: avoid oops on device removal
commit 5acda9d12d upstream.

After commit 839a8e8660 ("writeback: replace custom worker pool
implementation with unbound workqueue") when device is removed while we
are writing to it we crash in bdi_writeback_workfn() ->
set_worker_desc() because bdi->dev is NULL.

This can happen because even though bdi_unregister() cancels all pending
flushing work, nothing really prevents new ones from being queued from
balance_dirty_pages() or other places.

Fix the problem by clearing BDI_registered bit in bdi_unregister() and
checking it before scheduling of any flushing work.

Fixes: 839a8e8660

Reviewed-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Cc: Derek Basehore <dbasehore@chromium.org>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

(cherry picked from commit bf0972039d)
2014-05-22 21:11:01 +08:00
Mark Brown
29d6060096 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-05-22 11:38:24 +01:00
张晴
77b2eae948 rk3288:pmic:ricoh619:slove pwrkey missed when wakeup;modify some fg error 2014-05-22 16:53:53 +08:00
黄涛
a554b12b59 ARM: rockchip: fix rk3288 tsadc_int pinctrl 2014-05-22 15:11:52 +08:00
zwl
b6f6268626 rk fb: modify fb align for improve gpu ddr utilization 2014-05-22 09:22:19 +08:00
Mark Brown
fb64c4d995 Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
Conflicts:
	arch/arm64/kernel/debug-monitors.c
	arch/arm64/mm/dma-mapping.c
2014-05-22 00:13:20 +01:00
Will Deacon
83a6783cbe asm-generic: rwsem: de-PPCify rwsem.h
asm-generic/rwsem.h used to live under arch/powerpc. During its
liberation to common code, a few references to its former home where
preserved, in particular the definition of RWSEM_ACTIVE_MASK is
predicated on CONFIG_PPC64.

This patch updates the ifdefs and comments to architecturally neutral
versions.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit e172800e5d)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-05-21 18:58:41 +01:00
Mark Brown
baa60ad55e Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-05-21 18:02:00 +01:00
Mark Brown
3f8c76bb4f Merge remote-tracking branch 'lsk/v3.10/topic/arm64-be' into linux-linaro-lsk 2014-05-21 17:59:59 +01:00
H. Peter Anvin
8c8e31f98c word-at-a-time: simplify big-endian zero_bytemask macro
This is simpler and cleaner.  Depending on architecture, a smart
compiler may or may not generate the same code.

Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 789ce9dca8)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-05-21 17:59:31 +01:00
Will Deacon
68813d8f7e word-at-a-time: avoid undefined behaviour in zero_bytemask macro
The asm-generic, big-endian version of zero_bytemask creates a mask of
bytes preceding the first zero-byte by left shifting ~0ul based on the
position of the first zero byte.

Unfortunately, if the first (top) byte is zero, the output of
prep_zero_mask has only the top bit set, resulting in undefined C
behaviour as we shift left by an amount equal to the width of the type.
As it happens, GCC doesn't manage to spot this through the call to fls(),
but the issue remains if architectures choose to implement their shift
instructions differently.

An example would be arch/arm/ (AArch32), where LSL Rd, Rn, #32 results
in Rd == 0x0, whilst on arch/arm64 (AArch64) LSL Xd, Xn, #64 results in
Xd == Xn.

Rather than check explicitly for the problematic shift, this patch adds
an extra shift by 1, replacing fls with __fls. Since zero_bytemask is
never called with a zero argument (has_zero() is used to check the data
first), we don't need to worry about calling __fls(0), which is
undefined.

Cc: <stable@vger.kernel.org>
Cc: Victor Kamensky <victor.kamensky@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit ec6931b281)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-05-21 17:59:22 +01:00