ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary

I got a build error today that made me realize that it is not
possible to build a kernel for a SiRF platform without enabling
CONFIG_PRIMA2, since a lot of common code depends on CONFIG_PRIMA2.

This fixes all occurences that appear like common SiRF code.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Mark Brown <broonie@linaro.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Mike Turquette <mturquette@linaro.org>

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 1ba358ba16b871aec3b366cab9b4e4066048e69c..7ea15176d1099e20c99f0f5372306621e237d2d5 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -168,7 +168,7 @@ machine-$(CONFIG_ARCH_OMAP1)                += omap1
 machine-$(CONFIG_ARCH_OMAP2PLUS)       += omap2
 machine-$(CONFIG_ARCH_ORION5X)         += orion5x
 machine-$(CONFIG_ARCH_PICOXCELL)       += picoxcell
-machine-$(CONFIG_ARCH_PRIMA2)          += prima2
+machine-$(CONFIG_ARCH_SIRF)            += prima2
 machine-$(CONFIG_ARCH_PXA)             += pxa
 machine-$(CONFIG_ARCH_REALVIEW)                += realview
 machine-$(CONFIG_ARCH_RPC)             += rpc

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 137d3e730f866a2f10f75701801179c53d6340a5..f0e46997bb12aaf46d4351355eb9062edaf77007 100644 (file)
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -18,7 +18,7 @@ obj-$(CONFIG_ARCH_SOCFPGA)    += socfpga/
 obj-$(CONFIG_PLAT_SPEAR)       += spear/
 obj-$(CONFIG_ARCH_U300)                += clk-u300.o
 obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/
-obj-$(CONFIG_ARCH_PRIMA2)      += clk-prima2.o
+obj-$(CONFIG_ARCH_SIRF)                += clk-prima2.o
 obj-$(CONFIG_PLAT_ORION)       += mvebu/
 ifeq ($(CONFIG_COMMON_CLK), y)
 obj-$(CONFIG_ARCH_MMP)         += mmp/

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 631736e2e7ed94297a0f871615d6d5b6c9e6acd3..73e2e7db2b64e061d94da6aca141fdceae88f7d1 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -685,7 +685,7 @@ config I2C_SIMTEC
 
 config I2C_SIRF
        tristate "CSR SiRFprimaII I2C interface"
-       depends on ARCH_PRIMA2
+       depends on ARCH_SIRF
        help
          If you say yes to this option, support will be included for the
          CSR SiRFprimaII I2C interface.

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 92a9345d7a6bdeaa26fc8ca64a72a9d3a4d0554e..10f99f45a29bc8a567126e5739cd4f36ac5a9cca 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -404,7 +404,7 @@ config SPI_SH_HSPI
 
 config SPI_SIRF
        tristate "CSR SiRFprimaII SPI controller"
-       depends on ARCH_PRIMA2
+       depends on ARCH_SIRF
        select SPI_BITBANG
        help
          SPI driver for CSR SiRFprimaII SoCs

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 7e7006fd404e62000b19b728274c0abf8a51bf38..80155a1577e8c8d322cf79ca9ad3204ecebc4c9f 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -251,7 +251,7 @@ config SERIAL_SAMSUNG_CONSOLE
 
 config SERIAL_SIRFSOC
         tristate "SiRF SoC Platform Serial port support"
-        depends on ARCH_PRIMA2
+        depends on ARCH_SIRF
         select SERIAL_CORE
         help
           Support for the on-chip UART on the CSR SiRFprimaII series,