firefly-linux-kernel-4.4.55.git
9 years agork fb: if uboot logo not display, there is not need to poll blank and enable iommu
hjc [Tue, 3 Mar 2015 09:00:57 +0000 (17:00 +0800)]
rk fb: if uboot logo not display, there is not need to poll blank and enable iommu

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agommc: add hclk_mmc_peri for 3368
lintao [Tue, 3 Mar 2015 06:26:03 +0000 (14:26 +0800)]
mmc: add hclk_mmc_peri for 3368

Signed-off-by: lintao <lintao@rock-chips.com>
9 years agork: ion: fix compile warnning
CMY [Tue, 3 Mar 2015 05:56:52 +0000 (13:56 +0800)]
rk: ion: fix compile warnning

Signed-off-by: CMY <cmy@rock-chips.com>
9 years agoethernet: GMAC driver for RK3368
chenzhi [Tue, 3 Mar 2015 03:54:13 +0000 (11:54 +0800)]
ethernet: GMAC driver for RK3368

Signed-off-by: chenzhi <roger.chen@rock-chips.com>
9 years agommc: 3368: midgreed WA
lintao [Mon, 2 Mar 2015 10:11:11 +0000 (18:11 +0800)]
mmc: 3368: midgreed WA

Signed-off-by: lintao <lintao@rock-chips.com>
9 years agork3368 mipi: fix the phase between the mipi clock and mipi data
chenyifu [Mon, 2 Mar 2015 09:03:57 +0000 (17:03 +0800)]
rk3368 mipi: fix the phase between the mipi clock and mipi data

The mipi screen may be no-display in rk3368 when the mipi rate
higher than 900M, so we need to fix the phase between the clock and data.

Signed-off-by: chenyifu <chenyf@rock-chips.com>
9 years agork3368 lcdc: init pixclock when uboot logo on is open, it is need by DSI
hjc [Mon, 2 Mar 2015 07:25:38 +0000 (15:25 +0800)]
rk3368 lcdc: init pixclock when uboot logo on is open, it is need by DSI

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork: uboot_mem_reserve: lost a '=' in 'if' statement
CMY [Mon, 2 Mar 2015 07:42:55 +0000 (15:42 +0800)]
rk: uboot_mem_reserve: lost a '=' in 'if' statement

9 years agoarm64: mm: reserve memory region for uboot
CMY [Mon, 2 Mar 2015 03:44:54 +0000 (11:44 +0800)]
arm64: mm: reserve memory region for uboot

Signed-off-by: CMY <cmy@rock-chips.com>
9 years agork: uboot_mem_reserve: fix print format
CMY [Mon, 2 Mar 2015 03:33:35 +0000 (11:33 +0800)]
rk: uboot_mem_reserve: fix print format

Signed-off-by: CMY <cmy@rock-chips.com>
9 years agork3368: iommu: fix 32bit iommu work error in 64bit kernel
Simon [Tue, 6 Jan 2015 06:13:31 +0000 (14:13 +0800)]
rk3368: iommu: fix 32bit iommu work error in 64bit kernel

unsigned long has 8bytes in 64bit kernel,Maybach iommu each entry
both dte and pte has 4bytes,so we can not use unsigned long type
to define the entry address,otherwise,wrong page table will be set up,
that will cause page fault.So,replace unsigned long with unsigned int to
define the entry address

Signed-off-by: Simon <xxm@rock-chips.com>
9 years agork3368 codec : add support for codec es8316
smj [Mon, 2 Mar 2015 02:33:08 +0000 (10:33 +0800)]
rk3368 codec : add support for codec es8316

Signed-off-by: smj <smj@rock-chips.com>
9 years agork3368: p9_dts: add lcd_en delay time
guoyi [Sat, 28 Feb 2015 08:57:06 +0000 (16:57 +0800)]
rk3368: p9_dts: add lcd_en delay time

9 years agork3368 lcdc: fix fbdc addr config error
hjc [Sat, 28 Feb 2015 07:09:28 +0000 (15:09 +0800)]
rk3368 lcdc: fix fbdc addr config error

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork: ion: allow the cacheable buffer to map iommu
CMY [Fri, 27 Feb 2015 09:59:00 +0000 (17:59 +0800)]
rk: ion: allow the cacheable buffer to map iommu

