Commit 42466356 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'next/cleanup-plat-s3c24xx-s5p' of... 

Merge branch 'next/cleanup-plat-s3c24xx-s5p' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup2

Kukjin Kim <kgene.kim@samsung.com> writes:
  We can remove plat-s5p directory with this series and I think, the
  plat-s3c24xx can be removed next time for one plat-samsung of Samsung
  stuff.
  Note, this is including cleanup-samsung-iommu which is removing s5p
  iommu stuff in plat-s5p.

* 'next/cleanup-plat-s3c24xx-s5p' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: SAMSUNG: merge plat-s5p into plat-samsung
  ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig
  ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung
  ARM: SAMSUNG: move platform device for s5p uart into plat-samsung
  ARM: SAMSUNG: move hr timer for common s5p into plat-samsung
  ARM: SAMSUNG: move pm part for common s5p into plat-samsung
  ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung
  ARM: SAMSUNG: move clock part for common s5p into plat-samsung
  ARM: S3C24XX: Use common macro to define resources on dev-uart.c
  ARM: S3C24XX: move common clock init into common.c
  ARM: S3C24XX: move common power-management code to mach-s3c24xx
  ARM: S3C24XX: move plat-s3c24xx/dev-uart.c into common.c
  ARM: S3C24XX: move plat-s3c24xx/cpu.c

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents eedd52e3 163ec036

arch/arm/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -1088,7 +1088,6 @@ source "arch/arm/mach-sa1100/Kconfig" 




source "arch/arm/plat-samsung/Kconfig"

source "arch/arm/plat-samsung/Kconfig"

source "arch/arm/plat-s3c24xx/Kconfig"

source "arch/arm/plat-s3c24xx/Kconfig"

source "arch/arm/plat-s5p/Kconfig"





source "arch/arm/plat-spear/Kconfig"

source "arch/arm/plat-spear/Kconfig"

arch/arm/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -207,7 +207,7 @@ plat-$(CONFIG_PLAT_NOMADIK) := nomadik 
plat-$(CONFIG_PLAT_ORION)	:= orion

plat-$(CONFIG_PLAT_ORION)	:= orion

plat-$(CONFIG_PLAT_PXA)		:= pxa

plat-$(CONFIG_PLAT_PXA)		:= pxa

plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx samsung

plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx samsung

plat-$(CONFIG_PLAT_S5P)		:= s5p samsung

plat-$(CONFIG_PLAT_S5P)		:= samsung

plat-$(CONFIG_PLAT_SPEAR)	:= spear

plat-$(CONFIG_PLAT_SPEAR)	:= spear

plat-$(CONFIG_PLAT_VERSATILE)	:= versatile

plat-$(CONFIG_PLAT_VERSATILE)	:= versatile

arch/arm/mach-s3c24xx/Makefile

+6 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,8 @@ obj- := 




# core

# core





obj-y				+= common.o



obj-$(CONFIG_CPU_S3C2410)	+= s3c2410.o

obj-$(CONFIG_CPU_S3C2410)	+= s3c2410.o

obj-$(CONFIG_S3C2410_DMA)	+= dma-s3c2410.o

obj-$(CONFIG_S3C2410_DMA)	+= dma-s3c2410.o

obj-$(CONFIG_S3C2410_PM)	+= pm-s3c2410.o sleep-s3c2410.o

obj-$(CONFIG_S3C2410_PM)	+= pm-s3c2410.o sleep-s3c2410.o
@@ -33,6 +35,10 @@ obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o 




obj-$(CONFIG_CPU_S3C2443)	+= s3c2443.o irq-s3c2443.o clock-s3c2443.o

obj-$(CONFIG_CPU_S3C2443)	+= s3c2443.o irq-s3c2443.o clock-s3c2443.o





# PM



obj-$(CONFIG_PM)		+= pm.o irq-pm.o sleep.o



# common code

# common code





obj-$(CONFIG_S3C2443_COMMON)	+= common-s3c2443.o

obj-$(CONFIG_S3C2443_COMMON)	+= common-s3c2443.o

