xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v3.14-rc6' into devel

Browse Source 
Linux 3.14-rc6
This commit is contained in:
Linus Walleij
2014-03-14 10:26:45 +01:00
parent 23600969ff fa389e2202
commit 9e294427f6
1429 changed files with 17464 additions and 9013 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpio/Kconfig
View File

@@ -419,6 +419,7 @@ config GPIO_GRGPIO
config GPIO_TB10X
bool
select GENERIC_IRQ_CHIP
select OF_GPIO
comment "I2C GPIO expanders:"

4
drivers/gpio/gpio-bcm-kona.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012-2013 Broadcom Corporation
* Copyright (C) 2012-2014 Broadcom Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -676,6 +676,6 @@ static struct platform_driver bcm_kona_gpio_driver = {
module_platform_driver(bcm_kona_gpio_driver);
MODULE_AUTHOR("Broadcom");
MODULE_AUTHOR("Broadcom Corporation <bcm-kernel-feedback-list@broadcom.com>");
MODULE_DESCRIPTION("Broadcom Kona GPIO Driver");
MODULE_LICENSE("GPL v2");

1
drivers/gpio/gpio-clps711x.c
View File

@@ -98,3 +98,4 @@ module_platform_driver(clps711x_gpio_driver);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Alexander Shiyan <shc_work@mail.ru>");
MODULE_DESCRIPTION("CLPS711X GPIO driver");
MODULE_ALIAS("platform:clps711x-gpio");

4
drivers/gpio/gpio-intel-mid.c
View File

@@ -390,8 +390,8 @@ static const struct irq_domain_ops intel_gpio_irq_ops = {
static int intel_gpio_runtime_idle(struct device *dev)
{
pm_schedule_suspend(dev, 500);
return -EBUSY;
int err = pm_schedule_suspend(dev, 500);
return err ?: -EBUSY;
}
static const struct dev_pm_ops intel_gpio_pm_ops = {

16
drivers/gpio/gpio-xtensa.c
View File

@@ -40,6 +40,8 @@
#error GPIO32 option is not enabled for your xtensa core variant
#endif
#if XCHAL_HAVE_CP
static inline unsigned long enable_cp(unsigned long *cpenable)
{
unsigned long flags;
@@ -57,6 +59,20 @@ static inline void disable_cp(unsigned long flags, unsigned long cpenable)
local_irq_restore(flags);
}
#else
static inline unsigned long enable_cp(unsigned long *cpenable)
{
*cpenable = 0; /* avoid uninitialized value warning */
return 0;
}
static inline void disable_cp(unsigned long flags, unsigned long cpenable)
{
}
#endif /* XCHAL_HAVE_CP */
static int xtensa_impwire_get_direction(struct gpio_chip *gc, unsigned offset)
{
return 1; /* input only */