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

77d51337 · Linus Torvalds <[email protected]> · 2021-04-29 11:28:08 -07:00

Pull MIPS updates from Thomas Bogendoerfer:

 - removed get_fs/set_fs

 - removed broken/unmaintained MIPS KVM trap and emulate support

 - added support for Loongson-2K1000

 - fixes and cleanups

* tag 'mips_5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (107 commits)
  MIPS: BCM63XX: Use BUG_ON instead of condition followed by BUG.
  MIPS: select ARCH_KEEP_MEMBLOCK unconditionally
  mips: Do not include hi and lo in clobber list for R6
  MIPS:DTS:Correct the license for Loongson-2K
  MIPS:DTS:Fix label name and interrupt number of ohci for Loongson-2K
  MIPS: Avoid handcoded DIVU in `__div64_32' altogether
  lib/math/test_div64: Correct the spelling of "dividend"
  lib/math/test_div64: Fix error message formatting
  mips/bootinfo:correct some comments of fw_arg
  MIPS: Avoid DIVU in `__div64_32' is result would be zero
  MIPS: Reinstate platform `__div64_32' handler
  div64: Correct inline documentation for `do_div'
  lib/math: Add a `do_div' test module
  MIPS: Makefile: Replace -pg with CC_FLAGS_FTRACE
  MIPS: pci-legacy: revert "use generic pci_enable_resources"
  MIPS: Loongson64: Add kexec/kdump support
  MIPS: pci-legacy: use generic pci_enable_resources
  MIPS: pci-legacy: remove busn_resource field
  MIPS: pci-legacy: remove redundant info messages
  MIPS: pci-legacy: stop using of_pci_range_to_resource
  ...

Commit: 77d51337d650086643e1e96b8a7e1e6cbf0b09ff
Parents: 3644286f · 7e9be673

Merge commit. Changes below are compared with the first parent: 3644286f.

Changes

152 files changed · +2690 −6030

File	Status	Add	Del	Content
Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.yaml	modified	+0	−1	View file
Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml	modified	+32	−4	View file
arch/mips/Kconfig	modified	+10	−21	View file
arch/mips/Kconfig.debug	modified	+1	−0	View file
arch/mips/alchemy/common/clock.c	modified	+1	−2	View file
arch/mips/bcm63xx/clk.c	modified	+1	−1	View file
arch/mips/bcm63xx/gpio.c	modified	+3	−6	View file
arch/mips/bmips/dma.c	modified	+1	−1	View file
arch/mips/boot/compressed/Makefile	modified	+1	−1	View file
arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts	modified	+1	−1	View file
arch/mips/boot/dts/brcm/bcm3368.dtsi	modified	+4	−1	View file
arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts	modified	+1	−1	View file
arch/mips/boot/dts/brcm/bcm63268.dtsi	modified	+122	−15	View file
arch/mips/boot/dts/brcm/bcm6328.dtsi	modified	+110	−14	View file
arch/mips/boot/dts/brcm/bcm6358-neufbox4-sercomm.dts	modified	+1	−1	View file
arch/mips/boot/dts/brcm/bcm6358.dtsi	modified	+77	−12	View file
arch/mips/boot/dts/brcm/bcm6362-neufbox6-sercomm.dts	modified	+1	−1	View file
arch/mips/boot/dts/brcm/bcm6362.dtsi	modified	+122	−12	View file
arch/mips/boot/dts/brcm/bcm6368.dtsi	modified	+121	−12	View file
arch/mips/boot/dts/brcm/bcm93384wvg.dts	modified	+1	−1	View file
arch/mips/boot/dts/brcm/bcm93384wvg_viper.dts	modified	+1	−1	View file
arch/mips/boot/dts/brcm/bcm96368mvwg.dts	modified	+1	−1	View file
arch/mips/boot/dts/brcm/bcm97125cbmb.dts	modified	+1	−1	View file
arch/mips/boot/dts/brcm/bcm97346dbsmb.dts	modified	+2	−2	View file
arch/mips/boot/dts/brcm/bcm97358svmb.dts	modified	+2	−2	View file
arch/mips/boot/dts/brcm/bcm97360svmb.dts	modified	+1	−1	View file
arch/mips/boot/dts/brcm/bcm97362svmb.dts	modified	+2	−2	View file
arch/mips/boot/dts/brcm/bcm97420c.dts	modified	+1	−1	View file
arch/mips/boot/dts/brcm/bcm97425svmb.dts	modified	+2	−2	View file
arch/mips/boot/dts/brcm/bcm97435svmb.dts	modified	+2	−2	View file
arch/mips/boot/dts/brcm/bcm9ejtagprb.dts	modified	+1	−1	View file
arch/mips/boot/dts/ingenic/gcw0.dts	modified	+0	−1	View file
arch/mips/boot/dts/loongson/Makefile	modified	+1	−0	View file
arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi	added	+243	−0	View file
arch/mips/boot/dts/loongson/loongson64_2core_2k1000.dts	added	+10	−0	View file
arch/mips/cavium-octeon/oct_ilm.c	modified	+1	−1	View file
arch/mips/cavium-octeon/octeon-memcpy.S	modified	+6	−2	View file
arch/mips/configs/bigsur_defconfig	modified	+0	−4	View file
arch/mips/configs/loongson2k_defconfig	added	+353	−0	View file
arch/mips/configs/loongson3_defconfig	modified	+7	−2	View file
arch/mips/configs/malta_kvm_defconfig	modified	+0	−3	View file
arch/mips/configs/malta_kvm_guest_defconfig	deleted	+0	−436	View before deletion
arch/mips/configs/maltaup_xpa_defconfig	modified	+0	−3	View file
arch/mips/configs/rbtx49xx_defconfig	modified	+0	−3	View file
arch/mips/configs/sb1250_swarm_defconfig	modified	+9	−11	View file
arch/mips/configs/workpad_defconfig	modified	+6	−3	View file
arch/mips/crypto/.gitignore	added	+2	−0	View file
arch/mips/generic/board-boston.its.S	modified	+5	−5	View file
arch/mips/generic/board-jaguar2.its.S	modified	+8	−8	View file
arch/mips/generic/board-luton.its.S	modified	+4	−4	View file
arch/mips/generic/board-ni169445.its.S	modified	+5	−5	View file
arch/mips/generic/board-ocelot.its.S	modified	+10	−10	View file
arch/mips/generic/board-serval.its.S	modified	+4	−4	View file
arch/mips/generic/board-xilfpga.its.S	modified	+5	−5	View file
arch/mips/generic/vmlinux.its.S	modified	+5	−5	View file
arch/mips/include/asm/Kbuild	modified	+3	−4	View file
arch/mips/include/asm/asmmacro.h	modified	+1	−2	View file
arch/mips/include/asm/bootinfo.h	modified	+1	−1	View file
arch/mips/include/asm/div64.h	modified	+39	−16	View file
arch/mips/include/asm/io.h	modified	+13	−1	View file
arch/mips/include/asm/kvm_host.h	modified	+0	−238	View file
arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h	modified	+8	−0	View file
arch/mips/include/asm/mach-generic/spaces.h	modified	+0	−12	View file
arch/mips/include/asm/mach-loongson64/boot_param.h	modified	+0	−27	View file
arch/mips/include/asm/mach-loongson64/builtin_dtbs.h	modified	+1	−0	View file
arch/mips/include/asm/mach-loongson64/kernel-entry-init.h	modified	+27	−0	View file
arch/mips/include/asm/mach-loongson64/loongson.h	modified	+26	−1	View file
arch/mips/include/asm/mach-ralink/mt7621.h	modified	+4	−3	View file
arch/mips/include/asm/mips-cps.h	modified	+22	−1	View file
arch/mips/include/asm/octeon/cvmx-address.h	modified	+1	−1	View file
arch/mips/include/asm/octeon/cvmx-bootinfo.h	modified	+2	−0	View file
arch/mips/include/asm/page.h	modified	+8	−1	View file
arch/mips/include/asm/pci.h	modified	+0	−1	View file
arch/mips/include/asm/processor.h	modified	+0	−9	View file
arch/mips/include/asm/thread_info.h	modified	+0	−6	View file
arch/mips/include/asm/uaccess.h	modified	+220	−378	View file
arch/mips/include/asm/vdso/gettimeofday.h	modified	+21	−5	View file
arch/mips/kernel/Makefile	modified	+4	−4	View file
arch/mips/kernel/access-helper.h	added	+19	−0	View file
arch/mips/kernel/asm-offsets.c	modified	+0	−1	View file
arch/mips/kernel/cevt-r4k.c	modified	+0	−4	View file
arch/mips/kernel/cpu-probe.c	modified	+0	−3	View file
arch/mips/kernel/ftrace.c	modified	+0	−8	View file
arch/mips/kernel/process.c	modified	+0	−2	View file
arch/mips/kernel/relocate_kernel.S	modified	+4	−5	View file
arch/mips/kernel/scall32-o32.S	modified	+3	−5	View file
arch/mips/kernel/scall64-n32.S	modified	+1	−2	View file
arch/mips/kernel/scall64-n64.S	modified	+1	−2	View file
arch/mips/kernel/scall64-o32.S	modified	+2	−2	View file
arch/mips/kernel/smp-bmips.c	modified	+17	−10	View file
arch/mips/kernel/spinlock_test.c	modified	+4	−4	View file
arch/mips/kernel/syscalls/Makefile	modified	+10	−31	View file
arch/mips/kernel/syscalls/syscallhdr.sh	deleted	+0	−36	View before deletion
arch/mips/kernel/syscalls/syscalltbl.sh	deleted	+0	−36	View before deletion
arch/mips/kernel/traps.c	modified	+46	−59	View file
arch/mips/kernel/unaligned.c	modified	+75	−130	View file
arch/mips/kernel/vdso.c	modified	+3	−2	View file
arch/mips/kvm/Kconfig	modified	+0	−34	View file
arch/mips/kvm/Makefile	modified	+1	−6	View file
arch/mips/kvm/commpage.c	deleted	+0	−32	View before deletion
arch/mips/kvm/commpage.h	deleted	+0	−24	View before deletion
arch/mips/kvm/dyntrans.c	deleted	+0	−143	View before deletion
arch/mips/kvm/emulate.c	modified	+24	−1664	View file
arch/mips/kvm/entry.c	modified	+0	−33	View file
arch/mips/kvm/interrupt.c	modified	+2	−121	View file
arch/mips/kvm/interrupt.h	modified	+0	−20	View file
arch/mips/kvm/mips.c	modified	+2	−66	View file
arch/mips/kvm/mmu.c	modified	+0	−405	View file
arch/mips/kvm/tlb.c	modified	+0	−174	View file
arch/mips/kvm/trap_emul.c	deleted	+0	−1306	View before deletion
arch/mips/kvm/vz.c	modified	+2	−3	View file
arch/mips/lib/memcpy.S	modified	+17	−11	View file
arch/mips/lib/memset.S	modified	+0	−3	View file
arch/mips/lib/strncpy_user.S	modified	+14	−34	View file
arch/mips/lib/strnlen_user.S	modified	+12	−32	View file
arch/mips/loongson64/Makefile	modified	+1	−1	View file
arch/mips/loongson64/env.c	modified	+12	−21	View file
arch/mips/loongson64/init.c	modified	+19	−4	View file
arch/mips/loongson64/numa.c	modified	+14	−3	View file
arch/mips/loongson64/platform.c	deleted	+0	−42	View before deletion
arch/mips/loongson64/reset.c	modified	+113	−0	View file
arch/mips/loongson64/time.c	modified	+24	−0	View file
arch/mips/mm/Makefile	modified	+6	−0	View file
arch/mips/mm/maccess.c	added	+10	−0	View file
arch/mips/mm/physaddr.c	added	+56	−0	View file
arch/mips/mm/tlbex.c	modified	+5	−4	View file
arch/mips/mti-malta/Platform	modified	+1	−5	View file
arch/mips/mti-malta/malta-time.c	modified	+0	−5	View file
arch/mips/pci/pci-ar2315.c	modified	+1	−0	View file
arch/mips/pci/pci-legacy.c	modified	+10	−13	View file
arch/mips/pci/pci-mt7620.c	modified	+3	−2	View file
arch/mips/pci/pci-rt2880.c	modified	+24	−26	View file
arch/mips/pci/pci-rt3883.c	modified	+2	−8	View file
arch/mips/pci/pci-xtalk-bridge.c	modified	+1	−1	View file
arch/mips/ralink/Kconfig	modified	+1	−0	View file
arch/mips/ralink/clk.c	modified	+14	−0	View file
arch/mips/ralink/common.h	modified	+2	−1	View file
arch/mips/ralink/mt7620.c	modified	+1	−1	View file
arch/mips/ralink/mt7621.c	modified	+26	−5	View file
arch/mips/ralink/of.c	modified	+2	−0	View file
arch/mips/ralink/rt288x.c	modified	+1	−1	View file
arch/mips/ralink/rt305x.c	modified	+1	−1	View file
arch/mips/ralink/rt3883.c	modified	+1	−1	View file
arch/mips/sgi-ip27/TODO	deleted	+0	−19	View before deletion
arch/mips/sgi-ip27/ip27-timer.c	modified	+2	−2	View file
arch/mips/vdso/Makefile	modified	+2	−2	View file
drivers/firmware/broadcom/bcm47xx_nvram.c	modified	+47	−45	View file
drivers/irqchip/irq-loongson-liointc.c	modified	+50	−10	View file
include/asm-generic/div64.h	modified	+6	−4	View file
lib/Kconfig.debug	modified	+10	−0	View file
lib/math/Makefile	modified	+2	−0	View file
lib/math/test_div64.c	added	+249	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.yaml

View file

diff --git a/Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.yaml b/Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.yaml
index 6960036..c45c92a 100644
--- a/Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.yaml
+++ b/Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.yaml
@@ -47,7 +47,6 @@ examples:
 
             spi-max-frequency = <3125000>;
             spi-3wire;
-            spi-cs-high;
 
             reset-gpios = <&gpe 2 GPIO_ACTIVE_LOW>;
 

Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml

View file

diff --git a/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml b/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml
index f38e011..067165c 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml
@@ -10,9 +10,9 @@ maintainers:
   - Jiaxun Yang <[email protected]>
 
 description: |
-  This interrupt controller is found in the Loongson-3 family of chips as the primary
-  package interrupt controller which can route local I/O interrupt to interrupt lines
-  of cores.
+  This interrupt controller is found in the Loongson-3 family of chips and
+  Loongson-2K1000 chip, as the primary package interrupt controller which
+  can route local I/O interrupt to interrupt lines of cores.
 
 allOf:
   - $ref: /schemas/interrupt-controller.yaml#
@@ -22,9 +22,17 @@ properties:
     oneOf:
       - const: loongson,liointc-1.0
       - const: loongson,liointc-1.0a
+      - const: loongson,liointc-2.0
 
   reg:
-    maxItems: 1
+    minItems: 1
+    maxItems: 3
+
+  reg-names:
+    items:
+      - const: main
+      - const: isr0
+      - const: isr1
 
   interrupt-controller: true
 
@@ -69,6 +77,26 @@ required:
 
 unevaluatedProperties: false
 
+if:
+  properties:
+    compatible:
+      contains:
+        enum:
+          - loongson,liointc-2.0
+
+then:
+  properties:
+    reg:
+      minItems: 3
+
+  required:
+    - reg-names
+
+else:
+  properties:
+    reg:
+      maxItems: 1
+
 examples:
   - |
     iointc: interrupt-controller@3ff01400 {

arch/mips/Kconfig

View file

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d89efba..702648f 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -4,13 +4,15 @@ config MIPS
 	default y
 	select ARCH_32BIT_OFF_T if !64BIT
 	select ARCH_BINFMT_ELF_STATE if MIPS_FP_SUPPORT
+	select ARCH_HAS_DEBUG_VIRTUAL if !64BIT
 	select ARCH_HAS_FORTIFY_SOURCE
 	select ARCH_HAS_KCOV
+	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE if !EVA
 	select ARCH_HAS_PTE_SPECIAL if !(32BIT && CPU_HAS_RIXI)
 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
 	select ARCH_HAS_UBSAN_SANITIZE_ALL
 	select ARCH_HAS_GCOV_PROFILE_ALL
-	select ARCH_KEEP_MEMBLOCK if DEBUG_KERNEL
+	select ARCH_KEEP_MEMBLOCK
 	select ARCH_SUPPORTS_UPROBES
 	select ARCH_USE_BUILTIN_BSWAP
 	select ARCH_USE_CMPXCHG_LOCKREF if 64BIT
@@ -26,6 +28,7 @@ config MIPS
 	select GENERIC_ATOMIC64 if !64BIT
 	select GENERIC_CMOS_UPDATE
 	select GENERIC_CPU_AUTOPROBE
+	select GENERIC_FIND_FIRST_BIT
 	select GENERIC_GETTIMEOFDAY
 	select GENERIC_IOMAP
 	select GENERIC_IRQ_PROBE
@@ -91,7 +94,6 @@ config MIPS
 	select PERF_USE_VMALLOC
 	select PCI_MSI_ARCH_FALLBACKS if PCI_MSI
 	select RTC_LIB
-	select SET_FS
 	select SYSCTL_EXCEPTION_TRACE
 	select VIRT_TO_BUS
 	select ARCH_HAS_ELFCORE_COMPAT
@@ -712,6 +714,7 @@ config SGI_IP27
 	select ARC_CMDLINE_ONLY
 	select BOOT_ELF64
 	select DEFAULT_SGI_PARTITION
+	select FORCE_PCI
 	select SYS_HAS_EARLY_PRINTK
 	select HAVE_PCI
 	select IRQ_MIPS_CPU
@@ -774,6 +777,7 @@ config SGI_IP30
 	select BOOT_ELF64
 	select CEVT_R4K
 	select CSRC_R4K
+	select FORCE_PCI
 	select SYNC_R4K if SMP
 	select ZONE_DMA32
 	select HAVE_PCI
@@ -998,6 +1002,7 @@ config CAVIUM_OCTEON_SOC
 	select NR_CPUS_DEFAULT_64
 	select MIPS_NR_CPU_NR_MAP_1024
 	select BUILTIN_DTB
+	select MTD
 	select MTD_COMPLEX_MAPPINGS
 	select SWIOTLB
 	select SYS_SUPPORTS_RELOCATABLE
@@ -2118,7 +2123,7 @@ config CPU_MIPS32
 config CPU_MIPS64
 	bool
 	default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R5 || \
-		     CPU_MIPS64_R6
+		     CPU_MIPS64_R6 || CPU_LOONGSON64 || CPU_CAVIUM_OCTEON
 
 #
 # These indicate the revision of the architecture
@@ -2185,7 +2190,8 @@ config CPU_SUPPORTS_HUGEPAGES
 	depends on !(32BIT && (ARCH_PHYS_ADDR_T_64BIT || EVA))
 config MIPS_PGD_C0_CONTEXT
 	bool
-	default y if 64BIT && (CPU_MIPSR2 || CPU_MIPSR6) && !CPU_XLP
+	depends on 64BIT
+	default y if (CPU_MIPSR2 || CPU_MIPSR6) && !CPU_XLP
 
 #
 # Set to y for ptrace access to watch registers.
@@ -2219,23 +2225,6 @@ config 64BIT
 
 endchoice
 
-config KVM_GUEST
-	bool "KVM Guest Kernel"
-	depends on CPU_MIPS32_R2
-	depends on !64BIT && BROKEN_ON_SMP
-	help
-	  Select this option if building a guest kernel for KVM (Trap & Emulate)
-	  mode.
-
-config KVM_GUEST_TIMER_FREQ
-	int "Count/Compare Timer Frequency (MHz)"
-	depends on KVM_GUEST
-	default 100
-	help
-	  Set this to non-zero if building a guest kernel for KVM to skip RTC
-	  emulation when determining guest CPU Frequency. Instead, the guest's
-	  timer frequency is specified directly.
-
 config MIPS_VA_BITS_48
 	bool "48 bits virtual memory"
 	depends on 64BIT

arch/mips/Kconfig.debug

View file

diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index 7a8d94c..f5832a4 100644
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -77,6 +77,7 @@ config CMDLINE_OVERRIDE
 config SB1XXX_CORELIS
 	bool "Corelis Debugger"
 	depends on SIBYTE_SB1xxx_SOC
+	select DEBUG_KERNEL if !COMPILE_TEST
 	select DEBUG_INFO if !COMPILE_TEST
 	help
 	  Select compile flags that produce code that can be processed by the

arch/mips/alchemy/common/clock.c

View file

diff --git a/arch/mips/alchemy/common/clock.c b/arch/mips/alchemy/common/clock.c
index f0c8303..c01be8c 100644
--- a/arch/mips/alchemy/common/clock.c
+++ b/arch/mips/alchemy/common/clock.c
@@ -111,7 +111,7 @@ static struct clk_aliastable {
 /* access locks to SYS_FREQCTRL0/1 and SYS_CLKSRC registers */
 static spinlock_t alchemy_clk_fg0_lock;
 static spinlock_t alchemy_clk_fg1_lock;
-static spinlock_t alchemy_clk_csrc_lock;
+static DEFINE_SPINLOCK(alchemy_clk_csrc_lock);
 
 /* CPU Core clock *****************************************************/
 
@@ -996,7 +996,6 @@ static int __init alchemy_clk_setup_imux(int ctype)
 	if (!a)
 		return -ENOMEM;
 
-	spin_lock_init(&alchemy_clk_csrc_lock);
 	ret = 0;
 
 	for (i = 0; i < 6; i++) {

arch/mips/bcm63xx/clk.c

View file

diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c
index 1641159..5a3e325 100644
--- a/arch/mips/bcm63xx/clk.c
+++ b/arch/mips/bcm63xx/clk.c
@@ -76,7 +76,7 @@ static struct clk clk_enet_misc = {
 };
 
 /*
- * Ethernet MAC clocks: only revelant on 6358, silently enable misc
+ * Ethernet MAC clocks: only relevant on 6358, silently enable misc
  * clocks
  */
 static void enetx_set(struct clk *clk, int enable)

arch/mips/bcm63xx/gpio.c

View file

diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c
index 16f353a..5c4a233 100644
--- a/arch/mips/bcm63xx/gpio.c
+++ b/arch/mips/bcm63xx/gpio.c
@@ -43,8 +43,7 @@ static void bcm63xx_gpio_set(struct gpio_chip *chip,
 	u32 *v;
 	unsigned long flags;
 
-	if (gpio >= chip->ngpio)
-		BUG();
+	BUG_ON(gpio >= chip->ngpio);
 
 	if (gpio < 32) {
 		reg = gpio_out_low_reg;
@@ -70,8 +69,7 @@ static int bcm63xx_gpio_get(struct gpio_chip *chip, unsigned gpio)
 	u32 reg;
 	u32 mask;
 
-	if (gpio >= chip->ngpio)
-		BUG();
+	BUG_ON(gpio >= chip->ngpio);
 
 	if (gpio < 32) {
 		reg = gpio_out_low_reg;
@@ -92,8 +90,7 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip *chip,
 	u32 tmp;
 	unsigned long flags;
 
-	if (gpio >= chip->ngpio)
-		BUG();
+	BUG_ON(gpio >= chip->ngpio);
 
 	if (gpio < 32) {
 		reg = GPIO_CTL_LO_REG;

arch/mips/bmips/dma.c

View file

diff --git a/arch/mips/bmips/dma.c b/arch/mips/bmips/dma.c
index 49061b8..915ce4b 100644
--- a/arch/mips/bmips/dma.c
+++ b/arch/mips/bmips/dma.c
@@ -10,7 +10,7 @@
 
 #include <linux/device.h>
 #include <linux/dma-direction.h>
-#include <linux/dma-mapping.h>
+#include <linux/dma-direct.h>
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/of.h>

arch/mips/boot/compressed/Makefile

View file

diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index f93f72b..e4b7839 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -18,7 +18,7 @@ include $(srctree)/arch/mips/Kbuild.platforms
 BOOT_HEAP_SIZE := 0x400000
 
 # Disable Function Tracer
-KBUILD_CFLAGS := $(filter-out -pg, $(KBUILD_CFLAGS))
+KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_FTRACE), $(KBUILD_CFLAGS))
 
 KBUILD_CFLAGS := $(filter-out -fstack-protector, $(KBUILD_CFLAGS))
 

arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts

View file

diff --git a/arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts b/arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts
index ed6023a..d702a84 100644
--- a/arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts
+++ b/arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
-/include/ "bcm3368.dtsi"
+#include "bcm3368.dtsi"
 
 / {
 	compatible = "netgear,cvg834g", "brcm,bcm3368";

arch/mips/boot/dts/brcm/bcm3368.dtsi

View file

diff --git a/arch/mips/boot/dts/brcm/bcm3368.dtsi b/arch/mips/boot/dts/brcm/bcm3368.dtsi
index 69cbef4..883ca8b 100644
--- a/arch/mips/boot/dts/brcm/bcm3368.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm3368.dtsi
@@ -1,4 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
+
+#include "dt-bindings/clock/bcm3368-clock.h"
+
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
@@ -59,7 +62,7 @@
 
 		periph_cntl: syscon@fff8c008 {
 			compatible = "syscon";
-			reg = <0xfff8c000 0x4>;
+			reg = <0xfff8c008 0x4>;
 			native-endian;
 		};
 

arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts

View file

diff --git a/arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts b/arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts
index 8d010b9..b511bc7 100644
--- a/arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts
+++ b/arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
-/include/ "bcm63268.dtsi"
+#include "bcm63268.dtsi"
 
 / {
 	compatible = "comtrend,vr-3032u", "brcm,bcm63268";

arch/mips/boot/dts/brcm/bcm63268.dtsi

View file

diff --git a/arch/mips/boot/dts/brcm/bcm63268.dtsi b/arch/mips/boot/dts/brcm/bcm63268.dtsi
index e0021ff..c3ce49e 100644
--- a/arch/mips/boot/dts/brcm/bcm63268.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm63268.dtsi
@@ -1,4 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0
+
+#include "dt-bindings/clock/bcm63268-clock.h"
+#include "dt-bindings/reset/bcm63268-reset.h"
+#include "dt-bindings/soc/bcm63268-pm.h"
+
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
@@ -24,16 +29,29 @@
 	};
 
 	clocks {
-		periph_clk: periph-clk {
+		periph_osc: periph-osc {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <50000000>;
+			clock-output-names = "periph";
+		};
+
+		hsspi_osc: hsspi-osc {
+			compatible = "fixed-clock";
+
+			#clock-cells = <0>;
+
+			clock-frequency = <400000000>;
+			clock-output-names = "hsspi_osc";
 		};
 	};
 
 	aliases {
+		nflash = &nflash;
 		serial0 = &uart0;
 		serial1 = &uart1;
+		spi0 = &lsspi;
+		spi1 = &hsspi;
 	};
 
 	cpu_intc: interrupt-controller {
@@ -51,23 +69,22 @@
 		compatible = "simple-bus";
 		ranges;
 
-		clkctl: clock-controller@10000004 {
+		periph_clk: clock-controller@10000004 {
 			compatible = "brcm,bcm63268-clocks";
 			reg = <0x10000004 0x4>;
 			#clock-cells = <1>;
 		};
 
-		periph_cntl: syscon@10000008 {
+		pll_cntl: syscon@10000008 {
 			compatible = "syscon";
-			reg = <0x10000000 0xc>;
+			reg = <0x10000008 0x4>;
 			native-endian;
-		};
 
-		reboot: syscon-reboot@10000008 {
-			compatible = "syscon-reboot";
-			regmap = <&periph_cntl>;
-			offset = <0x0>;
-			mask = <0x1>;
+			reboot {
+				compatible = "syscon-reboot";
+				offset = <0x0>;
+				mask = <0x1>;
+			};
 		};
 
 		periph_rst: reset-controller@10000010 {
@@ -88,6 +105,16 @@
 			interrupts = <2>, <3>;
 		};
 
+		wdt: watchdog@1000009c {
+			compatible = "brcm,bcm7038-wdt";
+			reg = <0x1000009c 0xc>;
+
+			clocks = <&periph_osc>;
+			clock-names = "refclk";
+
+			timeout-sec = <30>;
+		};
+
 		uart0: serial@10000180 {
 			compatible = "brcm,bcm6345-uart";
 			reg = <0x10000180 0x18>;
@@ -95,12 +122,34 @@
 			interrupt-parent = <&periph_intc>;
 			interrupts = <5>;
 
-			clocks = <&periph_clk>;
+			clocks = <&periph_osc>;
 			clock-names = "refclk";
 
 			status = "disabled";
 		};
 
+		nflash: nand@10000200 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "brcm,nand-bcm6368",
+				     "brcm,brcmnand-v4.0",
+				     "brcm,brcmnand";
+			reg = <0x10000200 0x180>,
+			      <0x10000600 0x200>,
+			      <0x100000b0 0x10>;
+			reg-names = "nand",
+				    "nand-cache",
+				    "nand-int-base";
+
+			interrupt-parent = <&periph_intc>;
+			interrupts = <50>;
+
+			clocks = <&periph_clk BCM63268_CLK_NAND>;
+			clock-names = "nand";
+
+			status = "disabled";
+		};
+
 		uart1: serial@100001a0 {
 			compatible = "brcm,bcm6345-uart";
 			reg = <0x100001a0 0x18>;
@@ -108,17 +157,44 @@
 			interrupt-parent = <&periph_intc>;
 			interrupts = <34>;
 
-			clocks = <&periph_clk>;
+			clocks = <&periph_osc>;
 			clock-names = "refclk";
 
 			status = "disabled";
 		};
 
-		leds0: led-controller@10001900 {
+		lsspi: spi@10000800 {
 			#address-cells = <1>;
 			#size-cells = <0>;
-			compatible = "brcm,bcm6328-leds";
-			reg = <0x10001900 0x24>;
+			compatible = "brcm,bcm6358-spi";
+			reg = <0x10000800 0x70c>;
+
+			interrupt-parent = <&periph_intc>;
+			interrupts = <80>;
+
+			clocks = <&periph_clk BCM63268_CLK_SPI>;
+			clock-names = "spi";
+
+			resets = <&periph_rst BCM63268_RST_SPI>;
+
+			status = "disabled";
+		};
+
+		hsspi: spi@10001000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "brcm,bcm6328-hsspi";
+			reg = <0x10001000 0x600>;
+
+			interrupt-parent = <&periph_intc>;
+			interrupts = <6>;
+
+			clocks = <&periph_clk BCM63268_CLK_HSSPI>,
+				 <&hsspi_osc>;
+			clock-names = "hsspi",
+				      "pll";
+
+			resets = <&periph_rst BCM63268_RST_SPI>;
 
 			status = "disabled";
 		};
@@ -129,6 +205,15 @@
 			#power-domain-cells = <1>;
 		};
 
+		leds0: led-controller@10001900 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "brcm,bcm6328-leds";
+			reg = <0x10001900 0x24>;
+
+			status = "disabled";
+		};
+
 		ehci: usb@10002500 {
 			compatible = "brcm,bcm63268-ehci", "generic-ehci";
 			reg = <0x10002500 0x100>;
@@ -137,6 +222,9 @@
 			interrupt-parent = <&periph_intc>;
 			interrupts = <10>;
 
+			phys = <&usbh 0>;
+			phy-names = "usb";
+
 			status = "disabled";
 		};
 
@@ -149,6 +237,25 @@
 			interrupt-parent = <&periph_intc>;
 			interrupts = <9>;
 
+			phys = <&usbh 0>;
+			phy-names = "usb";
+
+			status = "disabled";
+		};
+
+		usbh: usb-phy@10002700 {
+			compatible = "brcm,bcm63268-usbh-phy";
+			reg = <0x10002700 0x38>;
+			#phy-cells = <1>;
+
+			clocks = <&periph_clk BCM63268_CLK_USBH>;
+			clock-names = "usbh";
+
+			power-domains = <&periph_pwr BCM63268_POWER_DOMAIN_USBH>;
+
+			resets = <&periph_rst BCM63268_RST_USBH>;
+			reset-names = "usbh";
+
 			status = "disabled";
 		};
 	};

arch/mips/boot/dts/brcm/bcm6328.dtsi

View file

diff --git a/arch/mips/boot/dts/brcm/bcm6328.dtsi b/arch/mips/boot/dts/brcm/bcm6328.dtsi
index 9dc5587..634618d 100644
--- a/arch/mips/boot/dts/brcm/bcm6328.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm6328.dtsi
@@ -1,4 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0
+
+#include "dt-bindings/clock/bcm6328-clock.h"
+#include "dt-bindings/reset/bcm6328-reset.h"
+#include "dt-bindings/soc/bcm6328-pm.h"
+
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
@@ -24,16 +29,26 @@
 	};
 
 	clocks {
-		periph_clk: periph-clk {
+		periph_osc: periph-osc {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <50000000>;
+			clock-output-names = "periph";
+		};
+
+		hsspi_osc: hsspi-osc {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <133333333>;
+			clock-output-names = "hsspi_osc";
 		};
 	};
 
 	aliases {
+		nflash = &nflash;
 		serial0 = &uart0;