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

Commit 7d5d15da authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 8017a0d3 on remote branch 

Change-Id: Icc3686d104ad6d348009c84a75f8bbe447753e72
parents 92f0f3da 8017a0d3

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -7611,6 +7611,12 @@ S: Maintained 
F:	Documentation/scsi/NinjaSCSI.txt

F:	drivers/scsi/nsp32*



NINTENDO HID DRIVER

M:	Daniel J. Ogorchock <djogorchock@gmail.com>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	drivers/hid/hid-nintendo*



NIOS2 ARCHITECTURE

M:	Ley Foon Tan <lftan@altera.com>

L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)

arch/arm/boot/dts/qcom/msm-audio-lpass.dtsi

+11 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2017, 2019-2020 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
@@ -293,6 +293,16 @@ 
			qcom,msm-dai-q6-dev-id = <32770>;

		};



		proxy_rx: qcom,msm-dai-q6-proxy-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <8194>;

		};



		proxy_tx: qcom,msm-dai-q6-proxy-tx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <8195>;

		};



		usb_audio_rx: qcom,msm-dai-q6-usb-audio-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <28672>;

arch/arm/boot/dts/qcom/msm8998-audio.dtsi

+9 −5
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2017, 2019-2020 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
@@ -122,7 +122,8 @@ 
				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,

				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,

				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,

				<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>;

				<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>,

				<&proxy_rx>, <&proxy_tx>;

		asoc-cpu-names = "msm-dai-q6-hdmi.8", "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -144,7 +145,8 @@ 
				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",

				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",

				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897",

				"msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36913";

				"msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36913",

				"msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195";

		asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;

		asoc-codec-names = "msm-stub-codec.1",

				   "msm-ext-disp-audio-codec-rx";
@@ -255,7 +257,8 @@ 
				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,

				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,

				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,

				<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>;

				<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>,

				<&proxy_rx>, <&proxy_tx>;

		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -277,7 +280,8 @@ 
				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",

				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",

				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897",

				"msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36913";

				"msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36913",

				"msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195";

		asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;

		asoc-codec-names = "msm-stub-codec.1",

				   "msm-ext-disp-audio-codec-rx";

arch/arm64/configs/msmcortex-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ CONFIG_SCHED_HMP=y 
CONFIG_SCHED_HMP_CSTATE_AWARE=y

CONFIG_SCHED_CORE_CTL=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_SCHED_AUTOGROUP=y

CONFIG_SCHED_TUNE=y
@@ -450,6 +449,7 @@ CONFIG_HID_ELECOM=y 
CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_NINTENDO=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_SONY=y

CONFIG_USB=y

arch/arm64/configs/msmcortex_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ CONFIG_SCHED_HMP=y 
CONFIG_SCHED_HMP_CSTATE_AWARE=y

CONFIG_SCHED_CORE_CTL=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_SCHED_AUTOGROUP=y

CONFIG_SCHED_TUNE=y
@@ -457,6 +456,7 @@ CONFIG_HID_ELECOM=y 
CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_NINTENDO=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_SONY=y

CONFIG_USB=y