S3C24XX: Add support for HSSPI on S3C2416/S3C2443

When the hsmmc clock lookup was changed to be lookup tables based, it seems the S3C2443 was forgotten.

As subsequent patches will want to add more lookups to it, this patch adds the base table with the missing hsmmc lookup.

Signed-off-by Heiko Stuebner<[email protected]>

---
  arch/arm/mach-s3c24xx/clock-s3c2443.c |    5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)

arch/arm/mach-s3c24xx/clock-s3c2443.c +4 -0

index efb3ac3..bce1cd3 100644
@@ -179,6 +179,10 @@ static struct clk *clks[] __initdata = {
  	&clk_hsmmc,
  };
 
+static struct clk_lookup s3c2443_clk_lookup[] = {
+	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2",&clk_hsmmc),
+};
+
  void __init s3c2443_init_clocks(int xtal)
  {
  	unsigned long epllcon = __raw_readl(S3C2443_EPLLCON);

Quoted 37 lines · Heiko St?bner

When the hsmmc clock lookup was changed to be lookup tables based, it seems the S3C2443 was forgotten.

As subsequent patches will want to add more lookups to it, this patch adds the base table with the missing hsmmc lookup.

Signed-off-by Heiko Stuebner<[email protected]>

---

  arch/arm/mach-s3c24xx/clock-s3c2443.c |    5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)

(quoted diff) +0 -0

b/arch/arm/mach-s3c24xx/clock-s3c2443.c index efb3ac3..bce1cd3 100644

arch/arm/mach-s3c24xx/clock-s3c2443.c +4 -0

@@ -179,6 +179,10 @@ static struct clk *clks[] __initdata = {
 
  	&clk_hsmmc,
 
  };
 
+static struct clk_lookup s3c2443_clk_lookup[] = {
+	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2",&clk_hsmmc),
+};
+
 

  void __init s3c2443_init_clocks(int xtal)
  {
  
  	unsigned long epllcon = __raw_readl(S3C2443_EPLLCON);

arch/arm/mach-s3c24xx/clock-s3c2443.c +0 -0

@@ -210,6 +214,7 @@ void __init s3c2443_init_clocks(int xtal)
 
  	s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
  	s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
 

Quoted 5 lines

arch/arm/mach-s3c24xx/clock-s3c2443.c +1 -0

+	clkdev_add_table(s3c2443_clk_lookup, ARRAY_SIZE(s3c2443_clk_lookup));
 
  	s3c_pwmclk_init();

  
  }

Uhm..how about mach-s3c24xx/common-s3c2443.c?

I think, we need to sort out some files in mach-s3c24xx/ and some remained mach-s3c24.. directories, actually, as you know, we didn't have much time to do it last time :)

Am Montag 02 April 2012, 23:08:10 schrieb Kukjin Kim:

Quoted 42 lines

Quoted 41 lines · Heiko St?bner

When the hsmmc clock lookup was changed to be lookup tables based, it seems the S3C2443 was forgotten.

As subsequent patches will want to add more lookups to it, this patch adds the base table with the missing hsmmc lookup.

Signed-off-by Heiko Stuebner<[email protected]>

---

   arch/arm/mach-s3c24xx/clock-s3c2443.c |    5 +++++
   1 files changed, 5 insertions(+), 0 deletions(-)

(quoted diff) +0 -0

b/arch/arm/mach-s3c24xx/clock-s3c2443.c index efb3ac3..bce1cd3 100644

arch/arm/mach-s3c24xx/clock-s3c2443.c +4 -0

@@ -179,6 +179,10 @@ static struct clk *clks[] __initdata = {
 
   	&clk_hsmmc,
 
   };
 
+static struct clk_lookup s3c2443_clk_lookup[] = {
+	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2",&clk_hsmmc),
+};
+
 

   void __init s3c2443_init_clocks(int xtal)
   {

   	unsigned long epllcon = __raw_readl(S3C2443_EPLLCON);

arch/arm/mach-s3c24xx/clock-s3c2443.c +1 -0

@@ -210,6 +214,7 @@ void __init s3c2443_init_clocks(int xtal)
 
   	s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
   	s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
 
+	clkdev_add_table(s3c2443_clk_lookup, ARRAY_SIZE(s3c2443_clk_lookup));
 
   	s3c_pwmclk_init();

Quoted 3 lines

Quoted 1 line

   }

