Skip to content

Commit 42accad

Browse files
olofjolofj
committed
Merge branch 'arm/fixes' into arm/soc
Merging in the last batch of fixes that didn't go in before previous release, just a few smaller DT fixups and a MAINTAINERS update * arm/fixes: (29 commits) MAINTAINERS: Add myself as TEE subsystem reviewer ARM: dts: ux500: Fix LED probing arm64: dts: rockchip: Update RK3399 PCI host bridge window to 32-bit address memory arm64: dts: allwinner: a64-sopine-baseboard: change RGMII mode to TXID arm64: meson: select COMMON_CLK soc: amlogic: meson-clk-measure: remove redundant dev_err call in meson_msr_probe() ARM: dts: qcom: sdx55-telit: Represent secure-regions as 64-bit elements ARM: dts: qcom: sdx55-t55: Represent secure-regions as 64-bit elements ARM: dts: sun8i: h3: orangepi-plus: Fix ethernet phy-mode ARM: dts: imx: emcon-avari: Fix nxp,pca8574 #gpio-cells ARM: dts: imx7d-pico: Fix the 'tuning-step' property ARM: dts: imx7d-meerkat96: Fix the 'tuning-step' property arm64: dts: freescale: sl28: var1: fix RGMII clock and voltage arm64: dts: freescale: sl28: var4: fix RGMII clock and voltage ARM: imx: pm-imx27: Include "common.h" arm64: dts: zii-ultra: fix 12V_MAIN voltage arm64: dts: zii-ultra: remove second GEN_3V3 regulator instance arm64: dts: ls1028a: fix memory node optee: use export_uuid() to copy client UUID arm64: dts: ti: k3*: Introduce reg definition for interrupt routers ...
2 parents 95ef715 + 048c958 commit 42accad

32 files changed

Lines changed: 108 additions & 107 deletions

‎MAINTAINERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17921,6 +17921,7 @@ F: include/media/i2c/tw9910.h
1792117921

1792217922
TEE SUBSYSTEM
1792317923
M: Jens Wiklander <jens.wiklander@linaro.org>
17924+
R: Sumit Garg <sumit.garg@linaro.org>
1792417925
L: op-tee@lists.trustedfirmware.org
1792517926
S: Maintained
1792617927
F: Documentation/staging/tee.rst

‎arch/arm/boot/dts/imx6dl-yapp4-common.dtsi‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,13 @@
105105
phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
106106
phy-reset-duration = <20>;
107107
phy-supply = <&sw2_reg>;
108-
phy-handle = <&ethphy0>;
109108
status = "okay";
110109

110+
fixed-link {
111+
speed = <1000>;
112+
full-duplex;
113+
};
114+
111115
mdio {
112116
#address-cells = <1>;
113117
#size-cells = <0>;

‎arch/arm/boot/dts/imx6q-dhcom-som.dtsi‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,18 @@
406406
vin-supply = <&sw1_reg>;
407407
};
408408

409+
&reg_pu {
410+
vin-supply = <&sw1_reg>;
411+
};
412+
413+
&reg_vdd1p1 {
414+
vin-supply = <&sw2_reg>;
415+
};
416+
417+
&reg_vdd2p5 {
418+
vin-supply = <&sw2_reg>;
419+
};
420+
409421
&uart1 {
410422
pinctrl-names = "default";
411423
pinctrl-0 = <&pinctrl_uart1>;

‎arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
compatible = "nxp,pca8574";
127127
reg = <0x3a>;
128128
gpio-controller;
129-
#gpio-cells = <1>;
129+
#gpio-cells = <2>;
130130
};
131131
};
132132

‎arch/arm/boot/dts/imx7d-meerkat96.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
pinctrl-names = "default";
194194
pinctrl-0 = <&pinctrl_usdhc1>;
195195
keep-power-in-suspend;
196-
tuning-step = <2>;
196+
fsl,tuning-step = <2>;
197197
vmmc-supply = <&reg_3p3v>;
198198
no-1-8-v;
199199
broken-cd;

‎arch/arm/boot/dts/imx7d-pico.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
352352
cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
353353
bus-width = <4>;
354-
tuning-step = <2>;
354+
fsl,tuning-step = <2>;
355355
vmmc-supply = <&reg_3p3v>;
356356
wakeup-source;
357357
no-1-8-v;

‎arch/arm/boot/dts/qcom-sdx55-t55.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
nand-ecc-step-size = <512>;
251251
nand-bus-width = <8>;
252252
/* efs2 partition is secured */
253-
secure-regions = <0x500000 0xb00000>;
253+
secure-regions = /bits/ 64 <0x500000 0xb00000>;
254254
};
255255
};
256256

‎arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@
250250
nand-ecc-step-size = <512>;
251251
nand-bus-width = <8>;
252252
/* ico and efs2 partitions are secured */
253-
secure-regions = <0x500000 0x500000
254-
0xa00000 0xb00000>;
253+
secure-regions = /bits/ 64 <0x500000 0x500000
254+
0xa00000 0xb00000>;
255255
};
256256
};
257257

‎arch/arm/boot/dts/ste-href.dtsi‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*/
55

66
#include <dt-bindings/interrupt-controller/irq.h>
7+
#include <dt-bindings/leds/common.h>
78
#include "ste-href-family-pinctrl.dtsi"
89

910
/ {
@@ -64,17 +65,20 @@
6465
reg = <0>;
6566
led-cur = /bits/ 8 <0x2f>;
6667
max-cur = /bits/ 8 <0x5f>;
68+
color = <LED_COLOR_ID_BLUE>;
6769
linux,default-trigger = "heartbeat";
6870
};
6971
chan@1 {
7072
reg = <1>;
7173
led-cur = /bits/ 8 <0x2f>;
7274
max-cur = /bits/ 8 <0x5f>;
75+
color = <LED_COLOR_ID_BLUE>;
7376
};
7477
chan@2 {
7578
reg = <2>;
7679
led-cur = /bits/ 8 <0x2f>;
7780
max-cur = /bits/ 8 <0x5f>;
81+
color = <LED_COLOR_ID_BLUE>;
7882
};
7983
};
8084
lp5521@34 {
@@ -88,16 +92,19 @@
8892
reg = <0>;
8993
led-cur = /bits/ 8 <0x2f>;
9094
max-cur = /bits/ 8 <0x5f>;
95+
color = <LED_COLOR_ID_BLUE>;
9196
};
9297
chan@1 {
9398
reg = <1>;
9499
led-cur = /bits/ 8 <0x2f>;
95100
max-cur = /bits/ 8 <0x5f>;
101+
color = <LED_COLOR_ID_BLUE>;
96102
};
97103
chan@2 {
98104
reg = <2>;
99105
led-cur = /bits/ 8 <0x2f>;
100106
max-cur = /bits/ 8 <0x5f>;
107+
color = <LED_COLOR_ID_BLUE>;
101108
};
102109
};
103110
bh1780@29 {

‎arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
pinctrl-0 = <&emac_rgmii_pins>;
8686
phy-supply = <&reg_gmac_3v3>;
8787
phy-handle = <&ext_rgmii_phy>;
88-
phy-mode = "rgmii";
88+
phy-mode = "rgmii-id";
8989

9090
status = "okay";
9191
};

0 commit comments

Comments
 (0)