Commit Graph

403684 Commits

Author SHA1 Message Date
sugar
bcd2f5fdd8 arm64: dts: rk3368-tb_8846: fix rt3261 codec i2c match.
Signed-off-by: sugar <sugar.zhang@rock-chips.com>
2014-12-31 09:08:42 +08:00
Huang, Tao
679585fe2d ion: fix cma alloc bug
Fix this bug on ARM64:
BUG: failure at mm/slub.c:1351/new_slab()!
Kernel panic - not syncing: BUG!
CPU: 0 PID: 1596 Comm: Binder_5 Tainted: G           O 3.10.0 #45
Call trace:
[<ffffffc00008807c>] dump_backtrace+0x0/0x144
[<ffffffc0000881d0>] show_stack+0x10/0x1c
[<ffffffc000892838>] dump_stack+0x1c/0x28
[<ffffffc00088ffd0>] panic+0xe4/0x210
[<ffffffc00016673c>] new_slab+0x50/0x248
[<ffffffc000167b60>] __slab_alloc.isra.59.constprop.63+0x1f4/0x2d0
[<ffffffc000167cec>] __kmalloc+0xb0/0x1c4
[<ffffffc000092930>] __dma_alloc_noncoherent+0x7c/0x158
[<ffffffc000643cf0>] ion_cma_allocate+0xfc/0x27c
[<ffffffc0006404f8>] ion_alloc+0x134/0x778
[<ffffffc00064100c>] ion_ioctl+0x15c/0x344
[<ffffffc00017bfa8>] vfs_ioctl+0x20/0x3c
[<ffffffc00017c8ac>] do_vfs_ioctl+0x474/0x540
[<ffffffc00017c9d4>] SyS_ioctl+0x5c/0x88

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-26 23:08:20 +08:00
Huang, Tao
ccddaafdb0 arm64: rockchip: rk3386: fix ion heap id
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-26 22:56:49 +08:00
Huang, Tao
6b278a8e82 Merge branch develop-3.10 2014-12-26 22:26:34 +08:00
Huang, Tao
37e1b87010 Revert "rk: ion: fix compilation error on arm64"
This reverts commit 6ba08d968d.
2014-12-26 22:26:28 +08:00
Huang, Tao
50883470a5 Revert "rk: ion: fix dts parse failure on arm64"
This reverts commit e46863d23c.
2014-12-26 22:26:14 +08:00
smj
4df3c8bb27 rk312x codec : fix the bug of codec capture gain 2014-12-26 21:07:26 +08:00
Huang, Tao
564a66a1cb arm/configs: add CONFIG_SECCOMP to rockchip_defconfig
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-26 13:56:29 +08:00
CMY
74ebc4ab43 rk: ion: fix dts parse failure on arm64 2014-12-26 13:04:08 +08:00
CMY
ee0b7b6a50 rk: ion: fix compilation error on arm64
Conflicts:

	drivers/staging/android/ion/rockchip/rockchip_ion.c
	include/linux/rockchip_ion.h
2014-12-26 13:00:41 +08:00
dkl
72dca47db4 clk: rockchip: set aclk_core_div to 4 for all rates in rk3036_apll_table
Set aclk_core_div to 4 for all rates, which makes rk3126\rk3128\rk3126b apll
frequency change stably.

