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

Commit 812c4e40 authored by Vasily Khoruzhick's avatar Vasily Khoruzhick Committed by Ben Dooks
Browse files

ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks 



Currently the {set,get}_pull callbacks of the s3c24xx_gpiocfg_default structure
are initalized via s3c_gpio_{get,set}pull_1up. This results in a linker
error when only CONFIG_CPU_S3C2442 is selected:

arch/arm/plat-s3c24xx/built-in.o:(.data+0x13f4): undefined reference to
`s3c_gpio_getpull_1up'
arch/arm/plat-s3c24xx/built-in.o:(.data+0x13f8): undefined reference to
`s3c_gpio_setpull_1up'

The s3c2442 has pulldowns instead of pullups compared to the s3c2440.
The method of controlling them is the same though.
So this patch modifies the existing s3c_gpio_{get,set}pull_1up helper functions
to take an additional parameter deciding whether the pin has a pullup or pulldown.
The s3c_gpio_{get,set}pull_1{down,up} functions then wrap that functions passing
either S3C_GPIO_PULL_UP or S3C_GPIO_PULL_DOWN.

Furthermore this patch sets up the s3c24xx_gpiocfg_default.{get,set}_pull fields
in the s3c244{0,2}_map_io function to the new pulldown helper functions.

Based on patch from "Lars-Peter Clausen" <lars@metafoo.de>

Signed-off-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 2e18edf7

arch/arm/mach-s3c2440/Kconfig

+1 −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

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;

}

arch/arm/plat-s3c24xx/cpu.c

+4 −4
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static struct cpu_table cpu_ids[] __initdata = { 
	{

		.idcode		= 0x32440000,

		.idmask		= 0xffffffff,

		.map_io		= s3c244x_map_io,

		.map_io		= s3c2440_map_io,

		.init_clocks	= s3c244x_init_clocks,

		.init_uarts	= s3c244x_init_uarts,

		.init		= s3c2440_init,
@@ -97,7 +97,7 @@ static struct cpu_table cpu_ids[] __initdata = { 
	{

		.idcode		= 0x32440001,

		.idmask		= 0xffffffff,

		.map_io		= s3c244x_map_io,

		.map_io		= s3c2440_map_io,

		.init_clocks	= s3c244x_init_clocks,

		.init_uarts	= s3c244x_init_uarts,

		.init		= s3c2440_init,
@@ -106,7 +106,7 @@ static struct cpu_table cpu_ids[] __initdata = { 
	{

		.idcode		= 0x32440aaa,

		.idmask		= 0xffffffff,

		.map_io		= s3c244x_map_io,

		.map_io		= s3c2442_map_io,

		.init_clocks	= s3c244x_init_clocks,

		.init_uarts	= s3c244x_init_uarts,

		.init		= s3c2442_init,
@@ -115,7 +115,7 @@ static struct cpu_table cpu_ids[] __initdata = { 
	{

		.idcode		= 0x32440aab,

		.idmask		= 0xffffffff,

		.map_io		= s3c244x_map_io,

		.map_io		= s3c2442_map_io,

		.init_clocks	= s3c244x_init_clocks,

		.init_uarts	= s3c244x_init_uarts,

		.init		= s3c2442_init,

arch/arm/plat-s3c24xx/gpiolib.c

+0 −2
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ static struct s3c_gpio_cfg s3c24xx_gpiocfg_banka = { 
struct s3c_gpio_cfg s3c24xx_gpiocfg_default = {

	.set_config	= s3c_gpio_setcfg_s3c24xx,

	.get_config	= s3c_gpio_getcfg_s3c24xx,

	.set_pull	= s3c_gpio_setpull_1up,

	.get_pull	= s3c_gpio_getpull_1up,

};



struct s3c_gpio_chip s3c24xx_gpios[] = {