Commit Graph

403512 Commits

Author SHA1 Message Date
hjc
fd18d428fa rk3368 lcdc: support win mirror and update NO_DUAL mode
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-10 20:11:35 +08:00
Huang, Tao
5c1a4b1d0a Merge branch develop-3.10 into develop-3.10-next 2014-12-10 20:09:28 +08:00
Huang, Tao
1fe7ec75a9 ARM64: rockchip: update rockchip_defconfig
-MEMCG
-RD_BZIP2
-RD_LZMA
PANIC_TIMEOUT=1
+BLOCK_RKNAND
+ARMV7_COMPAT
+SECCOMP
-MALI_MIDGARD
+LCDC_RK3368
+SND_DYNAMIC_MINORS
+BOOTPARAM_HARDLOCKUP_PANIC
+BOOTPARAM_SOFTLOCKUP_PANIC
DEFAULT_HUNG_TASK_TIMEOUT=10
+DYNAMIC_DEBUG

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-10 19:57:14 +08:00
Huang, Tao
421e9b5b59 ARM64: rockchip: add mach-rockchip
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-10 19:56:49 +08:00
Huang, Tao
c5a9c8992c ARM: rockchip: move common config to Kconfig.common
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-10 19:53:56 +08:00
Huang, Tao
b37a392127 ARM: rockchip: common files support ARM64
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-10 19:50:00 +08:00
Huang, Tao
17d73ad5bc media: rk30_camera_oneframe: fix link error
`.exit.text' referenced in section `.data.rel.local' of drivers/built-in.o: defined in discarded section `.exit.text' of drivers/built-in.o

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-10 19:42:48 +08:00
Huang, Tao
07ac21bb05 ARM: rockchip: common: covert dsb() to dsb(sy) 2014-12-10 19:40:53 +08:00
Huang, Tao
1d5fac6a47 usb: dwc_otg_310: covert dsb() to dsb(sy) 2014-12-10 19:36:30 +08:00
Huang, Tao
0036717277 video: rockchip: rk3288_hdmi: covert dsb() to dsb(sy) 2014-12-10 19:35:54 +08:00
Huang, Tao
0956ae5f32 video: rockchip: iep: covert dsb() to dsb(sy) 2014-12-10 19:34:41 +08:00
Huang, Tao
22dae895da video: rk3368_lcdc: covert dsb() to dsb(sy) 2014-12-10 19:32:25 +08:00
Huang, Tao
1f4f5f8066 media: rk30_camera_oneframe: covert dsb() to dsb(sy) 2014-12-10 19:31:34 +08:00
Huang, Tao
5fd886fa30 rk_serial: covert dsb() to dsb(sy) 2014-12-10 19:30:04 +08:00
Huang, Tao
a8103f7564 clocksource: rockchip_timer: covert dsb() to dsb(sy) 2014-12-10 19:27:08 +08:00
Huang, Tao
dcbd24b274 pwm: rockchip: covert dsb() to dsb(sy) 2014-12-10 19:25:48 +08:00
Huang, Tao
82c4a8857a irqchip: gic: covert dsb() to dsb(sy) 2014-12-10 19:24:50 +08:00
Huang, Tao
47b1e48e85 mmc: rockchip: covert dsb() to dsb(sy) 2014-12-10 19:24:11 +08:00
Huang, Tao
5624f0b836 rockchip: clk: covert dsb() to dsb(sy) 2014-12-10 19:23:04 +08:00
Huang, Tao
35140154b1 ethernet: gmac: covert dsb() to dsb(sy) 2014-12-10 19:21:35 +08:00
lintao
eff12e6b2a Revert "mmc: auto-pin when pm call for udbg"
This reverts commit 4ac86774c9.
2014-12-10 17:16:28 +08:00
hjc
38d79c299e rk3288 hdmi: add config for hdmi
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-10 17:16:07 +08:00
hjc
2cf99697de rk312x lcdc: fix no used function call.
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-10 16:44:16 +08:00
Luowei
6060b193b9 rk3128-box:update dts according to pm.c 2014-12-10 14:20:28 +08:00
Mark Yao
1fd8baf8c7 rk_fb: rk312x: direct power on lcdc when do fb_unblank
when do fb blank, we diretcly off the lcdc, so I think
we should power on lcdc in pairs.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-10 09:44:36 +08:00
Luowei
ee58e93212 rk3288:umask dma support for spi 2014-12-10 08:21:14 +08:00
lyz
a9c8b6d090 rk312x: usb: cleanup ohci-rockchip.c and make it support rk312x 2014-12-09 22:25:41 +08:00
lyz
6e9e103d18 rk312x: usb: Skip DWC HOST for rk3126/3128 and usb phy tuning
1.Use EHCI/OHCI for all rk312x series
2.Set Host disconnect trigger point to 600mv, default is 650mv
2014-12-09 22:23:10 +08:00
lyz
23805582e3 phy: backport generic phy framework from kernel-3.18 2014-12-09 20:36:43 +08:00
Luowei
dd1d4beb15 rk3036:add CONFIG_SWITCH again 2014-12-09 18:01:39 +08:00
sugar
ea0122bffa i2s: compatible with rk3126/rk3126b/rk3128.
because i2s controller is different between rk3126 and rk3126b,
but require the same dtb, so add runtime compatible.
2014-12-09 16:29:02 +08:00
hjc
96808e0a17 rk3368 dtsi: modify dtsi for display module
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-09 15:12:21 +08:00
hjc
7d40b12c2c rk3368 lcdc: add lcdc driver
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-09 15:12:14 +08:00
hjc
4cd85a1ffb rk31xx lvds: add support rk3368 lvds transmitter
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-09 15:12:08 +08:00
Huang, Tao
040cf4804a Merge branch develop-3.10 into develop-3.10-next 2014-12-09 15:10:34 +08:00
hjc
59a94c106e rk312x lcdc: fix vop csc config error 2014-12-08 18:24:42 +08:00
Mark Yao
872aaef89f rk_fb: logo: support display bmp logo from uboot
get bmp file data from bootargs "kernel_logo=xxxxxx", decoder bmp
file to framebuffer.

