forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions
404,440 commits 5 branches 3 tags 4.3 GiB
Commit graph

404,440 commits

This branch
This branch
All branches
Author SHA1 Message Date
Huang, Tao
1ca180425c LSK Android 15.02 v3.10 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJU9ILwAAoJECTWi3JdVIfQcZoH/1U/wwhhYwlevY/Z6LHu6aZ9
 3O9NLpAVIncUPFYoZZ7LfW4HpQoD5Em9TBgYtc/Ej7Ub5MczZPIELRFYlhQIIg/J
 XwFUt6Rd3sQ5uyo2lK0K7jRnRtcD6zxDJfRPpfs+YD9TyF3/bkPjVv+Yf9tp/HTU
 6XcPgNjZUG5Vq1Uzvmx38hMvOOvhGzLwbqgktxN1mawk6sbtt1aY5BaMO85PJXgt
 zkSz8cOvgg5KX1AF0vXnxgwG25Xfp/hqpPAa7rXjUnUmjKUWuS5wYvzw8MB+tYJB
 3AIunsk0JvZofXOn7F7j21gKzOeG6v/xLA5dEdW/v8fmr1ySRLIdIlRnVWftla0=
 =nF/9
 -----END PGP SIGNATURE-----

Merge tag 'lsk-v3.10-android-15.02'

LSK Android 15.02 v3.10

Conflicts:
	drivers/Kconfig
	drivers/regulator/core.c
	include/linux/of.h
 2015-03-05 17:11:40 +08:00
Alpha Lin
e7cee74f7c A mistaken dts property name, cause driver could 
not get the irq resource.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
 2015-03-05 14:47:18 +08:00
Huang, Tao
6f1b688f79 Merge branch develop-3.10 
Conflicts:
	drivers/staging/android/ion/rockchip/rockchip_ion.c
 2015-03-05 10:21:27 +08:00
hwg
25ad743f64 wifi: update broadcom wifi driver bcmdhd to 1.201.34.2 2015-03-05 09:52:31 +08:00
hwg
cb407500b8 wifi: update broadcom wifi driver bcmdhd to 1.201.34.2 2015-03-05 08:46:29 +08:00
dalon.zhang
f37632f5f4 camsys_drv config y defaultly 2015-03-04 22:11:03 +08:00
dalon.zhang
4abb90b2e8 dtsi: add rk3368 camera support 
Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>
 2015-03-04 21:58:52 +08:00
dalon.zhang
1f99b9f4f8 camera: 
camsys_drv: v0.0x1c.0
    oneframe: v0.2.0
    pingpong: v0.1.a

Conflicts:
	drivers/media/video/rk_camsys/camsys_gpio.h
	drivers/media/video/rk_camsys/camsys_internal.h
	drivers/media/video/rk_camsys/camsys_soc_priv.c
	include/linux/rockchip/cru.h
 2015-03-04 21:40:28 +08:00
Jianqun Xu
1107b0445c rk3368: rk818: enable HDMI 5V 
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2015-03-04 18:30:30 +08:00
Jianqun Xu
8a4dc647f1 rk3368: rk818 battery: allow capacity to be negative value 
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2015-03-04 17:58:53 +08:00
smj
e1be224e4c rk3368 codec : fix the es8316 codec capture gain 
Signed-off-by: smj <smj@rock-chips.com>
 2015-03-04 16:17:51 +08:00
hjc
038a1c5317 rk fb: in no_dual mode, dsp parameter according to user setting 
Signed-off-by: hjc <hjc@rock-chips.com>
 2015-03-04 16:16:47 +08:00
hjc
163a7283e7 rk3368 lcdc: add support overscan 
Signed-off-by: hjc <hjc@rock-chips.com>
 2015-03-04 15:28:56 +08:00
guoyi
aacd2a52ef rk3368-p9: backlight: Polarity reversal 2015-03-04 15:04:13 +08:00
huang zhibao
191bd45207 Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10 2015-03-04 11:04:47 +08:00
huang zhibao
be1a632993 add support rk1000 codec and tvencoder 2015-03-04 10:52:18 +08:00
hwg
639aaaa35c support different wifi bt chip auto compatible, modify 
arch/arm64/boot/dts/rk3368-p9_818.dts, arch/arm64/boot/dts/rk3368-tb_8846.dts
 2015-03-04 10:49:13 +08:00
hwg
6461fc6fcb Revert "support different wifi bt chip auto compatible" 
This reverts commit 2506d1678c.
 2015-03-04 10:46:28 +08:00
hwg
2506d1678c support different wifi bt chip auto compatible 
arch/arm64/boot/dts/rk3368-p9_818.dts
 arch/arm64/boot/dts/rk3368-tb_8846.dts
 2015-03-04 10:44:44 +08:00
hwg
a5dafe340b solve make clean error causeed by wifi driver 2015-03-04 10:42:34 +08:00
CMY
772873d13f rk: ion: fix compilation warning without CONFIG_COMPAT 
Signed-off-by: CMY <cmy@rock-chips.com>
 2015-03-04 10:39:18 +08:00
Huang, Tao
65297ef11c rk: ion: fix compilation error without CONFIG_COMPAT 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit 52315d4d54)

Signed-off-by: CMY <cmy@rock-chips.com>
 2015-03-04 10:39:18 +08:00
CMY
c4bc04acf0 rk: ion: fix compile warnning 
Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit ee9707a058)

Signed-off-by: CMY <cmy@rock-chips.com>
 2015-03-04 10:39:18 +08:00
CMY
2e0f7d4d49 rk: uboot_mem_reserve: lost a '=' in 'if' statement 
(cherry picked from commit b9721d0365)

