aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-samsung.c
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2014-09-23 11:40:45 -0400
committerLinus Walleij <linus.walleij@linaro.org>2014-09-23 11:51:39 -0400
commit9afd23b61221a5c5c0d588f6d8f0e4495ecc8d24 (patch)
tree9a09911a01600783eb8f49950c3397a1bc669787 /drivers/gpio/gpio-samsung.c
parent7ca267faba8ad097f57cb71c32ae1865de83241a (diff)
gpio: samsung: Remove remaining check for CONFIG_S5P_GPIO_DRVSTR
Commit d78c16ccde96 ("ARM: SAMSUNG: Remove remaining legacy code") removed the Kconfig symbol S5P_GPIO_DRVSTR. It didn't remove one check for the related macro. Remove that check and the dead code it hides. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-samsung.c')
-rw-r--r--drivers/gpio/gpio-samsung.c50
1 files changed, 0 insertions, 50 deletions
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index 3810da47043f..7c288ba4dc87 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -1309,56 +1309,6 @@ samsung_gpio_pull_t s3c_gpio_getpull(unsigned int pin)
1309} 1309}
1310EXPORT_SYMBOL(s3c_gpio_getpull); 1310EXPORT_SYMBOL(s3c_gpio_getpull);
1311 1311
1312#ifdef CONFIG_S5P_GPIO_DRVSTR
1313s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin)
1314{
1315 struct samsung_gpio_chip *chip = samsung_gpiolib_getchip(pin);
1316 unsigned int off;
1317 void __iomem *reg;
1318 int shift;
1319 u32 drvstr;
1320
1321 if (!chip)
1322 return -EINVAL;
1323
1324 off = pin - chip->chip.base;
1325 shift = off * 2;
1326 reg = chip->base + 0x0C;
1327
1328 drvstr = __raw_readl(reg);
1329 drvstr = drvstr >> shift;
1330 drvstr &= 0x3;
1331
1332 return (__force s5p_gpio_drvstr_t)drvstr;
1333}
1334EXPORT_SYMBOL(s5p_gpio_get_drvstr);
1335
1336int s5p_gpio_set_drvstr(unsigned int pin, s5p_gpio_drvstr_t drvstr)
1337{
1338 struct samsung_gpio_chip *chip = samsung_gpiolib_getchip(pin);
1339 unsigned int off;
1340 void __iomem *reg;
1341 int shift;
1342 u32 tmp;
1343
1344 if (!chip)
1345 return -EINVAL;
1346
1347 off = pin - chip->chip.base;
1348 shift = off * 2;
1349 reg = chip->base + 0x0C;
1350
1351 tmp = __raw_readl(reg);
1352 tmp &= ~(0x3 << shift);
1353 tmp |= drvstr << shift;
1354
1355 __raw_writel(tmp, reg);
1356
1357 return 0;
1358}
1359EXPORT_SYMBOL(s5p_gpio_set_drvstr);
1360#endif /* CONFIG_S5P_GPIO_DRVSTR */
1361
1362#ifdef CONFIG_PLAT_S3C24XX 1312#ifdef CONFIG_PLAT_S3C24XX
1363unsigned int s3c2410_modify_misccr(unsigned int clear, unsigned int change) 1313unsigned int s3c2410_modify_misccr(unsigned int clear, unsigned int change)
1364{ 1314{