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

Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Paul Burton:
 "Here are a few MIPS fixes, and a MAINTAINERS update to hand over MIPS
  maintenance to Thomas Bogendoerfer - this will be my final pull
  request as MIPS maintainer.

  Thanks for your helpful comments, useful corrections & responsiveness
  during the time I've fulfilled the role, and I'm sure I'll pop up
  elsewhere in the tree somewhere down the line"

* 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MAINTAINERS: Hand MIPS over to Thomas
  MIPS: ingenic: DTS: Fix watchdog nodes
  MIPS: X1000: Fix clock of watchdog node.
  MIPS: vdso: Wrap -mexplicit-relocs in cc-option
  MIPS: VPE: Fix a double free and a memory leak in 'release_vpe()'
  MIPS: cavium_octeon: Fix syncw generation.
  mips: vdso: add build time check that no 'jalr t9' calls left
  MIPS: Disable VDSO time functionality on microMIPS
  mips: vdso: fix 'jalr t9' crash in vdso code
parents 63623fd4 3234f4ed

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -567,6 +567,11 @@ D: Original author of Amiga FFS filesystem 
S: Orlando, Florida

S: USA



N: Paul Burton

E: paulburton@kernel.org

W: https://pburton.com

D: MIPS maintainer 2018-2020



N: Lennert Buytenhek

E: kernel@wantstofly.org

D: Original (2.4) rewrite of the ethernet bridging code

MAINTAINERS

+2 −4
Original line number Diff line number Diff line
@@ -11115,14 +11115,12 @@ S: Maintained 
F:	drivers/usb/image/microtek.*















MIPS













M:	Ralf Baechle <ralf@linux-mips.org>













M:	Paul Burton <paulburton@kernel.org>













M:	Thomas Bogendoerfer <tsbogend@alpha.franken.de>















L:	linux-mips@vger.kernel.org















W:	http://www.linux-mips.org/













T:	git git://git.linux-mips.org/pub/scm/ralf/linux.git















T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git















Q:	http://patchwork.linux-mips.org/project/linux-mips/list/













S:	Supported













S:	Maintained















F:	Documentation/devicetree/bindings/mips/















F:	Documentation/mips/















F:	arch/mips/

































arch/mips/boot/dts/ingenic/jz4740.dtsi



+9
−8






























Original line number
Diff line number
Diff line















// SPDX-License-Identifier: GPL-2.0















#include <dt-bindings/clock/jz4740-cgu.h>













#include <dt-bindings/clock/ingenic,tcu.h>































/ {















	#address-cells = <1>;










@@ -45,14 +46,6 @@













		#clock-cells = <1>;















	};





























	watchdog: watchdog@10002000 {













		compatible = "ingenic,jz4740-watchdog";













		reg = <0x10002000 0x10>;



























		clocks = <&cgu JZ4740_CLK_RTC>;













		clock-names = "rtc";













	};





























	tcu: timer@10002000 {















		compatible = "ingenic,jz4740-tcu", "simple-mfd";















		reg = <0x10002000 0x1000>;









@@ -73,6 +66,14 @@





























		interrupt-parent = <&intc>;















		interrupts = <23 22 21>;



























		watchdog: watchdog@0 {













			compatible = "ingenic,jz4740-watchdog";













			reg = <0x0 0xc>;



























			clocks = <&tcu TCU_CLK_WDT>;













			clock-names = "wdt";













		};















	};































	rtc_dev: rtc@10003000 {

































arch/mips/boot/dts/ingenic/jz4780.dtsi



+9
−8






























Original line number
Diff line number
Diff line















// SPDX-License-Identifier: GPL-2.0















#include <dt-bindings/clock/jz4780-cgu.h>













#include <dt-bindings/clock/ingenic,tcu.h>















#include <dt-bindings/dma/jz4780-dma.h>































/ {










@@ -67,6 +68,14 @@





























		interrupt-parent = <&intc>;















		interrupts = <27 26 25>;



























		watchdog: watchdog@0 {













			compatible = "ingenic,jz4780-watchdog";













			reg = <0x0 0xc>;



























			clocks = <&tcu TCU_CLK_WDT>;













			clock-names = "wdt";













		};















	};































	rtc_dev: rtc@10003000 {










@@ -348,14 +357,6 @@













		status = "disabled";















	};





























	watchdog: watchdog@10002000 {













		compatible = "ingenic,jz4780-watchdog";













		reg = <0x10002000 0x10>;



























		clocks = <&cgu JZ4780_CLK_RTCLK>;













		clock-names = "rtc";













	};





























	nemc: nemc@13410000 {















		compatible = "ingenic,jz4780-nemc";















		reg = <0x13410000 0x10000>;

































arch/mips/boot/dts/ingenic/x1000.dtsi



+2
−4






























Original line number
Diff line number
Diff line















// SPDX-License-Identifier: GPL-2.0













#include <dt-bindings/clock/ingenic,tcu.h>















#include <dt-bindings/clock/x1000-cgu.h>















#include <dt-bindings/dma/x1000-dma.h>


























@@ -72,7 +73,7 @@













			compatible = "ingenic,x1000-watchdog", "ingenic,jz4780-watchdog";















			reg = <0x0 0x10>;





























			clocks = <&cgu X1000_CLK_RTCLK>;













			clocks = <&tcu TCU_CLK_WDT>;















			clock-names = "wdt";















		};















	};










@@ -158,7 +159,6 @@













	i2c0: i2c-controller@10050000 {















		compatible = "ingenic,x1000-i2c";















		reg = <0x10050000 0x1000>;





























		#address-cells = <1>;















		#size-cells = <0>;

























@@ -173,7 +173,6 @@













	i2c1: i2c-controller@10051000 {















		compatible = "ingenic,x1000-i2c";















		reg = <0x10051000 0x1000>;





























		#address-cells = <1>;















		#size-cells = <0>;

























@@ -188,7 +187,6 @@













	i2c2: i2c-controller@10052000 {















		compatible = "ingenic,x1000-i2c";















		reg = <0x10052000 0x1000>;





























		#address-cells = <1>;















		#size-cells = <0>;

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE