Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 169124
b: refs/heads/master
c: 701a5dc
h: refs/heads/master
v: v3
  • Loading branch information
Russell King - ARM Linux authored and Dominik Brodowski committed Nov 9, 2009
1 parent a383574 commit d5b6b3e
Show file tree
Hide file tree
Showing 11 changed files with 124 additions and 41 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: da4f007375197d6683461b995d404b01a7fdf2f5
refs/heads/master: 701a5dc05ad99a06958b3f97cb69d99b47cebee3
19 changes: 12 additions & 7 deletions trunk/drivers/pcmcia/pxa2xx_base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ static const char *skt_names[] = {
#define SKT_DEV_INFO_SIZE(n) \
(sizeof(struct skt_dev_info) + (n)*sizeof(struct soc_pcmcia_socket))

static int pxa2xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt)
int pxa2xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt)
{
skt->res_skt.start = _PCMCIA(skt->nr);
skt->res_skt.end = _PCMCIA(skt->nr) + PCMCIASp - 1;
Expand All @@ -253,9 +253,18 @@ static int pxa2xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt)
return soc_pcmcia_add_one(skt);
}

void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops)
{
/* Provide our PXA2xx specific timing routines. */
ops->set_timing = pxa2xx_pcmcia_set_timing;
#ifdef CONFIG_CPU_FREQ
ops->frequency_change = pxa2xx_pcmcia_frequency_change;
#endif
}

int __pxa2xx_drv_pcmcia_probe(struct device *dev)
{
int i, ret;
int i, ret = 0;
struct pcmcia_low_level *ops;
struct skt_dev_info *sinfo;
struct soc_pcmcia_socket *skt;
Expand All @@ -265,11 +274,7 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev)

ops = (struct pcmcia_low_level *)dev->platform_data;

/* Provide our PXA2xx specific timing routines. */
ops->set_timing = pxa2xx_pcmcia_set_timing;
#ifdef CONFIG_CPU_FREQ
ops->frequency_change = pxa2xx_pcmcia_frequency_change;
#endif
pxa2xx_drv_pcmcia_ops(ops);

sinfo = kzalloc(SKT_DEV_INFO_SIZE(ops->nr), GFP_KERNEL);
if (!sinfo)
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/pcmcia/pxa2xx_base.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* temporary measure */
extern int __pxa2xx_drv_pcmcia_probe(struct device *);

int pxa2xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt);
void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops);

10 changes: 6 additions & 4 deletions trunk/drivers/pcmcia/pxa2xx_lubbock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ static int
lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
const socket_state_t *state)
{
struct sa1111_pcmcia_socket *s = to_skt(skt);
unsigned int pa_dwr_mask, pa_dwr_set, misc_mask, misc_set;
int ret = 0;

Expand Down Expand Up @@ -149,7 +150,7 @@ lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,

if (ret == 0) {
lubbock_set_misc_wr(misc_mask, misc_set);
sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, pa_dwr_set);
sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set);
}

#if 1
Expand All @@ -175,7 +176,7 @@ lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
* Switch to 5V, Configure socket with 5V voltage
*/
lubbock_set_misc_wr(misc_mask, 0);
sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, 0);
sa1111_set_io(s->dev, pa_dwr_mask, 0);

/*
* It takes about 100ms to turn off Vcc.
Expand Down Expand Up @@ -228,8 +229,9 @@ int pcmcia_lubbock_init(struct sa1111_dev *sadev)
/* Set CF Socket 1 power to standby mode. */
lubbock_set_misc_wr((1 << 15) | (1 << 14), 0);

sadev->dev.platform_data = &lubbock_pcmcia_ops;
ret = __pxa2xx_drv_pcmcia_probe(&sadev->dev);
pxa2xx_drv_pcmcia_ops(&lubbock_pcmcia_ops);
ret = sa1111_pcmcia_add(sadev, &lubbock_pcmcia_ops,
pxa2xx_drv_pcmcia_add_one);
}

return ret;
Expand Down
7 changes: 6 additions & 1 deletion trunk/drivers/pcmcia/sa1100_badge4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ static struct pcmcia_low_level badge4_pcmcia_ops = {

.socket_init = sa1111_pcmcia_socket_init,
.socket_suspend = sa1111_pcmcia_socket_suspend,

.first = 0,
.nr = 2,
};

int pcmcia_badge4_init(struct device *dev)
Expand All @@ -146,7 +149,9 @@ int pcmcia_badge4_init(struct device *dev)
__func__,
badge4_pcmvcc, badge4_pcmvpp, badge4_cfvcc);

ret = sa11xx_drv_pcmcia_probe(dev, &badge4_pcmcia_ops, 0, 2);
sa11xx_drv_pcmcia_ops(&badge4_pcmcia_ops);
ret = sa1111_pcmcia_add(dev, &badge4_pcmcia_ops,
sa11xx_drv_pcmcia_add_one);
}

return ret;
Expand Down
20 changes: 14 additions & 6 deletions trunk/drivers/pcmcia/sa1100_jornada720.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,25 @@

