Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[ARM] 2962/1: scoop: Allow GPIO pin suspend state to be specified
Patch from Richard Purdie
Allow the GPIO pin suspend states to be specified for SCOOP devices.
This is needed for correct operation on the spitz platform.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
authored by Richard Purdie and committed by Russell King 7c398988 1036260e
+18
-2
arch/arm/common/scoop.c
+18
-2
arch/arm/common/scoop.c
···
26
26
struct scoop_dev {
27
27
void *base;
28
28
spinlock_t scoop_lock;
29
+
unsigned short suspend_clr;
30
+
unsigned short suspend_set;
29
31
u32 scoop_gpwr;
30
32
};
31
33
···
92
90
EXPORT_SYMBOL(read_scoop_reg);
93
91
EXPORT_SYMBOL(write_scoop_reg);
94
92
93
+
static void check_scoop_reg(struct scoop_dev *sdev)
94
+
{
95
+
unsigned short mcr;
96
+
97
+
mcr = SCOOP_REG(sdev->base, SCOOP_MCR);
98
+
if ((mcr & 0x100) == 0)
99
+
SCOOP_REG(sdev->base, SCOOP_MCR) = 0x0101;
100
+
}
101
+
95
102
#ifdef CONFIG_PM
96
103
static int scoop_suspend(struct device *dev, pm_message_t state, uint32_t level)
97
104
{
98
105
if (level == SUSPEND_POWER_DOWN) {
99
106
struct scoop_dev *sdev = dev_get_drvdata(dev);
100
107
101
-
sdev->scoop_gpwr = SCOOP_REG(sdev->base,SCOOP_GPWR);
102
-
SCOOP_REG(sdev->base,SCOOP_GPWR) = 0;
108
+
check_scoop_reg(sdev);
109
+
sdev->scoop_gpwr = SCOOP_REG(sdev->base, SCOOP_GPWR);
110
+
SCOOP_REG(sdev->base, SCOOP_GPWR) = (sdev->scoop_gpwr & ~sdev->suspend_clr) | sdev->suspend_set;
103
111
}
104
112
return 0;
105
113
}
···
119
107
if (level == RESUME_POWER_ON) {
120
108
struct scoop_dev *sdev = dev_get_drvdata(dev);
121
109
110
+
check_scoop_reg(sdev);
122
111
SCOOP_REG(sdev->base,SCOOP_GPWR) = sdev->scoop_gpwr;
123
112
}
124
113
return 0;
···
163
150
reset_scoop(dev);
164
151
SCOOP_REG(devptr->base, SCOOP_GPCR) = inf->io_dir & 0xffff;
165
152
SCOOP_REG(devptr->base, SCOOP_GPWR) = inf->io_out & 0xffff;
153
+
154
+
devptr->suspend_clr = inf->suspend_clr;
155
+
devptr->suspend_set = inf->suspend_set;
166
156
167
157
return 0;
168
158
}