Permalink
Browse files

Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/k…

…ernel/git/gregkh/char-misc

Pull char/misc driver patches from Greg Kroah-Hartman:
 "Here's the big char/misc driver patches for 3.9-rc1.

  Nothing major here, just lots of different driver updates (mei,
  hyperv, ipack, extcon, vmci, etc.).

  All of these have been in the linux-next tree for a while."

* tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (209 commits)
  w1: w1_therm: Add force-pullup option for "broken" sensors
  w1: ds2482: Added 1-Wire pull-up support to the driver
  vme: add missing put_device() after device_register() fails
  extcon: max8997: Use workqueue to check cable state after completing boot of platform
  extcon: max8997: Set default UART/USB path on probe
  extcon: max8997: Consolidate duplicate code for checking ADC/CHG cable type
  extcon: max8997: Set default of ADC debounce time during initialization
  extcon: max8997: Remove duplicate code related to set H/W line path
  extcon: max8997: Move defined constant to header file
  extcon: max77693: Make max77693_extcon_cable static
  extcon: max8997: Remove unreachable code
  extcon: max8997: Make max8997_extcon_cable static
  extcon: max77693: Remove unnecessary goto statement to improve readability
  extcon: max77693: Convert to devm_input_allocate_device()
  extcon: gpio: Rename filename of extcon-gpio.c according to kernel naming style
  CREDITS: update email and address of Harald Hoyer
  extcon: arizona: Use MICDET for final microphone identification
  extcon: arizona: Always take the first HPDET reading as the final one
  extcon: arizona: Clear _trig_sts bits after jack detection
  extcon: arizona: Don't HPDET magic when headphones are enabled
  ...
  • Loading branch information...
