firefly-linux-kernel-4.4.55.git
9 years agoARM64: dt: rk3368: add driver support for rk818
Jianqun Xu [Thu, 9 Apr 2015 02:13:14 +0000 (10:13 +0800)]
ARM64: dt: rk3368: add driver support for rk818

Support rk818 pmic, patch is from zhangqing@rock-chips.com.

Signed-off-by: Zhangqing <zhangqing@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
9 years agork3368-box.dts: enable uboot logo.
Zheng Yang [Wed, 8 Apr 2015 10:46:46 +0000 (18:46 +0800)]
rk3368-box.dts: enable uboot logo.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agodts:rk3368-box.dts default iommu
huang zhibao [Wed, 8 Apr 2015 08:22:27 +0000 (16:22 +0800)]
dts:rk3368-box.dts default iommu

9 years agoRK3368 GPU version: L0.12
zxl [Wed, 8 Apr 2015 03:20:30 +0000 (11:20 +0800)]
RK3368 GPU version: L0.12
1. Instead kmalloc to kzalloc.
2. Clear cleanup_sync in pvr_sync_clean_freelist.

9 years agork3368:mipi: Solve clk_unprepare error problem when plug and pull out hdmi.
xubilv [Tue, 7 Apr 2015 10:45:26 +0000 (18:45 +0800)]
rk3368:mipi: Solve clk_unprepare error problem when plug and pull out hdmi.

Signed-off-by: xubilv <xbl@rock-chips.com>
9 years agork3368: clk: clk_add_recalc_ddr_freq.
zhangqing [Fri, 3 Apr 2015 13:54:08 +0000 (06:54 -0700)]
rk3368: clk: clk_add_recalc_ddr_freq.

Get ddr frequency correctly.

Signed-off-by: zhangqing <zhangqing@rock-chips.com>
9 years agomailbox: rockchip: add driver for Rockchip SoCs integrated mailbox && System Control...
Aiyoujun [Thu, 2 Apr 2015 10:13:10 +0000 (18:13 +0800)]
mailbox: rockchip: add driver for Rockchip SoCs integrated mailbox && System Control and Power Interface(SCPI) protocol

Signed-off-by: Aiyoujun <ayj@rock-chips.com>
9 years agork fb: from rk3368 fb only need to reserved 1 framebuffer
hjc [Thu, 2 Apr 2015 11:11:02 +0000 (19:11 +0800)]
rk fb: from rk3368 fb only need to reserved 1 framebuffer

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agodelete unused file
hjc [Thu, 2 Apr 2015 10:56:31 +0000 (18:56 +0800)]
delete unused file

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agoHDMI: revert commit 3fe08a661c106d071afb45ddf3660c2e92fe8b52 for
Zheng Yang [Thu, 2 Apr 2015 09:11:12 +0000 (17:11 +0800)]
HDMI: revert commit 3fe08a661c106d071afb45ddf3660c2e92fe8b52 for
      find root reason on commit 7f2f16780d1a27cffcaa8a2310621771174defe1.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agoHDMI: improve cec function:
Zheng Yang [Thu, 2 Apr 2015 08:56:40 +0000 (16:56 +0800)]
HDMI: improve cec function:
        1. To get logic address more stable, we ping 3 times to each
   logic address. If the result is NACK for two times, this
   logic address is not occupied.
        2. If transmmit cec data failed, retry immediately.
        4. set CECOP_IMAGE_VIEW_ON only taget to TV, not broadcasting.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agoHDMI: fix edid mode list error: set head->prev to edid->modelist.
Zheng Yang [Thu, 2 Apr 2015 08:49:50 +0000 (16:49 +0800)]
HDMI: fix edid mode list error: set head->prev to edid->modelist.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agoMerge tag lsk-v3.10-15.03-android
Huang, Tao [Thu, 2 Apr 2015 01:25:21 +0000 (09:25 +0800)]
Merge tag lsk-v3.10-15.03-android

lsk-v3.10-15.03-android release

