summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/btusb.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-08-22 14:32:00 +0200
committerArnd Bergmann <arnd@arndb.de>2012-08-22 14:32:00 +0200
commit5ddf8bad8c5ff52aae512215131f0af37176f6ea (patch)
treed24e88152e3538ed2c681bf8d6c0097c7fe1c9e0 /drivers/bluetooth/btusb.c
parente05dd97c5c345bd1f6ce9f6fc242326a64191239 (diff)
parent59bafcf69cdc74f848f212086a8b9c51866da384 (diff)
downloadblackbird-op-linux-5ddf8bad8c5ff52aae512215131f0af37176f6ea.tar.gz
blackbird-op-linux-5ddf8bad8c5ff52aae512215131f0af37176f6ea.zip
Merge branch 'drivers/ocp2scp' into next/drivers
Patch series from Kishon Vijay Abraham I <kishon@ti.com>: This patch series is done as a preparatory step for adding phy drivers for dwc3 and musb. This series adds a new driver for ocp2scp (only dt) to which phy drivers are connected. Since currently there is no generic way to create a child device along with doing a pm_runtime_enable (the exact requirement for ocp2scp), I'm creating a separate driver for ocp2scp. Changes from v3: No functional changes. Fixed few comments on filling module details. Changes from v2: Fixed Felipe's comments to avoid using arch_initcall and make dependent drivers return -EPROBE_DEFER case this isn't ready yet. Changes from v1: Fixed Sergei's comments to remove the address in the node name of ocp2scp since the ocp2scp node doesn't have a reg property. Changes from [RFC PATCH v2 0/2] omap: add ocp2scp as a misc driver: Created a new folder drivers/bus and moved ocp2scp driver from misc to drivers/bus. This patch was developed and tested on git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git * drivers/ocp2scp: arm/dts: omap4: Add ocp2scp data drivers: bus: add a new driver for omap-ocp2scp Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/bluetooth/btusb.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud