Commit 6086f349 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS updates from Thomas Bogendoerfer:
 "Cleanups and fixes"

* tag 'mips_7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (28 commits)
  Revert "clk: microchip: core: allow driver to be compiled with COMPILE_TEST"
  Revert "clk: microchip: fix typo in reference to a config option"
  MIPS: Implement ARCH_HAS_CC_CAN_LINK
  MIPS: rb532: Fix MMIO UART resource registration
  MIPS: Work around LLVM bug when gp is used as global register variable
  MIPS: Loongson64: env: Fixup serial clock-frequency when using LEFI
  MIPS: Loongson2ef: Use pcibios_align_resource() to block io range
  MIPS: Loongson2ef: Register PCI controller in early stage
  clk: microchip: fix typo in reference to a config option
  MIPS: Loongson64: dts: fix phy-related definition of LS7A GMAC
  clk: microchip: core: allow driver to be compiled with COMPILE_TEST
  MIPS: drop unused pic32.h header
  watchdog: pic32-wdt: update include to use pic32.h from platform_data
  watchdog: pic32-dmt: update include to use pic32.h from platform_data
  serial: pic32_uart: update include to use pic32.h from platform_data
  rtc: pic32: update include to use pic32.h from platform_data
  pinctrl: pic32: update include to use pic32.h from platform_data
  mmc: sdhci-pic32: update include to use pic32.h from platform_data
  irqchip/irq-pic32-evic: update include to use pic32.h from platform_data
  clk: microchip: core: update include to use pic32.h from platform_data
  ...
parents 2d10a488 720452a6

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -17611,6 +17611,7 @@ F: Documentation/arch/mips/ 
F:	arch/mips/

F:	drivers/platform/mips/

F:	include/dt-bindings/mips/

F:	include/linux/platform_data/pic32.h









MIPS BOSTON DEVELOPMENT BOARD









M:	Paul Burton <paulburton@kernel.org>

























arch/mips/Kconfig



+28
−1






























Original line number
Diff line number
Diff line







@@ -4,6 +4,7 @@ config MIPS







	default y









	select ARCH_32BIT_OFF_T if !64BIT









	select ARCH_BINFMT_ELF_STATE if MIPS_FP_SUPPORT









	select ARCH_HAS_CC_CAN_LINK









	select ARCH_HAS_CPU_CACHE_ALIASING









	select ARCH_HAS_CPU_FINALIZE_INIT









	select ARCH_HAS_CURRENT_STACK_POINTER








@@ -1409,7 +1410,6 @@ config CPU_LOONGSON32







	select CPU_MIPS32









	select CPU_MIPSR2









	select CPU_HAS_PREFETCH









	select CPU_HAS_LOAD_STORE_LR









	select CPU_SUPPORTS_32BIT_KERNEL









	select CPU_SUPPORTS_HIGHMEM









	select CPU_SUPPORTS_CPUFREQ








@@ -3127,6 +3127,33 @@ config CC_HAS_MNO_BRANCH_LIKELY







config CC_HAS_BROKEN_INLINE_COMPAT_BRANCH









	def_bool y if CC_IS_CLANG



















config ARCH_CC_CAN_LINK_N32









	bool









	default $(cc_can_link_user,-mabi=n32 -EL) if MIPS32_N32 && CPU_LITTLE_ENDIAN









	default $(cc_can_link_user,-mabi=n32 -EB) if MIPS32_N32 && CPU_BIG_ENDIAN



















config ARCH_CC_CAN_LINK_N64









	bool









	default $(cc_can_link_user,-mabi=64 -EL) if 64BIT && CPU_LITTLE_ENDIAN









	default $(cc_can_link_user,-mabi=64 -EB) if 64BIT && CPU_BIG_ENDIAN



















config ARCH_CC_CAN_LINK_O32









	bool









	default $(cc_can_link_user,-mabi=32 -EL) if (32BIT || MIPS32_O32) && CPU_LITTLE_ENDIAN









	default $(cc_can_link_user,-mabi=32 -EB) if (32BIT || MIPS32_O32) && CPU_BIG_ENDIAN



















config ARCH_CC_CAN_LINK









	def_bool ARCH_CC_CAN_LINK_N32 || ARCH_CC_CAN_LINK_N64 || ARCH_CC_CAN_LINK_O32



















config ARCH_USERFLAGS









	string









	default "-mabi=n32 -EL" if ARCH_CC_CAN_LINK_N32 && CPU_LITTLE_ENDIAN









	default "-mabi=n32 -EB" if ARCH_CC_CAN_LINK_N32 && CPU_BIG_ENDIAN









	default "-mabi=64 -EL" if ARCH_CC_CAN_LINK_N64 && CPU_LITTLE_ENDIAN









	default "-mabi=64 -EB" if ARCH_CC_CAN_LINK_N64 && CPU_BIG_ENDIAN









	default "-mabi=32 -EL" if ARCH_CC_CAN_LINK_O32 && CPU_LITTLE_ENDIAN









	default "-mabi=32 -EB" if ARCH_CC_CAN_LINK_O32 && CPU_BIG_ENDIAN



















menu "Power management options"



















config ARCH_HIBERNATION_POSSIBLE
































arch/mips/boot/dts/loongson/ls7a-pch.dtsi



+4
−2






























Original line number
Diff line number
Diff line







@@ -199,7 +199,8 @@ gmac@3,0 {







					     <13 IRQ_TYPE_LEVEL_HIGH>;









				interrupt-names = "macirq", "eth_lpi";









				interrupt-parent = <&pic>;









				phy-mode = "rgmii";









				phy-mode = "rgmii-id";









				phy-handle = <&phy0>;









				mdio {









					#address-cells = <1>;









					#size-cells = <0>;








@@ -222,7 +223,8 @@ gmac@3,1 {







					     <15 IRQ_TYPE_LEVEL_HIGH>;









				interrupt-names = "macirq", "eth_lpi";









				interrupt-parent = <&pic>;









				phy-mode = "rgmii";









				phy-mode = "rgmii-id";









				phy-handle = <&phy1>;









				mdio {









					#address-cells = <1>;









					#size-cells = <0>;
































arch/mips/include/asm/mach-loongson2ef/loongson.h



+6
−0






























Original line number
Diff line number
Diff line







@@ -324,4 +324,10 @@ extern unsigned long _loongson_addrwincfg_base;

















#endif	/* ! CONFIG_CPU_SUPPORTS_ADDRWINCFG */



















#ifdef CONFIG_PCI









void loongson2ef_pcibios_init(void);









#else









static inline void loongson2ef_pcibios_init(void) { }









#endif



















#endif /* __ASM_MACH_LOONGSON2EF_LOONGSON_H */
























arch/mips/include/asm/mach-loongson64/topology.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -7,7 +7,7 @@







#define cpu_to_node(cpu)	(cpu_logical_map(cpu) >> 2)



















extern cpumask_t __node_cpumask[];









#define cpumask_of_node(node)	(&__node_cpumask[node])









#define cpumask_of_node(node)	  ((node) == NUMA_NO_NODE ? cpu_all_mask : &__node_cpumask[node])



















struct pci_bus;









extern int pcibus_to_node(struct pci_bus *);