Skip to content

Commit 347f56f

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Olof Johansson: "A set of fixes that we've merged late, but for the most part that have been sitting in -next for a while through platform maintainer trees: - Fixes to suspend/resume on Tegra, caused by the added features this merge window - Cleanups and minor fixes to TI additions this merge window - Tee fixes queued up late before the merge window, included here. - A handful of other fixlets There's also a refresh of the shareed config files (multi_v* on 32-bit, and defconfig on 64-bit), to avoid conflicts when we get new contributions" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (32 commits) ARM: multi_v7_defconfig: Restore debugfs support ARM: defconfig: re-run savedefconfig on multi_v* configs arm64: defconfig: re-run savedefconfig ARM: pxa: Fix resource properties soc: mediatek: cmdq: fixup wrong input order of write api soc: aspeed: Fix snoop_file_poll()'s return type MAINTAINERS: Switch to Marvell addresses MAINTAINERS: update Cavium ThunderX drivers Revert "arm64: dts: juno: add dma-ranges property" MAINTAINERS: Make Nicolas Saenz Julienne the new bcm2835 maintainer firmware: arm_scmi: Avoid double free in error flow arm64: dts: juno: Fix UART frequency ARM: dts: Fix sgx sysconfig register for omap4 arm: socfpga: execute cold reboot by default ARM: dts: Fix vcsi regulator to be always-on for droid4 to prevent hangs ARM: dts: dra7: fix cpsw mdio fck clock ARM: dts: am57xx-beagle-x15: Update pinmux name to ddr_3_3v ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity soc/tegra: pmc: Add reset sources and levels on Tegra194 soc/tegra: pmc: Add missing IRQ callbacks on Tegra194 ...
2 parents 9888428 + 30f55ea commit 347f56f

32 files changed

+312
-139
lines changed

‎.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@ James E Wilson <[email protected]>
105105
James Hogan <[email protected]> <[email protected]>
106106
James Hogan <[email protected]> <[email protected]>
107107
James Ketrenos <jketreno@io.(none)>
108+
Jan Glauber <[email protected]> <[email protected]>
109+
Jan Glauber <[email protected]> <[email protected]>
110+
Jan Glauber <[email protected]> <[email protected]>
108111
Jason Gunthorpe <[email protected]> <[email protected]>
109112
Jason Gunthorpe <[email protected]> <[email protected]>
110113
Javi Merino <[email protected]> <[email protected]>

‎MAINTAINERS

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,8 +1584,8 @@ S: Maintained
15841584
F: arch/arm/mach-cns3xxx/
15851585

15861586
ARM/CAVIUM THUNDER NETWORK DRIVER
1587-
M: Sunil Goutham <sgoutham@cavium.com>
1588-
M: Robert Richter <[email protected]>
1587+
M: Sunil Goutham <sgoutham@marvell.com>
1588+
M: Robert Richter <[email protected]>
15891589
L: [email protected] (moderated for non-subscribers)
15901590
S: Supported
15911591
F: drivers/net/ethernet/cavium/thunder/
@@ -3228,8 +3228,7 @@ N: kona
32283228
F: arch/arm/mach-bcm/
32293229

32303230
BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
3231-
M: Eric Anholt <[email protected]>
3232-
M: Stefan Wahren <[email protected]>
3231+
M: Nicolas Saenz Julienne <[email protected]>
32333232
L: [email protected]
32343233
L: [email protected] (moderated for non-subscribers)
32353234
L: [email protected] (moderated for non-subscribers)
@@ -3742,9 +3741,8 @@ S: Maintained
37423741
F: drivers/net/wireless/ath/carl9170/
37433742

37443743
CAVIUM I2C DRIVER
3745-
M: Jan Glauber <[email protected]>
3746-
M: David Daney <[email protected]>
3747-
W: http://www.cavium.com
3744+
M: Robert Richter <[email protected]>
3745+
W: http://www.marvell.com
37483746
S: Supported
37493747
F: drivers/i2c/busses/i2c-octeon*
37503748
F: drivers/i2c/busses/i2c-thunderx*
@@ -3754,27 +3752,25 @@ M: Derek Chickles <[email protected]>
37543752
M: Satanand Burla <[email protected]>
37553753
M: Felix Manlunas <[email protected]>
37563754
L: [email protected]
3757-
W: http://www.cavium.com
3755+
W: http://www.marvell.com
37583756
S: Supported
37593757
F: drivers/net/ethernet/cavium/liquidio/
37603758

37613759
CAVIUM MMC DRIVER
3762-
M: Jan Glauber <[email protected]>
3763-
M: David Daney <[email protected]>
3764-
M: Steven J. Hill <[email protected]>
3765-
W: http://www.cavium.com
3760+
M: Robert Richter <[email protected]>
3761+
W: http://www.marvell.com
37663762
S: Supported
37673763
F: drivers/mmc/host/cavium*
37683764

