/* * i2sbus driver -- bus control routines * * Copyright 2006 Johannes Berg * * GPL v2, can be found in COPYING. */ #include #include #include #include #include #include #include #include #include #include "i2sbus.h" int i2sbus_control_init(struct macio_dev* dev, struct i2sbus_control **c) { *c = kzalloc(sizeof(struct i2sbus_control), GFP_KERNEL); if (!*c) return -ENOMEM; INIT_LIST_HEAD(&(*c)->list); (*c)->macio = dev->bus->chip; return 0; } void i2sbus_control_destroy(struct i2sbus_control *c) { kfree(c); } /* this is serialised externally */ int i2sbus_control_add_dev(struct i2sbus_control *c, struct i2sbus_dev *i2sdev) { struct device_node *np; np = i2sdev->sound.ofdev.dev.of_node; i2sdev->enable = pmf_find_function(np, "enable"); i2sdev->cell_enable = pmf_find_function(np, "cell-enable"); i2sdev->clock_enable = pmf_find_function(np, "clock-enable"); i2sdev->cell_disable = pmf_find_function(np, "cell-disable"); i2sdev->clock_disable = pmf_find_function(np, "clock-disable"); /* if the bus number is not 0 or 1 we absolutely need to use * the platform functions -- there's nothing in Darwin that * would allow seeing a system behind what the FCRs are then, * and I don't want to go parsing a bunch of platform functions * by hand to try finding a system... */ if (i2sdev->bus_number != 0 && i2sdev->bus_number != 1 && (!i2sdev->enable || !i2sdev->cell_enable || !i2sdev->clock_enable || !i2sdev->cell_disable || !i2sdev->clock_disable)) { pmf_put_function(i2sdev->enable); pmf_put_function(i2sdev->cell_enable); pmf_put_function(i2sdev->clock_enable); pmf_put_function(i2sdev->cell_disable); pmf_put_function(i2sdev->clock_disable); return -ENODEV; } list_add(&i2sdev->item, &c->list); return 0; } void i2sbus_control_remove_dev(struct i2sbus_control *c, struct i2sbus_dev *i2sdev) { /* this is serialised externally */ list_del(&i2sdev->item); if (list_empty(&c->list)) i2sbus_control_destroy(c); } int i2sbus_control_enable(struct i2sbus_control *c, struct i2sbus_dev *i2sdev) { struct pmf_args args = { .count = 0 }; struct macio_chip *macio = c->macio; if (i2sdev->enable) return pmf_call_one(i2sdev->enable, &args); if (macio == NULL || macio->base == NULL) return -ENODEV; switch (i2sdev->bus_number) { case 0: /* these need to be locked or done through * newly created feature calls! */ MACIO_BIS(KEYLARGO_FCR1, KL1_I2S0_ENABLE); break; case 1: MACIO_BIS(KEYLARGO_FCR1, KL1_I2S1_ENABLE); break; default: return -ENODEV; } return 0; } int i2sbus_control_cell(struct i2sbus_control *c, struct i2sbus_dev *i2sdev, int enable) { struct pmf_args args = { .count = 0 }; struct macio_chip *macio = c->macio; switch (enable) { case 0: if (i2sdev->cell_disable) return pmf_call_one(i2sdev->cell_disable, &args); break; case 1: if (i2sdev->cell_enable) return pmf_call_one(i2sdev->cell_enable, &args); break; default: printk(KERN_ERR "i2sbus: INVALID CELL ENABLE VALUE\n"); return -ENODEV; } if (macio == NULL || macio->base == NULL) return -ENODEV; switch (i2sdev->bus_number) { case 0: if (enable) MACIO_BIS(KEYLARGO_FCR1, KL1_I2S0_CELL_ENABLE); else MACIO_BIC(KEYLARGO_FCR1, KL1_I2S0_CELL_ENABLE); break; case 1: if (enable) MACIO_BIS(KEYLARGO_FCR1, KL1_I2S1_CELL_ENABLE); else MACIO_BIC(KEYLARGO_FCR1, KL1_I2S1_CELL_ENABLE); break; default: return -ENODEV; } return 0; } int i2sbus_control_clock(struct i2sbus_control *c, struct i2sbus_dev *i2sdev, int enable) { struct pmf_args args = { .count = 0 }; struct macio_chip *macio = c->macio; switch (enable) { case 0: if (i2sdev->clock_disable) return pmf_call_one(i2sdev->clock_disable, &args); break; case 1: if (i2sdev->clock_enable) return pmf_call_one(i2sdev->clock_enable, &args); break; default: printk(KERN_ERR "i2sbus: INVALID CLOCK ENABLE VALUE\n"); return -ENODEV; } if (macio == NULL || macio->base == NULL) return -ENODEV; switch (i2sdev->bus_number) { case 0: if (enable) MACIO_BIS(KEYLARGO_FCR1, KL1_I2S0_CLK_ENABLE_BIT); else MACIO_BIC(KEYLARGO_FCR1, KL1_I2S0_CLK_ENABLE_BIT); break; case 1: if (enable) MACIO_BIS(KEYLARGO_FCR1, KL1_I2S1_CLK_ENABLE_BIT); else MACIO_BIC(KEYLARGO_FCR1, KL1_I2S1_CLK_ENABLE_BIT); break; default: return -ENODEV; } return 0; } 18e99a9993fbcdda0abac09b (patch) tree1a70cb13dcfa7ade4c48d8a64d20543abebfb1dc /net parent62e13097c46c69dbd7544ab2cd585ccf48f360a4 (diff)parent6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/can/af_can.c12
-rw-r--r--net/can/af_can.h3
-rw-r--r--net/can/bcm.c27
-rw-r--r--net/can/gw.c2
-rw-r--r--net/can/raw.c4
-rw-r--r--net/ipv4/tcp_output.c6
-rw-r--r--net/ipv6/ip6_output.c2
-rw-r--r--net/ipv6/ip6_tunnel.c2
-rw-r--r--net/sched/cls_flower.c4
-rw-r--r--net/sched/cls_matchall.c129
-rw-r--r--net/sunrpc/clnt.c5
-rw-r--r--net/sunrpc/sunrpc_syms.c1
12 files changed, 93 insertions, 104 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c