Commit Graph

60693 Commits

Author SHA1 Message Date
gwl
ead7a910c0 Wifi:Bt: add wifi & bt resources into rk3288 dts. 2014-03-19 11:24:04 +08:00
zwl
7f6a81d6ed rk_fb: add support hdmi display for new rk fb 2014-03-18 23:32:09 +08:00
xxx
fbf2018630 fixed: pm-rk3288.c 2014-03-18 19:56:56 +08:00
xxx
c0a65262f7 fixed: pm.c pm-pie.c pm.h 2014-03-18 19:41:09 +08:00
yxj
cdfa5a1fdc lcdc rk3188: fix panic temporarily 2014-03-18 17:48:20 +08:00
hjc
9754a14b0b rk3288 lcdc: modify lcdc display interface 2014-03-18 15:48:59 +08:00
xbw
0086569bc0 SDMMC: Delete unused files 2014-03-18 13:49:17 +08:00
gwl
d789a5d925 wifi:rfkill:bcmdhd: insmod wifi driver after android started. 2014-03-18 10:21:53 +08:00
luowei
58c3a833a1 pinctrl:add vol_domain and iomux operation for RK3288 2014-03-17 19:35:11 +08:00
黄涛
88f776ec31 ARM: rockchip: rk3288 support save/restore QOS when power domain on/off 2014-03-17 18:51:44 +08:00
张晴
3d0820f5a9 linux3.10:pwm:renamed rk30/rk29-pwm-regulator to rockchip-pwm-regulator 2014-03-17 11:39:27 +08:00
xxm
ca55a92fcb support rockcihp iommu 2014-03-17 10:18:13 +08:00
dkl
d11c496731 clk: rockchip: add rk3288-clocks.dtsi 2014-03-16 12:09:58 +08:00
hjc
7f782836ee rk3288 lcdc:
1.add suspend and resume func;
	2.add x and y mirror func;
	3.rename some unresonable define.
2014-03-15 18:31:00 +08:00
xbw
59861ed4ca SDMMC: Add the judgment on soc differences between rk3188 and rk32XX 2014-03-15 17:37:14 +08:00
hjc
08fc9954b2 rk3288 lcdc: add support vop mmu 2014-03-15 14:47:59 +08:00
Yonghua Zheng
31ce81ee05 HID: hidraw: Add spinlock in struct hidraw to protect list
It is unsafe to call list_for_each_entry in hidraw_report_event to
traverse each hidraw_list node without a lock protection, the list
could be modified if someone calls hidraw_release and list_del to
remove itself from the list, this can cause hidraw_report_event
to touch a deleted list struct and panic.

To prevent this, introduce a spinlock in struct hidraw to protect
list from concurrent access.

Signed-off-by: Yonghua Zheng <younghua.zheng@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2014-03-14 18:21:18 +08:00
张晴
da24722d49 linux3.10:pwm:support pwm set voltage by regulator 2014-03-14 18:14:56 +08:00
CMY
98ad00141c rk: ion: support cache ops for CMA heap 2014-03-14 17:42:46 +08:00
yxj
32ed2d02a4 clean up rk screen 2014-03-13 11:27:52 +08:00
xxx
b992ababc8 rk3188 pm support 2014-03-13 15:24:12 +08:00
xxx
b5c82dc4f5 add pm support 2014-03-13 15:20:26 +08:00
dkl
1fe0958ebe clk: rk: add CLK_PLL_3288_APLL type support 2014-03-13 11:36:19 +08:00
CMY
8ccb043f60 rk: ion: rk3288/fpga reserve cma memory for ion from dts 2014-03-13 11:23:34 +08:00
dkl
8a6caaaffd clk: rk: modify clk_pll, using pll_flags instead of pll_id 2014-03-13 10:45:29 +08:00
黄涛
9983901d21 Merge tag 'lsk-android-14.02' into develop-3.10
lsk 14.02 Android release
2014-03-12 21:33:38 +08:00
张晴
19f3753f60 rk31:linux3.10:support bq27320 fg and bq24296 charger ic 2014-03-12 15:54:36 +08:00
xbw
3bf6d8c0cc SDMMC: eMMC OK. It is good to run correctly from emmc 2014-03-12 14:44:46 +08:00
hjc
1ef4f9a41c rk3288 lcdc: fix some compile warning 2014-03-12 11:50:22 +08:00
gwl
3a2b762e8f BT: add bt resource into dts, add bt power driver. 2014-03-11 17:24:06 +08:00
xbw
7dcb2b4f0a 1.to support eMMC.
2.Resolve conflicts pin used to wifi-sdio-det.
3.Resolve the clock conflict between sd and sdio.
2014-03-11 10:01:46 +08:00
hjc
a5b0564f69 rk3288 lcdc: win0/1/2/3 test at fpga ok 2014-03-11 09:40:16 +08:00
黄涛
ce1d983988 ARM: rockchip: move some head files to include/linux/rockchip 2014-03-10 19:32:43 +08:00
hjc
757b445bdd rk fb: new framework test ok at rk3188
this commit depend on the hwc commit:
commit 59966e5cc0530d936435052d187fbe574684f21e
Author: huangds <hds@rock-chips.com>
Date:   Fri Mar 7 11:17:56 2014 +0800

    lcdc ok ,enable hwc
commit 314b22af926f28c3daa048354a4e4185fc46611b
Author: huangds <hds@rock-chips.com>
Date:   Mon Mar 10 18:19:04 2014 +0800

    lcdc abbort ,RK_FBIOSET_CONFIG_DONE remove for a moment
2014-03-10 19:24:08 +08:00
libing
557ff1228e Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10 2014-03-10 17:35:08 +08:00
张晴
71bc8394f2 rk31:linux3.10:pmic:support dc&ldo suspend en/disable,add rk808 pre_init 2014-03-10 14:21:07 +08:00
xbw
c8dc36ca79 SDMMC: 1.to identify eMMC. 2.add the trace log in rk_sdmmc driver. 2014-03-10 12:05:59 +08:00
陈金泉
8ae6fcba5c Audio: delete codec_set_spk, update rk616 codec driver 2014-03-10 11:10:43 +08:00
libing
1b05238eb3 Revert "rk fb: new framework test ok at rk3188"
This reverts commit fe817a682b.
2014-03-08 14:30:22 +08:00
lintao
16fe3de136 Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10 2014-03-07 20:13:34 +08:00
Santosh Shilimkar
3cb50076ba ARM: 7795/1: mm: dma-mapping: Add dma_max_pfn(dev) helper function
Most of the kernel assumes that PFN0 is the start of the physical
memory (RAM). This assumptions is not true on most of the ARM SOCs
and hence and if one try to update the ARM port to follow the assumptions,
we end of breaking the dma bounce limit for few block layer drivers.
One such example is trying to unify the meaning of max*_pfn on ARM
as the bootmem layer expects, breaks few block layer driver dma
bounce limit.

To fix this problem, we introduce dma_max_pfn(dev) generic helper with
a possibility of override from the architecture code. The helper converts
a DMA bitmask of bits to a block PFN number. In all the generic cases,
it is just  "dev->dma_mask >> PAGE_SHIFT" and hence default behavior
is maintained as is.

Subsequent patches will make use of the helper. No functional change.

Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2014-03-07 20:07:29 +08:00
Ulf Hansson
10d03026fe mmc: block: Enable runtime pm for mmc blkdevice
Once the mmc blkdevice is being probed, runtime pm will be enabled.
By using runtime autosuspend, the power save operations can be done
when request inactivity occurs for a certain time. Right now the
selected timeout value is set to 3 s. Obviously this value will likely
need to be configurable somehow since it needs to be trimmed depending
on the power save algorithm.

For SD-combo cards, we are still leaving the enablement of runtime PM
to the SDIO init sequence since it depends on the capabilities of the
SDIO func driver.

Moreover, when the blk device is being suspended, we make sure the device
will be runtime resumed. The reason for doing this is that we want the
host suspend sequence to be unaware of any runtime power save operations
done for the card in this phase. Thus it can just handle the suspend as
the card is fully powered from a runtime perspective.