2 parents 21eaab6 + 29e5507 commit 7ed214ac2095f561a94335ca672b6c42a1ea40ff @torvalds committed Feb 21, 2013
Showing with 20,749 additions and 4,115 deletions.
  1. +4 −4 CREDITS
  2. +1 −1 Documentation/DocBook/uio-howto.tmpl
  3. +10 −3 Documentation/w1/slaves/w1_therm
  4. +7 −0 MAINTAINERS
  5. +2 −0 drivers/Kconfig
  6. +1 −0 drivers/Makefile
  7. +1 −1 drivers/char/hw_random/exynos-rng.c
  8. +5 −5 drivers/char/mem.c
  9. +340 −305 drivers/char/pcmcia/synclink_cs.c
  10. +2 −2 drivers/extcon/Kconfig
  11. +756 −54 drivers/extcon/extcon-arizona.c
  12. +1 −1 drivers/extcon/extcon-gpio.c
  13. +717 −264 drivers/extcon/extcon-max77693.c
  14. +496 −238 drivers/extcon/extcon-max8997.c
  15. +1 −2 drivers/hid/hid-hyperv.c
  16. +21 −12 drivers/hv/channel.c
  17. +93 −0 drivers/hv/channel_mgmt.c
  18. +167 −65 drivers/hv/connection.c
  19. +36 −36 drivers/hv/hv.c
  20. +54 −9 drivers/hv/hv_balloon.c
  21. +33 −13 drivers/hv/hv_util.c
  22. +31 −34 drivers/hv/hyperv_vmbus.h
  23. +113 −17 drivers/hv/ring_buffer.c
  24. +45 −9 drivers/hv/vmbus_drv.c
  25. +49 −64 drivers/ipack/devices/ipoctal.c
  26. +10 −0 drivers/mfd/wm5102-tables.c
  27. +12 −0 drivers/misc/Kconfig
  28. +3 −0 drivers/misc/Makefile
  29. +1 −1 drivers/misc/cb710/Kconfig
  30. +243 −0 drivers/misc/lattice-ecp3-config.c
  31. +12 −3 drivers/misc/mei/Kconfig
  32. +4 −2 drivers/misc/mei/Makefile
  33. +87 −77 drivers/misc/mei/amthif.c
  34. +729 −0 drivers/misc/mei/client.c
  35. +102 −0 drivers/misc/mei/client.h
  36. +669 −0 drivers/misc/mei/hbm.c
  37. +39 −0 drivers/misc/mei/hbm.h
  38. +167 −0 drivers/misc/mei/hw-me-regs.h
  39. +576 −0 drivers/misc/mei/hw-me.c
  40. +48 −0 drivers/misc/mei/hw-me.h
  41. +16 −109 drivers/misc/mei/hw.h
  42. +37 −535 drivers/misc/mei/init.c
  43. +0 −388 drivers/misc/mei/interface.c
  44. +0 −81 drivers/misc/mei/interface.h
  45. +43 −613 drivers/misc/mei/interrupt.c
  46. +0 −366 drivers/misc/mei/iorw.c
  47. +135 −401 drivers/misc/mei/main.c
  48. +186 −164 drivers/misc/mei/mei_dev.h
  49. +396 −0 drivers/misc/mei/pci-me.c
  50. +44 −33 drivers/misc/mei/wd.c
  51. +2 −1 drivers/misc/ti-st/st_core.c
  52. +16 −0 drivers/misc/vmw_vmci/Kconfig
  53. +4 −0 drivers/misc/vmw_vmci/Makefile
  54. +1,214 −0 drivers/misc/vmw_vmci/vmci_context.c
  55. +182 −0 drivers/misc/vmw_vmci/vmci_context.h
  56. +500 −0 drivers/misc/vmw_vmci/vmci_datagram.c
  57. +52 −0 drivers/misc/vmw_vmci/vmci_datagram.h
  58. +604 −0 drivers/misc/vmw_vmci/vmci_doorbell.c
  59. +51 −0 drivers/misc/vmw_vmci/vmci_doorbell.h
  60. +117 −0 drivers/misc/vmw_vmci/vmci_driver.c
  61. +50 −0 drivers/misc/vmw_vmci/vmci_driver.h
  62. +224 −0 drivers/misc/vmw_vmci/vmci_event.c
  63. +25 −0 drivers/misc/vmw_vmci/vmci_event.h
  64. +759 −0 drivers/misc/vmw_vmci/vmci_guest.c
  65. +142 −0 drivers/misc/vmw_vmci/vmci_handle_array.c
  66. +52 −0 drivers/misc/vmw_vmci/vmci_handle_array.h
  67. +1,043 −0 drivers/misc/vmw_vmci/vmci_host.c
  68. +3,425 −0 drivers/misc/vmw_vmci/vmci_queue_pair.c
  69. +191 −0 drivers/misc/vmw_vmci/vmci_queue_pair.h
  70. +229 −0 drivers/misc/vmw_vmci/vmci_resource.c
  71. +59 −0 drivers/misc/vmw_vmci/vmci_resource.h
  72. +226 −0 drivers/misc/vmw_vmci/vmci_route.c
  73. +30 −0 drivers/misc/vmw_vmci/vmci_route.h
  74. +1 −1 drivers/mmc/host/Kconfig
  75. +4 −0 drivers/net/Kconfig
  76. +1 −0 drivers/net/Makefile
  77. +1 −2 drivers/net/hyperv/netvsc_drv.c
  78. +408 −0 drivers/net/ntb_netdev.c
  79. +13 −0 drivers/ntb/Kconfig
  80. +3 −0 drivers/ntb/Makefile
  81. +1,141 −0 drivers/ntb/ntb_hw.c
  82. +181 −0 drivers/ntb/ntb_hw.h
  83. +139 −0 drivers/ntb/ntb_regs.h
  84. +1,441 −0 drivers/ntb/ntb_transport.c
  85. +3 −5 drivers/pcmcia/i82092.c
  86. +1 −0 drivers/pcmcia/vrc4171_card.c
  87. +6 −6 drivers/scsi/storvsc_drv.c
  88. +1 −0 drivers/vme/vme.c
  89. +18 −34 drivers/w1/masters/ds1wm.c
  90. +45 −6 drivers/w1/masters/ds2482.c
  91. +10 −39 drivers/w1/masters/mxc_w1.c
  92. +1 −1 drivers/w1/masters/w1-gpio.c
  93. +16 −20 drivers/w1/slaves/w1_therm.c
  94. 0 include/linux/extcon/{extcon_gpio.h → extcon-gpio.h}
  95. +230 −18 include/linux/hyperv.h
  96. +3 −1 include/linux/mfd/arizona/core.h
  97. +21 −0 include/linux/mfd/arizona/pdata.h
  98. +56 −0 include/linux/mfd/arizona/registers.h
  99. +86 −0 include/linux/mfd/max77693-private.h
  100. +9 −0 include/linux/mfd/max77693.h
  101. +64 −0 include/linux/mfd/max8997-private.h
  102. +10 −15 include/linux/mfd/max8997.h
  103. +83 −0 include/linux/ntb.h
  104. +82 −0 include/linux/vmw_vmci_api.h
  105. +880 −0 include/linux/vmw_vmci_defs.h
  106. +39 −40 tools/hv/hv_kvp_daemon.c
  107. +10 −14 tools/hv/hv_set_ifconfig.sh
