Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 332698
b: refs/heads/master
c: 54cd020
h: refs/heads/master
v: v3
  • Loading branch information
Sachin Kamat authored and David Woodhouse committed Sep 29, 2012
1 parent 897207d commit 61ccb19
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a68c5ec85685a8eb7a93a0577f91c5e0952df39e
refs/heads/master: 54cd0208c6be19d6944f40a083fe97dd56de3489
17 changes: 9 additions & 8 deletions trunk/drivers/mtd/nand/s3c2410.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ static int s3c_nand_calc_rate(int wanted, unsigned long clk, int max)
return result;
}

#define to_ns(ticks,clk) (((ticks) * NS_IN_KHZ) / (unsigned int)(clk))
#define to_ns(ticks, clk) (((ticks) * NS_IN_KHZ) / (unsigned int)(clk))

/* controller setup */

Expand Down Expand Up @@ -261,7 +261,8 @@ static int s3c2410_nand_setrate(struct s3c2410_nand_info *info)
}

dev_info(info->device, "Tacls=%d, %dns Twrph0=%d %dns, Twrph1=%d %dns\n",
tacls, to_ns(tacls, clkrate), twrph0, to_ns(twrph0, clkrate), twrph1, to_ns(twrph1, clkrate));
tacls, to_ns(tacls, clkrate), twrph0, to_ns(twrph0, clkrate),
twrph1, to_ns(twrph1, clkrate));

switch (info->cpu_type) {
case TYPE_S3C2410:
Expand Down Expand Up @@ -318,13 +319,13 @@ static int s3c2410_nand_inithw(struct s3c2410_nand_info *info)
if (ret < 0)
return ret;

switch (info->cpu_type) {
case TYPE_S3C2410:
switch (info->cpu_type) {
case TYPE_S3C2410:
default:
break;

case TYPE_S3C2440:
case TYPE_S3C2412:
case TYPE_S3C2440:
case TYPE_S3C2412:
/* enable the controller and de-assert nFCE */

writel(S3C2440_NFCONT_ENABLE, info->regs + S3C2440_NFCONT);
Expand Down Expand Up @@ -803,7 +804,7 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
dev_info(info->device, "System booted from NAND\n");

break;
}
}

chip->IO_ADDR_R = chip->IO_ADDR_W;

Expand Down Expand Up @@ -913,7 +914,7 @@ static void s3c2410_nand_update_chip(struct s3c2410_nand_info *info,
static int s3c24xx_nand_probe(struct platform_device *pdev)
{
struct s3c2410_platform_nand *plat = to_nand_plat(pdev);
enum s3c_cpu_type cpu_type;
enum s3c_cpu_type cpu_type;
struct s3c2410_nand_info *info;
struct s3c2410_nand_mtd *nmtd;
struct s3c2410_nand_set *sets;
Expand Down

0 comments on commit 61ccb19

Please sign in to comment.