now support rle 8bit bmp files and 24bit bmp files.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-08 17:54:59 +08:00
hjc
b9c889d03e rk fb: update fb config done info.
this commit depend on hwc update,
       including the following directory:

       hardware/rk29/hwcomposer_rga/
       hardware/rk29/libgralloc_ump/
       hardware/libhardware/
2014-12-08 17:06:57 +08:00
typ
c9303ae785 RK3126/3126B DDR:fix ddr DQS1 drv set err 2014-12-08 10:56:00 +08:00
sugar
764e56c849 Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into rk30/box/4.4_r1/develop 2014-12-08 09:44:14 +08:00
sugar
6e500ff492 i2s: compatable with rk3126/rk3126b/rk3128. 2014-12-08 09:40:26 +08:00
sugar
53d3292a72 Revert "rk3126/rk3126b: i2s: use i2s_2ch."
This reverts commit 942d98b30d.
2014-12-08 09:11:51 +08:00
Huang, Tao
d03390bfcd Merge tag 'lsk-v3.10-android-14.11'
LSK Android 14.11 v3.10

Conflicts:
	arch/arm/include/asm/cputype.h
2014-12-05 21:18:34 +08:00
lyz
1bfc7cccc5 usb: cleanup useless struct usb20otg_pdata_id 2014-12-05 19:26:34 +08:00
许盛飞
cd75fbf901 RK3126B: RK3126B delete the EBC
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2014-12-05 19:05:59 +08:00
li bing
039bc0006d wifi->esp8089: add wifi mac address user-defined function. 2014-12-05 17:41:29 +08:00
sugar
942d98b30d rk3126/rk3126b: i2s: use i2s_2ch. 2014-12-05 14:36:00 +08:00
blb
190da48d20 rk3128 & rk3036 : change the led color when power up and down
Signed-off-by:blb <blb@rockchips.com>
2014-12-05 14:27:30 +08:00
CMY
e46863d23c rk: ion: fix dts parse failure on arm64 2014-12-05 12:04:01 +08:00
li bing
e1985ec3e3 wifi->esp8089:
ESP8089 driver update to V1.9 (11272014).
     Update the V2.3 esp_prealloc program.

     This update is mainly as follows:
        1.To increase the new MAC address and MAC address customized version of the support;
        2.Enhance the robustness of the code;
        3.The increase of pure drive consistency under Linux and android;
        4.Enhance compatibility of non-standard AP;
        5.Improve the stability of the P2P mode.
2014-12-05 10:44:14 +08:00