View
@@ -1572,12 +1572,12 @@ S: Wantage, New Jersey 07461
S: USA
N: Harald Hoyer
-E: harald.hoyer@parzelle.de
-W: http://parzelle.de/
+E: harald@redhat.com
+W: http://www.harald-hoyer.de
D: ip_masq_quake
D: md boot support
-S: Hohe Strasse 30
-S: D-70176 Stuttgart
+S: Am Strand 5
+S: D-19063 Schwerin
S: Germany
N: Jan Hubicka
@@ -984,7 +984,7 @@ int main()
return errno;
}
configfd = open("/sys/class/uio/uio0/device/config", O_RDWR);
- if (uiofd < 0) {
+ if (configfd < 0) {
perror("config open:");
return errno;
}
@@ -34,9 +34,16 @@ currently supported. The driver also doesn't support reduced
precision (which would also reduce the conversion time).
The module parameter strong_pullup can be set to 0 to disable the
-strong pullup or 1 to enable. If enabled the 5V strong pullup will be
-enabled when the conversion is taking place provided the master driver
-must support the strong pullup (or it falls back to a pullup
+strong pullup, 1 to enable autodetection or 2 to force strong pullup.
+In case of autodetection, the driver will use the "READ POWER SUPPLY"
+command to check if there are pariste powered devices on the bus.
+If so, it will activate the master's strong pullup.
+In case the detection of parasite devices using this command fails
+(seems to be the case with some DS18S20) the strong pullup can
+be force-enabled.
+If the strong pullup is enabled, the master's strong pullup will be
+driven when the conversion is taking place, provided the master driver
+does support the strong pullup (or it falls back to a pullup
resistor). The DS18b20 temperature sensor specification lists a
maximum current draw of 1.5mA and that a 5k pullup resistor is not
sufficient. The strong pullup is designed to provide the additional
View
@@ -5405,6 +5405,13 @@ S: Maintained
F: Documentation/scsi/NinjaSCSI.txt
F: drivers/scsi/nsp32*
+NTB DRIVER
+M: Jon Mason <jon.mason@intel.com>
+S: Supported
+F: drivers/ntb/
+F: drivers/net/ntb_netdev.c
+F: include/linux/ntb.h
+
NTFS FILESYSTEM
M: Anton Altaparmakov <anton@tuxera.com>
L: linux-ntfs-dev@lists.sourceforge.net
View
@@ -152,6 +152,8 @@ source "drivers/memory/Kconfig"
source "drivers/iio/Kconfig"
+source "drivers/ntb/Kconfig"
+
source "drivers/vme/Kconfig"
source "drivers/pwm/Kconfig"
View
@@ -147,3 +147,4 @@ obj-$(CONFIG_MEMORY) += memory/
obj-$(CONFIG_IIO) += iio/
obj-$(CONFIG_VME_BUS) += vme/
obj-$(CONFIG_IPACK_BUS) += ipack/
+obj-$(CONFIG_NTB) += ntb/
@@ -163,7 +163,7 @@ static int exynos_rng_runtime_resume(struct device *dev)
}
-UNIVERSAL_DEV_PM_OPS(exynos_rng_pm_ops, exynos_rng_runtime_suspend,
+static UNIVERSAL_DEV_PM_OPS(exynos_rng_pm_ops, exynos_rng_runtime_suspend,
exynos_rng_runtime_resume, NULL);
static struct platform_driver exynos_rng_driver = {
View
@@ -399,7 +399,7 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
{
unsigned long p = *ppos;
ssize_t low_count, read, sz;
- char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
+ char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
int err = 0;
read = 0;
@@ -527,7 +527,7 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
unsigned long p = *ppos;
ssize_t wrote = 0;
ssize_t virtr = 0;
- char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
+ char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
int err = 0;
if (p < (unsigned long) high_memory) {
@@ -595,7 +595,7 @@ static ssize_t write_port(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
unsigned long i = *ppos;
- const char __user * tmp = buf;
+ const char __user *tmp = buf;
if (!access_ok(VERIFY_READ, buf, count))
return -EFAULT;
@@ -729,7 +729,7 @@ static loff_t memory_lseek(struct file *file, loff_t offset, int orig)
return ret;
}
-static int open_port(struct inode * inode, struct file * filp)
+static int open_port(struct inode *inode, struct file *filp)
{
return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
}
@@ -898,7 +898,7 @@ static int __init chr_dev_init(void)
continue;
/*
- * Create /dev/port?
+ * Create /dev/port?
*/
if ((minor == DEVPORT_MINOR) && !arch_has_dev_port())
continue;
Oops, something went wrong.

0 comments on commit 7ed214a

Please sign in to comment.