diff mbox

[v1,1/1] xilinx: Change commas to full stops

Message ID 318d19a708eed64caa64fbefc52eb1fe52ed85fe.1397013071.git.alistair.francis@xilinx.com
State New
Headers show

Commit Message

Alistair Francis April 9, 2014, 3:15 a.m. UTC
This is an extension of my 'zynq_slcr: Change the comma to a
underscore' patch. This changes the commas in Zynq peripherals
to full stops. This matches other Xilinx peripherals and also
makes command line argument parsing possible.

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
---
Thanks to Peter Crosthwaite for pointing out the 'xlnx.*' format

 hw/arm/xilinx_zynq.c     |    6 +++---
 hw/misc/zynq_slcr.c      |    2 +-
 hw/usb/hcd-ehci-sysbus.c |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

Comments

Peter Crosthwaite April 9, 2014, 3:23 a.m. UTC | #1
On Wed, Apr 9, 2014 at 1:15 PM, Alistair Francis
<alistair.francis@xilinx.com> wrote:
> This is an extension of my 'zynq_slcr: Change the comma to a
> underscore' patch.

You shouldn't reference previous versions of patches in the commit
message proper (you can talk about that stuff below the ---). Make the
message a self contained description of the changes relative to
current master. Just drop this sentence completely.

This changes the commas in Zynq peripherals
> to full stops. This matches other Xilinx peripherals and also
> makes command line argument parsing possible.

And you should mention that you are changing s/xilinx/xlnx.

Content of patch looks good.

Regards,
Peter

>
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> ---
> Thanks to Peter Crosthwaite for pointing out the 'xlnx.*' format
>
>  hw/arm/xilinx_zynq.c     |    6 +++---
>  hw/misc/zynq_slcr.c      |    2 +-
>  hw/usb/hcd-ehci-sysbus.c |    2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
> index 9ee21e7..eff31d2 100644
> --- a/hw/arm/xilinx_zynq.c
> +++ b/hw/arm/xilinx_zynq.c
> @@ -167,7 +167,7 @@ static void zynq_init(QEMUMachineInitArgs *args)
>                            1, 0x0066, 0x0022, 0x0000, 0x0000, 0x0555, 0x2aa,
>                                0);
>
> -    dev = qdev_create(NULL, "xilinx,zynq_slcr");
> +    dev = qdev_create(NULL, "xlnx.zynq-slcr");
>      qdev_init_nofail(dev);
>      sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xF8000000);
>
> @@ -187,8 +187,8 @@ static void zynq_init(QEMUMachineInitArgs *args)
>      zynq_init_spi_flashes(0xE0007000, pic[81-IRQ_OFFSET], false);
>      zynq_init_spi_flashes(0xE000D000, pic[51-IRQ_OFFSET], true);
>
> -    sysbus_create_simple("xlnx,ps7-usb", 0xE0002000, pic[53-IRQ_OFFSET]);
> -    sysbus_create_simple("xlnx,ps7-usb", 0xE0003000, pic[76-IRQ_OFFSET]);
> +    sysbus_create_simple("xlnx.ps7-usb", 0xE0002000, pic[53-IRQ_OFFSET]);
> +    sysbus_create_simple("xlnx.ps7-usb", 0xE0003000, pic[76-IRQ_OFFSET]);
>
>      sysbus_create_simple("cadence_uart", 0xE0000000, pic[59-IRQ_OFFSET]);
>      sysbus_create_simple("cadence_uart", 0xE0001000, pic[82-IRQ_OFFSET]);
> diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c
> index d1cc233..211f04a 100644
> --- a/hw/misc/zynq_slcr.c
> +++ b/hw/misc/zynq_slcr.c
> @@ -116,7 +116,7 @@ typedef enum {
>    RESET_MAX
>  } ResetValues;
>
> -#define TYPE_ZYNQ_SLCR "xilinx,zynq_slcr"
> +#define TYPE_ZYNQ_SLCR "xlnx.zynq-slcr"
>  #define ZYNQ_SLCR(obj) OBJECT_CHECK(ZynqSLCRState, (obj), TYPE_ZYNQ_SLCR)
>
>  typedef struct ZynqSLCRState {
> diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c
> index fe6eea5..dfad39d 100644
> --- a/hw/usb/hcd-ehci-sysbus.c
> +++ b/hw/usb/hcd-ehci-sysbus.c
> @@ -94,7 +94,7 @@ static void ehci_xlnx_class_init(ObjectClass *oc, void *data)
>  }
>
>  static const TypeInfo ehci_xlnx_type_info = {
> -    .name          = "xlnx,ps7-usb",
> +    .name          = "xlnx.ps7-usb",
>      .parent        = TYPE_SYS_BUS_EHCI,
>      .class_init    = ehci_xlnx_class_init,
>  };
> --
> 1.7.1
>
>
diff mbox

Patch

diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index 9ee21e7..eff31d2 100644
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -167,7 +167,7 @@  static void zynq_init(QEMUMachineInitArgs *args)
                           1, 0x0066, 0x0022, 0x0000, 0x0000, 0x0555, 0x2aa,
                               0);
 
-    dev = qdev_create(NULL, "xilinx,zynq_slcr");
+    dev = qdev_create(NULL, "xlnx.zynq-slcr");
     qdev_init_nofail(dev);
     sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xF8000000);
 
@@ -187,8 +187,8 @@  static void zynq_init(QEMUMachineInitArgs *args)
     zynq_init_spi_flashes(0xE0007000, pic[81-IRQ_OFFSET], false);
     zynq_init_spi_flashes(0xE000D000, pic[51-IRQ_OFFSET], true);
 
-    sysbus_create_simple("xlnx,ps7-usb", 0xE0002000, pic[53-IRQ_OFFSET]);
-    sysbus_create_simple("xlnx,ps7-usb", 0xE0003000, pic[76-IRQ_OFFSET]);
+    sysbus_create_simple("xlnx.ps7-usb", 0xE0002000, pic[53-IRQ_OFFSET]);
+    sysbus_create_simple("xlnx.ps7-usb", 0xE0003000, pic[76-IRQ_OFFSET]);
 
     sysbus_create_simple("cadence_uart", 0xE0000000, pic[59-IRQ_OFFSET]);
     sysbus_create_simple("cadence_uart", 0xE0001000, pic[82-IRQ_OFFSET]);
diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c
index d1cc233..211f04a 100644
--- a/hw/misc/zynq_slcr.c
+++ b/hw/misc/zynq_slcr.c
@@ -116,7 +116,7 @@  typedef enum {
   RESET_MAX
 } ResetValues;
 
-#define TYPE_ZYNQ_SLCR "xilinx,zynq_slcr"
+#define TYPE_ZYNQ_SLCR "xlnx.zynq-slcr"
 #define ZYNQ_SLCR(obj) OBJECT_CHECK(ZynqSLCRState, (obj), TYPE_ZYNQ_SLCR)
 
 typedef struct ZynqSLCRState {
diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c
index fe6eea5..dfad39d 100644
--- a/hw/usb/hcd-ehci-sysbus.c
+++ b/hw/usb/hcd-ehci-sysbus.c
@@ -94,7 +94,7 @@  static void ehci_xlnx_class_init(ObjectClass *oc, void *data)
 }
 
 static const TypeInfo ehci_xlnx_type_info = {
-    .name          = "xlnx,ps7-usb",
+    .name          = "xlnx.ps7-usb",
     .parent        = TYPE_SYS_BUS_EHCI,
     .class_init    = ehci_xlnx_class_init,
 };