Commit d6742212 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MIPS updates from Thomas Bogendoerfer:

 - converted Pistachio platform to use MIPS generic kernel

 - fixes and cleanups

* tag 'mips_5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (29 commits)
  MIPS: Malta: fix alignment of the devicetree buffer
  MIPS: ingenic: Unconditionally enable clock of CPU #0
  MIPS: mscc: ocelot: mark the phy-mode for internal PHY ports
  MIPS: mscc: ocelot: disable all switch ports by default
  MAINTAINERS: adjust PISTACHIO SOC SUPPORT after its retirement
  MIPS: Return true/false (not 1/0) from bool functions
  MIPS: generic: Return true/false (not 1/0) from bool functions
  MIPS: Make a alias for pistachio_defconfig
  MIPS: Retire MACH_PISTACHIO
  MIPS: config: generic: Add config for Marduk board
  pinctrl: pistachio: Make it as an option
  phy: pistachio-usb: Depend on MIPS || COMPILE_TEST
  clocksource/drivers/pistachio: Make it selectable for MIPS
  clk: pistachio: Make it selectable for generic MIPS kernel
  MIPS: DTS: Pistachio add missing cpc and cdmm
  MIPS: generic: Allow generating FIT image for Marduk board
  MIPS: locking/atomic: Fix atomic{_64,}_sub_if_positive
  MIPS: loongson2ef: don't build serial.o unconditionally
  MIPS: Replace deprecated CPU-hotplug functions.
  MIPS: Alchemy: Fix spelling contraction "cant" -> "can't"
  ...
parents 603eefda bea6a94a

MAINTAINERS

+1 −9
Original line number Diff line number Diff line
@@ -11120,7 +11120,7 @@ MARDUK (CREATOR CI40) DEVICE TREE SUPPORT 
M:	Rahul Bedarkar <rahulbedarkar89@gmail.com>

L:	linux-mips@vger.kernel.org

S:	Maintained

F:	arch/mips/boot/dts/img/pistachio_marduk.dts

F:	arch/mips/boot/dts/img/pistachio*









MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER









M:	Andrew Lunn <andrew@lunn.ch>








@@ -14824,14 +14824,6 @@ S:	Maintained







W:	http://www.st.com/spear









F:	drivers/pinctrl/spear/

















PISTACHIO SOC SUPPORT









M:	James Hartley <james.hartley@sondrel.com>









L:	linux-mips@vger.kernel.org









S:	Odd Fixes









F:	arch/mips/boot/dts/img/pistachio*









F:	arch/mips/configs/pistachio*_defconfig









F:	arch/mips/pistachio/

















PKTCDVD DRIVER









M:	linux-block@vger.kernel.org









S:	Orphan
































arch/mips/Kbuild.platforms



+0
−1






























Original line number
Diff line number
Diff line







@@ -21,7 +21,6 @@ platform-$(CONFIG_MIPS_MALTA)		+= mti-malta/







platform-$(CONFIG_MACH_NINTENDO64)	+= n64/









platform-$(CONFIG_NLM_COMMON)		+= netlogic/









platform-$(CONFIG_PIC32MZDA)		+= pic32/









platform-$(CONFIG_MACH_PISTACHIO)	+= pistachio/









platform-$(CONFIG_RALINK)		+= ralink/









platform-$(CONFIG_MIKROTIK_RB532)	+= rb532/









platform-$(CONFIG_SGI_IP22)		+= sgi-ip22/
































arch/mips/Kconfig



+0
−30






























Original line number
Diff line number
Diff line







@@ -514,35 +514,6 @@ config MACH_LOONGSON64







	  and Loongson-2F which will be removed), developed by the Institute









	  of Computing Technology (ICT), Chinese Academy of Sciences (CAS).



















config MACH_PISTACHIO









	bool "IMG Pistachio SoC based boards"









	select BOOT_ELF32









	select BOOT_RAW









	select CEVT_R4K









	select CLKSRC_MIPS_GIC









	select COMMON_CLK









	select CSRC_R4K









	select DMA_NONCOHERENT









	select GPIOLIB









	select IRQ_MIPS_CPU









	select MFD_SYSCON









	select MIPS_CPU_SCACHE









	select MIPS_GIC









	select PINCTRL









	select REGULATOR









	select SYS_HAS_CPU_MIPS32_R2









	select SYS_SUPPORTS_32BIT_KERNEL









	select SYS_SUPPORTS_LITTLE_ENDIAN









	select SYS_SUPPORTS_MIPS_CPS









	select SYS_SUPPORTS_MULTITHREADING









	select SYS_SUPPORTS_RELOCATABLE









	select SYS_SUPPORTS_ZBOOT









	select SYS_HAS_EARLY_PRINTK









	select USE_GENERIC_EARLY_PRINTK_8250









	select USE_OF









	help









	  This enables support for the IMG Pistachio SoC platform.



















config MIPS_MALTA









	bool "MIPS Malta board"









	select ARCH_MAY_HAVE_PC_FDC








@@ -1089,7 +1060,6 @@ source "arch/mips/ingenic/Kconfig"







source "arch/mips/jazz/Kconfig"









source "arch/mips/lantiq/Kconfig"









source "arch/mips/pic32/Kconfig"









source "arch/mips/pistachio/Kconfig"









source "arch/mips/ralink/Kconfig"









source "arch/mips/sgi-ip27/Kconfig"









source "arch/mips/sibyte/Kconfig"
































arch/mips/Makefile



+3
−0






























Original line number
Diff line number
Diff line







@@ -560,6 +560,9 @@ sead3micro_defconfig-y		:= micro32r2el_defconfig BOARDS=sead-3







legacy_defconfigs		+= xilfpga_defconfig









xilfpga_defconfig-y		:= 32r2el_defconfig BOARDS=xilfpga



















legacy_defconfigs		+= pistachio_defconfig









pistachio_defconfig-y		:= 32r2el_defconfig BOARDS=marduk



















.PHONY: $(legacy_defconfigs)









$(legacy_defconfigs):









	$(Q)$(MAKE) -f $(srctree)/Makefile $($@-y)
























arch/mips/alchemy/devboards/db1200.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -835,7 +835,7 @@ int __init db1200_dev_setup(void)







	if (!IS_ERR(c)) {









		pfc = clk_round_rate(c, 50000000);









		if ((pfc < 1) || (abs(50000000 - pfc) > 2500000))









			pr_warn("DB1200: cant get I2C close to 50MHz\n");









			pr_warn("DB1200: can't get I2C close to 50MHz\n");









		else









			clk_set_rate(c, pfc);









		clk_prepare_enable(c);