Skip to content

Commit e5abd12

Browse files
kuba-mookuba-moo
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/broadcom/bnxt/bnxt.c f7ce5eb ("bnxt_en: Fix crash in bnxt_get_max_rss_ctx_ring()") 20c8ad7 ("eth: bnxt: use the RSS context XArray instead of the local list") Adjacent changes: net/ethtool/ioctl.c 503757c ("net: ethtool: Fix RSS setting") eac9122 ("net: ethtool: record custom RSS contexts in the XArray") Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 75fd607 + 528dd46 commit e5abd12

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+916
-277
lines changed

‎Documentation/devicetree/bindings/cache/qcom,llcc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ allOf:
6666
compatible:
6767
contains:
6868
enum:
69-
- qcom,qdu1000-llcc
7069
- qcom,sc7180-llcc
7170
- qcom,sm6350-llcc
7271
then:
@@ -104,6 +103,7 @@ allOf:
104103
compatible:
105104
contains:
106105
enum:
106+
- qcom,qdu1000-llcc
107107
- qcom,sc8180x-llcc
108108
- qcom,sc8280xp-llcc
109109
- qcom,x1e80100-llcc

‎MAINTAINERS

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2892,7 +2892,7 @@ F: drivers/edac/altera_edac.[ch]
28922892
ARM/SPREADTRUM SoC SUPPORT
28932893
M: Orson Zhai <[email protected]>
28942894
M: Baolin Wang <[email protected]>
2895-
M: Chunyan Zhang <[email protected]>
2895+
R: Chunyan Zhang <[email protected]>
28962896
S: Maintained
28972897
F: arch/arm64/boot/dts/sprd
28982898
N: sprd
@@ -8833,6 +8833,7 @@ F: drivers/spi/spi-fsl-qspi.c
88338833

88348834
FREESCALE QUICC ENGINE LIBRARY
88358835
M: Qiang Zhao <[email protected]>
8836+
M: Christophe Leroy <[email protected]>
88368837
L: [email protected]
88378838
S: Maintained
88388839
F: drivers/soc/fsl/qe/
@@ -8882,9 +8883,10 @@ S: Maintained
88828883
F: drivers/tty/serial/ucc_uart.c
88838884

88848885
FREESCALE SOC DRIVERS
8886+
M: Christophe Leroy <[email protected]>
88858887
L: [email protected]
88868888
L: [email protected] (moderated for non-subscribers)
8887-
S: Orphan
8889+
S: Maintained
88888890
F: Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml
88898891
F: Documentation/devicetree/bindings/soc/fsl/
88908892
F: drivers/soc/fsl/
@@ -16447,7 +16449,7 @@ F: arch/arm/boot/dts/ti/omap/am335x-nano.dts
1644716449
OMAP1 SUPPORT
1644816450
M: Aaro Koskinen <[email protected]>
1644916451
M: Janusz Krzysztofik <[email protected]>
16450-
M: Tony Lindgren <[email protected]>
16452+
R: Tony Lindgren <[email protected]>
1645116453
L: [email protected]
1645216454
S: Maintained
1645316455
Q: http://patchwork.kernel.org/project/linux-omap/list/
@@ -16459,10 +16461,13 @@ F: include/linux/platform_data/ams-delta-fiq.h
1645916461
F: include/linux/platform_data/i2c-omap.h
1646016462

1646116463
OMAP2+ SUPPORT
16464+
M: Aaro Koskinen <[email protected]>
16465+
M: Andreas Kemnade <[email protected]>
16466+
M: Kevin Hilman <[email protected]>
16467+
M: Roger Quadros <[email protected]>
1646216468
M: Tony Lindgren <[email protected]>
1646316469
L: [email protected]
1646416470
S: Maintained
16465-
W: http://www.muru.com/linux/omap/
1646616471
W: http://linux.omap.com/
1646716472
Q: http://patchwork.kernel.org/project/linux-omap/list/
1646816473
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git

‎arch/arm/mach-davinci/pm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static void davinci_pm_suspend(void)
6161

6262
/* Configure sleep count in deep sleep register */
6363
val = __raw_readl(pm_config.deepsleep_reg);
64-
val &= ~DEEPSLEEP_SLEEPCOUNT_MASK,
64+
val &= ~DEEPSLEEP_SLEEPCOUNT_MASK;
6565
val |= pm_config.sleepcount;
6666
__raw_writel(val, pm_config.deepsleep_reg);
6767

‎arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
compatible = "x-powers,axp803";
192192
reg = <0x3a3>;
193193
interrupt-parent = <&r_intc>;
194-
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_LOW>;
194+
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
195195
x-powers,drive-vbus-en;
196196

197197
vin1-supply = <&reg_vcc5v>;

