mirror of
https://github.com/torvalds/linux
synced 2024-10-23 11:46:42 +00:00
84a442b9a1
These continue the device tree work from part 1, this set is for the
tegra, mxs and imx platforms, all of which have dependencies on clock
or pinctrl changes submitted earlier.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJPuex7AAoJEIwa5zzehBx3xsQP/jkyt74MvuKUi8pi2zkeMIgn
4XieyqcA0KZjJzfB22q3GIZjNIf/mEIGE4E/3bneVMPh/E2zaiohaXFExBmjNjml
hhzWeZlFGPBjrZsfpIXJIIUhwSI7gX2rjYh4npJmdNhZmy8Y89XnpNJhN1kOwMuV
oN23hPWoSVGbyDMQ0fmHx9GyOL8m7yap+joG13aljDa2OKpQg+pYvdwft+k1K9di
8yPF+qA043UUR7dSsjmTbiCcjZy2eySdCmfOAkEG4inSgxNoM7GBs3MuwZo/veCD
v5WssJqWDbLXtqKn5Uo2bvGWiEcf0xtwOAqhSpbaup3dQFJSWMEenBTtA9UlxFhk
6gdY62O+7k6N0thkxXyLNGkgaGzexZAsK7dM6XSDB+PqD+OSNJS7dvmxZM8tuaRn
rvCM1XWcNeN/dpnLbgwCR12efkwWtJoqqUZUUp/tFFaTo8HriqeAIYk7obnR8s9n
S5x9LeueQGNgaxXJzVdh481YKG/1lqjG/a06HbVgYS4XQvtdA+4khalOefJv10tm
Nkg8+4/8pMthWJfhhlfPUgWFXOXFF2AGPG4su2XwKuFXypO8599lzi7gUQaEZu2U
7caqoWP69KsKvK5iAAmA4DQ2rcsgHd44NXx/8Jjes9ma8knlYjrf42dBH6AZMQBG
69I9sJ1cyqusBwx72NPN
=WeDQ
-----END PGP SIGNATURE-----
Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc device tree conversions (part 2) from Olof Johansson:
"These continue the device tree work from part 1, this set is for the
tegra, mxs and imx platforms, all of which have dependencies on clock
or pinctrl changes submitted earlier."
Fix up trivial conflicts due to nearby changes in
drivers/{gpio/gpio,i2c/busses/i2c}-mxs.c
* tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)
ARM: dt: tegra: invert status=disable vs status=okay
ARM: dt: tegra: consistent basic property ordering
ARM: dt: tegra: sort nodes based on bus order
ARM: dt: tegra: remove duplicate device_type property
ARM: dt: tegra: consistenly use lower-case for hex constants
ARM: dt: tegra: format regs properties consistently
ARM: dt: tegra: gpio comment cleanup
ARM: dt: tegra: remove unnecessary unit addresses
ARM: dt: tegra: whitespace cleanup
ARM: dt: tegra cardhu: fix typo in SDHCI node name
ARM: dt: tegra: cardhu: register core regulator tps62361
ARM: dt: tegra30.dtsi: Add SMMU node
ARM: dt: tegra20.dtsi: Add GART node
ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes
ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes
ARM: dt: tegra: Add device tree support for AHB
ARM: dts: enable audio support for imx28-evk
ARM: dts: enable i2c device for imx28-evk
i2c: mxs: add device tree probe support
ARM: dts: enable mmc for imx28-evk
...
115 lines
2.8 KiB
C
115 lines
2.8 KiB
C
/*
|
|
* Copyright (C) 2009-2010 Pengutronix
|
|
* Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
|
|
*
|
|
* 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.
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/init.h>
|
|
#include <linux/amba/bus.h>
|
|
|
|
extern struct device mxs_apbh_bus;
|
|
|
|
struct platform_device *mxs_add_platform_device_dmamask(
|
|
const char *name, int id,
|
|
const struct resource *res, unsigned int num_resources,
|
|
const void *data, size_t size_data, u64 dmamask);
|
|
|
|
static inline struct platform_device *mxs_add_platform_device(
|
|
const char *name, int id,
|
|
const struct resource *res, unsigned int num_resources,
|
|
const void *data, size_t size_data)
|
|
{
|
|
return mxs_add_platform_device_dmamask(
|
|
name, id, res, num_resources, data, size_data, 0);
|
|
}
|
|
|
|
/* auart */
|
|
struct mxs_auart_data {
|
|
int id;
|
|
resource_size_t iobase;
|
|
resource_size_t iosize;
|
|
resource_size_t irq;
|
|
};
|
|
struct platform_device *__init mxs_add_auart(
|
|
const struct mxs_auart_data *data);
|
|
|
|
/* fec */
|
|
#include <linux/fec.h>
|
|
struct mxs_fec_data {
|
|
int id;
|
|
resource_size_t iobase;
|
|
resource_size_t iosize;
|
|
resource_size_t irq;
|
|
};
|
|
struct platform_device *__init mxs_add_fec(
|
|
const struct mxs_fec_data *data,
|
|
const struct fec_platform_data *pdata);
|
|
|
|
/* flexcan */
|
|
#include <linux/can/platform/flexcan.h>
|
|
struct mxs_flexcan_data {
|
|
int id;
|
|
resource_size_t iobase;
|
|
resource_size_t iosize;
|
|
resource_size_t irq;
|
|
};
|
|
struct platform_device *__init mxs_add_flexcan(
|
|
const struct mxs_flexcan_data *data,
|
|
const struct flexcan_platform_data *pdata);
|
|
|
|
/* gpmi-nand */
|
|
#include <linux/mtd/gpmi-nand.h>
|
|
struct mxs_gpmi_nand_data {
|
|
const char *devid;
|
|
const struct resource res[GPMI_NAND_RES_SIZE];
|
|
};
|
|
struct platform_device *__init
|
|
mxs_add_gpmi_nand(const struct gpmi_nand_platform_data *pdata,
|
|
const struct mxs_gpmi_nand_data *data);
|
|
|
|
/* i2c */
|
|
struct mxs_mxs_i2c_data {
|
|
int id;
|
|
resource_size_t iobase;
|
|
resource_size_t errirq;
|
|
resource_size_t dmairq;
|
|
};
|
|
struct platform_device * __init mxs_add_mxs_i2c(
|
|
const struct mxs_mxs_i2c_data *data);
|
|
|
|
/* mmc */
|
|
#include <linux/mmc/mxs-mmc.h>
|
|
struct mxs_mxs_mmc_data {
|
|
const char *devid;
|
|
int id;
|
|
resource_size_t iobase;
|
|
resource_size_t dma;
|
|
resource_size_t irq_err;
|
|
resource_size_t irq_dma;
|
|
};
|
|
struct platform_device *__init mxs_add_mxs_mmc(
|
|
const struct mxs_mxs_mmc_data *data,
|
|
const struct mxs_mmc_platform_data *pdata);
|
|
|
|
/* pwm */
|
|
struct platform_device *__init mxs_add_mxs_pwm(
|
|
resource_size_t iobase, int id);
|
|
|
|
/* saif */
|
|
#include <sound/saif.h>
|
|
struct mxs_saif_data {
|
|
int id;
|
|
resource_size_t iobase;
|
|
resource_size_t irq;
|
|
resource_size_t dma;
|
|
resource_size_t dmairq;
|
|
};
|
|
|
|
struct platform_device *__init mxs_add_saif(
|
|
const struct mxs_saif_data *data,
|
|
const struct mxs_saif_platform_data *pdata);
|