dalon.zhang [Wed, 4 Mar 2015 13:40:28 +0000 (21:40 +0800)]
camera:
camsys_drv: v0.0x1c.0
oneframe: v0.2.0
pingpong: v0.1.a
Conflicts:
drivers/media/video/rk_camsys/camsys_gpio.h
drivers/media/video/rk_camsys/camsys_internal.h
drivers/media/video/rk_camsys/camsys_soc_priv.c
include/linux/rockchip/cru.h
Jianqun Xu [Wed, 4 Mar 2015 10:30:30 +0000 (18:30 +0800)]
rk3368: rk818: enable HDMI 5V
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Jianqun Xu [Wed, 4 Mar 2015 09:58:53 +0000 (17:58 +0800)]
rk3368: rk818 battery: allow capacity to be negative value
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
smj [Wed, 4 Mar 2015 08:14:50 +0000 (16:14 +0800)]
rk3368 codec : fix the es8316 codec capture gain
Signed-off-by: smj <smj@rock-chips.com>
hjc [Wed, 4 Mar 2015 08:16:47 +0000 (16:16 +0800)]
rk fb: in no_dual mode, dsp parameter according to user setting
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Wed, 4 Mar 2015 07:25:26 +0000 (15:25 +0800)]
rk3368 lcdc: add support overscan
Signed-off-by: hjc <hjc@rock-chips.com>
guoyi [Wed, 4 Mar 2015 07:02:37 +0000 (15:02 +0800)]
rk3368-p9: backlight: Polarity reversal
hwg [Wed, 4 Mar 2015 02:49:13 +0000 (10:49 +0800)]
support different wifi bt chip auto compatible, modify
arch/arm64/boot/dts/rk3368-p9_818.dts, arch/arm64/boot/dts/rk3368-tb_8846.dts
hwg [Wed, 4 Mar 2015 02:46:28 +0000 (10:46 +0800)]
Revert "support different wifi bt chip auto compatible"
This reverts commit
2506d1678c7f5ed228e2a7ed4130a5f9ede641db.
hwg [Wed, 4 Mar 2015 02:44:44 +0000 (10:44 +0800)]
support different wifi bt chip auto compatible
arch/arm64/boot/dts/rk3368-p9_818.dts
arch/arm64/boot/dts/rk3368-tb_8846.dts
hwg [Wed, 4 Mar 2015 02:37:27 +0000 (10:37 +0800)]
solve make clean error causeed by wifi driver
hwg [Tue, 3 Mar 2015 09:56:58 +0000 (17:56 +0800)]
rfkill-wlan.c use CONFIG_MFD_SYSCON to compatible rk3368 and rk3288
hwg [Sat, 28 Feb 2015 09:06:56 +0000 (17:06 +0800)]
remove unused wifi driver: rda5990, mt5931, mt7601, mt6620
hwg [Sat, 28 Feb 2015 06:05:32 +0000 (14:05 +0800)]
support different wifi bt chip auto compatible
like auto recognize rtl8188eu, ap6210, esp8089 in android
Conflicts:
drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
net/rfkill/rfkill-wlan.c
lintao [Tue, 3 Mar 2015 13:09:54 +0000 (21:09 +0800)]
mmc: rk_sdmmc: doesn't enforce hpclk to be used
Signed-off-by: lintao <lintao@rock-chips.com>
hwg [Tue, 3 Mar 2015 09:56:58 +0000 (17:56 +0800)]
rfkill-wlan.c use CONFIG_MFD_SYSCON to compatible rk3368 and rk3288
hwg [Thu, 12 Feb 2015 07:22:38 +0000 (15:22 +0800)]
rfkill-wlan.c: support rk3368
Conflicts:
net/rfkill/rfkill-wlan.c
hwg [Thu, 12 Feb 2015 07:21:52 +0000 (15:21 +0800)]
update rkwifi bcmdhd to version 1.201.34.1
Conflicts:
drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
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>
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>
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>
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>
lintao [Mon, 2 Mar 2015 10:11:11 +0000 (18:11 +0800)]
mmc: 3368: midgreed WA
Signed-off-by: lintao <lintao@rock-chips.com>
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>
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>
CMY [Mon, 2 Mar 2015 07:42:55 +0000 (15:42 +0800)]
rk: uboot_mem_reserve: lost a '=' in 'if' statement
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>
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>
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>
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>
lintao [Mon, 2 Mar 2015 01:25:57 +0000 (09:25 +0800)]
mmc: replace tSD enumaration machanism
Remove dt property "support-tSD" and combine "support-emmc" with
"support-sd" in together for tSD/emmc distinguish by mmc core. More details
please refer to arch/arm/boot/dts/rk3288-tb.dts
Signed-off-by: lintao <lintao@rock-chips.com>
Sugar Zhang [Mon, 2 Mar 2015 00:50:41 +0000 (08:50 +0800)]
rockchip: i2s: use subysys_initcall_sync for probe.
because some codecs initialization depends on i2s mclk.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
dalon.zhang [Sat, 28 Feb 2015 11:16:21 +0000 (19:16 +0800)]
camsys_drv: v0.0x1c.0
dalon.zhang [Sat, 28 Feb 2015 11:09:34 +0000 (19:09 +0800)]
camera:
oneframe: v0.2.0
pingpong: v0.1.a
hwg [Sat, 28 Feb 2015 09:06:56 +0000 (17:06 +0800)]
remove unused wifi driver: rda5990, mt5931, mt7601, mt6620
guoyi [Sat, 28 Feb 2015 08:57:06 +0000 (16:57 +0800)]
rk3368: p9_dts: add lcd_en delay time
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>
hwg [Sat, 28 Feb 2015 06:05:32 +0000 (14:05 +0800)]
support different wifi bt chip auto compatible
like auto recognize rtl8188eu, ap6210, esp8089 in android
hwg [Sat, 28 Feb 2015 06:03:13 +0000 (14:03 +0800)]
support different wifi bt chip auto compatible
modify arch/arm/boot/dts/rk3128-86v.dts
hwg [Sat, 28 Feb 2015 06:02:56 +0000 (14:02 +0800)]
support different wifi bt chip auto compatible
modify arch/arm/boot/dts/rk3126-86v.dts
hwg [Sat, 28 Feb 2015 05:59:24 +0000 (13:59 +0800)]
support different wifi bt chip auto compatible
Attention: this is only for android 5.0, not compatible for android 4.4, meaning can't compatible for 4.4 after this commit
modify arch/arm/boot/dts/rk3288-tb_8846.dts
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>
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>
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>
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>
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>
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>
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>
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>
dkl [Thu, 26 Feb 2015 01:44:34 +0000 (09:44 +0800)]
rk312x/rk3036: not change aclk_core_div for stability
In rk312x/rk3036, do not change aclk_core_div for stability.
Also remove some unusued macros and codes.
Signed-off-by: dkl <dkl@rock-chips.com>
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>
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>
dalon.zhang [Sat, 14 Feb 2015 10:18:09 +0000 (18:18 +0800)]
camera: oneframe v0.1.f
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
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>
CMY [Sat, 14 Feb 2015 08:03:06 +0000 (16:03 +0800)]
ARM64: dma-mapping: zero the buffer that allocate with __GFP_ZERO flags
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>
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>
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
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>
hwg [Fri, 13 Feb 2015 07:02:37 +0000 (15:02 +0800)]
update rtl8189es wifi driver to rtl8189ES_linux_v4.3.10.1_13373.
20150129
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
huangzhibao [Fri, 13 Feb 2015 02:56:26 +0000 (10:56 +0800)]
dts: rk3368.dtsi:add remotectl; add rk3368-box.dts
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>
hwg [Thu, 12 Feb 2015 07:23:03 +0000 (15:23 +0800)]
rk3368-tb_8846.dts support wifi
hwg [Thu, 12 Feb 2015 07:22:38 +0000 (15:22 +0800)]
rfkill-wlan.c: support rk3368
hwg [Thu, 12 Feb 2015 07:21:52 +0000 (15:21 +0800)]
update rkwifi bcmdhd to version 1.201.34.1
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
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>
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>
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>
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>
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>
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>
lyz [Wed, 11 Feb 2015 10:03:28 +0000 (18:03 +0800)]
rockchip_defconfig: add generic EHIC and OHCI platform driver
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>
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>
hjc [Wed, 11 Feb 2015 08:24:34 +0000 (16:24 +0800)]
rk31xx lvds: fix lvds grf config error when disable lvds
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>
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>
guoyi [Wed, 11 Feb 2015 07:26:36 +0000 (15:26 +0800)]
rk3368: dts: fix rk3368-p9_818 err
guoyi [Wed, 11 Feb 2015 06:00:41 +0000 (14:00 +0800)]
Drivers:
input: add gt9xx/ for goodix touchscreen.
guoyi [Wed, 11 Feb 2015 03:13:28 +0000 (11:13 +0800)]
rk3368:
dts: add rk3368-p9_818.dts
hjc [Wed, 11 Feb 2015 06:02:37 +0000 (14:02 +0800)]
rk fb: enable mmu when uboot-logo is 0
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>
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>
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>
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>
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
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
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>
ywj [Tue, 10 Feb 2015 01:23:33 +0000 (09:23 +0800)]
add usb charge config
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>
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>
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>
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>
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>
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>
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
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.
projects / firefly-linux-kernel-4.4.55.git / log