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

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

Merge "defconfig:kona: Add support for slimbus slave drivers"

parents 80cf4a90 a5cd09f6

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

+9 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ 
		interrupt-names = "slimbus_irq", "slimbus_bam_irq";

		qcom,apps-ch-pipes = <0x700000>;

		qcom,ea-pc = <0x2d0>;

		status = "disabled";

		status = "ok";

		qcom,iommu-s1-bypass;



		iommu_slim_aud_ctrl_cb: qcom,iommu_slim_ctrl_cb {
@@ -633,6 +633,14 @@ 
				 <&apps_smmu 0x1830 0x1>;

			status = "disabled";

		};



		/* Slimbus Slave DT for QCA6390 */

		btfmslim_codec: qca6390 {

			compatible = "qcom,btfmslim_slave";

			elemental-addr = [00 01 20 02 17 02];

			qcom,btfm-slim-ifd = "btfmslim_slave_ifd";

			qcom,btfm-slim-ifd-elemental-addr = [00 00 20 02 17 02];

		};

	};



	intc: interrupt-controller@17a00000 {

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ CONFIG_QRTR_SMD=y 
CONFIG_QRTR_MHI=y

CONFIG_BT=y

CONFIG_MSM_BT_POWER=y

CONFIG_BT_SLIM_QCA6390=y

CONFIG_CFG80211=y

CONFIG_RFKILL=y

CONFIG_FW_LOADER_USER_HELPER=y
@@ -499,7 +500,6 @@ CONFIG_RAS=y 
CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_NVMEM_SPMI_SDAM=y

CONFIG_SLIMBUS=y

CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_ESOC=y

CONFIG_ESOC_DEV=y

arch/arm64/configs/vendor/kona_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ CONFIG_QRTR_SMD=y 
CONFIG_QRTR_MHI=y

CONFIG_BT=y

CONFIG_MSM_BT_POWER=y

CONFIG_BT_SLIM_QCA6390=y

CONFIG_CFG80211=y

# CONFIG_CFG80211_CRDA_SUPPORT is not set

CONFIG_RFKILL=y
@@ -516,7 +517,6 @@ CONFIG_RAS=y 
CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_NVMEM_SPMI_SDAM=y

CONFIG_SLIMBUS=y

CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_ESOC=y

CONFIG_ESOC_DEV=y