Commit Graph

67 Commits

Author SHA1 Message Date
Zheng Yang
f92fcd1ceb fb:
Define dts node disp-policy vale:
		DISPLAY_POLICY_SDK
		DISPLAY_POLICY_BOX
2014-10-21 17:31:57 +08:00
huang zhibao
bc0654474f kernel:input:ir, fix start kernel oops and move spaces 2014-10-09 10:29:12 +08:00
huang zhibao
035efe383e kernel:input: remotectl remove ir key struct to dts and handle ir irq not on cpu0 2014-10-08 17:37:41 +08:00
陈亮
eb7e8235cf rk312x: correct clk_ddr rate
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-09-18 02:33:31 -07:00
hjc
d4834e8084 rk312x lcdc:
VOP not support pre-alpha when overlay at YUV domain,
	so we set VOP overlay at RGB domain.
	If open BCSH and output_color is RGB,must open R2Y&Y2R,
	if output_color is YUV,must open R2Y.
2014-09-11 11:36:57 +08:00
许盛飞
d57410b3fc rk3126suspend: arm continuous power-supply in suspend
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2014-09-01 21:39:10 +08:00
zwl
026cf2550b rockchip:lcdc: add set default fb_win_map order at dts 2014-08-26 22:11:42 +08:00
zwl
5f159debc6 1.rockchip:screen: add color-mode node in screen timing and add prop at lcd-xxx.dtsi
2.rk312x:lcdc: modify set overlay mode according to the screen color-mode
2014-08-25 22:45:32 +08:00
luowei
81941d5546 pinctrl:add pinctrl dts for rk312x again 2014-07-24 11:19:55 +08:00
luowei
e5c80d8c68 pinctrl:add pinctrl dts for rk312x 2014-07-24 11:16:39 +08:00
张晴
a013c410ce rk312x:clk:support set clks 2014-07-18 10:04:19 +08:00
luowei
9620f4d406 pinctrl:delete unused definition for rk3036 2014-07-11 17:10:21 +08:00
luowei
5dc9dc6260 pinctrl:add rk3036 handler in pinctrl driver 2014-07-10 22:44:20 +08:00
dkl
8929905cb9 reset: rk3036: add rk3036 reset-controller support 2014-07-08 14:29:06 +08:00
黄涛
223378cc0f 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
2014-07-07 21:01:04 +08:00
Luowei
24487e0ff9 add rk3036 pinctrl support 2014-07-04 18:28:08 +08:00
dkl
3207637c8d rockchip: add reset-rockchip driver to support Generic Reset Controller framework 2014-07-02 19:30:37 +08:00
xxx
d966cddbfd fixed: suspend gpios setting 2014-06-26 15:15:58 +08:00
黄涛
4f26888822 ARM: rockchip: rk3036: add initial support 2014-06-24 17:37:35 +08:00
zwl
a33266695a rk fb: modify fb rotate config read from dts 2014-06-20 11:38:20 +08:00
hcy
51d7acb84f fix system reboot stop at DDR_DEBUG information 2014-06-03 16:54:13 +08:00
陈亮
cc1cd797fa 1.add rk_system_status.c, listen system status ,and prepare something for new status. 2.serialize ddrfreq, ensure that change ddrfreq is done before enter new status 2014-05-26 23:32:01 -07:00
黄涛
a554b12b59 ARM: rockchip: fix rk3288 tsadc_int pinctrl 2014-05-22 15:11:52 +08:00
陈亮
9b652a83df ddrfreq: add dualview sence and isp sence 2014-05-09 00:03:15 -07:00
陈亮
aaccb426d6 ddrfreq: add video scene, performan scene 2014-05-08 06:11:54 -07:00
陈亮
0180727dca ddrfreq: add more auto freq point 2014-05-07 06:30:33 -07:00
dkl
ad11a1286b clk: rockchip: add CLK_SET_RATE_PARENT_IN_ORDER
If the flag CLK_SET_RATE_PARENT_IN_ORDER is set, consider the
order of .set_parent and .set_rate, to prevent a too large
temporary rate on rate change. This will fix the bug of clk_gpu
in rk3288.
2014-04-28 21:24:24 +08:00
dkl
7348c1bed5 clk: rockchip: rk3288: adjust clock settings
1. add clkops_rate_3288_dclk_lcdc0/1
2. change gpll init_rate to 297M, and npll init_rate to 1250M
2014-04-28 21:24:24 +08:00
dkl
91019ca759 clk: rockchip: add clk_pll_ops_3188plus_auto 2014-04-28 21:24:24 +08:00
黄涛
7fe47454f2 Merge tag 'lsk-android-14.04' into develop-3.10
lsk-android 14.04

Conflicts:
	Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
	drivers/pinctrl/pinconf-generic.c
	include/linux/pinctrl/consumer.h
	include/linux/pinctrl/pinconf-generic.h
2014-04-24 19:04:10 +08:00
dkl
5a6a7c9fe3 clk: rockchip: add clkops_rate_3288_usb480m 2014-04-17 11:18:10 +08:00
dkl
d1de807ce5 pd: rockchip: add virtual pd clks 2014-04-14 21:32:41 +08:00
dkl
54775cd3b8 pd: rockchip: add clk_pd type and rk3288 clk_pd support 2014-04-14 16:59:23 +08:00
libing
542450a810 rk3288-mipi-dsi:add clk switch, debug node. 2014-04-11 18:14:32 +08:00
luowei
a3f6602089 pinctrl:add pin debug support and fix bank0 iomux bug 2014-04-09 16:07:46 +08:00
Eduardo Valentin
1c762edb2a thermal: introduce device tree parser
This patch introduces a device tree bindings for
describing the hardware thermal behavior and limits.
Also a parser to read and interpret the data and feed
it in the thermal framework is presented.

This patch introduces a thermal data parser for device
tree. The parsed data is used to build thermal zones
and thermal binding parameters. The output data
can then be used to deploy thermal policies.

This patch adds also documentation regarding this
API and how to define tree nodes to use
this infrastructure.

Note that, in order to be able to have control
on the sensor registration on the DT thermal zone,
it was required to allow changing the thermal zone
.get_temp callback. For this reason, this patch
also removes the 'const' modifier from the .ops
field of thermal zone devices.

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
(cherry picked from commit 4e5e4705bf)

Signed-off-by: Alex Shi <alex.shi@linaro.org>
2014-03-31 15:47:20 +08:00
libing
351a195a94 rk3288-mipi-dsi: add arch/arm/boot/dts/include/dt-bindings/rkmipi/mipi_dsi.h. 2014-03-30 23:07:29 +08:00
luowei
551fcbfe9f delete RK3288_GRF_GPIO0_D_IOMUX according to new datasheet 2014-03-28 17:13:25 +08:00
xxx
3f90324bec rkpm sleep support 2014-03-28 16:04:21 +08:00
luowei
f4a876aa69 pinctrl:fix pull operation bug and add bank0 register information 2014-03-27 11:52:34 +08:00
dkl
0e321ec4d7 rk3288: fix problem of mux clk with frac parent in rk3288
Mux clk with frac parent in rk3288, like i2s/spdif/uart,
has problem when set rate before.
2014-03-25 20:16:37 +08:00
xxx
c0a65262f7 fixed: pm.c pm-pie.c pm.h 2014-03-18 19:41:09 +08:00
xbw
0086569bc0 SDMMC: Delete unused files 2014-03-18 13:49:17 +08:00
luowei
58c3a833a1 pinctrl:add vol_domain and iomux operation for RK3288 2014-03-17 19:35:11 +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
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
dkl
8a6caaaffd clk: rk: modify clk_pll, using pll_flags instead of pll_id 2014-03-13 10:45:29 +08:00