ARM: dts: qcom: Rename hypervisor to gunyah
Rename 'haven' to 'gunyah', 'hh' to 'gh'. These following words are unchanged becaused of dependency of hypervisor: 'haven-hypervisor', 'qcom,hh-watchdog', 'qcom,haven-message-queue', 'qcom,gunyah-vm-id'. Change-Id: I73e9ec0e8c1107fa2278d7f328d0351ab7675a23
This commit is contained in:
		
				
					committed by
					
						
						Gerrit - the friendly Code Review server
					
				
			
			
				
	
			
			
			
						parent
						
							137e974adc
						
					
				
				
					commit
					4fb0de7d3c
				
			@@ -1,9 +1,9 @@
 | 
			
		||||
%YAML 1.2
 | 
			
		||||
---
 | 
			
		||||
$id: http://devicetree.org/schemas/bindings/arm/msm/hh_watchdog.yaml#
 | 
			
		||||
$id: http://devicetree.org/schemas/bindings/arm/msm/gh_watchdog.yaml#
 | 
			
		||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
 | 
			
		||||
 | 
			
		||||
title: QTI HH Watchdog
 | 
			
		||||
title: QTI GH Watchdog
 | 
			
		||||
 | 
			
		||||
maintainers:
 | 
			
		||||
 | 
			
		||||
@@ -32,7 +32,7 @@ properties:
 | 
			
		||||
 | 
			
		||||
