Skip to contentSkip to conversation

ARM: s3c24xx: Removed unneeded dependency on ARCH_S3C24XX for boards

PATCH In review Alexander Shiyan 3 participants 9 messages Mar 2, 2013 – Apr 4, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 ARM: s3c24xx: Removed unneeded dependency on ARCH_S3C24XX for boards

Board options are already under "if ARCH_S3C24XX" condition, so additional dependencies on this symbol can be removed.

---
 arch/arm/mach-s3c24xx/Kconfig | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
arch/arm/mach-s3c24xx/Kconfig +3 -8
index 37f513d..567d77b 100644
@@ -36,7 +36,6 @@ config CPU_S3C2410
 
 config CPU_S3C2412
 	bool "SAMSUNG S3C2412"
-	depends on ARCH_S3C24XX
 	select CPU_ARM926T
 	select CPU_LLSERIAL_S3C2440
 	select S3C2412_DMA if S3C24XX_DMA
@@ -46,7 +45,6 @@ config CPU_S3C2412
 
 config CPU_S3C2416
 	bool "SAMSUNG S3C2416/S3C2450"
-	depends on ARCH_S3C24XX
 	select CPU_ARM926T
 	select CPU_LLSERIAL_S3C2440
 	select S3C2416_PM if PM
@@ -81,7 +79,6 @@ config CPU_S3C244X
 
 config CPU_S3C2443
 	bool "SAMSUNG S3C2443"
-	depends on ARCH_S3C24XX
 	select CPU_ARM920T
 	select CPU_LLSERIAL_S3C2440
 	select S3C2443_COMMON
@@ -133,7 +130,6 @@ config S3C24XX_SETUP_TS
 
 config S3C24XX_DMA
 	bool "S3C2410 DMA support"
-	depends on ARCH_S3C24XX
 	select S3C_DMA
 	help
 	  S3C2410 DMA support. This is needed for drivers like sound which
@@ -142,7 +138,7 @@ config S3C24XX_DMA
 
 config S3C2410_DMA_DEBUG
 	bool "S3C2410 DMA support debug"
-	depends on ARCH_S3C24XX && S3C2410_DMA
+	depends on S3C2410_DMA
 	help
 	  Enable debugging output for the DMA code. This option sends info
 	  to the kernel log, at priority KERN_DEBUG.
@@ -380,9 +376,8 @@ if CPU_S3C2412
 
 config CPU_S3C2412_ONLY
 	bool
-	depends on ARCH_S3C24XX && !CPU_S3C2410 && \
-		   !CPU_S3C2416 && !CPU_S3C2440 && !CPU_S3C2442 && \
-		   !CPU_S3C2443 && CPU_S3C2412
+	depends on !CPU_S3C2410 && !CPU_S3C2416 && !CPU_S3C2440 && \
+		   !CPU_S3C2442 && !CPU_S3C2443 && CPU_S3C2412
 	default y
 
 config S3C2412_CPUFREQ
Signature · 1 line
1.7.12.4
#1 lore raw

PATCH 2/4 ARM: s3c24xx: Removed unneeded dependency on CPU_S3C2410

S3C2410 boards are already under "if CPU_S3C2410" condition, so additional dependencies on this symbol can be removed.

---
 arch/arm/mach-s3c24xx/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-s3c24xx/Kconfig +1 -1
index 567d77b..dddb49b 100644
@@ -229,7 +229,7 @@ if CPU_S3C2410
 
 config S3C2410_CPUFREQ
 	bool
-	depends on CPU_FREQ_S3C24XX && CPU_S3C2410
+	depends on CPU_FREQ_S3C24XX
 	select S3C2410_CPUFREQ_UTILS
 	help
 	  CPU Frequency scaling support for S3C2410
Signature · 1 line
1.7.12.4
#2 lore raw

PATCH 3/4 ARM: s3c24xx: Removed unneeded dependency on CPU_S3C2412

In reply to Alexander Shiyan

S3C2412 boards are already under "if CPU_S3C2412" condition, so additional dependencies on this symbol can be removed.

---
 arch/arm/mach-s3c24xx/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-s3c24xx/Kconfig +2 -2
index dddb49b..e6f7d7c 100644
@@ -377,12 +377,12 @@ if CPU_S3C2412
 config CPU_S3C2412_ONLY
 	bool
 	depends on !CPU_S3C2410 && !CPU_S3C2416 && !CPU_S3C2440 && \
-		   !CPU_S3C2442 && !CPU_S3C2443 && CPU_S3C2412
+		   !CPU_S3C2442 && !CPU_S3C2443
 	default y
 
 config S3C2412_CPUFREQ
 	bool
-	depends on CPU_FREQ_S3C24XX && CPU_S3C2412
+	depends on CPU_FREQ_S3C24XX
 	default y
 	select S3C2412_IOTIMING
 	help
Signature · 1 line
1.7.12.4
#3 lore raw

PATCH 4/4 ARM: s3c24xx: Fix switching FIFO in arch_enable_uart_fifo function

In reply to Alexander Shiyan