Signed-off-by: CMY <cmy@rock-chips.com>
9 years agoHDMI:
Zheng Yang [Sat, 14 Feb 2015 08:22:35 +0000 (16:22 +0800)]
HDMI:
1. In DVI mode, input color and output color should be RGB[0-255];
   In HDMI mode, input color should be YCbCr;
2. For MID, HDMI is default disabled.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agohdmi: hdmiv1:
Zheng Yang [Sat, 14 Feb 2015 01:14:18 +0000 (09:14 +0800)]
hdmi: hdmiv1:
For nlpcm bitstream mode, we need to set audio
channel status nlpcm bit to 1.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agohdmi: fix set hdmi switch state error when remove hdmi.
Zheng Yang [Sat, 14 Feb 2015 00:51:54 +0000 (08:51 +0800)]
hdmi: fix set hdmi switch state error when remove hdmi.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agork3368 lcdc: inter bak register will lead to clear
hjc [Fri, 27 Feb 2015 07:39:30 +0000 (15:39 +0800)]
rk3368 lcdc: inter bak register will lead to clear
    other inter status, so when we clear inter inter
    status we should set clear register to zero.

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork31xx lvds: set clock lane enable int ttl mode
hjc [Fri, 27 Feb 2015 03:50:10 +0000 (11:50 +0800)]
rk31xx lvds: set clock lane enable int ttl mode

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork_sdmmc: speed up MMC for 3368
lintao [Fri, 27 Feb 2015 03:19:15 +0000 (11:19 +0800)]
rk_sdmmc: speed up MMC for 3368

   Test with p9-818 board, without DM for ext4 mount option.

Signed-off-by: lintao <lintao@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 agork31xx lvds: ttl mode test ok
hjc [Sat, 14 Feb 2015 11:39:58 +0000 (19:39 +0800)]
rk31xx lvds: ttl mode test ok

Signed-off-by: hjc<hjc@rock-chips.com>
9 years agork3368 lcdc: overlay mode depend on screen color mode
hjc [Sat, 14 Feb 2015 09:56:26 +0000 (17:56 +0800)]
rk3368 lcdc: overlay mode depend on screen color mode

Signed-off-by: hjc<hjc@rock-chips.com>
9 years agork: ion: assign sg's dma_length in ion allocation if CONFIG_NEED_SG_DMA_LENGTH is set
CMY [Sat, 14 Feb 2015 10:05:01 +0000 (18:05 +0800)]
rk: ion: assign sg's dma_length in ion allocation if CONFIG_NEED_SG_DMA_LENGTH is set

9 years agoARM64: dma-mapping: zero the buffer that allocate with __GFP_ZERO flags
CMY [Sat, 14 Feb 2015 08:03:06 +0000 (16:03 +0800)]
ARM64: dma-mapping: zero the buffer that allocate with __GFP_ZERO flags

9 years agoMerge branch 'develop-3.10-next' of 10.10.10.29:rk/kernel into develop-3.10-next
zsq [Fri, 13 Feb 2015 07:22:34 +0000 (15:22 +0800)]
Merge branch 'develop-3.10-next' of 10.10.10.29:rk/kernel into develop-3.10-next

9 years agoARM64: dts: act8846: ldo5 output 3.0v
Jianqun Xu [Fri, 13 Feb 2015 01:09:41 +0000 (09:09 +0800)]
ARM64: dts: act8846: ldo5 output 3.0v

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
9 years agoMerge branch develop-3.10
Huang, Tao [Fri, 13 Feb 2015 06:40:39 +0000 (14:40 +0800)]
Merge branch develop-3.10

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Conflicts:
drivers/video/rockchip/rk_fb.c

9 years agodts: rk3368.dtsi:add remotectl; add rk3368-box.dts
huangzhibao [Fri, 13 Feb 2015 02:56:26 +0000 (10:56 +0800)]
dts: rk3368.dtsi:add remotectl; add rk3368-box.dts

