Commit Graph

404672 Commits

Author SHA1 Message Date
Huang, Tao
3a58147ea7 Revert "ARM64: dts: act8846: ldo5 output 3.0v"
This reverts commit 1fff298dee.
2015-03-29 18:27:25 +08:00
huang zhibao
2d298635f7 defconfig: add rk1000 support 2015-03-29 17:47:17 +08:00
Zheng Yang
3fe08a661c 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>
2015-03-29 17:28:18 +08:00
huang zhibao
baf374531b dts: lcd-box.dtsi change screen-type fome SCREEN_HDMI to SCREEN_RGB 2015-03-29 17:02:09 +08:00
huang zhibao
f8020b5d34 spdif: init spdif later 2015-03-29 16:26:48 +08:00
huang zhibao
ae194cca85 defconfig: add usb video camera support 2015-03-29 16:14:10 +08:00
Zheng Yang
48921e9feb 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>
2015-03-28 14:37:34 +08:00
Zheng Yang
f94118bca7 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>
2015-03-28 13:40:07 +08:00
zxl
8de08e28f0 RK3368 GPU version: L0.11
Fix 'Watchdog detected hard LOCKUP on cpu 0' bug casued by illegal visit register after disable clk.
2015-03-28 11:57:28 +08:00
Huang, Tao
051d437e32 clk: rockchip: dump more cru register when panic
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-03-27 19:42:19 +08:00
Simon
2b8ae8b9ee rk3368: iommu: fix hevc_mmu base address
Signed-off-by: Simon <xxm@rock-chips.com>
2015-03-27 18:38:12 +08:00
hjc
271f5aedb1 rk3368 lcdc: fix deadlock when close lcdc and update reg
Signed-off-by: hjc <hjc@rock-chips.com>
2015-03-27 18:58:21 +08:00
guoyi
63e851a987 rk3368: efuse: fix warning and
renamed rockchip_efuse_get_temp to rockchip_efuse_get_temp_adjust;

Signed-off-by: guoyi <gy@rock-chips.com>
2015-03-27 15:33:38 +08:00
David Wu
31cfefaa3f rk3368: efuse: change efuse get temp func
Signed-off-by: David Wu <wdc@rock-chips.com>
2015-03-27 15:03:45 +08:00
Arun KS
a3017b51a3 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 b9acc49ee9)

Conflicts:
	arch/arm64/kernel/process.c
2015-03-27 14:28:08 +08:00
Arun KS
363aaed735 arm64: Fix machine_shutdown() definition
This patch ports most of commit 19ab428f4b "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 90f51a09ef)
2015-03-27 14:18:32 +08:00
David Wu
d3c60c74df rk3368: thermal: add adjust temp from efuse
Signed-off-by: David Wu <wdc@rock-chips.com>
2015-03-26 22:29:24 +08:00
guoyi
873777cb8b rk3368: add rockchip_get_temp function and
rockchip_get_leakage support for 3368
2015-03-27 11:09:24 +08:00
xubilv
41f97177a1 mipi: arm64: rockchip_defconfig enable mipi default.
Signed-off-by: xubilv <xbl@rock-chips.com>
2015-03-27 09:41:30 +08:00
Xiao Feng
48ef6f66b8 rk3368: dvfs: avoid null-pointer dereference in dvfs_get_temp
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-03-27 09:39:12 +08:00
lintao
2077fe8e77 mmc: rk_sdmmc: substitude regulator_set_voltage for io switch usage
Signed-off-by: lintao <lintao@rock-chips.com>
2015-03-26 17:16:26 +08:00
Zheng Yang
abfe921f66 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>
2015-03-26 16:32:46 +08:00
Zheng Yang
ad446e7a06 HDMI: add dts node "rockchip,defaultmode" to define HDMI default output mode.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-03-26 16:32:30 +08:00
xubilv
f62320a527 mipi: rk3368 support power domain - pd_mipi_dsi.
Signed-off-by: xubilv <xbl@rock-chips.com>
2015-03-25 19:57:40 +08:00
Huang, Tao
83e32fc6d7 Merge branch develop-3.10 2015-03-25 19:10:16 +08:00
xubilv
21641b5251 mipi: correct coding style error of rk32_mipi_dsi.c
Signed-off-by: xubilv <xbl@rock-chips.com>
2015-03-25 19:05:55 +08:00
Zheng Yang
9219a888ca 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>
2015-03-25 18:55:39 +08:00
Zheng Yang
04aca3a563 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>
2015-03-25 18:46:56 +08:00
zsq
3acddcb19f add rga2 pd_clk support 2015-03-25 17:09:26 +08:00
xxh
428053ce3e update 8723bu wifi driver
1.Improve_P2P_compatibility for Android L
2.Fix_HiddenAP_handle
3.P2P ScanSparse For Miracas
2015-03-25 12:19:16 +08:00
zxl
2a14944523 RK3368 GPU version: L0.10
Init Power Rogue DDK code

