android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: s3c24xx: drop s3c-camif setup platform code

Browse Source 
The s3c-camif driver setup platform code does not have any users so it
can be safely removed.

Along with the code W=1 compile warnings go away:

    arch/arm/mach-s3c24xx/setup-camif.c:28:5: warning: no previous prototype for 's3c_camif_gpio_get' [-Wmissing-prototypes]
    arch/arm/mach-s3c24xx/setup-camif.c:56:6: warning: no previous prototype for 's3c_camif_gpio_put' [-Wmissing-prototypes]

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
This commit is contained in:
Krzysztof Kozlowski 2020-08-17 18:48:36 +02:00
parent 73dff51f57
commit 5b5858ef45
4 changed files with 0 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-s3c24xx/Kconfig
View File

@ -123,11 +123,6 @@ config S3C24XX_PLL
This also means that the PLL tables for the selected CPU(s) will This also means that the PLL tables for the selected CPU(s) will
be built which may increase the size of the kernel image. be built which may increase the size of the kernel image.
config S3C_SETUP_CAMIF
bool
help
Compile in common setup code for S3C CAMIF devices
# cpu frequency items common between s3c2410 and s3c2440/s3c2442 # cpu frequency items common between s3c2410 and s3c2440/s3c2442
config S3C2410_IOTIMING config S3C2410_IOTIMING
@ -468,7 +463,6 @@ config MACH_MINI2440
select NEW_LEDS select NEW_LEDS
select S3C_DEV_NAND select S3C_DEV_NAND
select S3C_DEV_USB_HOST select S3C_DEV_USB_HOST
select S3C_SETUP_CAMIF
help help
Say Y here to select support for the MINI2440. Is a 10cm x 10cm board Say Y here to select support for the MINI2440. Is a 10cm x 10cm board
available via various sources. It can come with a 3.5" or 7" touch LCD. available via various sources. It can come with a 3.5" or 7" touch LCD.

1
arch/arm/mach-s3c24xx/Makefile
View File

@ -97,4 +97,3 @@ obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
obj-$(CONFIG_S3C2443_SETUP_SPI) += setup-spi.o obj-$(CONFIG_S3C2443_SETUP_SPI) += setup-spi.o
obj-$(CONFIG_ARCH_S3C24XX) += setup-i2c.o obj-$(CONFIG_ARCH_S3C24XX) += setup-i2c.o
obj-$(CONFIG_S3C24XX_SETUP_TS) += setup-ts.o obj-$(CONFIG_S3C24XX_SETUP_TS) += setup-ts.o
obj-$(CONFIG_S3C_SETUP_CAMIF) += setup-camif.o

67
arch/arm/mach-s3c24xx/setup-camif.c
View File

@ -1,67 +0,0 @@
// SPDX-License-Identifier: GPL-2.0
//
// Copyright (C) 2012 Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
//
// Helper functions for S3C24XX/S3C64XX SoC series CAMIF driver
#include <linux/gpio.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
/* Number of camera port pins, without FIELD */
#define S3C_CAMIF_NUM_GPIOS 13
/* Default camera port configuration helpers. */
static void camif_get_gpios(int *gpio_start, int *gpio_reset)
{
#ifdef CONFIG_ARCH_S3C24XX
*gpio_start = S3C2410_GPJ(0);
*gpio_reset = S3C2410_GPJ(12);
#else
/* s3c64xx */
*gpio_start = S3C64XX_GPF(0);
*gpio_reset = S3C64XX_GPF(3);
#endif
}
int s3c_camif_gpio_get(void)
{
int gpio_start, gpio_reset;
int ret, i;
camif_get_gpios(&gpio_start, &gpio_reset);
for (i = 0; i < S3C_CAMIF_NUM_GPIOS; i++) {
int gpio = gpio_start + i;
if (gpio == gpio_reset)
continue;
ret = gpio_request(gpio, "camif");
if (!ret)
ret = s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));
if (ret) {
pr_err("failed to configure GPIO %d\n", gpio);
for (--i; i >= 0; i--)
gpio_free(gpio--);
return ret;
}
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
}
return 0;
}
void s3c_camif_gpio_put(void)
{
int i, gpio_start, gpio_reset;
camif_get_gpios(&gpio_start, &gpio_reset);
for (i = 0; i < S3C_CAMIF_NUM_GPIOS; i++) {
int gpio = gpio_start + i;
if (gpio != gpio_reset)
gpio_free(gpio);
}
}

4
include/media/drv-intf/s3c_camif.h
View File

@ -35,8 +35,4 @@ struct s3c_camif_plat_data {
int (*gpio_put)(void); int (*gpio_put)(void);
}; };
/* Platform default helper functions */
int s3c_camif_gpio_get(void);
int s3c_camif_gpio_put(void);
#endif /* MEDIA_S3C_CAMIF_ */ #endif /* MEDIA_S3C_CAMIF_ */