Commit Graph

50 Commits

Author SHA1 Message Date
3fecf7428d Kernel->iommu:ubuntu do not use iommu 2016-06-16 17:07:26 +08:00
8fe6c3be9d Kernel->defconfig: update the firefly-rk3288_defconfig 2016-05-10 17:01:43 +08:00
4258a604dd Kernel->Dts: add MPU6050 config for firefly-rk3288-reload 2016-05-05 16:15:23 +08:00
ada4ae9fb3 Kernel->Dts: add MPU6050 config for firefly-rk3288 2016-05-05 15:40:07 +08:00
ce82e07ea8 Kernel->driver:tp compatible with mt70817v2 2016-05-05 10:13:46 +08:00
49c1f8c305 Kernel->dts: add lcd-LP079Qx1.dtsi 2016-05-04 09:33:58 +08:00
683dffba90 Kernel->dts: rm firefly-mid.dts 2016-04-19 17:10:55 +08:00
97b96251c8 Kernel->dts: firefly-rk3288 support lcdc iommu 2016-04-07 11:26:40 +08:00
cjp
1c1093c3d5 Kernel->config:update firefly-rk3288-reload-linux_defconfig 2016-03-15 09:46:40 +08:00
b9bdb55106 Kernel->dts:add lcd-ips5k0350fpc-mipi.dtsi 2016-03-15 09:46:21 +08:00
ab643c2d62 Kernel->dts:add touchscreen GSLX680 support and touch default as disabled 2016-03-15 09:46:06 +08:00
f3bab495cd Kernel->Linux:remove uboot logo 2016-03-08 14:18:09 +08:00
55276150ea Kernel->DVFS:update dvfs table 2016-03-08 14:18:05 +08:00
5a4ff2eee1 Kernel->USB:set otg to auto mode 2016-03-08 14:18:00 +08:00
cjp
f94a539388 Kernel->DTS:rm some file 2016-02-29 09:39:13 +08:00
b56dc6c458 Kernel->Linux:Add linux config & dts file 2016-01-06 16:06:42 +08:00
5b27231c63 Android->kernel:HDMIIN audio switch local and remote ok 2016-01-05 11:52:16 +08:00
1557b58845 Kernel->HDMIIN:add hdmiin codec support 2016-01-05 11:51:51 +08:00
678a737cd3 Kernel->Add single HDMI 4K output support 2016-01-05 11:51:38 +08:00
60e49bcdea Kernel->HDMIIN: add HDMIIN support 2016-01-05 11:50:45 +08:00
2412296b95 Kernel->RGB2HDMI:reslove RGB2HDMI set mode fail 2016-01-05 11:50:28 +08:00
3782c7a5ea Kernel->DVFS: set cpu temperature threshold to 95 2016-01-05 11:50:14 +08:00
f958a0cfd6 Kernel->defconfig add RGB2HDMI config 2016-01-05 11:50:00 +08:00
c3d506a0ec Kernel->RGB2HDMI:add rgb to hdmi support 2016-01-05 11:49:40 +08:00
740d482a4c kernel->Add firefly-rk3288-reload config file 2016-01-05 11:49:36 +08:00
e37bc7770a kernel->Touch: add synaptics dsx driver 2015-12-31 18:15:55 +08:00
cjp
cb9222eddf kernel->dts:add dual screen config 2015-12-31 18:15:42 +08:00
cjp
6b210ab082 kernel->dts:modify firefly-rk3288 config 2015-12-31 18:15:24 +08:00
cjp
1a05a95822 kernel->dts:set lcd power pin 2015-12-31 18:15:11 +08:00
cjp
88e572ed6b kernel->dts:update firefly-mid.dts 2015-12-31 18:15:07 +08:00
cjp
d27689d111 kernel->ddr:modify logo flash issue 2015-12-31 18:14:58 +08:00
cjp
5096dedb88 kernel->logo:add firefly boot logo 2015-12-31 18:14:54 +08:00
djw
2b5f44213a Merge master branch.
Conflicts:
	frameworks/base/core/java/android/content/res/Configuration.java
	frameworks/base/core/java/android/provider/Settings.java
	frameworks/base/packages/SettingsProvider/res/values/defaults.xml
	frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/SystemBars.java
	frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
	hardware/rockchip/camera/CameraHal/CameraHal_board_xml_parse.cpp
	vendor/rockchip/common/apps/apps.mk
