drm/msm/adreno: Remove CONFIG_OF checks
Remove CONFIG_OF checks in adreno_device.c. The downstream bus scaling stuff is included only when CONFIG_OF is not set. So, remove that too. Signed-off-by: Archit Taneja <architt@codeaurora.org> Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
parent
1fd6a4412c
commit
66a42f8586
|
@ -19,10 +19,6 @@
|
|||
|
||||
#include "adreno_gpu.h"
|
||||
|
||||
#if defined(DOWNSTREAM_CONFIG_MSM_BUS_SCALING) && !defined(CONFIG_OF)
|
||||
# include <mach/kgsl.h>
|
||||
#endif
|
||||
|
||||
#define ANY_ID 0xff
|
||||
|
||||
bool hang_debug = false;
|
||||
|
@ -168,7 +164,6 @@ static void set_gpu_pdev(struct drm_device *dev,
|
|||
static int adreno_bind(struct device *dev, struct device *master, void *data)
|
||||
{
|
||||
static struct adreno_platform_config config = {};
|
||||
#ifdef CONFIG_OF
|
||||
struct device_node *child, *node = dev->of_node;
|
||||
u32 val;
|
||||
int ret;
|
||||
|
@ -205,53 +200,6 @@ static int adreno_bind(struct device *dev, struct device *master, void *data)
|
|||
return -ENXIO;
|
||||
}
|
||||
|
||||
#else
|
||||
struct kgsl_device_platform_data *pdata = dev->platform_data;
|
||||
uint32_t version = socinfo_get_version();
|
||||
if (cpu_is_apq8064ab()) {
|
||||
config.fast_rate = 450000000;
|
||||
config.slow_rate = 27000000;
|
||||
config.bus_freq = 4;
|
||||
config.rev = ADRENO_REV(3, 2, 1, 0);
|
||||
} else if (cpu_is_apq8064()) {
|
||||
config.fast_rate = 400000000;
|
||||
config.slow_rate = 27000000;
|
||||
config.bus_freq = 4;
|
||||
|
||||
if (SOCINFO_VERSION_MAJOR(version) == 2)
|
||||
config.rev = ADRENO_REV(3, 2, 0, 2);
|
||||
else if ((SOCINFO_VERSION_MAJOR(version) == 1) &&
|
||||
(SOCINFO_VERSION_MINOR(version) == 1))
|
||||
config.rev = ADRENO_REV(3, 2, 0, 1);
|
||||
else
|
||||
config.rev = ADRENO_REV(3, 2, 0, 0);
|
||||
|
||||
} else if (cpu_is_msm8960ab()) {
|
||||
config.fast_rate = 400000000;
|
||||
config.slow_rate = 320000000;
|
||||
config.bus_freq = 4;
|
||||
|
||||
if (SOCINFO_VERSION_MINOR(version) == 0)
|
||||
config.rev = ADRENO_REV(3, 2, 1, 0);
|
||||
else
|
||||
config.rev = ADRENO_REV(3, 2, 1, 1);
|
||||
|
||||
} else if (cpu_is_msm8930()) {
|
||||
config.fast_rate = 400000000;
|
||||
config.slow_rate = 27000000;
|
||||
config.bus_freq = 3;
|
||||
|
||||
if ((SOCINFO_VERSION_MAJOR(version) == 1) &&
|
||||
(SOCINFO_VERSION_MINOR(version) == 2))
|
||||
config.rev = ADRENO_REV(3, 0, 5, 2);
|
||||
else
|
||||
config.rev = ADRENO_REV(3, 0, 5, 0);
|
||||
|
||||
}
|
||||
# ifdef DOWNSTREAM_CONFIG_MSM_BUS_SCALING
|
||||
config.bus_scale_table = pdata->bus_scale_table;
|
||||
# endif
|
||||
#endif
|
||||
dev->platform_data = &config;
|
||||
set_gpu_pdev(dev_get_drvdata(master), to_platform_device(dev));
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue