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

Commit 40b956f0 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: S3C24XX: Drop s3c2410 specific s3c2410_gpio_cfgpin() 



The s3c_gpio_cfgpin() call should be functionally equivalent, so replace
the s3c2410_gpio_cfgpin() calls in the s3c24xx code with s3c_gpio_cfgpin
to allow moving away from a fixed GPIO number to register address mapping

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 82a4b6dc

arch/arm/mach-s3c2410/h1940-bluetooth.c

+4 −4
Original line number Diff line number Diff line
@@ -69,13 +69,13 @@ static int __devinit h1940bt_probe(struct platform_device *pdev) 
	}



	/* Configures BT serial port GPIOs */

	s3c2410_gpio_cfgpin(S3C2410_GPH(0), S3C2410_GPH0_nCTS0);

	s3c_gpio_cfgpin(S3C2410_GPH(0), S3C2410_GPH0_nCTS0);

	s3c_gpio_cfgpull(S3C2410_GPH(0), S3C_GPIO_PULL_NONE);

	s3c2410_gpio_cfgpin(S3C2410_GPH(1), S3C2410_GPIO_OUTPUT);

	s3c_gpio_cfgpin(S3C2410_GPH(1), S3C2410_GPIO_OUTPUT);

	s3c_gpio_cfgpull(S3C2410_GPH(1), S3C_GPIO_PULL_NONE);

	s3c2410_gpio_cfgpin(S3C2410_GPH(2), S3C2410_GPH2_TXD0);

	s3c_gpio_cfgpin(S3C2410_GPH(2), S3C2410_GPH2_TXD0);

	s3c_gpio_cfgpull(S3C2410_GPH(2), S3C_GPIO_PULL_NONE);

	s3c2410_gpio_cfgpin(S3C2410_GPH(3), S3C2410_GPH3_RXD0);

	s3c_gpio_cfgpin(S3C2410_GPH(3), S3C2410_GPH3_RXD0);

	s3c_gpio_cfgpull(S3C2410_GPH(3), S3C_GPIO_PULL_NONE);

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

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include <plat/iic.h>

#include <plat/devs.h>

#include <plat/cpu.h>

#include <plat/gpio-cfg.h>



#ifdef CONFIG_MTD_PARTITIONS
@@ -225,7 +226,7 @@ static void amlm5900_init_pm(void) 
	} else {

		enable_irq_wake(IRQ_EINT9);

		/* configure the suspend/resume status pin */

		s3c2410_gpio_cfgpin(S3C2410_GPF(2), S3C2410_GPIO_OUTPUT);

		s3c_gpio_cfgpin(S3C2410_GPF(2), S3C2410_GPIO_OUTPUT);

		s3c2410_gpio_pullup(S3C2410_GPF(2), 0);

	}

}

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

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

#include <plat/cpu.h>

#include <plat/cpu-freq.h>

#include <plat/gpio-cfg.h>

#include <plat/audio-simtec.h>



#include "usb-simtec.h"
@@ -222,7 +223,7 @@ static int bast_pm_suspend(struct sys_device *sd, pm_message_t state) 


static int bast_pm_resume(struct sys_device *sd)

{

	s3c2410_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPA21_nRSTOUT);

	s3c_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPA21_nRSTOUT);

	return 0;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <plat/udc.h>

#include <plat/iic.h>



#include <plat/gpio-cfg.h>

#include <plat/clock.h>

#include <plat/devs.h>

#include <plat/cpu.h>
@@ -209,7 +210,7 @@ static int h1940_backlight_init(struct device *dev) 


	gpio_direction_output(S3C2410_GPB(0), 0);

	s3c2410_gpio_pullup(S3C2410_GPB(0), 0);

	s3c2410_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPB0_TOUT0);

	s3c_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPB0_TOUT0);



	return 0;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include <plat/iic.h>



#include <plat/common-smdk.h>

#include <plat/gpio-cfg.h>

#include <plat/devs.h>

#include <plat/cpu.h>

#include <plat/pm.h>
@@ -347,7 +348,7 @@ static void __init qt2410_machine_init(void) 
	}

	s3c24xx_fb_set_platdata(&qt2410_fb_info);



	s3c2410_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPIO_OUTPUT);

	s3c_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPIO_OUTPUT);

	s3c2410_gpio_setpin(S3C2410_GPB(0), 1);



	s3c24xx_udc_set_platdata(&qt2410_udc_cfg);