[v4,4/6] dt-bindings: hypervisor: Rename virtio to hypervisor

Message ID 1675756199-5917-5-git-send-email-ssengar@linux.microsoft.com
State New
Headers
Series Device tree support for Hyper-V VMBus driver |

Commit Message

Saurabh Singh Sengar Feb. 7, 2023, 7:49 a.m. UTC
  Rename virtio folder to more generic hypervisor, so that this can
accommodate more devices of similar type.

Signed-off-by: Saurabh Sengar <ssengar@linux.microsoft.com>
---
 Documentation/devicetree/bindings/gpio/gpio-virtio.yaml               | 4 ++--
 Documentation/devicetree/bindings/{virtio => hypervisor}/mmio.yaml    | 2 +-
 .../devicetree/bindings/{virtio => hypervisor}/pci-iommu.yaml         | 2 +-
 .../devicetree/bindings/{virtio => hypervisor}/virtio-device.yaml     | 2 +-
 Documentation/devicetree/bindings/i2c/i2c-virtio.yaml                 | 4 ++--
 MAINTAINERS                                                           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename Documentation/devicetree/bindings/{virtio => hypervisor}/mmio.yaml (95%)
 rename Documentation/devicetree/bindings/{virtio => hypervisor}/pci-iommu.yaml (98%)
 rename Documentation/devicetree/bindings/{virtio => hypervisor}/virtio-device.yaml (93%)
  

Comments

Rob Herring Feb. 7, 2023, 6:39 p.m. UTC | #1
On Mon, Feb 06, 2023 at 11:49:57PM -0800, Saurabh Sengar wrote:
> Rename virtio folder to more generic hypervisor, so that this can
> accommodate more devices of similar type.
> 
> Signed-off-by: Saurabh Sengar <ssengar@linux.microsoft.com>
> ---
>  Documentation/devicetree/bindings/gpio/gpio-virtio.yaml               | 4 ++--
>  Documentation/devicetree/bindings/{virtio => hypervisor}/mmio.yaml    | 2 +-
>  .../devicetree/bindings/{virtio => hypervisor}/pci-iommu.yaml         | 2 +-
>  .../devicetree/bindings/{virtio => hypervisor}/virtio-device.yaml     | 2 +-
>  Documentation/devicetree/bindings/i2c/i2c-virtio.yaml                 | 4 ++--
>  MAINTAINERS                                                           | 2 +-
>  6 files changed, 8 insertions(+), 8 deletions(-)
>  rename Documentation/devicetree/bindings/{virtio => hypervisor}/mmio.yaml (95%)
>  rename Documentation/devicetree/bindings/{virtio => hypervisor}/pci-iommu.yaml (98%)
>  rename Documentation/devicetree/bindings/{virtio => hypervisor}/virtio-device.yaml (93%)

virtio is used for more than just an interface to hypervisors. I think 
this should remain. Instead, I'd put vmbus under bindings/bus/.

Rob
  
Saurabh Singh Sengar Feb. 8, 2023, 2:51 a.m. UTC | #2
On Tue, Feb 07, 2023 at 12:39:31PM -0600, Rob Herring wrote:
> On Mon, Feb 06, 2023 at 11:49:57PM -0800, Saurabh Sengar wrote:
> > Rename virtio folder to more generic hypervisor, so that this can
> > accommodate more devices of similar type.
> > 
> > Signed-off-by: Saurabh Sengar <ssengar@linux.microsoft.com>
> > ---
> >  Documentation/devicetree/bindings/gpio/gpio-virtio.yaml               | 4 ++--
> >  Documentation/devicetree/bindings/{virtio => hypervisor}/mmio.yaml    | 2 +-
> >  .../devicetree/bindings/{virtio => hypervisor}/pci-iommu.yaml         | 2 +-
> >  .../devicetree/bindings/{virtio => hypervisor}/virtio-device.yaml     | 2 +-
> >  Documentation/devicetree/bindings/i2c/i2c-virtio.yaml                 | 4 ++--
> >  MAINTAINERS                                                           | 2 +-
> >  6 files changed, 8 insertions(+), 8 deletions(-)
> >  rename Documentation/devicetree/bindings/{virtio => hypervisor}/mmio.yaml (95%)
> >  rename Documentation/devicetree/bindings/{virtio => hypervisor}/pci-iommu.yaml (98%)
> >  rename Documentation/devicetree/bindings/{virtio => hypervisor}/virtio-device.yaml (93%)
> 
> virtio is used for more than just an interface to hypervisors. I think 
> this should remain. Instead, I'd put vmbus under bindings/bus/.

Agree, will move to bus in v5

> 
> Rob
  

Patch

