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

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

Merge "defconfig: kona: Enable support for external viewer device"

parents a2c3a879 4630f806

arch/arm64/boot/dts/qcom/kona-smp2p.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -84,6 +84,11 @@ 
			interrupt-controller;

			#interrupt-cells = <2>;

		};



		smp2p_qvrexternal5_out: qcom,smp2p-qvrexternal5-out {

			qcom,entry-name = "qvrexternal";

			#qcom,smem-state-cells = <1>;

		};

	};



	qcom,smp2p-npu {

arch/arm64/boot/dts/qcom/kona.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -3453,6 +3453,7 @@ 
#include "kona-cvp.dtsi"

#include "kona-npu.dtsi"

#include "kona-gpu.dtsi"

#include "msm-qvr-external.dtsi"



&qupv3_se15_i2c {

	status = "ok";

arch/arm64/boot/dts/qcom/msm-qvr-external.dtsi

0 → 100644
+22 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&soc {



	qcom,smp2p_interrupt_qvrexternal_5_out {

		compatible = "qcom,smp2p-interrupt-qvrexternal-5-out";

		qcom,smem-states = <&smp2p_qvrexternal5_out 0>;

		qcom,smem-state-names = "qvrexternal-smp2p-out";

	};



};

arch/arm64/configs/vendor/kona-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -376,6 +376,8 @@ CONFIG_MEDIA_CONTROLLER=y 
CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_VIDEO_ADV_DEBUG=y

CONFIG_VIDEO_FIXED_MINOR_RANGES=y

CONFIG_MEDIA_USB_SUPPORT=y

CONFIG_USB_VIDEO_CLASS=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SPECTRA_CAMERA=y

CONFIG_MSM_CVP_V4L2=y
@@ -407,6 +409,7 @@ CONFIG_HID_MAGICMOUSE=y 
CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_QVR=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y

arch/arm64/configs/vendor/kona_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -386,6 +386,8 @@ CONFIG_MEDIA_CONTROLLER=y 
CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_VIDEO_ADV_DEBUG=y

CONFIG_VIDEO_FIXED_MINOR_RANGES=y

CONFIG_MEDIA_USB_SUPPORT=y

CONFIG_USB_VIDEO_CLASS=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SPECTRA_CAMERA=y

CONFIG_MSM_CVP_V4L2=y
@@ -418,6 +420,7 @@ CONFIG_HID_MAGICMOUSE=y 
CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_QVR=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y