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

Commit 2cedcc4f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux 

* 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux:
  ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks
  ARM: mini2440: Fix Kconfig to allow kernel to build
  ARM: S3C2412: Fix typo in CONFIG_CPU_S3C2412_ONLY definition
  ARM: S3C2443: Select properly ARM core type
  ARM: SMDK2416: Select MACH_SMDK, S3C_DEV_NAND, S3C_DEV_USB_HOST
parents 6142e05f 812c4e40

arch/arm/mach-s3c2412/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ config CPU_S3C2412 
config CPU_S3C2412_ONLY

	bool

	depends on ARCH_S3C2410 && !CPU_S3C2400 && !CPU_S3C2410 && \

		   !CPU_2416 && !CPU_S3C2440 && !CPU_S3C2442 && \

		   !CPU_S3C2416 && !CPU_S3C2440 && !CPU_S3C2442 && \

		   !CPU_S3C2443 && CPU_S3C2412

	default y if CPU_S3C2412

arch/arm/mach-s3c2416/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -35,9 +35,12 @@ menu "S3C2416 Machines" 
config MACH_SMDK2416

	bool "SMDK2416"

	select CPU_S3C2416

	select MACH_SMDK

	select S3C_DEV_FB

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_NAND

	select S3C_DEV_USB_HOST

	select S3C2416_PM if PM

	help

	  Say Y here if you are using an SMDK2416

arch/arm/mach-s3c2440/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ config CPU_S3C2440 
config CPU_S3C2442

	bool

	select CPU_ARM920T

	select S3C_GPIO_PULL_DOWN

	select S3C2410_CLOCK

	select S3C2410_GPIO

	select S3C2410_PM if PM
@@ -178,6 +179,9 @@ config MACH_MINI2440 
	bool "MINI2440 development board"

	select CPU_S3C2440

	select EEPROM_AT24

	select NEW_LEDS

	select LEDS_CLASS

	select LEDS_TRIGGER

	select LEDS_TRIGGER_BACKLIGHT

	select S3C_DEV_NAND

	select S3C_DEV_USB_HOST

arch/arm/mach-s3c2440/s3c2440.c

+8 −3
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ int __init s3c2440_init(void) 
{

	printk("S3C2440: Initialising architecture\n");



	s3c24xx_gpiocfg_default.set_pull = s3c_gpio_setpull_1up;

	s3c24xx_gpiocfg_default.get_pull = s3c_gpio_getpull_1up;



	/* change irq for watchdog */



	s3c_device_wdt.resource[1].start = IRQ_S3C2440_WDT;
@@ -58,3 +55,11 @@ int __init s3c2440_init(void) 


	return sysdev_register(&s3c2440_sysdev);

}



void __init s3c2440_map_io(void)

{

	s3c244x_map_io();



	s3c24xx_gpiocfg_default.set_pull = s3c_gpio_setpull_1up;

	s3c24xx_gpiocfg_default.get_pull = s3c_gpio_getpull_1up;

}

arch/arm/mach-s3c2440/s3c2442.c

+14 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/mutex.h>

#include <linux/gpio.h>

#include <linux/clk.h>

#include <linux/io.h>
@@ -43,6 +44,11 @@ 


#include <plat/clock.h>

#include <plat/cpu.h>

#include <plat/s3c244x.h>



#include <plat/gpio-core.h>

#include <plat/gpio-cfg.h>

#include <plat/gpio-cfg-helpers.h>



/* S3C2442 extended clock support */
@@ -163,3 +169,11 @@ int __init s3c2442_init(void) 


	return sysdev_register(&s3c2442_sysdev);

}



void __init s3c2442_map_io(void)

{

	s3c244x_map_io();



	s3c24xx_gpiocfg_default.set_pull = s3c_gpio_setpull_1down;

	s3c24xx_gpiocfg_default.get_pull = s3c_gpio_getpull_1down;

}