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

Commit 7f0ff702 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge next-samsung-s3c64xx-platdeletion 

Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung

Conflicts:

	arch/arm/mach-s3c64xx/Makefile (fixed)
parents d35b7a82 110d85ac

arch/arm/Kconfig

+16 −3
Original line number Diff line number Diff line
@@ -627,9 +627,24 @@ config ARCH_S3C2410 


config ARCH_S3C64XX

	bool "Samsung S3C64XX"

	select PLAT_S3C

	select CPU_V6

	select GENERIC_GPIO

	select ARM_VIC

	select HAVE_CLK

	select NO_IOPORT

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select SAMSUNG_CLKSRC

	select SAMSUNG_IRQ_VIC_TIMER

	select SAMSUNG_IRQ_UART

	select S3C_GPIO_TRACK

	select S3C_GPIO_PULL_UPDOWN

	select S3C_GPIO_CFG_S3C24XX

	select S3C_GPIO_CFG_S3C64XX

	select S3C_DEV_NAND

	select USB_ARCH_HAS_OHCI

	select SAMSUNG_GPIOLIB_4BIT

	help

	  Samsung S3C64XX series based systems
@@ -784,7 +799,6 @@ source "arch/arm/mach-dove/Kconfig" 


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

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

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

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

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

source "arch/arm/plat-s5pc1xx/Kconfig"
@@ -798,8 +812,7 @@ source "arch/arm/mach-s3c2443/Kconfig" 
endif



if ARCH_S3C64XX

source "arch/arm/mach-s3c6400/Kconfig"

source "arch/arm/mach-s3c6410/Kconfig"

source "arch/arm/mach-s3c64xx/Kconfig"

endif



source "arch/arm/mach-s5p6440/Kconfig"

arch/arm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ machine-$(CONFIG_ARCH_REALVIEW) := realview 
machine-$(CONFIG_ARCH_RPC)		:= rpc

machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2440 s3c2443

machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c6400 s3c6410

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx

machine-$(CONFIG_ARCH_S5P6440)		:= s5p6440

machine-$(CONFIG_ARCH_S5PC1XX)		:= s5pc100

machine-$(CONFIG_ARCH_SA1100)		:= sa1100
@@ -183,7 +183,7 @@ plat-$(CONFIG_PLAT_NOMADIK) := nomadik 
plat-$(CONFIG_PLAT_ORION)	:= orion

plat-$(CONFIG_PLAT_PXA)		:= pxa

plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx s3c samsung

plat-$(CONFIG_PLAT_S3C64XX)	:= s3c64xx s3c samsung

plat-$(CONFIG_ARCH_S3C64XX)	:= s3c samsung

plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx s3c samsung

plat-$(CONFIG_PLAT_S5P)		:= s5p samsung s3c

plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx

arch/arm/mach-s3c2410/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <mach/dma.h>



#include <plat/cpu.h>

#include <plat/dma-plat.h>

#include <plat/dma-s3c24xx.h>



#include <plat/regs-serial.h>

#include <mach/regs-gpio.h>

arch/arm/plat-s3c24xx/include/plat/pm-core.h→arch/arm/mach-s3c2410/include/mach/pm-core.h

+1 −1
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s3c24xx/include/plat/pll.h

/* linux/arch/arm/mach-s3c2410/include/pm-core.h

 *

 * Copyright 2008 Simtec Electronics

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

arch/arm/mach-s3c2412/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include <mach/dma.h>



#include <plat/dma-plat.h>

#include <plat/dma-s3c24xx.h>

#include <plat/cpu.h>



#include <plat/regs-serial.h>