Commit Graph

44 Commits

Author SHA1 Message Date
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
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
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
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
445738eb02 kernel->vga:modify VGA power up launch show issue 2015-12-31 18:15:03 +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
4a4d209d95 [kernel] video: rockchip: fb: vop driver struct select depend on lcdc id from extent screen
Change-Id: Ied1a53b86ee2e524707a017ba65cd5e648e93bae
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 662c3e55e38c83eb89f58e088bfa924b4773e17b)
2015-12-31 16:43:25 +08:00
7bdc37d437 [kernel] hdmi: hdmi_submit_work function support synchronous operation.
If hdmi_submit_work work in synchronous mode, the malloced delayed_work
is free by caller, not by hdmi_work_queue, to prevent delayed_work is
free before flush_delayed_work fucntion is executed.

Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 71a461a76455cc8b3082c0125f5d0be3287f1420)
2015-12-31 16:43:17 +08:00
54c3b851a3 [kernel] rk3288_mali_t760_driver_r6p0-02rel0_13_x@0
(cherry picked from commit 1075a28e369596f902a832a5e4fe2ce0abcccbd0)
2015-12-31 16:43:08 +08:00
9e87c01241 [kernel] power_supply: cw2015_battery: Add msleep(200) when recover from sleep mode
Change-Id: I66f0ee349622f24646376822948d331922676ad3
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 1b7fb3f26558b0eb7eed1a6f7897cf09efc0dc38)
2015-12-31 16:43:00 +08:00
feb9658c29 [kernel] power-supply: cw2015_battery: fix incorrect bracketing on a test
Change-Id: Id4910e148852ab64d9396b17d3daf403d1fcb4b2
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 1df21c1635a8bcbf344c6fead73cf6872f1bae8c)
2015-12-31 16:42:53 +08:00
74fdafcddf [kernel] power_supply: cw2015_battery: code style fixes
Change-Id: I3cf0af574e11b7fd32adaaecbd6dbe83e72c83c9
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 4e5b768771bba978e9213002e81abd3b52ed00e7)
2015-12-31 16:42:44 +08:00
013cf85f4b [kernel] rk3x: i2c: prevent i2c xfer, when i2c shut down.
if rk818 driver's shutdown func called, it should not do i2c transfer.
And rk818's shutdown func is behind of i2c driver's shutdown func.

Change-Id: Iec96ad4640894f604493d8c764a2f98e75397885
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit d07484d381d9c7ffa79745b345aa2af35582a8fb)
2015-12-31 16:42:36 +08:00
13cc5557b3 [kernel] video: rockchip: fb: recalculate logo offset to match new screen size
Change-Id: I9f62088f4d0868a9284d1794718da8f5a044f24a
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit dbb4cc8d6e58a99ca90362a86603fac6464e0a09)
2015-12-31 16:42:28 +08:00
3bb7bf76b4 [kernel] video: rockchip: lcdc: 3288/3368: read screen regs in uboot mode
Change-Id: I36db50471140d041fd0220283bc4e6ce59ec9d74
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 44bc4fd73647d04771b3b0b22b2f8fc94cf259e5)
2015-12-31 16:42:20 +08:00
888311b3f5 [kernel] video: rockchip: fb: resize uboot logo if screen size is changed
If hdmi is inserted or removed before android is launched, screen
size is changed and uboot logo is showing on wrong screen position.

For example, screen size is 720x576 in uboot, hdmi is inserted during
kernel is booting, screen size is changed to 1920x1080, logo size
is still 720x576 and shown on left-top.

This case is occurred on box, mid has no problem. So we need to resize
uboot logo to new screen size.

Change-Id: I6247bf8e77d181687986815c960ec72d4c59a757
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 92e7da2818b9dd75d125d017898e30ec4f9c9ee0)
2015-12-31 16:42:12 +08:00
8d3c3e9756 [kernel] of/device: Fix platform_device.name point to an freed memory after
dev_set_name()

When we use of_device_add() to create platform_device and add it to device
hierarchy, the platform_device.name and device's name will point to the same
memory.

Later we use dev_set_name() to change the device's name, it will alloc new
memory to store name and free old device's name. After it, the
platform_device.name will point to an freed memory, access platform_device.name
 maybe lead to unpredictable exceptions.

So, we alloc new memory for platform_device.name in of_device_add()

Change-Id: I59bf0941ee4e094053971d41d386206e47fddcaa
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit a51927d3ac36b6f5ec741040d7b694e73f0fbeaf)
2015-12-31 16:42:04 +08:00
6ea9d7d2e5 [kernel] power: rk81x-battery: fix charge termination voltage define error
the charge termination voltage configration is like bellow:

	000: 4.05v, 001: 4.10v, 010: 4.15v
	011: 4.20v, 100: 4.25v, 101: 4.30v
	110: 4.35v, 111: 4.35v

Change-Id: I17c7df5952c3913eaf509ae2603f2d96d7ea96c8
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 231c34138efb7182dd82d5b392643c555b3ed285)
2015-12-31 16:41:40 +08:00
9e8929d74e [kernel] power: rk81x-battery: support otg device get power from dc
Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 5f976d7e3f0b614e10bd73e3ea33e982bb3f08cf)
2015-12-31 16:41:31 +08:00
ee77b80139 [kernel] power: rk81x-battery: fix power on sec base error
Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 5ca10b99dfeffdc0fc71ced399466c5f33dc0fbc)
2015-12-31 16:41:23 +08:00
7d2422b2ff [kernel] video: rockchip: hdmi: introduce vic flag HDMI_UBOOT_NOT_INIT
If uboot_vic has HDMI_UBOOT_NOT_INIT flag, it means uboot just
pass the preset vic value, registers has not been set in uboot.
If not, hdmi has been power up in uboot, should not operate phy
register again.

Change-Id: I64f48bd878ec124a94f25a752a74dc9bae502b2b
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 468345a5026c858f295dedfc5644c8b63a5948c8)
2015-12-31 16:40:51 +08:00
5fc58c74b5 [kernel] bcmdhd wifi:update driver 1.201.59.5
(cherry picked from commit 21f5fe6e69c2917d31d33bd24df557fc04cb6f93)
2015-12-31 16:40:43 +08:00
8f2e6fbc41 [kernel] rk3288_mali_t760_driver_r6p0-02rel0_12_x@0
(cherry picked from commit 71d4fbd8cced98e1c99f0a95dbda8d9c8a41143e)
2015-12-31 16:40:35 +08:00
cjp
8edf8bc1e1 kernel->pmu:set cpu dct gpio high and usb hub reset high 2015-09-08 17:13:01 +08:00
c65eec37b0 kernel->camera:modify camera power issue 2015-08-20 14:52:35 +08:00
3de097182b kernel->vga:modify complie warning 2015-08-20 10:50:42 +08:00
319c7f50f1 kernel->led:add led_trigger and led_brightness 2015-08-18 14:49:58 +08:00
c2f9fb2a09 kernel->touch:add synaptics driver support 2015-08-17 16:20:26 +08:00
04ce30d890 kernel->touch:add gsl3680 driver support 2015-08-17 16:18:04 +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