firefly-linux-kernel-4.4.55.git
9 years agommc: rk_sdmmc: manually zero desc after allocated on ARM64 platform.
lintao [Wed, 24 Dec 2014 07:43:20 +0000 (15:43 +0800)]
mmc: rk_sdmmc: manually zero desc after allocated on ARM64 platform.

ARM64 call dmam_alloc_coherent mathod to allocate descriptor
will not auto clear buffer. So mmc may get wrong d->desc1 calculated that
load wrong address for BUF2 for dual-buf mode if NO CH set in d->desc0.
Then IDMAC will halt for BUF2 in WR_REQ_WAIT state and cannot generate
TI/RI or others in combine-interrupt.

Signed-off-by: lintao <lintao@rock-chips.com>
9 years agoRevert "arm64: rockchip: rockchip_defconfig disable MMC_DW_IDMAC temporarily"
lintao [Wed, 24 Dec 2014 07:40:20 +0000 (15:40 +0800)]
Revert "arm64: rockchip: rockchip_defconfig disable MMC_DW_IDMAC temporarily"

This reverts commit da9ae0c513b4a01ff4302a21a82746ddaeb2c16c.

Signed-off-by: lintao <lintao@rock-chips.com>
9 years agoarm64: rockchip: rk3368 enable 8 CPUs support
Huang, Tao [Tue, 23 Dec 2014 14:30:58 +0000 (22:30 +0800)]
arm64: rockchip: rk3368 enable 8 CPUs support

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agoion: rockchip: fix snapshot alignment fault on armv8
Huang, Tao [Tue, 23 Dec 2014 13:36:07 +0000 (21:36 +0800)]
ion: rockchip: fix snapshot alignment fault on armv8

Fix this bug:
Unhandled fault: alignment fault (0x96000061) at 0xffffff8000006016
Internal error: : 96000061 [#1] PREEMPT SMP
Modules linked in: dc_fbdev(O) pvrsrvkm(O)
CPU: 0 PID: 125 Comm: Binder_2 Tainted: G           O 3.10.0 #36
task: ffffffc0530f7380 ti: ffffffc0531c0000 task.ti: ffffffc0531c0000
PC is at memcpy+0x2c/0x60
LR is at vsnprintf+0x100/0x598
[<ffffffc0002e093c>] memcpy+0x2c/0x60
[<ffffffc00018b3bc>] seq_vprintf+0x48/0x84
[<ffffffc00018b44c>] seq_printf+0x54/0x60
[<ffffffc00063a238>] ion_alloc+0x4fc/0x778
[<ffffffc00063a98c>] ion_ioctl+0x164/0x360
[<ffffffc00017bfa8>] vfs_ioctl+0x20/0x3c
[<ffffffc00017c8ac>] do_vfs_ioctl+0x474/0x540
[<ffffffc00017c9d4>] SyS_ioctl+0x5c/0x88

pgprot_noncached will map buffer as MT_DEVICE, but
All store accesses to Device memory use the asynchronous abort mechanism on
Cortex-A53.

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agork3368: io-domain: sync with upstream to add REGULATOR_EVENT_PRE_VOLTAGE_CHANGE
David Wu [Tue, 23 Dec 2014 11:25:51 +0000 (19:25 +0800)]
rk3368: io-domain: sync with upstream to add REGULATOR_EVENT_PRE_VOLTAGE_CHANGE

Signed-off-by: David Wu <wdc@rock-chips.com>
9 years agoarm64: rockchip: rk3368-tb_8836 fix cw2015 gpio define
chenjh [Tue, 23 Dec 2014 11:31:23 +0000 (19:31 +0800)]
arm64: rockchip: rk3368-tb_8836 fix cw2015 gpio define

9 years agork3368: i2c: fix i2c1&i2c2 reg address and irq error
David Wu [Tue, 23 Dec 2014 08:43:17 +0000 (16:43 +0800)]
rk3368: i2c: fix i2c1&i2c2 reg address and irq error

Signed-off-by: David Wu <wdc@rock-chips.com>
9 years agoarm64: rockchip: rk3368 enable 4 big CPUs support
Huang, Tao [Tue, 23 Dec 2014 08:30:13 +0000 (16:30 +0800)]
arm64: rockchip: rk3368 enable 4 big CPUs support

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agoarm64: rockchip: rk3368-tb_8836 add tp support
Huang, Tao [Tue, 23 Dec 2014 08:26:56 +0000 (16:26 +0800)]
arm64: rockchip: rk3368-tb_8836 add tp support

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agoarm64: rockchip: rk3368 fix cpu axi init
Huang, Tao [Tue, 23 Dec 2014 07:29:14 +0000 (15:29 +0800)]
arm64: rockchip: rk3368 fix cpu axi init

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agoMerge tag 'lsk-v3.10-android-14.12'
Huang, Tao [Fri, 19 Dec 2014 12:02:18 +0000 (20:02 +0800)]
Merge tag 'lsk-v3.10-android-14.12'

LSK Android 14.12 v3.10

Conflicts:
include/linux/clk-provider.h

9 years agork3368: dma: enable pl330 and dmadevices defconfig
David Wu [Fri, 19 Dec 2014 11:15:40 +0000 (19:15 +0800)]
rk3368: dma: enable pl330 and dmadevices defconfig

Signed-off-by: David Wu <wdc@rock-chips.com>
9 years agork3368: uart_dbg: uart_dbg pinctrl is decided by hardware
David Wu [Fri, 19 Dec 2014 11:13:37 +0000 (19:13 +0800)]
rk3368: uart_dbg: uart_dbg pinctrl is decided by hardware

Signed-off-by: David Wu <wdc@rock-chips.com>
9 years agork3368: voppwm: add voppwm function
David Wu [Fri, 19 Dec 2014 11:11:42 +0000 (19:11 +0800)]
rk3368: voppwm: add voppwm function

Signed-off-by: David Wu <wdc@rock-chips.com>
9 years agoarm64: rockchip: build resource.img with logo_kernel.bmp
Huang, Tao [Wed, 17 Dec 2014 05:45:01 +0000 (13:45 +0800)]
arm64: rockchip: build resource.img with logo_kernel.bmp

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
9 years agoarm64: dts: rk3368-tb_8846: enable edp panel
yxj [Mon, 15 Dec 2014 11:29:19 +0000 (19:29 +0800)]
arm64: dts: rk3368-tb_8846: enable edp panel

Signed-off-by: yxj <yxj@rock-chips.com>
9 years agoarm64: dts: rk3368: fix grf, interrupts, resets for edp
yxj [Mon, 15 Dec 2014 11:27:08 +0000 (19:27 +0800)]
arm64: dts: rk3368: fix grf, interrupts, resets for edp

Signed-off-by: yxj <yxj@rock-chips.com>
9 years agovideo: rockchip: rk32_dp: add support for rk3368
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>
9 years agovideo: rockchip: rk32_dp: covert dsb() to dsb(sy)
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>
9 years agoRevert "rk32 dp: port to rk3368"
Huang, Tao [Tue, 16 Dec 2014 12:55:58 +0000 (20:55 +0800)]
Revert "rk32 dp: port to rk3368"

This reverts commit b8fdfeb2cfeec753b23236584e9e24b1f3be83c1.

9 years agork3368 lcdc: 1.add YUV domain overlay config; 2.edp force rgb888 output; 3.add 1...
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>
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: update gamma lut 10bit to 8bit
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>
9 years agork31xx lvds: set iomux for lvds ttl mode
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>
9 years agoMerge branch develop-3.10 into develop-3.10-next
Huang, Tao [Tue, 16 Dec 2014 12:36:30 +0000 (20:36 +0800)]
Merge branch develop-3.10 into develop-3.10-next

9 years agoiep driver:
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>
9 years agoreset: rockchip: load as subsys_initcall_sync
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>
9 years agork3368: pinctrl: add hdmi-i2c-xfer
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>
9 years agoremove rga driver mmu buf malloc to prevent crash
zsq [Mon, 15 Dec 2014 09:24:31 +0000 (17:24 +0800)]
remove rga driver mmu buf malloc to prevent crash

9 years agocamera: UVC: fix UVC interrupt and other issues
dalon.zhang [Mon, 15 Dec 2014 08:25:18 +0000 (16:25 +0800)]
camera: UVC: fix UVC interrupt and other issues

9 years agork312x: miss the new file rk3126.dtsi&&3128.dtsi for the commit c59e8d086aaf89d0f4835...
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>
9 years agoarm64: rockchip: rk3368 disable qos init temporarily
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>
9 years agork3368: clk: fix rk3368 apllb/aplll set_rate
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>
9 years agoMerge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Mark Brown [Sat, 13 Dec 2014 11:40:22 +0000 (11:40 +0000)]
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

9 years agoMerge remote-tracking branch 'lsk/v3.10/topic/genpd' into linux-linaro-lsk
Mark Brown [Sat, 13 Dec 2014 11:39:36 +0000 (11:39 +0000)]
Merge remote-tracking branch 'lsk/v3.10/topic/genpd' into linux-linaro-lsk

9 years agoarm64: rockchip: rockchip_defconfig enable RK31XX_LVDS RK32_DP
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>
9 years agoion: ino reserve
hjc [Sat, 13 Dec 2014 09:37:08 +0000 (17:37 +0800)]
ion: ino reserve

Signed-off-by: hjc <hjc@rock-chips.com>
9 years agork32 dp: port to rk3368
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>
9 years agork31xx lvds: add lvds grf config
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>
9 years agork3368 lcdc: 1.delete force vop output aaa mode in hdmi and edp mode; 2.not to contro...
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>
9 years agoarm64: rockchip: rockchip_defconfig disable MMC_DW_IDMAC temporarily
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>
9 years agork3368: dts: init gpll rate before clk_core_b and clk_core_l
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>
9 years agork3368: clk: fix rk3368 apll set_rate
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>
9 years agoarm64: rockchip: rockchip_defconfig enable some ARM64 feature
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>
9 years agoarm64: rockchip: fix tb_8846 boot
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>
9 years agoPM / Domains: Add generic OF-based PM domain look-up
Tomasz Figa [Fri, 19 Sep 2014 18:27:36 +0000 (20:27 +0200)]
PM / Domains: Add generic OF-based PM domain look-up

This patch introduces generic code to perform PM domain look-up using
device tree and automatically bind devices to their PM domains.

Generic device tree bindings are introduced to specify PM domains of
devices in their device tree nodes.

Backwards compatibility with legacy Samsung-specific PM domain bindings
is provided, but for now the new code is not compiled when
CONFIG_ARCH_EXYNOS is selected to avoid collision with legacy code.
This will change as soon as the Exynos PM domain code gets converted to
use the generic framework in further patch.

This patch was originally submitted by Tomasz Figa when he was employed
by Samsung.

Link: http://marc.info/?l=linux-pm&m=139955349702152&w=2
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit aa42240ab2544a8bcb2efb400193826f57f3175e)
Signed-off-by: Mark Brown <broonie@kernel.org>
Conflicts:
include/linux/pm_domain.h

