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

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

Pull MIPS updates from Paul Burton:
 "A light batch this time around but significant improvements for
  certain systems:

   - Removal of readq & writeq for MIPS32 kernels where they would
     simply BUG() anyway, allowing drivers or other code that #ifdefs on
     their presence to work properly.

   - Improvements for Ingenic JZ4740 systems, including support for the
     external memory controller & pinmuxing fixes for qi_lb60/NanoNote
     systems.

   - Improvements for Lantiq systems, in particular around SMP & IPIs.

   - DT updates for ralink/MediaTek MT7628a systems to probe & configure
     a bunch more devices.

   - Miscellaneous cleanups & build fixes"

* tag 'mips_5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (30 commits)
  MIPS: fix some more fall through errors in arch/mips
  MIPS: perf events: handle switch statement falling through warnings
  mips/kprobes: Export kprobe_fault_handler()
  MAINTAINERS: Add myself as Ingenic SoCs maintainer
  MIPS: ralink: mt7628a.dtsi: Add watchdog controller DT node
  MIPS: ralink: mt7628a.dtsi: Add SPI controller DT node
  MIPS: ralink: mt7628a.dtsi: Add GPIO controller DT node
  MIPS: ralink: mt7628a.dtsi: Add pinctrl DT properties to the UART nodes
  MIPS: ralink: mt7628a.dtsi: Add pinmux DT node
  MIPS: ralink: mt7628a.dtsi: Add SPDX GPL-2.0 license identifier
  MIPS: lantiq: Add SMP support for lantiq interrupt controller
  MIPS: lantiq: Shorten register names, remove unused macros
  MIPS: lantiq: Fix bitfield masking
  MIPS: lantiq: Remove unused macros
  MIPS: lantiq: Fix attributes of of_device_id structure
  MIPS: lantiq: Change variables to the same type as the source
  MIPS: lantiq: Move macro directly to iomem function
  mips: Remove q-accessors from non-64bit platforms
  FDDI: defza: Include linux/io-64-nonatomic-lo-hi.h
  MIPS: configs: Remove useless UEVENT_HELPER_PATH
  ...
parents 7d4901c0 e5793cd1

MAINTAINERS

+27 −0
Original line number Diff line number Diff line
@@ -7955,6 +7955,33 @@ L: linux-mtd@lists.infradead.org 
S:	Maintained

F:	drivers/mtd/nand/raw/ingenic/



INGENIC JZ47xx SoCs

M:	Paul Cercueil <paul@crapouillou.net>

S:	Maintained

F:	arch/mips/boot/dts/ingenic/

F:	arch/mips/include/asm/mach-jz4740/

F:	arch/mips/jz4740/

F:	drivers/clk/ingenic/

F:	drivers/dma/dma-jz4780.c

F:	drivers/gpu/drm/ingenic/

F:	drivers/i2c/busses/i2c-jz4780.c

F:	drivers/iio/adc/ingenic-adc.c

F:	drivers/irqchip/irq-ingenic.c

F:	drivers/memory/jz4780-nemc.c

F:	drivers/mmc/host/jz4740_mmc.c

F:	drivers/mtd/nand/raw/ingenic/

F:	drivers/pinctrl/pinctrl-ingenic.c

F:	drivers/power/supply/ingenic-battery.c

F:	drivers/pwm/pwm-jz4740.c

F:	drivers/rtc/rtc-jz4740.c

F:	drivers/tty/serial/8250/8250_ingenic.c

F:	drivers/usb/musb/jz4740.c

F:	drivers/watchdog/jz4740_wdt.c

F:	include/dt-bindings/iio/adc/ingenic,adc.h

F:	include/linux/mfd/ingenic-tcu.h

F:	sound/soc/jz4740/

F:	sound/soc/codecs/jz47*



INOTIFY

M:	Jan Kara <jack@suse.cz>

R:	Amir Goldstein <amir73il@gmail.com>

arch/mips/ar7/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ const char *get_system_type(void) 
		case TITAN_CHIP_1060:

			return "TI AR7 (TNETV1060)";

		}

		/* fall through */

	default:

		return "TI AR7 (unknown)";

	}

arch/mips/ath79/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static void __init ath79_detect_sys_type(void) 
	case REV_ID_MAJOR_QCA9533_V2:

		ver = 2;

		ath79_soc_rev = 2;

		/* drop through */

		/* fall through */



	case REV_ID_MAJOR_QCA9533:

		ath79_soc = ATH79_SOC_QCA9533;

arch/mips/bcm63xx/dev-flash.c

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ static int __init bcm63xx_detect_flash_type(void) 
		case STRAPBUS_6368_BOOT_SEL_PARALLEL:

			return BCM63XX_FLASH_TYPE_PARALLEL;

		}

		/* fall through */

	default:

		return -EINVAL;

	}

arch/mips/boot/dts/ralink/mt7628a.dtsi

+147 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



