Commit 2671fe5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MIPS updates from Thomas Bogendoerfer:

 - added support for Nintendo N64

 - added support for Realtek RTL83XX SoCs

 - kaslr support for Loongson64

 - first steps to get rid of set_fs()

 - DMA runtime coherent/non-coherent selection cleanup

 - cleanups and fixes

* tag 'mips_5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (98 commits)
  Revert "MIPS: Add basic support for ptrace single step"
  vmlinux.lds.h: catch more UBSAN symbols into .data
  MIPS: kernel: Drop kgdb_call_nmi_hook
  MAINTAINERS: Add git tree for KVM/mips
  MIPS: Use common way to parse elfcorehdr
  MIPS: Simplify EVA cache handling
  Revert "MIPS: kernel: {ftrace,kgdb}: Set correct address limit for cache flushes"
  MIPS: remove CONFIG_DMA_PERDEV_COHERENT
  MIPS: remove CONFIG_DMA_MAYBE_COHERENT
  driver core: lift dma_default_coherent into common code
  MIPS: refactor the runtime coherent vs noncoherent DMA indicators
  MIPS/alchemy: factor out the DMA coherent setup
  MIPS/malta: simplify plat_setup_iocoherency
  MIPS: Add basic support for ptrace single step
  MAINTAINERS: replace non-matching patterns for loongson{2,3}
  MIPS: Make check condition for SDBBP consistent with EJTAG spec
  mips: Replace lkml.org links with lore
  Revert "MIPS: microMIPS: Fix the judgment of mm_jr16_op and mm_jalr_op"
  MIPS: crash_dump.c: Simplify copy_oldmem_page()
  Revert "mips: Manually call fdt_init_reserved_mem() method"
  ...
parents b811b410 b0c2793b

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ Li Yang <leoyang.li@nxp.com> <leoli@freescale.com> 
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>

Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>

Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Maciej W. Rozycki <macro@orcam.me.uk> <macro@linux-mips.org>

Manivannan Sadhasivam <mani@kernel.org> <manivannanece23@gmail.com>

Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>

Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>

Documentation/devicetree/bindings/mips/lantiq/lantiq,cgu.yaml

0 → 100644
+32 −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/lantiq/lantiq,cgu.yaml#

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



title: Lantiq Xway SoC series Clock Generation Unit (CGU)



maintainers:

  - John Crispin <john@phrozen.org>



properties:

  compatible:

    items:

      - enum:

          - lantiq,cgu-xway



  reg:

    maxItems: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    cgu@103000 {

        compatible = "lantiq,cgu-xway";

        reg = <0x103000 0x1000>;

    };

Documentation/devicetree/bindings/mips/lantiq/lantiq,dma-xway.yaml

0 → 100644
+32 −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/lantiq/lantiq,dma-xway.yaml#

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



title: Lantiq Xway SoCs DMA Controller DT bindings



maintainers:

  - John Crispin <john@phrozen.org>



properties:

  compatible:

    items:

      - enum:

          - lantiq,dma-xway



  reg:

    maxItems: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    dma@e104100 {

        compatible = "lantiq,dma-xway";

        reg = <0xe104100 0x800>;

    };

Documentation/devicetree/bindings/mips/lantiq/lantiq,ebu.yaml

0 → 100644
+32 −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/lantiq/lantiq,ebu.yaml#

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



title: Lantiq Xway SoC series External Bus Unit (EBU)



maintainers:

  - John Crispin <john@phrozen.org>



properties:

  compatible:

    items:

      - enum:

          - lantiq,ebu-xway



  reg:

    maxItems: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    ebu@105300 {

        compatible = "lantiq,ebu-xway";

        reg = <0x105300 0x100>;

    };

Documentation/devicetree/bindings/mips/lantiq/lantiq,pmu.yaml

0 → 100644
+32 −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/lantiq/lantiq,pmu.yaml#

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



title: Lantiq Xway SoC series Power Management Unit (PMU)



maintainers:

  - John Crispin <john@phrozen.org>



properties:

  compatible:

    items:

      - enum:

          - lantiq,pmu-xway



  reg:

    maxItems: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    pmu@102000 {

        compatible = "lantiq,pmu-xway";

        reg = <0x102000 0x1000>;

    };