Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a29717d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable virtio clock for sa8155 vm"

parents 0c2a1abd ad5d6ae4

arch/arm64/boot/dts/qcom/sa8155-vm.dtsi

+8 −4
Original line number Diff line number Diff line
@@ -95,14 +95,18 @@ 
	ranges = <0 0 0 0xffffffff>;

	compatible = "simple-bus";



	clock_virt: qcom,virt-gcc {

		compatible = "qcom,virt-clk-sm8150-gcc";

	clock_virt: qcom,virtio-gcc {

		compatible = "virtio,mmio";

		reg = <0x1c200000 0x1000>;

		interrupts = <0 100 0>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	clock_virt_scc: qcom,virt-scc {

		compatible = "qcom,virt-clk-sm8150-scc";

	clock_virt_scc: qcom,virtio-scc {

		compatible = "virtio,mmio";

		reg = <0x1c300000 0x1000>;

		interrupts = <0 101 0>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};

arch/arm64/configs/vendor/qti-quin-gvm-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ CONFIG_SPS_SUPPORT_NDP_BAM=y 
CONFIG_USB_BAM=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_QCOM_CLK_VIRT=y

CONFIG_VIRTIO_CLK=y

CONFIG_HWSPINLOCK=y

CONFIG_MAILBOX=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

arch/arm64/configs/vendor/qti-quin-gvm_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ CONFIG_SPS_SUPPORT_NDP_BAM=y 
CONFIG_USB_BAM=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_QCOM_CLK_VIRT=y

CONFIG_VIRTIO_CLK=y

CONFIG_HWSPINLOCK=y

CONFIG_MAILBOX=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

drivers/clk/qcom/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -562,3 +562,9 @@ config QCOM_CLK_VIRT 
	  This is the virtual clock frontend driver which is based on HAB for

	  the QTI virtual machine.

	  Say Y if you want to support virtual clock.



config VIRTIO_CLK

	tristate "Virtio clock driver"

	depends on VIRTIO

	---help---

	  This is the virtual clock driver for virtio.

drivers/clk/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -78,5 +78,6 @@ obj-$(CONFIG_SM_GCC_TRINKET) += gcc-trinket.o 
obj-$(CONFIG_SM_GPUCC_TRINKET) += gpucc-trinket.o

obj-$(CONFIG_SM_VIDEOCC_TRINKET) += videocc-trinket.o

obj-$(CONFIG_SPMI_PMIC_CLKDIV) += clk-spmi-pmic-div.o

obj-$(CONFIG_VIRTIO_CLK) += virtio_clk.o virtio_clk_sm8150.o virtio_clk_sm6150.o virtio_clk_sa8195p.o



obj-y += mdss/