Merge branch 'drivers/ocp2scp' into next/drivers (5ddf8bad) · Commits · 戴 / test

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>

Documentation/devicetree/bindings/bus/omap-ocp2scp.txt

0 → 100644

+10 −0

Original line number	Diff line number	Diff line
		* OMAP OCP2SCP - ocp interface to scp interface

		properties:
		- compatible : Should be "ti,omap-ocp2scp"
		- #address-cells, #size-cells : Must be present if the device has sub-nodes
		- ranges : the child address space are mapped 1:1 onto the parent address space
		- ti,hwmods : must be "ocp2scp_usb_phy"

		Sub-nodes:
		All the devices connected to ocp2scp are described using sub-node to ocp2scp

arch/arm/boot/dts/omap4.dtsi

+8 −0

Original line number	Diff line number	Diff line
		@@ -295,5 +295,13 @@
		interrupt-parent = <&gic>;
		ti,hwmods = "dmic";
		};

		ocp2scp {
		compatible = "ti,omap-ocp2scp";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges;
		ti,hwmods = "ocp2scp_usb_phy";
		};
		};
		};

drivers/Kconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@ menu "Device Drivers"

		source "drivers/base/Kconfig"

		source "drivers/bus/Kconfig"

		source "drivers/connector/Kconfig"

		source "drivers/mtd/Kconfig"

drivers/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,8 @@
		# Rewritten to use lists instead of if-statements.
		#

		obj-y += bus/

		# GPIO must come after pinctrl as gpios may need to mux pins etc
		obj-y += pinctrl/
		obj-y += gpio/

drivers/bus/Kconfig

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		#
		# Bus Devices
		#

		menu "Bus devices"

		config OMAP_OCP2SCP
		tristate "OMAP OCP2SCP DRIVER"
		help
		Driver to enable ocp2scp module which transforms ocp interface
		protocol to scp protocol. In OMAP4, USB PHY is connected via
		OCP2SCP and in OMAP5, both USB PHY and SATA PHY is connected via
		OCP2SCP.

		endmenu

Admin message