9 years agoarm64: rockchip: rk3368 support boot from little core without swap
Huang, Tao [Thu, 2 Apr 2015 01:10:03 +0000 (09:10 +0800)]
arm64: rockchip: rk3368 support boot from little core without swap

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agorm64: rockchip: rockchip_defconfig enable POWERVR_ROGUE
Huang, Tao [Wed, 1 Apr 2015 03:51:27 +0000 (11:51 +0800)]
rm64: rockchip: rockchip_defconfig enable POWERVR_ROGUE

just for debug

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agoarm64: rockchip: rockchip_defconfig disable reboot while panic
Huang, Tao [Wed, 1 Apr 2015 03:24:16 +0000 (11:24 +0800)]
arm64: rockchip: rockchip_defconfig disable reboot while panic

just for debug

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agomodify wifi: load driver when kernel bootup:
hwg [Wed, 1 Apr 2015 13:22:35 +0000 (21:22 +0800)]
modify wifi: load driver when kernel bootup:
 can increase speed of wifi open/close
 can solve memory alloc fail when open wifi

9 years agousb: gadget: MTP support compat ioctl
lyz [Wed, 1 Apr 2015 08:04:27 +0000 (16:04 +0800)]
usb: gadget: MTP support compat ioctl

9 years agousb: dwc_otg: fix usb otg force_device_mode
lyz [Wed, 1 Apr 2015 02:22:06 +0000 (10:22 +0800)]
usb: dwc_otg: fix usb otg force_device_mode

TEST: set rockchip,usb-mode = <2> in dts and then the usb works

Tested-by: huang zhibao <hzb@rock-chips.com>
Signed-off-by: lyz <lyz@rock-chips.com>
9 years agork3368 lcdc: fix fps show error
hjc [Tue, 31 Mar 2015 07:19:50 +0000 (15:19 +0800)]
rk3368 lcdc: fix fps show error

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork3368-p9: dts : add core&gpu dvfs table
guoyi [Tue, 31 Mar 2015 03:54:22 +0000 (11:54 +0800)]
rk3368-p9: dts : add core&gpu dvfs table

9 years agork3368: thermal: add suspend judeg
David Wu [Tue, 31 Mar 2015 04:05:32 +0000 (12:05 +0800)]
rk3368: thermal: add suspend judeg

Signed-off-by: David Wu <wdc@rock-chips.com>
9 years agomend debug info
ywj [Tue, 31 Mar 2015 01:43:25 +0000 (09:43 +0800)]
mend debug info

9 years agork3368-p9 : dts: set vccio to 3.3V
guoyi [Tue, 31 Mar 2015 01:27:21 +0000 (09:27 +0800)]
rk3368-p9 : dts: set vccio to 3.3V

9 years agork3368 lcdc: update lcdc interface for mutile area check
hjc [Tue, 31 Mar 2015 01:14:38 +0000 (09:14 +0800)]
rk3368 lcdc: update lcdc interface for mutile area check

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: add consider vop full mutile area for vsync register check
hjc [Mon, 30 Mar 2015 10:02:23 +0000 (18:02 +0800)]
rk fb: add consider vop full mutile area for vsync register check

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork818 battery update:low power check and statu reg setting,uboot
ywj [Mon, 30 Mar 2015 10:48:16 +0000 (18:48 +0800)]
rk818 battery update:low power check and statu reg setting,uboot

9 years agork3368-p9 : dts: enable dsihost0
guoyi [Mon, 30 Mar 2015 09:49:16 +0000 (17:49 +0800)]
rk3368-p9 : dts: enable dsihost0

9 years agork3368-p9: dts: disabled vdd_arm when deep yxsuspend
guoyi [Mon, 30 Mar 2015 09:21:13 +0000 (17:21 +0800)]
rk3368-p9: dts: disabled vdd_arm when deep yxsuspend

9 years agomipi-ld089wu1: increase lcdc frame rate to 60 fps.
xubilv [Mon, 30 Mar 2015 01:05:18 +0000 (09:05 +0800)]
mipi-ld089wu1: increase lcdc frame rate to 60 fps.

Signed-off-by: xubilv <xbl@rock-chips.com>
9 years agoRevert "ARM64: dts: act8846: ldo5 output 3.0v"
Huang, Tao [Sun, 29 Mar 2015 10:27:25 +0000 (18:27 +0800)]
Revert "ARM64: dts: act8846: ldo5 output 3.0v"

This reverts commit 1fff298dee47c7d9280ef895296a6294652dc9d0.

9 years agodefconfig: add rk1000 support
huang zhibao [Sun, 29 Mar 2015 09:47:17 +0000 (17:47 +0800)]
defconfig: add rk1000 support

9 years agoHDMI: fix crash error when insert HDMI with following log:
Zheng Yang [Sun, 29 Mar 2015 09:28:18 +0000 (17:28 +0800)]
HDMI: fix crash error when insert HDMI with following log:
      Unable to handle kernel paging request at virtual address 40ce80f8
      pgd = ffffffc001022000
      [40ce80f8] *pgd=0000000025b19003, *pmd=000000001cb1f003, *pte=0000000000000000
      Internal error: Oops: 96000005 [#1] PREEMPT SMP
      Modules linked in: pvrsrvkm(O) drmboot(PO)
      CPU: 7 PID: 2558 Comm: kworker/u16:1 Tainted: P        W  O 3.10.0 #66
      Workqueue: hdmi-ff980000.hdmi hdmi_work_queue
      task: ffffffc01ca83f00 ti: ffffffc033e00000 task.ti: ffffffc033e00000
      PC is at hdmi_wq_insert+0xa4/0x2ac
      LR is at hdmi_wq_insert+0x74/0x2ac
      pc : [<ffffffc000341014>] lr : [<ffffffc000340fe4>] pstate: 60000145

      Use inline fuction hdmi_destroy_modelist replace fb_destroy_modelist.
      For unkown reason, variable struct hdmi *hdmi is deferent before and
      after calling fb_destroy_modelist.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agodts: lcd-box.dtsi change screen-type fome SCREEN_HDMI to SCREEN_RGB
huang zhibao [Sun, 29 Mar 2015 09:02:09 +0000 (17:02 +0800)]
dts: lcd-box.dtsi change screen-type fome SCREEN_HDMI to SCREEN_RGB

9 years agospdif: init spdif later
huang zhibao [Sat, 28 Mar 2015 09:05:06 +0000 (17:05 +0800)]
spdif: init spdif later

9 years agodefconfig: add usb video camera support
huang zhibao [Sun, 29 Mar 2015 07:54:20 +0000 (15:54 +0800)]
defconfig: add usb video camera support

9 years agoHDMI: remove limited conditions of calling switch_set_state.
Zheng Yang [Sat, 28 Mar 2015 06:37:34 +0000 (14:37 +0800)]
HDMI: remove limited conditions of calling switch_set_state.
      Application should read /sys/class/display/HDMI/audioinfo
      to detect sink device support audio or not.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agork_fb: 1. Make sure fb_par->state lowest value is zero.
Zheng Yang [Sat, 28 Mar 2015 05:40:07 +0000 (13:40 +0800)]
rk_fb: 1. Make sure fb_par->state lowest value is zero.
       2. For box, video layer z-order is always zero.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agoRK3368 GPU version: L0.11
zxl [Sat, 28 Mar 2015 03:57:28 +0000 (11:57 +0800)]
RK3368 GPU version: L0.11
Fix 'Watchdog detected hard LOCKUP on cpu 0' bug casued by illegal visit register after disable clk.

9 years agoclk: rockchip: dump more cru register when panic
Huang, Tao [Fri, 27 Mar 2015 11:42:02 +0000 (19:42 +0800)]
clk: rockchip: dump more cru register when panic

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agork3368: iommu: fix hevc_mmu base address
Simon [Fri, 27 Mar 2015 10:37:02 +0000 (18:37 +0800)]
rk3368: iommu: fix hevc_mmu base address

Signed-off-by: Simon <xxm@rock-chips.com>
9 years agork3368 lcdc: fix deadlock when close lcdc and update reg
hjc [Fri, 27 Mar 2015 10:57:38 +0000 (18:57 +0800)]
rk3368 lcdc: fix deadlock when close lcdc and update reg

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork3368: efuse: fix warning and
guoyi [Fri, 27 Mar 2015 07:33:38 +0000 (15:33 +0800)]
rk3368: efuse: fix warning and
renamed rockchip_efuse_get_temp to rockchip_efuse_get_temp_adjust;

Signed-off-by: guoyi <gy@rock-chips.com>
9 years agork3368: efuse: change efuse get temp func
David Wu [Fri, 27 Mar 2015 07:02:47 +0000 (15:02 +0800)]
rk3368: efuse: change efuse get temp func

Signed-off-by: David Wu <wdc@rock-chips.com>
9 years agoarm64: Fix deadlock scenario with smp_send_stop()
Arun KS [Wed, 7 May 2014 01:41:23 +0000 (02:41 +0100)]
arm64: Fix deadlock scenario with smp_send_stop()

If one process calls sys_reboot and that process then stops other
CPUs while those CPUs are within a spin_lock() region we can
potentially encounter a deadlock scenario like below.

CPU 0                   CPU 1
-----                   -----
                        spin_lock(my_lock)
smp_send_stop()
 <send IPI>             handle_IPI()
                         disable_preemption/irqs
                          while(1);
 <PREEMPT>
spin_lock(my_lock) <--- Waits forever

We shouldn't attempt to run any other tasks after we send a stop
IPI to a CPU so disable preemption so that this task runs to
completion. We use local_irq_disable() here for cross-arch
consistency with x86.

Based-on-work-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Arun KS <getarunks@gmail.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit b9acc49ee9464f8f8232a790045d057eb158e869)

