OrgACRN
/
clear-pkgs-linux-iot-lts2018
mirror of https://github.com/clearlinux-pkgs/linux-iot-lts2018.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
clear-pkgs-linux-iot-lts2018/0185-ASoC-mfd-Intel-changes...

267 lines
7.8 KiB
Diff
Raw Blame History

From 30d9929c1d3bf240e84ac924c9202ca72eeefcc4 Mon Sep 17 00:00:00 2001
From: Ramesh Babu <ramesh.babu@intel.com>
Date: Thu, 30 Apr 2015 12:36:21 +0530
Subject: [PATCH 185/743] ASoC: mfd: Intel changes for WM8281 integration on
K4.0
The changes are related to arizona MFD changes
to adopt both FPGA and actual board on kernel 4.0
Change-Id: I40767f73db9f3583797218636e2102190a70cea9
Signed-off-by: Ramesh Babu <ramesh.babu@intel.com>
Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com>
---
drivers/mfd/arizona-i2c.c | 196 +++++++++++++++++++++++++++++++++++++-
drivers/mfd/arizona-irq.c | 3 +-
2 files changed, 197 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c
index 5fe12961cfe5..84d29dec0ae1 100644
--- a/drivers/mfd/arizona-i2c.c
+++ b/drivers/mfd/arizona-i2c.c
@@ -23,6 +23,141 @@
#include "arizona.h"
+/************************************************************/
+#include <linux/input.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
+#include <linux/mfd/arizona/pdata.h>
+#include <linux/mfd/arizona/registers.h>
+
+#ifdef CONFIG_SND_SOC_INTEL_CNL_FPGA
+/***********WM8280 1.8V REGULATOR*************/
+static struct regulator_consumer_supply vflorida1_consumer[] = {
+ REGULATOR_SUPPLY("AVDD", "0-001a"),
+ REGULATOR_SUPPLY("DBVDD1", "0-001a"),
+ REGULATOR_SUPPLY("LDOVDD", "0-001a"),
+ REGULATOR_SUPPLY("CPVDD", "0-001a"),
+ REGULATOR_SUPPLY("DBVDD2", "0-001a"),
+ REGULATOR_SUPPLY("DBVDD3", "0-001a"),
+};
+
+/***********WM8280 5V REGULATOR*************/
+static struct regulator_consumer_supply vflorida2_consumer[] = {
+ REGULATOR_SUPPLY("SPKVDDL", "0-001a"),
+ REGULATOR_SUPPLY("SPKVDDR", "0-001a"),
+};
+#else
+/***********WM8280 1.8V REGULATOR*************/
+static struct regulator_consumer_supply vflorida1_consumer[] = {
+ REGULATOR_SUPPLY("AVDD", "i2c-INT34C1:00"),
+ REGULATOR_SUPPLY("DBVDD1", "i2c-INT34C1:00"),
+ REGULATOR_SUPPLY("LDOVDD", "i2c-INT34C1:00"),
+ REGULATOR_SUPPLY("CPVDD", "i2c-INT34C1:00"),
+ REGULATOR_SUPPLY("DBVDD2", "i2c-INT34C1:00"),
+ REGULATOR_SUPPLY("DBVDD3", "i2c-INT34C1:00"),
+};
+
+/***********WM8280 5V REGULATOR*************/
+static struct regulator_consumer_supply vflorida2_consumer[] = {
+ REGULATOR_SUPPLY("SPKVDDL", "i2c-INT34C1:00"),
+ REGULATOR_SUPPLY("SPKVDDR", "i2c-INT34C1:00"),
+};
+#endif
+
+static struct regulator_init_data vflorida1_data = {
+ .constraints = {
+ .always_on = 1,
+ },
+ .num_consumer_supplies = ARRAY_SIZE(vflorida1_consumer),
+ .consumer_supplies = vflorida1_consumer,
+};
+
+static struct fixed_voltage_config vflorida1_config = {
+ .supply_name = "DC_1V8",
+ .microvolts = 1800000,
+ .gpio = -EINVAL,
+ .init_data = &vflorida1_data,
+};
+
+static struct platform_device vflorida1_device = {
+ .name = "reg-fixed-voltage",
+ .id = PLATFORM_DEVID_AUTO,
+ .dev = {
+ .platform_data = &vflorida1_config,
+ },
+};
+
+static struct regulator_init_data vflorida2_data = {
+ .constraints = {
+ .always_on = 1,
+ },
+ .num_consumer_supplies = ARRAY_SIZE(vflorida2_consumer),
+ .consumer_supplies = vflorida2_consumer,
+};
+
+static struct fixed_voltage_config vflorida2_config = {
+ .supply_name = "DC_5V",
+ .microvolts = 3700000,
+ .gpio = -EINVAL,
+ .init_data = &vflorida2_data,
+};
+
+static struct platform_device vflorida2_device = {
+ .name = "reg-fixed-voltage",
+ .id = PLATFORM_DEVID_AUTO,
+ .dev = {
+ .platform_data = &vflorida2_config,
+ },
+};
+
+/***********WM8280 Codec Driver platform data*************/
+static const struct arizona_micd_range micd_ctp_ranges[] = {
+ { .max = 11, .key = BTN_0 },
+ { .max = 28, .key = BTN_1 },
+ { .max = 54, .key = BTN_2 },
+ { .max = 100, .key = BTN_3 },
+ { .max = 186, .key = BTN_4 },
+ { .max = 430, .key = BTN_5 },
+};
+
+static struct arizona_micd_config micd_modes[] = {
+ /*{Acc Det on Micdet1, Use Micbias2 for detection,
+ * Set GPIO to 1 to selecte this polarity}*/
+ { 0, 2, 1 },
+};
+
+static struct arizona_pdata __maybe_unused florida_pdata = {
+ .reset = 0, /*No Reset GPIO from AP, use SW reset*/
+ .irq_flags = IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+ .clk32k_src = ARIZONA_32KZ_MCLK2, /*Onboard OSC provides 32K on MCLK2*/
+ /*
+ * IN1 uses both MICBIAS1 and MICBIAS2 based on jack polarity,
+ * the below values in dmic_ref only has meaning for DMIC's and not
+ * AMIC's
+ */
+#ifdef CONFIG_SND_SOC_INTEL_CNL_FPGA
+ .dmic_ref = {ARIZONA_DMIC_MICBIAS1, ARIZONA_DMIC_MICBIAS3, 0, 0},
+ .inmode = {ARIZONA_INMODE_DIFF, ARIZONA_INMODE_DMIC, 0, 0},
+#else
+ .dmic_ref = {ARIZONA_DMIC_MICBIAS1, 0, ARIZONA_DMIC_MICVDD, 0},
+ .inmode = {ARIZONA_INMODE_SE, 0, ARIZONA_INMODE_DMIC, 0},
+#endif
+ .gpio_base = 0, /* Base allocated by gpio core */
+ .micd_pol_gpio = 2, /* GPIO3 (offset 2 from gpio_base) of the codec */
+ .micd_configs = micd_modes,
+ .num_micd_configs = ARRAY_SIZE(micd_modes),
+ .micd_force_micbias = true,
+};
+
+/************************************************************/
+#ifdef CONFIG_SND_SOC_INTEL_CNL_FPGA
+static struct i2c_board_info arizona_i2c_device = {
+ I2C_BOARD_INFO("wm8280", 0x1A),
+ .platform_data = &florida_pdata,
+};
+#endif
+
static int arizona_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
@@ -31,10 +166,16 @@ static int arizona_i2c_probe(struct i2c_client *i2c,
unsigned long type;
int ret;
+ pr_debug("%s:%d\n", __func__, __LINE__);
if (i2c->dev.of_node)
type = arizona_of_get_type(&i2c->dev);
+#ifdef CONFIG_SND_SOC_INTEL_CNL_FPGA
+ else
+ type = WM8280;
+#else
else
type = id->driver_data;
+#endif
switch (type) {
case WM5102:
@@ -105,6 +246,13 @@ static const struct i2c_device_id arizona_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, arizona_i2c_id);
+#ifndef CONFIG_SND_SOC_INTEL_CNL_FPGA
+static struct acpi_device_id __maybe_unused arizona_acpi_match[] = {
+ { "INT34C1", WM8280 },
+ { }
+};
+#endif
+
static struct i2c_driver arizona_i2c_driver = {
.driver = {
.name = "arizona",
@@ -116,7 +264,53 @@ static struct i2c_driver arizona_i2c_driver = {
.id_table = arizona_i2c_id,
};
-module_i2c_driver(arizona_i2c_driver);
+static int __init arizona_modinit(void)
+{
+ int ret = 0;
+#ifdef CONFIG_SND_SOC_INTEL_CNL_FPGA
+ struct i2c_adapter *adapter;
+ struct i2c_client *client;
+#endif
+
+ pr_debug("%s Entry\n", __func__);
+ /***********WM8280 Register Regulator*************/
+ platform_device_register(&vflorida1_device);
+ platform_device_register(&vflorida2_device);
+
+#ifdef CONFIG_SND_SOC_INTEL_CNL_FPGA
+ adapter = i2c_get_adapter(0);
+ pr_debug("%s:%d\n", __func__, __LINE__);
+ if (adapter) {
+ client = i2c_new_device(adapter, &arizona_i2c_device);
+ pr_debug("%s:%d\n", __func__, __LINE__);
+ if (!client) {
+ pr_err("can't create i2c device %s\n",
+ arizona_i2c_device.type);
+ i2c_put_adapter(adapter);
+ pr_debug("%s:%d\n", __func__, __LINE__);
+ return -ENODEV;
+ }
+ } else {
+ pr_err("adapter is NULL\n");
+ return -ENODEV;
+ }
+#endif
+ pr_debug("%s:%d\n", __func__, __LINE__);
+ ret = i2c_add_driver(&arizona_i2c_driver);
+
+ pr_debug("%s Exit\n", __func__);
+
+ return ret;
+}
+
+module_init(arizona_modinit);
+
+static void __exit arizona_modexit(void)
+{
+ i2c_del_driver(&arizona_i2c_driver);
+}
+
+module_exit(arizona_modexit);
MODULE_DESCRIPTION("Arizona I2C bus interface");
MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c
index a307832d7e45..bf50bb41e4a7 100644
--- a/drivers/mfd/arizona-irq.c
+++ b/drivers/mfd/arizona-irq.c
@@ -377,7 +377,8 @@ int arizona_irq_init(struct arizona *arizona)
ret = request_threaded_irq(arizona->irq, NULL, arizona_irq_thread,
flags, "arizona", arizona);
- if (ret != 0) {
+ /* FPGA board doesn't have irq line */
+ if (ret != 0 && !IS_ENABLED(CONFIG_SND_SOC_INTEL_CNL_FPGA)) {
dev_err(arizona->dev, "Failed to request primary IRQ %d: %d\n",
arizona->irq, ret);
goto err_main_irq;
--
2.19.2
Reference in New Issue View Git Blame Copy Permalink