samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
程式碼 問題 合併請求 Actions 套件 專案 版本發布 Wiki 動態

Revert "disp: msm: add func to parse pll_codes from dfps_data_region"

瀏覽代碼 
This reverts commit f3066919f4.

Change-Id: I97ad84bdd8aa7ebaf5cbf3a76a64dd03de89a30e
Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>
此提交包含在：
Manoj Kumar AVM
2020-05-21 16:32:23 -07:00
父節點 db766d7c86
當前提交 0fa7f77a94
共有 1 個檔案被更改，包括 0 行新增 和 78 行删除
下載 Patch 檔 下載差異檔 展開所有檔案 折疊所有檔案

78
msm/dsi/dsi_pll.c
查看文件

@@ -11,9 +11,6 @@
#include <linux/err.h>
#include <linux/delay.h>
#include <linux/iopoll.h>
#include <linux/vmalloc.h>
#include <linux/io.h>
#include <linux/of_address.h>
#include "dsi_pll.h"
static int dsi_pll_clock_register(struct platform_device *pdev,
@@ -54,78 +51,6 @@ static inline int dsi_pll_get_ioresources(struct platform_device *pdev,
return rc;
}
static void dsi_pll_free_bootmem(u32 mem_addr, u32 size)
{
unsigned long pfn_start, pfn_end, pfn_idx;
pfn_start = mem_addr >> PAGE_SHIFT;
pfn_end = (mem_addr + size) >> PAGE_SHIFT;
for (pfn_idx = pfn_start; pfn_idx < pfn_end; pfn_idx++)
free_reserved_page(pfn_to_page(pfn_idx));
}
static void dsi_pll_parse_dfps(struct platform_device *pdev,
struct dsi_pll_resource *pll_res)
{
struct device_node *pnode = NULL;
const u32 *addr;
struct vm_struct *area = NULL;
u64 size;
u32 offsets[2];
unsigned long virt_add = 0;
pnode = of_parse_phandle(pdev->dev.of_node, "memory-region", 0);
if (IS_ERR_OR_NULL(pnode)) {
DSI_PLL_INFO(pll_res, "of_parse_phandle failed\n");
goto node_err;
}
addr = of_get_address(pnode, 0, &size, NULL);
if (!addr) {
DSI_PLL_ERR(pll_res,
"failed to parse the dfps memory address\n");
goto node_err;
}
/* maintain compatibility for 32/64 bit */
offsets[0] = (u32) of_read_ulong(addr, 2);
offsets[1] = (u32) size;
area = get_vm_area(offsets[1], VM_IOREMAP);
if (!area) {
DSI_PLL_ERR(pll_res, "get_vm_area failed\n");
goto mem_err;
}
virt_add = (unsigned long)area->addr;
if (ioremap_page_range(virt_add, (virt_add + offsets[1]),
offsets[0], PAGE_KERNEL)) {
DSI_PLL_ERR(pll_res, "ioremap_page_range failed\n");
goto mem_err;
}
pll_res->dfps = kzalloc(sizeof(struct dfps_info), GFP_KERNEL);
if (IS_ERR_OR_NULL(pll_res->dfps)) {
DSI_PLL_ERR(pll_res, "pll_res->dfps allocate failed\n");
goto mem_err;
}
/* memcopy complete dfps structure from kernel virtual memory */
memcpy_fromio(pll_res->dfps, area->addr, sizeof(struct dfps_info));
mem_err:
if (virt_add)
unmap_kernel_range(virt_add, (unsigned long) size);
if (area)
vfree(area->addr);
/* free the dfps memory here */
dsi_pll_free_bootmem(offsets[0], offsets[1]);
node_err:
if (pnode)
of_node_put(pnode);
}
int dsi_pll_init(struct platform_device *pdev, struct dsi_pll_resource **pll)
{
int rc = 0;
@@ -220,9 +145,6 @@ int dsi_pll_init(struct platform_device *pdev, struct dsi_pll_resource **pll)
return -EINVAL;
}
if (!(pll_res->index))
dsi_pll_parse_dfps(pdev, pll_res);
return rc;
}