Signed-off-by: CMY <cmy@rock-chips.com>
 2015-03-04 10:39:18 +08:00
CMY
8d7aa53d05 rk: uboot_mem_reserve: fix print format 
Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit c9bbb3032c)

Signed-off-by: CMY <cmy@rock-chips.com>
 2015-03-04 10:39:17 +08:00
CMY
824538301d rk: ion: allow the cacheable buffer to map iommu 
Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit db95a55ffa)

Signed-off-by: CMY <cmy@rock-chips.com>
 2015-03-04 10:39:17 +08:00
CMY
dcd1c0a410 rk: ion: assign sg's dma_length in ion allocation if CONFIG_NEED_SG_DMA_LENGTH is set 
(cherry picked from commit c85ce1ade5)

Signed-off-by: CMY <cmy@rock-chips.com>
 2015-03-04 10:39:17 +08:00
CMY
f5c3bef8c6 ARM64: ion: ION_IOC_GET_PHYS compat 32bit userspace app. 
Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit 92ad540611)

Signed-off-by: CMY <cmy@rock-chips.com>
 2015-03-04 10:39:17 +08:00
CMY
82f69029fc ion: export ion_device for some kernel modules 
(cherry picked from commit c32433f1e0)

Signed-off-by: CMY <cmy@rock-chips.com>
 2015-03-04 10:39:17 +08:00
hwg
b70f43f91f solve make clean error causeed by wifi driver 2015-03-04 10:37:57 +08:00
hwg
2c70deaed9 rfkill-wlan.c use CONFIG_MFD_SYSCON to compatible rk3368 and rk3288 2015-03-04 09:56:25 +08:00
hwg
7f479c2a4a remove unused wifi driver: rda5990, mt5931, mt7601, mt6620 2015-03-04 09:56:01 +08:00
hwg
69ec730f70 support different wifi bt chip auto compatible 
like auto recognize rtl8188eu, ap6210, esp8089 in android

Conflicts:
	drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
	net/rfkill/rfkill-wlan.c
 2015-03-04 09:55:21 +08:00
lintao
9420778cf0 mmc: rk_sdmmc: edmac limit FIFOTH when mburst exceed limitation 
Signed-off-by: lintao <lintao@rock-chips.com>
 2015-03-03 21:37:44 +08:00
lintao
ac12f21803 mmc: rk_sdmmc: doesn't enforce hpclk to be used 
Signed-off-by: lintao <lintao@rock-chips.com>
 2015-03-03 21:10:11 +08:00
hwg
fc81f4bf58 rfkill-wlan.c use CONFIG_MFD_SYSCON to compatible rk3368 and rk3288 2015-03-03 17:57:20 +08:00
hwg
d65aa5b926 rfkill-wlan.c: support rk3368 
Conflicts:
	net/rfkill/rfkill-wlan.c
 2015-03-03 17:57:19 +08:00
hwg
d41ea47068 update rkwifi bcmdhd to version 1.201.34.1 
Conflicts:
	drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
 2015-03-03 17:57:19 +08:00
hjc
c49dc7088f rk fb: if uboot logo not display, there is not need to poll blank and enable iommu 
Signed-off-by: hjc <hjc@rock-chips.com>
 2015-03-03 17:00:57 +08:00
lintao
2e12006ac4 mmc: add hclk_mmc_peri for 3368 
Signed-off-by: lintao <lintao@rock-chips.com>
 2015-03-03 14:26:15 +08:00
CMY
ee9707a058 rk: ion: fix compile warnning 
Signed-off-by: CMY <cmy@rock-chips.com>
 2015-03-03 13:57:42 +08:00
chenzhi
0e8e5e9e9e ethernet: GMAC driver for RK3368 
Signed-off-by: chenzhi <roger.chen@rock-chips.com>
 2015-03-03 11:54:13 +08:00
lintao
8e8d41507b mmc: 3368: midgreed WA 
Signed-off-by: lintao <lintao@rock-chips.com>
 2015-03-02 18:12:07 +08:00
chenyifu
04b24f19e5 rk3368 mipi: fix the phase between the mipi clock and mipi data 
The mipi screen may be no-display in rk3368 when the mipi rate
higher than 900M, so we need to fix the phase between the clock and data.

Signed-off-by: chenyifu <chenyf@rock-chips.com>
 2015-03-02 17:07:07 +08:00
hjc
9518713533 rk3368 lcdc: init pixclock when uboot logo on is open, it is need by DSI 
Signed-off-by: hjc <hjc@rock-chips.com>
 2015-03-02 16:09:42 +08:00
CMY
b9721d0365 rk: uboot_mem_reserve: lost a '=' in 'if' statement 2015-03-02 15:42:55 +08:00
CMY
9b094d9d58 arm64: mm: reserve memory region for uboot 
Signed-off-by: CMY <cmy@rock-chips.com>
 2015-03-02 11:47:20 +08:00
CMY
c9bbb3032c rk: uboot_mem_reserve: fix print format 
Signed-off-by: CMY <cmy@rock-chips.com>
 2015-03-02 11:47:20 +08:00
Simon
8a29c30c7c rk3368: iommu: fix 32bit iommu work error in 64bit kernel 
unsigned long has 8bytes in 64bit kernel,Maybach iommu each entry
both dte and pte has 4bytes,so we can not use unsigned long type
to define the entry address,otherwise,wrong page table will be set up,
that will cause page fault.So,replace unsigned long with unsigned int to
define the entry address

Signed-off-by: Simon <xxm@rock-chips.com>
 2015-03-02 11:17:33 +08:00
smj
5321cb58d4 rk3368 codec : add support for codec es8316 
Signed-off-by: smj <smj@rock-chips.com>
 2015-03-02 10:40:31 +08:00