Signed-off-by: zxl <zhuangxl@rock-chips.com>
2015-03-25 11:19:31 +08:00
Xiao Feng
8d9dca881a rk3368: dvfs: add temperature control
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-03-24 21:33:35 +08:00
David Wu
a17bd5024b rk3368: pwm: add pwm interface for cabc
Signed-off-by: David Wu <wdc@rock-chips.com>
2015-03-24 20:17:42 +08:00
hjc
4d7a30ed54 rk3368 lcdc: CABC regulation pwm in frame start
Signed-off-by: hjc <hjc@rock-chips.com>
2015-03-24 20:16:55 +08:00
hjc
fe446ccbbb rk3368 dts: add backlight node into lcdc
Signed-off-by: hjc <hjc@rock-chips.com>
2015-03-24 20:13:06 +08:00
hjc
b29d71fa51 rk fb: add lut for CABC
Signed-off-by: hjc <hjc@rock-chips.com>
2015-03-24 19:57:36 +08:00
hjc
7d2b052260 rk fb: only use iommu need to check config
Signed-off-by: hjc <hjc@rock-chips.com>
2015-03-24 19:56:41 +08:00
hjc
13821b1828 rk fb: add lut for CABC
Signed-off-by: hjc <hjc@rock-chips.com>
2015-03-24 19:03:13 +08:00
hjc
a35b4daa1f rk fb: only use iommu need to check config
Signed-off-by: hjc <hjc@rock-chips.com>
2015-03-24 19:03:12 +08:00
hwg
5478bf8d59 disabled gmac as default in rk3368.dtsi 2015-03-24 15:58:26 +08:00
guoyi
04d0060017 sensor: add mpu6500 accel support 2015-03-24 14:32:56 +08:00
dalon.zhang
65fc4e7a4a rk3368📷 change aclk_isp from <&gates17 0> to <&gates16 0>. 2015-03-24 14:07:37 +08:00
hwg
03d0ce412c default disable gmac in rk3368-p9_818.dts 2015-03-24 11:45:13 +08:00
dkl
942f28b157 dts: rk3368: enable fclk_mcu\stclk_mcu\clk_jtag temporarily
Signed-off-by: dkl <dkl@rock-chips.com>
2015-03-23 18:15:41 +08:00
Huang, Tao
1c35ef9a2e arm64: rockchip: update rockchip_defconfig by savedefconfig
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-03-23 18:14:24 +08:00
Huang, Tao
bd13437c1b arm64: rockchip: rockchip_defconfig enable DEBUG_INFO
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-03-23 18:13:13 +08:00
Huang, Tao
a26084749b Merge branch develop-3.10
Conflicts:
	arch/arm/mach-rockchip/dvfs.c
2015-03-23 17:59:35 +08:00
lyz
6188958f03 usb: dwc_otg: fix bug in FORCE_HOST_MODE 2015-03-23 17:42:28 +08:00
lyz
a1b3f0ccb9 rk3368: usb: adjust usb phy parameter 2015-03-23 17:42:25 +08:00
Huang, Tao
0957deed0e rk: arm64: disable set pm_power_off for compatible with old pmic driver
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-03-23 17:16:25 +08:00