shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity
403,645 Commits 55 Branches 2,486 Tags
eaaf5aad38328f7febc2bac3abde8319b499f953
Commit Graph

403645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Huang, Tao
eaaf5aad38 arm64: rockchip: rk3368-tb_8836 add tp support 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2014-12-23 16:26:56 +08:00
Huang, Tao
93b7173068 arm64: rockchip: rk3368 fix cpu axi init 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2014-12-23 15:29:14 +08:00
Huang, Tao
79437e3372 Merge tag 'lsk-v3.10-android-14.12' 
LSK Android 14.12 v3.10

Conflicts:
	include/linux/clk-provider.h
 2014-12-19 20:02:18 +08:00
David Wu
561fe83bd4 rk3368: dma: enable pl330 and dmadevices defconfig 
Signed-off-by: David Wu <wdc@rock-chips.com>
 2014-12-19 19:28:03 +08:00
David Wu
6f96245db8 rk3368: uart_dbg: uart_dbg pinctrl is decided by hardware 
Signed-off-by: David Wu <wdc@rock-chips.com>
 2014-12-19 19:27:53 +08:00
David Wu
b633fe40c5 rk3368: voppwm: add voppwm function 
Signed-off-by: David Wu <wdc@rock-chips.com>
 2014-12-19 19:27:31 +08:00
Huang, Tao
f93b5a57ce arm64: rockchip: build resource.img with logo_kernel.bmp 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2014-12-17 13:45:01 +08:00
yxj
a8e1ae1adb arm64: dts: rk3368-tb_8846: enable edp panel 
Signed-off-by: yxj <yxj@rock-chips.com>
 2014-12-16 20:57:45 +08:00
yxj
fc2658c1bb arm64: dts: rk3368: fix grf, interrupts, resets for edp 
Signed-off-by: yxj <yxj@rock-chips.com>
 2014-12-16 20:57:41 +08:00
yxj
a1364527e9 video: rockchip: rk32_dp: add support for rk3368 
Signed-off-by: yxj <yxj@rock-chips.com>
 2014-12-16 20:57:29 +08:00
yxj
8b9fe46efc video: rockchip: rk32_dp: covert dsb() to dsb(sy) 
Signed-off-by: yxj <yxj@rock-chips.com>
 2014-12-16 20:56:17 +08:00
Huang, Tao
2920ad6c0d Revert "rk32 dp: port to rk3368" 
This reverts commit b8fdfeb2cf.
 2014-12-16 20:55:58 +08:00
hjc
623d53b7e2 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>
 2014-12-16 20:50:20 +08:00
hjc
b490bce9e0 rk fb: fix open hdmi open backlight again in no dual mode 
Signed-off-by: hjc <hjc@rock-chips.com>
 2014-12-16 20:49:45 +08:00
hjc
b3cd2058cd rk3368 lcdc: update gamma lut 10bit to 8bit 
Signed-off-by: hjc <hjc@rock-chips.com>
 2014-12-16 20:47:37 +08:00
hjc
0ad8f3f803 rk31xx lvds: set iomux for lvds ttl mode 
Signed-off-by: hjc <hjc@rock-chips.com>
 2014-12-16 20:47:21 +08:00
Huang, Tao
6ea75be3c1 Merge branch develop-3.10 into develop-3.10-next 2014-12-16 20:36:30 +08:00
ljf
0b6f34f8ac iep driver: 
get rid of kfree buffer which allocated using devm_kzalloc.

Signed-off-by: ljf <ljf@rock-chips.com>
 2014-12-16 19:56:18 +08:00
yxj
17b6509381 reset: rockchip: load as subsys_initcall_sync 
rockchip reset control should probe before edp

Signed-off-by: yxj <yxj@rock-chips.com>
 2014-12-15 21:15:10 +08:00
David Wu
d39cf37ff0 rk3368: pinctrl: add hdmi-i2c-xfer 
Signed-off-by: David Wu <wdc@rock-chips.com>
 2014-12-15 18:49:18 +08:00
zsq
bc190eca53 remove rga driver mmu buf malloc to prevent crash 2014-12-15 17:24:31 +08:00
dalon.zhang
86a0db3527 camera: UVC: fix UVC interrupt and other issues 2014-12-15 16:25:18 +08:00
cl
2adaeb93a1 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>
 2014-12-15 09:09:09 +08:00
Huang, Tao
76511ba280 arm64: rockchip: rk3368 disable qos init temporarily 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2014-12-13 22:12:26 +08:00
dkl
fd28f459b1 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>
 2014-12-13 21:10:11 +08:00
Mark Brown
f891dfcd5f Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-12-13 11:40:22 +00:00
Mark Brown
3e5fe00cd3 Merge remote-tracking branch 'lsk/v3.10/topic/genpd' into linux-linaro-lsk 2014-12-13 11:39:36 +00:00
Huang, Tao
fd62e6c91e arm64: rockchip: rockchip_defconfig enable RK31XX_LVDS RK32_DP 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2014-12-13 18:05:41 +08:00
hjc
5cc05e4945 ion: ino reserve 
Signed-off-by: hjc <hjc@rock-chips.com>
 2014-12-13 18:02:46 +08:00
hjc
b8fdfeb2cf rk32 dp: port to rk3368 
Signed-off-by: hjc <hjc@rock-chips.com>
 2014-12-13 18:02:28 +08:00
hjc
84f0f91f51 rk31xx lvds: add lvds grf config 
Signed-off-by: hjc <hjc@rock-chips.com>
 2014-12-13 17:59:51 +08:00
hjc
06f6340537 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>
 2014-12-13 17:59:14 +08:00
Huang, Tao
da9ae0c513 arm64: rockchip: rockchip_defconfig disable MMC_DW_IDMAC temporarily 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2014-12-13 15:18:26 +08:00
dkl
b8b2df2f41 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>
 2014-12-13 13:43:14 +08:00
dkl
d18042afb5 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>
 2014-12-13 13:42:37 +08:00
Huang, Tao
f4c8e2cdac 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>
 2014-12-13 12:58:06 +08:00
Huang, Tao
262b832c3f 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>
 2014-12-13 12:55:21 +08:00
Tomasz Figa
6920cae74d 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 aa42240ab2)
Signed-off-by: Mark Brown <broonie@kernel.org>

Conflicts:
	include/linux/pm_domain.h
 2014-12-12 20:06:29 +00:00
Ulf Hansson
0475cf9a2f 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 86f1e15f56)
Signed-off-by: Mark Brown <broonie@kernel.org>
 2014-12-12 20:06:12 +00:00
Ulf Hansson
99afc71dc9 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 c3099a5294)
Signed-off-by: Mark Brown <broonie@kernel.org>
 2014-12-12 20:06:03 +00:00
chenzhen
ecc6527784 rk, gpu : 
source code for device/rockchip/common/gpu/libMali-T760/mali_kbase.ko,
	in branch rk/rk32/mid/5.0/develop,
	commit 1b187041f11b7ca1d6c1490b934f09648f334a19.
 2014-12-12 18:08:54 +08:00
cl
c59e8d086a rk312x: adjust dts relation 
Signed-off-by: cl <cl@rock-chips.com>
 2014-12-12 17:59:56 +08:00
Huang, Tao
4d2f66c4d5 arm64: rockchip: add rk3368-tb_8846.dts 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2014-12-12 17:03:20 +08:00
Huang, Tao
497e94f6f2 arm64: rockchip: rk3368.dtsi add more configure 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2014-12-12 17:02:35 +08:00
hjc
cd1569d3fb rk3368 lcdc: support win mirror and update NO_DUAL mode 
Signed-off-by: hjc <hjc@rock-chips.com>
 2014-12-12 15:16:04 +08:00
dkl
0ceff91bfa rk3368: clk: add CLKOPS_RATE_RK3368_DCLK_LCDC for dclk_vop0 
Signed-off-by: dkl <dkl@rock-chips.com>
 2014-12-12 14:25:08 +08:00
dkl
7dfaf7a105 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>
 2014-12-12 14:24:54 +08:00
Huang, Tao
801c2bd378 Merge branch develop-3.10 into develop-3.10-next 2014-12-12 14:12:56 +08:00
Huang, Tao
4abd927beb Revert "rk3368 lcdc: support win mirror and update NO_DUAL mode" 
This reverts commit fd18d428fa.
 2014-12-12 14:11:55 +08:00
Huang, Tao
037ab54084 ARM: rk: build resource.img with logo_kernel.bmp 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2014-12-12 12:14:01 +08:00