Uhm..how about mach-s3c24xx/common-s3c2443.c?

Nope. This clock is really specific to only the s3c2443. There is only one hsmmc clock that is identical on both the s3c2443 and s3c2416/2450 and this one already is in common-s3c2443.c .

common-s3c2443.c was meant for stuff common to s3c2443 _and newer_, i.e. common clocks and so on.

Quoted 3 lines

I think, we need to sort out some files in mach-s3c24xx/ and some remained mach-s3c24.. directories, actually, as you know, we didn't have much time to do it last time :)

yeah, we did cut it quite close :-), but it also doesn't seem to have produced much fall-out. I moved my s3c2416 based development code to 3.4-rc1 without major hickups.

Getting rid of the remaining mach-directories and also the plat-s3c24xx would be good. But I'm not sure what you would want to change in mach-s3c24xx directory itself.

I don't know the earlier SoCs, but the s3c2443 and s3c2416/2450 SoCs currently don't have redundancies and in the current layout it's quite easy to understand what belongs to which SoC.

The S3C2416/S3C2443/S3C2450 SoCs contain HSSPI controllers compatible with the ones in the S3C64xx and later.

The second patch modifying the dma selection depends on the series enabling the dma support on the S3C2416, but as the whole s3c64xx-spi driver needs dma support this should be ok.

Tested on an Asus DR-900 ebook reader with a Marvell MR8686 using the libertas driver.

This is a repost of the series adapted to changes resulting from the other cleanup series.

Heiko Stuebner (6):
ARM: S3C24XX: Add forgotten clock lookup table to S3C2443
ARM: S3C24XX: claim spi channels for hsspi in dma-s3c2443
ARM: S3C24XX: Add map entries needed by the s3c64xx-spi devices
ARM: S3C24XX: Add clock-lookup entries required by s3c64xx-spi
ARM: S3C24XX: Add HSSPI setup callback for s3c64xx-spi driver spi/s3c64xx: Allow usage for ARCH_S3C24XX

 arch/arm/mach-s3c24xx/Kconfig            |    5 ++++
 arch/arm/mach-s3c24xx/Makefile           |    1 +
 arch/arm/mach-s3c24xx/clock-s3c2416.c    |    1 +
 arch/arm/mach-s3c24xx/clock-s3c2443.c    |    6 ++++
 arch/arm/mach-s3c24xx/common-s3c2443.c   |   15 +++++++----
 arch/arm/mach-s3c24xx/dma-s3c2443.c      |   16 +++++++++---
 arch/arm/mach-s3c24xx/include/mach/dma.h |    4 +++
 arch/arm/mach-s3c24xx/include/mach/map.h |    5 ++++
 arch/arm/mach-s3c24xx/setup-spi.c        |   39
++++++++++++++++++++++++++++++ drivers/spi/Kconfig                      | 
  2 +-
 10 files changed, 84 insertions(+), 10 deletions(-)
 create mode 100644 arch/arm/mach-s3c24xx/setup-spi.c

Am Montag 12 M?rz 2012, 19:59:32 schrieb Heiko St?bner:

Quoted 7 lines

The S3C2416/S3C2443/S3C2450 SoCs contain HSSPI controllers compatible with the ones in the S3C64xx and later.

The second patch modifying the dma selection depends on the series enabling the dma support on the S3C2416, but as the whole s3c64xx-spi driver needs dma support this should be ok.

Quoted 6 lines

Tested on an Asus DR-900 ebook reader with a Marvell MR8686 using the libertas driver.

This is a repost of the series adapted to changes resulting from the other cleanup series.

ping :-)

Quoted 12 lines · Heiko St?bner

Am Montag 12 M?rz 2012, 19:59:32 schrieb Heiko St?bner:

Quoted 11 lines

The S3C2416/S3C2443/S3C2450 SoCs contain HSSPI controllers compatible with the ones in the S3C64xx and later.

The second patch modifying the dma selection depends on the series enabling the dma support on the S3C2416, but as the whole s3c64xx-spi driver needs dma support this should be ok.

Tested on an Asus DR-900 ebook reader with a Marvell MR8686 using the libertas driver.

Quoted 5 lines

Quoted 2 lines

This is a repost of the series adapted to changes resulting from the other cleanup series.

ping :-)

Thanks for your reminder ;)
Let me review it soon.