From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roland Stigge Subject: [PATCH v2 2/8] ohci-nxp: Device tree support Date: Tue, 17 Apr 2012 19:08:21 +0200 Message-ID: <1334682507-15055-3-git-send-email-stigge@antcom.de> References: <1334682507-15055-1-git-send-email-stigge@antcom.de> Return-path: In-Reply-To: <1334682507-15055-1-git-send-email-stigge@antcom.de> Sender: linux-kernel-owner@vger.kernel.org To: arm@kernel.org, linux-arm-kernel@lists.infradead.org, thierry.reding@avionic-design.de, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, dmitry.torokhov@gmail.com, axel.lin@gmail.com, broonie@opensource.wolfsonmicro.com, marek.vasut@gmail.com, devel@driverdev.osuosl.org, kevin.wells@nxp.com, srinivas.bakki@nxp.com Cc: Roland Stigge List-Id: linux-input@vger.kernel.org This patch adds device tree support to ohci-nxp.c Signed-off-by: Roland Stigge --- Applies to v3.4-rc3 Changes since v1: * Separated out cleanup patch Thanks to Thierry Reding for reviewing! Documentation/devicetree/bindings/usb/ohci-nxp.txt | 16 ++++++++++++++++ drivers/usb/host/ohci-nxp.c | 10 ++++++++++ 2 files changed, 26 insertions(+) --- /dev/null +++ linux-2.6/Documentation/devicetree/bindings/usb/ohci-nxp.txt @@ -0,0 +1,16 @@ +* OHCI controller, NXP ohci-nxp variant + +Required properties: +- compatible: must be "nxp,ohci-nxp" +- reg: physical base address of the controller and length of memory mapped + region. +- interrupts: The OHCI interrupt + +Example (LPC32xx): + + ohci@31020000 { + compatible = "nxp,ohci-nxp"; + reg = <0x31020000 0x300>; + interrupt-parent = <&mic>; + interrupts = <0x3b 0>; + }; --- linux-2.6.orig/drivers/usb/host/ohci-nxp.c +++ linux-2.6/drivers/usb/host/ohci-nxp.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -526,10 +527,19 @@ static int usb_hcd_nxp_remove(struct pla /* work with hotplug and coldplug */ MODULE_ALIAS("platform:usb-ohci"); +#ifdef CONFIG_OF +static const struct of_device_id usb_hcd_nxp_match[] = { + { .compatible = "nxp,ohci-nxp" }, + {}, +}; +MODULE_DEVICE_TABLE(of, usb_hcd_nxp_match); +#endif + static struct platform_driver usb_hcd_nxp_driver = { .driver = { .name = "usb-ohci", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(usb_hcd_nxp_match), }, .probe = usb_hcd_nxp_probe, .remove = usb_hcd_nxp_remove,