summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cleopatre/devkit/plcdrv/inc/plcdrv.h6
-rw-r--r--cleopatre/devkit/plcdrv/src/boot_params.c5
-rw-r--r--cleopatre/devkit/plcdrv/src/plcdrv.c3
3 files changed, 10 insertions, 4 deletions
diff --git a/cleopatre/devkit/plcdrv/inc/plcdrv.h b/cleopatre/devkit/plcdrv/inc/plcdrv.h
index 255081faf3..2e4ddf178b 100644
--- a/cleopatre/devkit/plcdrv/inc/plcdrv.h
+++ b/cleopatre/devkit/plcdrv/inc/plcdrv.h
@@ -25,6 +25,7 @@
#include <linux/proc_fs.h>
#include <net/sock.h>
#include <net/seq_check.h>
+#include <asm/arch/spc300-atag.h>
#include "debug_dump.h"
#include "ipmbox.h"
@@ -49,6 +50,11 @@
/ IPMBOX_MSG_EMPTY_BUF_WORDS - 1)
/**
+ * DSP mode symbol declaration.
+ */
+extern spc300_atag_dsp_mode_t spc300_dsp_mode;
+
+/**
* Watchdog private context.
*/
typedef struct wd_t
diff --git a/cleopatre/devkit/plcdrv/src/boot_params.c b/cleopatre/devkit/plcdrv/src/boot_params.c
index 4ddba4d3cb..bebfb87b96 100644
--- a/cleopatre/devkit/plcdrv/src/boot_params.c
+++ b/cleopatre/devkit/plcdrv/src/boot_params.c
@@ -13,6 +13,7 @@
*/
#include "boot_params.h"
+#include "plcdrv.h"
#include <linux/kernel.h>
#include <linux/string.h>
@@ -183,9 +184,9 @@ static int plcdrv_add_default_boot_params(char *params_str)
int sysclk_mhz = PLC_SYSCLOCK_MHZ;
int dspclk_mhz = PLC_DSPCLOCK_MHZ;
/* Hack for MSE500 500 mode on Cesar. */
- if (NVRAM_BFEXT (MSE500_MODE, spidcom_nvram.pkg_cfg)
- == NVRAM_MSE500_MODE_500)
+ if (spc300_dsp_mode == SPC300_ATAG_DSP_MODE_2X)
dspclk_mhz *= 2;
+
/* Add params. */
if (plcdrv_add_boot_param_uint32(params_str, "mem",
spc300_plc_mem_size,
diff --git a/cleopatre/devkit/plcdrv/src/plcdrv.c b/cleopatre/devkit/plcdrv/src/plcdrv.c
index 26fca9d2e1..98e76cd4f6 100644
--- a/cleopatre/devkit/plcdrv/src/plcdrv.c
+++ b/cleopatre/devkit/plcdrv/src/plcdrv.c
@@ -140,8 +140,7 @@ plcdrv_config_afe (const struct net_device *dev)
#ifdef CONFIG_AFE_MSEAFE
afe_read (afe, 0x90, &val);
val &= ~(0x8);
- if (NVRAM_BFEXT (MSE500_MODE, spidcom_nvram.pkg_cfg)
- == NVRAM_MSE500_MODE_500)
+ if (spc300_dsp_mode == SPC300_ATAG_DSP_MODE_2X)
val |= 0x4;
afe_write (afe, 0x90, val);
afe_read (afe, 0x00, &val);