Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afba7f91 authored by Thomas Abraham's avatar Thomas Abraham Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: remove struct 's3c24xx_uart_clksrc' and all uses of it 



With clkdev based clock lookup added to samsung serial driver, the use
of 'struct s3c24xx_uart_clksrc' to supply clock names in platform
data is removed from all the Samsung platform code.

Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Ramax Lo <ramaxlo@gmail.com>
Cc: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 5f5a7a55

arch/arm/mach-exynos/init.c

+1 −14
Original line number Original line Diff line number Diff line
@@ -14,15 +14,6 @@ 
#include <plat/devs.h>

#include <plat/devs.h>

#include <plat/regs-serial.h>

#include <plat/regs-serial.h>





static struct s3c24xx_uart_clksrc exynos4_serial_clocks[] = {

	[0] = {

		.name		= "uclk1",

		.divisor	= 1,

		.min_baud	= 0,

		.max_baud	= 0,

	},

};



/* uart registration process */

/* uart registration process */

void __init exynos4_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)

void __init exynos4_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)

{

{
@@ -30,11 +21,7 @@ void __init exynos4_common_init_uarts(struct s3c2410_uartcfg *cfg, int no) 
	u32 ucnt;

	u32 ucnt;





	for (ucnt = 0; ucnt < no; ucnt++, tcfg++) {

	for (ucnt = 0; ucnt < no; ucnt++, tcfg++) {

		if (!tcfg->clocks) {

		tcfg->has_fracval = 1;

		tcfg->has_fracval = 1;

			tcfg->clocks = exynos4_serial_clocks;

			tcfg->clocks_size = ARRAY_SIZE(exynos4_serial_clocks);

		}

		tcfg->flags |= NO_NEED_CHECK_CLKSRC;

		tcfg->flags |= NO_NEED_CHECK_CLKSRC;

	}

	}

arch/arm/mach-s3c2410/mach-bast.c

+0 −22
Original line number Original line Diff line number Diff line
@@ -164,22 +164,6 @@ static struct map_desc bast_iodesc[] __initdata = { 
#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB

#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB

#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE

#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE





static struct s3c24xx_uart_clksrc bast_serial_clocks[] = {

	[0] = {

		.name		= "uclk",

		.divisor	= 1,

		.min_baud	= 0,

		.max_baud	= 0,

	},

	[1] = {

		.name		= "pclk",

		.divisor	= 1,

		.min_baud	= 0,

		.max_baud	= 0,

	}

};





static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {

static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {

	[0] = {

	[0] = {

		.hwport	     = 0,

		.hwport	     = 0,
@@ -187,8 +171,6 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = { 
		.ucon	     = UCON,

		.ucon	     = UCON,

		.ulcon	     = ULCON,

		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

		.ufcon	     = UFCON,

		.clocks	     = bast_serial_clocks,

		.clocks_size = ARRAY_SIZE(bast_serial_clocks),

	},

	},

	[1] = {

	[1] = {

		.hwport	     = 1,

		.hwport	     = 1,
@@ -196,8 +178,6 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = { 
		.ucon	     = UCON,

		.ucon	     = UCON,

		.ulcon	     = ULCON,

		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

		.ufcon	     = UFCON,

		.clocks	     = bast_serial_clocks,

		.clocks_size = ARRAY_SIZE(bast_serial_clocks),

	},

	},

	/* port 2 is not actually used */

	/* port 2 is not actually used */

	[2] = {

	[2] = {
@@ -206,8 +186,6 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = { 
		.ucon	     = UCON,

		.ucon	     = UCON,

		.ulcon	     = ULCON,

		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

		.ufcon	     = UFCON,

		.clocks	     = bast_serial_clocks,

		.clocks_size = ARRAY_SIZE(bast_serial_clocks),

	}

	}

};

};

arch/arm/mach-s3c2410/mach-vr1000.c

+0 −24
Original line number Original line Diff line number Diff line
@@ -109,23 +109,6 @@ static struct map_desc vr1000_iodesc[] __initdata = { 
#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB

#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB

#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE

#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE





/* uart clock source(s) */



static struct s3c24xx_uart_clksrc vr1000_serial_clocks[] = {

	[0] = {

		.name		= "uclk",

		.divisor	= 1,

		.min_baud	= 0,

		.max_baud	= 0,

	},

	[1] = {

		.name		= "pclk",

		.divisor	= 1,

		.min_baud	= 0,

		.max_baud	= 0.

	}

};



static struct s3c2410_uartcfg vr1000_uartcfgs[] __initdata = {

static struct s3c2410_uartcfg vr1000_uartcfgs[] __initdata = {

	[0] = {

	[0] = {

		.hwport	     = 0,

		.hwport	     = 0,
@@ -133,8 +116,6 @@ static struct s3c2410_uartcfg vr1000_uartcfgs[] __initdata = { 
		.ucon	     = UCON,

		.ucon	     = UCON,

		.ulcon	     = ULCON,

		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

		.ufcon	     = UFCON,

		.clocks	     = vr1000_serial_clocks,

		.clocks_size = ARRAY_SIZE(vr1000_serial_clocks),

	},

	},

	[1] = {

	[1] = {

		.hwport	     = 1,

		.hwport	     = 1,
@@ -142,8 +123,6 @@ static struct s3c2410_uartcfg vr1000_uartcfgs[] __initdata = { 
		.ucon	     = UCON,

		.ucon	     = UCON,

		.ulcon	     = ULCON,

		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

		.ufcon	     = UFCON,

		.clocks	     = vr1000_serial_clocks,

		.clocks_size = ARRAY_SIZE(vr1000_serial_clocks),

	},

	},

	/* port 2 is not actually used */

	/* port 2 is not actually used */

	[2] = {

	[2] = {
@@ -152,9 +131,6 @@ static struct s3c2410_uartcfg vr1000_uartcfgs[] __initdata = { 
		.ucon	     = UCON,

		.ucon	     = UCON,

		.ulcon	     = ULCON,

		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

		.ufcon	     = UFCON,

		.clocks	     = vr1000_serial_clocks,

		.clocks_size = ARRAY_SIZE(vr1000_serial_clocks),



	}

	}

};

};

arch/arm/mach-s3c2440/mach-anubis.c

+2 −20
Original line number Original line Diff line number Diff line
@@ -96,22 +96,6 @@ static struct map_desc anubis_iodesc[] __initdata = { 
#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB

#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB

#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE

#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE





static struct s3c24xx_uart_clksrc anubis_serial_clocks[] = {

	[0] = {

		.name		= "uclk",

		.divisor	= 1,

		.min_baud	= 0,

		.max_baud	= 0,

	},

	[1] = {

		.name		= "pclk",

		.divisor	= 1,

		.min_baud	= 0,

		.max_baud	= 0,

	}

};





static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = {

static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = {

	[0] = {

	[0] = {

		.hwport	     = 0,

		.hwport	     = 0,
@@ -119,8 +103,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = { 
		.ucon	     = UCON,

		.ucon	     = UCON,

		.ulcon	     = ULCON,

		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

		.ufcon	     = UFCON,

		.clocks	     = anubis_serial_clocks,

		.clk_sel	= S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,

		.clocks_size = ARRAY_SIZE(anubis_serial_clocks),

	},

	},

	[1] = {

	[1] = {

		.hwport	     = 2,

		.hwport	     = 2,
@@ -128,8 +111,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = { 
		.ucon	     = UCON,

		.ucon	     = UCON,

		.ulcon	     = ULCON,

		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

		.ufcon	     = UFCON,

		.clocks	     = anubis_serial_clocks,

		.clk_sel	= S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,

		.clocks_size = ARRAY_SIZE(anubis_serial_clocks),

	},

	},

};

};

arch/arm/mach-s3c2440/mach-at2440evb.c

+2 −20
Original line number Original line Diff line number Diff line
@@ -57,22 +57,6 @@ static struct map_desc at2440evb_iodesc[] __initdata = { 
#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE)

#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE)

#define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)

#define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)





static struct s3c24xx_uart_clksrc at2440evb_serial_clocks[] = {

	[0] = {

		.name		= "uclk",

		.divisor	= 1,

		.min_baud	= 0,

		.max_baud	= 0,

	},

	[1] = {

		.name		= "pclk",

		.divisor	= 1,

		.min_baud	= 0,

		.max_baud	= 0,

	}

};





static struct s3c2410_uartcfg at2440evb_uartcfgs[] __initdata = {

static struct s3c2410_uartcfg at2440evb_uartcfgs[] __initdata = {

	[0] = {

	[0] = {

		.hwport	     = 0,

		.hwport	     = 0,
@@ -80,8 +64,7 @@ static struct s3c2410_uartcfg at2440evb_uartcfgs[] __initdata = { 
		.ucon	     = UCON,

		.ucon	     = UCON,

		.ulcon	     = ULCON,

		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

		.ufcon	     = UFCON,

		.clocks	     = at2440evb_serial_clocks,

		.clk_sel	= S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,

		.clocks_size = ARRAY_SIZE(at2440evb_serial_clocks),

	},

	},

	[1] = {

	[1] = {

		.hwport	     = 1,

		.hwport	     = 1,
@@ -89,8 +72,7 @@ static struct s3c2410_uartcfg at2440evb_uartcfgs[] __initdata = { 
		.ucon	     = UCON,

		.ucon	     = UCON,

		.ulcon	     = ULCON,

		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

		.ufcon	     = UFCON,

		.clocks	     = at2440evb_serial_clocks,

		.clk_sel	= S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,

		.clocks_size = ARRAY_SIZE(at2440evb_serial_clocks),

	},

	},

};

};