Commit Graph

61119 Commits

Author SHA1 Message Date
lintao
e34cedacb9 trace: mmc: add event class for cmd and resp 2014-08-25 10:48:17 +08:00
zyc
8847ab8c70 rk312x : cif : cif driver v0.0x1.0 2014-08-22 15:18:24 +08:00
Zheng Yang
9a749b629b rk312x lcdc: fix win1 1080i display error. 2014-08-22 14:35:33 +08:00
张晴
476cbef830 rk312x:rt5025:support pmic rt5025 2014-08-22 10:01:21 +08:00
zwl
c0d496b44f rk312x:lcdc: add config output_domain(RGB/YUV) and modify BCSH CSC config 2014-08-21 22:24:09 +08:00
hwg
a39834c9f6 rtl8723bs wifi: add wifi diver select 2014-08-20 19:51:38 +08:00
陈亮
4b77a1b38d rk3288: move ddr-bandwidth-calc func to ddr_rk32.c from ddr_freq.c
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-08-20 00:17:41 -07:00
陈亮
fd9a00c860 rename macro RK312x_PMU_SYS_REG to RK312X_PMU_SYS_REG
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-08-19 20:58:02 -07:00
hjc
9c37b9f784 rk3036 lcdc: open interlace read mode when in 576i/480i and y_scale_fac over 2 2014-08-19 19:56:34 +08:00
陈亮
8fd24d93a2 rk312x: fix reboot loader fail
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-08-19 03:53:45 -07:00
zyc
628c7f1ce2 rk312x : cif : add many sensor drivers,include gc0329,gc0308 ... 2014-08-19 09:59:15 +08:00
许盛飞
3e7c4ab3ff rk312x: support suspend and resume
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2014-08-18 21:37:06 +08:00
陈亮
c84f321f6f rk312x: iomap PMU register
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-08-17 23:37:42 -07:00
lintao
45d41680fe mmc: change mmc_rescan_host usage for Rockchip turnkey customer :((
Before this patch we identify oob-wifi or sdio-irq-wifi by DTS.
However wifi engineers argue that our customer is lazy to modify it event
we had moentioned in release wifi configure document before and claim it
again and agin.

Cc: hwg <hwg@rock-chips.com>
Cc: gwl <gwl@rock-chips.com>
Signed-off-by: Shawn Lin <lintao@rock-chips.com>
2014-08-15 17:00:06 +08:00
许盛飞
e5b31c407f Revert "RK312x: support suspend and resume"
This reverts commit 0a82ae44b7.
2014-08-14 20:59:51 +08:00
zyc
85a9069c36 rk312x:cif: 1. soft reset cif before setting cif registers
2. raise cif qos the same as lcdc
                3. add 3A controls in soc camera framework
2014-08-14 17:09:33 +08:00
许盛飞
0a82ae44b7 RK312x: support suspend and resume
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2014-08-14 16:16:16 +08:00
zwl
1897916287 rk lcdc: use new interface to open and active vop iommu device 2014-08-14 14:40:16 +08:00
hwg
f17795c900 wifi: build together with rkwifi, esp8089, rtl8188eu driver, avoid config change 2014-08-13 15:13:15 +08:00
黄涛
68fe6924d3 Merge remote-tracking branch 'origin/develop-3.10-next' into develop-3.10
Conflicts:
	arch/arm/mach-rockchip/vcodec_service.c
	drivers/iommu/rockchip-iommu.c
	drivers/iommu/rockchip-iovmm.c
	drivers/net/ethernet/rockchip/gmac/stmmac_platform.c
	include/linux/rockchip/sysmmu.h
2014-08-12 17:39:16 +08:00
zyc
45023a37a5 rk312x:cif: add cif and ov2659 driver. 2014-08-08 15:26:16 +08:00
xxm
f1ac264d8f rockchip: iommu:
1.move out rockchip_get_sysmmu_device_by_compatible and platform_set_sysmmu
2.change compatible name in rk3288.dtsi,like "iommu,iep_mmu" to "rockchip,iep_mmu"
3.change iovmm_map etc to rockchip_iovmm_map
2014-08-08 10:50:28 +08:00
黄涛
c7412991e9 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
	arch/arm/mach-rockchip/vcodec_service.c
	drivers/input/Makefile
2014-08-08 10:21:50 +08:00
陈亮
b31f216cb9 rk312x: implement rk312x_restart() function
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-08-07 01:05:00 -07:00
张晴
29b38303e0 rk312x:support pwm set arm and logic voltages 2014-08-07 10:54:52 +08:00
zwl
d0f8322530 rk312x lcdc: when in hdmi/cvbs mode ,vop overlay in yuv domain 2014-08-07 08:45:54 +08:00
黄涛
fcef60e36f Merge tag 'lsk-v3.10-android-14.07' into develop-3.10
LSK v3.10 Android 14.07 release

Conflicts:
	drivers/clocksource/arm_arch_timer.c
	lib/Makefile
2014-08-06 15:34:14 +08:00
黄涛
4b19ba3477 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
	drivers/staging/android/ion/ion.c
	include/linux/rockchip/sysmmu.h
2014-08-04 16:52:07 +08:00
Zheng Yang
3ac820be05 rk3036 lcdc:
add set_overscan callback function to set overscan.
2014-08-02 19:03:44 +08:00
陈亮
d47b22f1f0 rk312x: init rockchip_pmu_ops 2014-07-31 05:21:43 -07:00
zyc
f1634b7e9e camsys_drv : v0.0x12.0 ,camsys_head : v0.0x8.0 2014-07-31 18:01:30 +08:00
xxm
fb4412ae7a rockchip:iommu:1,fix build error 2,disable invalid tlb when iovmm_unmap 2014-07-31 17:35:15 +08:00
xxm
7f0ffc5dbc rockchip:iommu:fix build error when iommu disabled 2014-07-31 16:16:47 +08:00
xxm
6da6bf7d78 rockchip:iommu:define function use inline instead of #define when iommu disabled 2014-07-31 11:32:35 +08:00
xxm
3bc178e8bc rockchip:iommu:fix build error when iommu disabled 2014-07-30 17:28:33 +08:00
zwl
f3edddc359 rk fb: add support scaler for one lcdc dual disp 2014-07-28 22:46:12 +08:00
zwl
d3458c0b8c rk312x lcdc: add support scaler function 2014-07-28 22:19:45 +08:00
黄涛
b5d61451d6 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next 2014-07-28 16:09:07 +08:00
dkl
e41271d341 pmic: rk818: modify shutdown function and fix compile errors
1. Modify the rk818 shutdown function refering to rk808.
2. Fix some compile errors.
2014-07-25 16:23:54 +08:00
Mark Brown
be5e8e20e9 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-07-24 23:07:25 +01:00
Mark Brown
c69294e957 Merge remote-tracking branch 'lsk/v3.10/topic/arm64-efi' into linux-linaro-lsk
Conflicts:
	arch/arm64/kernel/Makefile
	arch/arm64/kernel/head.S
2014-07-24 23:03:21 +01:00
Mark Brown
c98536343e Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
	drivers/of/fdt.c
2014-07-24 23:01:03 +01:00
Matt Fleming
9ed6b4ce7b ia64/efi: Implement efi_enabled()
There's no good reason to keep efi_enabled() under CONFIG_X86 anymore,
since nothing about the implementation is specific to x86.

Set EFI feature flags in the ia64 boot path instead of claiming to
support all features. The old behaviour was actually buggy since
efi.memmap never points to a valid memory map, so we shouldn't be
claiming to support EFI_MEMMAP.

Fortunately, this bug was never triggered because EFI_MEMMAP isn't used
outside of arch/x86 currently, but that may not always be the case.

Reviewed-and-tested-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
(cherry picked from commit 092063808c)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-07-24 22:58:08 +01:00
Matt Fleming
e42ede8c5e efi: Add separate 32-bit/64-bit definitions
The traditional approach of using machine-specific types such as
'unsigned long' does not allow the kernel to interact with firmware
running in a different CPU mode, e.g. 64-bit kernel with 32-bit EFI.

Add distinct EFI structure definitions for both 32-bit and 64-bit so
that we can use them in the 32-bit and 64-bit code paths.

Acked-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
(cherry picked from commit 677703cef0)
Signed-off-by: Mark Brown <broonie@linaro.org>

Conflicts:
	include/linux/efi.h
2014-07-24 22:56:50 +01:00
Mark Brown
bcddae4453 Merge remote-tracking branch 'lsk/v3.10/topic/libfdt' into linux-linaro-lsk
Conflicts:
	drivers/of/fdt.c
2014-07-24 22:54:49 +01:00
Rob Herring
a0e28c9fb2 of/fdt: Convert FDT functions to use libfdt
The kernel FDT functions predate libfdt and are much more limited in
functionality. Also, the kernel functions and libfdt functions are
not compatible with each other because they have different definitions
of node offsets. To avoid this incompatibility and in preparation to
add more FDT parsing functions which will need libfdt, let's first
convert the existing code to use libfdt.

The FDT unflattening, top-level FDT scanning, and property retrieval
functions are converted to use libfdt. The scanning code should be
re-worked to be more efficient and understandable by using libfdt to
find nodes directly by path or compatible strings.

Signed-off-by: Rob Herring <robh@kernel.org>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Grant Likely <grant.likely@linaro.org>
Tested-by: Stephen Chivers <schivers@csc.com>
(cherry picked from commit e6a6928c3e)
Signed-off-by: Mark Brown <broonie@linaro.org>

Conflicts:
	drivers/of/fdt.c
2014-07-24 21:08:48 +01:00
Mark Brown
d6c2d4f195 of/fdt: update of_get_flat_dt_prop in prep for libfdt
Make of_get_flat_dt_prop arguments compatible with libfdt fdt_getprop
call in preparation to convert FDT code to use libfdt. Make the return
value const and the property length ptr type an int.

Signed-off-by: Rob Herring <robh@kernel.org>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Grant Likely <grant.likely@linaro.org>
Tested-by: Stephen Chivers <schivers@csc.com>
(cherry picked from commit 9d0c4dfedd)
Signed-off-by: Mark Brown <broonie@linaro.org>

Conflicts:
	arch/arc/kernel/devtree.c
	arch/arm/kernel/devtree.c
	arch/arm/mach-exynos/exynos.c
	arch/arm/plat-samsung/s5p-dev-mfc.c
	arch/powerpc/kernel/epapr_paravirt.c
	arch/powerpc/kernel/prom.c
	arch/powerpc/mm/hash_utils_64.c
	arch/powerpc/platforms/powernv/opal.c
	arch/xtensa/kernel/setup.c
	drivers/of/fdt.c
2014-07-24 21:08:43 +01:00
Rob Herring
7f76e96eff of/fdt: remove unused of_scan_flat_dt_by_path
of_scan_flat_dt_by_path is unused anywhere in the kernel, so remove it.

Signed-off-by: Rob Herring <robh@kernel.org>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Grant Likely <grant.likely@linaro.org>
Tested-by: Stephen Chivers <schivers@csc.com>
(cherry picked from commit bba04d965d)
Signed-off-by: Mark Brown <broonie@linaro.org>

Conflicts:
	drivers/of/fdt.c
2014-07-24 20:00:00 +01:00
Marek Szyprowski
7c828dcc5c drivers: of: add support for custom reserved memory drivers
Add support for custom reserved memory drivers. Call their init() function
for each reserved region and prepare for using operations provided by them
with by the reserved_mem->ops array.

Based on previous code provided by Josh Cartwright <joshc@codeaurora.org>

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
(cherry picked from commit f618c4703a)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-07-24 19:57:03 +01:00
Marek Szyprowski
5b8f828963 drivers: of: add initialization code for dynamic reserved memory
This patch adds support for dynamically allocated reserved memory regions
declared in device tree. Such regions are defined by 'size', 'alignment'
and 'alloc-ranges' properties.

Based on previous code provided by Josh Cartwright <joshc@codeaurora.org>

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
(cherry picked from commit 3f0c820664)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-07-24 19:56:54 +01:00