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

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

[Alexander Shiyan]

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

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/mach-s3c24xx/Kconfig | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 37f513d..567d77b 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -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
-- 
1.7.12.4

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

[Alexander Shiyan]

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

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/mach-s3c24xx/Kconfig | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 37f513d..567d77b 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -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
-- 
1.7.12.4

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

[Alexander Shiyan]

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

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/mach-s3c24xx/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 567d77b..dddb49b 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -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
-- 
1.7.12.4

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

[Alexander Shiyan]

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

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/mach-s3c24xx/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 567d77b..dddb49b 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -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
-- 
1.7.12.4

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

[Alexander Shiyan]

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

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/mach-s3c24xx/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index dddb49b..e6f7d7c 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -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
-- 
1.7.12.4

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

[Alexander Shiyan]

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

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/mach-s3c24xx/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index dddb49b..e6f7d7c 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -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
-- 
1.7.12.4

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

[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.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/plat-samsung/include/plat/uncompress.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h b/arch/arm/plat-samsung/include/plat/uncompress.h
index 438b248..30fedd9 100644
--- a/arch/arm/plat-samsung/include/plat/uncompress.h
+++ b/arch/arm/plat-samsung/include/plat/uncompress.h
@@ -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
-- 
1.7.12.4

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

[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.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/plat-samsung/include/plat/uncompress.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h b/arch/arm/plat-samsung/include/plat/uncompress.h
index 438b248..30fedd9 100644
--- a/arch/arm/plat-samsung/include/plat/uncompress.h
+++ b/arch/arm/plat-samsung/include/plat/uncompress.h
@@ -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
-- 
1.7.12.4

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

[Arnd Bergmann]

On Saturday 02 March 2013, Alexander Shiyan wrote:
> Board options are already under "if ARCH_S3C24XX" condition, so
> additional dependencies on this symbol can be removed.
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>

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

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

[Arnd Bergmann]

On Saturday 02 March 2013, Alexander Shiyan wrote:
> Board options are already under "if ARCH_S3C24XX" condition, so
> additional dependencies on this symbol can be removed.
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>

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

Re[2]: [PATCH 1/4] ARM: s3c24xx: Removed unneeded dependency on ARCH_S3C24XX for boards

[Alexander Shiyan]

> On Saturday 02 March 2013, Alexander Shiyan wrote:
> > Board options are already under "if ARCH_S3C24XX" condition, so
> > additional dependencies on this symbol can be removed.
> > 
> > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> 
> 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.

---

Re[2]: [PATCH 1/4] ARM: s3c24xx: Removed unneeded dependency on ARCH_S3C24XX for boards

[Alexander Shiyan]

> On Saturday 02 March 2013, Alexander Shiyan wrote:
> > Board options are already under "if ARCH_S3C24XX" condition, so
> > additional dependencies on this symbol can be removed.
> > 
> > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> 
> 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.

---

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

[Kukjin Kim]

Alexander Shiyan wrote:
> 
> 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.
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>  arch/arm/plat-samsung/include/plat/uncompress.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h
> b/arch/arm/plat-samsung/include/plat/uncompress.h
> index 438b248..30fedd9 100644
> --- a/arch/arm/plat-samsung/include/plat/uncompress.h
> +++ b/arch/arm/plat-samsung/include/plat/uncompress.h
> @@ -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

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

[Kukjin Kim]

Alexander Shiyan wrote:
> 
> 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.
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>  arch/arm/plat-samsung/include/plat/uncompress.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h
> b/arch/arm/plat-samsung/include/plat/uncompress.h
> index 438b248..30fedd9 100644
> --- a/arch/arm/plat-samsung/include/plat/uncompress.h
> +++ b/arch/arm/plat-samsung/include/plat/uncompress.h
> @@ -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

RE: Re[2]: [PATCH 1/4] ARM: s3c24xx: Removed unneeded dependency on ARCH_S3C24XX for boards

[Kukjin Kim]

Alexander Shiyan wrote:
> 
> > On Saturday 02 March 2013, Alexander Shiyan wrote:
> > > Board options are already under "if ARCH_S3C24XX" condition, so
> > > additional dependencies on this symbol can be removed.
> > >
> > > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> >
> > 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.
> 
Looks good to me on patches 1-3 but for 4th patch, see my comments on that.

Applied 1-3 patches, thanks.

- Kukjin

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

[Kukjin Kim]

Alexander Shiyan wrote:
> 
> > On Saturday 02 March 2013, Alexander Shiyan wrote:
> > > Board options are already under "if ARCH_S3C24XX" condition, so
> > > additional dependencies on this symbol can be removed.
> > >
> > > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> >
> > 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.
> 
Looks good to me on patches 1-3 but for 4th patch, see my comments on that.

Applied 1-3 patches, thanks.

- Kukjin

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

[Alexander Shiyan]

Hello.

> Alexander Shiyan wrote:
> > 
> > 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.
> > 
> > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> > ---
> >  arch/arm/plat-samsung/include/plat/uncompress.h | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h
> > b/arch/arm/plat-samsung/include/plat/uncompress.h
> > index 438b248..30fedd9 100644
> > --- a/arch/arm/plat-samsung/include/plat/uncompress.h
> > +++ b/arch/arm/plat-samsung/include/plat/uncompress.h
> > @@ -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.

---

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

[Alexander Shiyan]

Hello.

> Alexander Shiyan wrote:
> > 
> > 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.
> > 
> > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> > ---
> >  arch/arm/plat-samsung/include/plat/uncompress.h | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h
> > b/arch/arm/plat-samsung/include/plat/uncompress.h
> > index 438b248..30fedd9 100644
> > --- a/arch/arm/plat-samsung/include/plat/uncompress.h
> > +++ b/arch/arm/plat-samsung/include/plat/uncompress.h
> > @@ -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.

---