Acasă Explorează Ajutor
Înregistrare Autentificare
phyus
/
linux-vybrid_public
8
0
Bifurcare 0
Fisiere Probleme 0 Trageți solicitările 0 Wiki
Răsfoiți Sursa

[ARM] pxa: remove incorrect select PXA_SSP in Kconfig

PXA_SSP is actually used by drivers like drivers/spi/pxa2xx_spi.c and
sound/soc/pxa/pxa-ssp.c, not by boards. Remove those incorrect 'select'
from Kconfig and make SOC_PXA_SSP to select.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Eric Miao 15 ani în urmă
părinte
54c39b420f
comite
866d091dcb
2 a modificat fișierele cu 1 adăugiri și 13 ștergeri
Vedere unificată Arată Statisticile Diff
  1. 0 13
      arch/arm/mach-pxa/Kconfig
  2. 1 0
      sound/soc/pxa/Kconfig

+ 0 - 13
arch/arm/mach-pxa/Kconfig
Vizualizați fișierul 

@@ -19,7 +19,6 @@ config MACH_MAINSTONE
 
 config MACH_ZYLONITE
 
 config MACH_ZYLONITE
 
 	bool
 
 	bool
 
 	select PXA3xx
 
 	select PXA3xx
 
-	select PXA_SSP
 
 	select HAVE_PWM
 
 	select HAVE_PWM
 
 	select PXA_HAVE_BOARD_IRQS
 
 	select PXA_HAVE_BOARD_IRQS
 
 
 
@@ -39,7 +38,6 @@ config MACH_LITTLETON
 
 	select PXA3xx
 
 	select PXA3xx
 
 	select CPU_PXA300
 
 	select CPU_PXA300
 
 	select CPU_PXA310
 
 	select CPU_PXA310
 
-	select PXA_SSP
 
 
 
 config MACH_TAVOREVB
 
 config MACH_TAVOREVB
 
 	bool "PXA930 Evaluation Board (aka TavorEVB)"
 
 	bool "PXA930 Evaluation Board (aka TavorEVB)"
 
@@ -98,7 +96,6 @@ config MACH_ARMCORE
 
 	select PXA27x
 
 	select PXA27x
 
 	select IWMMXT
 
 	select IWMMXT
 
 	select PXA25x
 
 	select PXA25x
 
-	select PXA_SSP
 
 
 
 config MACH_EM_X270
 
 config MACH_EM_X270
 
 	bool "CompuLab EM-x270 platform"
 
 	bool "CompuLab EM-x270 platform"
 
@@ -161,7 +158,6 @@ config MACH_XCEP
 
 	select MTD_CFI
 
 	select MTD_CFI
 
 	select MTD_CHAR
 
 	select MTD_CHAR
 
 	select SMC91X
 
 	select SMC91X
 
-	select PXA_SSP
 
 	help
 
 	help
 
 	  PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash.
 
 	  PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash.
 
 	  Tuned for usage in Libera instruments for particle accelerators.
 
 	  Tuned for usage in Libera instruments for particle accelerators.
 
@@ -180,7 +176,6 @@ config MACH_TRIZEPS4WL
 
 	depends on TRIZEPS_PXA
 
 	depends on TRIZEPS_PXA
 
 	select TRIZEPS_PCMCIA
 
 	select TRIZEPS_PCMCIA
 
 	select PXA27x
 
 	select PXA27x
 
-	select PXA_SSP
 
 
 
 choice
 
 choice
 
 	prompt "Select base board for Trizeps module"
 
 	prompt "Select base board for Trizeps module"
 
@@ -217,7 +212,6 @@ config MACH_PCM027
 
 	bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
 
 	bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
 
 	select PXA27x
 
 	select PXA27x
 
 	select IWMMXT
 
 	select IWMMXT
 
-	select PXA_SSP
 
 	select PXA_HAVE_BOARD_IRQS
 
 	select PXA_HAVE_BOARD_IRQS
 
 
 
 config MACH_PCM990_BASEBOARD
 
 config MACH_PCM990_BASEBOARD
 
