aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'b9a7985' into HEADKalimochoAz2012-10-141-19/+65
|\ | | | | | | | | Conflicts: kernel/time/timekeeping.c
| * drivers/misc/sgi-xp/xpc_uv.c: SGI XPC fails to load when cpu 0 is out of IRQ ↵Robin Holt2012-10-021-19/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources commit 7838f994b4fceff24c343f4e26a6cf4393869579 upstream. On many of our larger systems, CPU 0 has had all of its IRQ resources consumed before XPC loads. Worst cases on machines with multiple 10 GigE cards and multiple IB cards have depleted the entire first socket of IRQs. This patch makes selecting the node upon which IRQs are allocated (as well as all the other GRU Message Queue structures) specifiable as a module load param and has a default behavior of searching all nodes/cpus for an available resources. [akpm@linux-foundation.org: fix build: include cpu.h and module.h] Signed-off-by: Robin Holt <holt@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Added Backlight Dimmer (BLD) version 3.Ezekeel2012-08-303-0/+278
| | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-s5pv210/herring-touchkey-led.c drivers/input/keyboard/cypress-touchkey.c drivers/misc/Kconfig drivers/misc/Makefile
* | Merge remote-tracking branch 'google/android-samsung-3.0-jb' into HEADKalimochoAz2012-07-204-1365/+11
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-s5pv210/mach-herring.c drivers/media/video/samsung/fimc/fimc_dev.c include/trace/events/cpufreq_interactive.h
| * \ Merge remote-tracking branch 'common/android-3.0' into ↵JP Abgrall2012-05-041-19/+43
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android-samsung-30-wip-mergedown * common/android-3.0: (135 commits) net: wireless: bcmdhd: Avoid turning radio UP twice on start cpufreq: interactive: add boost pulse interface net: wireless: bcmdhd: Set MMC_PM_KEEP_POWER flag on suspend net: wireless: bcmdhd: Update to Version 5.90.195.61 net: wireless: bcmdhd: Turn OFF wlan power if interface UP fails ARM: vfp: only clear vfp state for current cpu in vfp_pm_suspend arm: vfp: Fix memory corruption on PM suspend Linux 3.0.30 tcp: fix TCP_MAXSEG for established IPv6 passive sockets net ax25: Reorder ax25_exit to remove races. ksz884x: don't copy too much in netdev_set_mac_address() netns: do not leak net_generic data on failed init tcp: fix tcp_grow_window() for large incoming frames dummy: Add ndo_uninit(). net: usb: smsc75xx: fix mtu net_sched: gred: Fix oops in gred_dump() in WRED mode net/ethernet: ks8851_mll fix rx frame buffer overflow net: smsc911x: fix skb handling in receive path 8139cp: set intr mask after its handler is registered atl1: fix kernel panic in case of DMA errors ...
| | * \ Merge commit 'v3.0.30' into android-3.0Todd Poynor2012-04-301-19/+43
| | |\ \ | | | |/
| * | | Merge remote-tracking branch 'common/android-3.0' into ↵JP Abgrall2012-04-246-55/+147
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android-samsung-30-wip-mergedown * common/android-3.0: (1178 commits) cpufreq: interactive: remove unused target_validate_time_in_idle cpufreq: interactive: Boost frequency on touchscreen input cpufreq: Separate speed target revalidate time and initial set time cpufreq: interactive: based hispeed bump on target freq, not actual cpufreq: interactive: adjust code and documentation to match cpufreq: interactive: configurable delay before raising above hispeed sync: add poll support sw_sync: add fill_driver_data support sync: add ioctl to get fence data sw_sync: add debug support sync: add debugfs support sync: add timestamps to sync_pts sw_sync: add cpu based sync driver sync: Add synchronization framework Linux 3.0.28 Bluetooth: Fix l2cap conn failures for ssp devices TOMOYO: Fix mount flags checking order. iommu/amd: Make sure IOMMU interrupts are re-enabled on resume cred: copy_process() should clear child->replacement_session_keyring ASoC: ak4642: fixup: mute needs +1 step ... Conflicts: mm/compaction.c Change-Id: I3dc59225d2435eddbed0c639155179e580891ac8 Signed-off-by: JP Abgrall <jpa@google.com>
| | * | Merge linux-stable 3.0.28 into android-3.0Todd Poynor2012-04-196-55/+147
| | |\ \ | | | | | | | | | | | | | | | | | | | | Change-Id: Iee820738e53627f5d0447a87ceff34443aa72786 Signed-off-by: Todd Poynor <toddpoynor@google.com>
| * | | | misc: fsa9480: disable/enable irq on suspend/resumeJP Abgrall2012-03-291-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of flaky usb hardware that triggers the fsa during suspend/resume it would fsa9480_irq_thread() ... fsa9880_usb_cb() usb_gadget_vbus_disconnect() s3c_vbus_enable(..., 0) udc_disable() otg_phy_off() and during gadget resume there would be no otg_phy_init(). This would leave the whole OTG turned off, and when enabling IRQ_OTG there would sometimes be a storm from the OTG as the interrupt previously pending could not be cleared. In turn this would lead to the watchdog pet to never happen. Change-Id: I57bac0af79a69ab5365009eff4fd615d1ef17277 Signed-off-by: JP Abgrall <jpa@google.com>
| * | | | Merge remote-tracking branch 'common/android-3.0' into ↵JP Abgrall2012-02-063-1365/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android-samsung-30-wip-mergedown * common/android-3.0: Input: evdev - fix variable initialisation Input: evdev - Add ioctl to block suspend while event queue is not empty. Input: evdev - Don't hold wakelock when no data is available to user-space net: wireless: bcmdhd: Increase pm_notify callback priority net: wireless: bcmdhd: Fix crash on dhdsdio_probe_attach() failure net: wireless: bcmdhd: Daemonize wl_event_handler net: wireless: bcmdhd: Update to Version 5.90.195.23 net: wireless: bcmdhd: Update to Version 5.90.195.22 net: wireless: bcmdhd: Update to Version 5.90.195.19 net: wireless: bcmdhd: Update to Version 5.90.195.15 net: wireless: bcmdhd: Add WIPHY_FLAG_SUPPORTS_FW_ROAM flag net: wireless: bcmdhd: Fake PNO event to wake up the wpa_supplicant usb: gadget: android: Honor CONFIG_USB_GADGET_VBUS_DRAW usb: gadget: Fix usb string id allocation nl80211/cfg80211: Make addition of new sinfo fields safer cfg80211/nl80211: Send AssocReq IEs to user space in AP mode misc: remove android pmem driver, it's obsolete. Revert "proc: enable writing to /proc/pid/mem" ram_console: set CON_ANYTIME console flag Conflicts: drivers/misc/Kconfig Change-Id: I7d64300b228a0fc05e700f283a02f830bcadd371
| | * | | misc: remove android pmem driver, it's obsolete.Dima Zavin2012-01-233-1350/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48d9778007e1e9eed2bb34e33ceee818c23afaa5 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | Updated to build 5Zsolt Sz. Sztupak2012-05-251-3/+3
| | | | |
* | | | | USB Host mode build 4 port to Nexus SZsolt Sz. Sztupak2012-05-251-0/+18
| | | | |
* | | | | Merge branch 'linux-3.0.y' into cmremoteKalimochoAz2012-04-251-19/+43
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | pch_phub: Improve ADE(Address Decode Enable) controlTomoya MORINAGA2012-04-221-17/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 9914a0de7a27ef2cb5d9aacfe50ae97ebb532f28 upstream. Currently, external ROM access is enabled/disabled in probe()/remove(). So, when a buggy software access unanticipated memory area, in case of enabling this ADE bit, external ROM memory area can be broken. This patch enables the ADE bit only accessing external ROM area. Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com> Cc: Masayuki Ohtak <masa-korg@dsn.okisemi.com> Cc: Alexander Stein <alexander.stein@systec-electronic.com> Cc: Denis Turischev <denis@compulab.co.il> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | | pch_phub: Care FUNCSEL register in PMTomoya MORINAGA2012-04-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit dd7d7fea29c18b818e94f252a76f495490d399c3 upstream. Only ML7213/ML7223(Bus-n) has this register. Currently,this driver doesn't care register "FUNCSEL" in suspend/resume. This patch saves/restores FUNCSEL register only when the device is ML7213 or ML7223(Bus-n). Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | | pch_phub: Fix register miss-setting issueTomoya MORINAGA2012-04-221-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 20ae6d0b307963416db0e8433602e5d5c95e942b upstream. Register "interrupt delay value" is for GbE which is connected to Bus-m of PCIe. However currently, the value is set for Bus-n. As a result, the value is not set correctly. This patch moves setting the value processing of Bus-n to Bus-m. Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | | | Create a new sysfs to get all the values in one lineKalimochoAz2012-04-181-0/+27
| | | |
* | | | Merge branch 'linux-3.0.y' into icsKalimochoAz2012-04-181-45/+115
|\ \ \ \ | |/ / /
| * | | x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()Jason Wessel2012-04-131-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 3751d3e85cf693e10e2c47c03c8caa65e171099b upstream. There has long been a limitation using software breakpoints with a kernel compiled with CONFIG_DEBUG_RODATA going back to 2.6.26. For this particular patch, it will apply cleanly and has been tested all the way back to 2.6.36. The kprobes code uses the text_poke() function which accommodates writing a breakpoint into a read-only page. The x86 kgdb code can solve the problem similarly by overriding the default breakpoint set/remove routines and using text_poke() directly. The x86 kgdb code will first attempt to use the traditional probe_kernel_write(), and next try using a the text_poke() function. The break point install method is tracked such that the correct break point removal routine will get called later on. Cc: x86@kernel.org Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Inspried-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * | | kgdbts: (2 of 2) fix single step awareness to work correctly with SMPJason Wessel2012-04-131-11/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 23bbd8e346f1ef3fc1219c79cea53d8d52b207d8 upstream. The do_fork and sys_open tests have never worked properly on anything other than a UP configuration with the kgdb test suite. This is because the test suite did not fully implement the behavior of a real debugger. A real debugger tracks the state of what thread it asked to single step and can correctly continue other threads of execution or conditionally stop while waiting for the original thread single step request to return. Below is a simple method to cause a fatal kernel oops with the kgdb test suite on a 2 processor ARM system: while [ 1 ] ; do ls > /dev/null 2> /dev/null; done& while [ 1 ] ; do ls > /dev/null 2> /dev/null; done& echo V1I1F100 > /sys/module/kgdbts/parameters/kgdbts Very soon after starting the test the kernel will start warning with messages like: kgdbts: BP mismatch c002487c expected c0024878 ------------[ cut here ]------------ WARNING: at drivers/misc/kgdbts.c:317 check_and_rewind_pc+0x9c/0xc4() [<c01f6520>] (check_and_rewind_pc+0x9c/0xc4) [<c01f595c>] (validate_simple_test+0x3c/0xc4) [<c01f60d4>] (run_simple_test+0x1e8/0x274) The kernel will eventually recovers, but the test suite has completely failed to test anything useful. This patch implements behavior similar to a real debugger that does not rely on hardware single stepping by using only software planted breakpoints. In order to mimic a real debugger, the kgdb test suite now tracks the most recent thread that was continued (cont_thread_id), with the intent to single step just this thread. When the response to the single step request stops in a different thread that hit the original break point that thread will now get continued, while the debugger waits for the thread with the single step pending. Here is a high level description of the sequence of events. cont_instead_of_sstep = 0; 1) set breakpoint at do_fork 2) continue 3) Save the thread id where we stop to cont_thread_id 4) Remove breakpoint at do_fork 5) Reset the PC if needed depending on kernel exception type 6) soft single step 7) Check where we stopped if current thread != cont_thread_id { if (here for more than 2 times for the same thead) { ### must be a really busy system, start test again ### goto step 1 } goto step 5 } else { cont_instead_of_sstep = 0; } 8) clean up and run test again if needed 9) Clear out any threads that were waiting on a break point at the point in time the test is ended with get_cont_catch(). This happens sometimes because breakpoints are used in place of single stepping and some threads could have been in the debugger exception handling queue because breakpoints were hit concurrently on different CPUs. This also means we wait at least one second before unplumbing the debugger connection at the very end, so as respond to any debug threads waiting to be serviced. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * | | kgdbts: (1 of 2) fix single step awareness to work correctly with SMPJason Wessel2012-04-131-11/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 486c5987a00a89d56c2c04c506417ef8f823ca2e upstream. The do_fork and sys_open tests have never worked properly on anything other than a UP configuration with the kgdb test suite. This is because the test suite did not fully implement the behavior of a real debugger. A real debugger tracks the state of what thread it asked to single step and can correctly continue other threads of execution or conditionally stop while waiting for the original thread single step request to return. Below is a simple method to cause a fatal kernel oops with the kgdb test suite on a 4 processor x86 system: while [ 1 ] ; do ls > /dev/null 2> /dev/null; done& while [ 1 ] ; do ls > /dev/null 2> /dev/null; done& while [ 1 ] ; do ls > /dev/null 2> /dev/null; done& while [ 1 ] ; do ls > /dev/null 2> /dev/null; done& echo V1I1F1000 > /sys/module/kgdbts/parameters/kgdbts Very soon after starting the test the kernel will oops with a message like: kgdbts: BP mismatch 3b7da66480 expected ffffffff8106a590 WARNING: at drivers/misc/kgdbts.c:303 check_and_rewind_pc+0xe0/0x100() Call Trace: [<ffffffff812994a0>] check_and_rewind_pc+0xe0/0x100 [<ffffffff81298945>] validate_simple_test+0x25/0xc0 [<ffffffff81298f77>] run_simple_test+0x107/0x2c0 [<ffffffff81298a18>] kgdbts_put_char+0x18/0x20 The warn will turn to a hard kernel crash shortly after that because the pc will not get properly rewound to the right value after hitting a breakpoint leading to a hard lockup. This change is broken up into 2 pieces because archs that have hw single stepping (2.6.26 and up) need different changes than archs that do not have hw single stepping (3.0 and up). This change implements the correct behavior for an arch that supports hw single stepping. A minor defect was fixed where sys_open should be do_sys_open for the sys_open break point test. This solves the problem of running a 64 bit with a 32 bit user space. The sys_open() never gets called when using the 32 bit file system for the kgdb testsuite because the 32 bit binaries invoke the compat_sys_open() call leading to the test never completing. In order to mimic a real debugger, the kgdb test suite now tracks the most recent thread that was continued (cont_thread_id), with the intent to single step just this thread. When the response to the single step request stops in a different thread that hit the original break point that thread will now get continued, while the debugger waits for the thread with the single step pending. Here is a high level description of the sequence of events. cont_instead_of_sstep = 0; 1) set breakpoint at do_fork 2) continue 3) Save the thread id where we stop to cont_thread_id 4) Remove breakpoint at do_fork 5) Reset the PC if needed depending on kernel exception type 6) if (cont_instead_of_sstep) { continue } else { single step } 7) Check where we stopped if current thread != cont_thread_id { cont_instead_of_sstep = 1; goto step 5 } else { cont_instead_of_sstep = 0; } 8) clean up and run test again if needed Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * | | kgdbts: Fix kernel oops with CONFIG_DEBUG_RODATAJason Wessel2012-04-131-24/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 456ca7ff24841bf2d2a2dfd690fe7d42ef70d932 upstream. On x86 the kgdb test suite will oops when the kernel is compiled with CONFIG_DEBUG_RODATA and you run the tests after boot time. This is regression has existed since 2.6.26 by commit: b33cb815 (kgdbts: Use HW breakpoints with CONFIG_DEBUG_RODATA). The test suite can use hw breakpoints for all the tests, but it has to execute the hardware breakpoint specific tests first in order to determine that the hw breakpoints actually work. Specifically the very first test causes an oops: # echo V1I1 > /sys/module/kgdbts/parameters/kgdbts kgdb: Registered I/O driver kgdbts. kgdbts:RUN plant and detach test Entering kdb (current=0xffff880017aa9320, pid 1078) on processor 0 due to Keyboard Entry [0]kdb> kgdbts: ERROR PUT: end of test buffer on 'plant_and_detach_test' line 1 expected OK got $E14#aa WARNING: at drivers/misc/kgdbts.c:730 run_simple_test+0x151/0x2c0() [...oops clipped...] This commit re-orders the running of the tests and puts the RODATA check into its own function so as to correctly avoid the kernel oops by detecting and using the hw breakpoints. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | | Merge branch 'ics.googleupdate.4.0.4' into cm.icsKalimochoAz2012-04-015-37/+104
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: fs/proc/base.c
| * | | misc: samsung_modemctl: Add multipdp supportKocharlakota.sridhar2012-01-184-27/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UMTS models support 3 PDP sessions at same time. Modified the driver to support multipdp sessions. Change-Id: I739fa751290288885b163dd76f3879ab8639b683 Signed-off-by: Kocharlakota.sridhar <k.sridhar@samsung.com>
| * | | misc: fsa9480: make interrupt handling more robustSimon Wilson2012-01-181-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fsa9480 interrupt is actually triggered low, not falling - process any queued events and only handle the last Change-Id: Id7b99068b226346a609454f41d75f10a86259898 Signed-off-by: Simon Wilson <simonwilson@google.com>
* | | | Merge branch 'linux-3.0.y' into cm.icsKalimochoAz2012-03-121-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | cs5535-mfgpt: don't call __init function from __devinitDanny Kukawka2012-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 474de3bbadd9cb75ffc32cc759c40d868343d46c upstream. Fix scan_timers() to be __devinit and not __init since the function get called from cs5535_mfgpt_probe which is __devinit. Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | | Merge branch 'linux-3.0.y' into cm.ics.newKalimochoAz2012-02-201-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: mm/compaction.c
| * | | mmc: cb710 core: Add missing spin_lock_init for irq_lock of struct cb710_chipAxel Lin2012-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit b5266ea675c5a041e2852c7ccec4cf2d4f5e0cf4 upstream. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | | Merge branch 'glados/deepidle'KalimochoAz2012-02-112-0/+208
|\ \ \ \
| * | | | Add power saving state DEEP IDLE version 2.Ezekeel2011-12-182-0/+207
| | |/ / | |/| |
* | | | Merge branch 'linux-3.0.update' into cm.ics.newKalimochoAz2012-02-113-9/+30
|\ \ \ \ | | |/ / | |/| |
| * | | pcie-gadget-spear: Add "platform:" prefix for platform modaliasAxel Lin2011-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 161f14191dc166c4e3f37f68af1bc199c6868b7d upstream. Since 43cc71eed1250755986da4c0f9898f9a635cb3bf (platform: prefix MODALIAS with "platform:"), the platform modalias is prefixed with "platform:". Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Pratyush Anand <pratyush.anand@st.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | pch_phub: Fix MAC address writing issue for LAPIS ML7831Tomoya MORINAGA2011-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 2a9887919457c6e1bd482e8448223be59d19010a upstream. ISSUE: Using ML7831, MAC address writing doesn't work well. CAUSE: ML7831 and EG20T have the same register map for MAC address access. However, this driver processes the writing the same as ML7223. This is not true. This driver must process the writing the same as EG20T. This patch fixes the issue. Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com> Cc: Masayuki Ohtak <masa-korg@dsn.okisemi.com> Cc: Alexander Stein <alexander.stein@systec-electronic.com> Cc: Denis Turischev <denis@compulab.co.il> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | pch_phub: Support new device LAPIS Semiconductor ML7831 IOHTomoya MORINAGA2011-11-262-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 584ad00ce4bfe594e4c4a89944b3c635187a1ca1 upstream. ML7831 is companion chip for Intel Atom E6xx series. Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | | | Remove blink from LED notification controlKalimochoAz2012-02-111-108/+3
| | | | | | | | | | | | | | | | This is done to encrease stability and more to preserve bettery
* | | | Generic BLN with in-kernel blinkAdam Kent2012-02-113-0/+321
| |/ / |/| |
* | | samsung_modemctl: initialize skb->mac_header before passing it to netif_rx().Chia-chi Yeh2011-12-131-0/+1
| | | | | | | | | | | | Signed-off-by: Chia-chi Yeh <chiachi@android.com>
* | | misc: samsung_modemctl: Remove unnecessary semaphore checkKocharlakota.sridhar2011-12-011-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modem_start function checks whether AP holds the semaphore and in the next line gives the semaphore to MODEM. RIL tries to reset modem multiple times when the modem_start function returns error Signed-off-by: Kocharlakota.sridhar <k.sridhar@samsung.com>
* | | pn544: Increase GPIO toggle delays again as per experimental resultsNick Pelly2011-11-171-5/+5
| | | | | | | | | | | | | | | We've already been running with these new delays for a while, just moving from userspace to kernel.
* | | SENSOR: Fix mismatch between user-space and the kerneltim.sk.lee2011-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix mismatch between where user-space and the kernel expect the data to be returned Change-Id: I923005c631fcb026899d8653ad027241b503a399 Signed-off-by: tim.sk.lee <tim.sk.lee@samsung.com>
* | | misc: samsung_modemctl: support CDMA modem updateThomas Ryu2011-11-173-1/+550
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following functions are implemented to support binary update of CDMA modem. -Basic primitives to access oneDRAM. -IOCTL File operation functions. -support full and incremental update Change-Id: I4f3d54527d71e295ef671ba8404687201e7e8a26 Signed-off-by: Thomas Ryu <smilesr.ryu@samsung.com>
* | | misc: samsung_modemctl: CDMA modem power on sequenceThomas Ryu2011-11-171-1/+0
| | | | | | | | | | | | | | | | | | Fixed to keep gpio_phone_on HIGH after power-on sequence. Signed-off-by: Thomas Ryu <smilesr.ryu@samsung.com>
* | | misc: samsung_modemctl: support CDMA modemThomas Ryu2011-11-173-16/+45
| | | | | | | | | | | | | | | | | | | | | | | | 1. add CDMA modem specific power on sequence. 2. add CDMA modem specific state change on boot. 3. add CDMA modem specific parameters in modemctl_data. Signed-off-by: Thomas Ryu <smilesr.ryu@samsung.com>
* | | input: accelerometer: Add support for rotated accelerometerRom Lemarchand2011-11-171-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds an optional rotation matrix to the accelerometer output to compensate for those cases when the accelerometer is not in a consistent orientation. Change-Id: I178466c4bfcee461edf7877ed7ac19b5aa7f8c77 Signed-off-by: Rom Lemarchand <rlemarchand@sta.samsung.com>
* | | samsung_modemctl: Fix ethertype for IPv6 packets.Lorenzo Colitti2011-11-171-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although the modem is IPv6-capable, the driver always sets the ethertype to IPv4 when passing received packets to the kernel, causing them to be dropped. Get the ethertype from the first nibble of the IP header instead. Signed-off-by: Lorenzo Colitti <lorenzo@google.com> Change-Id: I9b1c445cb16919c348c9aeb38e23c7c8ff5e52c9
* | | modem_ctl:Check FMT Data at every onedram interruptKyungtak Hur2011-11-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transfering data between AP and BP, 1. Get access authority 2. Write data to OneDRAM 3. Write command to OneDRAM's mailbox region 4. The opposite side get the interrupt 5. Read the OneDRAM's mailbox region 6. Accoding to mailbox command, processing the data. Our commands for mailbox are composed of FMT, RAW, RFS, request & response semaphore and so on. When FMT data is required to response, sometimes exceptional cases occur. 1. FMT data from the BP; 2. Request the access authority from the BP Requesting the access authority command overwrites FMT data command. Access authority will be asked prior to AP reading the FMT Data. AP give back the access authority to BP, and FMT data from BP will be timeout. Signed-off-by: Kyungtak Hur <kt.hur@samsung.com> Change-Id: I0ef20fd2afe7973bb9f84653261fa20ad2c06d6d Signed-off-by: HUR KYUNGTAK <kt.hur@samsung.com>
* | | S5PC11X: SOUND: support 3-buttons earjackMinsong Kim2011-11-171-2/+161
| | | | | | | | | | | | | | | | | | Using input filter to add support for 3-buttons earjack driver. Signed-off-by: Minsong Kim <ms17.kim@samsung.com>
* | | S5PC11X: USB Switch: Support USB Path on deskdocksb223.kang2011-11-171-0/+30
| | | | | | | | | | | | | | | | | | | | | When deskdock is connected, Switch path will be changed to USB. Change-Id: I448d06aae8b90c0d101788452398d0b97e423289 Signed-off-by: sb223.kang <sb223.kang@samsung.com>