Signed-off-by: dkl <dkl@rock-chips.com>
2014-12-26 10:11:39 +08:00
Wu Liang feng
28e9901cf0 USB: DWC_OTG: Support otg suspend and resume pm
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
2014-12-25 14:57:26 +08:00
CMY
c32433f1e0 ion: export ion_device for some kernel modules 2014-12-25 14:54:36 +08:00
hjc
c3ec2077f4 rk3368 lcdc: fix crash when close display
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-25 14:26:22 +08:00
hjc
b7bff6a27b rk fb: add win mirror pos config
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-25 14:26:22 +08:00
hjc
3db3476b6b rk3368 lcdc: add yuv overlay and close lut when switch hdmi
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-25 14:26:21 +08:00
hjc
20fbcf2a42 rk3368 lcdc: fbdc test ok use auto test case
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-25 14:26:21 +08:00
hjc
686c2212a6 rk fb: compatible when 32bit system call used on 64bit kernel
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-25 14:26:21 +08:00
Mark Yao
78648b80d8 rk312x: lcdc: fix shutdown power and clock deinit
immediately power down lcdc and clock, maybe
regs_update_handler still work, some status would
became wrong.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-25 10:06:38 +08:00
lyz
d2f97737dd usb: support rk3368 OTG device side and EHCI 2014-12-24 18:50:05 +08:00
lyz
522b75a51d usb: ohci: backport ohci-platform.c driver from kernel-3.18 2014-12-24 18:50:05 +08:00
lyz
7844ff3788 usb: ehci: backport ehci-platform.c driver from kernel-3.18 2014-12-24 18:50:05 +08:00
lyz
c7877396ea usb: dwc_otg: set dma_mask 32bit for both device and host mode 2014-12-24 18:50:05 +08:00
David Wu
73cc56277c rk3368: io-domain: add io domain volt sel
Signed-off-by: David Wu <wdc@rock-chips.com>
2014-12-24 17:25:17 +08:00
lintao
e68d16d336 mmc: rk_sdmmc: manually zero desc after allocated on ARM64 platform.
ARM64 call dmam_alloc_coherent mathod to allocate descriptor
will not auto clear buffer. So mmc may get wrong d->desc1 calculated that
load wrong address for BUF2 for dual-buf mode if NO CH set in d->desc0.
Then IDMAC will halt for BUF2 in WR_REQ_WAIT state and cannot generate
TI/RI or others in combine-interrupt.

Signed-off-by: lintao <lintao@rock-chips.com>
2014-12-24 16:38:17 +08:00
lintao
1b4317b2c9 Revert "arm64: rockchip: rockchip_defconfig disable MMC_DW_IDMAC temporarily"
This reverts commit da9ae0c513.

