shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity
404,466 Commits 55 Branches 2,486 Tags
0d615e8cdad79e5e2a37efe6717fb292c5158fc0
Commit Graph

404466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hjc
0d615e8cda rk fb: if not want the config effect,set reserved[3] bit[0] 1 
Signed-off-by: hjc <hjc@rock-chips.com>
 2015-03-09 18:10:19 +08:00
hwg
6086f8f486 update wifi bcmdhd driver: 
solve kernel panic when use gmac and hotspots at same time
 2015-03-09 17:23:03 +08:00
dkl
6271af33fe dts: rk3036/rk312x/rk3288: add dma clk to fit 
commit 75ce2b9330

Signed-off-by: dkl <dkl@rock-chips.com>
 2015-03-09 15:34:13 +08:00
hjc
1cefe0404b rk3368 lcdc: add fbdc data format: HAL_PIXEL_FORMAT_FBDC_RGBA888 2015-03-09 15:52:06 +08:00
hjc
36841c672b rk3368 lcdc: 
1. check act and size in win2 win3 layer;
    2. add support yuv420sp nv21 data format;
    3. in read bit func,not need to backup reg;
    4. complete get win state func;

Signed-off-by: hjc <hjc@rock-chips.com>
 2015-03-09 15:04:04 +08:00
hjc
367a5c837d rk fb: add memsize check 
Signed-off-by: hjc <hjc@rock-chips.com>
 2015-03-09 14:54:05 +08:00
hjc
dbdab722d9 rk lcdc: if win not support scale, make sure dsp size equal to act size 
Signed-off-by: hjc <hjc@rock-chips.com>
 2015-03-09 14:54:05 +08:00
hjc
f653373db0 rk fb: add support yuv420sp nv21 data format 
Signed-off-by: hjc <hjc@rock-chips.com>

Conflicts:
	drivers/video/rockchip/rkfb_sysfs.c
	include/linux/rk_fb.h
 2015-03-09 14:54:05 +08:00
hjc
789a229b33 rk fb: make sure win close state take effect when update regs 
Signed-off-by: hjc <hjc@rock-chips.com>
 2015-03-09 14:54:05 +08:00
dkl
98d0d65e06 rk3368: clk: modify relation in software of clocks under PD_VIO 
It is necessary to enable hclk_vio_h2p\pclk_vio_h2p\hclk_vio_ahb_arbi
for devices under power doamin PD_VIO wen they work. Thus these clks
are modified to be parent of other clks from hclk_vio.

Signed-off-by: dkl <dkl@rock-chips.com>
 2015-03-09 14:04:55 +08:00
dkl
75ce2b9330 DMA: rk3368: add dma clk enable/disable 
Signed-off-by: dkl <dkl@rock-chips.com>
 2015-03-09 14:04:55 +08:00
Zheng Yang
874f30142e HDMI: Modify color output policy. 
Introduce feature SUPPORT_YCBCR_INPUT. If VOP can
        output YCbCr, VOP output color mode is equal to HDMI
        output color mode. Otherwise, VOP just output RGB,
        HDMI will conver color space.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
 2015-03-09 11:30:24 +08:00
Zheng Yang
c353bcdcf1 HDMI: add mutex lock when hdmi is set to auto mode, to avoid 
system crash by NULL pointer.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
 2015-03-09 11:30:10 +08:00
David Wu
c39e33f52b rk3368: thermal: add log trigger for tsadc 
enable log:
	echo t > sys/rockchip_thermal/temp
	disable log:
	echo f > sys/rockchip_thermal/temp

Signed-off-by: David Wu <wdc@rock-chips.com>
 2015-03-07 13:08:39 +08:00
David Wu
88db77f947 rk3368: tb_8846: change 8846 mode for tsadc 
Signed-off-by: David Wu <wdc@rock-chips.com>
 2015-03-07 00:28:42 +08:00
David Wu
6460e425e4 rk3368: add tsadc for p9 
Signed-off-by: David Wu <wdc@rock-chips.com>
 2015-03-06 21:03:39 +08:00
David Wu
7616e7d0de rk3368: tsadc: remove tsadc-int pin for p9 
Signed-off-by: David Wu <wdc@rock-chips.com>
 2015-03-06 21:03:39 +08:00
chenzhi
19343d9c8d ethernet: fix dts for rk3368-box 
Signed-off-by: chenzhi <roger.chen@rock-chips.com>
 2015-03-06 17:55:06 +08:00
David Wu
106c5fc6fc rk3368: thermal: remove dbg log 
Signed-off-by: David Wu <wdc@rock-chips.com>
 2015-03-06 17:43:01 +08:00
David Wu
5ed2c99f8c rk3368: use pvtm for 32k tep 
Signed-off-by: David Wu <wdc@rock-chips.com>
 2015-03-06 17:08:06 +08:00
David Wu
dd48da4e0b rk3368: tsadc: remove tsadc_tockchip defconfig 
Signed-off-by: David Wu <wdc@rock-chips.com>
 2015-03-06 17:07:12 +08:00
David Wu
2dc7021f12 rk3368: thermal: tsadc use usermode for rk3368 
Signed-off-by: David Wu <wdc@rock-chips.com>
 2015-03-06 16:59:31 +08:00
dkl
7c9231090e pvtm: rk3368: add pvtm_pmu clk support (output 32k) 
Support pvtm_pmu output 32k clk. By default, 32k use xin32k,
and pvtm_pmu 32k clk is disabled.

Signed-off-by: dkl <dkl@rock-chips.com>
 2015-03-06 15:06:38 +08:00
smj
e928d44b96 rk3368 codec : add support for headset detection of es8316 
Signed-off-by: smj <smj@rock-chips.com>
 2015-03-06 12:09:55 +08:00
David Wu
08cc897b0f rk3368: thermal: rockchip_thermal support rk3368 
Signed-off-by: David Wu <wdc@rock-chips.com>
 2015-03-06 11:00:46 +08:00
David Wu
178a7852c8 rk3368: thermal: sync form upstream for rockchip-thermal 
Signed-off-by: David Wu <wdc@rock-chips.com>
 2015-03-06 10:56:39 +08:00
Huang, Tao
1ca180425c 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