Commit 67faad74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS updates from Thomas Bogendoerfer:

 - Added support for EcoNet platform

 - Added support for parallel CPU bring up on EyeQ

 - Other cleanups and fixes

* tag 'mips_6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (23 commits)
  MIPS: loongson2ef: lemote-2f: add missing function prototypes
  MIPS: loongson2ef: cs5536: add missing function prototypes
  MIPS: SMP: Move the AP sync point before the calibration delay
  mips: econet: Fix incorrect Kconfig dependencies
  MAINTAINERS: Add entry for newly added EcoNet platform.
  mips: dts: Add EcoNet DTS with EN751221 and SmartFiber XP8421-B board
  dt-bindings: vendor-prefixes: Add SmartFiber
  mips: Add EcoNet MIPS platform support
  dt-bindings: mips: Add EcoNet platform binding
  MIPS: bcm63xx: nvram: avoid inefficient use of crc32_le_combine()
  mips: dts: pic32: pic32mzda: Rename the sdhci nodename to match with common mmc-controller binding
  MIPS: SMP: Move the AP sync point before the non-parallel aware functions
  MIPS: Replace strcpy() with strscpy() in vpe_elfload()
  MIPS: BCM63XX: Replace strcpy() with strscpy() in board_prom_init()
  mips: ptrace: Improve code formatting and indentation
  MIPS: SMP: Implement parallel CPU bring up for EyeQ
  mips: Add -std= flag specified in KBUILD_CFLAGS to vdso CFLAGS
  MIPS: Loongson64: Add missing '#interrupt-cells' for loongson64c_ls7a
  mips: dts: realtek: Add MDIO controller
  MIPS: txx9: gpio: use new line value setter callbacks
  ...
parents e271ed52 5a0c7491

Documentation/devicetree/bindings/mips/econet.yaml

0 → 100644
+26 −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/econet.yaml#

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



title: EcoNet MIPS SoCs



maintainers:

  - Caleb James DeLisle <cjd@cjdns.fr>



properties:

  $nodename:

    const: '/'



  compatible:

    oneOf:

      - description: Boards with EcoNet EN751221 family SoC

        items:

          - enum:

              - smartfiber,xp8421-b

          - const: econet,en751221



additionalProperties: true



...

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -1406,6 +1406,8 @@ patternProperties: 
    description: SKOV A/S

  "^skyworks,.*":

    description: Skyworks Solutions, Inc.

  "^smartfiber,.*":

    description: ShenZhen Smartfiber Technology Co, Ltd.

  "^smartlabs,.*":

    description: SmartLabs LLC

  "^smartrg,.*":

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -8477,6 +8477,18 @@ W: https://linuxtv.org 
Q:	http://patchwork.linuxtv.org/project/linux-media/list/

F:	drivers/media/dvb-frontends/ec100*









ECONET MIPS PLATFORM









M:	Caleb James DeLisle <cjd@cjdns.fr>









L:	linux-mips@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/interrupt-controller/econet,en751221-intc.yaml









F:	Documentation/devicetree/bindings/mips/econet.yaml









F:	Documentation/devicetree/bindings/timer/econet,en751221-timer.yaml









F:	arch/mips/boot/dts/econet/









F:	arch/mips/econet/









F:	drivers/clocksource/timer-econet-en751221.c









F:	drivers/irqchip/irq-econet-en751221.c

















ECRYPT FILE SYSTEM









M:	Tyler Hicks <code@tyhicks.com>









L:	ecryptfs@vger.kernel.org
































arch/mips/Kbuild.platforms



+1
−0






























Original line number
Diff line number
Diff line







@@ -11,6 +11,7 @@ platform-$(CONFIG_CAVIUM_OCTEON_SOC)	+= cavium-octeon/







platform-$(CONFIG_EYEQ)			+= mobileye/









platform-$(CONFIG_MIPS_COBALT)		+= cobalt/









platform-$(CONFIG_MACH_DECSTATION)	+= dec/









platform-$(CONFIG_ECONET)		+= econet/









platform-$(CONFIG_MIPS_GENERIC)		+= generic/









platform-$(CONFIG_MACH_JAZZ)		+= jazz/









platform-$(CONFIG_LANTIQ)		+= lantiq/
































arch/mips/Kconfig



+28
−0






























Original line number
Diff line number
Diff line







@@ -391,6 +391,31 @@ config MACH_DECSTATION

















	  otherwise choose R3000.



















config ECONET









	bool "EcoNet MIPS family"









	select BOOT_RAW









	select CPU_BIG_ENDIAN









	select DEBUG_ZBOOT if DEBUG_KERNEL









	select EARLY_PRINTK_8250









	select ECONET_EN751221_TIMER









	select SERIAL_8250









	select SERIAL_OF_PLATFORM









	select SYS_SUPPORTS_BIG_ENDIAN









	select SYS_HAS_CPU_MIPS32_R1









	select SYS_HAS_CPU_MIPS32_R2









	select SYS_HAS_EARLY_PRINTK









	select SYS_SUPPORTS_32BIT_KERNEL









	select SYS_SUPPORTS_MIPS16









	select SYS_SUPPORTS_ZBOOT_UART16550









	select USE_GENERIC_EARLY_PRINTK_8250









	select USE_OF









	help









	  EcoNet EN75xx MIPS devices are big endian MIPS machines used









	  in XPON (fiber) and DSL applications. They have SPI, PCI, USB,









	  GPIO, and Ethernet, with optional XPON, DSL, and VoIP DSP cores.









	  Don't confuse these with the Airoha ARM devices sometimes referred









	  to as "EcoNet", this family is for MIPS based devices only.



















config MACH_JAZZ









	bool "Jazz family of machines"









	select ARC_MEMORY








@@ -617,6 +642,7 @@ config EYEQ







	select USB_UHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN









	select USB_UHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN









	select USE_OF









	select HOTPLUG_PARALLEL if SMP









	help









	  Select this to build a kernel supporting EyeQ SoC from Mobileye.


















@@ -1020,6 +1046,7 @@ source "arch/mips/ath79/Kconfig"







source "arch/mips/bcm47xx/Kconfig"









source "arch/mips/bcm63xx/Kconfig"









source "arch/mips/bmips/Kconfig"









source "arch/mips/econet/Kconfig"









source "arch/mips/generic/Kconfig"









source "arch/mips/ingenic/Kconfig"









source "arch/mips/jazz/Kconfig"








@@ -2287,6 +2314,7 @@ config MIPS_CPS







	select MIPS_CM









	select MIPS_CPS_PM if HOTPLUG_CPU









	select SMP









	select HOTPLUG_SMT if HOTPLUG_PARALLEL









	select HOTPLUG_CORE_SYNC_DEAD if HOTPLUG_CPU









	select SYNC_R4K if (CEVT_R4K || CSRC_R4K)









	select SYS_SUPPORTS_HOTPLUG_CPU