9 years agopower: reset: rockchip-reboot: rk3368 support reboot with argument
Huang, Tao [Thu, 12 Feb 2015 08:38:12 +0000 (16:38 +0800)]
power: reset: rockchip-reboot: rk3368 support reboot with argument

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agork3368-tb_8846.dts support wifi
hwg [Thu, 12 Feb 2015 07:23:03 +0000 (15:23 +0800)]
rk3368-tb_8846.dts support wifi

9 years agorfkill-wlan.c: support rk3368
hwg [Thu, 12 Feb 2015 07:22:38 +0000 (15:22 +0800)]
rfkill-wlan.c: support rk3368

9 years agoupdate rkwifi bcmdhd to version 1.201.34.1
hwg [Thu, 12 Feb 2015 07:21:52 +0000 (15:21 +0800)]
update rkwifi bcmdhd to version 1.201.34.1

9 years agoupdate rtl8188eu wifi driver to RTL8188EUS_linux_v4.3.0.7_12758.20141114
hwg [Thu, 12 Feb 2015 07:02:51 +0000 (15:02 +0800)]
update rtl8188eu wifi driver to RTL8188EUS_linux_v4.3.0.7_12758.20141114

9 years agousb: dwc_otg: show warning on actual buffer length larger than
lyz [Thu, 12 Feb 2015 02:16:32 +0000 (10:16 +0800)]
usb: dwc_otg: show warning on actual buffer length larger than
transfer buffer length

In this case DWC_OTG controller will over-write memory space that
not belongs to this urb, it may cause kernel crash.

Signed-off-by: lyz <lyz@rock-chips.com>
9 years agousb: ehci: fix test packet mode
lyz [Wed, 11 Feb 2015 02:59:23 +0000 (10:59 +0800)]
usb: ehci: fix test packet mode

When enter usb test packet mode the device no longer connect
normally, so stop the connect detect timer

Signed-off-by: lyz <lyz@rock-chips.com>
9 years agousb: dwc_otg: add condition judgement to filter invalid
lyz [Tue, 27 Jan 2015 07:53:53 +0000 (15:53 +0800)]
usb: dwc_otg: add condition judgement to filter invalid
disconnect interrupt

In some case, we disconnect a usb device, then usb controller
will trigger more the one disconnect interrupt, so check port
enable change bit in hprt0 to make sure just one disconnect
interrupt be handled.
here to

Signed-off-by: lyz <lyz@rock-chips.com>
9 years agousb: ehci-rockchip: fix typo
lyz [Tue, 27 Jan 2015 03:46:38 +0000 (11:46 +0800)]
usb: ehci-rockchip: fix typo

'work around' should be 'walk around'

Signed-off-by: lyz <lyz@rock-chips.com>
9 years agousb: rk3368: support wake up by usb plug
lyz [Wed, 11 Feb 2015 10:38:50 +0000 (18:38 +0800)]
usb: rk3368: support wake up by usb plug

Signed-off-by: lyz <lyz@rock-chips.com>
9 years agousb: rk3368: support usb battery charger detect
lyz [Wed, 11 Feb 2015 10:15:42 +0000 (18:15 +0800)]
usb: rk3368: support usb battery charger detect

Signed-off-by: lyz <lyz@rock-chips.com>
9 years agorockchip_defconfig: add generic EHIC and OHCI platform driver
lyz [Wed, 11 Feb 2015 10:03:28 +0000 (18:03 +0800)]
rockchip_defconfig: add generic EHIC and OHCI platform driver

9 years agork31xx lvds: update config for VOCM and VDIFF
hjc [Wed, 11 Feb 2015 09:30:59 +0000 (17:30 +0800)]
rk31xx lvds: update config for VOCM and VDIFF

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork fb: fix screen info error when in no dual mode and pull out hdmi
hjc [Wed, 11 Feb 2015 08:28:47 +0000 (16:28 +0800)]
rk fb: fix screen info error when in no dual mode and pull out hdmi

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork31xx lvds: fix lvds grf config error when disable lvds
hjc [Wed, 11 Feb 2015 08:24:34 +0000 (16:24 +0800)]
rk31xx lvds: fix lvds grf config error when disable lvds

