From: Arnd Bergmann Date: Wed, 22 Aug 2012 12:32:00 +0000 (+0200) Subject: Merge branch 'drivers/ocp2scp' into next/drivers X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5ddf8bad8c5ff52aae512215131f0af37176f6ea;p=linux-beck.git Merge branch 'drivers/ocp2scp' into next/drivers Patch series from Kishon Vijay Abraham I : 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 --- 5ddf8bad8c5ff52aae512215131f0af37176f6ea