Conflicts:
arch/arm64/kernel/process.c

9 years agoarm64: Fix machine_shutdown() definition
Arun KS [Wed, 7 May 2014 01:41:22 +0000 (02:41 +0100)]
arm64: Fix machine_shutdown() definition

This patch ports most of commit 19ab428f4b79 "ARM: 7759/1: decouple CPU
offlining from reboot/shutdown" by Stephen Warren from arch/arm to
arch/arm64.

machine_shutdown() is a hook for kexec. Add a comment saying so, since
it isn't obvious from the function name.

Halt, power-off, and restart have different requirements re: stopping
secondary CPUs than kexec has. The former simply require the secondary
CPUs to be quiesced somehow, whereas kexec requires them to be
completely non-operational, so that no matter where the kexec target
images are written in RAM, they won't influence operation of the
secondary CPUS,which could happen if the CPUs were still executing some
kind of pin loop. To this end, modify machine_halt, power_off, and
restart to call smp_send_stop() directly, rather than calling
machine_shutdown().

In machine_shutdown(), replace the call to smp_send_stop() with a call
to disable_nonboot_cpus(). This completely disables all but one CPU,
thus satisfying the kexec requirements a couple paragraphs above.

Signed-off-by: Arun KS <getarunks@gmail.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 90f51a09ef83703b6c2e0434e0384b61b59699d3)

9 years agork3368: thermal: add adjust temp from efuse
David Wu [Thu, 26 Mar 2015 14:29:24 +0000 (22:29 +0800)]
rk3368: thermal: add adjust temp from efuse

Signed-off-by: David Wu <wdc@rock-chips.com>
9 years agork3368: add rockchip_get_temp function and
guoyi [Fri, 27 Mar 2015 03:07:02 +0000 (11:07 +0800)]
rk3368: add rockchip_get_temp function and
rockchip_get_leakage support for 3368

9 years agomipi: arm64: rockchip_defconfig enable mipi default.
xubilv [Thu, 26 Mar 2015 00:33:31 +0000 (08:33 +0800)]
mipi: arm64: rockchip_defconfig enable mipi default.

Signed-off-by: xubilv <xbl@rock-chips.com>
9 years agork3368: dvfs: avoid null-pointer dereference in dvfs_get_temp
Xiao Feng [Thu, 26 Mar 2015 02:38:56 +0000 (10:38 +0800)]
rk3368: dvfs: avoid null-pointer dereference in dvfs_get_temp

Signed-off-by: Xiao Feng <xf@rock-chips.com>
9 years agommc: rk_sdmmc: substitude regulator_set_voltage for io switch usage
lintao [Thu, 26 Mar 2015 09:14:55 +0000 (17:14 +0800)]
mmc: rk_sdmmc: substitude regulator_set_voltage for io switch usage

