hwg [Wed, 20 Aug 2014 11:03:55 +0000 (19:03 +0800)]
rtl8723bs wifi: support rk3288
hjc [Wed, 20 Aug 2014 11:26:24 +0000 (19:26 +0800)]
rk hdmi: fix fb switch lead to hdmi no display
zsq [Wed, 20 Aug 2014 07:45:19 +0000 (15:45 +0800)]
fix rga 321x dsti clock error
zwl [Wed, 20 Aug 2014 07:32:17 +0000 (15:32 +0800)]
rk fb: add disable screen scaler when switch hdmi resolution if dispmode is ONE_DUAL
陈亮 [Wed, 20 Aug 2014 07:15:25 +0000 (00:15 -0700)]
rk3288: move ddr-bandwidth-calc func to ddr_rk32.c from ddr_freq.c
Signed-off-by: 陈亮 <cl@rock-chips.com>
zwl [Wed, 20 Aug 2014 07:16:25 +0000 (15:16 +0800)]
rk312x:lcdc: add calc and set the pll for the sclk so that can get a more precise clock
li bing [Wed, 20 Aug 2014 06:37:16 +0000 (14:37 +0800)]
rk3128-box: remove the box defconfig 'rk3128_box_defconfig'.
陈亮 [Wed, 20 Aug 2014 03:57:45 +0000 (20:57 -0700)]
rename macro RK312x_PMU_SYS_REG to RK312X_PMU_SYS_REG
Signed-off-by: 陈亮 <cl@rock-chips.com>
zsq [Wed, 20 Aug 2014 03:46:57 +0000 (11:46 +0800)]
rga fix scale down ratio over 2 error
Zheng Yang [Wed, 20 Aug 2014 03:25:49 +0000 (11:25 +0800)]
rockchip_defconfig: add 3128/3036 tv encoder support.
roger [Wed, 20 Aug 2014 03:08:06 +0000 (11:08 +0800)]
ethernet:gmac: enable gmac in rockchip_defconfig
roger [Wed, 20 Aug 2014 02:57:32 +0000 (10:57 +0800)]
ethernet:gmac: set PHY's address to 1 to fix ip101's issue
zsq [Wed, 20 Aug 2014 02:40:17 +0000 (10:40 +0800)]
rga/rga2 driver error handling fixed
hjc [Wed, 20 Aug 2014 01:50:37 +0000 (09:50 +0800)]
rk312x lcdc: fix vsync polority error
Sun Mingjun [Wed, 20 Aug 2014 01:48:14 +0000 (09:48 +0800)]
codec : modified the codec debug level
hjc [Wed, 20 Aug 2014 01:27:13 +0000 (09:27 +0800)]
rk312x lcdc: add interlace condition for interlace read
张晴 [Wed, 20 Aug 2014 01:22:11 +0000 (09:22 +0800)]
rk312x:clk:modify pvtm clk name to g_clk_pvtm
li bing [Wed, 20 Aug 2014 00:58:40 +0000 (08:58 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into my
Conflicts:
arch/arm/boot/dts/rk312x-sdk.dtsi
li bing [Wed, 20 Aug 2014 00:50:11 +0000 (08:50 +0800)]
wifi: esp wifi normally open for rk3128's box.
hjc [Tue, 19 Aug 2014 11:56:21 +0000 (19:56 +0800)]
rk312x lcdc: open interlace read mode when in 576i/480i and y_scale_fac over 2
hjc [Tue, 19 Aug 2014 11:34:20 +0000 (19:34 +0800)]
rk3036 lcdc: open interlace read mode when in 576i/480i and y_scale_fac over 2
陈亮 [Tue, 19 Aug 2014 10:53:45 +0000 (03:53 -0700)]
rk312x: fix reboot loader fail
Signed-off-by: 陈亮 <cl@rock-chips.com>
lintao [Tue, 19 Aug 2014 09:12:08 +0000 (17:12 +0800)]
mmc: dts: limit clk for audi(s), and enable sdio by default
hjc [Tue, 19 Aug 2014 07:48:31 +0000 (15:48 +0800)]
rk3036 hdmi: add hdmi power domain control
zwl [Tue, 19 Aug 2014 02:32:20 +0000 (10:32 +0800)]
rk312x:dtsi: modify pd_lcdc node from pd_vop
hjc [Tue, 19 Aug 2014 02:16:44 +0000 (10:16 +0800)]
rk3036 hdmi: update hdmi pre-driver and main-driver strength for CTS
张晴 [Tue, 19 Aug 2014 02:12:48 +0000 (10:12 +0800)]
rk312x:clk:modify lcdc pd name pd_vop
zyc [Tue, 19 Aug 2014 01:56:45 +0000 (09:56 +0800)]
rk312x : cif : add many sensor drivers,include gc0329,gc0308 ...
simon [Tue, 19 Aug 2014 01:43:36 +0000 (09:43 +0800)]
rockchip: mali400: update to R4P1-01REL0
Sun Mingjun [Tue, 19 Aug 2014 00:45:40 +0000 (08:45 +0800)]
spdif : changed box_defconfig to hdmi_i2s
许盛飞 [Mon, 18 Aug 2014 13:37:06 +0000 (21:37 +0800)]
rk312x: support suspend and resume
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
zwl [Mon, 18 Aug 2014 13:23:55 +0000 (21:23 +0800)]
rockchip:rk312x-lcdc: add support enable or disable vio power domain
hjc [Mon, 18 Aug 2014 10:53:40 +0000 (18:53 +0800)]
rk312x lcdc: fix hsync vsync den polo for HDMI
hjc [Mon, 18 Aug 2014 10:25:07 +0000 (18:25 +0800)]
rk fb: fix disp error for box
typ [Mon, 18 Aug 2014 06:53:40 +0000 (14:53 +0800)]
rk312x DDR:idle port when power domain is normal
陈亮 [Mon, 18 Aug 2014 06:37:05 +0000 (23:37 -0700)]
rk312x: iomap PMU register
Signed-off-by: 陈亮 <cl@rock-chips.com>
wdc [Mon, 18 Aug 2014 06:31:36 +0000 (14:31 +0800)]
rk3036: new kernel config for 256M
zwl [Sat, 16 Aug 2014 03:34:13 +0000 (11:34 +0800)]
rockchip:rk fb: remove unused the calling method of 'rga_ioctl_kernel' interface
hjc [Fri, 15 Aug 2014 11:51:57 +0000 (19:51 +0800)]
rk312x lcdc: only in 576i and 480i video mode use pixel repeat
hwg [Fri, 15 Aug 2014 09:47:16 +0000 (17:47 +0800)]
gmac: delete /sys/class/vmac/exist
li bing [Fri, 15 Aug 2014 09:26:57 +0000 (17:26 +0800)]
rk3036: build together with ap6210, esp8089 and rtl8188eu driver, avoid config change.
li bing [Fri, 15 Aug 2014 09:18:21 +0000 (17:18 +0800)]
rk3036: modify the default wifi is esp8089.
li bing [Fri, 15 Aug 2014 09:16:42 +0000 (17:16 +0800)]
wifi esp8089: Esp's company update driver for kernel ver3.10.
typ [Fri, 15 Aug 2014 09:17:21 +0000 (17:17 +0800)]
rk312x DDR:correct ddr cap print error , rx dll set and ddr dll bypass freq
lintao [Fri, 15 Aug 2014 08:54:12 +0000 (16:54 +0800)]
mmc: change mmc_rescan_host usage for Rockchip turnkey customer :((
Before this patch we identify oob-wifi or sdio-irq-wifi by DTS.
However wifi engineers argue that our customer is lazy to modify it event
we had moentioned in release wifi configure document before and claim it
again and agin.
Cc: hwg <hwg@rock-chips.com>
Cc: gwl <gwl@rock-chips.com>
Signed-off-by: Shawn Lin <lintao@rock-chips.com>
陈亮 [Fri, 15 Aug 2014 06:49:07 +0000 (23:49 -0700)]
rk312x-sdk: modify adc key adc_value and power key gpio
Signed-off-by: 陈亮 <cl@rock-chips.com>
黄涛 [Fri, 15 Aug 2014 06:00:55 +0000 (14:00 +0800)]
ARM: rockchip: rk312x: core qos use default value
zwl [Fri, 15 Aug 2014 03:54:37 +0000 (11:54 +0800)]
rockchip:hdmi: modify switch hdmi screen info when remove HDMI
zwl [Fri, 15 Aug 2014 03:52:06 +0000 (11:52 +0800)]
rk fb: add support scaler for one lcdc dual disp mode
陈亮 [Fri, 15 Aug 2014 03:12:22 +0000 (20:12 -0700)]
rk312x: clk_ddr enable dvfs
Signed-off-by: 陈亮 <cl@rock-chips.com>
simon [Fri, 15 Aug 2014 02:58:53 +0000 (10:58 +0800)]
rockchip: midgard: version to 0x0a
simon [Fri, 15 Aug 2014 02:56:19 +0000 (10:56 +0800)]
rockchip: midgard: renable temperature control in dvfs
lyz [Thu, 7 Aug 2014 13:16:14 +0000 (21:16 +0800)]
usb: dwc_otg: put usb phy back to normal state when shutdown
lyz [Thu, 7 Aug 2014 12:59:37 +0000 (20:59 +0800)]
usb-uart: add a propertie in dts to enable usb-uart debug
simon [Fri, 15 Aug 2014 02:35:22 +0000 (10:35 +0800)]
rockchip: midgard: cancel dvfs timers when recieve reboot notifier event
hwg [Fri, 15 Aug 2014 02:03:41 +0000 (10:03 +0800)]
rk3288 gmac: add tx rx clock delayline in dts
zwl [Thu, 14 Aug 2014 13:07:04 +0000 (21:07 +0800)]
rk fb: add support DUAL disp mode in rk_fb_switch_screen interlace
许盛飞 [Thu, 14 Aug 2014 12:59:51 +0000 (20:59 +0800)]
Revert "RK312x: support suspend and resume"
This reverts commit
0a82ae44b72ec6a7b3c9893661a5bfced30423e7.
Zheng Yang [Thu, 14 Aug 2014 11:17:11 +0000 (19:17 +0800)]
rk3036 lcdc: fix compile error for iommu function changed.
wdc [Thu, 14 Aug 2014 09:07:18 +0000 (17:07 +0800)]
rk3036: CMA size reduces to 4M
zyc [Thu, 14 Aug 2014 09:09:33 +0000 (17:09 +0800)]
rk312x:cif: 1. soft reset cif before setting cif registers
2. raise cif qos the same as lcdc
3. add 3A controls in soc camera framework
许盛飞 [Thu, 14 Aug 2014 08:16:16 +0000 (16:16 +0800)]
RK312x: support suspend and resume
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
roger [Thu, 14 Aug 2014 08:10:58 +0000 (16:10 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
roger [Thu, 14 Aug 2014 08:09:40 +0000 (16:09 +0800)]
ethernet:gmac: fix the following warnning
[ 169.855161] WARNING: at fs/sysfs/dir.c:530 sysfs_adl@one28x7/ 0x9c()
[ 169.855236] sysfs: cannot create duplicate filename '/devices/
ff290000.eth/stmmac-0:00/phy_reg'
zwl [Thu, 14 Aug 2014 07:22:03 +0000 (15:22 +0800)]
rk312x lcdc: modify mmu_dts_name copy from MAROC Definition
xxm [Thu, 14 Aug 2014 07:01:37 +0000 (15:01 +0800)]
rockchip: iommu: replace prefix iommu with rockchip for iommu compatible
roger [Thu, 14 Aug 2014 06:52:36 +0000 (14:52 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
roger [Thu, 14 Aug 2014 06:51:23 +0000 (14:51 +0800)]
ethernet:gmac:
1. set interface type(rgmii/rmii) in dts
2. set clock input/output in dts
3. set tx/rx delay in dts
zwl [Thu, 14 Aug 2014 06:40:16 +0000 (14:40 +0800)]
rk lcdc: use new interface to open and active vop iommu device
Sun Mingjun [Thu, 14 Aug 2014 02:11:39 +0000 (10:11 +0800)]
codec modified :
- Changed name from spk_ctl to hp_ctl to Corresponding logic
- Deleted some of Debugging Code
- Add the support to fullalsa
hjc [Thu, 14 Aug 2014 03:31:22 +0000 (11:31 +0800)]
rk312x lcdc: add alpha config
CMY [Thu, 14 Aug 2014 02:49:15 +0000 (10:49 +0800)]
rk: ion: return appropriate value if iommu map fail
hjc [Thu, 14 Aug 2014 02:40:54 +0000 (10:40 +0800)]
rk312x lcdc: fix rk312x lcdc win1 reg error
zwl [Thu, 14 Aug 2014 02:22:10 +0000 (10:22 +0800)]
rk fb: fix hdmi disp err when at ONE_DUAL disp mode and reorganize some code
xxm [Thu, 14 Aug 2014 02:24:34 +0000 (10:24 +0800)]
rockchip: iommu: fix function name cpu_is_rkxxxx
zwl [Thu, 14 Aug 2014 01:44:03 +0000 (09:44 +0800)]
rk3126 sdk dts: add the pinctrl of lvds node to support RGB output
Sun Mingjun [Thu, 14 Aug 2014 01:31:54 +0000 (09:31 +0800)]
spdif : changed the spdif device name to uniform naming
CMY [Thu, 14 Aug 2014 01:03:21 +0000 (09:03 +0800)]
rk: ion: check the iommu map's result
roger [Wed, 13 Aug 2014 11:05:41 +0000 (19:05 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
roger [Wed, 13 Aug 2014 11:05:28 +0000 (19:05 +0800)]
ethernet: fix the bug of rmii not work when clock input from PHY
typ [Wed, 13 Aug 2014 09:09:30 +0000 (17:09 +0800)]
rk312x DDR: first init ddr.c
hwg [Wed, 13 Aug 2014 07:21:36 +0000 (15:21 +0800)]
gmac: compatible with rk3288 and rk312x
ddl [Wed, 13 Aug 2014 07:19:21 +0000 (15:19 +0800)]
camsys_drv: v0.0x13.0
hwg [Wed, 13 Aug 2014 07:11:50 +0000 (15:11 +0800)]
wifi: build together with rkwifi, esp8089, rtl8188eu driver, avoid config change
ljf [Wed, 13 Aug 2014 02:58:34 +0000 (10:58 +0800)]
vpu: modify for the iommu interface
xxm [Wed, 13 Aug 2014 03:02:01 +0000 (11:02 +0800)]
rockchip: iommu: add rockchip specific head file to fix compile error
lintao [Wed, 13 Aug 2014 01:19:16 +0000 (09:19 +0800)]
mmc: rk312x: dts: remove pwren
xxh [Wed, 13 Aug 2014 00:41:36 +0000 (08:41 +0800)]
modify esp8089 wifi driver for p2p fuction
zwl [Tue, 12 Aug 2014 15:22:17 +0000 (23:22 +0800)]
rk312x dts: move the pinctrl config of lvds node from dtsi to dts that is need
zwl [Tue, 12 Aug 2014 15:18:33 +0000 (23:18 +0800)]
rk312x lvds: fix get pinctrl pins null pointer for RGB output
Sun Mingjun [Tue, 12 Aug 2014 12:42:13 +0000 (20:42 +0800)]
codec : add the general configuration to rk312x.dtsi
Sun Mingjun [Tue, 12 Aug 2014 09:43:23 +0000 (17:43 +0800)]
codec : Support rk3126-sdk codec
黄涛 [Tue, 12 Aug 2014 10:37:38 +0000 (18:37 +0800)]
ARM: rockchip: rk312x add cpu axi bus support
lintao [Tue, 12 Aug 2014 10:02:21 +0000 (18:02 +0800)]
mmc: fix err handle for release cd_irq
黄涛 [Tue, 12 Aug 2014 09:39:16 +0000 (17:39 +0800)]
Merge remote-tracking branch 'origin/develop-3.10-next' into develop-3.10
Conflicts:
arch/arm/mach-rockchip/vcodec_service.c
drivers/iommu/rockchip-iommu.c
drivers/iommu/rockchip-iovmm.c
drivers/net/ethernet/rockchip/gmac/stmmac_platform.c
include/linux/rockchip/sysmmu.h
ljf [Tue, 12 Aug 2014 08:12:18 +0000 (16:12 +0800)]
prepare for marging develop-3.10-next to develop-3.10
Sun Mingjun [Tue, 12 Aug 2014 07:28:22 +0000 (15:28 +0800)]
codec : Remove codec dts From rk312x.dtsi To rk3128-box.dtsi
黄涛 [Thu, 7 Aug 2014 09:57:54 +0000 (17:57 +0800)]
rk_serial: 4 bytes IO accesses
RK3288 uart_dbg only support 4 bytes IO accesses
dkl [Tue, 12 Aug 2014 03:57:29 +0000 (11:57 +0800)]
rk818: disable otg and boost when in sleep mode
lintao [Tue, 12 Aug 2014 03:44:20 +0000 (11:44 +0800)]
mmc: 312x: disable sdio pull down