mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-18 06:50:08 +00:00
0bd3fbd4ab
Pull crypto updates from Herbert Xu:
- New cipher/hash driver for ARM ux500.
- Code clean-up for aesni-intel.
- Misc fixes.
Fixed up conflicts in arch/arm/mach-ux500/devices-common.h, where quite
frankly some of it made no sense at all (the pull brought in a
declaration for the dbx500_add_platform_device_noirq() function, which
neither exists nor is used anywhere).
Also some trivial add-add context conflicts in the Kconfig file in
drivers/{char/hw_random,crypto}/
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: aesni-intel - move more common code to ablk_init_common
crypto: aesni-intel - use crypto_[un]register_algs
crypto: ux500 - Cleanup hardware identification
crypto: ux500 - Update DMA handling for 3.4
mach-ux500: crypto - core support for CRYP/HASH module.
crypto: ux500 - Add driver for HASH hardware
crypto: ux500 - Add driver for CRYP hardware
hwrng: Kconfig - modify default state for atmel-rng driver
hwrng: omap - use devm_request_and_ioremap
crypto: crypto4xx - move up err_request_irq label
crypto, xor: Sanitize checksumming function selection output
crypto: caam - add backward compatible string sec4.0
156 lines
3.7 KiB
C
156 lines
3.7 KiB
C
/*
|
|
* Copyright (C) ST-Ericsson SA 2010
|
|
*
|
|
* Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
|
|
* License terms: GNU General Public License (GPL), version 2.
|
|
*/
|
|
|
|
#ifndef __DEVICES_COMMON_H
|
|
#define __DEVICES_COMMON_H
|
|
|
|
#include <linux/platform_device.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/sys_soc.h>
|
|
#include <linux/amba/bus.h>
|
|
#include <plat/i2c.h>
|
|
#include <mach/crypto-ux500.h>
|
|
|
|
struct spi_master_cntlr;
|
|
|
|
static inline struct amba_device *
|
|
dbx500_add_msp_spi(struct device *parent, const char *name,
|
|
resource_size_t base, int irq,
|
|
struct spi_master_cntlr *pdata)
|
|
{
|
|
return amba_ahb_device_add(parent, name, base, SZ_4K, irq, 0,
|
|
pdata, 0);
|
|
}
|
|
|
|
static inline struct amba_device *
|
|
dbx500_add_spi(struct device *parent, const char *name, resource_size_t base,
|
|
int irq, struct spi_master_cntlr *pdata,
|
|
u32 periphid)
|
|
{
|
|
return amba_ahb_device_add(parent, name, base, SZ_4K, irq, 0,
|
|
pdata, periphid);
|
|
}
|
|
|
|
struct mmci_platform_data;
|
|
|
|
static inline struct amba_device *
|
|
dbx500_add_sdi(struct device *parent, const char *name, resource_size_t base,
|
|
int irq, struct mmci_platform_data *pdata, u32 periphid)
|
|
{
|
|
return amba_ahb_device_add(parent, name, base, SZ_4K, irq, 0,
|
|
pdata, periphid);
|
|
}
|
|
|
|
struct amba_pl011_data;
|
|
|
|
static inline struct amba_device *
|
|
dbx500_add_uart(struct device *parent, const char *name, resource_size_t base,
|
|
int irq, struct amba_pl011_data *pdata)
|
|
{
|
|
return amba_ahb_device_add(parent, name, base, SZ_4K, irq, 0, pdata, 0);
|
|
}
|
|
|
|
struct nmk_i2c_controller;
|
|
|
|
static inline struct platform_device *
|
|
dbx500_add_i2c(struct device *parent, int id, resource_size_t base, int irq,
|
|
struct nmk_i2c_controller *data)
|
|
{
|
|
struct resource res[] = {
|
|
DEFINE_RES_MEM(base, SZ_4K),
|
|
DEFINE_RES_IRQ(irq),
|
|
};
|
|
|
|
struct platform_device_info pdevinfo = {
|
|
.parent = parent,
|
|
.name = "nmk-i2c",
|
|
.id = id,
|
|
.res = res,
|
|
.num_res = ARRAY_SIZE(res),
|
|
.data = data,
|
|
.size_data = sizeof(*data),
|
|
.dma_mask = DMA_BIT_MASK(32),
|
|
};
|
|
|
|
return platform_device_register_full(&pdevinfo);
|
|
}
|
|
|
|
static inline struct amba_device *
|
|
dbx500_add_rtc(struct device *parent, resource_size_t base, int irq)
|
|
{
|
|
return amba_apb_device_add(parent, "rtc-pl031", base, SZ_4K, irq,
|
|
0, NULL, 0);
|
|
}
|
|
|
|
struct cryp_platform_data;
|
|
|
|
static inline struct platform_device *
|
|
dbx500_add_cryp1(struct device *parent, int id, resource_size_t base, int irq,
|
|
struct cryp_platform_data *pdata)
|
|
{
|
|
struct resource res[] = {
|
|
DEFINE_RES_MEM(base, SZ_4K),
|
|
DEFINE_RES_IRQ(irq),
|
|
};
|
|
|
|
struct platform_device_info pdevinfo = {
|
|
.parent = parent,
|
|
.name = "cryp1",
|
|
.id = id,
|
|
.res = res,
|
|
.num_res = ARRAY_SIZE(res),
|
|
.data = pdata,
|
|
.size_data = sizeof(*pdata),
|
|
.dma_mask = DMA_BIT_MASK(32),
|
|
};
|
|
|
|
return platform_device_register_full(&pdevinfo);
|
|
}
|
|
|
|
struct hash_platform_data;
|
|
|
|
static inline struct platform_device *
|
|
dbx500_add_hash1(struct device *parent, int id, resource_size_t base,
|
|
struct hash_platform_data *pdata)
|
|
{
|
|
struct resource res[] = {
|
|
DEFINE_RES_MEM(base, SZ_4K),
|
|
};
|
|
|
|
struct platform_device_info pdevinfo = {
|
|
.parent = parent,
|
|
.name = "hash1",
|
|
.id = id,
|
|
.res = res,
|
|
.num_res = ARRAY_SIZE(res),
|
|
.data = pdata,
|
|
.size_data = sizeof(*pdata),
|
|
.dma_mask = DMA_BIT_MASK(32),
|
|
};
|
|
|
|
return platform_device_register_full(&pdevinfo);
|
|
}
|
|
|
|
struct nmk_gpio_platform_data;
|
|
|
|
void dbx500_add_gpios(struct device *parent, resource_size_t *base, int num,
|
|
int irq, struct nmk_gpio_platform_data *pdata);
|
|
|
|
static inline void
|
|
dbx500_add_pinctrl(struct device *parent, const char *name)
|
|
{
|
|
struct platform_device_info pdevinfo = {
|
|
.parent = parent,
|
|
.name = name,
|
|
.id = -1,
|
|
};
|
|
|
|
platform_device_register_full(&pdevinfo);
|
|
}
|
|
|
|
#endif
|