Signed-off-by: lintao <lintao@rock-chips.com>
9 years agoHDMI: rockchip-hdmiv2:
Zheng Yang [Thu, 26 Mar 2015 08:18:38 +0000 (16:18 +0800)]
HDMI: rockchip-hdmiv2:
Set i2c5_hdmi to gpio mode when suspend and reset
it to hdmi ddc mode when system resume.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agoHDMI: add dts node "rockchip,defaultmode" to define HDMI default output mode.
Zheng Yang [Thu, 26 Mar 2015 06:40:32 +0000 (14:40 +0800)]
HDMI: add dts node "rockchip,defaultmode" to define HDMI default output mode.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agomipi: rk3368 support power domain - pd_mipi_dsi.
xubilv [Wed, 25 Mar 2015 10:03:40 +0000 (18:03 +0800)]
mipi: rk3368 support power domain - pd_mipi_dsi.

Signed-off-by: xubilv <xbl@rock-chips.com>
9 years agoMerge branch develop-3.10
Huang, Tao [Wed, 25 Mar 2015 11:10:16 +0000 (19:10 +0800)]
Merge branch develop-3.10

9 years agomipi: correct coding style error of rk32_mipi_dsi.c
xubilv [Wed, 25 Mar 2015 09:51:07 +0000 (17:51 +0800)]
mipi: correct coding style error of rk32_mipi_dsi.c

Signed-off-by: xubilv <xbl@rock-chips.com>
9 years agoHDMI: fix feature SUPPORT_TMDS_600M filter error.
Zheng Yang [Wed, 25 Mar 2015 10:46:56 +0000 (18:46 +0800)]
HDMI: fix feature SUPPORT_TMDS_600M filter error.
For some sink device, it's max tmdsclk is only 300M, but
it support 4K YUV420 mode, so it can be filted by feature
SUPPORT_TMDS_600M under current code.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agoHDMI: fix feature SUPPORT_TMDS_600M filter error.
Zheng Yang [Wed, 25 Mar 2015 10:46:56 +0000 (18:46 +0800)]
HDMI: fix feature SUPPORT_TMDS_600M filter error.
For some sink device, it's max tmdsclk is only 300M, but
it support 4K YUV420 mode, so it can be filted by feature
SUPPORT_TMDS_600M under current code.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agoadd rga2 pd_clk support
zsq [Wed, 25 Mar 2015 09:09:26 +0000 (17:09 +0800)]
add rga2 pd_clk support

9 years agoupdate 8723bu wifi driver
xxh [Wed, 25 Mar 2015 04:19:16 +0000 (12:19 +0800)]
update 8723bu wifi driver
1.Improve_P2P_compatibility for Android L
2.Fix_HiddenAP_handle
3.P2P ScanSparse For Miracas

9 years agoRK3368 GPU version: L0.10
zxl [Wed, 25 Mar 2015 03:05:17 +0000 (11:05 +0800)]
RK3368 GPU version: L0.10
Init Power Rogue DDK code

Signed-off-by: zxl <zhuangxl@rock-chips.com>
9 years agork3368: dvfs: add temperature control
Xiao Feng [Tue, 24 Mar 2015 13:06:42 +0000 (21:06 +0800)]
rk3368: dvfs: add temperature control

Signed-off-by: Xiao Feng <xf@rock-chips.com>
9 years agork3368: pwm: add pwm interface for cabc
David Wu [Tue, 24 Mar 2015 11:11:00 +0000 (19:11 +0800)]
rk3368: pwm: add pwm interface for cabc