When CONFIG_S3C_BOOT_UART_FORCE_FIFO symbol is set, we should enable FIFO but actually switch command is missing in the code. This patch adds this switch.

---
 arch/arm/plat-samsung/include/plat/uncompress.h | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/plat-samsung/include/plat/uncompress.h +2 -0
index 438b248..30fedd9 100644
@@ -130,6 +130,8 @@ static inline void arch_enable_uart_fifo(void)
 			if (!(fifocon & S3C2410_UFCON_RESETBOTH))
 				break;
 		}
+
+		uart_wr(S3C2410_UFCON, S3C2410_UFCON_FIFOMODE);
 	}
 }
 #else
Signature · 1 line
1.7.12.4
#4 lore raw

PATCH 4/4 ARM: s3c24xx: Fix switching FIFO in arch_enable_uart_fifo function

Quoted 16 lines · Alexander Shiyan

When CONFIG_S3C_BOOT_UART_FORCE_FIFO symbol is set, we should enable FIFO but actually switch command is missing in the code. This patch adds this switch.

---
 arch/arm/plat-samsung/include/plat/uncompress.h | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/plat-samsung/include/plat/uncompress.h +0 -0
index 438b248..30fedd9 100644

arch/arm/plat-samsung/include/plat/uncompress.h static inline void arch_enable_uart_fifo(void) · line 134

Quoted 5 lines
arch/arm/plat-samsung/include/plat/uncompress.h +2 -0
@@ -130,6 +130,8 @@ static inline void arch_enable_uart_fifo(void)
 			if (!(fifocon & S3C2410_UFCON_RESETBOTH))
 				break;
 		}
+
+		uart_wr(S3C2410_UFCON, S3C2410_UFCON_FIFOMODE);

Well, I think, if required, this should be moved into 'if (!(fifocon & S3C2410_UFCON_FIFOMODE))'.

- Kukjin

#5 lore raw

Re[2]: [PATCH 4/4] ARM: s3c24xx: Fix switching FIFO in arch_enable_uart_fifo function

In reply to Alexander Shiyan

Hello.

Quoted 11 lines
Quoted 10 lines · Alexander Shiyan

When CONFIG_S3C_BOOT_UART_FORCE_FIFO symbol is set, we should enable FIFO but actually switch command is missing in the code. This patch adds this switch.

---
 arch/arm/plat-samsung/include/plat/uncompress.h | 2 ++
 1 file changed, 2 insertions(+)
Quoted 14 lines

arch/arm/plat-samsung/include/plat/uncompress.h static inline void arch_enable_uart_fifo(void) · line 134

Quoted 11 lines
arch/arm/plat-samsung/include/plat/uncompress.h +2 -0
index 438b248..30fedd9 100644
@@ -130,6 +130,8 @@ static inline void arch_enable_uart_fifo(void)
 			if (!(fifocon & S3C2410_UFCON_RESETBOTH))
 				break;
 		}
+
+		uart_wr(S3C2410_UFCON, S3C2410_UFCON_FIFOMODE);

Well, I think, if required, this should be moved into 'if (!(fifocon & S3C2410_UFCON_FIFOMODE))'.

Already here.

---

#6 lore raw

PATCH 1/4 ARM: s3c24xx: Removed unneeded dependency on ARCH_S3C24XX for boards

In reply to Alexander Shiyan
Quoted 4 lines · Alexander Shiyan

Board options are already under "if ARCH_S3C24XX" condition, so additional dependencies on this symbol can be removed.

Hi Alexander,

Is this just a cosmetic change that has no other consequences, or do you have other follow-up patches that depend on patches 1-3?

Arnd

#7 lore raw
Quoted 10 lines · Alexander Shiyan
Quoted 4 lines

Board options are already under "if ARCH_S3C24XX" condition, so additional dependencies on this symbol can be removed.

Hi Alexander,

Is this just a cosmetic change that has no other consequences, or do you have other follow-up patches that depend on patches 1-3?

Hello Arnd.
Nothing more yet. Perhaps I'll do a merging some parts of the code for different versions of the CPU into one unit and some future changes may remove some Kconfig symbols, so it is only initial Kconfig cleaning. Thanks.

---

#8 lore raw

PATCH 1/4 ARM: s3c24xx: Removed unneeded dependency on ARCH_S3C24XX for boards

Quoted 9 lines · Alexander Shiyan
Quoted 9 lines · Alexander Shiyan
Quoted 4 lines

Board options are already under "if ARCH_S3C24XX" condition, so additional dependencies on this symbol can be removed.

Hi Alexander,

Quoted 9 lines
Quoted 2 lines

Is this just a cosmetic change that has no other consequences, or do you have other follow-up patches that depend on patches 1-3?

Hello Arnd.
Nothing more yet. Perhaps I'll do a merging some parts of the code for different versions of the CPU into one unit and some future changes may remove some Kconfig symbols, so it is only initial Kconfig cleaning. Thanks.

Looks good to me on patches 1-3 but for 4th patch, see my comments on that.

Applied 1-3 patches, thanks.

- Kukjin