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

Commit 98023a02 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Enable uio msm shared mem"

parents f388a43a 9d8febdc

Documentation/devicetree/bindings/uio/msm_sharedmem.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
msm_sharedmem provides the shared memory addresses for various clients in user-space



Required properties:

- compatible:		Must be "qcom,sharedmem-uio"

- reg : The address and size of the shared memory. The address/sizes may vary.

	A reg address of Zero indicates that the shared memory is dynamically

	allocated using dma_alloc_coherent. A non zero reg address is used

	directly.

- reg-names : Indicates various client-names.

- qcom,client-id : The client id for the QMI clients.



Example:

	qcom,msm_sharedmem@0dc80000 {

		compatible = "qcom,sharedmem-uio";

		reg = <0x0dc80000 0x00180000>,

		reg-names = "rmtfs";

		qcom,client-id = <0x00000001>;

	};

arch/arm64/configs/msm-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y

CONFIG_UIO=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y

CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y

CONFIG_ANDROID=y

arch/arm64/configs/msm_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -396,6 +396,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y

CONFIG_UIO=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y

CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y

CONFIG_ANDROID=y

drivers/uio/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -135,4 +135,11 @@ config UIO_MF624 


	  If you compile this as a module, it will be called uio_mf624.



config UIO_MSM_SHAREDMEM

	bool "MSM shared memory driver"

	default n

	help

	  Provides the clients with their respective alloted shared memory

	  addresses which are used as transport buffer.



endif

drivers/uio/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ obj-$(CONFIG_UIO_PCI_GENERIC) += uio_pci_generic.o 
obj-$(CONFIG_UIO_NETX)	+= uio_netx.o

obj-$(CONFIG_UIO_PRUSS)         += uio_pruss.o

obj-$(CONFIG_UIO_MF624)         += uio_mf624.o

obj-$(CONFIG_UIO_MSM_SHAREDMEM) += msm_sharedmem/