Signed-off-by: David Wu <wdc@rock-chips.com>
9 years agork3368 lcdc: CABC regulation pwm in frame start
hjc [Tue, 24 Mar 2015 11:02:00 +0000 (19:02 +0800)]
rk3368 lcdc: CABC regulation pwm in frame start

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork3368 dts: add backlight node into lcdc
hjc [Tue, 24 Mar 2015 11:00:36 +0000 (19:00 +0800)]
rk3368 dts: add backlight node into lcdc

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: add lut for CABC
hjc [Mon, 23 Mar 2015 08:29:34 +0000 (16:29 +0800)]
rk fb: add lut for CABC

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: only use iommu need to check config
hjc [Mon, 23 Mar 2015 08:08:43 +0000 (16:08 +0800)]
rk fb: only use iommu need to check config

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: add lut for CABC
hjc [Mon, 23 Mar 2015 08:29:34 +0000 (16:29 +0800)]
rk fb: add lut for CABC

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: only use iommu need to check config
hjc [Mon, 23 Mar 2015 08:08:43 +0000 (16:08 +0800)]
rk fb: only use iommu need to check config

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agodisabled gmac as default in rk3368.dtsi
hwg [Tue, 24 Mar 2015 07:58:26 +0000 (15:58 +0800)]
disabled gmac as default in rk3368.dtsi

9 years agosensor: add mpu6500 accel support
guoyi [Tue, 24 Mar 2015 06:30:23 +0000 (14:30 +0800)]
sensor: add mpu6500 accel support

9 years agork3368:camera: change aclk_isp from <&gates17 0> to <&gates16 0>.
dalon.zhang [Mon, 23 Mar 2015 08:38:54 +0000 (16:38 +0800)]
rk3368:camera: change aclk_isp from <&gates17 0> to <&gates16 0>.

9 years agodefault disable gmac in rk3368-p9_818.dts
hwg [Tue, 24 Mar 2015 03:42:53 +0000 (11:42 +0800)]
default disable gmac in rk3368-p9_818.dts

9 years agodts: rk3368: enable fclk_mcu\stclk_mcu\clk_jtag temporarily
dkl [Mon, 23 Mar 2015 10:13:03 +0000 (18:13 +0800)]
dts: rk3368: enable fclk_mcu\stclk_mcu\clk_jtag temporarily

Signed-off-by: dkl <dkl@rock-chips.com>
9 years agoarm64: rockchip: update rockchip_defconfig by savedefconfig
Huang, Tao [Mon, 23 Mar 2015 10:14:24 +0000 (18:14 +0800)]
arm64: rockchip: update rockchip_defconfig by savedefconfig

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agoarm64: rockchip: rockchip_defconfig enable DEBUG_INFO
Huang, Tao [Mon, 23 Mar 2015 10:13:13 +0000 (18:13 +0800)]
arm64: rockchip: rockchip_defconfig enable DEBUG_INFO

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agoMerge branch develop-3.10
Huang, Tao [Mon, 23 Mar 2015 09:59:35 +0000 (17:59 +0800)]
Merge branch develop-3.10

Conflicts:
arch/arm/mach-rockchip/dvfs.c

9 years agousb: dwc_otg: fix bug in FORCE_HOST_MODE
lyz [Mon, 23 Mar 2015 08:57:46 +0000 (16:57 +0800)]
usb: dwc_otg: fix bug in FORCE_HOST_MODE

9 years agork3368: usb: adjust usb phy parameter
lyz [Mon, 23 Mar 2015 08:48:19 +0000 (16:48 +0800)]
rk3368: usb: adjust usb phy parameter

9 years agork: arm64: disable set pm_power_off for compatible with old pmic driver
Huang, Tao [Mon, 23 Mar 2015 09:16:25 +0000 (17:16 +0800)]
rk: arm64: disable set pm_power_off for compatible with old pmic driver

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agoDMA: pl330: add chan_status to mutex between pl330_tasklet and pl330_control DMA_TERM...
Huibin Hong [Mon, 23 Mar 2015 09:11:09 +0000 (17:11 +0800)]
DMA: pl330: add chan_status to mutex between pl330_tasklet and pl330_control DMA_TERMINATE_ALL

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
9 years agocamsys_drv: v0.0x1e.0
dalon.zhang [Mon, 23 Mar 2015 08:43:14 +0000 (16:43 +0800)]
camsys_drv: v0.0x1e.0

