Skip to content

Commit 5596c6a

Browse files
committed
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
2 parents 7c3dc44 + 91dc288 commit 5596c6a

35 files changed

+136
-144
lines changed

arch/mips/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@ config LANTIQ
445445
select IRQ_MIPS_CPU
446446
select CEVT_R4K
447447
select CSRC_R4K
448+
select NO_EXCEPT_FILL
448449
select SYS_HAS_CPU_MIPS32_R1
449450
select SYS_HAS_CPU_MIPS32_R2
450451
select SYS_SUPPORTS_BIG_ENDIAN

arch/mips/bcm47xx/board.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ struct bcm47xx_board_type_list2 bcm47xx_board_list_boot_hw[] __initconst = {
130130
{{BCM47XX_BOARD_LINKSYS_E1000V21, "Linksys E1000 V2.1"}, "E1000", "2.1"},
131131
{{BCM47XX_BOARD_LINKSYS_E1200V2, "Linksys E1200 V2"}, "E1200", "2.0"},
132132
{{BCM47XX_BOARD_LINKSYS_E2000V1, "Linksys E2000 V1"}, "Linksys E2000", "1.0"},
133+
{{BCM47XX_BOARD_LINKSYS_E2500V3, "Linksys E2500 V3"}, "E2500", "1.0"},
133134
/* like WRT610N v2.0 */
134135
{{BCM47XX_BOARD_LINKSYS_E3000V1, "Linksys E3000 V1"}, "E300", "1.0"},
135136
{{BCM47XX_BOARD_LINKSYS_E3200V1, "Linksys E3200 V1"}, "E3200", "1.0"},

arch/mips/bcm47xx/buttons.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,12 @@ bcm47xx_buttons_linksys_e2000v1[] __initconst = {
222222
BCM47XX_GPIO_KEY(8, KEY_RESTART),
223223
};
224224

225+
static const struct gpio_keys_button
226+
bcm47xx_buttons_linksys_e2500v3[] __initconst = {
227+
BCM47XX_GPIO_KEY(9, KEY_WPS_BUTTON),
228+
BCM47XX_GPIO_KEY(10, KEY_RESTART),
229+
};
230+
225231
static const struct gpio_keys_button
226232
bcm47xx_buttons_linksys_e3000v1[] __initconst = {
227233
BCM47XX_GPIO_KEY(4, KEY_WPS_BUTTON),
@@ -617,6 +623,9 @@ int __init bcm47xx_buttons_register(void)
617623
case BCM47XX_BOARD_LINKSYS_E2000V1:
618624
err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_e2000v1);
619625
break;
626+
case BCM47XX_BOARD_LINKSYS_E2500V3:
627+
err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_e2500v3);
628+
break;
620629
case BCM47XX_BOARD_LINKSYS_E3000V1:
621630
err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_e3000v1);
622631
break;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@
2020
leds {
2121
compatible = "gpio-leds";
2222

23-
usb1 {
23+
led-usb1 {
2424
label = "usb1";
2525
gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
2626
};
2727

28-
usb2 {
28+
led-usb2 {
2929
label = "usb2";
3030
gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
3131
};
3232

33-
wps {
33+
led-wps {
3434
label = "wps";
3535
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
3636
};
3737

38-
wireless1 {
38+
led-wireless1 {
3939
label = "5g";
4040
gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
4141
};
4242

43-
wireless2 {
43+
led-wireless2 {
4444
label = "2.4g";
4545
gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
4646
};

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
leds {
2222
compatible = "gpio-leds";
2323

24-
usb {
24+
led-usb {
2525
gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
2626
};
2727

28-
wps {
28+
led-wps {
2929
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
3030
};
3131

32-
wireless {
32+
led-wireless {
3333
label = "2.4g";
3434
gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
3535
};

arch/mips/boot/dts/img/boston.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
#interrupt-cells = <1>;
126126
};
127127

128-
pci2_root@0,0,0 {
128+
pci2_root@0,0 {
129129
compatible = "pci10ee,7021";
130130
reg = <0x00000000 0 0 0 0>;
131131

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,25 @@
4242
leds {
4343
compatible = "gpio-leds";
4444

45-
led0 {
45+
led-0 {
4646
label = "ci20:red:led0";
4747
gpios = <&gpc 3 GPIO_ACTIVE_HIGH>;
4848
linux,default-trigger = "none";
4949
};
5050

51-
led1 {
51+
led-1 {
5252
label = "ci20:red:led1";
5353
gpios = <&gpc 2 GPIO_ACTIVE_HIGH>;
5454
linux,default-trigger = "nand-disk";
5555
};
5656

57-
led2 {
57+
led-2 {
5858
label = "ci20:red:led2";
5959
gpios = <&gpc 1 GPIO_ACTIVE_HIGH>;
6060
linux,default-trigger = "cpu1";
6161
};
6262

63-
led3 {
63+
led-3 {
6464
label = "ci20:red:led3";
6565
gpios = <&gpc 0 GPIO_ACTIVE_HIGH>;
6666
linux,default-trigger = "cpu0";
@@ -113,7 +113,7 @@
113113
regulator-min-microvolt = <5000000>;
114114
regulator-max-microvolt = <5000000>;
115115

116-
gpio = <&gpf 14 GPIO_ACTIVE_LOW>;
116+
gpio = <&gpf 15 GPIO_ACTIVE_LOW>;
117117
enable-active-high;
118118
};
119119
};

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@
155155

156156
clocks = <&cgu JZ4780_CLK_RTCLK>;
157157
clock-names = "rtc";
158+
159+
#clock-cells = <0>;
158160
};
159161

160162
pinctrl: pin-controller@10010000 {

arch/mips/boot/dts/lantiq/danube.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
eiu0: eiu@101000 {
4141
#interrupt-cells = <1>;
4242
interrupt-controller;
43-
interrupt-parent;
4443
compatible = "lantiq,eiu-xway";
4544
reg = <0x101000 0x1000>;
4645
};

arch/mips/boot/dts/pic32/pic32mzda_sk.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@
2828
pinctrl-names = "default";
2929
pinctrl-0 = <&user_leds_s0>;
3030

31-
led@1 {
31+
led-1 {
3232
label = "pic32mzda_sk:red:led1";
3333
gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>;
3434
linux,default-trigger = "heartbeat";
3535
};
3636

37-
led@2 {
37+
led-2 {
3838
label = "pic32mzda_sk:yellow:led2";
3939
gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
4040
linux,default-trigger = "mmc0";
4141
};
4242

43-
led@3 {
43+
led-3 {
4444
label = "pic32mzda_sk:green:led3";
4545
gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
4646
default-state = "on";

0 commit comments

Comments
 (0)