37693765
CAVIUM OCTEON-TX CRYPTO DRIVER
3770-
M: George Cherian <george.cherian@cavium.com>
3766+
M: George Cherian <gcherian@marvell.com>
37713767
L: [email protected]
3772-
W: http://www.cavium.com
3768+
W: http://www.marvell.com
37733769
S: Supported
37743770
F: drivers/crypto/cavium/cpt/
37753771

37763772
CAVIUM THUNDERX2 ARM64 SOC
3777-
M: Robert Richter <rrichter@cavium.com>
3773+
M: Robert Richter <rrichter@marvell.com>
37783774
L: [email protected] (moderated for non-subscribers)
37793775
S: Maintained
37803776
F: arch/arm64/boot/dts/cavium/thunder2-99xx*
@@ -5892,15 +5888,14 @@ F: drivers/edac/highbank*
58925888

58935889
EDAC-CAVIUM OCTEON
58945890
M: Ralf Baechle <[email protected]>
5895-
M: David Daney <david.daney@cavium.com>
5891+
M: Robert Richter <rrichter@marvell.com>
58965892
L: [email protected]
58975893
L: [email protected]
58985894
S: Supported
58995895
F: drivers/edac/octeon_edac*
59005896

59015897
EDAC-CAVIUM THUNDERX
5902-
M: David Daney <[email protected]>
5903-
M: Jan Glauber <[email protected]>
5898+
M: Robert Richter <[email protected]>
59045899
L: [email protected]
59055900
S: Supported
59065901
F: drivers/edac/thunderx_edac*
@@ -12799,7 +12794,7 @@ F: Documentation/devicetree/bindings/pci/axis,artpec*
1279912794
F: drivers/pci/controller/dwc/*artpec*
1280012795

1280112796
PCIE DRIVER FOR CAVIUM THUNDERX
12802-
M: David Daney <david.daney@cavium.com>
12797+
M: Robert Richter <rrichter@marvell.com>
1280312798
L: [email protected]
1280412799
L: [email protected] (moderated for non-subscribers)
1280512800
S: Supported
@@ -16372,7 +16367,7 @@ S: Maintained
1637216367
F: drivers/net/thunderbolt.c
1637316368

1637416369
THUNDERX GPIO DRIVER
16375-
M: David Daney <david.daney@cavium.com>
16370+
M: Robert Richter <rrichter@marvell.com>
1637616371
S: Maintained
1637716372
F: drivers/gpio/gpio-thunderx.c
1637816373

@@ -18177,10 +18172,9 @@ S: Supported
1817718172
F: drivers/char/xillybus/
1817818173

1817918174
XLP9XX I2C DRIVER
18180-
M: George Cherian <[email protected]>
18181-
M: Jan Glauber <[email protected]>
18175+
M: George Cherian <[email protected]>
1818218176
L: [email protected]
18183-
W: http://www.cavium.com
18177+
W: http://www.marvell.com
1818418178
S: Supported
1818518179
F: Documentation/devicetree/bindings/i2c/i2c-xlp9xx.txt
1818618180
F: drivers/i2c/busses/i2c-xlp9xx.c

‎arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
};
2525

2626
&mmc2 {
27-
pinctrl-names = "default", "hs", "ddr_1_8v";
27+
pinctrl-names = "default", "hs", "ddr_3_3v";
2828
pinctrl-0 = <&mmc2_pins_default>;
2929
pinctrl-1 = <&mmc2_pins_hs>;
3030
pinctrl-2 = <&mmc2_pins_ddr_3_3v_rev11 &mmc2_iodelay_ddr_3_3v_rev11_conf>;

‎arch/arm/boot/dts/am57xx-beagle-x15-revc.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
};
2525

2626
&mmc2 {
27-
pinctrl-names = "default", "hs", "ddr_1_8v";
27+
pinctrl-names = "default", "hs", "ddr_3_3v";
2828
pinctrl-0 = <&mmc2_pins_default>;
2929
pinctrl-1 = <&mmc2_pins_hs>;
3030
pinctrl-2 = <&mmc2_pins_ddr_rev20>;

‎arch/arm/boot/dts/bcm2711-rpi-4-b.dts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
reg = <0 0 0>;
2020
};
2121

22+
aliases {
23+
ethernet0 = &genet;
24+
};
25+
2226
leds {
2327
act {
2428
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
@@ -97,6 +101,19 @@
97101
status = "okay";
98102
};
99103

104+
&genet {
105+
phy-handle = <&phy1>;
106+
phy-mode = "rgmii-rxid";
107+
status = "okay";
108+
};
109+
110+
&genet_mdio {
111+
phy1: ethernet-phy@1 {
112+
/* No PHY interrupt */
113+
reg = <0x1>;
114+
};
115+
};
116+
100117
/* uart0 communicates with the BT module */
101118
&uart0 {
102119
pinctrl-names = "default";

‎arch/arm/boot/dts/bcm2711.dtsi

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,26 @@
1212

1313
interrupt-parent = <&gicv2>;
1414

15+
reserved-memory {
16+
#address-cells = <2>;
17+
#size-cells = <1>;
18+
ranges;
19+
20+
/*
21+
* arm64 reserves the CMA by default somewhere in ZONE_DMA32,
22+
* that's not good enough for the BCM2711 as some devices can
23+
* only address the lower 1G of memory (ZONE_DMA).
24+
*/
25+
linux,cma {
26+
compatible = "shared-dma-pool";
27+
size = <0x2000000>; /* 32MB */
28+
alloc-ranges = <0x0 0x00000000 0x40000000>;
29+
reusable;
30+
linux,cma-default;
31+
};
32+
};
33+
34+
1535
soc {
1636
/*
1737
* Defined ranges:
@@ -305,6 +325,32 @@
305325
cpu-release-addr = <0x0 0x000000f0>;
306326
};
307327
};
328+
329+
scb {
330+
compatible = "simple-bus";
331+
#address-cells = <2>;
332+
#size-cells = <1>;
333+
334+
ranges = <0x0 0x7c000000 0x0 0xfc000000 0x03800000>;
335+
336+
genet: ethernet@7d580000 {
337+
compatible = "brcm,bcm2711-genet-v5";
338+
reg = <0x0 0x7d580000 0x10000>;
339+
#address-cells = <0x1>;
340+
#size-cells = <0x1>;
341+
interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
342+
<GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
343+
status = "disabled";
344+
345+
genet_mdio: mdio@e14 {
346+
compatible = "brcm,genet-mdio-v5";
347+
reg = <0xe14 0x8>;
348+
reg-names = "mdio";
349+
#address-cells = <0x0>;
350+
#size-cells = <0x1>;
351+
};
352+
};
353+
};
308354
};
309355

310356
&clk_osc {

‎arch/arm/boot/dts/dra7-l4.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3056,7 +3056,7 @@
30563056

30573057
davinci_mdio: mdio@1000 {
30583058
compatible = "ti,cpsw-mdio","ti,davinci_mdio";
3059-
clocks = <&gmac_clkctrl DRA7_GMAC_GMAC_CLKCTRL 0>;
3059+
clocks = <&gmac_main_clk>;
30603060
clock-names = "fck";
30613061
#address-cells = <1>;
30623062
#size-cells = <0>;

‎arch/arm/boot/dts/logicpd-torpedo-37xx-devkit-28.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@
1111
#include "logicpd-torpedo-37xx-devkit.dts"
1212

1313
&lcd0 {
14-
/* To make it work, set CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=4 */
1514
compatible = "logicpd,type28";
1615
};

‎arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@
101101
};
102102
};
103103

