yxj [Thu, 11 Dec 2014 07:45:57 +0000 (15:45 +0800)]
video: rockchip: rk32_dp: add support for rk3368
Signed-off-by: yxj <yxj@rock-chips.com>
yxj [Thu, 11 Dec 2014 06:49:51 +0000 (14:49 +0800)]
video: rockchip: rk32_dp: covert dsb() to dsb(sy)
Signed-off-by: yxj <yxj@rock-chips.com>
Huang, Tao [Tue, 16 Dec 2014 12:55:58 +0000 (20:55 +0800)]
Revert "rk32 dp: port to rk3368"
This reverts commit
b8fdfeb2cfeec753b23236584e9e24b1f3be83c1.
hjc [Tue, 16 Dec 2014 01:44:58 +0000 (09:44 +0800)]
rk3368 lcdc: 1.add YUV domain overlay config; 2.edp force rgb888 output; 3.add 1.8 IO domain selete;
Signed-off-by: hjc <hjc@rock-chips.com>
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>
hjc [Tue, 16 Dec 2014 02:00:17 +0000 (10:00 +0800)]
rk3368 lcdc: update gamma lut 10bit to 8bit
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Mon, 15 Dec 2014 04:52:59 +0000 (12:52 +0800)]
rk31xx lvds: set iomux for lvds ttl mode
Signed-off-by: hjc <hjc@rock-chips.com>
Huang, Tao [Tue, 16 Dec 2014 12:36:30 +0000 (20:36 +0800)]
Merge branch develop-3.10 into develop-3.10-next
ljf [Tue, 16 Dec 2014 11:56:18 +0000 (19:56 +0800)]
iep driver:
get rid of kfree buffer which allocated using devm_kzalloc.
Signed-off-by: ljf <ljf@rock-chips.com>
yxj [Mon, 15 Dec 2014 11:35:44 +0000 (19:35 +0800)]
reset: rockchip: load as subsys_initcall_sync
rockchip reset control should probe before edp
Signed-off-by: yxj <yxj@rock-chips.com>
David Wu [Mon, 15 Dec 2014 09:42:53 +0000 (17:42 +0800)]
rk3368: pinctrl: add hdmi-i2c-xfer
Signed-off-by: David Wu <wdc@rock-chips.com>
zsq [Mon, 15 Dec 2014 09:24:31 +0000 (17:24 +0800)]
remove rga driver mmu buf malloc to prevent crash
dalon.zhang [Mon, 15 Dec 2014 08:25:18 +0000 (16:25 +0800)]
camera: UVC: fix UVC interrupt and other issues
cl [Mon, 15 Dec 2014 01:09:09 +0000 (09:09 +0800)]
rk312x: miss the new file rk3126.dtsi&&3128.dtsi for the commit
c59e8d086aaf89d0f48351ff7287708b57e5aba1(rk312x: adjust dts relation)
Signed-off-by: cl <cl@rock-chips.com>
Huang, Tao [Sat, 13 Dec 2014 14:12:26 +0000 (22:12 +0800)]
arm64: rockchip: rk3368 disable qos init temporarily
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
dkl [Sat, 13 Dec 2014 12:55:04 +0000 (20:55 +0800)]
rk3368: clk: fix rk3368 apllb/aplll set_rate
After rk3368 apllb/aplll change settings, set the divider of core back to 1.
Signed-off-by: dkl <dkl@rock-chips.com>
Huang, Tao [Sat, 13 Dec 2014 10:05:41 +0000 (18:05 +0800)]
arm64: rockchip: rockchip_defconfig enable RK31XX_LVDS RK32_DP
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
hjc [Sat, 13 Dec 2014 09:37:08 +0000 (17:37 +0800)]
ion: ino reserve
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Sat, 13 Dec 2014 09:34:45 +0000 (17:34 +0800)]
rk32 dp: port to rk3368
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Sat, 13 Dec 2014 09:20:43 +0000 (17:20 +0800)]
rk31xx lvds: add lvds grf config
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Sat, 13 Dec 2014 09:41:25 +0000 (17:41 +0800)]
rk3368 lcdc: 1.delete force vop output aaa mode in hdmi and edp mode; 2.not to control power domain.
Signed-off-by: hjc <hjc@rock-chips.com>
Huang, Tao [Sat, 13 Dec 2014 07:18:26 +0000 (15:18 +0800)]
arm64: rockchip: rockchip_defconfig disable MMC_DW_IDMAC temporarily
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
dkl [Sat, 13 Dec 2014 04:27:04 +0000 (12:27 +0800)]
rk3368: dts: init gpll rate before clk_core_b and clk_core_l
It's better to init gpll rate before clk_core_b and clk_core_l,
because gpll will be used when clk_core_b and clk_core_l change rate.
Signed-off-by: dkl <dkl@rock-chips.com>
dkl [Sat, 13 Dec 2014 04:00:23 +0000 (12:00 +0800)]
rk3368: clk: fix rk3368 apll set_rate
In rk3368, apll enter slow mode before changing settings
and return to normal mode after changing settings.
Signed-off-by: dkl <dkl@rock-chips.com>
Huang, Tao [Sat, 13 Dec 2014 04:58:06 +0000 (12:58 +0800)]
arm64: rockchip: rockchip_defconfig enable some ARM64 feature
+DISABLE_CPU_SCHED_DOMAIN_BALANCE
+SCHED_HMP
+HMP_VARIABLE_SCALE
+HMP_FREQUENCY_INVARIANT_SCALE
+SCHED_HMP_LITTLE_PACKING
+ARM_BIG_LITTLE_CPUFREQ
+ARM_DT_BL_CPUFREQ
+ARM64_CPUIDLE
+SERIAL_ROCKCHIP_CONSOLE
+RK30_CAMERA_ONEFRAME
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Huang, Tao [Sat, 13 Dec 2014 04:55:21 +0000 (12:55 +0800)]
arm64: rockchip: fix tb_8846 boot
uart_dbg status default disabled
disabe wireless-wlan
bootargs remove vmalloc=512M console=ttyS2
remove memory node
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
chenzhen [Thu, 11 Dec 2014 07:11:57 +0000 (15:11 +0800)]
rk, gpu :
source code for device/rockchip/common/gpu/libMali-T760/mali_kbase.ko,
in branch rk/rk32/mid/5.0/develop,
commit
1b187041f11b7ca1d6c1490b934f09648f334a19.
cl [Fri, 12 Dec 2014 09:59:56 +0000 (17:59 +0800)]
rk312x: adjust dts relation
Signed-off-by: cl <cl@rock-chips.com>
Huang, Tao [Fri, 12 Dec 2014 09:03:20 +0000 (17:03 +0800)]
arm64: rockchip: add rk3368-tb_8846.dts
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Huang, Tao [Fri, 12 Dec 2014 09:02:35 +0000 (17:02 +0800)]
arm64: rockchip: rk3368.dtsi add more configure
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
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>
dkl [Thu, 11 Dec 2014 12:08:22 +0000 (20:08 +0800)]
rk3368: clk: add CLKOPS_RATE_RK3368_DCLK_LCDC for dclk_vop0
Signed-off-by: dkl <dkl@rock-chips.com>
dkl [Thu, 11 Dec 2014 06:38:26 +0000 (14:38 +0800)]
rk3368: dts: clk: fix some errors
Adjust vip clks, rename clk_gpu_core "clk_gpu" and remove wrong clk4x_ddr.
Signed-off-by: dkl <dkl@rock-chips.com>
Huang, Tao [Fri, 12 Dec 2014 06:12:56 +0000 (14:12 +0800)]
Merge branch develop-3.10 into develop-3.10-next
Huang, Tao [Fri, 12 Dec 2014 06:11:55 +0000 (14:11 +0800)]
Revert "rk3368 lcdc: support win mirror and update NO_DUAL mode"
This reverts commit
fd18d428fa43fba8f42c6be7649cd857263c8c8e.
Huang, Tao [Fri, 12 Dec 2014 04:14:01 +0000 (12:14 +0800)]
ARM: rk: build resource.img with logo_kernel.bmp
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
dkl [Fri, 12 Dec 2014 03:27:21 +0000 (11:27 +0800)]
rk3368: reset: add soft_reset id
Signed-off-by: dkl <dkl@rock-chips.com>
hjc [Fri, 12 Dec 2014 02:41:03 +0000 (10:41 +0800)]
rk fb: delete unused message
Signed-off-by: hjc <hjc@rock-chips.com>
zyc [Fri, 12 Dec 2014 03:40:23 +0000 (11:40 +0800)]
cif: set CONFIG_RK30_CAMERA_ONEFRAME default as yes in rockchip_defconfig
dkl [Fri, 12 Dec 2014 02:38:00 +0000 (10:38 +0800)]
clk: rockchip: fix some code style problems in clk-pll.c
Signed-off-by: dkl <dkl@rock-chips.com>
dkl [Fri, 12 Dec 2014 02:25:26 +0000 (10:25 +0800)]
clk: rockchip: fix pll_clk_get_best_set() for rk3188plus type pll
When selecting a best setting for rk3188plus type pll, consider a
larger NO first(means larger VCO freq), and a smaller NR later.
Signed-off-by: dkl <dkl@rock-chips.com>
lyz [Wed, 10 Dec 2014 14:24:38 +0000 (22:24 +0800)]
rk32: disabled ohci in dt
lyz [Wed, 10 Dec 2014 14:23:46 +0000 (22:23 +0800)]
ARM: rockchip: rockchip_defconfig add USB_OHCI_HCD
lyz [Wed, 10 Dec 2014 14:18:58 +0000 (22:18 +0800)]
rk312x: add support for ehci to all rk312x series
lyz [Wed, 10 Dec 2014 07:57:17 +0000 (15:57 +0800)]
rk32: ehci: work-around for abnormal ohci
lyz [Wed, 10 Dec 2014 07:40:21 +0000 (15:40 +0800)]
Revert "USB: Fix EHCI bug if connect with FS or LS device."
This reverts commit
f65cb6fc5a364f0efba4fc9f0039c4ddb34ef4dd.
hjc [Thu, 11 Dec 2014 04:40:01 +0000 (12:40 +0800)]
rk fb: box is use NO_DUAL mode,so fb have to disable dsp_black
Signed-off-by: hjc <hjc@rock-chips.com>
Huang, Tao [Thu, 11 Dec 2014 06:23:00 +0000 (14:23 +0800)]
rk: Makefile set default CROSS_COMPILE when ARCH is arm64
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Mark Yao [Thu, 11 Dec 2014 05:49:03 +0000 (13:49 +0800)]
rk_fb: logo: get kernel logo addr from protect memory region
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
CMY [Thu, 11 Dec 2014 04:58:09 +0000 (12:58 +0800)]
rk: mem: protect memory region that specified by uboot on kernel booting
CMY [Thu, 11 Dec 2014 04:53:29 +0000 (12:53 +0800)]
rk: ion: cma reserve 640MB at anywhere by default on rk32xx
Huang, Tao [Thu, 11 Dec 2014 04:44:50 +0000 (12:44 +0800)]
rk: arm64: support build kernel.img and resource.img
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Huang, Tao [Wed, 10 Dec 2014 12:15:52 +0000 (20:15 +0800)]
ARM64: rockchip: rockchip_defconfig disable HDMI_RK3288
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
hjc [Wed, 10 Dec 2014 02:33:51 +0000 (10:33 +0800)]
rk3368 lcdc: support win mirror and update NO_DUAL mode
Signed-off-by: hjc <hjc@rock-chips.com>
Huang, Tao [Wed, 10 Dec 2014 12:09:28 +0000 (20:09 +0800)]
Merge branch develop-3.10 into develop-3.10-next
Huang, Tao [Wed, 10 Dec 2014 11:57:14 +0000 (19:57 +0800)]
ARM64: rockchip: update rockchip_defconfig
-MEMCG
-RD_BZIP2
-RD_LZMA
PANIC_TIMEOUT=1
+BLOCK_RKNAND
+ARMV7_COMPAT
+SECCOMP
-MALI_MIDGARD
+LCDC_RK3368
+SND_DYNAMIC_MINORS
+BOOTPARAM_HARDLOCKUP_PANIC
+BOOTPARAM_SOFTLOCKUP_PANIC
DEFAULT_HUNG_TASK_TIMEOUT=10
+DYNAMIC_DEBUG
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Huang, Tao [Wed, 10 Dec 2014 11:56:49 +0000 (19:56 +0800)]
ARM64: rockchip: add mach-rockchip
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Huang, Tao [Wed, 10 Dec 2014 11:53:56 +0000 (19:53 +0800)]
ARM: rockchip: move common config to Kconfig.common
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Huang, Tao [Wed, 10 Dec 2014 11:50:00 +0000 (19:50 +0800)]
ARM: rockchip: common files support ARM64
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Huang, Tao [Wed, 10 Dec 2014 11:42:48 +0000 (19:42 +0800)]
media: rk30_camera_oneframe: fix link error
`.exit.text' referenced in section `.data.rel.local' of drivers/built-in.o: defined in discarded section `.exit.text' of drivers/built-in.o
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Huang, Tao [Wed, 10 Dec 2014 11:40:53 +0000 (19:40 +0800)]
ARM: rockchip: common: covert dsb() to dsb(sy)
Huang, Tao [Wed, 10 Dec 2014 11:36:30 +0000 (19:36 +0800)]
usb: dwc_otg_310: covert dsb() to dsb(sy)
Huang, Tao [Wed, 10 Dec 2014 11:35:54 +0000 (19:35 +0800)]
video: rockchip: rk3288_hdmi: covert dsb() to dsb(sy)
Huang, Tao [Wed, 10 Dec 2014 11:34:41 +0000 (19:34 +0800)]
video: rockchip: iep: covert dsb() to dsb(sy)
Huang, Tao [Wed, 10 Dec 2014 11:32:25 +0000 (19:32 +0800)]
video: rk3368_lcdc: covert dsb() to dsb(sy)
Huang, Tao [Wed, 10 Dec 2014 11:31:34 +0000 (19:31 +0800)]
media: rk30_camera_oneframe: covert dsb() to dsb(sy)
Huang, Tao [Wed, 10 Dec 2014 11:30:04 +0000 (19:30 +0800)]
rk_serial: covert dsb() to dsb(sy)
Huang, Tao [Wed, 10 Dec 2014 11:27:08 +0000 (19:27 +0800)]
clocksource: rockchip_timer: covert dsb() to dsb(sy)
Huang, Tao [Wed, 10 Dec 2014 11:25:48 +0000 (19:25 +0800)]
pwm: rockchip: covert dsb() to dsb(sy)
Huang, Tao [Wed, 10 Dec 2014 11:24:50 +0000 (19:24 +0800)]
irqchip: gic: covert dsb() to dsb(sy)
Huang, Tao [Wed, 10 Dec 2014 11:24:11 +0000 (19:24 +0800)]
mmc: rockchip: covert dsb() to dsb(sy)
Huang, Tao [Wed, 10 Dec 2014 11:23:04 +0000 (19:23 +0800)]
rockchip: clk: covert dsb() to dsb(sy)
Huang, Tao [Wed, 10 Dec 2014 11:21:35 +0000 (19:21 +0800)]
ethernet: gmac: covert dsb() to dsb(sy)
lintao [Wed, 10 Dec 2014 09:16:14 +0000 (17:16 +0800)]
Revert "mmc: auto-pin when pm call for udbg"
This reverts commit
4ac86774c95b8f8cd8d80605fc332010cc02714e.
hjc [Wed, 10 Dec 2014 09:16:07 +0000 (17:16 +0800)]
rk3288 hdmi: add config for hdmi
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Wed, 10 Dec 2014 08:44:05 +0000 (16:44 +0800)]
rk312x lcdc: fix no used function call.
Signed-off-by: hjc <hjc@rock-chips.com>
Luowei [Wed, 10 Dec 2014 06:19:53 +0000 (14:19 +0800)]
rk3128-box:update dts according to pm.c
Mark Yao [Wed, 10 Dec 2014 01:42:31 +0000 (09:42 +0800)]
rk_fb: rk312x: direct power on lcdc when do fb_unblank
when do fb blank, we diretcly off the lcdc, so I think
we should power on lcdc in pairs.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Luowei [Wed, 10 Dec 2014 00:20:38 +0000 (08:20 +0800)]
rk3288:umask dma support for spi
lyz [Tue, 9 Dec 2014 14:25:41 +0000 (22:25 +0800)]
rk312x: usb: cleanup ohci-rockchip.c and make it support rk312x
lyz [Tue, 9 Dec 2014 14:23:05 +0000 (22:23 +0800)]
rk312x: usb: Skip DWC HOST for rk3126/3128 and usb phy tuning
1.Use EHCI/OHCI for all rk312x series
2.Set Host disconnect trigger point to 600mv, default is 650mv
lyz [Tue, 9 Dec 2014 12:31:32 +0000 (20:31 +0800)]
phy: backport generic phy framework from kernel-3.18
Luowei [Tue, 9 Dec 2014 10:00:49 +0000 (18:00 +0800)]
rk3036:add CONFIG_SWITCH again
sugar [Tue, 9 Dec 2014 08:29:02 +0000 (16:29 +0800)]
i2s: compatible with rk3126/rk3126b/rk3128.
because i2s controller is different between rk3126 and rk3126b,
but require the same dtb, so add runtime compatible.
hjc [Tue, 9 Dec 2014 04:19:52 +0000 (12:19 +0800)]
rk3368 dtsi: modify dtsi for display module
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Tue, 9 Dec 2014 04:18:12 +0000 (12:18 +0800)]
rk3368 lcdc: add lcdc driver
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Tue, 9 Dec 2014 04:17:28 +0000 (12:17 +0800)]
rk31xx lvds: add support rk3368 lvds transmitter
Signed-off-by: hjc <hjc@rock-chips.com>
Huang, Tao [Tue, 9 Dec 2014 07:10:34 +0000 (15:10 +0800)]
Merge branch develop-3.10 into develop-3.10-next
hjc [Mon, 8 Dec 2014 10:24:22 +0000 (18:24 +0800)]
rk312x lcdc: fix vop csc config error
Mark Yao [Mon, 8 Dec 2014 08:55:21 +0000 (16:55 +0800)]
rk_fb: logo: support display bmp logo from uboot
get bmp file data from bootargs "kernel_logo=xxxxxx", decoder bmp
file to framebuffer.
now support rle 8bit bmp files and 24bit bmp files.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
hjc [Mon, 8 Dec 2014 03:53:47 +0000 (11:53 +0800)]
rk fb: update fb config done info.
this commit depend on hwc update,
including the following directory:
hardware/rk29/hwcomposer_rga/
hardware/rk29/libgralloc_ump/
hardware/libhardware/
typ [Mon, 8 Dec 2014 02:50:18 +0000 (10:50 +0800)]
RK3126/3126B DDR:fix ddr DQS1 drv set err
sugar [Mon, 8 Dec 2014 01:44:14 +0000 (09:44 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into rk30/box/4.4_r1/develop
sugar [Mon, 8 Dec 2014 01:40:26 +0000 (09:40 +0800)]
i2s: compatable with rk3126/rk3126b/rk3128.
sugar [Mon, 8 Dec 2014 01:11:51 +0000 (09:11 +0800)]
Revert "rk3126/rk3126b: i2s: use i2s_2ch."
This reverts commit
942d98b30dd2c9907b4f53c160a16ee4216745a0.
Huang, Tao [Fri, 5 Dec 2014 13:18:34 +0000 (21:18 +0800)]
Merge tag 'lsk-v3.10-android-14.11'
LSK Android 14.11 v3.10
Conflicts:
arch/arm/include/asm/cputype.h
lyz [Tue, 25 Nov 2014 11:33:13 +0000 (19:33 +0800)]
usb: cleanup useless struct usb20otg_pdata_id
许盛飞 [Fri, 5 Dec 2014 11:05:59 +0000 (19:05 +0800)]
RK3126B: RK3126B delete the EBC
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
li bing [Fri, 5 Dec 2014 09:20:51 +0000 (17:20 +0800)]
wifi->esp8089: add wifi mac address user-defined function.
sugar [Fri, 5 Dec 2014 06:36:00 +0000 (14:36 +0800)]
rk3126/rk3126b: i2s: use i2s_2ch.