mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-30 12:49:36 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
- Add new driver for MAXIM MAX77620/MAX20024 PMIC - Add new driver for Hisilicon HI665X PMIC - New Device Support - Add support for AXP809 in axp20x-rsb - Add support for Power Supply in axp20x - New core features - devm_mfd_* managed resources - Fix-ups - Remove unused code; da9063-irq, wm8400-core, tps6105x, smsc-ece1099, twl4030-power - Improve clean-up in error path; intel_quark_i2c_gpio - Explicitly include headers; syscon.h - Allow building as modules; max77693 - Use IS_ENABLED() instead of rolling your own; dm355evm_msp, wm8400-core - DT adaptions; axp20x, hi655x, arizona, max77620 - Remove CLK_IS_ROOT flag; intel-lpss, intel_quark - Move to gpiochip API; asic3, dm355evm_msp, htc-egpio, htc-i2cpld, sm501, tc6393xb, tps65010, ucb1x00, vexpress - Make use of devm_mfd_* calls; act8945a, as3711, atmel-hlcdc, bcm590xx, hi6421-pmic-core, lp3943, menf21bmc, mt6397, rdc321x, rk808, rn5t618, rt5033, sky81452, stw481x, tps6507x, tps65217, wm8400, - Bug Fixes - Fix ACPI child matching; mfd-core - Fix start-up ordering issues; mt6397-core, arizona-core - Fix forgotten register state on resume; intel-lpss - Fix Clock related issues; twl6040 - Fix scheduling whilst atomic; omap-usb-tll - Kconfig changes; vexpress -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJXPzwAAAoJEFGvii+H/HdhkPEP/iTvgiL+CpAk7UwAhCNolR5j l3vb49lOlmqx87zELdToJmySAd/byiZN0YQEmcn+t4BCs/8CeaWeNkb8vltJvuac Fmz88bhXfgFYk87nx/6tRMvuM3fKXlk/YYRZkklV7mkBjcPLiqBZSi/MG/SV53a9 A+vGW56B2/vHiUgTBkYs9UZNqkFCkmhuVYbHjtFwTfL84lwy9u4tNRrktss6g1lx Ak9uiDhaUP/vxKe/7/qCTZXgV/IYb2+tcNjMJ+Cztmyht8VTrhGSXbDPH7MyRYUI EBBWRXAQelR5qHxOYDSBNIemZe3AniCBp7tjqcwlN9cdE8q9pJxOk+0XStjC+XeW Qt1aIwQisk8jfII8BIGr2pAzc8Jh9/TtcK+wKMRQ2o5g2tvcG90hHIJWQlbdy4ST SX799w0KvTItdaMhTHThTOfJRj777v/H2cj8DBCCEeoBHOCHnzbJSIuKahPa9PM3 W0dyZOpsDXoegyksjBUYjdhGoggjEdirt+oXJe4rY7UxeEml+YZS54fseVzgNzNq //Nxk1GMNOVXgo3NrlO8JTs2G5gFPc8VOuPW60G1fm8DyNW13RbUG74QPpSd4U7S zZM/OZ3D0E4nrPjXf/GCS3QRwM7p1ubiOgSTTZkaLJYGBcHSezGXK8XpFSNReRop Un13GPM09Sl9VN9a2Ybi =FSmn -----END PGP SIGNATURE----- Merge tag 'mfd-for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd Pull MFD updates from Lee Jones: "New Drivers: - Add new driver for MAXIM MAX77620/MAX20024 PMIC - Add new driver for Hisilicon HI665X PMIC New Device Support: - Add support for AXP809 in axp20x-rsb - Add support for Power Supply in axp20x New core features: - devm_mfd_* managed resources Fix-ups: - Remove unused code (da9063-irq, wm8400-core, tps6105x, smsc-ece1099, twl4030-power) - Improve clean-up in error path (intel_quark_i2c_gpio) - Explicitly include headers (syscon.h) - Allow building as modules (max77693) - Use IS_ENABLED() instead of rolling your own (dm355evm_msp, wm8400-core) - DT adaptions (axp20x, hi655x, arizona, max77620) - Remove CLK_IS_ROOT flag (intel-lpss, intel_quark) - Move to gpiochip API (asic3, dm355evm_msp, htc-egpio, htc-i2cpld, sm501, tc6393xb, tps65010, ucb1x00, vexpress) - Make use of devm_mfd_* calls (act8945a, as3711, atmel-hlcdc, bcm590xx, hi6421-pmic-core, lp3943, menf21bmc, mt6397, rdc321x, rk808, rn5t618, rt5033, sky81452, stw481x, tps6507x, tps65217, wm8400) Bug Fixes" - Fix ACPI child matching (mfd-core) - Fix start-up ordering issues (mt6397-core, arizona-core) - Fix forgotten register state on resume (intel-lpss) - Fix Clock related issues (twl6040) - Fix scheduling whilst atomic (omap-usb-tll) - Kconfig changes (vexpress)" * tag 'mfd-for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (73 commits) mfd: hi655x: Add MFD driver for hi655x mfd: ab8500-debugfs: Trivial fix of spelling mistake on "between" mfd: vexpress: Add !ARCH_USES_GETTIMEOFFSET dependency mfd: Add device-tree binding doc for PMIC MAX77620/MAX20024 mfd: max77620: Add core driver for MAX77620/MAX20024 mfd: arizona: Add defines for GPSW values that can be used from DT mfd: omap-usb-tll: Fix scheduling while atomic BUG mfd: wm5110: ARIZONA_CLOCK_CONTROL should be volatile mfd: axp20x: Add a cell for the ac power_supply part of the axp20x PMICs mfd: intel_soc_pmic_core: Terminate panel control GPIO lookup table correctly mfd: wl1273-core: Use devm_mfd_add_devices() for mfd_device registration mfd: tps65910: Use devm_mfd_add_devices and devm_regmap_add_irq_chip mfd: sec: Use devm_mfd_add_devices and devm_regmap_add_irq_chip mfd: rc5t583: Use devm_mfd_add_devices and devm_request_threaded_irq mfd: max77686: Use devm_mfd_add_devices and devm_regmap_add_irq_chip mfd: as3722: Use devm_mfd_add_devices and devm_regmap_add_irq_chip mfd: twl4030-power: Remove driver path in file comment MAINTAINERS: Add entry for X-Powers AXP family PMIC drivers mfd: smsc-ece1099: Remove unnecessarily remove callback mfd: Use IS_ENABLED(CONFIG_FOO) instead of checking FOO || FOO_MODULE ...
295 lines
7.3 KiB
C
295 lines
7.3 KiB
C
/*
|
|
* Intel Quark MFD PCI driver for I2C & GPIO
|
|
*
|
|
* Copyright(c) 2014 Intel Corporation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* Intel Quark PCI device for I2C and GPIO controller sharing the same
|
|
* PCI function. This PCI driver will split the 2 devices into their
|
|
* respective drivers.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/mfd/core.h>
|
|
#include <linux/clkdev.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/dmi.h>
|
|
#include <linux/platform_data/gpio-dwapb.h>
|
|
#include <linux/platform_data/i2c-designware.h>
|
|
|
|
/* PCI BAR for register base address */
|
|
#define MFD_I2C_BAR 0
|
|
#define MFD_GPIO_BAR 1
|
|
|
|
/* ACPI _ADR value to match the child node */
|
|
#define MFD_ACPI_MATCH_GPIO 0ULL
|
|
#define MFD_ACPI_MATCH_I2C 1ULL
|
|
|
|
/* The base GPIO number under GPIOLIB framework */
|
|
#define INTEL_QUARK_MFD_GPIO_BASE 8
|
|
|
|
/* The default number of South-Cluster GPIO on Quark. */
|
|
#define INTEL_QUARK_MFD_NGPIO 8
|
|
|
|
/* The DesignWare GPIO ports on Quark. */
|
|
#define INTEL_QUARK_GPIO_NPORTS 1
|
|
|
|
#define INTEL_QUARK_IORES_MEM 0
|
|
#define INTEL_QUARK_IORES_IRQ 1
|
|
|
|
#define INTEL_QUARK_I2C_CONTROLLER_CLK "i2c_designware.0"
|
|
|
|
/* The Quark I2C controller source clock */
|
|
#define INTEL_QUARK_I2C_CLK_HZ 33000000
|
|
|
|
struct intel_quark_mfd {
|
|
struct device *dev;
|
|
struct clk *i2c_clk;
|
|
struct clk_lookup *i2c_clk_lookup;
|
|
};
|
|
|
|
struct i2c_mode_info {
|
|
const char *name;
|
|
unsigned int i2c_scl_freq;
|
|
};
|
|
|
|
static const struct i2c_mode_info platform_i2c_mode_info[] = {
|
|
{
|
|
.name = "Galileo",
|
|
.i2c_scl_freq = 100000,
|
|
},
|
|
{
|
|
.name = "GalileoGen2",
|
|
.i2c_scl_freq = 400000,
|
|
},
|
|
{}
|
|
};
|
|
|
|
static struct resource intel_quark_i2c_res[] = {
|
|
[INTEL_QUARK_IORES_MEM] = {
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[INTEL_QUARK_IORES_IRQ] = {
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct mfd_cell_acpi_match intel_quark_acpi_match_i2c = {
|
|
.adr = MFD_ACPI_MATCH_I2C,
|
|
};
|
|
|
|
static struct resource intel_quark_gpio_res[] = {
|
|
[INTEL_QUARK_IORES_MEM] = {
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct mfd_cell_acpi_match intel_quark_acpi_match_gpio = {
|
|
.adr = MFD_ACPI_MATCH_GPIO,
|
|
};
|
|
|
|
static struct mfd_cell intel_quark_mfd_cells[] = {
|
|
{
|
|
.id = MFD_GPIO_BAR,
|
|
.name = "gpio-dwapb",
|
|
.acpi_match = &intel_quark_acpi_match_gpio,
|
|
.num_resources = ARRAY_SIZE(intel_quark_gpio_res),
|
|
.resources = intel_quark_gpio_res,
|
|
.ignore_resource_conflicts = true,
|
|
},
|
|
{
|
|
.id = MFD_I2C_BAR,
|
|
.name = "i2c_designware",
|
|
.acpi_match = &intel_quark_acpi_match_i2c,
|
|
.num_resources = ARRAY_SIZE(intel_quark_i2c_res),
|
|
.resources = intel_quark_i2c_res,
|
|
.ignore_resource_conflicts = true,
|
|
},
|
|
};
|
|
|
|
static const struct pci_device_id intel_quark_mfd_ids[] = {
|
|
{ PCI_VDEVICE(INTEL, 0x0934), },
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(pci, intel_quark_mfd_ids);
|
|
|
|
static int intel_quark_register_i2c_clk(struct device *dev)
|
|
{
|
|
struct intel_quark_mfd *quark_mfd = dev_get_drvdata(dev);
|
|
struct clk *i2c_clk;
|
|
|
|
i2c_clk = clk_register_fixed_rate(dev,
|
|
INTEL_QUARK_I2C_CONTROLLER_CLK, NULL,
|
|
0, INTEL_QUARK_I2C_CLK_HZ);
|
|
if (IS_ERR(i2c_clk))
|
|
return PTR_ERR(i2c_clk);
|
|
|
|
quark_mfd->i2c_clk = i2c_clk;
|
|
quark_mfd->i2c_clk_lookup = clkdev_create(i2c_clk, NULL,
|
|
INTEL_QUARK_I2C_CONTROLLER_CLK);
|
|
|
|
if (!quark_mfd->i2c_clk_lookup) {
|
|
clk_unregister(quark_mfd->i2c_clk);
|
|
dev_err(dev, "Fixed clk register failed\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void intel_quark_unregister_i2c_clk(struct device *dev)
|
|
{
|
|
struct intel_quark_mfd *quark_mfd = dev_get_drvdata(dev);
|
|
|
|
if (!quark_mfd->i2c_clk_lookup)
|
|
return;
|
|
|
|
clkdev_drop(quark_mfd->i2c_clk_lookup);
|
|
clk_unregister(quark_mfd->i2c_clk);
|
|
}
|
|
|
|
static int intel_quark_i2c_setup(struct pci_dev *pdev, struct mfd_cell *cell)
|
|
{
|
|
const char *board_name = dmi_get_system_info(DMI_BOARD_NAME);
|
|
const struct i2c_mode_info *info;
|
|
struct dw_i2c_platform_data *pdata;
|
|
struct resource *res = (struct resource *)cell->resources;
|
|
struct device *dev = &pdev->dev;
|
|
|
|
res[INTEL_QUARK_IORES_MEM].start =
|
|
pci_resource_start(pdev, MFD_I2C_BAR);
|
|
res[INTEL_QUARK_IORES_MEM].end =
|
|
pci_resource_end(pdev, MFD_I2C_BAR);
|
|
|
|
res[INTEL_QUARK_IORES_IRQ].start = pdev->irq;
|
|
res[INTEL_QUARK_IORES_IRQ].end = pdev->irq;
|
|
|
|
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
|
|
if (!pdata)
|
|
return -ENOMEM;
|
|
|
|
/* Normal mode by default */
|
|
pdata->i2c_scl_freq = 100000;
|
|
|
|
if (board_name) {
|
|
for (info = platform_i2c_mode_info; info->name; info++) {
|
|
if (!strcmp(board_name, info->name)) {
|
|
pdata->i2c_scl_freq = info->i2c_scl_freq;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
cell->platform_data = pdata;
|
|
cell->pdata_size = sizeof(*pdata);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int intel_quark_gpio_setup(struct pci_dev *pdev, struct mfd_cell *cell)
|
|
{
|
|
struct dwapb_platform_data *pdata;
|
|
struct resource *res = (struct resource *)cell->resources;
|
|
struct device *dev = &pdev->dev;
|
|
|
|
res[INTEL_QUARK_IORES_MEM].start =
|
|
pci_resource_start(pdev, MFD_GPIO_BAR);
|
|
res[INTEL_QUARK_IORES_MEM].end =
|
|
pci_resource_end(pdev, MFD_GPIO_BAR);
|
|
|
|
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
|
|
if (!pdata)
|
|
return -ENOMEM;
|
|
|
|
/* For intel quark x1000, it has only one port: portA */
|
|
pdata->nports = INTEL_QUARK_GPIO_NPORTS;
|
|
pdata->properties = devm_kcalloc(dev, pdata->nports,
|
|
sizeof(*pdata->properties),
|
|
GFP_KERNEL);
|
|
if (!pdata->properties)
|
|
return -ENOMEM;
|
|
|
|
/* Set the properties for portA */
|
|
pdata->properties->fwnode = NULL;
|
|
pdata->properties->idx = 0;
|
|
pdata->properties->ngpio = INTEL_QUARK_MFD_NGPIO;
|
|
pdata->properties->gpio_base = INTEL_QUARK_MFD_GPIO_BASE;
|
|
pdata->properties->irq = pdev->irq;
|
|
pdata->properties->irq_shared = true;
|
|
|
|
cell->platform_data = pdata;
|
|
cell->pdata_size = sizeof(*pdata);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int intel_quark_mfd_probe(struct pci_dev *pdev,
|
|
const struct pci_device_id *id)
|
|
{
|
|
struct intel_quark_mfd *quark_mfd;
|
|
int ret;
|
|
|
|
ret = pcim_enable_device(pdev);
|
|
if (ret)
|
|
return ret;
|
|
|
|
quark_mfd = devm_kzalloc(&pdev->dev, sizeof(*quark_mfd), GFP_KERNEL);
|
|
if (!quark_mfd)
|
|
return -ENOMEM;
|
|
|
|
quark_mfd->dev = &pdev->dev;
|
|
dev_set_drvdata(&pdev->dev, quark_mfd);
|
|
|
|
ret = intel_quark_register_i2c_clk(&pdev->dev);
|
|
if (ret)
|
|
return ret;
|
|
|
|
ret = intel_quark_i2c_setup(pdev, &intel_quark_mfd_cells[1]);
|
|
if (ret)
|
|
goto err_unregister_i2c_clk;
|
|
|
|
ret = intel_quark_gpio_setup(pdev, &intel_quark_mfd_cells[0]);
|
|
if (ret)
|
|
goto err_unregister_i2c_clk;
|
|
|
|
ret = mfd_add_devices(&pdev->dev, 0, intel_quark_mfd_cells,
|
|
ARRAY_SIZE(intel_quark_mfd_cells), NULL, 0,
|
|
NULL);
|
|
if (ret)
|
|
goto err_unregister_i2c_clk;
|
|
|
|
return 0;
|
|
|
|
err_unregister_i2c_clk:
|
|
intel_quark_unregister_i2c_clk(&pdev->dev);
|
|
return ret;
|
|
}
|
|
|
|
static void intel_quark_mfd_remove(struct pci_dev *pdev)
|
|
{
|
|
intel_quark_unregister_i2c_clk(&pdev->dev);
|
|
mfd_remove_devices(&pdev->dev);
|
|
}
|
|
|
|
static struct pci_driver intel_quark_mfd_driver = {
|
|
.name = "intel_quark_mfd_i2c_gpio",
|
|
.id_table = intel_quark_mfd_ids,
|
|
.probe = intel_quark_mfd_probe,
|
|
.remove = intel_quark_mfd_remove,
|
|
};
|
|
|
|
module_pci_driver(intel_quark_mfd_driver);
|
|
|
|
MODULE_AUTHOR("Raymond Tan <raymond.tan@intel.com>");
|
|
MODULE_DESCRIPTION("Intel Quark MFD PCI driver for I2C & GPIO");
|
|
MODULE_LICENSE("GPL v2");
|