9 years agork3368 mipi: modified the bug of dts file
chenyifu [Wed, 14 Jan 2015 08:12:07 +0000 (16:12 +0800)]
rk3368 mipi: modified the bug of dts file

The address of rk3368 is 64-bits.
Change the order of "pclk_mipi_dsi" and "pclk_mipi_dsi_host"
in order compatible with earlier code.

Signed-off-by: chenyifu <chenyf@rock-chips.com>
9 years agork3368 mipi: add mipi driver of rk3368
chenyifu [Wed, 14 Jan 2015 08:43:55 +0000 (16:43 +0800)]
rk3368 mipi: add mipi driver of rk3368

Signed-off-by: chenyifu <chenyf@rock-chips.com>
9 years agork3368: dts: fix rk3368-p9_818 err
guoyi [Wed, 11 Feb 2015 07:26:36 +0000 (15:26 +0800)]
rk3368: dts: fix rk3368-p9_818 err

9 years agoDrivers:
guoyi [Wed, 11 Feb 2015 06:00:41 +0000 (14:00 +0800)]
Drivers:
input: add gt9xx/ for goodix touchscreen.

9 years agork3368:
guoyi [Wed, 11 Feb 2015 03:13:28 +0000 (11:13 +0800)]
rk3368:
    dts: add rk3368-p9_818.dts

9 years agork fb: enable mmu when uboot-logo is 0
hjc [Wed, 11 Feb 2015 06:02:37 +0000 (14:02 +0800)]
rk fb: enable mmu when uboot-logo is 0

9 years agork fb: fix fence time out for dual display mode
hjc [Wed, 11 Feb 2015 03:54:29 +0000 (11:54 +0800)]
rk fb: fix fence time out for dual display mode

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork: last_log: version 3.1, support arm64
Huang, Tao [Tue, 10 Feb 2015 12:18:09 +0000 (20:18 +0800)]
rk: last_log: version 3.1, support arm64

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agoarm64: rockchip: rockchip_defconfig enable TEST_POWER
Huang, Tao [Tue, 10 Feb 2015 11:12:57 +0000 (19:12 +0800)]
arm64: rockchip: rockchip_defconfig enable TEST_POWER

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agork: ion: fix compilation error without CONFIG_COMPAT
Huang, Tao [Tue, 10 Feb 2015 08:48:02 +0000 (16:48 +0800)]
rk: ion: fix compilation error without CONFIG_COMPAT

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agoMerge branch develop-3.10 into develop-3.10-next
Huang, Tao [Tue, 10 Feb 2015 08:43:50 +0000 (16:43 +0800)]
Merge branch develop-3.10 into develop-3.10-next

Conflicts:
drivers/clk/rockchip/clk-ops.h
drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c
drivers/video/rockchip/rk_fb.c

9 years agoMerge tag 'lsk-v3.10-android-15.01'
Huang, Tao [Tue, 10 Feb 2015 08:24:25 +0000 (16:24 +0800)]
Merge tag 'lsk-v3.10-android-15.01'

LSK Android 15.01 v3.10

Conflicts:
arch/arm/Kconfig.debug
arch/arm64/mm/init.c
drivers/Makefile
drivers/cpufreq/cpufreq_interactive.c

9 years agodts: rk3126\rk3126b: modify VIO clocks to slove VIO idle fail problem
dkl [Tue, 10 Feb 2015 03:01:25 +0000 (11:01 +0800)]
dts: rk3126\rk3126b: modify VIO clocks to slove VIO idle fail problem

In rk3126, when aclk_vio0\aclk_vio1\hclk_vio were reparented from the
default parent gpll_div2 to gpll in clk_init, the temporary rates
are too high and may lead to failture in VIO idle_request later.
To slove this problem, VIO clocks are modified to auto select parent
and consider the order of reparent and set_div when set_rate.

Signed-off-by: dkl <dkl@rock-chips.com>
9 years agoadd usb charge config
ywj [Tue, 10 Feb 2015 01:23:33 +0000 (09:23 +0800)]
add usb charge config

