dkl [Wed, 5 Nov 2014 02:02:06 +0000 (10:02 +0800)]
rk3368: add support for rk3368 clocks
1. Add clkops_rate_ddr_div4 ops
2. Add clk_pll_ops_3368_apllb && &clk_pll_ops_3368_aplll ops
3. Add some rk3368 clock macros
4. Add "rkclk_init_special_regs" type clk to handle clock with
register not in CRU
wdc [Thu, 30 Oct 2014 03:56:51 +0000 (11:56 +0800)]
spi: rockchip: fix arm64 compile error
Heiko Stübner [Thu, 28 Aug 2014 19:36:04 +0000 (12:36 -0700)]
regulator: core: Add REGULATOR_EVENT_PRE_VOLTAGE_CHANGE (and ABORT)
In some cases we need to know when a regulator is about to be changed.
Add a way for clients to be notified. Note that for set_voltage() we
don't necessarily know what voltage we'll end up with, so we tell the
client what the range will be so they can prepare.
Signed-off-by: Heiko Stübner <heiko@sntech.de>
Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Mark Brown <broonie+linaro@kernel.org>
(cherry picked from commit
7179569aeb52197fd2a9909ba226c4c9cc0e2e2a)
黄涛 [Tue, 28 Oct 2014 03:49:48 +0000 (11:49 +0800)]
Revert "pinctrl: fix build error"
This reverts commit
528be9456c7566c843ebb9be6e7ad653a1dbb1bb.
黄涛 [Mon, 27 Oct 2014 11:17:13 +0000 (19:17 +0800)]
arm64: rockchip: rockchip_defconfig enable IO domain
wdc [Mon, 27 Oct 2014 08:15:23 +0000 (16:15 +0800)]
rk3368: pinctrl: add pinctrl_rk3368 config for pinctrl_rk3368.c
wdc [Fri, 24 Oct 2014 09:44:04 +0000 (17:44 +0800)]
pinctrl-rk3368: enable gpio-clk && calc_pull_reg_and_bit
wdc [Fri, 24 Oct 2014 07:56:21 +0000 (15:56 +0800)]
pinctrl: fix build error
CMY [Fri, 24 Oct 2014 06:12:22 +0000 (14:12 +0800)]
rk: ion: fix compilation error on arm64
wdc [Fri, 24 Oct 2014 03:37:15 +0000 (11:37 +0800)]
rk3368: fix pinconf build error
wdc [Fri, 24 Oct 2014 03:11:18 +0000 (11:11 +0800)]
rk3368: new pinctrl, io-domain driver supported
黄涛 [Thu, 23 Oct 2014 13:08:05 +0000 (21:08 +0800)]
input: touchscreen: k29_i2c_goodix: fix compilation warning
黄涛 [Thu, 23 Oct 2014 13:02:05 +0000 (21:02 +0800)]
arm64: rockchip: rockchip_defconfig enable cpufreq
黄涛 [Thu, 23 Oct 2014 13:01:19 +0000 (21:01 +0800)]
cpufreq: rockchip-cpufreq: fix compilation error on arm64
黄涛 [Thu, 23 Oct 2014 12:39:45 +0000 (20:39 +0800)]
arm64: rockchip: add rockchip_defconfig
黄涛 [Thu, 23 Oct 2014 12:29:29 +0000 (20:29 +0800)]
mmc: dw_mmc: Add support for ARM64
黄涛 [Thu, 23 Oct 2014 12:19:51 +0000 (20:19 +0800)]
rkwifi: fix compilation error on arm64
黄涛 [Thu, 23 Oct 2014 12:19:22 +0000 (20:19 +0800)]
rockchip: iommu: fix compilation error on arm64
黄涛 [Thu, 23 Oct 2014 10:28:06 +0000 (18:28 +0800)]
rk30_factory_adc_battery: fix compilation error on arm64
黄涛 [Thu, 23 Oct 2014 10:26:44 +0000 (18:26 +0800)]
rtl8188eu: fix compilation error on arm64
黄涛 [Thu, 23 Oct 2014 09:06:52 +0000 (17:06 +0800)]
rfkill: fix compilation error on arm64
黄涛 [Thu, 23 Oct 2014 09:05:46 +0000 (17:05 +0800)]
ARM: rockchip: iomap.h: fix compilation error on arm64
黄涛 [Thu, 23 Oct 2014 09:05:05 +0000 (17:05 +0800)]
USB: dwc_otg_310: fix compilation error on arm64
黄涛 [Thu, 23 Oct 2014 09:03:52 +0000 (17:03 +0800)]
fiq_debugger: rockchip: fix compilation error on arm64
黄涛 [Thu, 23 Oct 2014 09:03:17 +0000 (17:03 +0800)]
camsys_drv: fix compilation error on arm64
黄涛 [Thu, 23 Oct 2014 09:01:49 +0000 (17:01 +0800)]
input: sensor-dev: fix compilation error on arm64
黄涛 [Thu, 23 Oct 2014 08:59:39 +0000 (16:59 +0800)]
rk_headset: fix compilation error on arm64
黄涛 [Thu, 23 Oct 2014 08:58:42 +0000 (16:58 +0800)]
clocksource: rockchip_timer: fix compilation error on arm64
黄涛 [Thu, 23 Oct 2014 08:57:50 +0000 (16:57 +0800)]
block/partitions/rk.c: fix compilation error on arm64
黄涛 [Wed, 22 Oct 2014 11:05:55 +0000 (19:05 +0800)]
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
lintao [Wed, 22 Oct 2014 06:59:23 +0000 (14:59 +0800)]
mmc: Hynix 4.41 iNAND no trim quirk patch from mediatek
zwl [Wed, 22 Oct 2014 02:07:58 +0000 (10:07 +0800)]
rk3288: lcdc:
* fix the register value of BCSH is different of the value configed at uboot
Signed-off-by: zwl <zwl@rock-chips.com>
lintao [Wed, 22 Oct 2014 00:13:05 +0000 (08:13 +0800)]
mmc: v2: fix wrong mszs calculation for edmac.
Change log v2: update logical operation for FIFOTH
zwl [Tue, 21 Oct 2014 10:46:24 +0000 (18:46 +0800)]
rk312x:lcdc:
* fix screen flash when suspend like at charge ui init or pcba ui init
* set uboot logo on as open at dst node
Signed-off-by: zwl <zwl@rock-chips.com>
Zheng Yang [Tue, 21 Oct 2014 09:31:57 +0000 (17:31 +0800)]
fb:
Define dts node disp-policy vale:
DISPLAY_POLICY_SDK
DISPLAY_POLICY_BOX
Zheng Yang [Tue, 21 Oct 2014 08:58:42 +0000 (16:58 +0800)]
hdmi:
Temporary diable YUV output. For some sink may not recognize
yuv format correctly, then picture will mask a pink layer.
Especially monitor device.
smj [Tue, 21 Oct 2014 08:53:10 +0000 (16:53 +0800)]
rk3036: set clk_core to 1.2GHZ and clk_gpu to 400MHZ
lintao [Tue, 21 Oct 2014 07:14:13 +0000 (15:14 +0800)]
mmc: fix wrong mszs calculation for edmac.
Internal dmac set mszs from 0 ~ 7, means {1, 4, 8, 16,
32, 64, 128, 256} respectively. But mszs is difference from another
if it's edmac been used indeed.External dmac limit it from 0 ~ 16
, and we select mszs from FIFOTH calculated before to lookup table
in order to find mszs fitable for edmac.
Signed-off-by: lintao <lintao@rock-chips.com>
Tested-and-acked-by: lw <lw@rock-chips.com>
lintao [Tue, 21 Oct 2014 06:56:40 +0000 (14:56 +0800)]
Revert "mmc: lookup mszs for edmac, diff M base from idmac"
This reverts commit
006e7b478d3e63583f91598d5e28111c1ccb0df9.
Zheng Yang [Tue, 21 Oct 2014 06:37:40 +0000 (14:37 +0800)]
rk3036/rk312x lcdc:
1. Disable some unused code.
2. Fix actived layer status error when enable alpha mode.
3. We need to update layer status in config_done when use
RK_FBIOSET_CONFIG_DONE ioctl.
Zheng Yang [Tue, 21 Oct 2014 06:37:09 +0000 (14:37 +0800)]
fb:
Add disp-policy in dts and disp_policy in struct rk_fb
to distinguish box and sdk display policy.
lintao [Tue, 21 Oct 2014 05:01:55 +0000 (13:01 +0800)]
mmc: lookup mszs for edmac, diff M base from idmac
li bing [Tue, 21 Oct 2014 02:27:37 +0000 (10:27 +0800)]
Wifi: close the rtl8189es's debug log.
cz [Mon, 20 Oct 2014 08:13:18 +0000 (16:13 +0800)]
ethernet:vmac: enable vmac in rockchip_defconfig for rk3036
Zheng Yang [Mon, 20 Oct 2014 06:22:09 +0000 (14:22 +0800)]
rk3036 hdmi:
Add 20ms delay between irq and work thread to make
sure hdmi connection status stable.
li bing [Mon, 20 Oct 2014 03:41:19 +0000 (11:41 +0800)]
rk3036:
1.add uart0 & bluetooth.
2.add 'wifi_chip_type' note.
rk3128:
2.add 'wifi_chip_type' note.
li bing [Mon, 20 Oct 2014 02:18:31 +0000 (10:18 +0800)]
wifi->esp8089: update driver ver 1.8:
1.Repair the coexistence of bluetooth module (unused coexistence agreement possible WIFI does not work).
2.increasing the compatibility of kernel3.10.
3.strengthen SoftAP and P2P GO the performance of the model.
zwl [Mon, 20 Oct 2014 02:53:03 +0000 (10:53 +0800)]
rk fb: fix get fb info addr error if at fb0-win1 map when close fb
Zheng Yang [Mon, 20 Oct 2014 02:31:18 +0000 (10:31 +0800)]
rockchip_defconfig: support rk3036 lcdc.
smj [Mon, 20 Oct 2014 02:27:58 +0000 (10:27 +0800)]
rk3036 : add the rk3036 sound config to rochchip_defconfig
zsq [Mon, 20 Oct 2014 00:26:32 +0000 (08:26 +0800)]
fix rga2 dst yuv offset addr generate error
zwl [Fri, 17 Oct 2014 08:40:03 +0000 (16:40 +0800)]
rk312x:lcdc: the temporary solution for fix charge display flash
smj [Fri, 17 Oct 2014 07:59:04 +0000 (15:59 +0800)]
rk312x box: enable gpio_poweroff driver
Luowei [Fri, 17 Oct 2014 03:26:01 +0000 (11:26 +0800)]
spi:improve spi dma burst
zwl [Fri, 17 Oct 2014 03:04:11 +0000 (11:04 +0800)]
rk fb:
* fix get share dma buf fd failed when stop and start system
Signed-off-by: zwl <zwl@rock-chips.com>
许盛飞 [Fri, 17 Oct 2014 02:36:52 +0000 (10:36 +0800)]
chargedisplay: add for adc-battery-driver
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
hhb [Fri, 17 Oct 2014 01:17:41 +0000 (09:17 +0800)]
DMA:pl330: add burst length config
Zheng Yang [Fri, 17 Oct 2014 00:52:40 +0000 (08:52 +0800)]
rk3036/rk3128 tve: fix compile error.
Zheng Yang [Thu, 16 Oct 2014 09:42:33 +0000 (17:42 +0800)]
rk312x_lcdc.c
1. Fix code style.
2. We need to stanby vop when reconfigure vop output timing.
3. Disabling win0 instead of stanby vop when enable iommu at
uboot logo mode.
Zheng Yang [Thu, 16 Oct 2014 09:42:09 +0000 (17:42 +0800)]
rk3036/rk312x hdmi:
We need to check hdmi connect status in probe hdmi. If hdmi is
enable in uboot, and is removed before kernel, we will power
down hdmi, and set it as disconnected.
Zheng Yang [Thu, 16 Oct 2014 09:36:03 +0000 (17:36 +0800)]
rk3036/rk3128 tve: support uboot logo display.
smj [Thu, 16 Oct 2014 09:23:24 +0000 (17:23 +0800)]
rk3036 :
- Audio : spdif: add spdif card or not according dts define.
- Other : enable gpio_poweroff driver.
cl [Thu, 16 Oct 2014 08:49:47 +0000 (16:49 +0800)]
rk3126-86v: disable usb uart bypass function
Signed-off-by: cl <cl@rock-chips.com>
Cai Zhiyong [Wed, 11 Sep 2013 21:20:09 +0000 (14:20 -0700)]
block: support embedded device command line partition
Read block device partition table from command line. The partition used
for fixed block device (eMMC) embedded device. It is no MBR, save
storage space. Bootloader can be easily accessed by absolute address of
data on the block device. Users can easily change the partition.
This code reference MTD partition, source "drivers/mtd/cmdlinepart.c"
About the partition verbose reference
"Documentation/block/cmdline-partition.txt"
[akpm@linux-foundation.org: fix printk text]
[yongjun_wei@trendmicro.com.cn: fix error return code in parse_parts()]
Signed-off-by: Cai Zhiyong <caizhiyong@huawei.com>
Cc: Karel Zak <kzak@redhat.com>
Cc: "Wanglin (Albert)" <albert.wanglin@huawei.com>
Cc: Marius Groeger <mag@sysgo.de>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Artem Bityutskiy <dedekind@infradead.org>
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Conflicts:
block/partitions/Kconfig
block/partitions/Makefile
block/partitions/check.c
cl [Thu, 16 Oct 2014 03:13:05 +0000 (11:13 +0800)]
cpufreq: set suspend volt to 1.1V for 40nm process, fix reboot err when vdd_arm regulator is not registered
Signed-off-by: cl <cl@rock-chips.com>
cl [Thu, 16 Oct 2014 02:47:26 +0000 (10:47 +0800)]
rockchip: add gpio_poweroff driver
Signed-off-by: cl <cl@rock-chips.com>
Sun Mingjun [Thu, 16 Oct 2014 02:01:24 +0000 (10:01 +0800)]
rk3036:enable uboot display
zwl [Thu, 16 Oct 2014 02:02:46 +0000 (10:02 +0800)]
rk fb: add rk_fb_par data struct to store more fb info
Sun Mingjun [Thu, 16 Oct 2014 00:39:31 +0000 (08:39 +0800)]
rk312x : audio : fix the box audio crash bug when recording
CMY [Tue, 14 Oct 2014 10:32:42 +0000 (18:32 +0800)]
rk: ion: add drm heap for secure buffer allocation
Zheng Yang [Wed, 15 Oct 2014 06:31:21 +0000 (14:31 +0800)]
rk3036 lcdc: fix uboot display logo kernel open iommu splash
lyz [Wed, 15 Oct 2014 06:04:48 +0000 (14:04 +0800)]
rk312x: remove unused usb charger detect log info
zhangqing [Wed, 15 Oct 2014 01:54:00 +0000 (09:54 +0800)]
rk312x:pmic:rk818:slove irq handle failed
wdc [Tue, 14 Oct 2014 11:13:29 +0000 (19:13 +0800)]
fiq-debugger: enable uart clk by serial-id
huang zhibao [Mon, 13 Oct 2014 09:59:27 +0000 (17:59 +0800)]
input:ir, resume -> resume_early for wakeup one time
gwl [Mon, 13 Oct 2014 03:38:26 +0000 (11:38 +0800)]
Wifi: update rtl8189es/etv to version 4.00(V4.3.10_12447.
20141008).
hjc [Sat, 11 Oct 2014 03:48:22 +0000 (11:48 +0800)]
rk fb: fix uboot display logo kernel open iommu splash
hjc [Sat, 11 Oct 2014 07:50:43 +0000 (15:50 +0800)]
rk312x lcdc: this vop bg layer not support yuv domain overlay,so bg val
have to set 0x800a80 equeal to 0x000000 at rgb domian,after
open win0/win1 alpha we recover to 0x00000.
hjc [Fri, 10 Oct 2014 07:11:31 +0000 (15:11 +0800)]
rk hdmi: update hdmi connect status
lyz [Fri, 10 Oct 2014 05:42:32 +0000 (13:42 +0800)]
usb: support different type of usb charger
Luowei [Sat, 11 Oct 2014 01:18:08 +0000 (09:18 +0800)]
box:enable uboot logo and sdmmc card
Luowei [Sat, 11 Oct 2014 00:32:25 +0000 (08:32 +0800)]
unmask spi dma code for rk312x
张晴 [Fri, 10 Oct 2014 07:18:47 +0000 (15:18 +0800)]
rk312x:clk:modify apll_clk 600M when init
CMY [Fri, 10 Oct 2014 07:07:17 +0000 (15:07 +0800)]
rk: ion: finished ION memory reserve more gracefully
hjc [Fri, 10 Oct 2014 03:30:53 +0000 (11:30 +0800)]
rk312x lcdc: update bcsh path select
lintao [Fri, 10 Oct 2014 01:44:02 +0000 (09:44 +0800)]
mmc: Support sdmmc/uart_dbg auto switch
Add pinctrl-names "udbg" in sdmmc blob, and drivers auto
switch io useage by card-detect tasklet routine. Only audi series need
it indeed now and ever.
Signed-off-by: lintao <lintao@rock-chips.com>
Acked-by: lw <lw@rock-chips.com>
Cc: phc <phc@rock-chips.com>
zwl [Thu, 9 Oct 2014 11:05:40 +0000 (19:05 +0800)]
rk312x:lvds: display no noise for lvds screen
cz [Thu, 9 Oct 2014 10:19:31 +0000 (18:19 +0800)]
ethernet:gmac: fix the bug that rtl8201F attach failed when clock input from rk SoC
hjc [Thu, 9 Oct 2014 08:42:36 +0000 (16:42 +0800)]
rk hdmi: update screen info for display uboot logo
hjc [Thu, 9 Oct 2014 08:28:31 +0000 (16:28 +0800)]
rk fb: fix change ddr freq lead to system panic when uboot display logo
lintao [Thu, 9 Oct 2014 08:56:35 +0000 (16:56 +0800)]
mmc: only ctrl_all_reset if slot state really changed
cz [Thu, 9 Oct 2014 06:44:19 +0000 (14:44 +0800)]
ethernet:gmac support phy irq for rtl8211e (disabled as default)
张晴 [Thu, 9 Oct 2014 06:42:36 +0000 (14:42 +0800)]
rk312x:pmic:rt5036:updata drivers to 1.0.9;support hdmi connect to VMID
huang zhibao [Thu, 9 Oct 2014 03:04:26 +0000 (11:04 +0800)]
input: box, ir add input.h in dts
huang zhibao [Thu, 9 Oct 2014 02:29:12 +0000 (10:29 +0800)]
kernel:input:ir, fix start kernel oops and move spaces
Simon [Thu, 9 Oct 2014 01:58:14 +0000 (09:58 +0800)]
rockchip: gpu: add /sys/rk_gpu/error_count
Note: these add node "error_count" for rk3036/rk312x/rk3288
gpu error auto detect,if cat /sys/rk_gpu/error_count return
> 1,means gpu work unnormal currently
huang zhibao [Wed, 8 Oct 2014 09:38:14 +0000 (17:38 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
huang zhibao [Wed, 8 Oct 2014 09:37:41 +0000 (17:37 +0800)]
kernel:input: remotectl remove ir key struct to dts and handle ir irq not on cpu0
lintao [Wed, 8 Oct 2014 09:31:55 +0000 (17:31 +0800)]
mmc: merge dpm patch from my-mmc-next
hjc [Wed, 8 Oct 2014 09:01:33 +0000 (17:01 +0800)]
rk hdmi: identify diff SOC HDMI support video mode