example:
 | 
			
		||||
  - |
 | 
			
		||||
    wdog_hh: qcom,wdt_hh {
 | 
			
		||||
    wdog_gh: qcom,wdt_gh {
 | 
			
		||||
		    compatible = "qcom,hh-watchdog";
 | 
			
		||||
		    interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>;
 | 
			
		||||
	    };
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
%YAML 1.2
 | 
			
		||||
---
 | 
			
		||||
$id: http://devicetree.org/schemas/haven/qcom,hypervisor.yaml#
 | 
			
		||||
$id: http://devicetree.org/schemas/gunyah/qcom,hypervisor.yaml#
 | 
			
		||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
 | 
			
		||||
 | 
			
		||||
title: Hypervisor node to define virtual devices and other services.
 | 
			
		||||
@@ -152,7 +152,7 @@ examples:
 | 
			
		||||
                     "simple-bus";
 | 
			
		||||
        name = "hypervisor";
 | 
			
		||||
 | 
			
		||||
        qcom,haven-vm {
 | 
			
		||||
        qcom,gunyah-vm {
 | 
			
		||||
            compatible = "qcom,haven-vm-id-1.0", "qcom,haven-vm-id";
 | 
			
		||||
            qcom,vendor = "Qualcomm Technologies, Inc.";
 | 
			
		||||
            qcom,vmid = <45>;
 | 
			
		||||
@@ -1,9 +1,9 @@
 | 
			
		||||
%YAML 1.2
 | 
			
		||||
---
 | 
			
		||||
$id: http://devicetree.org/schemas/haven/virtio_backend.yaml#
 | 
			
		||||
$id: http://devicetree.org/schemas/gunyah/virtio_backend.yaml#
 | 
			
		||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
 | 
			
		||||
 | 
			
		||||
title: Virtio backend device for Haven hypervisor
 | 
			
		||||
title: Virtio backend device for Gunyah hypervisor
 | 
			
		||||
 | 
			
		||||
maintainers:
 | 
			
		||||
  - Srivatsa Vaddagiri <svaddagi@qti.qualcomm.com>
 | 
			
		||||
@@ -11,10 +11,10 @@ maintainers:
 | 
			
		||||
 | 
			
		||||
description: |+
 | 
			
		||||
  Configuration properties for Virtio backend device. This device is
 | 
			
		||||
  specific to virtio support found in Haven hypervisor. The
 | 
			
		||||
  specific to virtio support found in Gunyah hypervisor. The
 | 
			
		||||
  device helps a virtio backend driver in one Virtual Machine
 | 
			
		||||
  establish connection with its frontend counterpart in another Virtual
 | 
			
		||||
  Machine, with both VMs running on Haven hypervisor.
 | 
			
		||||
  Machine, with both VMs running on Gunyah hypervisor.
 | 
			
		||||
 | 
			
		||||
properties:
 | 
			
		||||
  compatible:
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
%YAML 1.2
 | 
			
		||||
---
 | 
			
		||||
$id: http://devicetree.org/schemas/haven/vm.yaml#
 | 
			
		||||
$id: http://devicetree.org/schemas/gunyah/vm.yaml#
 | 
			
		||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
 | 
			
		||||
 | 
			
		||||
title: Virtual Machine (VM) Configuration
 | 
			
		||||
@@ -65,7 +65,7 @@ patternProperties:
 | 
			
		||||
        enum:
 | 
			
		||||
          - qcom,neuron-channel-mq-loopback
 | 
			
		||||
          - qcom,neuron-channel-mq-shmem
 | 
			
		||||
          - qcom,neuron-channel-haven-shmem
 | 
			
		||||
          - qcom,neuron-channel-gunyah-shmem
 | 
			
		||||
 | 
			
		||||
      direction:
 | 
			
		||||
        oneOf:
 | 
			
		||||
 
 | 
			
		||||
@@ -3,27 +3,27 @@
 | 
			
		||||
$id: "http://devicetree.org/schemas/neuron.yaml#"
 | 
			
		||||
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
 | 
			
		||||
 | 
			
		||||
title: QRTR Haven Transport Configuration
 | 
			
		||||
title: QRTR Gunyah Transport Configuration
 | 
			
		||||
 | 
			
		||||
maintainers:
 | 
			
		||||
  - Chris Lew <clew@quicinc.com>
 | 
			
		||||
 | 
			
		||||
description: |
 | 
			
		||||
  Configuration properties for the qrtr Haven Transport. This configuration is
 | 
			
		||||
  Configuration properties for the qrtr Gunyah Transport. This configuration is
 | 
			
		||||
  to instantiate a transport for IPC Router protocol communication between
 | 
			
		||||
  virtual machines on top of the Haven hypervisor.
 | 
			
		||||
  virtual machines on top of the Gunyah hypervisor.
 | 
			
		||||
 | 
			
		||||
properties:
 | 
			
		||||
  compatible:
 | 
			
		||||
    const: qcom,qrtr-haven
 | 
			
		||||
    const: qcom,qrtr-gunyah
 | 
			
		||||
 | 
			
		||||
  qcom,master:
 | 
			
		||||
    description: Specify if this device is on the primary virtual machine.
 | 
			
		||||
 | 
			
		||||
  haven-label:
 | 
			
		||||
  gunyah-label:
 | 
			
		||||
    $ref: '/schemas/types.yaml#/definitions/u32'
 | 
			
		||||
    maxItems: 1
 | 
			
		||||
    description: The label qrtr should request interrupts with from the haven
 | 
			
		||||
    description: The label qrtr should request interrupts with from the gunyah
 | 
			
		||||
                 doorbell driver.
 | 
			
		||||
 | 
			
		||||
  shared-buffer:
 | 
			
		||||
@@ -34,7 +34,7 @@ properties:
 | 
			
		||||
 | 
			
		||||
required:
 | 
			
		||||
  -compatible
 | 
			
		||||
  -haven-label
 | 
			
		||||
  -gunyah-label
 | 
			
		||||
  -shared-buffer
 | 
			
		||||
 | 
			
		||||
examples:
 | 
			
		||||
@@ -44,9 +44,9 @@ examples:
 | 
			
		||||
        reg = <0x0 0xd7ef7000 0x0 0x9000>;
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    qrtr-haven {
 | 
			
		||||
        compatible = "qcom,qrtr-haven";
 | 
			
		||||
    qrtr-gunyah {
 | 
			
		||||
        compatible = "qcom,qrtr-gunyah";
 | 
			
		||||
	qcom,master;
 | 
			
		||||
	haven-label = <0>;
 | 
			
		||||
	gunyah-label = <0>;
 | 
			
		||||
        shared-buffer = <&qrtr_shbuf>;
 | 
			
		||||
    };
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
%YAML 1.2
 | 
			
		||||
---
 | 
			
		||||
$id: http://devicetree.org/schemas/haven/swiotlb.yaml#
 | 
			
		||||
$id: http://devicetree.org/schemas/gunyah/swiotlb.yaml#
 | 
			
		||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
 | 
			
		||||
 | 
			
		||||
title: SWIOTLB device
 | 
			
		||||
 
 | 
			
		||||
@@ -82,9 +82,9 @@
 | 
			
		||||
		};
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	qrtr-haven {
 | 
			
		||||
		compatible = "qcom,qrtr-haven";
 | 
			
		||||
		haven-label = <3>;
 | 
			
		||||
	qrtr-gunyah {
 | 
			
		||||
		compatible = "qcom,qrtr-gunyah";
 | 
			
		||||
		gunyah-label = <3>;
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	qcom,vm-config {
 | 
			
		||||
@@ -205,7 +205,7 @@
 | 
			
		||||
			qrtr-shm {
 | 
			
		||||
				vdevice-type = "shm-doorbell";
 | 
			
		||||
				generate = "/hypervisor/qrtr-shm";
 | 
			
		||||
				push-compatible = "qcom,qrtr-haven-gen";
 | 
			
		||||
				push-compatible = "qcom,qrtr-gunyah-gen";
 | 
			
		||||
				peer-default;
 | 
			
		||||
				memory {
 | 
			
		||||
					qcom,label = <0x3>;
 | 
			
		||||
 
 | 
			
		||||
@@ -518,19 +518,19 @@
 | 
			
		||||
	trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring@e85fc000 {
 | 
			
		||||
		no-map;
 | 
			
		||||
		reg = <0x0 0xe85fc000 0x0 0x4000>;
 | 
			
		||||
		haven-label = <0x10>;
 | 
			
		||||
		gunyah-label = <0x10>;
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	trust_ui_vm_vblk1_ring: trust_ui_vm_vblk1_ring@e8600000 {
 | 
			
		||||
		no-map;
 | 
			
		||||
		reg = <0x0 0xe8600000 0x0 0x4000>;
 | 
			
		||||
		haven-label = <0x11>;
 | 
			
		||||
		gunyah-label = <0x11>;
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	trust_ui_vm_swiotlb: trust_ui_vm_swiotlb@e8604000 {
 | 
			
		||||
		no-map;
 | 
			
		||||
		reg = <0x0 0xe8604000 0x0 0x1fc000>;
 | 
			
		||||
		haven-label = <0x12>;
 | 
			
		||||
		gunyah-label = <0x12>;
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	trust_ui_vm_qrtr: trust_ui_vm_qrtr@e8500000 {
 | 
			
		||||
@@ -1642,10 +1642,10 @@
 | 
			
		||||
		};
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	qrtr-haven {
 | 
			
		||||
		compatible = "qcom,qrtr-haven";
 | 
			
		||||
	qrtr-gunyah {
 | 
			
		||||
		compatible = "qcom,qrtr-gunyah";
 | 
			
		||||
		qcom,master;
 | 
			
		||||
		haven-label = <3>;
 | 
			
		||||
		gunyah-label = <3>;
 | 
			
		||||
		peer-name = <2>;
 | 
			
		||||
		shared-buffer = <&trust_ui_vm_qrtr>;
 | 
			
		||||
	};
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user