Commit Graph

93 Commits

Author SHA1 Message Date
c105668e18 Kernel->RGB2HDMI:update rgb2hdmi resolution 2016-03-09 16:31:31 +08:00
8f7d63a7e9 Kernel->clk:fix lcdc set freq err 2016-03-09 16:31:23 +08:00
f642a51e9d Revert "Kernel->clk:always use cpll for lcdc"
This reverts commit 6cf0f56841c33142cb152df63d2cdaa6d2bc3678.
2016-03-09 16:30:52 +08:00
79c1295b16 Kernel->clk:always use cpll for lcdc 2016-03-08 14:18:37 +08:00
b9c8a32af3 [kernel] ARM: rockchip: rk3288: fix dclk_lcdc setting freq error 2016-03-08 14:18:32 +08:00
24a5fb91d0 [kernel] ARM: rockchip: rk3228: clk: fix lcdc1 dclk setting error 2016-03-08 14:18:28 +08:00
14b005cf9b [kernel] Revert "clk: rockchip: dclk_lcdc0 and g_aclk_lcdc0 are always div from cpll for HDMI" 2016-03-08 14:18:23 +08:00
d08de59bea [kernel] video: rockchip: lcdc: 3288: fix iommu pagefault when user set win3 dsp size bigger than act size 2016-03-08 14:18:18 +08:00
b1198f34af Kernel->tsadc:fix tsadc get cpu tempture fail 2016-03-08 14:18:14 +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
0f3c408638 Kernel->HDMIIN:fix hdmiin start fail 2016-03-08 14:17:56 +08:00
cjp
3b106702e7 Kernel->Hwmon:printk cpu temperature 2016-03-08 14:17:51 +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
b4d42c5cf5 Kernel->Sound:correct debug info 2016-01-06 14:31:40 +08:00
e5e47c724a Kernel->HDMIIN:support HDMIIN record video 2016-01-05 11:52:32 +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
4a6973320a Android->HDMIIN:HDMIIN power ctrl in camSys 2016-01-05 11:50:54 +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
9bba3e7e10 Kernel->RGB2HDMI:correct LT8618 suspend bug 2016-01-05 11:50:24 +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
c662241813 Kernel->rgb2hdmi ok 2016-01-05 11:49:45 +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
81e6a558b1 Kernel->VGA: modify VGA show issue 2015-12-31 18:16:18 +08:00
8fa48dc229 kernel->lcd: increase the capacity of mipi cmds 2015-12-31 18:16:04 +08:00
e37bc7770a kernel->Touch: add synaptics dsx driver 2015-12-31 18:15:55 +08:00
002d70ba51 Kernel->backlight: fix some error of backlight 2015-12-31 18:15:51 +08:00
ba57755ad8 Kernel->logo:change logo and show logo in the middle of lcd 2015-12-31 18:15:46 +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
445738eb02 kernel->vga:modify VGA power up launch show issue 2015-12-31 18:15:03 +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
937e123f6c [kernel] i2c: rockchip: fix power off issue for rk818
The power off sequence is behind of i2c bus shutdown func,
it would prevent the rk818 to do power off action. The irq was
disabled when rk818 power off, it could let rk818 to power off
through i2c bus.

Change-Id: Ia6155f137ab2fa36dbe19e06878b0228670b1398
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 67e6de73b6b9336ef515c4d5a075251fb94ff6dc)
2015-12-31 16:44:22 +08:00
342bcc86a3 [kernel] video: rockchip: hdmi: 3288/3368: set ddc clock to 50KHz.
Change-Id: I00ba32eb9115fe63606b6ccb441ca3b7e3378880
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 9ce6f6b608392c4b3fce74146db071f23dd0f82f)
2015-12-31 16:44:14 +08:00
2665c1f437 [kernel] video: rockchip: hdmi: fix parsing 1st block edid
If parsing 1st block edid failed, we think it is good
only when there is more than one external block.

Change-Id: I1eb11405dade41ebb2ad041ba909de0c7ea120f8
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 1d9b35e9d10839a9d513eed551034fd02e855f92)
2015-12-31 16:44:05 +08:00
a04c0b97d4 [kernel] video: rockchip: display-sys: Add the same display interface device naming convention
When multiple same type display interface is registered, such as TV, named TV, TV1, TV2.

Change-Id: I33f7e12c4942c3bf7eb29cca8ef6037f9e78d1af
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit c196bbf342cdee23591522a545db6c42d9a008ea)
2015-12-31 16:43:57 +08:00
204ef22d2b [kernel] rk_fb: add extern screen open iommu, when dual screen display using iommu
Change-Id: Ia216d102df6841d4497144fe3c53aaeea9860178
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 5f6abdf11d058238fe3fc9c409eaaef7aa811d6d)
2015-12-31 16:43:49 +08:00
92b68f31f7 [kernel] video: rockchip: fb: delele obsolete code for box
There is no difference between mid and box on setting
RK_FBIOSET_CONFIG_DONE.

Change-Id: I8a454a318ad8663b5e0f94ac05c067c6b386801a
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 495b4a8232528251ee9276964014d6dd87e3ee22)
2015-12-31 16:43:41 +08:00
2618f552f3 [kernel] video: rockchip: lcdc: 3288: set iommu_status to 0, when all layer closed
Change-Id: I494c54017be89e48836870f015f420a0c148c980
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 172981dc8955170dd851910b7179710f073a7d21)
2015-12-31 16:43:33 +08:00