arch/arm/plat-s3c24xx/cpu.c→arch/arm/mach-s3c24xx/common.c

+68 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
 *	http://www.simtec.co.uk/products/SWLINUX/

 *	http://www.simtec.co.uk/products/SWLINUX/

 *	Ben Dooks <ben@simtec.co.uk>

 *	Ben Dooks <ben@simtec.co.uk>

 *

 *

 * S3C24XX CPU Support

 * Common code for S3C24XX machines

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * it under the terms of the GNU General Public License as published by
@@ -41,6 +41,7 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/map.h>





#include <mach/regs-clock.h>

#include <mach/regs-gpio.h>

#include <mach/regs-gpio.h>

#include <plat/regs-serial.h>

#include <plat/regs-serial.h>
@@ -52,6 +53,8 @@ 
#include <plat/s3c2416.h>

#include <plat/s3c2416.h>

#include <plat/s3c244x.h>

#include <plat/s3c244x.h>

#include <plat/s3c2443.h>

#include <plat/s3c2443.h>

#include <plat/cpu-freq.h>

#include <plat/pll.h>





/* table of supported CPUs */

/* table of supported CPUs */
@@ -234,3 +237,67 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size) 




	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));

	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));

}

}



/* Serial port registrations */



static struct resource s3c2410_uart0_resource[] = {

	[0] = DEFINE_RES_MEM(S3C2410_PA_UART0, SZ_16K),

	[1] = DEFINE_RES_NAMED(IRQ_S3CUART_RX0, \

			IRQ_S3CUART_ERR0 - IRQ_S3CUART_RX0 + 1, \

			NULL, IORESOURCE_IRQ)

};



static struct resource s3c2410_uart1_resource[] = {

	[0] = DEFINE_RES_MEM(S3C2410_PA_UART1, SZ_16K),

	[1] = DEFINE_RES_NAMED(IRQ_S3CUART_RX1, \

			IRQ_S3CUART_ERR1 - IRQ_S3CUART_RX1 + 1, \

			NULL, IORESOURCE_IRQ)

};



static struct resource s3c2410_uart2_resource[] = {

	[0] = DEFINE_RES_MEM(S3C2410_PA_UART2, SZ_16K),

	[1] = DEFINE_RES_NAMED(IRQ_S3CUART_RX2, \

			IRQ_S3CUART_ERR2 - IRQ_S3CUART_RX2 + 1, \

			NULL, IORESOURCE_IRQ)

};



static struct resource s3c2410_uart3_resource[] = {

	[0] = DEFINE_RES_MEM(S3C2443_PA_UART3, SZ_16K),

	[1] = DEFINE_RES_NAMED(IRQ_S3CUART_RX3, \

			IRQ_S3CUART_ERR3 - IRQ_S3CUART_RX3 + 1, \

			NULL, IORESOURCE_IRQ)

};



struct s3c24xx_uart_resources s3c2410_uart_resources[] __initdata = {

	[0] = {

		.resources	= s3c2410_uart0_resource,

		.nr_resources	= ARRAY_SIZE(s3c2410_uart0_resource),

	},

	[1] = {

		.resources	= s3c2410_uart1_resource,

		.nr_resources	= ARRAY_SIZE(s3c2410_uart1_resource),

	},

	[2] = {

		.resources	= s3c2410_uart2_resource,

		.nr_resources	= ARRAY_SIZE(s3c2410_uart2_resource),

	},

	[3] = {

		.resources	= s3c2410_uart3_resource,

		.nr_resources	= ARRAY_SIZE(s3c2410_uart3_resource),

	},

};



/* initialise all the clocks */



void __init_or_cpufreq s3c24xx_setup_clocks(unsigned long fclk,

					   unsigned long hclk,

					   unsigned long pclk)

{

	clk_upll.rate = s3c24xx_get_pll(__raw_readl(S3C2410_UPLLCON),

					clk_xtal.rate);



	clk_mpll.rate = fclk;

	clk_h.rate = hclk;

	clk_p.rate = pclk;

	clk_f.rate = fclk;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE