黄涛 [Mon, 7 Jul 2014 13:01:04 +0000 (21:01 +0800)]
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
drivers/mmc/host/Kconfig
drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c
drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.h
drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.c
drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.h
include/linux/mmc/rk_mmc.h
include/linux/rockchip/cru.h
dkl [Mon, 7 Jul 2014 10:22:12 +0000 (18:22 +0800)]
rockchip: dvfs: switch regulator mode dynamically as rate changes
黄涛 [Mon, 7 Jul 2014 11:45:28 +0000 (19:45 +0800)]
ARM: rockchip: pie support rk3036
张晴 [Mon, 7 Jul 2014 10:07:25 +0000 (18:07 +0800)]
rk3288:pmic:sdk:support new pmic hardware
lintao [Mon, 7 Jul 2014 09:39:37 +0000 (17:39 +0800)]
mmc: add support for rk3036
lintao [Mon, 7 Jul 2014 08:41:49 +0000 (16:41 +0800)]
mmc: host: rk_sdmmc: prepare for next Soc(s)
fix edma slave config phy regs
wdc [Mon, 7 Jul 2014 08:39:25 +0000 (16:39 +0800)]
3036: open uart pinctrl and clk
qjb [Mon, 7 Jul 2014 07:58:53 +0000 (15:58 +0800)]
rk616 codec: fixed rk616 codec shutdown function null pointer
张晴 [Mon, 7 Jul 2014 06:06:37 +0000 (14:06 +0800)]
rk3036:clk:support set pll clks and init clocks
wdc [Mon, 7 Jul 2014 05:44:14 +0000 (13:44 +0800)]
3036: update rtc dts
Zheng Yang [Mon, 7 Jul 2014 05:08:04 +0000 (13:08 +0800)]
rk3036 lcdc: commit driver code, just pass compiling.
hjc [Mon, 7 Jul 2014 03:12:06 +0000 (11:12 +0800)]
rk3036 hdmi: add pinctrl for hdmi
hjc [Fri, 4 Jul 2014 09:37:07 +0000 (17:37 +0800)]
rk3036 hdmi: fix some define error
CMY [Tue, 24 Jun 2014 02:48:50 +0000 (10:48 +0800)]
rk: ion: fix build warning for iommu API
xxm [Mon, 7 Jul 2014 02:12:38 +0000 (10:12 +0800)]
rockchip:iommu:update iommu for rk3036,add vcodec_sel for hevc and vpu,change param name(sfrbase) to (base) ,delete some useless code
zsq [Sun, 6 Jul 2014 07:34:26 +0000 (15:34 +0800)]
fix rga1/rga2 mem leak when create mmu table use user malloc buf
dkl [Fri, 4 Jul 2014 12:31:12 +0000 (20:31 +0800)]
rockchip: rk3036: add pwm_regulator node in dts
Luowei [Fri, 4 Jul 2014 10:27:32 +0000 (18:27 +0800)]
add rk3036 pinctrl support
陈亮 [Fri, 4 Jul 2014 05:51:38 +0000 (22:51 -0700)]
set screen status before and after ddr change freq
Signed-off-by: 陈亮 <cl@rock-chips.com>
hjc [Thu, 3 Jul 2014 11:40:26 +0000 (19:40 +0800)]
rk3036 hdmi: add basic version
zwl [Thu, 3 Jul 2014 08:43:50 +0000 (16:43 +0800)]
rk616 hdmi: coding reorganize for 3.10 and clean up unused code
ljf [Fri, 4 Jul 2014 07:28:15 +0000 (15:28 +0800)]
rk3036: add dts node for vpu and hevc
wdc [Fri, 4 Jul 2014 06:32:27 +0000 (14:32 +0800)]
3036: fix iomap error
黄涛 [Fri, 4 Jul 2014 04:59:57 +0000 (12:59 +0800)]
scripts/checkpatch.pl: update to
b43ae21bd1d8199df10548f3fc0d806052027f29 and enable strict default
陈亮 [Fri, 4 Jul 2014 03:58:01 +0000 (20:58 -0700)]
change ddrfreq directly in ddr_init() since lcdc is not init
Signed-off-by: 陈亮 <cl@rock-chips.com>
lyz [Fri, 4 Jul 2014 03:56:19 +0000 (11:56 +0800)]
3036: usb: add usb support
xxm [Fri, 4 Jul 2014 02:57:56 +0000 (10:57 +0800)]
rockchip:mali400:enable mali400 irq and resource address in rk3036.dtsi
xxm [Fri, 4 Jul 2014 02:51:58 +0000 (10:51 +0800)]
rockchip:mali400:enable mali build config in (drivers/video/Kconfig)
xxm [Fri, 4 Jul 2014 02:47:12 +0000 (10:47 +0800)]
rockchip:mali400:init r4p0-00rel0 for rk3036,version to 0x01
许盛飞 [Fri, 4 Jul 2014 02:38:48 +0000 (10:38 +0800)]
3036: fix pwm dts tree
wdc [Fri, 4 Jul 2014 02:29:20 +0000 (10:29 +0800)]
3036: default jtag_clk is enable
wdc [Fri, 4 Jul 2014 02:23:16 +0000 (10:23 +0800)]
3036: add CRU_MODE_CON offset
wdc [Fri, 4 Jul 2014 02:10:43 +0000 (10:10 +0800)]
3036: enble dpll slow mode at restart
zwl [Fri, 4 Jul 2014 01:29:04 +0000 (09:29 +0800)]
rk screen: add the judgement if the variable rk_screen is null pointer
wdc [Fri, 4 Jul 2014 01:22:44 +0000 (09:22 +0800)]
3036:for cru slow mode
wdc [Thu, 3 Jul 2014 10:24:18 +0000 (18:24 +0800)]
3036: for jtag clk
wdc [Thu, 3 Jul 2014 09:53:25 +0000 (17:53 +0800)]
fix gpu build error
wdc [Thu, 3 Jul 2014 09:49:06 +0000 (17:49 +0800)]
3036: add cru,grf,iomap
zwl [Thu, 3 Jul 2014 08:43:50 +0000 (16:43 +0800)]
rk616 hdmi: coding reorganize for 3.10 and clean up unused code
郭毅 [Thu, 3 Jul 2014 02:41:37 +0000 (10:41 +0800)]
tb_8846: dts : fix gpu voltage
yxj [Thu, 3 Jul 2014 01:12:44 +0000 (09:12 +0800)]
default disabled lcdc iommu in dts
黄涛 [Wed, 2 Jul 2014 11:58:15 +0000 (19:58 +0800)]
reset: rockchip: fix compilation warning
dkl [Fri, 27 Jun 2014 13:37:45 +0000 (21:37 +0800)]
rockchip: add reset-rockchip driver to support Generic Reset Controller framework
zwl [Wed, 2 Jul 2014 03:55:27 +0000 (11:55 +0800)]
rk fb: add the judgement that if the variable dev_drv is null pointer
lintao [Wed, 2 Jul 2014 01:57:08 +0000 (09:57 +0800)]
mmc: host: rk_sdmmc: no requirement to reclaim edmac in err handle routine
Signed-off-by: lintao <lintao@rock-chips.com>
Cc: xujh <xujh@rock-chips.com>
wdc [Wed, 2 Jul 2014 01:05:22 +0000 (09:05 +0800)]
3036: add sdk ,rk88 dts file
黄涛 [Tue, 1 Jul 2014 11:13:28 +0000 (19:13 +0800)]
ARM: rockchip: ft support GPU test
xxx [Tue, 1 Jul 2014 08:58:51 +0000 (16:58 +0800)]
add:ddr reg dump,resume code data align
黄涛 [Tue, 1 Jul 2014 07:57:34 +0000 (15:57 +0800)]
ARM: rockchip: pm: fix compilation warning
黄涛 [Tue, 1 Jul 2014 07:38:56 +0000 (15:38 +0800)]
ARM: rockchip: fix compilation error when SENSORS_ROCKCHIP_TSADC is not selected
黄涛 [Tue, 1 Jul 2014 07:43:00 +0000 (15:43 +0800)]
ARM: rockchip: pm-rk3288.c fix compilation warning when RK_LAST_LOG is not selected
xxx [Tue, 1 Jul 2014 07:43:34 +0000 (15:43 +0800)]
suspend:resume arm errata818325
xxm [Tue, 1 Jul 2014 07:26:15 +0000 (15:26 +0800)]
rockchip:mali400:1,update rk3036.dtsi with mali400 2,update mali400 build config
郭毅 [Tue, 1 Jul 2014 03:05:49 +0000 (11:05 +0800)]
tb_8846 : dts: swap lcd0 and lcd1
郭毅 [Tue, 1 Jul 2014 03:03:47 +0000 (11:03 +0800)]
dts: delete rk3288-tb1.dts
zwl [Tue, 1 Jul 2014 02:32:18 +0000 (10:32 +0800)]
rk fb: add set screen status for ddr change
陈亮 [Mon, 30 Jun 2014 09:00:50 +0000 (02:00 -0700)]
auto down ldcd0 or lcdc1 dclk rate when ddr change rate.
This commit corresponds to commit
debf1d2237185a26503d737d54db730f62cf5ea5
Signed-off-by: 陈亮 <cl@rock-chips.com>
lintao [Mon, 30 Jun 2014 02:03:26 +0000 (10:03 +0800)]
mmc: host: rk_sdmmc: fix re-put count of dma
黄涛 [Mon, 30 Jun 2014 12:27:52 +0000 (20:27 +0800)]
ARM: rockchip: enable ARM_ERRATA_818325 for RK3288
黄涛 [Mon, 30 Jun 2014 12:21:22 +0000 (20:21 +0800)]
ARM: errata: Workaround for Cortex-A12 erratum 818325
On Cortex-A12 (r0p0..r0p1-00lac0-rc11), when a CPU executes a sequence of
two conditional store instructions with opposite condition code and
updating the same register, the system might enter a deadlock if the
second conditional instruction is an UNPREDICTABLE STR or STM
instruction. This workaround setting bit[12] of the Feature Register
prevents the erratum. This bit disables an optimisation applied to a
sequence of 2 instructions that use opposing condition codes.
wlf [Mon, 30 Jun 2014 09:01:12 +0000 (17:01 +0800)]
USB: fix DWC_OTG HCD disconnect bug to avoid NULL pointer.
CMY [Mon, 30 Jun 2014 06:52:36 +0000 (14:52 +0800)]
rk: ion: add caller info in snapshot if alloc failed
郭毅 [Mon, 30 Jun 2014 06:29:09 +0000 (14:29 +0800)]
Author: CMY <cmy@rock-chips.com>
rk: dts: more convenient to modify CMA region
张晴 [Mon, 30 Jun 2014 03:35:50 +0000 (11:35 +0800)]
rk3288:tsadc:support auto mode,high temp to reset cru or cut down pmic
郭毅 [Mon, 30 Jun 2014 02:30:58 +0000 (10:30 +0800)]
p977:dts: modify gpu freq to 420M
郭毅 [Mon, 30 Jun 2014 02:04:47 +0000 (10:04 +0800)]
rk3288: dts: add rk3288-tb_8846.dts for sdk v2.0
xxx [Fri, 27 Jun 2014 10:23:08 +0000 (18:23 +0800)]
fixed : ft test config
wdc [Fri, 27 Jun 2014 10:21:48 +0000 (18:21 +0800)]
3036: fix spi dts tree
lintao [Fri, 27 Jun 2014 06:56:34 +0000 (14:56 +0800)]
mmc: core: rk_sdmmc: fix NULL pointer cause by edma complete
If card been removed after sending read cmd to it, and before its
response data sent to host, data null pointer occur.
lintao [Fri, 27 Jun 2014 01:56:52 +0000 (09:56 +0800)]
mmc: host: rk_sdmmc: fix edma src max burst size
lintao [Thu, 26 Jun 2014 13:27:48 +0000 (21:27 +0800)]
mmc: core: rk_sdmmc: prepare for next Soc(s)
Merge branch from develop-3.10-next into develop-3.10
lintao [Thu, 26 Jun 2014 12:38:04 +0000 (20:38 +0800)]
mmc: core: rk_sdmmc: prepare for next Soc(s)
Release external dma channel before mci suspend and remove
陈亮 [Thu, 26 Jun 2014 11:27:24 +0000 (04:27 -0700)]
fix BUG: sleeping function called from invalid context at kernel/mutex.c
xxx [Thu, 26 Jun 2014 10:19:48 +0000 (18:19 +0800)]
add ft tst func
xxx [Thu, 26 Jun 2014 10:17:08 +0000 (18:17 +0800)]
add arm pll rate conf
xxx [Thu, 26 Jun 2014 10:15:27 +0000 (18:15 +0800)]
fixed not define CONFIG_PM warning
xxx [Thu, 26 Jun 2014 10:13:16 +0000 (18:13 +0800)]
ddr_rk32.c:fixed warning
CMY [Thu, 26 Jun 2014 10:01:34 +0000 (18:01 +0800)]
rk: dts: more convenient to modify CMA region
gwl [Thu, 26 Jun 2014 07:55:05 +0000 (15:55 +0800)]
WiFi:bcmdhd: fix wifi driver endless loop when initialization fail.
xxx [Thu, 26 Jun 2014 07:15:58 +0000 (15:15 +0800)]
fixed: suspend gpios setting
xxx [Thu, 26 Jun 2014 07:11:41 +0000 (15:11 +0800)]
fixed : rkpm_ddr_regs_dump
黄涛 [Thu, 26 Jun 2014 06:54:51 +0000 (14:54 +0800)]
ARM: rockchip: platsmp fix for Cortex-A7
SCUCTLR do not existing in Cortex-A7.
CMY [Thu, 26 Jun 2014 06:47:09 +0000 (14:47 +0800)]
rk: ion: enable CMA that placed in highmem zone by default
CMY [Thu, 26 Jun 2014 06:29:01 +0000 (14:29 +0800)]
rk: p977: adjust lowmem/vmalloc area to 496/504 MB
CMY [Thu, 26 Jun 2014 03:21:41 +0000 (11:21 +0800)]
rk: ion: Add support cma heap placed in highmem zone
Add CONFIG_ION_CMA_HIGHMEM to support cma that placed in highmem zone.
Use dma_alloc_attrs() with DMA_ATTR_NO_KERNEL_MAPPING to alloc memory from
cma heap that placed in highmem zone, and use dma_free_attrs() with
DMA_ATTR_NO_KERNEL_MAPPING to free the memory.
Use ion_heap_map_kernel/ion_heap_unmap_kernel for map/unmap to the kernel
when support cma in highmem.
CMY [Thu, 26 Jun 2014 03:18:23 +0000 (11:18 +0800)]
rk: dma-mapping: Add support DMA allocate memory without mapping
reserved DMA(CMA) regions may be large than 512MB for devices, placed it
in the highmem zone is appropriate, but according to the existing
mechanism, memory allocation with mapping will cause vmalloc area not
enough.
Now we don't do mapping if the DMA_ATTR_NO_KERNEL_MAPPING is set.
lintao [Thu, 26 Jun 2014 06:05:50 +0000 (14:05 +0800)]
mmc: core: rk_sdmmc: prepare for next Soc(s)
Fix cache coherence: flush sg before write and invalidate sg
between read-done and umap
lintao [Thu, 26 Jun 2014 03:46:36 +0000 (11:46 +0800)]
mmc: core: rk_sdmmc: prepare for next Soc(s)
Support fifoth adjust based on blksz each transfer handled by
external dma itf.
zwl [Thu, 26 Jun 2014 03:33:24 +0000 (11:33 +0800)]
rk3288 hdmi: fix some tv have no display if switch resolution several times
wdc [Thu, 26 Jun 2014 03:11:38 +0000 (11:11 +0800)]
3036: fix cpu timer ints and nandc dts node
ywj [Thu, 26 Jun 2014 02:59:32 +0000 (10:59 +0800)]
fix some warning for mpu6050
hwg [Thu, 26 Jun 2014 02:13:06 +0000 (10:13 +0800)]
asix usb ethernet:
avoid kernel panic when alloc skb fail in lowmemory case
lintao [Tue, 24 Jun 2014 09:20:42 +0000 (17:20 +0800)]
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)
lintao [Wed, 25 Jun 2014 13:37:57 +0000 (21:37 +0800)]
mmc: core: rk_sdmmc: prepare for next Soc(s)
fix commit-sha1
4ae0cc94: cherry-pick wrong commit from experimental branch
lintao [Wed, 25 Jun 2014 13:31:07 +0000 (21:31 +0800)]
mmc: core: rk_sdmmc: prepare for next Soc(s)
Add node to dts(rk3036); Fixme: pinctrl missing
dkl [Wed, 25 Jun 2014 12:21:16 +0000 (20:21 +0800)]
rk3288: set "rockchip,clocks-uboot-has-init" "aclk_vio0" as default.
This commit corresponds to commit
debf1d2237185a26503d737d54db730f62cf5ea5.
lintao [Wed, 25 Jun 2014 08:30:26 +0000 (16:30 +0800)]
mmc: core: rk_sdmmc: prepare for next Soc(s)
complete external dma itf ops for mmc
黄涛 [Wed, 25 Jun 2014 03:50:37 +0000 (11:50 +0800)]
ARM: rockchip: rk3036: fix arm pmu irq setup
CMY [Tue, 24 Jun 2014 02:48:50 +0000 (10:48 +0800)]
rk: ion: fix build warning for iommu API
zyc [Wed, 25 Jun 2014 00:44:42 +0000 (08:44 +0800)]
camera: change isp ddr freq from 400M to 533M