‎arch/arm64/boot/dts/qcom/qdu1000.dtsi

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1459,9 +1459,23 @@
14591459

14601460
system-cache-controller@19200000 {
14611461
compatible = "qcom,qdu1000-llcc";
1462-
reg = <0 0x19200000 0 0xd80000>,
1462+
reg = <0 0x19200000 0 0x80000>,
1463+
<0 0x19300000 0 0x80000>,
1464+
<0 0x19600000 0 0x80000>,
1465+
<0 0x19700000 0 0x80000>,
1466+
<0 0x19a00000 0 0x80000>,
1467+
<0 0x19b00000 0 0x80000>,
1468+
<0 0x19e00000 0 0x80000>,
1469+
<0 0x19f00000 0 0x80000>,
14631470
<0 0x1a200000 0 0x80000>;
14641471
reg-names = "llcc0_base",
1472+
"llcc1_base",
1473+
"llcc2_base",
1474+
"llcc3_base",
1475+
"llcc4_base",
1476+
"llcc5_base",
1477+
"llcc6_base",
1478+
"llcc7_base",
14651479
"llcc_broadcast_base";
14661480
interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
14671481
};

‎arch/arm64/boot/dts/qcom/sa8775p.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3605,7 +3605,7 @@
36053605
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
36063606
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
36073607
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
3608-
<GIC_PPI 12 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
3608+
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
36093609
};
36103610

36113611
pcie0: pcie@1c00000 {

‎arch/arm64/boot/dts/qcom/sc8180x.dtsi

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2647,11 +2647,14 @@
26472647

26482648
system-cache-controller@9200000 {
26492649
compatible = "qcom,sc8180x-llcc";
2650-
reg = <0 0x09200000 0 0x50000>, <0 0x09280000 0 0x50000>,
2651-
<0 0x09300000 0 0x50000>, <0 0x09380000 0 0x50000>,
2652-
<0 0x09600000 0 0x50000>;
2650+
reg = <0 0x09200000 0 0x58000>, <0 0x09280000 0 0x58000>,
2651+
<0 0x09300000 0 0x58000>, <0 0x09380000 0 0x58000>,
2652+
<0 0x09400000 0 0x58000>, <0 0x09480000 0 0x58000>,
2653+
<0 0x09500000 0 0x58000>, <0 0x09580000 0 0x58000>,
2654+
<0 0x09600000 0 0x58000>;
26532655
reg-names = "llcc0_base", "llcc1_base", "llcc2_base",
2654-
"llcc3_base", "llcc_broadcast_base";
2656+
"llcc3_base", "llcc4_base", "llcc5_base",
2657+
"llcc6_base", "llcc7_base", "llcc_broadcast_base";
26552658
interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
26562659
};
26572660

‎arch/arm64/boot/dts/qcom/sc8280xp-crd.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -977,8 +977,7 @@
977977
reset-n-pins {
978978
pins = "gpio99";
979979
function = "gpio";
980-
output-high;
981-
drive-strength = <16>;
980+
bias-disable;
982981
};
983982
};
984983

‎arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -655,15 +655,16 @@
655655

656656
status = "okay";
657657

658-
/* FIXME: verify */
659658
touchscreen@10 {
660-
compatible = "hid-over-i2c";
659+
compatible = "elan,ekth5015m", "elan,ekth6915";
661660
reg = <0x10>;
662661

663-
hid-descr-addr = <0x1>;
664662
interrupts-extended = <&tlmm 175 IRQ_TYPE_LEVEL_LOW>;
665-
vdd-supply = <&vreg_misc_3p3>;
666-
vddl-supply = <&vreg_s10b>;
663+
reset-gpios = <&tlmm 99 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
664+
no-reset-on-power-off;
665+
666+
vcc33-supply = <&vreg_misc_3p3>;
667+
vccio-supply = <&vreg_misc_3p3>;
667668

668669
pinctrl-names = "default";
669670
pinctrl-0 = <&ts0_default>;
@@ -1496,8 +1497,8 @@
14961497
reset-n-pins {
14971498
pins = "gpio99";
14981499
function = "gpio";
1499-
output-high;
1500-
drive-strength = <16>;
1500+
drive-strength = <2>;
1501+
bias-disable;
15011502
};
15021503
};
15031504

‎arch/arm64/boot/dts/qcom/sc8280xp.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4623,6 +4623,8 @@
46234623
restart@c264000 {
46244624
compatible = "qcom,pshold";
46254625
reg = <0 0x0c264000 0 0x4>;
4626+
/* TZ seems to block access */
4627+
status = "reserved";
46264628
};
46274629

46284630
tsens1: thermal-sensor@c265000 {

0 commit comments

Comments
 (0)