9 years agoACPI / PM: Assign the ->detach() callback when attaching the PM domain
Ulf Hansson [Fri, 19 Sep 2014 18:27:35 +0000 (20:27 +0200)]
ACPI / PM: Assign the ->detach() callback when attaching the PM domain

As as preparation to simplify the detachment of devices from their PM
domains, we assign the ->detach() callback to genpd_dev_pm_detach().

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 86f1e15f5646b4855bd77025c950239650c4843e)
Signed-off-by: Mark Brown <broonie@kernel.org>
9 years agoPM / Domains: Add a detach callback to the struct dev_pm_domain
Ulf Hansson [Fri, 19 Sep 2014 18:27:34 +0000 (20:27 +0200)]
PM / Domains: Add a detach callback to the struct dev_pm_domain

The intent of this callback is to simplify detachment of devices from
their PM domains. Further patches will show the benefit.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit c3099a5294f2c7266234e8ea35cbffc20a41aa9a)
Signed-off-by: Mark Brown <broonie@kernel.org>
9 years agork, gpu :
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.

9 years agork312x: adjust dts relation
cl [Fri, 12 Dec 2014 09:59:56 +0000 (17:59 +0800)]
rk312x: adjust dts relation

Signed-off-by: cl <cl@rock-chips.com>
9 years agoarm64: rockchip: add rk3368-tb_8846.dts
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>
9 years agoarm64: rockchip: rk3368.dtsi add more configure
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>
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 agork3368: clk: add CLKOPS_RATE_RK3368_DCLK_LCDC for dclk_vop0
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>
9 years agork3368: dts: clk: fix some errors
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>
9 years agoMerge branch develop-3.10 into develop-3.10-next
Huang, Tao [Fri, 12 Dec 2014 06:12:56 +0000 (14:12 +0800)]
Merge branch develop-3.10 into develop-3.10-next

9 years agoRevert "rk3368 lcdc: support win mirror and update NO_DUAL mode"
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.

