Merge commit 'gcl/gcl-next'
This commit is contained in:
@@ -443,7 +443,7 @@ mpc52xx_bcom_probe(struct of_device *op, const struct of_device_id *match)
|
||||
|
||||
/* Done ! */
|
||||
printk(KERN_INFO "DMA: MPC52xx BestComm engine @%08lx ok !\n",
|
||||
bcom_eng->regs_base);
|
||||
(long)bcom_eng->regs_base);
|
||||
|
||||
return 0;
|
||||
|
||||
|
@@ -20,6 +20,7 @@
|
||||
#include <asm/io.h>
|
||||
|
||||
#include <asm/mpc52xx.h>
|
||||
#include <asm/mpc52xx_psc.h>
|
||||
|
||||
#include "bestcomm.h"
|
||||
#include "bestcomm_priv.h"
|
||||
@@ -253,6 +254,100 @@ bcom_gen_bd_tx_release(struct bcom_task *tsk)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(bcom_gen_bd_tx_release);
|
||||
|
||||
/* ---------------------------------------------------------------------
|
||||
* PSC support code
|
||||
*/
|
||||
|
||||
/**
|
||||
* bcom_psc_parameters - Bestcomm initialization value table for PSC devices
|
||||
*
|
||||
* This structure is only used internally. It is a lookup table for PSC
|
||||
* specific parameters to bestcomm tasks.
|
||||
*/
|
||||
static struct bcom_psc_params {
|
||||
int rx_initiator;
|
||||
int rx_ipr;
|
||||
int tx_initiator;
|
||||
int tx_ipr;
|
||||
} bcom_psc_params[] = {
|
||||
[0] = {
|
||||
.rx_initiator = BCOM_INITIATOR_PSC1_RX,
|
||||
.rx_ipr = BCOM_IPR_PSC1_RX,
|
||||
.tx_initiator = BCOM_INITIATOR_PSC1_TX,
|
||||
.tx_ipr = BCOM_IPR_PSC1_TX,
|
||||
},
|
||||
[1] = {
|
||||
.rx_initiator = BCOM_INITIATOR_PSC2_RX,
|
||||
.rx_ipr = BCOM_IPR_PSC2_RX,
|
||||
.tx_initiator = BCOM_INITIATOR_PSC2_TX,
|
||||
.tx_ipr = BCOM_IPR_PSC2_TX,
|
||||
},
|
||||
[2] = {
|
||||
.rx_initiator = BCOM_INITIATOR_PSC3_RX,
|
||||
.rx_ipr = BCOM_IPR_PSC3_RX,
|
||||
.tx_initiator = BCOM_INITIATOR_PSC3_TX,
|
||||
.tx_ipr = BCOM_IPR_PSC3_TX,
|
||||
},
|
||||
[3] = {
|
||||
.rx_initiator = BCOM_INITIATOR_PSC4_RX,
|
||||
.rx_ipr = BCOM_IPR_PSC4_RX,
|
||||
.tx_initiator = BCOM_INITIATOR_PSC4_TX,
|
||||
.tx_ipr = BCOM_IPR_PSC4_TX,
|
||||
},
|
||||
[4] = {
|
||||
.rx_initiator = BCOM_INITIATOR_PSC5_RX,
|
||||
.rx_ipr = BCOM_IPR_PSC5_RX,
|
||||
.tx_initiator = BCOM_INITIATOR_PSC5_TX,
|
||||
.tx_ipr = BCOM_IPR_PSC5_TX,
|
||||
},
|
||||
[5] = {
|
||||
.rx_initiator = BCOM_INITIATOR_PSC6_RX,
|
||||
.rx_ipr = BCOM_IPR_PSC6_RX,
|
||||
.tx_initiator = BCOM_INITIATOR_PSC6_TX,
|
||||
.tx_ipr = BCOM_IPR_PSC6_TX,
|
||||
},
|
||||
};
|
||||
|
||||
/**
|
||||
* bcom_psc_gen_bd_rx_init - Allocate a receive bcom_task for a PSC port
|
||||
* @psc_num: Number of the PSC to allocate a task for
|
||||
* @queue_len: number of buffer descriptors to allocate for the task
|
||||
* @fifo: physical address of FIFO register
|
||||
* @maxbufsize: Maximum receive data size in bytes.
|
||||
*
|
||||
* Allocate a bestcomm task structure for receiving data from a PSC.
|
||||
*/
|
||||
struct bcom_task * bcom_psc_gen_bd_rx_init(unsigned psc_num, int queue_len,
|
||||
phys_addr_t fifo, int maxbufsize)
|
||||
{
|
||||
if (psc_num >= MPC52xx_PSC_MAXNUM)
|
||||
return NULL;
|
||||
|
||||
return bcom_gen_bd_rx_init(queue_len, fifo,
|
||||
bcom_psc_params[psc_num].rx_initiator,
|
||||
bcom_psc_params[psc_num].rx_ipr,
|
||||
maxbufsize);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(bcom_psc_gen_bd_rx_init);
|
||||
|
||||
/**
|
||||
* bcom_psc_gen_bd_tx_init - Allocate a transmit bcom_task for a PSC port
|
||||
* @psc_num: Number of the PSC to allocate a task for
|
||||
* @queue_len: number of buffer descriptors to allocate for the task
|
||||
* @fifo: physical address of FIFO register
|
||||
*
|
||||
* Allocate a bestcomm task structure for transmitting data to a PSC.
|
||||
*/
|
||||
struct bcom_task *
|
||||
bcom_psc_gen_bd_tx_init(unsigned psc_num, int queue_len, phys_addr_t fifo)
|
||||
{
|
||||
struct psc;
|
||||
return bcom_gen_bd_tx_init(queue_len, fifo,
|
||||
bcom_psc_params[psc_num].tx_initiator,
|
||||
bcom_psc_params[psc_num].tx_ipr);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(bcom_psc_gen_bd_tx_init);
|
||||
|
||||
|
||||
MODULE_DESCRIPTION("BestComm General Buffer Descriptor tasks driver");
|
||||
MODULE_AUTHOR("Jeff Gibbons <jeff.gibbons@appspec.com>");
|
||||
|
@@ -44,5 +44,10 @@ extern void
|
||||
bcom_gen_bd_tx_release(struct bcom_task *tsk);
|
||||
|
||||
|
||||
/* PSC support utility wrappers */
|
||||
struct bcom_task * bcom_psc_gen_bd_rx_init(unsigned psc_num, int queue_len,
|
||||
phys_addr_t fifo, int maxbufsize);
|
||||
struct bcom_task * bcom_psc_gen_bd_tx_init(unsigned psc_num, int queue_len,
|
||||
phys_addr_t fifo);
|
||||
#endif /* __BESTCOMM_GEN_BD_H__ */
|
||||
|
||||
|
@@ -86,7 +86,7 @@ int bcom_sram_init(struct device_node *sram_node, char *owner)
|
||||
if (!bcom_sram->base_virt) {
|
||||
printk(KERN_ERR "%s: bcom_sram_init: "
|
||||
"Map error SRAM zone 0x%08lx (0x%0x)!\n",
|
||||
owner, bcom_sram->base_phys, bcom_sram->size );
|
||||
owner, (long)bcom_sram->base_phys, bcom_sram->size );
|
||||
rv = -ENOMEM;
|
||||
goto error_release;
|
||||
}
|
||||
|
@@ -414,139 +414,6 @@ err:
|
||||
|
||||
arch_initcall(gfar_of_init);
|
||||
|
||||
#ifdef CONFIG_I2C_BOARDINFO
|
||||
#include <linux/i2c.h>
|
||||
struct i2c_driver_device {
|
||||
char *of_device;
|
||||
char *i2c_type;
|
||||
};
|
||||
|
||||
static struct i2c_driver_device i2c_devices[] __initdata = {
|
||||
{"ricoh,rs5c372a", "rs5c372a"},
|
||||
{"ricoh,rs5c372b", "rs5c372b"},
|
||||
{"ricoh,rv5c386", "rv5c386"},
|
||||
{"ricoh,rv5c387a", "rv5c387a"},
|
||||
{"dallas,ds1307", "ds1307"},
|
||||
{"dallas,ds1337", "ds1337"},
|
||||
{"dallas,ds1338", "ds1338"},
|
||||
{"dallas,ds1339", "ds1339"},
|
||||
{"dallas,ds1340", "ds1340"},
|
||||
{"stm,m41t00", "m41t00"},
|
||||
{"dallas,ds1374", "ds1374"},
|
||||
{"cirrus,cs4270", "cs4270"},
|
||||
};
|
||||
|
||||
static int __init of_find_i2c_driver(struct device_node *node,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(i2c_devices); i++) {
|
||||
if (!of_device_is_compatible(node, i2c_devices[i].of_device))
|
||||
continue;
|
||||
if (strlcpy(info->type, i2c_devices[i].i2c_type,
|
||||
I2C_NAME_SIZE) >= I2C_NAME_SIZE)
|
||||
return -ENOMEM;
|
||||
return 0;
|
||||
}
|
||||
|
||||
pr_warning("fsl_soc.c: unrecognized i2c node %s\n",
|
||||
(const char *) of_get_property(node, "compatible", NULL));
|
||||
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static void __init of_register_i2c_devices(struct device_node *adap_node,
|
||||
int bus_num)
|
||||
{
|
||||
struct device_node *node = NULL;
|
||||
|
||||
while ((node = of_get_next_child(adap_node, node))) {
|
||||
struct i2c_board_info info = {};
|
||||
const u32 *addr;
|
||||
int len;
|
||||
|
||||
addr = of_get_property(node, "reg", &len);
|
||||
if (!addr || len < sizeof(int) || *addr > (1 << 10) - 1) {
|
||||
printk(KERN_WARNING "fsl_soc.c: invalid i2c device entry\n");
|
||||
continue;
|
||||
}
|
||||
|
||||
info.irq = irq_of_parse_and_map(node, 0);
|
||||
if (info.irq == NO_IRQ)
|
||||
info.irq = -1;
|
||||
|
||||
if (of_find_i2c_driver(node, &info) < 0)
|
||||
continue;
|
||||
|
||||
info.addr = *addr;
|
||||
|
||||
i2c_register_board_info(bus_num, &info, 1);
|
||||
}
|
||||
}
|
||||
|
||||
static int __init fsl_i2c_of_init(void)
|
||||
{
|
||||
struct device_node *np;
|
||||
unsigned int i = 0;
|
||||
struct platform_device *i2c_dev;
|
||||
int ret;
|
||||
|
||||
for_each_compatible_node(np, NULL, "fsl-i2c") {
|
||||
struct resource r[2];
|
||||
struct fsl_i2c_platform_data i2c_data;
|
||||
const unsigned char *flags = NULL;
|
||||
int idx;
|
||||
const u32 *iprop;
|
||||
|
||||
memset(&r, 0, sizeof(r));
|
||||
memset(&i2c_data, 0, sizeof(i2c_data));
|
||||
|
||||
ret = of_address_to_resource(np, 0, &r[0]);
|
||||
if (ret)
|
||||
goto err;
|
||||
|
||||
of_irq_to_resource(np, 0, &r[1]);
|
||||
|
||||
iprop = of_get_property(np, "cell-index", NULL);
|
||||
idx = iprop ? *iprop : i;
|
||||
|
||||
i2c_dev = platform_device_register_simple("fsl-i2c", idx, r, 2);
|
||||
if (IS_ERR(i2c_dev)) {
|
||||
ret = PTR_ERR(i2c_dev);
|
||||
goto err;
|
||||
}
|
||||
|
||||
i2c_data.device_flags = 0;
|
||||
flags = of_get_property(np, "dfsrr", NULL);
|
||||
if (flags)
|
||||
i2c_data.device_flags |= FSL_I2C_DEV_SEPARATE_DFSRR;
|
||||
|
||||
flags = of_get_property(np, "fsl5200-clocking", NULL);
|
||||
if (flags)
|
||||
i2c_data.device_flags |= FSL_I2C_DEV_CLOCK_5200;
|
||||
|
||||
ret =
|
||||
platform_device_add_data(i2c_dev, &i2c_data,
|
||||
sizeof(struct
|
||||
fsl_i2c_platform_data));
|
||||
if (ret)
|
||||
goto unreg;
|
||||
|
||||
of_register_i2c_devices(np, idx);
|
||||
i++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
unreg:
|
||||
platform_device_unregister(i2c_dev);
|
||||
err:
|
||||
return ret;
|
||||
}
|
||||
|
||||
arch_initcall(fsl_i2c_of_init);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PPC_83xx
|
||||
static int __init mpc83xx_wdt_init(void)
|
||||
|
Reference in New Issue
Block a user