2015-12-31 17:54:05 +08:00
3c17c1a9d3 [kernel] dtsi: rk312x-sdk: update rk818 battery node
Change-Id: I1d0dd1b005e94281cff0792e6380deb3f02efaaf
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 358babe3842cd4aafb486c654f0c538ca82dad9b)
2015-12-31 16:41:56 +08:00
c1d27e0a44 [kernel] dts: rk3288-tb: update rk818 battery node
Change-Id: I4a76e7ac0ff3af791839ab5e5f9656ce72612dd1
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit e8f3a0f1a7918fc27250ce68bc3c357446cc9d16)
2015-12-31 16:41:48 +08:00
dbf3d47ded [kernel] rk3288: pwm: rkpwm use same interrupt, voppwm would not use capture mode
Change-Id: Ic4d27adeb800406efa1efa5b34fc78677b4def72
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 577f1219dda73bf48d2fc4d00693dabbf626af30)
2015-12-31 16:41:15 +08:00
466d037fce [kernel] ARM: dts: rk3288: move the remote-ctrl of PWM into box dts
Thinking about the PWM remote-ctrl is used by box, we should
put this into box dts.

Meanwhile, that PWM configure will break the normal PWM driver.
This patch will fix it.

Change-Id: I14878332631f94f512412ced5ceb8689f8bfbe46
Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 74a24fe1b7e7529f618c32b085177f2be3394c6b)
2015-12-31 16:41:07 +08:00
6fcc0c2363 [kernel] ARM: dts: rk3288: add the interrupts property for PWM
We are assuming that PWM need use the property, we can support the
SPI interrupts for PWM.

At the moment, we can find the remotectl pwm is needed on box.
We can add the property for all PWMs. AFAIK, the pwm driver don't use it
but the drivers/input/remotectl/rockchip_pwm_remotectl.c

Change-Id: Ia223e6cc0e882477614b555bd09c86fd4bf8dbd7
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 16b7b284618d1652e694f6286f575ce82f5f03e5)
2015-12-31 16:40:59 +08:00
cjp
9bcd9e1673 kernel->spdif:use base source and moidfy dts file 2015-09-08 17:10:27 +08:00
cjp
688bd90323 kernel->dts:modify usb mode 2015-09-08 17:10:23 +08:00
cjp
ef0a2258b6 kernel->console: enable rockchip console and disable 2015-09-08 17:09:43 +08:00
1eadbeda01 kernel->config:add firefly-rk3288_defconfig config 2015-08-20 15:34:20 +08:00
0f8a6b390e kernel->dts:promote lcdc driver power 2015-08-20 15:17:51 +08:00
f0665f0cf6 kerenl->dts:update firefly-mid and firefly-rk3288 2015-08-20 15:10:41 +08:00
c65eec37b0 kernel->camera:modify camera power issue 2015-08-20 14:52:35 +08:00
e56c60585d kernel->dts:add firefly-mid firefly-rk3288 config 2015-08-18 10:07:43 +08:00
74ee62c9b4 kernel->lcd:update lcd-b101ew05 driver 2015-08-18 10:06:52 +08:00
1f1aee3ecc kernel->rm some unstrack file 2015-08-11 12:00:50 +08:00
3f8870a135 Commit of manifest rk3288_box_lollipop_release.xml 2015-08-11 11:01:11 +08:00
93013a6efc Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml 2015-05-20 17:06:22 +08:00