Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756285Ab2FYUXv (ORCPT ); Mon, 25 Jun 2012 16:23:51 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:42765 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755800Ab2FYUXt (ORCPT ); Mon, 25 Jun 2012 16:23:49 -0400 From: Alexandre Pereira da Silva To: Felipe Balbi , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Grant Likely , Rob Herring , devicetree-discuss@lists.ozlabs.org Cc: Alexandre Pereira da Silva Subject: [RFC 2/2] usb: gadget: composite: parse dt overrides Date: Mon, 25 Jun 2012 17:23:52 -0300 Message-Id: <1340655832-30447-1-git-send-email-aletes.xgr@gmail.com> X-Mailer: git-send-email 1.7.10 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2035 Lines: 72 Grab the devicetree node properties to override VendorId, ProductId, bcdDevice, Manucacturer, Product and SerialNumber Signed-off-by: Alexandre Pereira da Silva --- drivers/usb/gadget/composite.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 390749b..f3b480e 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -1423,6 +1424,7 @@ static int composite_bind(struct usb_gadget *gadget) { struct usb_composite_dev *cdev; int status = -ENOMEM; + struct device_node *np = gadget->dev.of_node; cdev = kzalloc(sizeof *cdev, GFP_KERNEL); if (!cdev) @@ -1470,6 +1472,35 @@ static int composite_bind(struct usb_gadget *gadget) cdev->desc = *composite->dev; + /* grab overrides from devicetree */ + if (np) { + u32 reg; + + if (!idVendor && + of_property_read_u32(np, "vendor_id", ®) == 0) + idVendor = reg; + + if (!idProduct && + of_property_read_u32(np, "product_id", ®) == 0) + idProduct = reg; + + if (!bcdDevice && + of_property_read_u32(np, "bcd_device", ®) == 0) + bcdDevice = reg; + + if (!iManufacturer) + of_property_read_string(np, "manufacturer", + &iManufacturer); + + if (!iProduct) + of_property_read_string(np, "product", + &iProduct); + + if (!iSerialNumber) + of_property_read_string(np, "serial_number", + &iSerialNumber); + } + /* standardized runtime overrides for device ID data */ if (idVendor) cdev->desc.idVendor = cpu_to_le16(idVendor); -- 1.7.10 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/