lintao [Thu, 20 Nov 2014 01:47:32 +0000 (09:47 +0800)]
mmc: add rto for infinit sending timeout loop
dw_mci write cmd index to CMD register to trigger sending cmd by BIU.
However, if device fall into panic holding cmd/data line to low level cause BIU
cannnot send out cmd forever. So no cmd_done_int will come. AND, cmd response timeout
only valid after cmd been sent. Nothing to break this loop, we need a s/w recovery from
STATE_SENDING_CMD to STATE_IDLE, and the pending one reported as -ETIMEOUT, let caller
decide howto again.
Reported-by: roger.hu <hwg@rock-chips.com>
Signed-off-by: lintao <lintao@rock-chips.com>
Reviewed-and-tested-by: roger.hu <hwg@rock-chips.com>
Simon Xue [Thu, 27 Nov 2014 01:27:39 +0000 (09:27 +0800)]
rockchip: iommu: update iommu driver
1.Audi vpu_combo contain hevc and vpu,it need to switch
when hevc on or vpu on,but there was a issue could cause
hevc or vpu failed,so current vpu driver disable/enable
iommu each frame to avoid failed,for these,a lot of log
produced,so change dev_info to dev_dbg when iommu attach/deattach
2.AudiB has fixed the vop read problem,we use soc_is_rk3126 or
soc_is_rk3128 instead of cpu_is_rk312x to identify Audi
Jaegeuk Kim [Mon, 3 Jun 2013 10:46:19 +0000 (19:46 +0900)]
f2fs: support xattr security labels
This patch adds the support of security labels for f2fs, which will be used
by Linus Security Models (LSMs).
Quote from http://en.wikipedia.org/wiki/Linux_Security_Modules:
"Linux Security Modules (LSM) is a framework that allows the Linux kernel to
support a variety of computer security models while avoiding favoritism toward
any single security implementation. The framework is licensed under the terms of
the GNU General Public License and is standard part of the Linux kernel since
Linux 2.6. AppArmor, SELinux, Smack and TOMOYO Linux are the currently accepted
modules in the official kernel.".
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
(cherry picked from commit
8ae8f1627f39bae505b90cade50cd8a911b8bda6)
Jaegeuk Kim [Mon, 20 May 2013 01:10:29 +0000 (10:10 +0900)]
f2fs: update inode page after creation
I found a bug when testing power-off-recovery as follows.
[Bug Scenario]
1. create a file
2. fsync the file
3. reboot w/o any sync
4. try to recover the file
- found its fsync mark
- found its dentry mark
: try to recover its dentry
- get its file name
- get its parent inode number
: here we got zero value
The reason why we get the wrong parent inode number is that we didn't
synchronize the inode page with its newly created inode information perfectly.
Especially, previous f2fs stores fi->i_pino and writes it to the cached
node page in a wrong order, which incurs the zero-valued i_pino during the
recovery.
So, this patch modifies the creation flow to fix the synchronization order of
inode page with its inode.
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
(cherry picked from commit
44a83ff6a81d84ab83bcb43a49ff1ba6c7e17cd1)
Jaegeuk Kim [Mon, 20 May 2013 00:55:50 +0000 (09:55 +0900)]
f2fs: change get_new_data_page to pass a locked node page
This patch is for passing a locked node page to get_dnode_of_data.
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
(cherry picked from commit
64aa7ed98db489d1c41ef140876ada38498678ab)
ljf [Wed, 26 Nov 2014 09:52:19 +0000 (17:52 +0800)]
rk3036,rk312x. merge the hevc and vpu workqueue according to audi vpu_combo feature
dkl [Tue, 25 Nov 2014 08:53:24 +0000 (16:53 +0800)]
clk: rk3126b: add support and fix clk_pll_set_rate_3036_apll
Mark Yao [Tue, 25 Nov 2014 06:16:01 +0000 (14:16 +0800)]
rk-fb: display kernel logo if define CONFIG_LOGO
if define CONFIG_LOGO macro, display kernel logo,
else display logo from uboot.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
hjc [Tue, 25 Nov 2014 03:44:25 +0000 (11:44 +0800)]
rk312x lcdc: fix fb_par->state error.
许盛飞 [Mon, 24 Nov 2014 04:00:21 +0000 (12:00 +0800)]
test-power: add testpower dts-config
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
lyz [Fri, 21 Nov 2014 08:18:49 +0000 (16:18 +0800)]
usb: dwc_otg: fix problems of commit
058d627
1.
schedule_delayed_work(&pcd->check_id_work,msecs_to_jiffies(HZ))
should be schedule_delayed_work(&pcd->check_id_work,HZ)
2.fix coding-style to pass checkpatch.pl
3.set otg controler working on foece host/device mode to avoid
mode_missmatch_interrupts
zyk [Fri, 21 Nov 2014 06:56:45 +0000 (14:56 +0800)]
rk3126 adc battery: change charge time
Huang, Tao [Fri, 21 Nov 2014 06:00:14 +0000 (14:00 +0800)]
ARM: rockchip: rk3126b: add initial support
zyk [Fri, 21 Nov 2014 03:52:34 +0000 (11:52 +0800)]
rk312x adc battery: save capacity increment from uboot
zyk [Fri, 21 Nov 2014 03:45:34 +0000 (11:45 +0800)]
rk3126-86v dts: add adc battery status for uboot
zyk [Fri, 21 Nov 2014 01:38:47 +0000 (09:38 +0800)]
rk312x adc,author xhc:save old capacity on android
lyz [Thu, 20 Nov 2014 11:09:04 +0000 (19:09 +0800)]
usb: dwc-otg: using delayed-work to detect id change event instead of id_change intrrupt
hhb [Wed, 19 Nov 2014 07:26:15 +0000 (15:26 +0800)]
DMA pl330: pl330_get_desc try more to get desc
gwl [Wed, 19 Nov 2014 02:57:10 +0000 (10:57 +0800)]
Wifi: fix rtl usb wifi resume issue.
smj [Tue, 18 Nov 2014 11:46:06 +0000 (19:46 +0800)]
rk3128 : codec : fix the pop sound when codec power on at first
张晴 [Tue, 18 Nov 2014 08:10:52 +0000 (16:10 +0800)]
rk3288:pmic:ricoh619:slove fuel gauge error when sleep wakeup for a long time
Zheng Yang [Tue, 18 Nov 2014 03:07:02 +0000 (11:07 +0800)]
rk3036 lcdc:
If same layer is closed twice, atv_layer_cnt may be
set to zero, so vop go to standy. Now win0、win1、hwc
is mapped to atv_layer_cnt bit[0-2]. When open/close
layer, set coresponding atv_layer_cnt bit to one/zero.
chenyifu [Tue, 18 Nov 2014 02:56:14 +0000 (10:56 +0800)]
rk mipi: fixed the bug of getting mipi cmds in mipi screen dts file.
The driver supports 32 parameters of each mipi cmds
when initialization the mipi screen.
But the users may send a cmds longer the 32 parameters sometimes,
and it will result in that the array out of range.
chenyifu [Tue, 18 Nov 2014 01:57:13 +0000 (09:57 +0800)]
rk mipi: fixed the bug of send generic short packet in rk32_mipi_dsi.c
DTYPE_GEN_SWRITE_2P:
Generic Short WRITE Packet with 2 parameters(one command
and one parameter). But the users may send the packet more
than 2 parameters.
DTYPE_GEN_SWRITE_1P:
Generic Short WRITE Packet with 1 parameters(one command
without parameter).
DTYPE_GEN_SWRITE_0P:
Generic Short WRITE Packet with 0 parameters(nop packet
without command and parameter).
chenyifu [Tue, 18 Nov 2014 01:04:28 +0000 (09:04 +0800)]
rk mipi: fixed the bug of set_bits in rk32_mipi_dsi.c.
lyz [Mon, 17 Nov 2014 09:01:29 +0000 (17:01 +0800)]
usb-uart: fix complie error
郭毅 [Mon, 17 Nov 2014 07:53:08 +0000 (15:53 +0800)]
Revert "hwmon: rockchip_tsadc: dynamically control pclk"
This reverts commit
da8f8281e989dd44b126ed6cfef6c21a2f9ca0e6.
Zheng Yang [Mon, 17 Nov 2014 06:30:09 +0000 (14:30 +0800)]
rk3036/3128 hdmi:
Take following sequence to avoid picture flash when swiching resolution:
1. Send AV_MUTE GCP packet.
2. Power off hdmi phy.
3. Sleep 2 second to wait TV process no TMDS signal.
4. Configure video and audio registers.
5. Power on HDMI phy.
6. Send CLEAR_MUTE GCP packet.
lintao [Thu, 13 Nov 2014 15:00:49 +0000 (23:00 +0800)]
mmc: capture dpm notify and avoid conflict scan flow
Signed-off-by: lintao <lintao@rock-chips.com>
dkl [Wed, 5 Nov 2014 06:30:39 +0000 (14:30 +0800)]
rockchip: clk: add rk3188_plus type pll enable/disable
Add rk3188_plus type pll enable/disable ops. Disable unused plls
when display is off in rk3288.
Mark Yao [Mon, 17 Nov 2014 01:18:42 +0000 (09:18 +0800)]
rk_fb: wait extend lcdc vsync before release fence
before release fence, we should make sure extend lcdc config take
effect. if not, maybe GPU would access the buffer which hdmi using,
and cause tearing.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
li yun zhi [Fri, 14 Nov 2014 02:59:15 +0000 (10:59 +0800)]
rk312x: usb-uart: disable usb-uart when cpu suspend
lyz [Thu, 30 Oct 2014 08:20:53 +0000 (16:20 +0800)]
usb: ehci-rockchip: fix bugs:
1. Remove ehci_port_power() in ehci-rockchip, since commit
c73cee7 the ehci_port_power() function no longer needed,
ehci hub driver taking care of power supply.
2. Fix 64-bit address pointer warnning.
3. Register rk-rhci driver by ehci_init_driver() for reducing
useless code.
4. Fix kernrl crash caused by null pointer dereference ,
When 'echo 0 > ehci_power' usb_remove_hcd() run twice. Set rk
ehci->host_enabled 0 to stop connect_detect thread.
lyz [Wed, 29 Oct 2014 09:24:29 +0000 (17:24 +0800)]
usb: implement power control by 'buspower' attribute
This node is used for usb controller test application to enum usb
devices plugin and disconnect.
hjc [Fri, 14 Nov 2014 01:51:07 +0000 (09:51 +0800)]
rk312x lcdc: fix compile warning.
Signed-off-by: xzj<xzj@rock-chips.com>
hjc [Thu, 13 Nov 2014 10:22:59 +0000 (18:22 +0800)]
rk312x lcdc: if bcsh is disable and rgb output, close yuv2rgb and rgb2yuv.
Signed-off-by: xzj<xzj@rock-chips.com>
gwl [Thu, 13 Nov 2014 06:57:04 +0000 (14:57 +0800)]
BT: fix the issue of bt cannot wake up host.
张晴 [Wed, 12 Nov 2014 09:42:44 +0000 (17:42 +0800)]
rk32:pmic:ricoh619:not currect 99% to 100% when no charger;slove soc to 0% when resume;modify usb type detect
cl [Tue, 11 Nov 2014 10:11:50 +0000 (18:11 +0800)]
efuse: clear compile warning
Signed-off-by: cl <cl@rock-chips.com>
cl [Tue, 11 Nov 2014 10:01:30 +0000 (18:01 +0800)]
efuse: add rk312x_efuse_readregs()
Signed-off-by: cl <cl@rock-chips.com>
hhb [Tue, 11 Nov 2014 09:31:16 +0000 (17:31 +0800)]
pl330: change NR_DEFAULT_DESC from 16 to 32
zyc [Tue, 11 Nov 2014 07:05:00 +0000 (15:05 +0800)]
camsys_drv: v0.0x19.0
Zheng Yang [Tue, 11 Nov 2014 06:21:28 +0000 (14:21 +0800)]
fb: box: if win data format is yuv420/yuv420_A, set win state is 1.
zwl [Tue, 11 Nov 2014 01:27:01 +0000 (09:27 +0800)]
rk fb:
fix rk3036 get fb addr error when resume
Signed-off-by: xzj<xzj@rock-chips.com>
Signed-off-by: zwl<zwl@rock-chips.com>
zyc [Mon, 10 Nov 2014 03:45:56 +0000 (11:45 +0800)]
camsys_drv: v0.0x18.0 camsys_head: v0.0xa.0
许盛飞 [Mon, 10 Nov 2014 01:26:03 +0000 (09:26 +0800)]
pwm: add min-duty = 0
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
Zheng Yang [Fri, 7 Nov 2014 10:01:48 +0000 (18:01 +0800)]
hdmi & fb:
For box, we need to set hdmi switch state when insert/remove,
regardless of whether the device supports audio. So add function
rk_fb_get_display_policy() to get display policy.
ljf [Fri, 7 Nov 2014 09:38:08 +0000 (17:38 +0800)]
RK3036/RK312x,
Reactivate hevc/vpu iommu when vpu/hevc start to work, can not work at
the same time.
Signed-off-by: ljf <ljf@rock-chips.com>
ljf [Fri, 7 Nov 2014 07:15:50 +0000 (15:15 +0800)]
add protect mutex when activate iommu device. coresponse to iommu
modify.
Signed-off-by: ljf <ljf@rock-chips.com>
Simon [Fri, 7 Nov 2014 06:04:07 +0000 (14:04 +0800)]
rockchip: iommu: update stall operation
1. Skip stall operation when invalid iommu tlb cache
because it does not need enter stall mode
2. Add stall operation when detach device
Zheng Yang [Thu, 6 Nov 2014 09:44:34 +0000 (17:44 +0800)]
rk312x lcdc:
Because rk312x lcdc is not support premul alpha when at
YUV overlay mode, we disable premul alpha under YUV overlay.
Simon [Thu, 6 Nov 2014 08:42:47 +0000 (16:42 +0800)]
rockchip: iommu: move iommu_reset function to attach_device
If master power domain is disabled,at this time to r/w the
iommu register,it would failed.Master call the attach_deivce
means it must power on itself,so iommu_reset in attach_device
can guarantee the safety
Depend on this, we can remove the vpu/hevc GRF relative code
wdc [Thu, 6 Nov 2014 07:46:04 +0000 (15:46 +0800)]
rk3036: fix system halt when suspend
wdc [Mon, 3 Nov 2014 09:06:23 +0000 (17:06 +0800)]
sar-adc: extra channel is channel-6 via datasheet
zwl [Thu, 6 Nov 2014 03:36:28 +0000 (11:36 +0800)]
rk fb:
* avoid get the delay of power-ctrl error when 'rockchip,delay' is not set on lcdc node at dts file
Signed-off-by: zwl <zwl@rock-chips.com>
zwl [Wed, 5 Nov 2014 12:14:04 +0000 (20:14 +0800)]
rk fb:
* add support the regulator type of power control for lcd
Signed-off-by: zwl <zwl@rock-chips.com>
Simon [Wed, 5 Nov 2014 11:22:39 +0000 (19:22 +0800)]
rockchip: iommu: fix some bugs
1.rewrite irq function
2.rewrite dump_pgtable
cl [Wed, 5 Nov 2014 10:45:46 +0000 (18:45 +0800)]
rk312x: sdk add temperature data
Signed-off-by: cl <cl@rock-chips.com>
cl [Wed, 5 Nov 2014 09:13:11 +0000 (17:13 +0800)]
rk3126-sdk: update dvfs table
Signed-off-by: cl <cl@rock-chips.com>
cl [Wed, 5 Nov 2014 09:07:54 +0000 (17:07 +0800)]
dvfs: add leakage adjust volt support
Signed-off-by: cl <cl@rock-chips.com>
huang zhibao [Wed, 5 Nov 2014 07:44:37 +0000 (15:44 +0800)]
input:ir: request rk pwm irq with IRQF_NO_SUSPEND flag
sugar [Wed, 5 Nov 2014 05:25:47 +0000 (13:25 +0800)]
Audio: add 192k samplerate support.
cl [Wed, 5 Nov 2014 02:00:00 +0000 (10:00 +0800)]
dvfs: add pvtm support
Signed-off-by: cl <cl@rock-chips.com>
wdc [Wed, 5 Nov 2014 01:26:08 +0000 (09:26 +0800)]
rk3288: fix i2c1 and i2c2 clk gating error
smj [Wed, 5 Nov 2014 00:56:26 +0000 (08:56 +0800)]
rk3036:add lcdc in aliases for uboot display
cl [Tue, 4 Nov 2014 08:02:14 +0000 (16:02 +0800)]
efuse: add rockchip_process_version function
Signed-off-by: cl <cl@rock-chips.com>
lintao [Tue, 4 Nov 2014 07:19:30 +0000 (15:19 +0800)]
rk3126-sdk: modify cd-gpios
许盛飞 [Mon, 3 Nov 2014 19:00:53 +0000 (03:00 +0800)]
rk3288-resume: save the wake-up time
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
许盛飞 [Mon, 3 Nov 2014 02:05:29 +0000 (10:05 +0800)]
adc-battery: add the function of auto-calibration the reference-voltage
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
zyc [Mon, 3 Nov 2014 09:42:04 +0000 (17:42 +0800)]
rk312x camera : oneframe v0.1.9,pingpong v0.1.9
zwl [Fri, 31 Oct 2014 10:21:13 +0000 (18:21 +0800)]
rk312x:lcdc:
* set dither down according to primary screen face when DUAL display
for fix the color gradation of display
Signed-off-by: zwl <zwl@rock-chips.com>
Signed-off-by: xzj <xzj@rock-chips.com>
hjc [Fri, 31 Oct 2014 08:48:32 +0000 (16:48 +0800)]
rk312x lcdc: kernel bcsh selete depend on uboot config
smj [Fri, 31 Oct 2014 08:10:05 +0000 (16:10 +0800)]
spdif : disable the spdif debug print
smj [Fri, 31 Oct 2014 02:35:01 +0000 (10:35 +0800)]
rk3036: update rk3036 rk88 dts
ShenZhengyi [Fri, 31 Oct 2014 02:01:50 +0000 (10:01 +0800)]
及时清除cvbsformat位,保证CVBS待机唤醒能够设置TVE寄存器
gwl [Fri, 31 Oct 2014 01:17:26 +0000 (09:17 +0800)]
Wifi:bcmdhd: fix p2p error after driver stop cmd.
zwl [Thu, 30 Oct 2014 09:58:06 +0000 (17:58 +0800)]
rk fb:
* fix fence timeout when set hdmi scaler or switch hdmi resolution if at ONE_DUAL display mode
Signed-off-by: zwl <zwl@rock-chips.com>
Signed-off-by: xzj <xzj@rock-chips.com>
chenyifu [Wed, 29 Oct 2014 10:05:12 +0000 (18:05 +0800)]
rk mipi: modify debugfs of mipi
It outputed the debugfs info of mipi to UART earlier.
But it is inconvenient.
It can output the debugfs info of mipi's to the kmesg now.
lyz [Wed, 29 Oct 2014 00:57:18 +0000 (08:57 +0800)]
usb: ehci: add attribute to start usb eye-pattern test
lyz [Tue, 28 Oct 2014 08:54:25 +0000 (16:54 +0800)]
usb: dwc_otg: add attribute to start usb eye-pattern test
lintao [Wed, 29 Oct 2014 00:25:44 +0000 (08:25 +0800)]
mmc: add more dbg info for dto
smj [Tue, 28 Oct 2014 08:47:54 +0000 (16:47 +0800)]
audio : fix the problem of usb-audio code
黄涛 [Tue, 28 Oct 2014 08:30:59 +0000 (16:30 +0800)]
ARM: rockchip: rk3288-tb_8846.dts: default disable spi
黄涛 [Tue, 28 Oct 2014 07:04:13 +0000 (15:04 +0800)]
ARM: rockchip: rk3288.dtsi: default disable crypto clk
黄涛 [Tue, 28 Oct 2014 07:00:57 +0000 (15:00 +0800)]
iio: rockchip_adc: dynamically control clk
黄涛 [Tue, 28 Oct 2014 06:59:58 +0000 (14:59 +0800)]
i2c: rockchip: dynamically control clk
黄涛 [Tue, 28 Oct 2014 06:59:08 +0000 (14:59 +0800)]
hwmon: rockchip_tsadc: dynamically control pclk
CMY [Tue, 28 Oct 2014 08:17:57 +0000 (16:17 +0800)]
rk: ion: add buffer mmap/munmap trace
smj [Tue, 28 Oct 2014 06:46:03 +0000 (14:46 +0800)]
audio : fix usb audio no sound problem.
lintao [Tue, 28 Oct 2014 00:47:12 +0000 (08:47 +0800)]
mmc: remove useless pcl to udbg when routine card from mmc bus probe.
When kernel booting for the first time, pcl may cause incorrect
state for bus timing which cause detect failure from bus porbe, and been
recoginzed well from driver probe. Check cd state, and avoid this action.
.
[ 5.112563] dwmmc_rockchip
10214000.rksdmmc: data_over interrupt timeout!
[ 5.112704] mmc1: error -84 whilst initialising SD card
...
[ 5.201691] mmc1: new high speed SDHC card at address 0007
[ 5.202583] mmcblk1: mmc1:0007 SD32G 29.3 GiB
Tested-and-acked-by: heyun <heyun@rock-chips.com>
Signed-off-by: lintao <lintao@rock-chips.com>
lintao [Mon, 27 Oct 2014 05:53:16 +0000 (13:53 +0800)]
mmc: only stop edmac if slot state really changed
This commit follow up with
27dc823e, avoid unnecessary emdac operation
in routine card of bh.
Signed-off-by: lintao <lintao@rock-chips.com>
黄涛 [Mon, 27 Oct 2014 10:39:14 +0000 (18:39 +0800)]
ARM: rockchip: cpu.c support export cpu version
zyc [Mon, 27 Oct 2014 08:08:07 +0000 (16:08 +0800)]
camera : enable UVC camera configs as default.
lyz [Mon, 27 Oct 2014 06:49:38 +0000 (14:49 +0800)]
usb: dwc_otg: in some low-memory cases BURST_INCR16 mode will cause kernel crash
Simon [Mon, 27 Oct 2014 01:41:27 +0000 (09:41 +0800)]
rk3036: gpu: build gpu as module
张晴 [Fri, 24 Oct 2014 07:35:01 +0000 (15:35 +0800)]
rk:pmic:rk808&rk818:modify some warning
chenyifu [Fri, 24 Oct 2014 02:49:45 +0000 (10:49 +0800)]
rk312x mipi: enable the non-continued function for mipi
张晴 [Fri, 24 Oct 2014 01:09:26 +0000 (09:09 +0800)]
rk312x:clk:support clk_cif set 24M
heyun [Fri, 24 Oct 2014 00:43:22 +0000 (08:43 +0800)]
rk312x-dts: disable gmac
zwl [Thu, 23 Oct 2014 10:11:01 +0000 (18:11 +0800)]
rk312x: lcdc:
* add update dclk freq when uboot-logo-on is set
Signed-off-by: zwl <zwl@rock-chips.com>