mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
9e4db1c3ee
Pull ARM platform updates from Russell King:
"This covers platform stuff for platforms I have a direct interest in
(iow, I have the hardware). Essentially:
- as we no longer support any other Acorn platforms other than RiscPC
anymore, we can collect all that code into mach-rpc.
- convert Acorn expansion card stuff to use IRQ allocation functions,
and get rid of NO_IRQ from there.
- cleanups to the ebsa110 platform to move some private stuff out of
its header files.
- large amount of SA11x0 updates:
- conversion of private DMA implementation to DMA engine support
(this actually gives us greater flexibility in drivers over the old
API.)
- re-worked ucb1x00 updates - convert to genirq, remove sa11x0
dependencies, fix various minor issues
- move platform specific sa11x0 framebuffer data into platform files
in arch/arm instead of keeping this in the driver itself
- update sa11x0 IrDA driver for DMA engine, and allow it to use DMA
for SIR transmissions as well as FIR
- rework sa1111 support for genirq, and irq allocation
- fix sa1111 IRQ support so it works again
- use sparse IRQ support
After this, I have one more pull request remaining from my current
set, which I think is going to be the most problematical as it
generates 8 conflicts."
Fixed up the trivial conflict in arch/arm/mach-rpc/Makefile as per
Russell.
* 'platforms' of git://git.linaro.org/people/rmk/linux-arm: (125 commits)
ARM: 7343/1: sa11x0: convert to sparse IRQ
ARM: 7342/2: sa1100: prepare for sparse irq conversion
ARM: 7341/1: input: prepare jornada720 keyboard and ts for sa11x0 sparse irq
ARM: 7340/1: rtc: sa1100: include mach/irqs.h instead of asm/irq.h
ARM: sa11x0: remove unused DMA controller definitions
ARM: sa11x0: remove old SoC private DMA driver
USB: sa1111: add hcd .reset method
USB: sa1111: add OHCI shutdown methods
USB: sa1111: reorganize ohci-sa1111.c
USB: sa1111: get rid of nasty printk(KERN_DEBUG "%s: ...", __FILE__)
USB: sa1111: sparse and checkpatch cleanups
ARM: sa11x0: don't static map sa1111
ARM: sa1111: use dev_err() rather than printk()
ARM: sa1111: cleanup sub-device registration and unregistration
ARM: sa1111: only setup DMA for DMA capable devices
ARM: sa1111: register sa1111 devices with dmabounce in bus notifier
ARM: sa1111: move USB interface register definitions to ohci-sa1111.c
ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.c
ARM: sa1111: move PS/2 interface register definitions to sa1111p2.c
ARM: sa1111: delete unused physical GPIO register definitions
...
129 lines
3.1 KiB
C
129 lines
3.1 KiB
C
/*
|
|
* linux/drivers/pcmcia/sa1100_neponset.c
|
|
*
|
|
* Neponset PCMCIA specific routines
|
|
*/
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/device.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/init.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
#include <mach/neponset.h>
|
|
#include <asm/hardware/sa1111.h>
|
|
|
|
#include "sa1111_generic.h"
|
|
|
|
/*
|
|
* Neponset uses the Maxim MAX1600, with the following connections:
|
|
*
|
|
* MAX1600 Neponset
|
|
*
|
|
* A0VCC SA-1111 GPIO A<1>
|
|
* A1VCC SA-1111 GPIO A<0>
|
|
* A0VPP CPLD NCR A0VPP
|
|
* A1VPP CPLD NCR A1VPP
|
|
* B0VCC SA-1111 GPIO A<2>
|
|
* B1VCC SA-1111 GPIO A<3>
|
|
* B0VPP ground (slot B is CF)
|
|
* B1VPP ground (slot B is CF)
|
|
*
|
|
* VX VCC (5V)
|
|
* VY VCC3_3 (3.3V)
|
|
* 12INA 12V
|
|
* 12INB ground (slot B is CF)
|
|
*
|
|
* The MAX1600 CODE pin is tied to ground, placing the device in
|
|
* "Standard Intel code" mode. Refer to the Maxim data sheet for
|
|
* the corresponding truth table.
|
|
*/
|
|
|
|
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;
|
|
|
|
switch (skt->nr) {
|
|
case 0:
|
|
pa_dwr_mask = GPIO_A0 | GPIO_A1;
|
|
ncr_mask = NCR_A0VPP | NCR_A1VPP;
|
|
|
|
if (state->Vpp == 0)
|
|
ncr_set = 0;
|
|
else if (state->Vpp == 120)
|
|
ncr_set = NCR_A1VPP;
|
|
else if (state->Vpp == state->Vcc)
|
|
ncr_set = NCR_A0VPP;
|
|
else {
|
|
printk(KERN_ERR "%s(): unrecognized VPP %u\n",
|
|
__func__, state->Vpp);
|
|
return -1;
|
|
}
|
|
break;
|
|
|
|
case 1:
|
|
pa_dwr_mask = GPIO_A2 | GPIO_A3;
|
|
ncr_mask = 0;
|
|
ncr_set = 0;
|
|
|
|
if (state->Vpp != state->Vcc && state->Vpp != 0) {
|
|
printk(KERN_ERR "%s(): CF slot cannot support VPP %u\n",
|
|
__func__, state->Vpp);
|
|
return -1;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
return -1;
|
|
}
|
|
|
|
/*
|
|
* pa_dwr_set is the mask for selecting Vcc on both sockets.
|
|
* pa_dwr_mask selects which bits (and therefore socket) we change.
|
|
*/
|
|
switch (state->Vcc) {
|
|
default:
|
|
case 0: pa_dwr_set = 0; break;
|
|
case 33: pa_dwr_set = GPIO_A1|GPIO_A2; break;
|
|
case 50: pa_dwr_set = GPIO_A0|GPIO_A3; break;
|
|
}
|
|
|
|
ret = sa1111_pcmcia_configure_socket(skt, state);
|
|
if (ret == 0) {
|
|
neponset_ncr_frob(ncr_mask, ncr_set);
|
|
sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static struct pcmcia_low_level neponset_pcmcia_ops = {
|
|
.owner = THIS_MODULE,
|
|
.configure_socket = neponset_pcmcia_configure_socket,
|
|
.first = 0,
|
|
.nr = 2,
|
|
};
|
|
|
|
int pcmcia_neponset_init(struct sa1111_dev *sadev)
|
|
{
|
|
int ret = -ENODEV;
|
|
|
|
if (machine_is_assabet()) {
|
|
/*
|
|
* Set GPIO_A<3:0> to be outputs for the MAX1600,
|
|
* and switch to standby mode.
|
|
*/
|
|
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);
|
|
sa11xx_drv_pcmcia_ops(&neponset_pcmcia_ops);
|
|
ret = sa1111_pcmcia_add(sadev, &neponset_pcmcia_ops,
|
|
sa11xx_drv_pcmcia_add_one);
|
|
}
|
|
|
|
return ret;
|
|
}
|