Finally, this patch prepares to make it possible to move BKOPS handling
into the runtime callbacks for the mmc bus_ops. Thus IDLE BKOPS can be
accomplished.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

Conflicts:
	drivers/mmc/card/block.c
2014-03-07 19:49:54 +08:00
Bing Zhao
9545e8d7fe mmc: sdio: add a quirk for broken SDIO_CCCR_INTx polling
Polling SDIO_CCCR_INTx could create a fake interrupt with Marvell
SD8797 card. Add a quirk to handle this case. The fixup here is
to issue a dummy CMD52 read to function 0 register 0xff, and this
dummy read must be right after SDIO_CCCR_INTx is read.

Patch has been verified on a dw_mmc controller (Samsung Chromebook)
with MMC_CAP_SDIO_IRQ disabled.

Signed-off-by: Bing Zhao <bzhao@marvell.com>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>
2014-03-07 19:39:01 +08:00
Ulf Hansson
0233fd23a5 mmc: core: Add MMC_CAP_RUNTIME_RESUME to resume at runtime_resume
In some environments it is to prefer to postpone the resume of the card
device until runtime_resume is being carried out, since it will mean a
signficant decrease of the total system resume time.

The reason of the decreased resume time is simply because of the actual
re-initalization of the card, which typically takes hundreds of
milliseconds, is performed outside the resume sequence and wont thus
affect it.

For removable card, the detect work tries to re-detect the card to make
sure it is still present, as a part of that sequence the card will also
be runtime_resumed and thus also fully resumed.

For a non-removable card, typically a mmc blk request will trigger a
runtime_resume and thus fully resume the card. This also means the
first request will likely suffer from an inital latency since the
re-initialization of the card needs to be performed.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
2014-03-07 19:35:27 +08:00
Ulf Hansson
4b1ff18255 mmc: Don't force card to active state when entering suspend/shutdown
By adding a card state that records if it is suspended or resumed, we
can accept asyncronus suspend/resume requests for the mmc and sd
bus_ops.

MMC_CAP_AGGRESSIVE_PM, will at request inactivity through the runtime
bus_ops callbacks, execute a suspend of the the card. In the state were
this has been done, we can receive a suspend request for the mmc bus,
which for sd and mmc forced the card to active state by a
pm_runtime_get_sync. In other words, the card was resumed and then
immediately suspended again, completely unnecessary.

Since the suspend/resume bus_ops callbacks for sd and mmc are now
capable of handling asynchronous requests, we no longer need to force
the card to active state before executing suspend. Evidently preventing
the above sequence for MMC_CAP_AGGRESSIVE_PM.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
2014-03-07 19:34:01 +08:00
Ulf Hansson
3027099fb5 mmc: core: Remove deprecated mmc_suspend|resume_host APIs
The are no more users of the deprecated mmc_suspend|resume_host API,
so let's remove it.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
2014-03-07 19:28:24 +08:00
luowei
9f2f43526d add spi_write_and_read interface for spi 2014-03-07 19:06:04 +08:00
luowei
b1d4d15af2 add spi driver support 2014-03-07 19:01:09 +08:00
Ulf Hansson
51dfeaef6a mmc: core: Move cached value of the negotiated ocr mask to card struct
The negotiated ocr mask is directly related to the card. Once a card
gets removed, the mask shall be dropped. By moving the cache of the ocr
mask from the host struct to the card struct we have accomplished this.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

Conflicts:
	drivers/mmc/core/sd.c
2014-03-07 17:35:23 +08:00
Ulf Hansson
5161f23189 mmc: core: Do not poll for busy with status cmd for all switch cmds
Some switch operations like poweroff notify, shall according to the
spec not be followed by any other new commands. For these cases and
when the host does'nt support MMC_CAP_WAIT_WHILE_BUSY, we must not
send status commands to poll for busy detection. Instead wait for
the stated timeout from the EXT_CSD before completing the request.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
2014-03-07 16:16:06 +08:00