9 years agork3288 hdmi: If audio source if spdif, sclk/fs should be 128x.
Zheng Yang [Mon, 9 Feb 2015 02:42:19 +0000 (10:42 +0800)]
rk3288 hdmi: If audio source if spdif, sclk/fs should be 128x.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agoHDMI: fix filter feature SUPPORT_TMDS_600M error:
Zheng Yang [Mon, 9 Feb 2015 02:40:40 +0000 (10:40 +0800)]
HDMI: fix filter feature SUPPORT_TMDS_600M error:
If soc is not support feature SUPPORT_TMDS_600M,
or current EDID information is not support the
feature, we should not show the corresponding
option, such as 3840x2160p-60.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agoi2c: fix retry_count to return error when i2c bus checkidle was low
David Wu [Sun, 8 Feb 2015 13:38:22 +0000 (21:38 +0800)]
i2c: fix retry_count to return error when i2c bus checkidle was low

Signed-off-by: David Wu <wdc@rock-chips.com>
9 years agork3368: rename pmu_grf or pmu to pmugrf
Huang, Tao [Fri, 6 Feb 2015 13:43:58 +0000 (21:43 +0800)]
rk3368: rename pmu_grf or pmu to pmugrf

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agopower: reset: rockchip-reboot: add rk3368 reboot driver
Huang, Tao [Fri, 6 Feb 2015 13:37:06 +0000 (21:37 +0800)]
power: reset: rockchip-reboot: add rk3368 reboot driver

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agork3368: cpufreq: fix compile warning
Xiao Feng [Fri, 6 Feb 2015 07:48:17 +0000 (15:48 +0800)]
rk3368: cpufreq: fix compile warning

Signed-off-by: Xiao Feng <xf@rock-chips.com>
9 years agorfkill-wlan.c: solve null point panic when wifi_chip_type is not define in dts
hwg [Thu, 5 Feb 2015 02:51:07 +0000 (10:51 +0800)]
rfkill-wlan.c: solve null point panic when wifi_chip_type is not define in dts

9 years agowifi->esp8089:
li bing [Tue, 3 Feb 2015 07:31:46 +0000 (15:31 +0800)]
wifi->esp8089:
       ESP8089 driver update to V1.9.1(30/01/2015);
       Update the V2.4 esp_prealloc program.

9 years agohdmi:
Zheng Yang [Tue, 3 Feb 2015 07:51:18 +0000 (15:51 +0800)]
hdmi:
1. fix 3288 hdmi audio source select error.
2. For mid, it need to call rk_fb_get_display_policy
   to reset overscan after swichting vop timing.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agork3288: modify to ensure pairwise call of clk_enable\disable
dkl [Tue, 3 Feb 2015 06:15:27 +0000 (14:15 +0800)]
rk3288: modify to ensure pairwise call of clk_enable\disable
        in rk3288_pll_early_suspend_notifier_call

Signed-off-by: dkl <dkl@rock-chips.com>
9 years agohdmi: depends on DRM_ROCKCHIP and fix document error.
Zheng Yang [Mon, 2 Feb 2015 07:04:21 +0000 (15:04 +0800)]
hdmi: depends on DRM_ROCKCHIP and fix document error.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agodts: fix compile err
lintao [Mon, 2 Feb 2015 03:26:48 +0000 (11:26 +0800)]
dts: fix compile err

Signed-off-by: lintao <lintao@rock-chips.com>
9 years agohdmi: update driver to v2.0:
Zheng Yang [Mon, 2 Feb 2015 03:06:04 +0000 (11:06 +0800)]
hdmi: update driver to v2.0:
1. Rename rk3036 hdmi to rockchip_hdmiv1, support hdmi v1.4;
2. Rename rk3288 hdmi to rockchip_hdmiv2, support hdmi v2.0;
3. Support transmmit 3D picture.
4. 3288 hdmi support HDCP, CEC and TMDSCLK 600M.
5. HDMI video source default is LCDC0, it can be modified in dts by
   follow:
    rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC1>;
   HDCP and CEC function default is disabled , it can be enabled in
   dts file by follow:
    rockchip,hdcp_enable = <1>;
    rockchip,cec_enable = <1>;
   More information please see
Documentation/devicetree/bindings/video/rockchip_hdmi.txt

