#ifndef _VME_BRIDGE_H_ #define _VME_BRIDGE_H_ #include <linux/vme.h> #define VME_CRCSR_BUF_SIZE (508*1024) /* * Resource structures */ struct vme_master_resource { struct list_head list; struct vme_bridge *parent; /* * We are likely to need to access the VME bus in interrupt context, so * protect master routines with a spinlock rather than a mutex. */ spinlock_t lock; int locked; int number; u32 address_attr; u32 cycle_attr; u32 width_attr; struct resource bus_resource; void __iomem *kern_base; }; struct vme_slave_resource { struct list_head list; struct vme_bridge *parent; struct mutex mtx; int locked; int number; u32 address_attr; u32 cycle_attr; }; struct vme_dma_pattern { u32 pattern; u32 type; }; struct vme_dma_pci { dma_addr_t address; }; struct vme_dma_vme { unsigned long long address; u32 aspace; u32 cycle; u32 dwidth; }; struct vme_dma_list { struct list_head list; struct vme_dma_resource *parent; struct list_head entries; struct mutex mtx; }; struct vme_dma_resource { struct list_head list; struct vme_bridge *parent; struct mutex mtx; int locked; int number; struct list_head pending; struct list_head running; u32 route_attr; }; struct vme_lm_resource { struct list_head list; struct vme_bridge *parent; struct mutex mtx; int locked; int number; int monitors; }; struct vme_error_handler { struct list_head list; unsigned long long start; /* Beginning of error window */ unsigned long long end; /* End of error window */ unsigned long long first_error; /* Address of the first error */ u32 aspace; /* Address space of error window*/ unsigned num_errors; /* Number of errors */ }; struct vme_callback { void (*func)(int, int, void*); void *priv_data; }; struct vme_irq { int count; struct vme_callback callback[VME_NUM_STATUSID]; }; /* Allow 16 characters for name (including null character) */ #define VMENAMSIZ 16 /* This structure stores all the information about one bridge * The structure should be dynamically allocated by the driver and one instance * of the structure should be present for each VME chip present in the system. */ struct vme_bridge { char name[VMENAMSIZ]; int num; struct list_head master_resources; struct list_head slave_resources; struct list_head dma_resources; struct list_head lm_resources; /* List for registered errors handlers */ struct list_head vme_error_handlers; /* List of devices on this bridge */ struct list_head devices; /* Bridge Info - XXX Move to private structure? */ struct device *parent; /* Parent device (eg. pdev->dev for PCI) */ void *driver_priv; /* Private pointer for the bridge driver */ struct list_head bus_list; /* list of VME buses */ /* Interrupt callbacks */ struct vme_irq irq[7]; /* Locking for VME irq callback configuration */ struct mutex irq_mtx; /* Slave Functions */ int (*slave_get) (struct vme_slave_resource *, int *, unsigned long long *, unsigned long long *, dma_addr_t *, u32 *, u32 *); int (*slave_set) (struct vme_slave_resource *, int, unsigned long long, unsigned long long, dma_addr_t, u32, u32); /* Master Functions */ int (*master_get) (struct vme_master_resource *, int *, unsigned long long *, unsigned long long *, u32 *, u32 *, u32 *); int (*master_set) (struct vme_master_resource *, int, unsigned long long, unsigned long long, u32, u32, u32); ssize_t (*master_read) (struct vme_master_resource *, void *, size_t, loff_t); ssize_t (*master_write) (struct vme_master_resource *, void *, size_t, loff_t); unsigned int (*master_rmw) (struct vme_master_resource *, unsigned int, unsigned int, unsigned int, loff_t); /* DMA Functions */ int (*dma_list_add) (struct vme_dma_list *, struct vme_dma_attr *, struct vme_dma_attr *, size_t); int (*dma_list_exec) (struct vme_dma_list *); int (*dma_list_empty) (struct vme_dma_list *); /* Interrupt Functions */ void (*irq_set) (struct vme_bridge *, int, int, int); int (*irq_generate) (struct vme_bridge *, int, int); /* Location monitor functions */ int (*lm_set) (struct vme_lm_resource *, unsigned long long, u32, u32); int (*lm_get) (struct vme_lm_resource *, unsigned long long *, u32 *, u32 *); int (*lm_attach) (struct vme_lm_resource *, int, void (*callback)(int)); int (*lm_detach) (struct vme_lm_resource *, int); /* CR/CSR space functions */ int (*slot_get) (struct vme_bridge *); /* Bridge parent interface */ void *(*alloc_consistent)(struct device *dev, size_t size, dma_addr_t *dma); void (*free_consistent)(struct device *dev, size_t size, void *vaddr, dma_addr_t dma); }; void vme_bus_error_handler(struct vme_bridge *bridge, unsigned long long address, int am); void vme_irq_handler(struct vme_bridge *, int, int); struct vme_bridge *vme_init_bridge(struct vme_bridge *); int vme_register_bridge(struct vme_bridge *); void vme_unregister_bridge(struct vme_bridge *); struct vme_error_handler *vme_register_error_handler( struct vme_bridge *bridge, u32 aspace, unsigned long long address, size_t len); void vme_unregister_error_handler(struct vme_error_handler *handler); #endif /* _VME_BRIDGE_H_ */ m.com></td><td class='right'>2017-01-25 19:30:09 +0000</td></tr> <tr><th>committer</th><td>Mark Brown <broonie@kernel.org></td><td class='right'>2017-01-25 21:05:37 +0000</td></tr> <tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/include/uapi/mtd/Kbuild?h=nds-private-remove&id=1372cef1c697d8aac0cc923f8aa2c37d790ec9ed'>1372cef1c697d8aac0cc923f8aa2c37d790ec9ed</a> (<a href='/cgit.cgi/linux/net-next.git/patch/include/uapi/mtd/Kbuild?id=1372cef1c697d8aac0cc923f8aa2c37d790ec9ed'>patch</a>)</td></tr> <tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?h=nds-private-remove&id=1372cef1c697d8aac0cc923f8aa2c37d790ec9ed'>ed5f350cd559bc15ae370f0c9fd280204e98597d</a> /<a href='/cgit.cgi/linux/net-next.git/tree/include/uapi/mtd/Kbuild?h=nds-private-remove&id=1372cef1c697d8aac0cc923f8aa2c37d790ec9ed'>include/uapi/mtd/Kbuild</a></td></tr> <tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/include/uapi/mtd/Kbuild?h=nds-private-remove&id=d00b74613fb18dfd0a5aa99270ee2e72d5c808d7'>d00b74613fb18dfd0a5aa99270ee2e72d5c808d7</a> (<a href='/cgit.cgi/linux/net-next.git/diff/include/uapi/mtd/Kbuild?h=nds-private-remove&id=1372cef1c697d8aac0cc923f8aa2c37d790ec9ed&id2=d00b74613fb18dfd0a5aa99270ee2e72d5c808d7'>diff</a>)</td></tr></table> <div class='commit-subject'>regulator: fixed: Revert support for ACPI interface</div><div class='commit-msg'>This reverts commit 13bed58ce874 (regulator: fixed: add support for ACPI interface). While there does appear to be a practical need to manage regulators on ACPI systems, using ad-hoc properties to describe regulators to the kernel presents a number of problems (especially should ACPI gain first class support for such things), and there are ongoing discussions as to how to manage this. Until there is a rough consensus, revert commit 13bed58ce8748d43, which hasn't been in a released kernel yet as discussed in [1] and the surrounding thread. [1] http://lkml.kernel.org/r/20170125184949.x2wkoo7kbaaajkjk@sirena.org.uk Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Lu Baolu <baolu.lu@linux.intel.com> Cc: Mark Brown <broonie@kernel.org> Cc: Rafael J. Wysocki <rafael@kernel.org> Cc: linux-kernel@vger.kernel.org Signed-off-by: Mark Brown <broonie@kernel.org> </div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?h=nds-private-remove&id=1372cef1c697d8aac0cc923f8aa2c37d790ec9ed'>Diffstat</a> (limited to 'include/uapi/mtd/Kbuild')</div><table summary='diffstat' class='diffstat'>