Commit 5596c6ad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MIPS updates from Thomas Bogendoerfer:
 "Just cleanups and fixes"

* tag 'mips_6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: vpe-mt: drop physical_memsize
  mips: fix syscall_get_nr
  MIPS: SMP-CPS: fix build error when HOTPLUG_CPU not set
  MIPS: DTS: jz4780: add #clock-cells to rtc_dev
  MIPS: dts: Boston: Fix dtc 'pci_device_reg' warning
  mips: dts: ralink: mt7621: add port@5 as CPU port
  mips: dts: align LED node names with dtschema
  MIPS: ralink: Use devm_platform_get_and_ioremap_resource()
  MIPS: pci-mt7620: Use devm_platform_get_and_ioremap_resource()
  MIPS: pci: lantiq: Use devm_platform_get_and_ioremap_resource()
  MIPS: lantiq: xway: Use devm_platform_get_and_ioremap_resource()
  MIPS: BCM47XX: Add support for Linksys E2500 V3
  mips: ralink: make SOC_MT7621 select PINCTRL_MT7621 and fix help section
  MIPS: DTS: CI20: fix otg power gpio
  MIPS: dts: lantiq: Remove bogus interrupt-parent; line
  MIPS: Fix a compilation issue
  MIPS: remove CONFIG_MIPS_LD_CAN_LINK_VDSO
  mips: Realtek RTL: select NO_EXCEPT_FILL
  MIPS: OCTEON: octeon-usb: Consolidate error messages
parents 7c3dc440 91dc288f

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ config LANTIQ 
	select IRQ_MIPS_CPU

	select CEVT_R4K

	select CSRC_R4K

	select NO_EXCEPT_FILL

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_SUPPORTS_BIG_ENDIAN

arch/mips/bcm47xx/board.c

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ struct bcm47xx_board_type_list2 bcm47xx_board_list_boot_hw[] __initconst = { 
	{{BCM47XX_BOARD_LINKSYS_E1000V21, "Linksys E1000 V2.1"}, "E1000", "2.1"},

	{{BCM47XX_BOARD_LINKSYS_E1200V2, "Linksys E1200 V2"}, "E1200", "2.0"},

	{{BCM47XX_BOARD_LINKSYS_E2000V1, "Linksys E2000 V1"}, "Linksys E2000", "1.0"},

	{{BCM47XX_BOARD_LINKSYS_E2500V3, "Linksys E2500 V3"}, "E2500", "1.0"},

	/* like WRT610N v2.0 */

	{{BCM47XX_BOARD_LINKSYS_E3000V1, "Linksys E3000 V1"}, "E300", "1.0"},

	{{BCM47XX_BOARD_LINKSYS_E3200V1, "Linksys E3200 V1"}, "E3200", "1.0"},

arch/mips/bcm47xx/buttons.c

+9 −0
Original line number Diff line number Diff line
@@ -222,6 +222,12 @@ bcm47xx_buttons_linksys_e2000v1[] __initconst = { 
	BCM47XX_GPIO_KEY(8, KEY_RESTART),

};



static const struct gpio_keys_button

bcm47xx_buttons_linksys_e2500v3[] __initconst = {

	BCM47XX_GPIO_KEY(9, KEY_WPS_BUTTON),

	BCM47XX_GPIO_KEY(10, KEY_RESTART),

};



static const struct gpio_keys_button

bcm47xx_buttons_linksys_e3000v1[] __initconst = {

	BCM47XX_GPIO_KEY(4, KEY_WPS_BUTTON),
@@ -617,6 +623,9 @@ int __init bcm47xx_buttons_register(void) 
	case BCM47XX_BOARD_LINKSYS_E2000V1:

		err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_e2000v1);

		break;

	case BCM47XX_BOARD_LINKSYS_E2500V3:

		err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_e2500v3);

		break;

	case BCM47XX_BOARD_LINKSYS_E3000V1:

		err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_e3000v1);

		break;

arch/mips/boot/dts/cavium-octeon/dlink_dsr-1000n.dts

+5 −5
Original line number Diff line number Diff line
@@ -20,27 +20,27 @@ 
	leds {

		compatible = "gpio-leds";



		usb1 {

		led-usb1 {

			label = "usb1";

			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;

		};



		usb2 {

		led-usb2 {

			label = "usb2";

			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;

		};



		wps {

		led-wps {

			label = "wps";

			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;

		};



		wireless1 {

		led-wireless1 {

			label = "5g";

			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;

		};



		wireless2 {

		led-wireless2 {

			label = "2.4g";

			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;

		};

arch/mips/boot/dts/cavium-octeon/dlink_dsr-500n.dts

+3 −3
Original line number Diff line number Diff line
@@ -21,15 +21,15 @@ 
	leds {

		compatible = "gpio-leds";



		usb {

		led-usb {

			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;

		};



		wps {

		led-wps {

			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;

		};



		wireless {

		led-wireless {

			label = "2.4g";

			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;

		};