Skip to content

Commit 6279026

Browse files
committed
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Olof Johansson: "We've been accruing these for a couple of weeks, so the batch is a bit bigger than usual. Largest delta is due to a led-bl driver that is added -- there was a miscommunication before the merge window and the driver didn't make it in. Due to this, the platforms needing it regressed. At this point, it seemed easier to add the new driver than unwind the changes. Besides that, there are a handful of various fixes: - AMD tee memory leak fix - A handful of fixlets for i.MX SCU communication - A few maintainers woke up and realized DEBUG_FS had been missing for a while, so a few updates of that. ... and the usual collection of smaller fixes to various platforms" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (37 commits) ARM: socfpga_defconfig: Add back DEBUG_FS arm64: dts: socfpga: agilex: Fix gmac compatible ARM: bcm2835_defconfig: Explicitly restore CONFIG_DEBUG_FS arm64: dts: meson: fix gxm-khadas-vim2 wifi arm64: dts: meson-sm1-sei610: add missing interrupt-names ARM: meson: Drop unneeded select of COMMON_CLK ARM: dts: bcm2711: Add pcie0 alias ARM: dts: bcm283x: Add missing properties to the PWR LED tee: amdtee: fix memory leak in amdtee_open_session() ARM: OMAP2+: Fix compile if CONFIG_HAVE_ARM_SMCCC is not set arm: dts: dra76x: Fix mmc3 max-frequency ARM: dts: dra7: Add "dma-ranges" property to PCIe RC DT nodes bus: ti-sysc: Fix 1-wire reset quirk ARM: dts: r8a7779: Remove deprecated "renesas, rcar-sata" compatible value soc: imx-scu: Align imx sc msg structs to 4 firmware: imx: Align imx_sc_msg_req_cpu_start to 4 firmware: imx: scu-pd: Align imx sc msg structs to 4 firmware: imx: misc: Align imx sc msg structs to 4 firmware: imx: scu: Ensure sequential TX ARM: dts: imx7-colibri: Fix frequency for sd/mmc ...
2 parents efe582a + d4d89e2 commit 6279026

Some content is hidden

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

43 files changed

+416
-91
lines changed

Documentation/devicetree/bindings/reset/intel,rcu-gw.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ properties:
2323
description: Global reset register offset and bit offset.
2424
allOf:
2525
- $ref: /schemas/types.yaml#/definitions/uint32-array
26-
- maxItems: 2
26+
items:
27+
- description: Register offset
28+
- description: Register bit offset
29+
minimum: 0
30+
maximum: 31
2731

2832
"#reset-cells":
2933
minimum: 2

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14226,7 +14226,7 @@ F: include/dt-bindings/reset/
1422614226
F: include/linux/reset.h
1422714227
F: include/linux/reset/
1422814228
F: include/linux/reset-controller.h
14229-
K: \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
14229+
K: \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
1423014230

1423114231
RESTARTABLE SEQUENCES SUPPORT
1423214232
M: Mathieu Desnoyers <[email protected]>

arch/arm/boot/dts/am437x-idk-evm.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,11 +526,11 @@
526526
* Supply voltage supervisor on board will not allow opp50 so
527527
* disable it and set opp100 as suspend OPP.
528528
*/
529-
opp50@300000000 {
529+
opp50-300000000 {
530530
status = "disabled";
531531
};
532532

533-
opp100@600000000 {
533+
opp100-600000000 {
534534
opp-suspend;
535535
};
536536
};

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
aliases {
2323
ethernet0 = &genet;
24+
pcie0 = &pcie0;
2425
};
2526

2627
leds {
@@ -31,6 +32,8 @@
3132
pwr {
3233
label = "PWR";
3334
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
35+
default-state = "keep";
36+
linux,default-trigger = "default-on";
3437
};
3538
};
3639

arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
pwr {
2727
label = "PWR";
2828
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
29+
default-state = "keep";
30+
linux,default-trigger = "default-on";
2931
};
3032
};
3133
};

arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
pwr {
2828
label = "PWR";
2929
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
30+
default-state = "keep";
31+
linux,default-trigger = "default-on";
3032
};
3133
};
3234

arch/arm/boot/dts/dra7-evm.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
regulator-max-microvolt = <1800000>;
6262
};
6363

64-
evm_3v3: fixedregulator-evm3v3 {
64+
vsys_3v3: fixedregulator-vsys3v3 {
6565
/* Output of Cntlr A of TPS43351-Q1 on dra7-evm */
6666
compatible = "regulator-fixed";
67-
regulator-name = "evm_3v3";
67+
regulator-name = "vsys_3v3";
6868
regulator-min-microvolt = <3300000>;
6969
regulator-max-microvolt = <3300000>;
7070
vin-supply = <&evm_12v0>;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3474,6 +3474,7 @@
34743474
clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER13_CLKCTRL 24>;
34753475
clock-names = "fck";
34763476
interrupts = <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>;
3477+
ti,timer-pwm;
34773478
};
34783479
};
34793480

@@ -3501,6 +3502,7 @@
35013502
clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER14_CLKCTRL 24>;
35023503
clock-names = "fck";
35033504
interrupts = <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>;
3505+
ti,timer-pwm;
35043506
};
35053507
};
35063508

@@ -3528,6 +3530,7 @@
35283530
clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER15_CLKCTRL 24>;
35293531
clock-names = "fck";
35303532
interrupts = <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>;
3533+
ti,timer-pwm;
35313534
};
35323535
};
35333536

@@ -3555,6 +3558,7 @@
35553558
clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER16_CLKCTRL 24>;
35563559
clock-names = "fck";
35573560
interrupts = <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>;
3561+
ti,timer-pwm;
35583562
};
35593563
};
35603564

arch/arm/boot/dts/dra7.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@
184184
device_type = "pci";
185185
ranges = <0x81000000 0 0 0x03000 0 0x00010000
186186
0x82000000 0 0x20013000 0x13000 0 0xffed000>;
187+
dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;
187188
bus-range = <0x00 0xff>;
188189
#interrupt-cells = <1>;
189190
num-lanes = <1>;
@@ -238,6 +239,7 @@
238239
device_type = "pci";
239240
ranges = <0x81000000 0 0 0x03000 0 0x00010000
240241
0x82000000 0 0x30013000 0x13000 0 0xffed000>;
242+
dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;
241243
bus-range = <0x00 0xff>;
242244
#interrupt-cells = <1>;
243245
num-lanes = <1>;

arch/arm/boot/dts/dra76x.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,3 +128,8 @@
128128
&usb4_tm {
129129
status = "disabled";
130130
};
131+
132+
&mmc3 {
133+
/* dra76x is not affected by i887 */
134+
max-frequency = <96000000>;
135+
};

0 commit comments

Comments
 (0)