Skip to content

fastchg: Remove vestigial fsa9480 "force AC" switch. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiny4579 merged 1 commit into from
May 19, 2013
Merged

fastchg: Remove vestigial fsa9480 "force AC" switch. #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions drivers/misc/fsa9480.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include <linux/usb/otg_id.h>
#include <linux/seq_file.h>
#include <linux/debugfs.h>
#include <linux/fastchg.h>

#define DEBUG_DUMP_REGISTERS

Expand Down Expand Up @@ -518,15 +517,7 @@ static int fsa9480_detect_callback(struct otg_id_notifier_block *nb)
/* usb peripheral mode */
if (!(nb_info->detect_set->mask & FSA9480_DETECT_USB))
goto unhandled;
#ifdef CONFIG_FORCE_FAST_CHARGE
if (force_fast_charge != 0) {
_detected(usbsw, FSA9480_DETECT_CHARGER);
} else {
_detected(usbsw, FSA9480_DETECT_USB);
}
#else
_detected(usbsw, FSA9480_DETECT_USB);
#endif
goto handled;
} else if (dev_type & DEV_UART_MASK) {
if (!(nb_info->detect_set->mask & FSA9480_DETECT_UART))
Expand Down