9 years agodts: rk312x: default enable emmc
lintao [Mon, 2 Feb 2015 02:21:25 +0000 (10:21 +0800)]
dts: rk312x: default enable emmc

Signed-off-by: lintao <lintao@rock-chips.com>
9 years agommc: add more waiting for erase and status op
lintao [Mon, 26 Jan 2015 01:57:11 +0000 (09:57 +0800)]
mmc: add more waiting for erase and status op

9 years agork3288 hdmi: add cec clk and pinctrl.
Zheng Yang [Sun, 1 Feb 2015 08:28:03 +0000 (16:28 +0800)]
rk3288 hdmi: add cec clk and pinctrl.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agork3288 hdmi:
Zheng Yang [Sun, 1 Feb 2015 08:24:58 +0000 (16:24 +0800)]
rk3288 hdmi:
To improve stability of reading EDID, we need to
disable HDMI ddc GPIO internal pull up.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agocamera: oneframe v0.1.e
zyc [Fri, 30 Jan 2015 01:42:23 +0000 (09:42 +0800)]
camera: oneframe v0.1.e

9 years agosolve rfkill-wlan driver kernel panic when rfkill-bt driver probe fail
hwg [Thu, 29 Jan 2015 09:29:03 +0000 (17:29 +0800)]
solve rfkill-wlan driver kernel panic when rfkill-bt driver probe fail

9 years agoWifi->rtl8812au: add chip name /sys/class/rkwifi/chip for RTL8812BU
li bing [Thu, 29 Jan 2015 07:01:37 +0000 (15:01 +0800)]
Wifi->rtl8812au: add chip name /sys/class/rkwifi/chip for RTL8812BU

9 years agoWifi->rtl8723au: update dirver to version 4.00(4.1.11_12622.20141215).
li bing [Thu, 29 Jan 2015 06:09:41 +0000 (14:09 +0800)]
Wifi->rtl8723au: update dirver to version 4.00(4.1.11_12622.20141215).

9 years agork312x codec: fix rk312x codec switch state error
smj [Thu, 29 Jan 2015 00:51:26 +0000 (08:51 +0800)]
rk312x codec: fix rk312x codec switch state error

Signed-off-by: lxt <lxt@rock-chips.com>
9 years agomodify display-sys.c and display-sys.h code style.
Zheng Yang [Wed, 28 Jan 2015 10:13:37 +0000 (18:13 +0800)]
modify display-sys.c and display-sys.h code style.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
9 years agork3128: hdmi: add disable clock when system shutdown
zwl [Wed, 28 Jan 2015 07:50:05 +0000 (15:50 +0800)]
rk3128: hdmi: add disable clock when system shutdown

disable clock will call disable power domain.
hdmi and lcdc share the power domain, so they must disable
the power domain when system shutdown.

Signed-off-by: zwl <zwl@rockchips.com>
9 years agorockchip: iommu: skip rk312x vop mmu stall operation,mask rk312x vop mmu interrupt
Simon [Wed, 28 Jan 2015 07:30:26 +0000 (15:30 +0800)]
rockchip: iommu: skip rk312x vop mmu stall operation,mask rk312x vop mmu interrupt

Video stress test failed, may have something relationship to vop mmu stall operation
skip it as a workaround

Reboot stress test failed, error showed a large number of vop/vop mmu interrupt,mask
vop mmu interrupt to avoid reboot stress test failed in rk312x

Signed-off-by: Simon <xxm@rock-chips.com>
9 years agocamera: camsys_drv:v0.0x1b.0 oneframe:v0.1.0xd
zyc [Wed, 28 Jan 2015 03:24:21 +0000 (11:24 +0800)]
camera: camsys_drv:v0.0x1b.0 oneframe:v0.1.0xd

9 years agork312x: fix usb otg camera issues
dalon.zhang [Wed, 28 Jan 2015 02:12:32 +0000 (10:12 +0800)]
rk312x: fix usb otg camera issues

9 years agomali_400_driver :
chenzhen [Mon, 26 Jan 2015 08:10:22 +0000 (16:10 +0800)]
mali_400_driver :
use mod_timer in mali_control_timer_callback_chain.
upgrade rk_ko_ver to 3.