@@ -261,7 +255,6 @@ config MACH_H4700
 
 	bool "HP iPAQ hx4700"
 
 	bool "HP iPAQ hx4700"
 
 	select PXA27x
 
 	select PXA27x
 
 	select IWMMXT
 
 	select IWMMXT
 
-	select PXA_SSP
 
 	select HAVE_PWM
 
 	select HAVE_PWM
 
 	select PXA_HAVE_BOARD_IRQS
 
 	select PXA_HAVE_BOARD_IRQS
 
 
 
@@ -277,7 +270,6 @@ config MACH_MAGICIAN
 
 	bool "Enable HTC Magician Support"
 
 	bool "Enable HTC Magician Support"
 
 	select PXA27x
 
 	select PXA27x
 
 	select IWMMXT
 
 	select IWMMXT
 
-	select PXA_SSP
 
 	select HAVE_PWM
 
 	select HAVE_PWM
 
 	select PXA_HAVE_BOARD_IRQS
 
 	select PXA_HAVE_BOARD_IRQS
 
 
 
@@ -431,13 +423,11 @@ config MACH_RAUMFELD_CONNECTOR
 
 	bool "Raumfeld Connector"
 
 	bool "Raumfeld Connector"
 
 	select PXA3xx
 
 	select PXA3xx
 
 	select CPU_PXA300
 
 	select CPU_PXA300
 
-	select PXA_SSP
 
 
 
 config MACH_RAUMFELD_SPEAKER
 
 config MACH_RAUMFELD_SPEAKER
 
 	bool "Raumfeld Speaker"
 
 	bool "Raumfeld Speaker"
 
 	select PXA3xx
 
 	select PXA3xx
 
 	select CPU_PXA300
 
 	select CPU_PXA300
 
-	select PXA_SSP
 
 
 
 config PXA_SHARPSL
 
 config PXA_SHARPSL
 
 	bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
 
 	bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
 
@@ -466,7 +456,6 @@ config MACH_POODLE
 
 	depends on PXA_SHARPSL
 
 	depends on PXA_SHARPSL
 
 	select PXA25x
 
 	select PXA25x
 
 	select SHARP_LOCOMO
 
 	select SHARP_LOCOMO
 
-	select PXA_SSP
 
 	select PXA_HAVE_BOARD_IRQS
 
 	select PXA_HAVE_BOARD_IRQS
 
 
 
 config MACH_CORGI
 
 config MACH_CORGI
 
@@ -636,14 +625,12 @@ config CPU_PXA950
 
 
 
 config PXA_SHARP_C7xx
 
 config PXA_SHARP_C7xx
 
 	bool
 
 	bool
 
-	select PXA_SSP
 
 	select SHARPSL_PM
 
 	select SHARPSL_PM
 
 	help
 
 	help
 
 	  Enable support for all Sharp C7xx models
 
 	  Enable support for all Sharp C7xx models
 
 
 
 config PXA_SHARP_Cxx00
 
 config PXA_SHARP_Cxx00
 
 	bool
 
 	bool
 
-	select PXA_SSP
 
 	select SHARPSL_PM
 
 	select SHARPSL_PM
 
 	help
 
 	help
 
 	  Enable common support for Sharp Cxx00 models
 
 	  Enable common support for Sharp Cxx00 models

+ 1 - 0
sound/soc/pxa/Kconfig
Vizualizați fișierul 

@@ -23,6 +23,7 @@ config SND_PXA2XX_SOC_I2S
 
 
 
 config SND_PXA_SOC_SSP
 
 config SND_PXA_SOC_SSP
 
 	tristate
 
 	tristate
 
+	select PXA_SSP
 
 
 
 config SND_PXA2XX_SOC_CORGI
 
 config SND_PXA2XX_SOC_CORGI
 
 	tristate "SoC Audio support for Sharp Zaurus SL-C7x0"
 
 	tristate "SoC Audio support for Sharp Zaurus SL-C7x0"