static int jornada720_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
{
struct sa1111_pcmcia_socket *s = to_skt(skt);
unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;

/*
* What is all this crap for?
*/
GRER |= 0x00000002;
/* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */
sa1111_set_io_dir(SA1111_DEV(skt->dev), pin, 0, 0);
sa1111_set_io(SA1111_DEV(skt->dev), pin, 0);
sa1111_set_sleep_io(SA1111_DEV(skt->dev), pin, 0);
sa1111_set_io_dir(s->dev, pin, 0, 0);
sa1111_set_io(s->dev, pin, 0);
sa1111_set_sleep_io(s->dev, pin, 0);

return sa1111_pcmcia_hw_init(skt);
}

static int
jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)
{
struct sa1111_pcmcia_socket *s = to_skt(skt);
unsigned int pa_dwr_mask, pa_dwr_set;
int ret;

Expand Down Expand Up @@ -97,7 +99,7 @@ jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_s
unsigned long flags;

local_irq_save(flags);
sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, pa_dwr_set);
sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set);
local_irq_restore(flags);
}

Expand All @@ -113,14 +115,20 @@ static struct pcmcia_low_level jornada720_pcmcia_ops = {

.socket_init = sa1111_pcmcia_socket_init,
.socket_suspend = sa1111_pcmcia_socket_suspend,

.first = 0,
.nr = 2,
};

int __devinit pcmcia_jornada720_init(struct device *dev)
{
int ret = -ENODEV;

if (machine_is_jornada720())
ret = sa11xx_drv_pcmcia_probe(dev, &jornada720_pcmcia_ops, 0, 2);
if (machine_is_jornada720()) {
sa11xx_drv_pcmcia_ops(&jornada720_pcmcia_ops);
ret = sa1111_pcmcia_add(dev, &jornada720_pcmcia_ops,
sa11xx_drv_pcmcia_add_one);
}

return ret;
}
9 changes: 7 additions & 2 deletions trunk/drivers/pcmcia/sa1100_neponset.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
static int
neponset_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)
{
struct sa1111_pcmcia_socket *s = to_skt(skt);
unsigned int ncr_mask, ncr_set, pa_dwr_mask, pa_dwr_set;
int ret;

Expand Down Expand Up @@ -99,7 +100,7 @@ neponset_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_sta
NCR_0 = (NCR_0 & ~ncr_mask) | ncr_set;

local_irq_restore(flags);
sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, pa_dwr_set);
sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set);
}

return 0;
Expand All @@ -121,6 +122,8 @@ static struct pcmcia_low_level neponset_pcmcia_ops = {
.configure_socket = neponset_pcmcia_configure_socket,
.socket_init = neponset_pcmcia_socket_init,
.socket_suspend = sa1111_pcmcia_socket_suspend,
.first = 0,
.nr = 2,
};

int pcmcia_neponset_init(struct sa1111_dev *sadev)
Expand All @@ -135,7 +138,9 @@ int pcmcia_neponset_init(struct sa1111_dev *sadev)
sa1111_set_io_dir(sadev, GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0, 0);
sa1111_set_io(sadev, GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0);
sa1111_set_sleep_io(sadev, GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0);
ret = sa11xx_drv_pcmcia_probe(&sadev->dev, &neponset_pcmcia_ops, 0, 2);
sa11xx_drv_pcmcia_ops(&neponset_pcmcia_ops);
ret = sa1111_pcmcia_add(sadev, &neponset_pcmcia_ops,
sa11xx_drv_pcmcia_add_one);
}

return ret;
Expand Down
58 changes: 45 additions & 13 deletions trunk/drivers/pcmcia/sa1111_generic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ static struct pcmcia_irqs irqs[] = {

int sa1111_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
{
if (skt->irq == NO_IRQ)
skt->irq = skt->nr ? IRQ_S1_READY_NINT : IRQ_S0_READY_NINT;

return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
}

Expand All @@ -43,8 +40,8 @@ void sa1111_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)

void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state)
{
struct sa1111_dev *sadev = SA1111_DEV(skt->dev);
unsigned long status = sa1111_readl(sadev->mapbase + SA1111_PCSR);
struct sa1111_pcmcia_socket *s = to_skt(skt);
unsigned long status = sa1111_readl(s->dev->mapbase + SA1111_PCSR);

switch (skt->nr) {
case 0:
Expand All @@ -71,7 +68,7 @@ void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_sta

int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)
{
struct sa1111_dev *sadev = SA1111_DEV(skt->dev);
struct sa1111_pcmcia_socket *s = to_skt(skt);
unsigned int pccr_skt_mask, pccr_set_mask, val;
unsigned long flags;

Expand Down Expand Up @@ -100,10 +97,10 @@ int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_s
pccr_set_mask |= PCCR_S0_FLT|PCCR_S1_FLT;

local_irq_save(flags);
val = sa1111_readl(sadev->mapbase + SA1111_PCCR);
val = sa1111_readl(s->dev->mapbase + SA1111_PCCR);
val &= ~pccr_skt_mask;
val |= pccr_set_mask & pccr_skt_mask;
sa1111_writel(val, sadev->mapbase + SA1111_PCCR);
sa1111_writel(val, s->dev->mapbase + SA1111_PCCR);
local_irq_restore(flags);

return 0;
Expand All @@ -119,10 +116,45 @@ void sa1111_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
soc_pcmcia_disable_irqs(skt, irqs, ARRAY_SIZE(irqs));
}

int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops,
int (*add)(struct soc_pcmcia_socket *))
{
struct sa1111_pcmcia_socket *s;
int i, ret = 0;

s = kzalloc(sizeof(*s) * ops->nr, GFP_KERNEL);
if (!s)
return -ENODEV;

for (i = 0; i < ops->nr; i++) {
s = kzalloc(sizeof(*s), GFP_KERNEL);
if (!s)
return -ENOMEM;

s->soc.nr = ops->first + i;
s->soc.irq = s->soc.nr ? IRQ_S1_READY_NINT : IRQ_S0_READY_NINT;
s->soc.ops = ops;
s->soc.socket.owner = ops->owner;
s->soc.socket.dev.parent = &dev->dev;
s->dev = dev;

ret = add(&s->soc);
if (ret == 0) {
s->next = dev_get_drvdata(&dev->dev);
dev_set_drvdata(&dev->dev, s);
} else
kfree(s);
}

return ret;
}

