summaryrefslogtreecommitdiff
path: root/cleopatre
diff options
context:
space:
mode:
authorJean-Philippe SAVE2012-08-24 14:33:01 +0200
committerCyril Jourdan2012-09-20 11:23:22 +0200
commite0a000e4b40be71312dfbb1ac4486b5d4749f5f7 (patch)
treef00bf48490df069bfb74ff1b175f0b897f703fe0 /cleopatre
parentf825d40be3510f18090e15bc7ec8d94a0d568914 (diff)
cleo/linux/arch/arm/mach-spc300: use NVRAM defines, closes #420
Diffstat (limited to 'cleopatre')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c4
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c
index 896d001257..eb078856b6 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c
@@ -269,9 +269,9 @@ spc300_gpio_one_setup (int num)
chip->direction_output = NULL;
if (num < MIN_INTERNAL_GPIOS)
- gpio_config = ((spidcom_nvram.io.spcpio.gpio_0_7_cfg >> (num * 4)) & 0xF);
+ gpio_config = spc300_gpio_cfg(spidcom_nvram.io.spcpio.gpio_0_7_cfg, num);
else
- gpio_config = ((spidcom_nvram.io.spcpio.gpio_8_15_cfg >> ((num-MIN_INTERNAL_GPIOS) * 4)) & 0xF);
+ gpio_config = spc300_gpio_cfg(spidcom_nvram.io.spcpio.gpio_8_15_cfg, num - MIN_INTERNAL_GPIOS);
/* Check if gpio_config is ARM gpios */
if (gpio_config == 0)
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c
index 0794278a50..8ba7b14845 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c
@@ -392,8 +392,7 @@ void spc300_add_device_ethernet(void)
memcpy(&spc300_ethernet_data.mac_addr, spidcom_nvram.eth1_address, sizeof(spidcom_nvram.eth1_address));
//Find Eth phy connection from NVRAM
- //TODO:use NVRAM defines
- switch((spidcom_nvram.pkg_cfg & 0x00000300)>>8)
+ switch(NVRAM_BFEXT(ETH1_MODE, spidcom_nvram.pkg_cfg))
{
case 1: //RMII
spc300_ethernet_data.support_mii = 0;