From mboxrd@z Thu Jan 1 00:00:00 1970 From: Domenico Andreoli Subject: [patch 2/2] Add GPIO DT support to s3c24xx Date: Sun, 10 Apr 2011 17:33:16 +0200 Message-ID: <20110410153316.GC27088@dandreoli.com> References: <20110410152735.338798127@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline; filename=s3c24xx-gpio-add-dt-support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org To: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: devicetree@vger.kernel.org From: Domenico Andreoli Assign proper OF node (= with matching physical base address) to each s3c24xx GPIO chip. Signed-off-by: Domenico Andreoli --- arch/arm/plat-s3c24xx/gpiolib.c | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) Index: b/arch/arm/plat-s3c24xx/gpiolib.c =================================================================== --- a/arch/arm/plat-s3c24xx/gpiolib.c 2011-04-10 16:24:59.000000000 +0200 +++ b/arch/arm/plat-s3c24xx/gpiolib.c 2011-04-10 17:12:32.000000000 +0200 @@ -19,6 +19,8 @@ #include #include #include +#include +#include #include #include @@ -97,6 +99,9 @@ .direction_input = s3c24xx_gpiolib_banka_input, .direction_output = s3c24xx_gpiolib_banka_output, }, +#ifdef CONFIG_OF_GPIO + .dt_compat = "samsung,s3c2410-gpio-a", +#endif }, [1] = { .base = S3C2410_GPBCON, @@ -210,6 +215,45 @@ }, }; +#ifdef CONFIG_OF_GPIO +static int s3c24xx_of_base_match(struct s3c_gpio_chip *chip, struct device_node *dn) +{ + const u32 *addrp; + u64 addr; + + addrp = of_get_address(dn, 0, 0, NULL); + if (!addrp) + return 0; + + addr = of_translate_address(dn, addrp); + if (addr == OF_BAD_ADDR) + return 0; + + return chip->base == (addr - S3C24XX_PA_GPIO + S3C24XX_VA_GPIO); +} + +static void s3c24xx_attach_of_node(struct s3c_gpio_chip *chip) +{ + struct device_node *dn; + + if (!chip->dt_compat) + chip->dt_compat = "samsung,s3c2410-gpio"; + + for_each_compatible_node(dn, NULL, chip->dt_compat) { + if (s3c24xx_of_base_match(chip, dn)) { + chip->chip.of_node = dn; + break; + } + } +} + +#else + +static void s3c24xx_attach_of_node(struct s3c_gpio_chip *chip) +{ +} + +#endif static __init int s3c24xx_gpiolib_init(void) { @@ -220,6 +264,7 @@ if (!chip->config) chip->config = &s3c24xx_gpiocfg_default; + s3c24xx_attach_of_node(chip); s3c_gpiolib_add(chip); }