Pull MIPS updates from Ralf Baechle: "These are the highlists of the main MIPS pull request for 4.4: - Add latencytop support - Support appended DTBs - VDSO support and initially use it for gettimeofday. - Drop the .MIPS.abiflags and ELF NOTE sections from vmlinux - Support for the 5KE, an internal test core. - Switch all MIPS platfroms to libata drivers. - Improved support, cleanups for ralink and Lantiq platforms. - Support for the new xilfpga platform. - A number of DTB improvments for BMIPS. - Improved support for CM and CPS. - Minor JZ4740 and BCM47xx enhancements" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (120 commits) MIPS: idle: add case for CPU_5KE MIPS: Octeon: Support APPENDED_DTB MIPS: vmlinux: create a section for appended DTB MIPS: Clean up compat_siginfo_t MIPS: Fix PAGE_MASK definition MIPS: BMIPS: Enable GZIP ramdisk and timed printks MIPS: Add xilfpga defconfig MIPS: xilfpga: Add mipsfpga platform code MIPS: xilfpga: Add xilfpga device tree files. dt-bindings: MIPS: Document xilfpga bindings and boot style MIPS: Make MIPS_CMDLINE_DTB default MIPS: Make the kernel arguments from dtb available MIPS: Use USE_OF as the guard for appended dtb MIPS: BCM63XX: Use pr_* instead of printk MIPS: Loongson: Cleanup CONFIG_LOONGSON_SUSPEND. MIPS: lantiq: Disable xbar fpi burst mode MIPS: lantiq: Force the crossbar to big endian MIPS: lantiq: Initialize the USB core on boot MIPS: lantiq: Return correct value for fpi clock on ar9 MIPS: ralink: Add missing clock on rt305x ...
Showing the changes to include (1 of 151 files). Show all
Unified · Split
| @@ -9,6 +9,7 @@ · 8 unmodified lines | ||
| 9 | 9 | #define __LINUX_IRQCHIP_MIPS_GIC_H |
| 10 | 10 | |
| 11 | 11 | #include <linux/clocksource.h> |
| 12 | +#include <linux/ioport.h> | |
| 12 | 13 | |
| 13 | 14 | #define GIC_MAX_INTRS 256 |
| 14 | 15 | |
| @@ -245,6 +246,8 @@ · 230 unmodified lines | ||
| 245 | 246 | #define GIC_SHARED_TO_HWIRQ(x) (GIC_SHARED_HWIRQ_BASE + (x)) |
| 246 | 247 | #define GIC_HWIRQ_TO_SHARED(x) ((x) - GIC_SHARED_HWIRQ_BASE) |
| 247 | 248 | |
| 249 | +#ifdef CONFIG_MIPS_GIC | |
| 250 | + | |
| 248 | 251 | extern unsigned int gic_present; |
| 249 | 252 | |
| 250 | 253 | extern void gic_init(unsigned long gic_base_addr, |
| @@ -264,4 +267,18 @@ extern unsigned int plat_ipi_resched_int_xlate(unsigned int); · 13 unmodified lines | ||
| 264 | 267 | extern int gic_get_c0_compare_int(void); |
| 265 | 268 | extern int gic_get_c0_perfcount_int(void); |
| 266 | 269 | extern int gic_get_c0_fdc_int(void); |
| 270 | +extern int gic_get_usm_range(struct resource *gic_usm_res); | |
| 271 | + | |
| 272 | +#else /* CONFIG_MIPS_GIC */ | |
| 273 | + | |
| 274 | +#define gic_present 0 | |
| 275 | + | |
| 276 | +static inline int gic_get_usm_range(struct resource *gic_usm_res) | |
| 277 | +{ | |
| 278 | + /* Shouldn't be called. */ | |
| 279 | + return -1; | |
| 280 | +} | |
| 281 | + | |
| 282 | +#endif /* CONFIG_MIPS_GIC */ | |
| 283 | + | |
| 267 | 284 | #endif /* __LINUX_IRQCHIP_MIPS_GIC_H */ |