summaryrefslogtreecommitdiff
path: root/cleopatre/linux-2.6.25.10-spc300/arch
diff options
context:
space:
mode:
Diffstat (limited to 'cleopatre/linux-2.6.25.10-spc300/arch')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c8
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c6
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300.c8
3 files changed, 11 insertions, 11 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 f2086f3cf8..a242279714 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,15 +269,15 @@ spc300_gpio_one_setup (int num)
chip->direction_output = NULL;
if (num < MIN_INTERNAL_GPIOS)
- gpio_config = ((spc300_nvram.gpio_0_7_cfg >> (num * 4)) & 0xF);
+ gpio_config = ((spidcom_nvram.gpio_0_7_cfg >> (num * 4)) & 0xF);
else
- gpio_config = ((spc300_nvram.gpio_8_15_cfg >> ((num-MIN_INTERNAL_GPIOS) * 4)) & 0xF);
+ gpio_config = ((spidcom_nvram.gpio_8_15_cfg >> ((num-MIN_INTERNAL_GPIOS) * 4)) & 0xF);
/* Check if gpio_config is ARM gpios */
if (gpio_config == 0)
{
/* check allowed direction */
- switch (spc300_gpio_direction (spc300_nvram.gpio_allow_dir, num))
+ switch (spc300_gpio_direction (spidcom_nvram.gpio_allow_dir, num))
{
case SPC300_GPIO_DIRECTION_BIDIR:
chip->get = &spc300_gpio_get_value;
@@ -309,7 +309,7 @@ spc300_gpio_setup (void)
int i;
/* Register allowed gpios through gpio_lib */
- for (i=0 ; i<spc300_gpio_max_nb (spc300_nvram.pkg_cfg); i++)
+ for (i=0 ; i<spc300_gpio_max_nb (spidcom_nvram.pkg_cfg); i++)
{
spc300_gpio_one_setup (i);
}
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 2c2e049606..e9155f65e7 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
@@ -389,11 +389,11 @@ void __init spc300_add_device_uart1(void)
void spc300_add_device_ethernet(void)
{
//Find MAC address from NVRAM
- memcpy(&spc300_ethernet_data.mac_addr, spc300_nvram.eth_address, sizeof(spc300_nvram.eth_address));
+ memcpy(&spc300_ethernet_data.mac_addr, spidcom_nvram.eth_address, sizeof(spidcom_nvram.eth_address));
//Find Eth phy connection from NVRAM
//TODO:use NVRAM defines
- switch((spc300_nvram.pkg_cfg & 0x00000300)>>8)
+ switch((spidcom_nvram.pkg_cfg & 0x00000300)>>8)
{
case 1: //RMII
spc300_ethernet_data.support_mii = 0;
@@ -412,7 +412,7 @@ void spc300_add_device_ethernet(void)
}
//Find PHY address from NVRAM
- spc300_ethernet_data.phy_addr = spc300_nvram.eth_phy_addr;
+ spc300_ethernet_data.phy_addr = spidcom_nvram.eth_phy_addr;
//Register Ethernet device
platform_device_register(&spc300_ethernet_device);
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300.c
index 115193a546..7e7bdfe231 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300.c
@@ -81,8 +81,8 @@ static struct map_desc spc300_nvram_io_desc;
static struct map_desc spc300_plccode_io_desc;
/** Global NVRAM address */
-spc300_nvram_t spc300_nvram;
-EXPORT_SYMBOL(spc300_nvram);
+spidcom_nvram_t spidcom_nvram;
+EXPORT_SYMBOL(spidcom_nvram);
/** Physical address of the start of the memory dedicated to PLC. */
uint32_t spc300_plc_mem_start = 0;
@@ -266,7 +266,7 @@ void __init spc300_map_io(void)
//Set NVRAM mapping and copy it because direct access only accept word read
iotable_init(&spc300_nvram_io_desc, 1);
- spc300_nvram_copy((void*)&spc300_nvram, (void*)spc300_nvram_io_desc.virtual, sizeof(spc300_nvram_t));
+ spidcom_nvram_copy((void*)&spidcom_nvram, (void*)spc300_nvram_io_desc.virtual, sizeof(spidcom_nvram_t));
//Set PLC code mapping
iotable_init(&spc300_plccode_io_desc, 1);
@@ -305,7 +305,7 @@ void spc300_fixup(struct machine_desc *desc, struct tag *tags, char **cmdline, s
//Set NVRAM mapping
spc300_nvram_io_desc.virtual = IO_ADDRESS(SPI_BASE_DIR) + nvram_offset;
spc300_nvram_io_desc.pfn = __phys_to_pfn(SPI_BASE_DIR + nvram_offset);
- spc300_nvram_io_desc.length = sizeof(spc300_nvram_t);
+ spc300_nvram_io_desc.length = sizeof(spidcom_nvram_t);
spc300_nvram_io_desc.type = MT_DEVICE;
//Set PLC code mapping