diff --git a/Documentation/devicetree/bindings/gpio/gpio-virtio.yaml b/Documentation/devicetree/bindings/gpio/gpio-virtio.yaml
index 601d857..e08ed2a 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-virtio.yaml
+++ b/Documentation/devicetree/bindings/gpio/gpio-virtio.yaml
@@ -10,10 +10,10 @@  maintainers:
   - Viresh Kumar <viresh.kumar@linaro.org>
 
 allOf:
-  - $ref: /schemas/virtio/virtio-device.yaml#
+  - $ref: /schemas/hypervisor/virtio-device.yaml#
 
 description:
-  Virtio GPIO controller, see /schemas/virtio/virtio-device.yaml for more
+  Virtio GPIO controller, see /schemas/hypervisor/virtio-device.yaml for more
   details.
 
 properties:
diff --git a/Documentation/devicetree/bindings/virtio/mmio.yaml b/Documentation/devicetree/bindings/hypervisor/mmio.yaml
similarity index 95%
rename from Documentation/devicetree/bindings/virtio/mmio.yaml
rename to Documentation/devicetree/bindings/hypervisor/mmio.yaml
index 0aa8433..8492c9b 100644
--- a/Documentation/devicetree/bindings/virtio/mmio.yaml
+++ b/Documentation/devicetree/bindings/hypervisor/mmio.yaml
@@ -1,7 +1,7 @@ 
 # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 %YAML 1.2
 ---
-$id: http://devicetree.org/schemas/virtio/mmio.yaml#
+$id: http://devicetree.org/schemas/hypervisor/mmio.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
 title: virtio memory mapped devices
diff --git a/Documentation/devicetree/bindings/virtio/pci-iommu.yaml b/Documentation/devicetree/bindings/hypervisor/pci-iommu.yaml
similarity index 98%
rename from Documentation/devicetree/bindings/virtio/pci-iommu.yaml
rename to Documentation/devicetree/bindings/hypervisor/pci-iommu.yaml
index 972a785..52de535 100644
--- a/Documentation/devicetree/bindings/virtio/pci-iommu.yaml
+++ b/Documentation/devicetree/bindings/hypervisor/pci-iommu.yaml
@@ -1,7 +1,7 @@ 
 # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 %YAML 1.2
 ---
-$id: http://devicetree.org/schemas/virtio/pci-iommu.yaml#
+$id: http://devicetree.org/schemas/hypervisor/pci-iommu.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
 title: virtio-iommu device using the virtio-pci transport
diff --git a/Documentation/devicetree/bindings/virtio/virtio-device.yaml b/Documentation/devicetree/bindings/hypervisor/virtio-device.yaml
similarity index 93%
rename from Documentation/devicetree/bindings/virtio/virtio-device.yaml
rename to Documentation/devicetree/bindings/hypervisor/virtio-device.yaml
index 8c6919b..7b8d93b 100644
--- a/Documentation/devicetree/bindings/virtio/virtio-device.yaml
+++ b/Documentation/devicetree/bindings/hypervisor/virtio-device.yaml
@@ -1,7 +1,7 @@ 
 # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 %YAML 1.2
 ---
-$id: http://devicetree.org/schemas/virtio/virtio-device.yaml#
+$id: http://devicetree.org/schemas/hypervisor/virtio-device.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
 title: Virtio device
diff --git a/Documentation/devicetree/bindings/i2c/i2c-virtio.yaml b/Documentation/devicetree/bindings/i2c/i2c-virtio.yaml
index 7d87ed8..99a0ce2 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-virtio.yaml
+++ b/Documentation/devicetree/bindings/i2c/i2c-virtio.yaml
@@ -11,10 +11,10 @@  maintainers:
 
 allOf:
   - $ref: /schemas/i2c/i2c-controller.yaml#
-  - $ref: /schemas/virtio/virtio-device.yaml#
+  - $ref: /schemas/hypervisor/virtio-device.yaml#
 
 description:
-  Virtio I2C device, see /schemas/virtio/virtio-device.yaml for more details.
+  Virtio I2C device, see /schemas/hypervisor/virtio-device.yaml for more details.
 
 properties:
   $nodename:
diff --git a/MAINTAINERS b/MAINTAINERS
index f76ca28..27a5650 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -21977,7 +21977,7 @@  L:	virtualization@lists.linux-foundation.org
 S:	Maintained
 F:	Documentation/ABI/testing/sysfs-bus-vdpa
 F:	Documentation/ABI/testing/sysfs-class-vduse
-F:	Documentation/devicetree/bindings/virtio/
+F:	Documentation/devicetree/bindings/hypervisor/
 F:	Documentation/driver-api/virtio/
 F:	drivers/block/virtio_blk.c
 F:	drivers/crypto/virtio/