From: Guenter Roeck <linux@roeck-us.net>
To: Arnd Bergmann <arnd@arndb.de>, Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
Jean Delvare <jdelvare@suse.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Sebastian Reichel <sre@kernel.org>
Cc: linux-samsung-soc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org,
linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org,
linux-input@vger.kernel.org, linux-pm@vger.kernel.org
Subject: Re: [PATCH 15/36] ARM: s3c: adc: move header to linux/soc/samsung
Date: Thu, 10 Oct 2019 15:20:32 -0700 [thread overview]
Message-ID: <da32e8a3-cbb3-ea08-1c55-55980b3dc53e@roeck-us.net> (raw)
In-Reply-To: <20191010203043.1241612-15-arnd@arndb.de>
On 10/10/19 1:29 PM, Arnd Bergmann wrote:
> There are multiple drivers using the private adc interface.
> It seems unlikely that they would ever get converted to iio,
> so make the current state official by making the header file
> global.
>
> The s3c2410_ts driver needs a couple of register definitions
> as well.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
For hwmon:
Acked-by: Guenter Roeck <linux@roeck-us.net>
> ---
> arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +-
> arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
> arch/arm/mach-s3c64xx/mach-real6410.c | 2 +-
> arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
> arch/arm/plat-samsung/adc.c | 2 +-
> arch/arm/plat-samsung/devs.c | 2 +-
> drivers/hwmon/s3c-hwmon.c | 2 +-
> drivers/input/touchscreen/s3c2410_ts.c | 37 ++++++++++++++++++-
> drivers/power/supply/s3c_adc_battery.c | 2 +-
> .../linux/soc/samsung/s3c-adc.h | 0
> 10 files changed, 43 insertions(+), 10 deletions(-)
> rename arch/arm/plat-samsung/include/plat/adc.h => include/linux/soc/samsung/s3c-adc.h (100%)
>
> diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
> index da5b50981a14..133453562d23 100644
> --- a/arch/arm/mach-s3c64xx/mach-crag6410.c
> +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
> @@ -57,7 +57,7 @@
> #include <plat/keypad.h>
> #include <plat/devs.h>
> #include <plat/cpu.h>
> -#include <plat/adc.h>
> +#include <linux/soc/samsung/s3c-adc.h>
> #include <linux/platform_data/i2c-s3c2410.h>
> #include <plat/pm.h>
> #include <plat/samsung-time.h>
> diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c
> index 0dd36ae49e6a..c7140300bd3f 100644
> --- a/arch/arm/mach-s3c64xx/mach-mini6410.c
> +++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
> @@ -27,7 +27,7 @@
> #include <mach/regs-gpio.h>
> #include <mach/gpio-samsung.h>
>
> -#include <plat/adc.h>
> +#include <linux/soc/samsung/s3c-adc.h>
> #include <plat/cpu.h>
> #include <plat/devs.h>
> #include <plat/fb.h>
> diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c
> index 0ff88b6859c4..f55097fde94c 100644
> --- a/arch/arm/mach-s3c64xx/mach-real6410.c
> +++ b/arch/arm/mach-s3c64xx/mach-real6410.c
> @@ -29,7 +29,7 @@
> #include <mach/gpio-samsung.h>
> #include <mach/irqs.h>
>
> -#include <plat/adc.h>
> +#include <linux/soc/samsung/s3c-adc.h>
> #include <plat/cpu.h>
> #include <plat/devs.h>
> #include <plat/fb.h>
> diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
> index 95bdcfe95a53..3042f6cbffd9 100644
> --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
> +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
> @@ -60,7 +60,7 @@
>
> #include <plat/devs.h>
> #include <plat/cpu.h>
> -#include <plat/adc.h>
> +#include <linux/soc/samsung/s3c-adc.h>
> #include <linux/platform_data/touchscreen-s3c2410.h>
> #include <plat/keypad.h>
> #include <plat/samsung-time.h>
> diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c
> index ee3d5c989a76..623a9774cc52 100644
> --- a/arch/arm/plat-samsung/adc.c
> +++ b/arch/arm/plat-samsung/adc.c
> @@ -20,7 +20,7 @@
> #include <linux/regulator/consumer.h>
>
> #include <plat/regs-adc.h>
> -#include <plat/adc.h>
> +#include <linux/soc/samsung/s3c-adc.h>
>
> /* This driver is designed to control the usage of the ADC block between
> * the touchscreen and any other drivers that may need to use it, such as
> diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
> index fd94a35e22f8..ddd90f0bb380 100644
> --- a/arch/arm/plat-samsung/devs.c
> +++ b/arch/arm/plat-samsung/devs.c
> @@ -44,7 +44,7 @@
>
> #include <plat/cpu.h>
> #include <plat/devs.h>
> -#include <plat/adc.h>
> +#include <linux/soc/samsung/s3c-adc.h>
> #include <linux/platform_data/ata-samsung_cf.h>
> #include <plat/fb.h>
> #include <plat/fb-s3c2410.h>
> diff --git a/drivers/hwmon/s3c-hwmon.c b/drivers/hwmon/s3c-hwmon.c
> index b490fe3d2ee8..f2703c5460d0 100644
> --- a/drivers/hwmon/s3c-hwmon.c
> +++ b/drivers/hwmon/s3c-hwmon.c
> @@ -20,7 +20,7 @@
> #include <linux/hwmon.h>
> #include <linux/hwmon-sysfs.h>
>
> -#include <plat/adc.h>
> +#include <linux/soc/samsung/s3c-adc.h>
> #include <linux/platform_data/hwmon-s3c.h>
>
> struct s3c_hwmon_attr {
> diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
> index b346e7cafd62..1a5a178ea286 100644
> --- a/drivers/input/touchscreen/s3c2410_ts.c
> +++ b/drivers/input/touchscreen/s3c2410_ts.c
> @@ -21,10 +21,43 @@
> #include <linux/clk.h>
> #include <linux/io.h>
>
> -#include <plat/adc.h>
> -#include <plat/regs-adc.h>
> +#include <linux/soc/samsung/s3c-adc.h>
> #include <linux/platform_data/touchscreen-s3c2410.h>
>
> +#define S3C2410_ADCCON (0x00)
> +#define S3C2410_ADCTSC (0x04)
> +#define S3C2410_ADCDLY (0x08)
> +#define S3C2410_ADCDAT0 (0x0C)
> +#define S3C2410_ADCDAT1 (0x10)
> +#define S3C64XX_ADCUPDN (0x14)
> +#define S3C2443_ADCMUX (0x18)
> +#define S3C64XX_ADCCLRINT (0x18)
> +#define S5P_ADCMUX (0x1C)
> +#define S3C64XX_ADCCLRINTPNDNUP (0x20)
> +
> +/* ADCTSC Register Bits */
> +#define S3C2443_ADCTSC_UD_SEN (1 << 8)
> +#define S3C2410_ADCTSC_YM_SEN (1<<7)
> +#define S3C2410_ADCTSC_YP_SEN (1<<6)
> +#define S3C2410_ADCTSC_XM_SEN (1<<5)
> +#define S3C2410_ADCTSC_XP_SEN (1<<4)
> +#define S3C2410_ADCTSC_PULL_UP_DISABLE (1<<3)
> +#define S3C2410_ADCTSC_AUTO_PST (1<<2)
> +#define S3C2410_ADCTSC_XY_PST(x) (((x)&0x3)<<0)
> +
> +/* ADCDAT0 Bits */
> +#define S3C2410_ADCDAT0_UPDOWN (1<<15)
> +#define S3C2410_ADCDAT0_AUTO_PST (1<<14)
> +#define S3C2410_ADCDAT0_XY_PST (0x3<<12)
> +#define S3C2410_ADCDAT0_XPDATA_MASK (0x03FF)
> +
> +/* ADCDAT1 Bits */
> +#define S3C2410_ADCDAT1_UPDOWN (1<<15)
> +#define S3C2410_ADCDAT1_AUTO_PST (1<<14)
> +#define S3C2410_ADCDAT1_XY_PST (0x3<<12)
> +#define S3C2410_ADCDAT1_YPDATA_MASK (0x03FF)
> +
> +
> #define TSC_SLEEP (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))
>
> #define INT_DOWN (0)
> diff --git a/drivers/power/supply/s3c_adc_battery.c b/drivers/power/supply/s3c_adc_battery.c
> index 3d00b35cafc9..60b7f41ab063 100644
> --- a/drivers/power/supply/s3c_adc_battery.c
> +++ b/drivers/power/supply/s3c_adc_battery.c
> @@ -22,7 +22,7 @@
> #include <linux/init.h>
> #include <linux/module.h>
>
> -#include <plat/adc.h>
> +#include <linux/soc/samsung/s3c-adc.h>
>
> #define BAT_POLL_INTERVAL 10000 /* ms */
> #define JITTER_DELAY 500 /* ms */
> diff --git a/arch/arm/plat-samsung/include/plat/adc.h b/include/linux/soc/samsung/s3c-adc.h
> similarity index 100%
> rename from arch/arm/plat-samsung/include/plat/adc.h
> rename to include/linux/soc/samsung/s3c-adc.h
>
next prev parent reply other threads:[~2019-10-10 22:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 20:28 [PATCH 00/36] ARM: samsung platform cleanup Arnd Bergmann
[not found] ` <20191010203043.1241612-1-arnd@arndb.de>
2019-10-10 20:29 ` [PATCH 15/36] ARM: s3c: adc: move header to linux/soc/samsung Arnd Bergmann
2019-10-10 22:20 ` Guenter Roeck [this message]
2019-10-10 22:29 ` Dmitry Torokhov
2019-10-10 22:44 ` Sebastian Reichel
2019-10-23 12:37 ` Krzysztof Kozlowski
2019-10-23 13:23 ` Arnd Bergmann
2019-10-23 13:10 ` [PATCH 00/36] ARM: samsung platform cleanup Krzysztof Kozlowski
2019-10-23 13:39 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=da32e8a3-cbb3-ea08-1c55-55980b3dc53e@roeck-us.net \
--to=linux@roeck-us.net \
--cc=arnd@arndb.de \
--cc=dmitry.torokhov@gmail.com \
--cc=jdelvare@suse.com \
--cc=kgene@kernel.org \
--cc=krzk@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).