/ {

	#address-cells = <1>;

	#size-cells = <1>;
@@ -36,7 +38,113 @@ 


		sysc: system-controller@0 {

			compatible = "ralink,mt7620a-sysc", "syscon";

			reg = <0x0 0x100>;

			reg = <0x0 0x60>;

		};



		pinmux: pinmux@60 {

			compatible = "pinctrl-single";

			reg = <0x60 0x8>;

			#address-cells = <1>;

			#size-cells = <0>;

			#pinctrl-cells = <2>;

			pinctrl-single,bit-per-mux;

			pinctrl-single,register-width = <32>;

			pinctrl-single,function-mask = <0x1>;



			pinmux_gpio_gpio: pinmux_gpio_gpio {

				pinctrl-single,bits = <0x0 0x0 0x3>;

			};



			pinmux_spi_cs1_cs: pinmux_spi_cs1_cs {

				pinctrl-single,bits = <0x0 0x0 0x30>;

			};



			pinmux_i2s_gpio: pinmux_i2s_gpio {

				pinctrl-single,bits = <0x0 0x40 0xc0>;

			};



			pinmux_uart0_uart: pinmux_uart0_uart0 {

				pinctrl-single,bits = <0x0 0x0 0x300>;

			};



			pinmux_sdmode_sdxc: pinmux_sdmode_sdxc {

				pinctrl-single,bits = <0x0 0x0 0xc00>;

			};



			pinmux_sdmode_gpio: pinmux_sdmode_gpio {

				pinctrl-single,bits = <0x0 0x400 0xc00>;

			};



			pinmux_spi_spi: pinmux_spi_spi {

				pinctrl-single,bits = <0x0 0x0 0x1000>;

			};



			pinmux_refclk_gpio: pinmux_refclk_gpio {

				pinctrl-single,bits = <0x0 0x40000 0x40000>;

			};



			pinmux_i2c_i2c: pinmux_i2c_i2c {

				pinctrl-single,bits = <0x0 0x0 0x300000>;

			};



			pinmux_uart1_uart: pinmux_uart1_uart1 {

				pinctrl-single,bits = <0x0 0x0 0x3000000>;

			};



			pinmux_uart2_uart: pinmux_uart2_uart {

				pinctrl-single,bits = <0x0 0x0 0xc000000>;

			};



			pinmux_pwm0_pwm: pinmux_pwm0_pwm {

				pinctrl-single,bits = <0x0 0x0 0x30000000>;

			};



			pinmux_pwm0_gpio: pinmux_pwm0_gpio {

				pinctrl-single,bits = <0x0 0x10000000

						       0x30000000>;

			};



			pinmux_pwm1_pwm: pinmux_pwm1_pwm {

				pinctrl-single,bits = <0x0 0x0 0xc0000000>;

			};



			pinmux_pwm1_gpio: pinmux_pwm1_gpio {

				pinctrl-single,bits = <0x0 0x40000000

						       0xc0000000>;

			};



			pinmux_p0led_an_gpio: pinmux_p0led_an_gpio {

				pinctrl-single,bits = <0x4 0x4 0xc>;

			};



			pinmux_p1led_an_gpio: pinmux_p1led_an_gpio {

				pinctrl-single,bits = <0x4 0x10 0x30>;

			};



			pinmux_p2led_an_gpio: pinmux_p2led_an_gpio {

				pinctrl-single,bits = <0x4 0x40 0xc0>;

			};



			pinmux_p3led_an_gpio: pinmux_p3led_an_gpio {

				pinctrl-single,bits = <0x4 0x100 0x300>;

			};



			pinmux_p4led_an_gpio: pinmux_p4led_an_gpio {

				pinctrl-single,bits = <0x4 0x400 0xc00>;

			};

		};



		watchdog: watchdog@100 {

			compatible = "mediatek,mt7621-wdt";

			reg = <0x100 0x30>;



			resets = <&resetc 8>;

			reset-names = "wdt";



			interrupt-parent = <&intc>;

			interrupts = <24>;



			status = "disabled";

		};



		intc: interrupt-controller@200 {
@@ -62,10 +170,42 @@ 
			reg = <0x300 0x100>;

		};



		gpio: gpio@600 {

			compatible = "mediatek,mt7621-gpio";

			reg = <0x600 0x100>;



			gpio-controller;

			interrupt-controller;

			#gpio-cells = <2>;

			#interrupt-cells = <2>;



			interrupt-parent = <&intc>;

			interrupts = <6>;

		};



		spi: spi@b00 {

			compatible = "ralink,mt7621-spi";

			reg = <0xb00 0x100>;



			pinctrl-names = "default";

			pinctrl-0 = <&pinmux_spi_spi>;



			resets = <&resetc 18>;

			reset-names = "spi";



			#address-cells = <1>;

			#size-cells = <0>;



			status = "disabled";

		};



		uart0: uartlite@c00 {

			compatible = "ns16550a";

			reg = <0xc00 0x100>;



			pinctrl-names = "default";

			pinctrl-0 = <&pinmux_uart0_uart>;



			resets = <&resetc 12>;

			reset-names = "uart0";
@@ -79,6 +219,9 @@ 
			compatible = "ns16550a";

			reg = <0xd00 0x100>;



			pinctrl-names = "default";

			pinctrl-0 = <&pinmux_uart1_uart>;



			resets = <&resetc 19>;

			reset-names = "uart1";
@@ -92,6 +235,9 @@ 
			compatible = "ns16550a";

			reg = <0xe00 0x100>;



			pinctrl-names = "default";

			pinctrl-0 = <&pinmux_uart2_uart>;



			resets = <&resetc 20>;

			reset-names = "uart2";

CRA Git | Maintained and supported by SUSTech CRA and CCSE