9 years agork fb: box product not need to load screen when switch screen par enable is zero
hjc [Mon, 23 Mar 2015 07:20:27 +0000 (15:20 +0800)]
rk fb: box product not need to load screen when switch screen par enable is zero

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: fix open hdmi open backlight again in no dual mode
hjc [Tue, 16 Dec 2014 02:00:55 +0000 (10:00 +0800)]
rk fb: fix open hdmi open backlight again in no dual mode

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork3368 lcdc: support win mirror and update NO_DUAL mode
hjc [Fri, 12 Dec 2014 07:01:28 +0000 (15:01 +0800)]
rk3368 lcdc: support win mirror and update NO_DUAL mode

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: compatible when 32bit system call used on 64bit kernel
hjc [Thu, 25 Dec 2014 03:26:52 +0000 (11:26 +0800)]
rk fb: compatible when 32bit system call used on 64bit kernel

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork3368 lcdc: add CABC mode config
hjc [Fri, 9 Jan 2015 06:44:04 +0000 (14:44 +0800)]
rk3368 lcdc: add CABC mode config

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agosolve bluetooth hid problem:
hwg [Mon, 23 Mar 2015 06:59:10 +0000 (14:59 +0800)]
solve bluetooth hid problem:
  when bluetooth hid device connected, the key is delayed to be reponse about 5 second

9 years agorevert drivers/hid/uhid.c of commit 522c0bb37a66e65b704a4bd0f1bee7fec526dd32
hwg [Mon, 23 Mar 2015 06:53:04 +0000 (14:53 +0800)]
revert drivers/hid/uhid.c of commit 522c0bb37a66e65b704a4bd0f1bee7fec526dd32
  solve uhid Bad address error in 64bit cpu

9 years agork fb: box product not need to load screen when switch screen par enable is zero
hjc [Mon, 23 Mar 2015 07:20:27 +0000 (15:20 +0800)]
rk fb: box product not need to load screen when switch screen par enable is zero

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agorevert drivers/hid/uhid.c of commit 522c0bb37a66e65b704a4bd0f1bee7fec526dd32
hwg [Mon, 23 Mar 2015 06:53:04 +0000 (14:53 +0800)]
revert drivers/hid/uhid.c of commit 522c0bb37a66e65b704a4bd0f1bee7fec526dd32
  solve uhid Bad address error in 64bit cpu

9 years agork fb: if not want the config effect,set reserved[3] bit[0] 1
hjc [Mon, 9 Mar 2015 10:09:37 +0000 (18:09 +0800)]
rk fb: if not want the config effect,set reserved[3] bit[0] 1

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: if uboot-logo-on set 1, open iommu when iommu en
hjc [Thu, 26 Feb 2015 10:27:40 +0000 (18:27 +0800)]
rk fb: if uboot-logo-on set 1, open iommu when iommu en

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: update pixclock init value and scale mode only support ONE_DUAL mode
hjc [Wed, 18 Mar 2015 08:26:49 +0000 (16:26 +0800)]
rk fb: update pixclock init value and scale mode only support ONE_DUAL mode

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: add win mirror pos config
hjc [Tue, 23 Dec 2014 06:26:48 +0000 (14:26 +0800)]
rk fb: add win mirror pos config

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: add support phy address config
hjc [Fri, 20 Mar 2015 02:53:50 +0000 (10:53 +0800)]
rk fb: add support phy address config

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: compatible with 32 bit system
hjc [Tue, 17 Mar 2015 06:31:01 +0000 (14:31 +0800)]
rk fb: compatible with 32 bit system

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agommc: rk_sdmmc: remove hpclk ops in set_sdio_status callback
lintao [Mon, 23 Mar 2015 02:45:44 +0000 (10:45 +0800)]
mmc: rk_sdmmc: remove hpclk ops in set_sdio_status callback

Signed-off-by: lintao <lintao@rock-chips.com>
9 years agommc: rk_sdmmc: close FJTAG when drv probe
lintao [Mon, 23 Mar 2015 01:53:48 +0000 (09:53 +0800)]
mmc: rk_sdmmc: close FJTAG when drv probe

Signed-off-by: lintao <lintao@rock-chips.com>
9 years agork fb: update check var screen info
hjc [Mon, 23 Mar 2015 01:29:40 +0000 (09:29 +0800)]
rk fb: update check var screen info

Signed-off-by: hjc <hjc@rock-chips.com>