Commit Graph

20 Commits

Author SHA1 Message Date
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
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
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
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
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
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