Commit 3fb561b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MIPS updates from Thomas Bogendoerfer:

 - add support for more BCM47XX based devices

 - add MIPS support for brcmstb PCIe controller

 - add Loongson 2K1000 reset driver

 - remove board support for rbtx4938/rbtx4939

 - remove support for TX4939 SoCs

 - fixes and cleanups

* tag 'mips_5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (59 commits)
  MIPS: ath79: drop _machine_restart again
  PCI: brcmstb: Augment driver for MIPs SOCs
  MIPS: bmips: Remove obsolete DMA mapping support
  MIPS: bmips: Add support PCIe controller device nodes
  dt-bindings: PCI: Add compatible string for Brcmstb 74[23]5 MIPs SOCs
  MIPS: compressed: Fix build with ZSTD compression
  MIPS: BCM47XX: Add support for Netgear WN2500RP v1 & v2
  MIPS: BCM47XX: Add support for Netgear R6300 v1
  MIPS: BCM47XX: Add LEDs and buttons for Asus RTN-10U
  MIPS: BCM47XX: Add board entry for Linksys WRT320N v1
  MIPS: BCM47XX: Define Linksys WRT310N V2 buttons
  MIPS: Remove duplicated include in local.h
  MIPS: retire "asm/llsc.h"
  MIPS: rework local_t operation on MIPS64
  MIPS: fix local_{add,sub}_return on MIPS64
  mips/pci: remove redundant ret variable
  MIPS: Loongson64: Add missing of_node_put() in ls2k_reset_init()
  MIPS: new Kconfig option ZBOOT_LOAD_ADDRESS
  MIPS: enable both vmlinux.gz.itb and vmlinuz for generic
  MIPS: signal: Return immediately if call fails
  ...
parents 3ceff4ea d3115128

Documentation/devicetree/bindings/mips/loongson/ls2k-reset.yaml

0 → 100644
+38 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: "http://devicetree.org/schemas/mips/loongson/ls2k-reset.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"



title: Loongson 2K1000 PM Controller



maintainers:

  - Qing Zhang <zhangqing@loongson.cn>



description: |

  This controller can be found in Loongson-2K1000 Soc systems.



properties:

  compatible:

    const: loongson,ls2k-pm



  reg:

    maxItems: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    bus {

        #address-cells = <2>;

        #size-cells = <2>;

        pm: reset-controller@1fe07000 {

            compatible = "loongson,ls2k-pm";

            reg = <0 0x1fe07000 0 0x422>;

        };

    };

...

Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ properties: 
          - brcm,bcm7278-pcie # Broadcom 7278 Arm

          - brcm,bcm7216-pcie # Broadcom 7216 Arm

          - brcm,bcm7445-pcie # Broadcom 7445 Arm

          - brcm,bcm7425-pcie # Broadcom 7425 MIPs

          - brcm,bcm7435-pcie # Broadcom 7435 MIPs



  reg:

    maxItems: 1

arch/mips/Kconfig

+15 −7
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ config BMIPS_GENERIC 
	bool "Broadcom Generic BMIPS kernel"

	select ARCH_HAS_RESET_CONTROLLER

	select ARCH_HAS_SYNC_DMA_FOR_CPU_ALL

	select ARCH_HAS_PHYS_TO_DMA

	select BOOT_RAW

	select NO_EXCEPT_FILL

	select USE_OF
@@ -640,9 +639,6 @@ config MACH_REALTEK_RTL 
	select SYS_SUPPORTS_MIPS16

	select SYS_SUPPORTS_MULTITHREADING

	select SYS_SUPPORTS_VPE_LOADER

	select SYS_HAS_EARLY_PRINTK

	select SYS_HAS_EARLY_PRINTK_8250

	select USE_GENERIC_EARLY_PRINTK_8250

	select BOOT_RAW

	select PINCTRL

	select USE_OF
@@ -765,7 +761,6 @@ config SGI_IP30 
	select HAVE_PCI

	select IRQ_MIPS_CPU

	select IRQ_DOMAIN_HIERARCHY

	select NR_CPUS_DEFAULT_2

	select PCI_DRIVERS_GENERIC

	select PCI_XTALK_BRIDGE

	select SYS_HAS_EARLY_PRINTK
@@ -1611,7 +1606,6 @@ config CPU_R4300 
	depends on SYS_HAS_CPU_R4300

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_HAS_LOAD_STORE_LR

	help

	  MIPS Technologies R4300-series processors.
@@ -1907,6 +1901,10 @@ config SYS_HAS_CPU_MIPS64_R1 
config SYS_HAS_CPU_MIPS64_R2

	bool



config SYS_HAS_CPU_MIPS64_R5

	bool

	select ARCH_HAS_SYNC_DMA_FOR_CPU if DMA_NONCOHERENT



config SYS_HAS_CPU_MIPS64_R6

	bool

	select ARCH_HAS_SYNC_DMA_FOR_CPU if DMA_NONCOHERENT
@@ -2065,7 +2063,7 @@ config CPU_SUPPORTS_ADDRWINCFG 
	bool

config CPU_SUPPORTS_HUGEPAGES

	bool

	depends on !(32BIT && (ARCH_PHYS_ADDR_T_64BIT || EVA))

	depends on !(32BIT && (PHYS_ADDR_T_64BIT || EVA))

config MIPS_PGD_C0_CONTEXT

	bool

	depends on 64BIT
@@ -2116,6 +2114,16 @@ config MIPS_VA_BITS_48 


	  If unsure, say N.



config ZBOOT_LOAD_ADDRESS

	hex "Compressed kernel load address"

	default 0xffffffff80400000 if BCM47XX

	default 0x0

	depends on SYS_SUPPORTS_ZBOOT

	help

	  The address to load compressed kernel, aka vmlinuz.



	  This is only used if non-zero.



choice

	prompt "Kernel page size"

	default PAGE_SIZE_4KB

arch/mips/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -253,9 +253,7 @@ endif 
#

# Board-dependent options and extra files

#

ifdef need-compiler

include $(srctree)/arch/mips/Kbuild.platforms

endif



ifdef CONFIG_PHYSICAL_START

load-y					= $(CONFIG_PHYSICAL_START)

arch/mips/alchemy/common/gpiolib.c

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
 *  675 Mass Ave, Cambridge, MA 02139, USA.

 *

 *  Notes :

 *	This file must ONLY be built when CONFIG_GPIOLIB=y and

 *	 CONFIG_ALCHEMY_GPIO_INDIRECT=n, otherwise compilation will fail!

 *	au1000 SoC have only one GPIO block : GPIO1

 *	Au1100, Au15x0, Au12x0 have a second one : GPIO2

 *	Au1300 is totally different: 1 block with up to 128 GPIOs