Zheng Yang [Sat, 12 Jul 2014 03:29:03 +0000 (11:29 +0800)]
rk3036 lcdc&tve: fix driver load error.
wdc [Fri, 11 Jul 2014 13:24:14 +0000 (21:24 +0800)]
3036: disbale emcc,sdio,sdmmc temporatly
wdc [Fri, 11 Jul 2014 13:18:24 +0000 (21:18 +0800)]
3036: add ion at dtsi
wdc [Fri, 11 Jul 2014 13:12:10 +0000 (21:12 +0800)]
3036: fix i2c1-gpio error
wdc [Fri, 11 Jul 2014 13:02:13 +0000 (21:02 +0800)]
3036: remove usb bypass func temporarily
wdc [Fri, 11 Jul 2014 10:52:28 +0000 (18:52 +0800)]
3036: fix iomap base addr error
hjc [Wed, 9 Jul 2014 00:59:23 +0000 (08:59 +0800)]
rk3036 hdmi: fix HPD status reg change
lyz [Fri, 11 Jul 2014 09:42:24 +0000 (17:42 +0800)]
usb-uart: fix compiler warning
arch/arm/mach-rockchip/rk3036.c: In function 'usb_uart_init':
arch/arm/mach-rockchip/rk3036.c:87:9: warning: unused variable
luowei [Fri, 11 Jul 2014 09:10:21 +0000 (17:10 +0800)]
pinctrl:delete unused definition for rk3036
luowei [Thu, 10 Jul 2014 14:44:20 +0000 (22:44 +0800)]
pinctrl:add rk3036 handler in pinctrl driver
Zheng Yang [Thu, 10 Jul 2014 09:13:56 +0000 (17:13 +0800)]
rk3036 lcdc:
1. fix some register define error.
2. disable mmu.
黄涛 [Thu, 10 Jul 2014 06:32:57 +0000 (14:32 +0800)]
cpufreq: rockchip-cpufreq: add ARM_ROCKCHIP_CPUFREQ config
黄涛 [Thu, 10 Jul 2014 06:10:23 +0000 (14:10 +0800)]
input: keyboard: rk_keys: allow work without ADC
lyz [Thu, 10 Jul 2014 01:38:50 +0000 (09:38 +0800)]
usb: rk3036: updata soft-reset
1.rename platform dev name to 3036
2.fix dts err
3.follow new soft reset framework
黄涛 [Thu, 10 Jul 2014 01:22:27 +0000 (09:22 +0800)]
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
drivers/usb/dwc_otg_310/usbdev_rk.h
陈亮 [Wed, 9 Jul 2014 11:30:00 +0000 (04:30 -0700)]
remove reboot_config_done flag, do not close ddrfreq thread after reboot notify, because that may cause ddrfreq_system_status_notifier_call block forever
Signed-off-by: 陈亮 <cl@rock-chips.com>
lintao [Wed, 9 Jul 2014 10:08:47 +0000 (18:08 +0800)]
mmc: support drv_e and sr modify
张晴 [Wed, 9 Jul 2014 08:50:25 +0000 (16:50 +0800)]
rk3036:clk:rename clk_core_pre to clk_core
Zhaoyifeng [Wed, 9 Jul 2014 07:22:14 +0000 (15:22 +0800)]
nand driver:modify rk3036 nand clk config in dtsi.
wdc [Wed, 9 Jul 2014 07:19:47 +0000 (15:19 +0800)]
3036: start secondary_startup
张晴 [Wed, 9 Jul 2014 07:16:58 +0000 (15:16 +0800)]
rk3288:tsadc:slove pull down power_hold when power on
lyz [Mon, 7 Jul 2014 11:24:02 +0000 (19:24 +0800)]
usb: update soft reset
1.add rst_flag to distinguish different reset cases
2.use new reset framework APIs
张晴 [Wed, 9 Jul 2014 00:55:04 +0000 (08:55 +0800)]
rk3036:clk:modify init clocks
许盛飞 [Tue, 8 Jul 2014 11:43:32 +0000 (19:43 +0800)]
rk3036: add pwm-pinctrl
Zheng Yang [Tue, 8 Jul 2014 10:11:59 +0000 (18:11 +0800)]
rk3036: add tv encoder code.
wdc [Tue, 8 Jul 2014 07:33:03 +0000 (15:33 +0800)]
3036: update i2c gpio
dkl [Tue, 8 Jul 2014 06:24:17 +0000 (14:24 +0800)]
reset: rk3036: add rk3036 reset-controller support
xxm [Tue, 8 Jul 2014 02:54:48 +0000 (10:54 +0800)]
rockchip:midgard:1,keep processing if fence NULL 2,version to 0x05
qjb [Tue, 8 Jul 2014 02:19:18 +0000 (10:19 +0800)]
rk616 codec : remove call function rk616_codec_power_up after
kfree rk616_priv.
wdc [Tue, 8 Jul 2014 01:17:57 +0000 (09:17 +0800)]
Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10-next
wdc [Tue, 8 Jul 2014 01:17:24 +0000 (09:17 +0800)]
3036: fix vpu,hevc clk
黄涛 [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.