1fc149933f
Here's the big char/misc driver patchset for 4.1-rc1. Lots of different driver subsystem updates here, nothing major, full details are in the shortlog below. All of this has been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlU2IMEACgkQMUfUDdst+yloDQCfbyIRL23WVAn9ckQse/y8gbjB OT4AoKTJbwndDP9Kb/lrj2tjd9QjNVrC =xhen -----END PGP SIGNATURE----- Merge tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc Pull char/misc driver updates from Greg KH: "Here's the big char/misc driver patchset for 4.1-rc1. Lots of different driver subsystem updates here, nothing major, full details are in the shortlog. All of this has been in linux-next for a while" * tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (133 commits) mei: trace: remove unused TRACE_SYSTEM_STRING DTS: ARM: OMAP3-N900: Add lis3lv02d support Documentation: DT: lis302: update wakeup binding lis3lv02d: DT: add wakeup unit 2 and wakeup threshold lis3lv02d: DT: use s32 to support negative values Drivers: hv: hv_balloon: correctly handle num_pages>INT_MAX case Drivers: hv: hv_balloon: correctly handle val.freeram<num_pages case mei: replace check for connection instead of transitioning mei: use mei_cl_is_connected consistently mei: fix mei_poll operation hv_vmbus: Add gradually increased delay for retries in vmbus_post_msg() Drivers: hv: hv_balloon: survive ballooning request with num_pages=0 Drivers: hv: hv_balloon: eliminate jumps in piecewiese linear floor function Drivers: hv: hv_balloon: do not online pages in offline blocks hv: remove the per-channel workqueue hv: don't schedule new works in vmbus_onoffer()/vmbus_onoffer_rescind() hv: run non-blocking message handlers in the dispatch tasklet coresight: moving to new "hwtracing" directory coresight-tmc: Adding a status interface to sysfs coresight: remove the unnecessary configuration coresight-default-sink ...
117 lines
3.5 KiB
C
117 lines
3.5 KiB
C
/*
|
|
* Copyright 2006 PathScale, Inc. All Rights Reserved.
|
|
*
|
|
* This file is free software; you can redistribute it and/or modify
|
|
* it under the terms of version 2 of the GNU General Public License
|
|
* as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
#ifndef _LINUX_IO_H
|
|
#define _LINUX_IO_H
|
|
|
|
#include <linux/types.h>
|
|
#include <asm/io.h>
|
|
#include <asm/page.h>
|
|
|
|
struct device;
|
|
|
|
__visible void __iowrite32_copy(void __iomem *to, const void *from, size_t count);
|
|
void __iowrite64_copy(void __iomem *to, const void *from, size_t count);
|
|
|
|
#ifdef CONFIG_MMU
|
|
int ioremap_page_range(unsigned long addr, unsigned long end,
|
|
phys_addr_t phys_addr, pgprot_t prot);
|
|
#else
|
|
static inline int ioremap_page_range(unsigned long addr, unsigned long end,
|
|
phys_addr_t phys_addr, pgprot_t prot)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
|
|
void __init ioremap_huge_init(void);
|
|
int arch_ioremap_pud_supported(void);
|
|
int arch_ioremap_pmd_supported(void);
|
|
#else
|
|
static inline void ioremap_huge_init(void) { }
|
|
#endif
|
|
|
|
/*
|
|
* Managed iomap interface
|
|
*/
|
|
#ifdef CONFIG_HAS_IOPORT_MAP
|
|
void __iomem * devm_ioport_map(struct device *dev, unsigned long port,
|
|
unsigned int nr);
|
|
void devm_ioport_unmap(struct device *dev, void __iomem *addr);
|
|
#else
|
|
static inline void __iomem *devm_ioport_map(struct device *dev,
|
|
unsigned long port,
|
|
unsigned int nr)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#define IOMEM_ERR_PTR(err) (__force void __iomem *)ERR_PTR(err)
|
|
|
|
void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
|
|
resource_size_t size);
|
|
void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
|
|
resource_size_t size);
|
|
void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset,
|
|
resource_size_t size);
|
|
void devm_iounmap(struct device *dev, void __iomem *addr);
|
|
int check_signature(const volatile void __iomem *io_addr,
|
|
const unsigned char *signature, int length);
|
|
void devm_ioremap_release(struct device *dev, void *res);
|
|
|
|
/*
|
|
* Some systems do not have legacy ISA devices.
|
|
* /dev/port is not a valid interface on these systems.
|
|
* So for those archs, <asm/io.h> should define the following symbol.
|
|
*/
|
|
#ifndef arch_has_dev_port
|
|
#define arch_has_dev_port() (1)
|
|
#endif
|
|
|
|
/*
|
|
* Some systems (x86 without PAT) have a somewhat reliable way to mark a
|
|
* physical address range such that uncached mappings will actually
|
|
* end up write-combining. This facility should be used in conjunction
|
|
* with pgprot_writecombine, ioremap-wc, or set_memory_wc, since it has
|
|
* no effect if the per-page mechanisms are functional.
|
|
* (On x86 without PAT, these functions manipulate MTRRs.)
|
|
*
|
|
* arch_phys_del_wc(0) or arch_phys_del_wc(any error code) is guaranteed
|
|
* to have no effect.
|
|
*/
|
|
#ifndef arch_phys_wc_add
|
|
static inline int __must_check arch_phys_wc_add(unsigned long base,
|
|
unsigned long size)
|
|
{
|
|
return 0; /* It worked (i.e. did nothing). */
|
|
}
|
|
|
|
static inline void arch_phys_wc_del(int handle)
|
|
{
|
|
}
|
|
|
|
#define arch_phys_wc_add arch_phys_wc_add
|
|
#endif
|
|
|
|
#endif /* _LINUX_IO_H */
|