9 years agoARM: rk: build resource.img with logo_kernel.bmp
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>
9 years agork3368: reset: add soft_reset id
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>
9 years agork fb: delete unused message
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>
9 years agocif: set CONFIG_RK30_CAMERA_ONEFRAME default as yes in rockchip_defconfig
zyc [Fri, 12 Dec 2014 03:40:23 +0000 (11:40 +0800)]
cif: set CONFIG_RK30_CAMERA_ONEFRAME default as yes in rockchip_defconfig

9 years agoclk: rockchip: fix some code style problems in clk-pll.c
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>
9 years agoclk: rockchip: fix pll_clk_get_best_set() for rk3188plus type pll
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>
9 years agork32: disabled ohci in dt
lyz [Wed, 10 Dec 2014 14:24:38 +0000 (22:24 +0800)]
rk32: disabled ohci in dt

9 years agoARM: rockchip: rockchip_defconfig add USB_OHCI_HCD
lyz [Wed, 10 Dec 2014 14:23:46 +0000 (22:23 +0800)]
ARM: rockchip: rockchip_defconfig add USB_OHCI_HCD

9 years agork312x: add support for ehci to all rk312x series
lyz [Wed, 10 Dec 2014 14:18:58 +0000 (22:18 +0800)]
rk312x: add support for ehci to all rk312x series

9 years agork32: ehci: work-around for abnormal ohci
lyz [Wed, 10 Dec 2014 07:57:17 +0000 (15:57 +0800)]
rk32: ehci: work-around for abnormal ohci

9 years agoRevert "USB: Fix EHCI bug if connect with FS or LS device."
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.

9 years agork fb: box is use NO_DUAL mode,so fb have to disable dsp_black
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>
9 years agork: Makefile set default CROSS_COMPILE when ARCH is arm64
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>
9 years agork_fb: logo: get kernel logo addr from protect memory region
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>
9 years agork: mem: protect memory region that specified by uboot on kernel booting
CMY [Thu, 11 Dec 2014 04:58:09 +0000 (12:58 +0800)]
rk: mem: protect memory region that specified by uboot on kernel booting

9 years agork: ion: cma reserve 640MB at anywhere by default on rk32xx
CMY [Thu, 11 Dec 2014 04:53:29 +0000 (12:53 +0800)]
rk: ion: cma reserve 640MB at anywhere by default on rk32xx

9 years agork: arm64: support build kernel.img and resource.img
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>
9 years agoARM64: rockchip: rockchip_defconfig disable HDMI_RK3288
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>
9 years agork3368 lcdc: support win mirror and update NO_DUAL mode
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>
9 years agoMerge branch develop-3.10 into develop-3.10-next
Huang, Tao [Wed, 10 Dec 2014 12:09:28 +0000 (20:09 +0800)]
Merge branch develop-3.10 into develop-3.10-next

9 years agoARM64: rockchip: update rockchip_defconfig
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>
9 years agoARM64: rockchip: add mach-rockchip
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>
9 years agoARM: rockchip: move common config to Kconfig.common
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>
9 years agoARM: rockchip: common files support ARM64
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>
9 years agomedia: rk30_camera_oneframe: fix link error
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>
9 years agoARM: rockchip: common: covert dsb() to dsb(sy)
Huang, Tao [Wed, 10 Dec 2014 11:40:53 +0000 (19:40 +0800)]
ARM: rockchip: common: covert dsb() to dsb(sy)

9 years agoMerge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Mark Brown [Wed, 10 Dec 2014 11:40:18 +0000 (11:40 +0000)]
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

9 years agousb: dwc_otg_310: 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)

9 years agovideo: rockchip: rk3288_hdmi: 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)

9 years agovideo: rockchip: iep: 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)

9 years agovideo: rk3368_lcdc: 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)

9 years agomedia: rk30_camera_oneframe: 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)

9 years agork_serial: 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)

9 years agoclocksource: rockchip_timer: 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)

9 years agopwm: rockchip: 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)

9 years agoirqchip: gic: 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)

9 years agommc: rockchip: 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)

9 years agorockchip: clk: 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)

9 years agoethernet: gmac: 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)

9 years agoRevert "mmc: auto-pin when pm call for udbg"
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.

9 years agork3288 hdmi: add config for hdmi
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>
9 years agork312x lcdc: fix no used function call.
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>
9 years agork3128-box:update dts according to pm.c
Luowei [Wed, 10 Dec 2014 06:19:53 +0000 (14:19 +0800)]
rk3128-box:update dts according to pm.c