Re: [PATCH v2 09/14] mfd: omap-usb-host: Add device tree support and binding information
On 02/11/2013 02:00 PM, Mark Rutland wrote: > On Thu, Feb 07, 2013 at 04:02:49PM +, Roger Quadros wrote: >> Allows the OMAP HS USB host controller to be specified >> via device tree. >> >> CC: Samuel Ortiz >> Signed-off-by: Roger Quadros >> --- >> .../devicetree/bindings/mfd/omap-usb-host.txt | 80 ++ >> drivers/mfd/omap-usb-host.c| 160 >> +++- >> 2 files changed, 234 insertions(+), 6 deletions(-) >> create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-host.txt >> >> diff --git a/Documentation/devicetree/bindings/mfd/omap-usb-host.txt >> b/Documentation/devicetree/bindings/mfd/omap-usb-host.txt >> new file mode 100644 >> index 000..b381fa6 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/mfd/omap-usb-host.txt >> @@ -0,0 +1,80 @@ >> +OMAP HS USB Host >> + >> +Required properties: >> + >> +- compatible: should be "ti,usbhs-host" >> +- reg: should contain one register range i.e. start and length >> +- ti,hwmods: must contain "usb_host_hs" >> + >> +Optional properties: >> + >> +- num-ports: number of USB ports. Usually this is automatically detected >> + from the IP's revision register but can be overridden by specifying >> + this property. A maximum of 3 ports are supported at the moment. >> + >> +- portN-mode: String specifying the port mode for port N, where N can be >> + from 1 to 3. If the port mode is not specified, that port is treated >> + as unused. When specified, it must be one of the following. >> +"ehci-phy", >> +"ehci-tll", >> +"ehci-hsic", >> +"ohci-phy-6pin-datse0", >> +"ohci-phy-6pin-dpdm", >> +"ohci-phy-3pin-datse0", >> +"ohci-phy-4pin-dpdm", >> +"ohci-tll-6pin-datse0", >> +"ohci-tll-6pin-dpdm", >> +"ohci-tll-3pin-datse0", >> +"ohci-tll-4pin-dpdm", >> +"ohci-tll-2pin-datse0", >> +"ohci-tll-2pin-dpdm", >> + > > [...] > >> +/** >> + * Map 'enum usbhs_omap_port_mode' found in >> + * to the device tree binding portN-mode found in >> + * 'Documentation/devicetree/bindings/mfd/omap-usb-host.txt' >> + */ >> +static const char *port_modes[] = { >> +[OMAP_USBHS_PORT_MODE_UNUSED] = "", >> +[OMAP_EHCI_PORT_MODE_PHY] = "ehci-phy", >> +[OMAP_EHCI_PORT_MODE_TLL] = "ehci-tll", >> +[OMAP_EHCI_PORT_MODE_HSIC] = "ehci-hsic", >> +[OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0] = "ohci-phy-6pin-datse0", >> +[OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM] = "ohci-phy-6pin-dpdm", >> +[OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0] = "ohci-phy-3pin-datse0", >> +[OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM] = "ohci-phy-4pin-dpdm", >> +[OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0] = "ohci-tll-6pin-datse0", >> +[OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM] = "ohci-tll-6pin-dpdm", >> +[OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0] = "ohci-tll-3pin-datse0", >> +[OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM] = "ohci-tll-4pin-dpdm", >> +[OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0] = "ohci-tll-2pin-datse0", >> +[OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM] = "ohci-tll-2pin-dpdm", >> +}; >> + >> +/** >> + * omap_usbhs_get_dt_port_mode - Get the 'enum usbhs_omap_port_mode' >> + * from the port mode string. >> + * @mode: The port mode string, usually obtained from device tree. >> + * >> + * The function returns the 'enum usbhs_omap_port_mode' that matches the >> + * provided port mode string as per the port_modes table. >> + * If no match is found it returns -ENODEV >> + */ >> +static const int omap_usbhs_get_dt_port_mode(const char *mode) >> +{ >> +int i; >> + >> +for (i = 0; i < ARRAY_SIZE(port_modes); i++) { >> +if (!strcasecmp(mode, port_modes[i])) >> +return i; >> +} > > Any reason for using strcasecmp rather than strcmp? The binding only specified > lower case versions, and this allows people to write "oHcI-PhY-6PiN-DaTsE0" > with impunity. :). No specific reason. I'll change it to strcmp. > > Otherwise, this looks fine to me. Thanks. cheers, -roger -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2 09/14] mfd: omap-usb-host: Add device tree support and binding information
On Thu, Feb 07, 2013 at 04:02:49PM +, Roger Quadros wrote: > Allows the OMAP HS USB host controller to be specified > via device tree. > > CC: Samuel Ortiz > Signed-off-by: Roger Quadros > --- > .../devicetree/bindings/mfd/omap-usb-host.txt | 80 ++ > drivers/mfd/omap-usb-host.c| 160 > +++- > 2 files changed, 234 insertions(+), 6 deletions(-) > create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-host.txt > > diff --git a/Documentation/devicetree/bindings/mfd/omap-usb-host.txt > b/Documentation/devicetree/bindings/mfd/omap-usb-host.txt > new file mode 100644 > index 000..b381fa6 > --- /dev/null > +++ b/Documentation/devicetree/bindings/mfd/omap-usb-host.txt > @@ -0,0 +1,80 @@ > +OMAP HS USB Host > + > +Required properties: > + > +- compatible: should be "ti,usbhs-host" > +- reg: should contain one register range i.e. start and length > +- ti,hwmods: must contain "usb_host_hs" > + > +Optional properties: > + > +- num-ports: number of USB ports. Usually this is automatically detected > + from the IP's revision register but can be overridden by specifying > + this property. A maximum of 3 ports are supported at the moment. > + > +- portN-mode: String specifying the port mode for port N, where N can be > + from 1 to 3. If the port mode is not specified, that port is treated > + as unused. When specified, it must be one of the following. > + "ehci-phy", > +"ehci-tll", > +"ehci-hsic", > +"ohci-phy-6pin-datse0", > +"ohci-phy-6pin-dpdm", > +"ohci-phy-3pin-datse0", > +"ohci-phy-4pin-dpdm", > +"ohci-tll-6pin-datse0", > +"ohci-tll-6pin-dpdm", > +"ohci-tll-3pin-datse0", > +"ohci-tll-4pin-dpdm", > +"ohci-tll-2pin-datse0", > +"ohci-tll-2pin-dpdm", > + [...] > +/** > + * Map 'enum usbhs_omap_port_mode' found in > + * to the device tree binding portN-mode found in > + * 'Documentation/devicetree/bindings/mfd/omap-usb-host.txt' > + */ > +static const char *port_modes[] = { > + [OMAP_USBHS_PORT_MODE_UNUSED] = "", > + [OMAP_EHCI_PORT_MODE_PHY] = "ehci-phy", > + [OMAP_EHCI_PORT_MODE_TLL] = "ehci-tll", > + [OMAP_EHCI_PORT_MODE_HSIC] = "ehci-hsic", > + [OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0] = "ohci-phy-6pin-datse0", > + [OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM] = "ohci-phy-6pin-dpdm", > + [OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0] = "ohci-phy-3pin-datse0", > + [OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM] = "ohci-phy-4pin-dpdm", > + [OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0] = "ohci-tll-6pin-datse0", > + [OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM] = "ohci-tll-6pin-dpdm", > + [OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0] = "ohci-tll-3pin-datse0", > + [OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM] = "ohci-tll-4pin-dpdm", > + [OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0] = "ohci-tll-2pin-datse0", > + [OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM] = "ohci-tll-2pin-dpdm", > +}; > + > +/** > + * omap_usbhs_get_dt_port_mode - Get the 'enum usbhs_omap_port_mode' > + * from the port mode string. > + * @mode: The port mode string, usually obtained from device tree. > + * > + * The function returns the 'enum usbhs_omap_port_mode' that matches the > + * provided port mode string as per the port_modes table. > + * If no match is found it returns -ENODEV > + */ > +static const int omap_usbhs_get_dt_port_mode(const char *mode) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(port_modes); i++) { > + if (!strcasecmp(mode, port_modes[i])) > + return i; > + } Any reason for using strcasecmp rather than strcmp? The binding only specified lower case versions, and this allows people to write "oHcI-PhY-6PiN-DaTsE0" with impunity. Otherwise, this looks fine to me. Thanks, Mark. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2 09/14] mfd: omap-usb-host: Add device tree support and binding information
On Thu, Feb 07, 2013 at 04:02:49PM +, Roger Quadros wrote: Allows the OMAP HS USB host controller to be specified via device tree. CC: Samuel Ortiz sa...@linux.intel.com Signed-off-by: Roger Quadros rog...@ti.com --- .../devicetree/bindings/mfd/omap-usb-host.txt | 80 ++ drivers/mfd/omap-usb-host.c| 160 +++- 2 files changed, 234 insertions(+), 6 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-host.txt diff --git a/Documentation/devicetree/bindings/mfd/omap-usb-host.txt b/Documentation/devicetree/bindings/mfd/omap-usb-host.txt new file mode 100644 index 000..b381fa6 --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/omap-usb-host.txt @@ -0,0 +1,80 @@ +OMAP HS USB Host + +Required properties: + +- compatible: should be ti,usbhs-host +- reg: should contain one register range i.e. start and length +- ti,hwmods: must contain usb_host_hs + +Optional properties: + +- num-ports: number of USB ports. Usually this is automatically detected + from the IP's revision register but can be overridden by specifying + this property. A maximum of 3 ports are supported at the moment. + +- portN-mode: String specifying the port mode for port N, where N can be + from 1 to 3. If the port mode is not specified, that port is treated + as unused. When specified, it must be one of the following. + ehci-phy, +ehci-tll, +ehci-hsic, +ohci-phy-6pin-datse0, +ohci-phy-6pin-dpdm, +ohci-phy-3pin-datse0, +ohci-phy-4pin-dpdm, +ohci-tll-6pin-datse0, +ohci-tll-6pin-dpdm, +ohci-tll-3pin-datse0, +ohci-tll-4pin-dpdm, +ohci-tll-2pin-datse0, +ohci-tll-2pin-dpdm, + [...] +/** + * Map 'enum usbhs_omap_port_mode' found in linux/platform_data/usb-omap.h + * to the device tree binding portN-mode found in + * 'Documentation/devicetree/bindings/mfd/omap-usb-host.txt' + */ +static const char *port_modes[] = { + [OMAP_USBHS_PORT_MODE_UNUSED] = , + [OMAP_EHCI_PORT_MODE_PHY] = ehci-phy, + [OMAP_EHCI_PORT_MODE_TLL] = ehci-tll, + [OMAP_EHCI_PORT_MODE_HSIC] = ehci-hsic, + [OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0] = ohci-phy-6pin-datse0, + [OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM] = ohci-phy-6pin-dpdm, + [OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0] = ohci-phy-3pin-datse0, + [OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM] = ohci-phy-4pin-dpdm, + [OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0] = ohci-tll-6pin-datse0, + [OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM] = ohci-tll-6pin-dpdm, + [OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0] = ohci-tll-3pin-datse0, + [OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM] = ohci-tll-4pin-dpdm, + [OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0] = ohci-tll-2pin-datse0, + [OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM] = ohci-tll-2pin-dpdm, +}; + +/** + * omap_usbhs_get_dt_port_mode - Get the 'enum usbhs_omap_port_mode' + * from the port mode string. + * @mode: The port mode string, usually obtained from device tree. + * + * The function returns the 'enum usbhs_omap_port_mode' that matches the + * provided port mode string as per the port_modes table. + * If no match is found it returns -ENODEV + */ +static const int omap_usbhs_get_dt_port_mode(const char *mode) +{ + int i; + + for (i = 0; i ARRAY_SIZE(port_modes); i++) { + if (!strcasecmp(mode, port_modes[i])) + return i; + } Any reason for using strcasecmp rather than strcmp? The binding only specified lower case versions, and this allows people to write oHcI-PhY-6PiN-DaTsE0 with impunity. Otherwise, this looks fine to me. Thanks, Mark. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2 09/14] mfd: omap-usb-host: Add device tree support and binding information
On 02/11/2013 02:00 PM, Mark Rutland wrote: On Thu, Feb 07, 2013 at 04:02:49PM +, Roger Quadros wrote: Allows the OMAP HS USB host controller to be specified via device tree. CC: Samuel Ortiz sa...@linux.intel.com Signed-off-by: Roger Quadros rog...@ti.com --- .../devicetree/bindings/mfd/omap-usb-host.txt | 80 ++ drivers/mfd/omap-usb-host.c| 160 +++- 2 files changed, 234 insertions(+), 6 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-host.txt diff --git a/Documentation/devicetree/bindings/mfd/omap-usb-host.txt b/Documentation/devicetree/bindings/mfd/omap-usb-host.txt new file mode 100644 index 000..b381fa6 --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/omap-usb-host.txt @@ -0,0 +1,80 @@ +OMAP HS USB Host + +Required properties: + +- compatible: should be ti,usbhs-host +- reg: should contain one register range i.e. start and length +- ti,hwmods: must contain usb_host_hs + +Optional properties: + +- num-ports: number of USB ports. Usually this is automatically detected + from the IP's revision register but can be overridden by specifying + this property. A maximum of 3 ports are supported at the moment. + +- portN-mode: String specifying the port mode for port N, where N can be + from 1 to 3. If the port mode is not specified, that port is treated + as unused. When specified, it must be one of the following. +ehci-phy, +ehci-tll, +ehci-hsic, +ohci-phy-6pin-datse0, +ohci-phy-6pin-dpdm, +ohci-phy-3pin-datse0, +ohci-phy-4pin-dpdm, +ohci-tll-6pin-datse0, +ohci-tll-6pin-dpdm, +ohci-tll-3pin-datse0, +ohci-tll-4pin-dpdm, +ohci-tll-2pin-datse0, +ohci-tll-2pin-dpdm, + [...] +/** + * Map 'enum usbhs_omap_port_mode' found in linux/platform_data/usb-omap.h + * to the device tree binding portN-mode found in + * 'Documentation/devicetree/bindings/mfd/omap-usb-host.txt' + */ +static const char *port_modes[] = { +[OMAP_USBHS_PORT_MODE_UNUSED] = , +[OMAP_EHCI_PORT_MODE_PHY] = ehci-phy, +[OMAP_EHCI_PORT_MODE_TLL] = ehci-tll, +[OMAP_EHCI_PORT_MODE_HSIC] = ehci-hsic, +[OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0] = ohci-phy-6pin-datse0, +[OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM] = ohci-phy-6pin-dpdm, +[OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0] = ohci-phy-3pin-datse0, +[OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM] = ohci-phy-4pin-dpdm, +[OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0] = ohci-tll-6pin-datse0, +[OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM] = ohci-tll-6pin-dpdm, +[OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0] = ohci-tll-3pin-datse0, +[OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM] = ohci-tll-4pin-dpdm, +[OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0] = ohci-tll-2pin-datse0, +[OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM] = ohci-tll-2pin-dpdm, +}; + +/** + * omap_usbhs_get_dt_port_mode - Get the 'enum usbhs_omap_port_mode' + * from the port mode string. + * @mode: The port mode string, usually obtained from device tree. + * + * The function returns the 'enum usbhs_omap_port_mode' that matches the + * provided port mode string as per the port_modes table. + * If no match is found it returns -ENODEV + */ +static const int omap_usbhs_get_dt_port_mode(const char *mode) +{ +int i; + +for (i = 0; i ARRAY_SIZE(port_modes); i++) { +if (!strcasecmp(mode, port_modes[i])) +return i; +} Any reason for using strcasecmp rather than strcmp? The binding only specified lower case versions, and this allows people to write oHcI-PhY-6PiN-DaTsE0 with impunity. :). No specific reason. I'll change it to strcmp. Otherwise, this looks fine to me. Thanks. cheers, -roger -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/