shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

move rockchip_ion.h file to include/linux/

Browse Source
This commit is contained in:
CMY
2014-02-11 16:48:16 +08:00
parent 4b91865e1c
commit 268a9b7111
4 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/android/ion/ion.h
View File

@@ -20,7 +20,6 @@
#include <linux/types.h>
#include "../uapi/ion.h"
#include "../uapi/rockchip_ion.h"
struct ion_handle;
struct ion_device;

16
drivers/staging/android/ion/rockchip/rockchip_ion.c
View File

@@ -17,7 +17,7 @@
#include <linux/err.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include "../ion.h"
#include <linux/rockchip_ion.h>
#include "../ion_priv.h"
#ifdef CONFIG_OF
@@ -29,15 +29,7 @@
static struct ion_device *idev;
static int num_heaps;
static struct ion_heap **heaps;
/*
static struct ion_platform_heap s_heap_data = {
.type = ION_HEAP_TYPE_DMA,
.id = 1,
.name = "norheap",
.size = 256*SZ_1M,
.align = SZ_1M,
};
*/
struct ion_heap_desc {
unsigned int id;
enum ion_heap_type type;
@@ -144,12 +136,12 @@ static struct ion_platform_data *rockchip_ion_parse_dt(
if (ret)
goto free_heaps;
// msm_ion_get_heap_align(node, &pdata->heaps[idx]);
// rockchip_ion_get_heap_align(node, &pdata->heaps[idx]);
ret = rockchip_ion_get_heap_size(node, &pdata->heaps[idx]);
if (ret)
goto free_heaps;
// msm_ion_get_heap_adjacent(node, &pdata->heaps[idx]);
// rockchip_ion_get_heap_adjacent(node, &pdata->heaps[idx]);
pdata->heaps[idx].priv = dev;
pr_info("%d: %d %d %s 0x%08X\n", idx, pdata->heaps[idx].type, pdata->heaps[idx].id, pdata->heaps[idx].name, pdata->heaps[idx].size);

2
drivers/video/rockchip/rk_fb.c
View File

@@ -44,7 +44,7 @@
#endif
#if defined(CONFIG_ION_ROCKCHIP)
#include "../../staging/android/ion/ion.h"
#include <linux/rockchip_ion.h>
#endif

2
drivers/staging/android/uapi/rockchip_ion.h → include/linux/rockchip_ion.h Executable file → Normal file
View File

@@ -16,6 +16,8 @@
#ifndef _LINUX_ROCKCHIP_ION_H
#define _LINUX_ROCKCHIP_ION_H
#include "../../drivers/staging/android/ion/ion.h"
enum ion_heap_ids {
INVALID_HEAP_ID = -1,
ION_VIDEO_HEAP_ID = 1,