static int pcmcia_probe(struct sa1111_dev *dev)
{
void __iomem *base;

dev_set_drvdata(&dev->dev, NULL);

if (!request_mem_region(dev->res.start, 512,
SA1111_DRIVER_NAME(dev)))
return -EBUSY;
Expand Down Expand Up @@ -152,15 +184,15 @@ static int pcmcia_probe(struct sa1111_dev *dev)

static int __devexit pcmcia_remove(struct sa1111_dev *dev)
{
struct skt_dev_info *sinfo = dev_get_drvdata(&dev->dev);
int i;
struct sa1111_pcmcia_socket *next, *s = dev_get_drvdata(&dev->dev);

dev_set_drvdata(&dev->dev, NULL);

for (i = 0; i < sinfo->nskt; i++)
soc_pcmcia_remove_one(&sinfo->skt[i]);
for (; next = s->next, s; s = next) {
soc_pcmcia_remove_one(&s->soc);
kfree(s);
}

kfree(sinfo);
release_mem_region(dev->res.start, 512);
return 0;
}
Expand Down
14 changes: 14 additions & 0 deletions trunk/drivers/pcmcia/sa1111_generic.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
#include "soc_common.h"
#include "sa11xx_base.h"

struct sa1111_pcmcia_socket {
struct soc_pcmcia_socket soc;
struct sa1111_dev *dev;
struct sa1111_pcmcia_socket *next;
};

static inline struct sa1111_pcmcia_socket *to_skt(struct soc_pcmcia_socket *s)
{
return container_of(s, struct sa1111_pcmcia_socket, soc);
}

int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops,
int (*add)(struct soc_pcmcia_socket *));

extern int sa1111_pcmcia_hw_init(struct soc_pcmcia_socket *);
extern void sa1111_pcmcia_hw_shutdown(struct soc_pcmcia_socket *);
extern void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *, struct pcmcia_state *);
Expand Down
21 changes: 14 additions & 7 deletions trunk/drivers/pcmcia/sa11xx_base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static const char *skt_names[] = {
#define SKT_DEV_INFO_SIZE(n) \
(sizeof(struct skt_dev_info) + (n)*sizeof(struct soc_pcmcia_socket))

static int sa11xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt)
int sa11xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt)
{
skt->res_skt.start = _PCMCIA(skt->nr);
skt->res_skt.end = _PCMCIA(skt->nr) + PCMCIASp - 1;
Expand All @@ -195,14 +195,10 @@ static int sa11xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt)

return soc_pcmcia_add_one(skt);
}
EXPORT_SYMBOL(sa11xx_drv_pcmcia_add_one);

int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops,
int first, int nr)
void sa11xx_drv_pcmcia_ops(struct pcmcia_low_level *ops)
{
struct skt_dev_info *sinfo;
struct soc_pcmcia_socket *skt;
int i;

/*
* set default MECR calculation if the board specific
* code did not specify one...
Expand All @@ -216,6 +212,17 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops,
#ifdef CONFIG_CPU_FREQ
ops->frequency_change = sa1100_pcmcia_frequency_change;
#endif
}
EXPORT_SYMBOL(sa11xx_drv_pcmcia_ops);

int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops,
int first, int nr)
{
struct skt_dev_info *sinfo;
struct soc_pcmcia_socket *skt;
int i, ret = 0;

sa11xx_drv_pcmcia_ops(ops);

sinfo = kzalloc(SKT_DEV_INFO_SIZE(nr), GFP_KERNEL);
if (!sinfo)
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/pcmcia/sa11xx_base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ static inline unsigned int sa1100_pcmcia_cmd_time(unsigned int cpu_clock_khz,
}


int sa11xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt);
void sa11xx_drv_pcmcia_ops(struct pcmcia_low_level *ops);
extern int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, int first, int nr);

#endif /* !defined(_PCMCIA_SA1100_H) */

0 comments on commit d5b6b3e

Please sign in to comment.