Signed-off-by: lintao <lintao@rock-chips.com>
2014-12-24 16:38:13 +08:00
Huang, Tao
0a6d05ddd6 arm64: rockchip: rk3368 enable 8 CPUs support
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-23 22:30:58 +08:00
Huang, Tao
22eb70f063 ion: rockchip: fix snapshot alignment fault on armv8
Fix this bug:
Unhandled fault: alignment fault (0x96000061) at 0xffffff8000006016
Internal error: : 96000061 [#1] PREEMPT SMP
Modules linked in: dc_fbdev(O) pvrsrvkm(O)
CPU: 0 PID: 125 Comm: Binder_2 Tainted: G           O 3.10.0 #36
task: ffffffc0530f7380 ti: ffffffc0531c0000 task.ti: ffffffc0531c0000
PC is at memcpy+0x2c/0x60
LR is at vsnprintf+0x100/0x598
[<ffffffc0002e093c>] memcpy+0x2c/0x60
[<ffffffc00018b3bc>] seq_vprintf+0x48/0x84
[<ffffffc00018b44c>] seq_printf+0x54/0x60
[<ffffffc00063a238>] ion_alloc+0x4fc/0x778
[<ffffffc00063a98c>] ion_ioctl+0x164/0x360
[<ffffffc00017bfa8>] vfs_ioctl+0x20/0x3c
[<ffffffc00017c8ac>] do_vfs_ioctl+0x474/0x540
[<ffffffc00017c9d4>] SyS_ioctl+0x5c/0x88

pgprot_noncached will map buffer as MT_DEVICE, but
All store accesses to Device memory use the asynchronous abort mechanism on
Cortex-A53.

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-23 21:36:07 +08:00
David Wu
e93588288e rk3368: io-domain: sync with upstream to add REGULATOR_EVENT_PRE_VOLTAGE_CHANGE
Signed-off-by: David Wu <wdc@rock-chips.com>
2014-12-23 21:20:36 +08:00
chenjh
08959c3554 arm64: rockchip: rk3368-tb_8836 fix cw2015 gpio define 2014-12-23 19:31:23 +08:00
CMY
be6254128b rk: ion: ion's heap id order by heap type
need update android, including:
    hardware/rk29/libgralloc_ump/
    hardware/rk29/camera/
    external/rk-pcba-test/
2014-12-23 18:16:22 +08:00
David Wu
5ecb63c75e rk3368: i2c: fix i2c1&i2c2 reg address and irq error
Signed-off-by: David Wu <wdc@rock-chips.com>
2014-12-23 17:15:32 +08:00
Huang, Tao
41b711c60f arm64: rockchip: rk3368 enable 4 big CPUs support
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-23 16:30:13 +08:00
Huang, Tao
eaaf5aad38 arm64: rockchip: rk3368-tb_8836 add tp support
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-23 16:26:56 +08:00
Huang, Tao
93b7173068 arm64: rockchip: rk3368 fix cpu axi init
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-23 15:29:14 +08:00
lyz
8689409d5b usb: rk312x: rk3126/3128 usb phy tuning set OTG port disconnect
trigger point to 600mv, default is 650mv
2014-12-22 15:48:16 +08:00
Huang, Tao
79437e3372 Merge tag 'lsk-v3.10-android-14.12'
LSK Android 14.12 v3.10

Conflicts:
	include/linux/clk-provider.h
2014-12-19 20:02:18 +08:00
David Wu
561fe83bd4 rk3368: dma: enable pl330 and dmadevices defconfig
Signed-off-by: David Wu <wdc@rock-chips.com>
2014-12-19 19:28:03 +08:00
David Wu
6f96245db8 rk3368: uart_dbg: uart_dbg pinctrl is decided by hardware
Signed-off-by: David Wu <wdc@rock-chips.com>
2014-12-19 19:27:53 +08:00
David Wu
b633fe40c5 rk3368: voppwm: add voppwm function
Signed-off-by: David Wu <wdc@rock-chips.com>
2014-12-19 19:27:31 +08:00
chenzhen
1ae1ba872d mali_760_driver, rk_ext :
Add log of ver_info and built_time of mali_ko.
2014-12-17 15:19:49 +08:00
chenzhen
4b2e73b447 mali_760_driver : rk_ext on arm_release_ver, from r5p0-02dev0. 2014-12-17 15:19:48 +08:00
chenzhen
4599043e5e mali_760_driver : arm_release_ver r5p0-02dev0. 2014-12-17 15:19:48 +08:00
li bing
032b70b4cd rk312x: close the bluetooth in the file rk3128-box-rk88.dts. 2014-12-17 13:58:18 +08:00
Huang, Tao
f93b5a57ce arm64: rockchip: build resource.img with logo_kernel.bmp
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-17 13:45:01 +08:00
Huang, Tao
adf525716c ARM: rk: kernel.img depends on logo_kernel.bmp
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-17 13:41:37 +08:00
yxj
a8e1ae1adb arm64: dts: rk3368-tb_8846: enable edp panel
Signed-off-by: yxj <yxj@rock-chips.com>
2014-12-16 20:57:45 +08:00
yxj
fc2658c1bb arm64: dts: rk3368: fix grf, interrupts, resets for edp
Signed-off-by: yxj <yxj@rock-chips.com>
2014-12-16 20:57:41 +08:00
yxj
a1364527e9 video: rockchip: rk32_dp: add support for rk3368
Signed-off-by: yxj <yxj@rock-chips.com>
2014-12-16 20:57:29 +08:00
yxj
8b9fe46efc video: rockchip: rk32_dp: covert dsb() to dsb(sy)
Signed-off-by: yxj <yxj@rock-chips.com>
2014-12-16 20:56:17 +08:00