* [PATCH v1 1/1] x86/platform/intel-mid: Enable GPIO expanders on Edison
@ 2016-06-14 23:11 Andy Shevchenko
2016-06-15 8:06 ` Ingo Molnar
0 siblings, 1 reply; 3+ messages in thread
From: Andy Shevchenko @ 2016-06-14 23:11 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86,
Dan O'Donovan, linux-kernel
Cc: Andy Shevchenko
Intel Edison board provides GPIO expanders connected to I2C bus. Add necessary
file to get those enumerated.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
arch/x86/platform/intel-mid/device_libs/Makefile | 6 +-
.../intel-mid/device_libs/platform_pcal9555a.c | 99 ++++++++++++++++++++++
2 files changed, 103 insertions(+), 2 deletions(-)
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_pcal9555a.c
diff --git a/arch/x86/platform/intel-mid/device_libs/Makefile b/arch/x86/platform/intel-mid/device_libs/Makefile
index ed946fd..744638f 100644
--- a/arch/x86/platform/intel-mid/device_libs/Makefile
+++ b/arch/x86/platform/intel-mid/device_libs/Makefile
@@ -11,11 +11,13 @@ obj-$(subst m,y,$(CONFIG_INTEL_MFLD_THERMAL)) += platform_msic_thermal.o
# I2C Devices
obj-$(subst m,y,$(CONFIG_SENSORS_EMC1403)) += platform_emc1403.o
obj-$(subst m,y,$(CONFIG_SENSORS_LIS3LV02D)) += platform_lis331.o
-obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_max7315.o
obj-$(subst m,y,$(CONFIG_INPUT_MPU3050)) += platform_mpu3050.o
obj-$(subst m,y,$(CONFIG_INPUT_BMA150)) += platform_bma023.o
-obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_tca6416.o
obj-$(subst m,y,$(CONFIG_DRM_MEDFIELD)) += platform_tc35876x.o
+# I2C GPIO Expanders
+obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_max7315.o
+obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_pcal9555a.o
+obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_tca6416.o
# MISC Devices
obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o
obj-$(subst m,y,$(CONFIG_INTEL_MID_WATCHDOG)) += platform_wdt.o
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_pcal9555a.c b/arch/x86/platform/intel-mid/device_libs/platform_pcal9555a.c
new file mode 100644
index 0000000..65efe01
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_pcal9555a.c
@@ -0,0 +1,99 @@
+/*
+ * PCAL9555a platform data initilization file
+ *
+ * Copyright (C) 2016, Intel Corporation
+ *
+ * Authors: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+ * Dan O'Donovan <dan@emutex.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+
+#include <linux/gpio.h>
+#include <linux/init.h>
+#include <linux/i2c.h>
+#include <linux/platform_data/pca953x.h>
+#include <linux/sfi.h>
+
+#include <asm/intel-mid.h>
+
+#define PCAL9555A_NUM 4
+
+static struct pca953x_platform_data pcal9555a_pdata[PCAL9555A_NUM];
+static int nr;
+
+static void __init *pcal9555a_platform_data(void *info)
+{
+ struct i2c_board_info *i2c_info = info;
+ char *type = i2c_info->type;
+ struct pca953x_platform_data *pcal9555a;
+ char base_pin_name[SFI_NAME_LEN + 1];
+ char intr_pin_name[SFI_NAME_LEN + 1];
+ int gpio_base, intr;
+
+ snprintf(base_pin_name, sizeof(base_pin_name), "%s_base", type);
+ snprintf(intr_pin_name, sizeof(intr_pin_name), "%s_int", type);
+
+ gpio_base = get_gpio_by_name(base_pin_name);
+ intr = get_gpio_by_name(intr_pin_name);
+
+ /* Check if the SFI record valid */
+ if (gpio_base == -1)
+ return NULL;
+
+ if (nr >= PCAL9555A_NUM) {
+ pr_err("%s: Too many instances, only %d supported\n", __func__,
+ PCAL9555A_NUM);
+ return NULL;
+ }
+
+ pcal9555a = &pcal9555a_pdata[nr++];
+ pcal9555a->gpio_base = gpio_base;
+
+ if (intr >= 0) {
+ i2c_info->irq = intr + INTEL_MID_IRQ_OFFSET;
+ pcal9555a->irq_base = gpio_base + INTEL_MID_IRQ_OFFSET;
+ } else {
+ i2c_info->irq = -1;
+ pcal9555a->irq_base = -1;
+ }
+
+ strcpy(type, "pcal9555a");
+ return pcal9555a;
+}
+
+static const struct devs_id pcal9555a_1_dev_id __initconst = {
+ .name = "pcal9555a-1",
+ .type = SFI_DEV_TYPE_I2C,
+ .delay = 1,
+ .get_platform_data = &pcal9555a_platform_data,
+};
+
+static const struct devs_id pcal9555a_2_dev_id __initconst = {
+ .name = "pcal9555a-2",
+ .type = SFI_DEV_TYPE_I2C,
+ .delay = 1,
+ .get_platform_data = &pcal9555a_platform_data,
+};
+
+static const struct devs_id pcal9555a_3_dev_id __initconst = {
+ .name = "pcal9555a-3",
+ .type = SFI_DEV_TYPE_I2C,
+ .delay = 1,
+ .get_platform_data = &pcal9555a_platform_data,
+};
+
+static const struct devs_id pcal9555a_4_dev_id __initconst = {
+ .name = "pcal9555a-4",
+ .type = SFI_DEV_TYPE_I2C,
+ .delay = 1,
+ .get_platform_data = &pcal9555a_platform_data,
+};
+
+sfi_device(pcal9555a_1_dev_id);
+sfi_device(pcal9555a_2_dev_id);
+sfi_device(pcal9555a_3_dev_id);
+sfi_device(pcal9555a_4_dev_id);
--
2.8.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v1 1/1] x86/platform/intel-mid: Enable GPIO expanders on Edison
2016-06-14 23:11 [PATCH v1 1/1] x86/platform/intel-mid: Enable GPIO expanders on Edison Andy Shevchenko
@ 2016-06-15 8:06 ` Ingo Molnar
2016-06-15 9:17 ` Andy Shevchenko
0 siblings, 1 reply; 3+ messages in thread
From: Ingo Molnar @ 2016-06-15 8:06 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86,
Dan O'Donovan, linux-kernel
* Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> +static const struct devs_id pcal9555a_1_dev_id __initconst = {
> + .name = "pcal9555a-1",
> + .type = SFI_DEV_TYPE_I2C,
> + .delay = 1,
> + .get_platform_data = &pcal9555a_platform_data,
> +};
> +
> +static const struct devs_id pcal9555a_2_dev_id __initconst = {
> + .name = "pcal9555a-2",
> + .type = SFI_DEV_TYPE_I2C,
> + .delay = 1,
> + .get_platform_data = &pcal9555a_platform_data,
> +};
> +
> +static const struct devs_id pcal9555a_3_dev_id __initconst = {
> + .name = "pcal9555a-3",
> + .type = SFI_DEV_TYPE_I2C,
> + .delay = 1,
> + .get_platform_data = &pcal9555a_platform_data,
> +};
> +
> +static const struct devs_id pcal9555a_4_dev_id __initconst = {
> + .name = "pcal9555a-4",
> + .type = SFI_DEV_TYPE_I2C,
> + .delay = 1,
> + .get_platform_data = &pcal9555a_platform_data,
> +};
I have the same complaint as yesterday. Going forward could we please get nice
structure initializers in all future patches? :)
Thanks,
Ingo
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v1 1/1] x86/platform/intel-mid: Enable GPIO expanders on Edison
2016-06-15 8:06 ` Ingo Molnar
@ 2016-06-15 9:17 ` Andy Shevchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2016-06-15 9:17 UTC (permalink / raw)
To: Ingo Molnar
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86,
Dan O'Donovan, linux-kernel
On Wed, 2016-06-15 at 10:06 +0200, Ingo Molnar wrote:
> * Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
>
> > +static const struct devs_id pcal9555a_1_dev_id __initconst = {
> > + .name = "pcal9555a-1",
> > + .type = SFI_DEV_TYPE_I2C,
> > + .delay = 1,
> > + .get_platform_data = &pcal9555a_platform_data,
> > +};
> > +
> > +static const struct devs_id pcal9555a_2_dev_id __initconst = {
> > + .name = "pcal9555a-2",
> > + .type = SFI_DEV_TYPE_I2C,
> > + .delay = 1,
> > + .get_platform_data = &pcal9555a_platform_data,
> > +};
> > +
> > +static const struct devs_id pcal9555a_3_dev_id __initconst = {
> > + .name = "pcal9555a-3",
> > + .type = SFI_DEV_TYPE_I2C,
> > + .delay = 1,
> > + .get_platform_data = &pcal9555a_platform_data,
> > +};
> > +
> > +static const struct devs_id pcal9555a_4_dev_id __initconst = {
> > + .name = "pcal9555a-4",
> > + .type = SFI_DEV_TYPE_I2C,
> > + .delay = 1,
> > + .get_platform_data = &pcal9555a_platform_data,
> > +};
>
> I have the same complaint as yesterday. Going forward could we please
> get nice
> structure initializers in all future patches? :)
Oops, indeed. Sorry, will send new version soon.
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-15 9:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-14 23:11 [PATCH v1 1/1] x86/platform/intel-mid: Enable GPIO expanders on Edison Andy Shevchenko
2016-06-15 8:06 ` Ingo Molnar
2016-06-15 9:17 ` Andy Shevchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox