Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762237Ab3JQC71 (ORCPT ); Wed, 16 Oct 2013 22:59:27 -0400 Received: from mga02.intel.com ([134.134.136.20]:10752 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762180Ab3JQC7Z (ORCPT ); Wed, 16 Oct 2013 22:59:25 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,511,1378882800"; d="scan'208";a="394164426" From: David Cohen To: linux-kernel@vger.kernel.org, sfi-devel@simplefirmware.org, linux-gpio@vger.kernel.org Cc: Andy Shevchenko , Kuppuswamy Sathyanarayanan , David Cohen , Linus Walleij , Len Brown Subject: [PATCH] gpiolib: append SFI helpers for GPIO API Date: Wed, 16 Oct 2013 20:03:35 -0700 Message-Id: <1381979015-28980-1-git-send-email-david.a.cohen@linux.intel.com> X-Mailer: git-send-email 1.8.4.rc3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5215 Lines: 195 From: Andy Shevchenko To support some (legacy) firmwares and platforms let's make life easier for their customers. Signed-off-by: Andy Shevchenko Cc: Kuppuswamy Sathyanarayanan Cc: David Cohen Cc: Linus Walleij Cc: Len Brown --- drivers/gpio/Kconfig | 4 +++ drivers/gpio/Makefile | 1 + drivers/gpio/gpiolib-sfi.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/sfi/sfi_core.c | 7 +++++ include/linux/sfi_gpio.h | 27 ++++++++++++++++ 5 files changed, 115 insertions(+) create mode 100644 drivers/gpio/gpiolib-sfi.c create mode 100644 include/linux/sfi_gpio.h diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 3471962..3fa2a0d 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -51,6 +51,10 @@ config OF_GPIO def_bool y depends on OF +config GPIO_SFI + def_bool y + depends on SFI + config GPIO_ACPI def_bool y depends on ACPI diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index f951866..d548ff3 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -5,6 +5,7 @@ ccflags-$(CONFIG_DEBUG_GPIO) += -DDEBUG obj-$(CONFIG_GPIO_DEVRES) += devres.o obj-$(CONFIG_GPIOLIB) += gpiolib.o obj-$(CONFIG_OF_GPIO) += gpiolib-of.o +obj-$(CONFIG_GPIO_SFI) += gpiolib-sfi.o obj-$(CONFIG_GPIO_ACPI) += gpiolib-acpi.o # Device drivers. Generally keep list sorted alphabetically diff --git a/drivers/gpio/gpiolib-sfi.c b/drivers/gpio/gpiolib-sfi.c new file mode 100644 index 0000000..2f15a81 --- /dev/null +++ b/drivers/gpio/gpiolib-sfi.c @@ -0,0 +1,76 @@ +/* + * SFI helpers for GPIO API + * + * Copyright (C) 2013, Intel Corporation + * Author: Andy Shevchenko + * + * Based on work done for Intel MID platforms (mrst.c) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#define pr_fmt(fmt) "SFI: GPIO: " fmt + +#include +#include +#include +#include +#include +#include +#include +#include + +static struct sfi_gpio_table_entry *sfi_gpio_table; +static int sfi_gpio_num_entry; + +int sfi_get_gpio_by_name(const char *name) +{ + struct sfi_gpio_table_entry *pentry = sfi_gpio_table; + int i; + + if (!pentry) + return -1; + + for (i = 0; i < sfi_gpio_num_entry; i++, pentry++) { + if (!strncmp(name, pentry->pin_name, SFI_NAME_LEN)) + return pentry->pin_no; + } + + return -1; +} +EXPORT_SYMBOL_GPL(sfi_get_gpio_by_name); + +static int __init sfi_gpio_parse(struct sfi_table_header *table) +{ + struct sfi_table_simple *sb = (struct sfi_table_simple *)table; + struct sfi_gpio_table_entry *pentry; + int num, i; + + if (sfi_gpio_table) + return 0; + + num = SFI_GET_NUM_ENTRIES(sb, struct sfi_gpio_table_entry); + pentry = (struct sfi_gpio_table_entry *)sb->pentry; + + sfi_gpio_table = kmalloc(num * sizeof(*pentry), GFP_KERNEL); + if (!sfi_gpio_table) + return -ENOMEM; + + memcpy(sfi_gpio_table, pentry, num * sizeof(*pentry)); + sfi_gpio_num_entry = num; + + pr_debug("Pin info:\n"); + for (i = 0; i < num; i++, pentry++) + pr_debug("[%2d] chip = %16.16s, name = %16.16s, pin=%d\n", i, + pentry->controller_name, pentry->pin_name, + pentry->pin_no); + + return 0; +} + +int __init sfi_gpio_init(void) +{ + return sfi_table_parse(SFI_SIG_GPIO, NULL, NULL, sfi_gpio_parse); +} diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c index 296db7a..2828da0 100644 --- a/drivers/sfi/sfi_core.c +++ b/drivers/sfi/sfi_core.c @@ -67,6 +67,7 @@ #include #include #include +#include #include #include "sfi_core.h" @@ -512,6 +513,12 @@ void __init sfi_init_late(void) syst_va = sfi_map_memory(syst_pa, length); sfi_acpi_init(); + + /* + * Parsing GPIO table first, since the DEVS table will need this table + * to map the pin name to the actual pin. + */ + sfi_gpio_init(); } /* diff --git a/include/linux/sfi_gpio.h b/include/linux/sfi_gpio.h new file mode 100644 index 0000000..ef7e497 --- /dev/null +++ b/include/linux/sfi_gpio.h @@ -0,0 +1,27 @@ +#ifndef _LINUX_SFI_GPIO_H_ +#define _LINUX_SFI_GPIO_H_ + +#include +#include +#include + +#ifdef CONFIG_GPIO_SFI + +int sfi_get_gpio_by_name(const char *name); +int __init sfi_gpio_init(void); + +#else /* CONFIG_GPIO_SFI */ + +static inline int sfi_get_gpio_by_name(const char *name); +{ + return -1; +} + +static inline int __init sfi_gpio_init(void) +{ + return -ENODEV; +} + +#endif /* CONFIG_GPIO_SFI */ + +#endif /* _LINUX_SFI_GPIO_H_ */ -- 1.8.4.rc3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/