diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 18:48:19 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 18:48:19 -0500 |
commit | 9f67627a0fea99b080a190d2d24cc1e2634aa2f7 (patch) | |
tree | 24dcf714a8b502c7ef91086d9eb6164f68c7d52b /Documentation/extcon/porting-android-switch-class | |
parent | 82b51734b4f228c76b6064b6e899d9d3d4c17c1a (diff) | |
parent | 6adb8efb024a7e413b93b22848fc13395b1a438a (diff) |
Merge tag 'char-misc-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver patches from Greg KH:
"Here's the big char/misc driver patches for 3.14-rc1.
Lots of little things, and a new "big" driver, genwqe. Full details
are in the shortlog"
* tag 'char-misc-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (90 commits)
mei: limit the number of consecutive resets
mei: revamp mei reset state machine
drivers/char: don't use module_init in non-modular ttyprintk.c
VMCI: fix error handling path when registering guest driver
extcon: gpio: Add power resume support
Documentation: HOWTO: Updates on subsystem trees, patchwork, -next (vs. -mm) in ko_KR
Documentation: HOWTO: update for 2.6.x -> 3.x versioning in ko_KR
Documentation: HOWTO: update stable address in ko_KR
Documentation: HOWTO: update LXR web link in ko_KR
char: nwbutton: open-code interruptible_sleep_on
mei: fix syntax in comments and debug output
mei: nfc: mei_nfc_free has to be called under lock
mei: use hbm idle state to prevent spurious resets
mei: do not run reset flow from the interrupt thread
misc: genwqe: fix return value check in genwqe_device_create()
GenWQE: Fix warnings for sparc
GenWQE: Fix compile problems for Alpha
Documentation/misc-devices/mei/mei-amt-version.c: remove unneeded call of mei_deinit()
GenWQE: Rework return code for flash-update ioctl
sgi-xp: open-code interruptible_sleep_on_timeout
...
Diffstat (limited to 'Documentation/extcon/porting-android-switch-class')
-rw-r--r-- | Documentation/extcon/porting-android-switch-class | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Documentation/extcon/porting-android-switch-class b/Documentation/extcon/porting-android-switch-class index 5377f6317961..49c81caef84d 100644 --- a/Documentation/extcon/porting-android-switch-class +++ b/Documentation/extcon/porting-android-switch-class | |||
@@ -50,7 +50,7 @@ so that they are still compatible with legacy userspace processes. | |||
50 | Extcon's extended features for switch device drivers with | 50 | Extcon's extended features for switch device drivers with |
51 | complex features usually required magic numbers in state | 51 | complex features usually required magic numbers in state |
52 | value of switch_dev. With extcon, such magic numbers that | 52 | value of switch_dev. With extcon, such magic numbers that |
53 | support multiple cables ( | 53 | support multiple cables are no more required or supported. |
54 | 54 | ||
55 | 1. Define cable names at edev->supported_cable. | 55 | 1. Define cable names at edev->supported_cable. |
56 | 2. (Recommended) remove print_state callback. | 56 | 2. (Recommended) remove print_state callback. |
@@ -114,11 +114,8 @@ exclusive, the two cables cannot be in ATTACHED state simulteneously. | |||
114 | 114 | ||
115 | ****** ABI Location | 115 | ****** ABI Location |
116 | 116 | ||
117 | If "CONFIG_ANDROID" is enabled and "CONFIG_ANDROID_SWITCH" is | 117 | If "CONFIG_ANDROID" is enabled, /sys/class/switch/* are created |
118 | disabled, /sys/class/switch/* are created as symbolic links to | 118 | as symbolic links to /sys/class/extcon/*. |
119 | /sys/class/extcon/*. Because CONFIG_ANDROID_SWITCH creates | ||
120 | /sys/class/switch directory, we disable symboling linking if | ||
121 | CONFIG_ANDROID_SWITCH is enabled. | ||
122 | 119 | ||
123 | The two files of switch class, name and state, are provided with | 120 | The two files of switch class, name and state, are provided with |
124 | extcon, too. When the multistate support (STEP 2 of CHAPTER 1.) is | 121 | extcon, too. When the multistate support (STEP 2 of CHAPTER 1.) is |