104+
&hdqw1w {
105+
pinctrl-names = "default";
106+
pinctrl-0 = <&hdq_pins>;
107+
};
108+
109+
104110
&vpll2 {
105111
regulator-always-on;
106112
};
@@ -126,7 +132,6 @@
126132

127133
lcd0: display {
128134
/* This isn't the exact LCD, but the timings meet spec */
129-
/* To make it work, set CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=4 */
130135
compatible = "newhaven,nhd-4.3-480272ef-atxl";
131136
label = "15";
132137
pinctrl-names = "default";
@@ -169,6 +174,12 @@
169174
>;
170175
};
171176

177+
hdq_pins: hdq_pins {
178+
pinctrl-single,pins = <
179+
OMAP3_CORE1_IOPAD(0x21c6, PIN_INPUT_PULLUP | MUX_MODE0) /* hdq_sio */
180+
>;
181+
};
182+
172183
pwm_pins: pinmux_pwm_pins {
173184
pinctrl-single,pins = <
174185
OMAP3_CORE1_IOPAD(0x20B8, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE3) /* gpmc_ncs5.gpt_10_pwm_evt */

‎arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,12 @@
162162
regulator-enable-ramp-delay = <1000>;
163163
};
164164

165-
/* Used by DSS */
165+
/* Used by DSS and is the "zerov_regulator" trigger for SoC off mode */
166166
vcsi: VCSI {
167167
regulator-min-microvolt = <1800000>;
168168
regulator-max-microvolt = <1800000>;
169169
regulator-enable-ramp-delay = <1000>;
170-
regulator-boot-on;
170+
regulator-always-on;
171171
};
172172

173173
vdac: VDAC {

0 commit comments

Comments
 (0)