9 years agork312x, mali_400_driver : ammend rk_ko_ver.txt.
chenzhen [Wed, 7 Jan 2015 06:30:56 +0000 (14:30 +0800)]
rk312x, mali_400_driver : ammend rk_ko_ver.txt.

9 years ago Support 1.5GB and 3GB with 2CS on the DDR1 channel
hcy [Mon, 26 Jan 2015 01:13:52 +0000 (09:13 +0800)]
Support 1.5GB and 3GB with 2CS on the DDR1 channel

9 years agoMerge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Mark Brown [Sat, 24 Jan 2015 11:54:15 +0000 (11:54 +0000)]
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

9 years agoMerge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
Mark Brown [Fri, 23 Jan 2015 20:36:05 +0000 (20:36 +0000)]
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

Conflicts:
arch/arm64/include/asm/proc-fns.h
arch/arm64/kernel/debug-monitors.c
arch/arm64/kernel/psci.c

9 years agoarm64: add atomic pool for non-coherent and CMA allocations
Laura Abbott [Thu, 9 Oct 2014 22:26:44 +0000 (15:26 -0700)]
arm64: add atomic pool for non-coherent and CMA allocations

Neither CMA nor noncoherent allocations support atomic allocations.
Add a dedicated atomic pool to support this.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Riley <davidriley@chromium.org>
Cc: Olof Johansson <olof@lixom.net>
Cc: Ritesh Harjain <ritesh.harjani@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit d4932f9e81ae7a7bf3c3967e48373909b9c98ee5)
Signed-off-by: Mark Brown <broonie@kernel.org>
9 years agoMerge remote-tracking branch 'lsk/v3.10/topic/dma-mapping' into lsk-v3.10-arm64-misc
Mark Brown [Fri, 23 Jan 2015 20:27:25 +0000 (20:27 +0000)]
Merge remote-tracking branch 'lsk/v3.10/topic/dma-mapping' into lsk-v3.10-arm64-misc

9 years agoRevert "arm64: vdso: move to _install_special_mapping and remove arch_vma_name"
Mark Brown [Fri, 23 Jan 2015 20:15:32 +0000 (20:15 +0000)]
Revert "arm64: vdso: move to _install_special_mapping and remove arch_vma_name"

This reverts commit 95c91bdd8eafdc74337049c45d74c903b7dac49c.

Signed-off-by: Mark Brown <broonie@kernel.org>
9 years agoRevert "arm64: vdso: move data page before code pages"
Mark Brown [Fri, 23 Jan 2015 20:15:15 +0000 (20:15 +0000)]
Revert "arm64: vdso: move data page before code pages"

This reverts commit 82a95d0521cb6258559d18dca736da8272ba05a7.

Signed-off-by: Mark Brown <broonie@kernel.org>
9 years agoMerge remote-tracking branch 'lsk/v3.10/topic/coresight' into linux-linaro-lsk
Mark Brown [Fri, 23 Jan 2015 12:09:02 +0000 (12:09 +0000)]
Merge remote-tracking branch 'lsk/v3.10/topic/coresight' into linux-linaro-lsk

9 years agoARM: Revert "coresight: adding basic support for Vexpress TC2"
Mark Brown [Fri, 23 Jan 2015 12:04:03 +0000 (12:04 +0000)]
ARM: Revert "coresight: adding basic support for Vexpress TC2"

This reverts commit 63041eff2297676a345478c2b1cc6f76c63102db.  For some
reason this is causing failures before the serial console comes up on
TC2 when booted using UEFI, revert pending investigation.

Signed-off-by: Mark Brown <broonie@kernel.org>
9 years agoMerge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Mark Brown [Fri, 23 Jan 2015 11:59:22 +0000 (11:59 +0000)]
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

9 years agoMerge remote-tracking branch 'lsk/linux-linaro-lsk' into linux-linaro-lsk
Mark Brown [Fri, 23 Jan 2015 11:59:17 +0000 (11:59 +0000)]
Merge remote-tracking branch 'lsk/linux-linaro-lsk' into linux-linaro-lsk

9 years agoMerge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Mark Brown [Fri, 23 Jan 2015 11:33:35 +0000 (11:33 +0000)]
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android