shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity
404,507 Commits 55 Branches 2,486 Tags
17685ec17ac93ff8a540e1c093b4873323dfdbf8
Commit Graph

404507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
huangzhibao
17685ec17a Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10-next 2015-03-16 20:09:07 +08:00
Huang, Tao
03b9f4949f Merge branch linux-linaro-lsk-v3.10-android 2015-03-16 20:30:06 +08:00
huangzhibao
1958bfe6b9 dts: update rk3368-box dts:1, wifi_bt,2,enabled pwm1;3.emmc clk 2015-03-16 20:08:50 +08:00
dkl
68bdc6aff1 pd: rk3368: add rk3368 power domain support (as pd clk) 
Signed-off-by: dkl <dkl@rock-chips.com>
 2015-03-16 17:53:51 +08:00
dkl
2d040c7441 dts: rk3368: remove "clk_ignore_unused" from bootargs 
Signed-off-by: dkl <dkl@rock-chips.com>
 2015-03-16 16:47:00 +08:00
Zheng Yang
5ef7d03446 rk3368-box.dts: set initial display timing to 1080P. 
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
 2015-03-14 10:11:56 +08:00
guoyi
a95b17f7f4 3368_P9: dts: renamed 818 DCDC2 regulator to vdd_logic 2015-03-13 15:57:41 +08:00
Alpha Lin
f27b31eae5 VPU: remove dev_set_name. 
dev_set_name is prohibit in linux, and may casue system
warning dump.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
 2015-03-13 10:33:46 +08:00
hjc
5f8a929f59 rk312x lcdc: add to get hwc layer status 
Signed-off-by: hjc <hjc@rock-chips.com>
 2015-03-12 16:19:57 +08:00
Mark Yao
cb49914a9d bmp_helper: fix bmp rle8 display abnormal 
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
 2015-03-12 16:19:57 +08:00
Huang, Tao
9a742e52b1 rtc: HYM8563: don't call rtc_year_days 
If i2c error, the driver may call rtc_year_days with month -1, which will
cause crash. Fix this by never call rtc_year_days at all.

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2015-03-12 15:48:12 +08:00
CMY
29dc0928ee arm64: ion: fix scatterlist alloc fault on ion_system heap 
Fix this bug:
WARNING: at lib/scatterlist.c:251 __sg_alloc_table+0x5c/0x15c()
Modules linked in: pvrsrvkm(O)
CPU: 2 PID: 582 Comm: Binder_5 Tainted: G           O 3.10.0 #10
Call trace:
[<ffffffc000088164>] dump_backtrace+0x0/0x140
[<ffffffc0000882b4>] show_stack+0x10/0x1c
[<ffffffc0008ccaf0>] dump_stack+0x1c/0x28
[<ffffffc0000a13c0>] warn_slowpath_common+0x74/0x9c
[<ffffffc0000a14ac>] warn_slowpath_null+0x14/0x20
[<ffffffc0002fadc4>] __sg_alloc_table+0x58/0x15c
[<ffffffc0002faee8>] sg_alloc_table+0x20/0x50
[<ffffffc00067ab7c>] ion_system_heap_allocate+0x188/0x318
[<ffffffc00067823c>] ion_alloc+0x134/0x788
[<ffffffc000678d68>] ion_ioctl+0x15c/0x344
[<ffffffc0001840ac>] vfs_ioctl+0x20/0x3c
[<ffffffc0001849b4>] do_vfs_ioctl+0x478/0x550
[<ffffffc000184ae8>] SyS_ioctl+0x5c/0x88

Signed-off-by: CMY <cmy@rock-chips.com>
 2015-03-10 15:45:14 +08:00
hjc
68c0a19fed rk3368 dtsi: update vop iommu compatible name 
Signed-off-by: hjc <hjc@rock-chips.com>
 2015-03-10 15:05:27 +08:00
Mark Brown
e8f1cafd74 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2015-03-09 12:27:34 +00:00
Mark Brown
c810fcb930 Merge remote-tracking branch 'lsk/v3.10/topic/cpufreq' into linux-linaro-lsk 2015-03-09 12:27:27 +00:00
Mark Brown
db295c8937 cpufreq: Revert "cpufreq: suspend governors on system suspend/hibernate" 
This reverts commit adb665056a.

The commit has too many hidden dependencies to be sensibly backported.

Signed-off-by: Mark Brown <broonie@linaro.org>
 2015-03-09 12:27:09 +00:00
Mark Brown
d255fcab2b cpufreq: Revert "cpufreq: Don't iterate over all CPUs when suspending and resuming governors" 
This reverts commit 212df5dd32.

The commit it's fixing has too many other dependencies.

Signed-off-by: Mark Brown <broonie@linaro.org>
 2015-03-09 12:26:10 +00:00
hjc
5e69085097 rk3368 lcdc: FBDC_ABGR_888 data format support alpha 
Signed-off-by: hjc <hjc@rock-chips.com>
 2015-03-09 18:32:01 +08:00
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