Commit 96b6eb8a authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer
Browse files

Merge tag 'mips_fixes_5.6.1' into mips-next 



Pull in mips-fixes avoiding conflicts with more CI20 DT changes.

A few MIPS fixes:

- DT fixes for CI20

- Fix command line handling

- Correct patchwork URL

Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parents 1e07c876 f7d5f565

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

+3 −5
Original line number Diff line number Diff line
@@ -11114,14 +11114,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









Q:	https://patchwork.kernel.org/project/linux-mips/list/









S:	Maintained









F:	Documentation/devicetree/bindings/mips/









F:	Documentation/mips/









F:	arch/mips/
































arch/mips/boot/dts/ingenic/ci20.dts



+28
−16






























Original line number
Diff line number
Diff line







@@ -4,6 +4,8 @@







#include "jz4780.dtsi"









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









#include <dt-bindings/gpio/gpio.h>









#include <dt-bindings/interrupt-controller/irq.h>









#include <dt-bindings/regulator/active-semi,8865-regulator.h>



















/ {









	compatible = "img,ci20", "ingenic,jz4780";








@@ -163,63 +165,71 @@

















		regulators {









			vddcore: SUDCDC1 {









				regulator-name = "VDDCORE";









				regulator-name = "DCDC_REG1";









				regulator-min-microvolt = <1100000>;









				regulator-max-microvolt = <1100000>;









				regulator-always-on;









			};









			vddmem: SUDCDC2 {









				regulator-name = "VDDMEM";









				regulator-name = "DCDC_REG2";









				regulator-min-microvolt = <1500000>;









				regulator-max-microvolt = <1500000>;









				regulator-always-on;









			};









			vcc_33: SUDCDC3 {









				regulator-name = "VCC33";









				regulator-name = "DCDC_REG3";









				regulator-min-microvolt = <3300000>;









				regulator-max-microvolt = <3300000>;









				regulator-always-on;









			};









			vcc_50: SUDCDC4 {









				regulator-name = "VCC50";









				regulator-name = "SUDCDC_REG4";









				regulator-min-microvolt = <5000000>;









				regulator-max-microvolt = <5000000>;









				regulator-always-on;









			};









			vcc_25: LDO_REG5 {









				regulator-name = "VCC25";









				regulator-name = "LDO_REG5";









				regulator-min-microvolt = <2500000>;









				regulator-max-microvolt = <2500000>;









				regulator-always-on;









			};









			wifi_io: LDO_REG6 {









				regulator-name = "WIFIIO";









				regulator-name = "LDO_REG6";









				regulator-min-microvolt = <2500000>;









				regulator-max-microvolt = <2500000>;









				regulator-always-on;









			};









			vcc_28: LDO_REG7 {









				regulator-name = "VCC28";









				regulator-name = "LDO_REG7";









				regulator-min-microvolt = <2800000>;









				regulator-max-microvolt = <2800000>;









				regulator-always-on;









			};









			vcc_15: LDO_REG8 {









				regulator-name = "VCC15";









				regulator-name = "LDO_REG8";









				regulator-min-microvolt = <1500000>;









				regulator-max-microvolt = <1500000>;









				regulator-always-on;









			};









			vcc_18: LDO_REG9 {









				regulator-name = "VCC18";









				regulator-min-microvolt = <1800000>;









				regulator-max-microvolt = <1800000>;









			vrtc_18: LDO_REG9 {









				regulator-name = "LDO_REG9";









				/* Despite the datasheet stating 3.3V









				 * for REG9 and the driver expecting that,









				 * REG9 outputs 1.8V.









				 * Likely the CI20 uses a proprietary









				 * factory programmed chip variant.









				 * Since this is a simple on/off LDO the









				 * exact values do not matter.









				 */









				regulator-min-microvolt = <3300000>;









				regulator-max-microvolt = <3300000>;









				regulator-always-on;









			};









			vcc_11: LDO_REG10 {









				regulator-name = "VCC11";









				regulator-min-microvolt = <1100000>;









				regulator-max-microvolt = <1100000>;









				regulator-name = "LDO_REG10";









				regulator-min-microvolt = <1200000>;









				regulator-max-microvolt = <1200000>;









				regulator-always-on;









			};









		};








@@ -261,7 +271,9 @@







		rtc@51 {









			compatible = "nxp,pcf8563";









			reg = <0x51>;









			interrupts = <110>;



















			interrupt-parent = <&gpf>;









			interrupts = <30 IRQ_TYPE_LEVEL_LOW>;









		};









};










































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>;