Commit Graph

400381 Commits

Author SHA1 Message Date
wdc
5bfaf8c9a6 3036: remove uart0 & bluetooth 2014-07-12 15:54:43 +08:00
wdc
5a4a975ba3 Revert "3036: open usb uart init"
This reverts commit 3925d5e56b.
2014-07-12 15:53:45 +08:00
黄涛
bacd1f5e35 mali400: fix rk3036 init
rk3036 don't support power manager
2014-07-12 15:32:34 +08:00
wdc
3925d5e56b 3036: open usb uart init 2014-07-12 15:25:07 +08:00
黄涛
18ec4c746a mali400: mali_osk_mali: fix get irq with dts 2014-07-12 15:17:32 +08:00
Zheng Yang
3cfc06be12 Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10-next 2014-07-12 15:04:42 +08:00
Zheng Yang
1c0c2c38a3 rk3036:
fb: load_screen is called once in function rk_fb_switch_screen().
	tve: fix 7.5 IRE configure error for NTSC and PAL.
2014-07-12 15:03:35 +08:00
wdc
74b63344fd 3036: fix hym gpio judgement 2014-07-12 14:57:51 +08:00
wdc
0edb250c0a 3036: fix rtc-HYM8563 without irq pin 2014-07-12 14:40:43 +08:00
Zheng Yang
f2be39b47b rk3036 tve: delete debug log. 2014-07-12 14:31:03 +08:00
Zheng Yang
2b0721d911 rk3036 tv encoder is ok. 2014-07-12 14:27:59 +08:00
hjc
422b8701e2 rk3036 hdmi: hdmi display ok 2014-07-12 14:06:05 +08:00
张晴
1cda5a3a28 rk3036:clk:modify init clocks 2014-07-12 12:52:39 +08:00
黄涛
1b06959c15 ARM: rockchip: rk3036_defconfig select MMC_DW_IDMAC 2014-07-12 11:50:21 +08:00
黄涛
75bea4dd74 ARM: rockchip: rk3036_defconfig set LOG_BUF_SHIFT=17 2014-07-12 11:50:20 +08:00
黄涛
1b09504efb ARM: rockchip: add rk3036_defconfig 2014-07-12 11:50:20 +08:00
Zheng Yang
454f578734 Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10-next 2014-07-12 11:30:09 +08:00
Zheng Yang
9724e411b7 rk3036 lcdc&tve: fix driver load error. 2014-07-12 11:29:03 +08:00
luowei
2a5ade78e8 pinctrl:add dts definition for nandc 2014-07-12 10:17:07 +08:00
Zhaoyifeng
3543ddb737 nand driver:
add nand reg config for emmc read sn and verdor info.
2014-07-12 10:09:58 +08:00
Zhaoyifeng
e0e0124cd9 nand driver: enable nand config in dts. 2014-07-12 09:42:18 +08:00
wdc
24e745fbce 3036: disbale emcc,sdio,sdmmc temporatly 2014-07-11 21:24:14 +08:00
wdc
4fee3c8688 3036: add ion at dtsi 2014-07-11 21:18:24 +08:00
wdc
7a2a510752 3036: fix i2c1-gpio error 2014-07-11 21:12:10 +08:00
wdc
324e9548d7 3036: remove usb bypass func temporarily 2014-07-11 21:02:13 +08:00
wdc
b42061c4fa 3036: fix iomap base addr error 2014-07-11 18:52:28 +08:00
hjc
8913efd702 rk3036 hdmi: fix HPD status reg change 2014-07-11 17:45:56 +08:00
lyz
b1db3f3b00 usb-uart: fix compiler warning
arch/arm/mach-rockchip/rk3036.c: In function 'usb_uart_init':
arch/arm/mach-rockchip/rk3036.c:87:9: warning: unused variable
2014-07-11 17:43:54 +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
Zheng Yang
e77353dfd6 rk3036 lcdc:
1. fix some register define error.
	2. disable mmu.
2014-07-10 17:13:56 +08:00
黄涛
6df5a4b21d cpufreq: rockchip-cpufreq: add ARM_ROCKCHIP_CPUFREQ config 2014-07-10 14:32:57 +08:00
黄涛
fd6ec123f7 input: keyboard: rk_keys: allow work without ADC 2014-07-10 14:10:23 +08:00
lyz
2ddac0b093 usb: rk3036: updata soft-reset
1.rename platform dev name to 3036
2.fix dts err
3.follow new soft reset framework
2014-07-10 09:38:50 +08:00
黄涛
77ddfc9d50 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
	drivers/usb/dwc_otg_310/usbdev_rk.h
2014-07-10 09:22:27 +08:00
陈亮
3418d6a86e remove reboot_config_done flag, do not close ddrfreq thread after reboot notify, because that may cause ddrfreq_system_status_notifier_call block forever
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-07-09 04:31:07 -07:00
lintao
bfc40850c4 mmc: support drv_e and sr modify 2014-07-09 18:09:20 +08:00
张晴
032de7a4eb rk3036:clk:rename clk_core_pre to clk_core 2014-07-09 16:50:25 +08:00
Zhaoyifeng
66d0558fda nand driver:modify rk3036 nand clk config in dtsi. 2014-07-09 15:23:11 +08:00
wdc
c81930b2d7 3036: start secondary_startup 2014-07-09 15:20:13 +08:00
张晴
5ef7714bb4 rk3288:tsadc:slove pull down power_hold when power on 2014-07-09 15:16:58 +08:00
lyz
c7ec4ec5a3 usb: update soft reset
1.add rst_flag to distinguish different reset cases
2.use new reset framework APIs
2014-07-09 10:52:49 +08:00
张晴
b365f68f64 rk3036:clk:modify init clocks 2014-07-09 08:55:04 +08:00
许盛飞
d9593dbc03 rk3036: add pwm-pinctrl 2014-07-08 19:43:32 +08:00
Zheng Yang
b6d7152f51 rk3036: add tv encoder code. 2014-07-08 18:11:59 +08:00
wdc
c4c45b1e46 3036: update i2c gpio 2014-07-08 15:33:34 +08:00
dkl
8929905cb9 reset: rk3036: add rk3036 reset-controller support 2014-07-08 14:29:06 +08:00
xxm
a972d04f65 rockchip:midgard:1,keep processing if fence NULL 2,version to 0x05 2014-07-08 10:54:48 +08:00
qjb
68bef378c7 rk616 codec : remove call function rk616_codec_power_up after
kfree rk616_priv.
2014-07-08 10:19:18 +08:00
wdc
596905f64a Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10-next 2014-07-08 09:17:57 +08:00