mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
- Add support for Software Nodes to MFD Core
- Remove support for Device Properties from MFD Core
- Use standard APIs in MFD Core
- New Drivers
- Add support for ROHM BD9576MUF and BD9573MUF PMICs
- Add support for Netronix Embedded Controller, PWM and RTC
- Add support for Actions Semi ATC260x PMICs and OnKey
- New Device Support
- Add support for DG1 PCIe Graphics Card to Intel PMT
- Add support for ROHM BD71815 PMIC to ROHM BD71828
- Add support for Tolino Shine 2 HD to Netronix Embedded Controller
- Add support for AX10 BMC Secure Updates to Intel M10 BMC
- Removed Device Support
- Remove Arizona Extcon support from MFD
- Remove ST-E AB8500 Power Supply code from MFD
- Remove AB3100 altogether
- New Functionality
- Add support for SMBus and I2C modes to Dialog DA9063
- Switch to using Software Nodes in Intel (various)
- New/converted Device Tree bindings; rohm,bd71815-pmic, rohm,bd9576-pmic,
netronix,ntxec, actions,atc260x,
ricoh,rn5t618, qcom-pm8xxx
- Fix-ups
- Fix error handling/path; intel_pmt
- Simplify code; rohm-bd718x7, ab8500-core, intel-m10-bmc
- Trivial clean-ups (reordering, spelling); rohm-generic, rn5t618, max8997
- Use correct data-type; db8500-prcmu
- Remove superfluous code; lp87565, intel_quark_i2c_gpi, lpc_sch, twl
- Use generic APIs/defines; lm3533-core, intel_quark_i2c_gpio
- Regmap related fix-ups; intel-m10-bmc, sec-core
- Reorder resource freeing during remove; intel_quark_i2c_gpio
- Make table indexing more robust; intel_quark_i2c_gpio
- Fix reference imbalances; arizona-irq
- Staticify and (un)constify things; arizona-spi, stmpe, ene-kb3930,
intel-lpss-acpi, intel-lpss-pci,
atc260x-i2c, intel_quark_i2c_gpio
- Bug Fixes
- Fix incorrect (register) values; intel-m10-bmc
- Kconfig related fixes; ABX500_CORE
- Do not clear the Auto Reload Register; stm32-timers
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEdrbJNaO+IJqU8IdIUa+KL4f8d2EFAmCJIPEACgkQUa+KL4f8
d2FRZA//Xu9f8u2uLuIfuhxIjUUXOqIjRAFnkhKlgGZhKsY8BohjQ80Tj9yp6UKy
St6ABwACO0hJap4zL4FxPW9+HXTmqZvAibnvHnvZdYSQ3ai6x9h6kTNvhSNLeRQU
fuY7eN8kpAHHiHNKNJCsQLQMvcIyP7+0KAP6qir5GYsMjiXspWq7THUnfBi2JXC6
y60guDo9XrgmQTO+pB870UJrKLM/h+iiohNRGxLFlShKhFCgbTB/wyw6bFeKy1SB
0/6XuY6fOt1IQyBDuzw383Q2faMWO9U+es29bwvFxdqJDK0MHQXC47zBba2q94wL
/9i/HSoz9dRHnTJNYUKWsVcPv4T84w/Iq7scyDvE00ubehJ+oo/M7Au3M6Tt3M1/
6lBAwFYXiwhQnp9EP3nwPwgJF6JzX1IGuMOsUAqrVFOEMuIkZKbRdUlatUhqepJT
spV4/TOfztAhY/7BzEOZLnF8cFNjmL5sn42/UzSRW708V5SxuTNsS48KJ4l0c7Er
CZSTlR/T1rKkWqf7ejaS2TNqMCdYyB3vZW0quDxZTHTZHv9huNUvtbKPR7jmd+4p
mrMIik7EE4BzC5m8tBPnXXZl+Og0keeYv4LUDBuLDX1agrxYIErl4ITvQTqqMfX1
Jt14SIjSO56iu2ngQuvGWwegVK4/urO2kBJKUAH1QN1OocNaajQ=
=IJSL
-----END PGP SIGNATURE-----
Merge tag 'mfd-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones:
"Core Framework:
- Add support for Software Nodes to MFD Core
- Remove support for Device Properties from MFD Core
- Use standard APIs in MFD Core
New Drivers:
- Add support for ROHM BD9576MUF and BD9573MUF PMICs
- Add support for Netronix Embedded Controller, PWM and RTC
- Add support for Actions Semi ATC260x PMICs and OnKey
New Device Support:
- Add support for DG1 PCIe Graphics Card to Intel PMT
- Add support for ROHM BD71815 PMIC to ROHM BD71828
- Add support for Tolino Shine 2 HD to Netronix Embedded Controller
- Add support for AX10 BMC Secure Updates to Intel M10 BMC
Removed Device Support:
- Remove Arizona Extcon support from MFD
- Remove ST-E AB8500 Power Supply code from MFD
- Remove AB3100 altogether
New Functionality:
- Add support for SMBus and I2C modes to Dialog DA9063
- Switch to using Software Nodes in Intel (various)
New/converted Device Tree bindings:
- rohm bd71815-pmic, rohm bd9576-pmic, netronix ntxec, actions
atc260x, ricoh rn5t618, qcom pm8xxx
- Fix-ups:
- Fix error handling/path; intel_pmt
- Simplify code; rohm-bd718x7, ab8500-core, intel-m10-bmc
- Trivial clean-ups (reordering, spelling); rohm-generic, rn5t618,
max8997
- Use correct data-type; db8500-prcmu
- Remove superfluous code; lp87565, intel_quark_i2c_gpi, lpc_sch, twl
- Use generic APIs/defines; lm3533-core, intel_quark_i2c_gpio
- Regmap related fix-ups; intel-m10-bmc, sec-core
- Reorder resource freeing during remove; intel_quark_i2c_gpio
- Make table indexing more robust; intel_quark_i2c_gpio
- Fix reference imbalances; arizona-irq
- Staticify and (un)constify things; arizona-spi, stmpe, ene-kb3930,
intel-lpss-acpi, intel-lpss-pci, atc260x-i2c, intel_quark_i2c_gpio
Bug Fixes:
- Fix incorrect (register) values; intel-m10-bmc
- Kconfig related fixes; ABX500_CORE
- Do not clear the Auto Reload Register; stm32-timers"
* tag 'mfd-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (84 commits)
mfd: intel-m10-bmc: Add support for MAX10 BMC Secure Updates
Revert "mfd: max8997: Add of_compatible to Extcon and Charger mfd_cell"
mfd: twl: Remove unused inline function twl4030charger_usb_en()
dt-bindings: mfd: Convert pm8xxx bindings to yaml
dt-bindings: mfd: Add compatible for pmk8350 rtc
i2c: designware: Get rid of legacy platform data
mfd: intel_quark_i2c_gpio: Convert I²C to use software nodes
mfd: lpc_sch: Partially revert "Add support for Intel Quark X1000"
mfd: arizona: Fix rumtime PM imbalance on error
mfd: max8997: Replace 8998 with 8997
mfd: core: Use acpi_find_child_device() for child devices lookup
mfd: intel_quark_i2c_gpio: Don't play dirty trick with const
mfd: intel_quark_i2c_gpio: Enable MSI interrupt
mfd: intel_quark_i2c_gpio: Reuse BAR definitions for MFD cell indexing
mfd: ntxec: Support for EC in Tolino Shine 2 HD
mfd: stm32-timers: Avoid clearing auto reload register
mfd: intel_quark_i2c_gpio: Replace I²C speeds with descriptive definitions
mfd: intel_quark_i2c_gpio: Remove unused struct device member
mfd: intel_quark_i2c_gpio: Unregister resources in reversed order
mfd: Kconfig: ABX500_CORE should depend on ARCH_U8500
...
307 lines
7.9 KiB
C
307 lines
7.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Intel Quark MFD PCI driver for I2C & GPIO
|
|
*
|
|
* Copyright(c) 2014 Intel Corporation.
|
|
*
|
|
* 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/i2c.h>
|
|
#include <linux/platform_data/gpio-dwapb.h>
|
|
#include <linux/property.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 clk *i2c_clk;
|
|
struct clk_lookup *i2c_clk_lookup;
|
|
};
|
|
|
|
static const struct property_entry intel_quark_i2c_controller_standard_properties[] = {
|
|
PROPERTY_ENTRY_U32("clock-frequency", I2C_MAX_STANDARD_MODE_FREQ),
|
|
{ }
|
|
};
|
|
|
|
static const struct software_node intel_quark_i2c_controller_standard_node = {
|
|
.name = "intel-quark-i2c-controller",
|
|
.properties = intel_quark_i2c_controller_standard_properties,
|
|
};
|
|
|
|
static const struct property_entry intel_quark_i2c_controller_fast_properties[] = {
|
|
PROPERTY_ENTRY_U32("clock-frequency", I2C_MAX_FAST_MODE_FREQ),
|
|
{ }
|
|
};
|
|
|
|
static const struct software_node intel_quark_i2c_controller_fast_node = {
|
|
.name = "intel-quark-i2c-controller",
|
|
.properties = intel_quark_i2c_controller_fast_properties,
|
|
};
|
|
|
|
static const struct dmi_system_id dmi_platform_info[] = {
|
|
{
|
|
.matches = {
|
|
DMI_EXACT_MATCH(DMI_BOARD_NAME, "Galileo"),
|
|
},
|
|
.driver_data = (void *)&intel_quark_i2c_controller_standard_node,
|
|
},
|
|
{
|
|
.matches = {
|
|
DMI_EXACT_MATCH(DMI_BOARD_NAME, "GalileoGen2"),
|
|
},
|
|
.driver_data = (void *)&intel_quark_i2c_controller_fast_node,
|
|
},
|
|
{
|
|
.matches = {
|
|
DMI_EXACT_MATCH(DMI_BOARD_NAME, "SIMATIC IOT2000"),
|
|
},
|
|
.driver_data = (void *)&intel_quark_i2c_controller_fast_node,
|
|
},
|
|
{}
|
|
};
|
|
|
|
/* This is used as a place holder and will be modified at run-time */
|
|
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,
|
|
};
|
|
|
|
/* This is used as a place holder and will be modified at run-time */
|
|
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[] = {
|
|
[MFD_I2C_BAR] = {
|
|
.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,
|
|
},
|
|
[MFD_GPIO_BAR] = {
|
|
.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,
|
|
},
|
|
};
|
|
|
|
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 = &intel_quark_mfd_cells[MFD_I2C_BAR];
|
|
struct resource *res = intel_quark_i2c_res;
|
|
const struct dmi_system_id *dmi_id;
|
|
|
|
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 = pci_irq_vector(pdev, 0);
|
|
res[INTEL_QUARK_IORES_IRQ].end = pci_irq_vector(pdev, 0);
|
|
|
|
/* Normal mode by default */
|
|
cell->swnode = &intel_quark_i2c_controller_standard_node;
|
|
|
|
dmi_id = dmi_first_match(dmi_platform_info);
|
|
if (dmi_id)
|
|
cell->swnode = (struct software_node *)dmi_id->driver_data;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int intel_quark_gpio_setup(struct pci_dev *pdev)
|
|
{
|
|
struct mfd_cell *cell = &intel_quark_mfd_cells[MFD_GPIO_BAR];
|
|
struct resource *res = intel_quark_gpio_res;
|
|
struct dwapb_platform_data *pdata;
|
|
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[0] = pci_irq_vector(pdev, 0);
|
|
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;
|
|
|
|
dev_set_drvdata(&pdev->dev, quark_mfd);
|
|
|
|
ret = intel_quark_register_i2c_clk(&pdev->dev);
|
|
if (ret)
|
|
return ret;
|
|
|
|
pci_set_master(pdev);
|
|
|
|
/* This driver only requires 1 IRQ vector */
|
|
ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
|
|
if (ret < 0)
|
|
goto err_unregister_i2c_clk;
|
|
|
|
ret = intel_quark_i2c_setup(pdev);
|
|
if (ret)
|
|
goto err_free_irq_vectors;
|
|
|
|
ret = intel_quark_gpio_setup(pdev);
|
|
if (ret)
|
|
goto err_free_irq_vectors;
|
|
|
|
ret = mfd_add_devices(&pdev->dev, 0, intel_quark_mfd_cells,
|
|
ARRAY_SIZE(intel_quark_mfd_cells), NULL, 0,
|
|
NULL);
|
|
if (ret)
|
|
goto err_free_irq_vectors;
|
|
|
|
return 0;
|
|
|
|
err_free_irq_vectors:
|
|
pci_free_irq_vectors(pdev);
|
|
err_unregister_i2c_clk:
|
|
intel_quark_unregister_i2c_clk(&pdev->dev);
|
|
return ret;
|
|
}
|
|
|
|
static void intel_quark_mfd_remove(struct pci_dev *pdev)
|
|
{
|
|
mfd_remove_devices(&pdev->dev);
|
|
pci_free_irq_vectors(pdev);
|
|
intel_quark_unregister_i2c_clk(&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");
|