mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-16 10:25:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'mips_5.2_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Browse Source 
Pull a few more MIPS updates from Paul Burton:
 "Some SGI IP27 specific PCI rework and a batch of fixes:

   - A build fix for BMIPS5000 configurations with
     CONFIG_HW_PERF_EVENTS=y, which also neatly removes some #ifdefery.

   - A fix to report supported ISAs correctly on older Ingenic SoCs
     which incorrectly indicate MIPSr2 support in their cop0 Config
     register.

   - Some PCI modernization for SGI IP27 systems as part of ongoing work
     to support some other SGI systems.

   - A fix allowing use of appended DTB files with generic kernels.

   - DMA mask fixes for SGI IP22 & Alchemy systems"

* tag 'mips_5.2_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Alchemy: add DMA masks for on-chip ethernet
  MIPS: SGI-IP22: provide missing dma_mask/coherent_dma_mask
  generic: fix appended dtb support
  MIPS: SGI-IP27: abstract chipset irq from bridge
  MIPS: SGI-IP27: use generic PCI driver
  MIPS: Fix Ingenic SoCs sometimes reporting wrong ISA
  MIPS: perf: Fix build with CONFIG_CPU_BMIPS5000 enabled
This commit is contained in:
Linus Torvalds
2019-05-19 10:05:28 -07:00
parent b0bb1269b9 b1e479e3dc
commit bcd1739788
18 changed files with 831 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/linux/platform_data/xtalk-bridge.h Normal file
View File

@@ -0,0 +1,22 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* SGI PCI Xtalk Bridge
*/
#ifndef PLATFORM_DATA_XTALK_BRIDGE_H
#define PLATFORM_DATA_XTALK_BRIDGE_H
#include <asm/sn/types.h>
struct xtalk_bridge_platform_data {
struct resource mem;
struct resource io;
unsigned long bridge_addr;
unsigned long intr_addr;
unsigned long mem_offset;
unsigned long io_offset;
nasid_t nasid;
int masterwid;
};
#endif /* PLATFORM_DATA_XTALK_BRIDGE_H */