mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge branch 'linux-2.6' into for-2.6.24
This commit is contained in:
Paul Mackerras
commit
35438c4327
567 changed files with 8334 additions and 10830 deletions
|
|
@ -3,6 +3,11 @@ menuconfig MACINTOSH_DRIVERS
|
|||
bool "Macintosh device drivers"
|
||||
depends on PPC || MAC || X86
|
||||
default y if (PPC_PMAC || MAC)
|
||||
---help---
|
||||
Say Y here to get to see options for devices used with Macintosh
|
||||
computers. This option alone does not add any kernel code.
|
||||
|
||||
If you say N, all options in this submenu will be skipped and disabled.
|
||||
|
||||
if MACINTOSH_DRIVERS
|
||||
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ static int sleepy_trackpad;
|
|||
static int autopoll_devs;
|
||||
int __adb_probe_sync;
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static void adb_notify_sleep(struct pmu_sleep_notifier *self, int when);
|
||||
static struct pmu_sleep_notifier adb_sleep_notifier = {
|
||||
adb_notify_sleep,
|
||||
|
|
@ -313,7 +313,7 @@ int __init adb_init(void)
|
|||
printk(KERN_WARNING "Warning: no ADB interface detected\n");
|
||||
adb_controller = NULL;
|
||||
} else {
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
pmu_register_sleep_notifier(&adb_sleep_notifier);
|
||||
#endif /* CONFIG_PM */
|
||||
#ifdef CONFIG_PPC
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#include <linux/sysctl.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/kbd_kern.h>
|
||||
|
||||
|
||||
static struct input_dev *emumousebtn;
|
||||
|
|
|
|||
|
|
@ -152,10 +152,10 @@ static spinlock_t pmu_lock;
|
|||
static u8 pmu_intr_mask;
|
||||
static int pmu_version;
|
||||
static int drop_interrupts;
|
||||
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
|
||||
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
|
||||
static int option_lid_wakeup = 1;
|
||||
#endif /* CONFIG_PM && CONFIG_PPC32 */
|
||||
#if (defined(CONFIG_PM)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)
|
||||
#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
|
||||
#if (defined(CONFIG_PM_SLEEP)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)
|
||||
static int sleep_in_progress;
|
||||
#endif
|
||||
static unsigned long async_req_locks;
|
||||
|
|
@ -875,7 +875,7 @@ proc_read_options(char *page, char **start, off_t off,
|
|||
{
|
||||
char *p = page;
|
||||
|
||||
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
|
||||
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
|
||||
if (pmu_kind == PMU_KEYLARGO_BASED &&
|
||||
pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
|
||||
p += sprintf(p, "lid_wakeup=%d\n", option_lid_wakeup);
|
||||
|
|
@ -916,7 +916,7 @@ proc_write_options(struct file *file, const char __user *buffer,
|
|||
*(val++) = 0;
|
||||
while(*val == ' ')
|
||||
val++;
|
||||
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
|
||||
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
|
||||
if (pmu_kind == PMU_KEYLARGO_BASED &&
|
||||
pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
|
||||
if (!strcmp(label, "lid_wakeup"))
|
||||
|
|
@ -1738,7 +1738,7 @@ pmu_present(void)
|
|||
return via != 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
||||
static LIST_HEAD(sleep_notifiers);
|
||||
|
||||
|
|
@ -1769,9 +1769,9 @@ pmu_unregister_sleep_notifier(struct pmu_sleep_notifier* n)
|
|||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(pmu_unregister_sleep_notifier);
|
||||
#endif /* CONFIG_PM */
|
||||
#endif /* CONFIG_PM_SLEEP */
|
||||
|
||||
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
|
||||
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
|
||||
|
||||
/* Sleep is broadcast last-to-first */
|
||||
static void broadcast_sleep(int when)
|
||||
|
|
@ -2390,7 +2390,7 @@ powerbook_sleep_3400(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_PM && CONFIG_PPC32 */
|
||||
#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
|
||||
|
||||
/*
|
||||
* Support for /dev/pmu device
|
||||
|
|
@ -2573,7 +2573,7 @@ pmu_ioctl(struct inode * inode, struct file *filp,
|
|||
int error = -EINVAL;
|
||||
|
||||
switch (cmd) {
|
||||
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
|
||||
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
|
||||
case PMU_IOC_SLEEP:
|
||||
if (!capable(CAP_SYS_ADMIN))
|
||||
return -EACCES;
|
||||
|
|
@ -2601,7 +2601,7 @@ pmu_ioctl(struct inode * inode, struct file *filp,
|
|||
return put_user(0, argp);
|
||||
else
|
||||
return put_user(1, argp);
|
||||
#endif /* CONFIG_PM && CONFIG_PPC32 */
|
||||
#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
|
||||
|
||||
#ifdef CONFIG_PMAC_BACKLIGHT_LEGACY
|
||||
/* Compatibility ioctl's for backlight */
|
||||
|
|
@ -2757,7 +2757,7 @@ pmu_polled_request(struct adb_request *req)
|
|||
* to do suspend-to-disk.
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
|
||||
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
|
||||
|
||||
int pmu_sys_suspended;
|
||||
|
||||
|
|
@ -2792,7 +2792,7 @@ static int pmu_sys_resume(struct sys_device *sysdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_PM && CONFIG_PPC32 */
|
||||
#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
|
||||
|
||||
static struct sysdev_class pmu_sysclass = {
|
||||
set_kset_name("pmu"),
|
||||
|
|
@ -2803,10 +2803,10 @@ static struct sys_device device_pmu = {
|
|||
};
|
||||
|
||||
static struct sysdev_driver driver_pmu = {
|
||||
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
|
||||
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
|
||||
.suspend = &pmu_sys_suspend,
|
||||
.resume = &pmu_sys_resume,
|
||||
#endif /* CONFIG_PM && CONFIG_PPC32 */
|
||||
#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
|
||||
};
|
||||
|
||||
static int __init init_pmu_sysfs(void)
|
||||
|
|
@ -2841,10 +2841,10 @@ EXPORT_SYMBOL(pmu_wait_complete);
|
|||
EXPORT_SYMBOL(pmu_suspend);
|
||||
EXPORT_SYMBOL(pmu_resume);
|
||||
EXPORT_SYMBOL(pmu_unlock);
|
||||
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
|
||||
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
|
||||
EXPORT_SYMBOL(pmu_enable_irled);
|
||||
EXPORT_SYMBOL(pmu_battery_count);
|
||||
EXPORT_SYMBOL(pmu_batteries);
|
||||
EXPORT_SYMBOL(pmu_power_flags);
|
||||
#endif /* CONFIG_PM && CONFIG_PPC32 */
|
||||
#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
|
||||
|
||||
|
|
|
|||
|
|
@ -818,243 +818,3 @@ pmu_present(void)
|
|||
{
|
||||
return (pmu_kind != PMU_UNKNOWN);
|
||||
}
|
||||
|
||||
#if 0 /* needs some work for 68K */
|
||||
|
||||
/*
|
||||
* This struct is used to store config register values for
|
||||
* PCI devices which may get powered off when we sleep.
|
||||
*/
|
||||
static struct pci_save {
|
||||
u16 command;
|
||||
u16 cache_lat;
|
||||
u16 intr;
|
||||
} *pbook_pci_saves;
|
||||
static int n_pbook_pci_saves;
|
||||
|
||||
static inline void
|
||||
pbook_pci_save(void)
|
||||
{
|
||||
int npci;
|
||||
struct pci_dev *pd = NULL;
|
||||
struct pci_save *ps;
|
||||
|
||||
npci = 0;
|
||||
while ((pd = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pd)) != NULL)
|
||||
++npci;
|
||||
n_pbook_pci_saves = npci;
|
||||
if (npci == 0)
|
||||
return;
|
||||
ps = kmalloc(npci * sizeof(*ps), GFP_KERNEL);
|
||||
pbook_pci_saves = ps;
|
||||
if (ps == NULL)
|
||||
return;
|
||||
|
||||
pd = NULL;
|
||||
while ((pd = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pd)) != NULL) {
|
||||
pci_read_config_word(pd, PCI_COMMAND, &ps->command);
|
||||
pci_read_config_word(pd, PCI_CACHE_LINE_SIZE, &ps->cache_lat);
|
||||
pci_read_config_word(pd, PCI_INTERRUPT_LINE, &ps->intr);
|
||||
++ps;
|
||||
--npci;
|
||||
}
|
||||
}
|
||||
|
||||
static inline void
|
||||
pbook_pci_restore(void)
|
||||
{
|
||||
u16 cmd;
|
||||
struct pci_save *ps = pbook_pci_saves;
|
||||
struct pci_dev *pd = NULL;
|
||||
int j;
|
||||
|
||||
while ((pd = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pd)) != NULL) {
|
||||
if (ps->command == 0)
|
||||
continue;
|
||||
pci_read_config_word(pd, PCI_COMMAND, &cmd);
|
||||
if ((ps->command & ~cmd) == 0)
|
||||
continue;
|
||||
switch (pd->hdr_type) {
|
||||
case PCI_HEADER_TYPE_NORMAL:
|
||||
for (j = 0; j < 6; ++j)
|
||||
pci_write_config_dword(pd,
|
||||
PCI_BASE_ADDRESS_0 + j*4,
|
||||
pd->resource[j].start);
|
||||
pci_write_config_dword(pd, PCI_ROM_ADDRESS,
|
||||
pd->resource[PCI_ROM_RESOURCE].start);
|
||||
pci_write_config_word(pd, PCI_CACHE_LINE_SIZE,
|
||||
ps->cache_lat);
|
||||
pci_write_config_word(pd, PCI_INTERRUPT_LINE,
|
||||
ps->intr);
|
||||
pci_write_config_word(pd, PCI_COMMAND, ps->command);
|
||||
break;
|
||||
/* other header types not restored at present */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Put the powerbook to sleep.
|
||||
*/
|
||||
#define IRQ_ENABLE ((unsigned int *)0xf3000024)
|
||||
#define MEM_CTRL ((unsigned int *)0xf8000070)
|
||||
|
||||
int powerbook_sleep(void)
|
||||
{
|
||||
int ret, i, x;
|
||||
static int save_backlight;
|
||||
static unsigned int save_irqen;
|
||||
unsigned long msr;
|
||||
unsigned int hid0;
|
||||
unsigned long p, wait;
|
||||
struct adb_request sleep_req;
|
||||
|
||||
/* Notify device drivers */
|
||||
ret = blocking_notifier_call_chain(&sleep_notifier_list,
|
||||
PBOOK_SLEEP, NULL);
|
||||
if (ret & NOTIFY_STOP_MASK)
|
||||
return -EBUSY;
|
||||
|
||||
/* Sync the disks. */
|
||||
/* XXX It would be nice to have some way to ensure that
|
||||
* nobody is dirtying any new buffers while we wait. */
|
||||
sys_sync();
|
||||
|
||||
/* Turn off the display backlight */
|
||||
save_backlight = backlight_enabled;
|
||||
if (save_backlight)
|
||||
pmu_enable_backlight(0);
|
||||
|
||||
/* Give the disks a little time to actually finish writing */
|
||||
for (wait = jiffies + (HZ/4); time_before(jiffies, wait); )
|
||||
mb();
|
||||
|
||||
/* Disable all interrupts except pmu */
|
||||
save_irqen = in_le32(IRQ_ENABLE);
|
||||
for (i = 0; i < 32; ++i)
|
||||
if (i != vias->intrs[0].line && (save_irqen & (1 << i)))
|
||||
disable_irq(i);
|
||||
asm volatile("mtdec %0" : : "r" (0x7fffffff));
|
||||
|
||||
/* Save the state of PCI config space for some slots */
|
||||
pbook_pci_save();
|
||||
|
||||
/* Set the memory controller to keep the memory refreshed
|
||||
while we're asleep */
|
||||
for (i = 0x403f; i >= 0x4000; --i) {
|
||||
out_be32(MEM_CTRL, i);
|
||||
do {
|
||||
x = (in_be32(MEM_CTRL) >> 16) & 0x3ff;
|
||||
} while (x == 0);
|
||||
if (x >= 0x100)
|
||||
break;
|
||||
}
|
||||
|
||||
/* Ask the PMU to put us to sleep */
|
||||
pmu_request(&sleep_req, NULL, 5, PMU_SLEEP, 'M', 'A', 'T', 'T');
|
||||
while (!sleep_req.complete)
|
||||
mb();
|
||||
/* displacement-flush the L2 cache - necessary? */
|
||||
for (p = KERNELBASE; p < KERNELBASE + 0x100000; p += 0x1000)
|
||||
i = *(volatile int *)p;
|
||||
asleep = 1;
|
||||
|
||||
/* Put the CPU into sleep mode */
|
||||
asm volatile("mfspr %0,1008" : "=r" (hid0) :);
|
||||
hid0 = (hid0 & ~(HID0_NAP | HID0_DOZE)) | HID0_SLEEP;
|
||||
asm volatile("mtspr 1008,%0" : : "r" (hid0));
|
||||
local_save_flags(msr);
|
||||
msr |= MSR_POW | MSR_EE;
|
||||
local_irq_restore(msr);
|
||||
udelay(10);
|
||||
|
||||
/* OK, we're awake again, start restoring things */
|
||||
out_be32(MEM_CTRL, 0x3f);
|
||||
pbook_pci_restore();
|
||||
|
||||
/* wait for the PMU interrupt sequence to complete */
|
||||
while (asleep)
|
||||
mb();
|
||||
|
||||
/* reenable interrupts */
|
||||
for (i = 0; i < 32; ++i)
|
||||
if (i != vias->intrs[0].line && (save_irqen & (1 << i)))
|
||||
enable_irq(i);
|
||||
|
||||
/* Notify drivers */
|
||||
blocking_notifier_call_chain(&sleep_notifier_list, PBOOK_WAKE, NULL);
|
||||
|
||||
/* reenable ADB autopoll */
|
||||
pmu_adb_autopoll(adb_dev_map);
|
||||
|
||||
/* Turn on the screen backlight, if it was on before */
|
||||
if (save_backlight)
|
||||
pmu_enable_backlight(1);
|
||||
|
||||
/* Wait for the hard disk to spin up */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Support for /dev/pmu device
|
||||
*/
|
||||
static int pmu_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static ssize_t pmu_read(struct file *file, char *buf,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static ssize_t pmu_write(struct file *file, const char *buf,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int pmu_ioctl(struct inode * inode, struct file *filp,
|
||||
u_int cmd, u_long arg)
|
||||
{
|
||||
int error;
|
||||
__u32 value;
|
||||
|
||||
switch (cmd) {
|
||||
case PMU_IOC_SLEEP:
|
||||
return -ENOSYS;
|
||||
case PMU_IOC_GET_BACKLIGHT:
|
||||
return put_user(backlight_level, (__u32 *)arg);
|
||||
case PMU_IOC_SET_BACKLIGHT:
|
||||
error = get_user(value, (__u32 *)arg);
|
||||
if (!error)
|
||||
pmu_set_brightness(value);
|
||||
return error;
|
||||
case PMU_IOC_GET_MODEL:
|
||||
return put_user(pmu_kind, (__u32 *)arg);
|
||||
}
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static const struct file_operations pmu_device_fops = {
|
||||
.read = pmu_read,
|
||||
.write = pmu_write,
|
||||
.ioctl = pmu_ioctl,
|
||||
.open = pmu_open,
|
||||
};
|
||||
|
||||
static struct miscdevice pmu_device = {
|
||||
PMU_MINOR, "pmu", &pmu_device_fops
|
||||
};
|
||||
|
||||
void pmu_device_init(void)
|
||||
{
|
||||
if (!via)
|
||||
return;
|
||||
if (misc_register(&pmu_device) < 0)
|
||||
printk(KERN_ERR "via-pmu68k: cannot register misc device.\n");
|
||||
}
|
||||
#endif /* CONFIG_PMAC_PBOOK */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue