diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-04-19 09:39:21 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:07:28 +0200 |
| commit | 8999e34d81e7949139cbabca57cde5429ed530fb (patch) | |
| tree | a840c300ec1d3cba77fa6ad03f1ece6afa4c285b | |
| parent | 4330971889149f064e9af8e020fe098c628b627e (diff) | |
HSI: omap_ssi: Add OMAP SSI to the kernel configuration
Add OMAP SSI device and driver to the kernel configuration
Change-Id: I7f21d4016a98db6f53efcd03f9ffd176b8845d7c
Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20577
Reviewed-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com>
Tested-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Conflicts:
arch/arm/mach-omap2/Makefile
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 3 | ||||
| -rw-r--r-- | drivers/hsi/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/hsi/Makefile | 1 | ||||
| -rw-r--r-- | drivers/hsi/controllers/Kconfig | 23 | ||||
| -rw-r--r-- | drivers/hsi/controllers/Makefile | 5 |
5 files changed, 33 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 49f92bc1c31..95578bb571d 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -187,6 +187,9 @@ ifneq ($(CONFIG_TIDSPBRIDGE),) obj-y += dsp.o endif +omap-ssi-$(CONFIG_OMAP_SSI) := ssi.o +obj-y += $(omap-ssi-m) $(omap-ssi-y) + # Specific board support obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o diff --git a/drivers/hsi/Kconfig b/drivers/hsi/Kconfig index d94e38dd80c..f053858683c 100644 --- a/drivers/hsi/Kconfig +++ b/drivers/hsi/Kconfig @@ -15,5 +15,6 @@ config HSI_BOARDINFO default y source "drivers/hsi/clients/Kconfig" +source "drivers/hsi/controllers/Kconfig" endif # HSI diff --git a/drivers/hsi/Makefile b/drivers/hsi/Makefile index 9d5d33f90de..586e5e0729e 100644 --- a/drivers/hsi/Makefile +++ b/drivers/hsi/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_HSI_BOARDINFO) += hsi_boardinfo.o obj-$(CONFIG_HSI) += hsi.o obj-y += clients/ +obj-y += controllers/ diff --git a/drivers/hsi/controllers/Kconfig b/drivers/hsi/controllers/Kconfig new file mode 100644 index 00000000000..3efe0f027c7 --- /dev/null +++ b/drivers/hsi/controllers/Kconfig @@ -0,0 +1,23 @@ +# +# HSI controllers configuration +# +comment "HSI controllers" + +config OMAP_SSI + tristate "OMAP SSI hardware driver" + depends on ARCH_OMAP && HSI + default n + ---help--- + SSI is a legacy version of HSI. It is usually used to connect + an application engine with a cellular modem. + If you say Y here, you will enable the OMAP SSI hardware driver. + + If unsure, say N. + +if OMAP_SSI + +config OMAP_SSI_CONFIG + boolean + default y + +endif # OMAP_SSI diff --git a/drivers/hsi/controllers/Makefile b/drivers/hsi/controllers/Makefile new file mode 100644 index 00000000000..c4ba2c2c2bd --- /dev/null +++ b/drivers/hsi/controllers/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for HSI controllers drivers +# + +obj-$(CONFIG_OMAP_SSI) += omap_ssi.o |