Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758029Ab2FZO1q (ORCPT ); Tue, 26 Jun 2012 10:27:46 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:49790 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757962Ab2FZO1n (ORCPT ); Tue, 26 Jun 2012 10:27:43 -0400 From: Alexandre Pereira da Silva To: Grant Likely , Rob Herring , Rob Landley , Felipe Balbi , Greg Kroah-Hartman , Li Yang , Alexandre Pereira da Silva , devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Roland Stigge Subject: [PATCH 5/5] usb: gadget: composite: parse dt overrides Date: Tue, 26 Jun 2012 11:27:13 -0300 Message-Id: <1340720833-781-6-git-send-email-aletes.xgr@gmail.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1340720833-781-1-git-send-email-aletes.xgr@gmail.com> References: <1340720833-781-1-git-send-email-aletes.xgr@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3487 Lines: 112 Grab the devicetree node properties to override VendorId, ProductId, bcdDevice, Manucacturer, Product and SerialNumber Signed-off-by: Alexandre Pereira da Silva --- Documentation/devicetree/bindings/usb/gadget.txt | 20 +++++++++++ drivers/usb/gadget/composite.c | 39 ++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/gadget.txt diff --git a/Documentation/devicetree/bindings/usb/gadget.txt b/Documentation/devicetree/bindings/usb/gadget.txt new file mode 100644 index 0000000..93388d3 --- /dev/null +++ b/Documentation/devicetree/bindings/usb/gadget.txt @@ -0,0 +1,20 @@ +Usb Gadget DeviceTree bindings + +These optional properties inside the usb device controller node are used to +change some of the gadget drivers configuration: +- vendor-id: Usb vendor id +- product-id: Usb product id +- release: Version of this device +- vendor: Textual description of the vendor +- device: Textual description of this device +- serial: Textual representation of the device's serial number + +Binding Example: + usbd@31020000 { + vendor-id = <0x0525>; + product-id = <0xa4a6>; + release = <1>; + vendor = "Some Corp"; + device = "Test Device"; + serial = "12345"; + }; diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 390749b..b39aef4 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -1419,10 +1420,44 @@ static u8 override_id(struct usb_composite_dev *cdev, u8 *desc) return *desc; } +static void composite_parse_dt(struct usb_composite_dev *cdev, + struct device_node *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, "release", ®) == 0) + bcdDevice = reg; + + if (!iManufacturer) + if (of_property_read_string(np, "vendor", + &composite->iManufacturer) == 0) + cdev->manufacturer_override = override_id(cdev, + &cdev->desc.iManufacturer); + + if (!iProduct) + if (of_property_read_string(np, "device", + &composite->iProduct) == 0) + cdev->product_override = override_id(cdev, + &cdev->desc.iProduct); + + if (!iSerialNumber) + if (of_property_read_string(np, "serial", + &composite->iSerialNumber) == 0) + cdev->serial_override = override_id(cdev, + &cdev->desc.iSerialNumber); +} + 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 +1505,10 @@ static int composite_bind(struct usb_gadget *gadget) cdev->desc = *composite->dev; + /* grab overrides from devicetree */ + if (np) + composite_parse_dt(cdev, np); + /* 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/