Skip to content

Commit 7b82df3

Browse files
arndbarndb
committed
Merge branch 'arm/fixes' into soc/late2
* arm/fixes: arm64: dts: imx8mm-tqma8mqml: Correct PAD settings for PMIC_nINT arm64: dts: imx8mn-tqma8mqnl: Correct PAD settings for PMIC_nINT arm64: dts: imx8mm-emtop-som: Correct PAD settings for PMIC_nINT reset: amlogic: t7: Fix null reset ops arm64: dts: imx8mp-data-modul-edm-sbc: Correct PAD settings for PMIC_nINT arm64: dts: imx8mp-dhcom-som: Correct PAD settings for PMIC_nINT arm64: dts: imx8mp-ultra-mach-sbc: Correct PAD settings for PMIC_nINT arm64: dts: imx8mp-sr-som: Correct PAD settings for PMIC_nINT arm64: dts: imx8mp-nitrogen-som: Correct PAD settings for PMIC_nINT arm64: dts: imx8mp-aristainetos3a-som-v1: Correct PAD settings for PMIC_nINT arm64: dts: imx8mp-edm-g: Correct PAD settings for PMIC_nINT arm64: dts: imx8mp-icore-mx8mp: Correct PAD settings for PMIC_nINT arm64: dts: imx8mp-navqp: Correct PAD settings for PMIC_nINT arm64: dts: imx8mp-debix-som-a: Correct PAD settings for PMIC_nINT arm64: dts: imx8mp-debix-model-a: Correct PAD settings for PMIC_nINT dt-bindings: arm64: add Marvell 7k COMe boards
2 parents 8242c70 + 3e24440 commit 7b82df3

17 files changed

Lines changed: 30 additions & 18 deletions

‎Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,17 @@ properties:
2121
- const: marvell,armada-ap806-dual
2222
- const: marvell,armada-ap806
2323

24+
- description:
25+
Falcon (DB-98CX85x0) Development board COM Express Carrier plus
26+
Armada 7020 SoC COM Express CPU module
27+
items:
28+
- const: marvell,armada7020-falcon-carrier
29+
- const: marvell,db-falcon-carrier
30+
- const: marvell,armada7020-cpu-module
31+
- const: marvell,armada7020
32+
- const: marvell,armada-ap806-dual
33+
- const: marvell,armada-ap806
34+
2435
- description: Armada 7040 SoC
2536
items:
2637
- enum:

‎arch/arm64/boot/dts/freescale/imx8mm-emtop-som.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
pinctrl-names = "default";
6161
pinctrl-0 = <&pinctrl_pmic>;
6262
interrupt-parent = <&gpio1>;
63-
interrupts = <3 IRQ_TYPE_EDGE_RISING>;
63+
interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
6464

6565
regulators {
6666
buck1: BUCK1 {
@@ -194,7 +194,7 @@
194194

195195
pinctrl_pmic: emtop-pmic-grp {
196196
fsl,pins = <
197-
MX8MM_IOMUXC_GPIO1_IO03_GPIO1_IO3 0x41
197+
MX8MM_IOMUXC_GPIO1_IO03_GPIO1_IO3 0x141
198198
>;
199199
};
200200

‎arch/arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
};
293293

294294
pinctrl_pmic: pmicgrp {
295-
fsl,pins = <MX8MM_IOMUXC_GPIO1_IO08_GPIO1_IO8 0x94>;
295+
fsl,pins = <MX8MM_IOMUXC_GPIO1_IO08_GPIO1_IO8 0x1d4>;
296296
};
297297

298298
pinctrl_reg_usdhc2_vmmc: regusdhc2vmmcgrp {

‎arch/arm64/boot/dts/freescale/imx8mn-tqma8mqnl.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@
283283
};
284284

285285
pinctrl_pmic: pmicgrp {
286-
fsl,pins = <MX8MN_IOMUXC_GPIO1_IO08_GPIO1_IO8 0x84>;
286+
fsl,pins = <MX8MN_IOMUXC_GPIO1_IO08_GPIO1_IO8 0x1c4>;
287287
};
288288

289289
pinctrl_reg_usdhc2_vmmc: regusdhc2vmmcgrp {

‎arch/arm64/boot/dts/freescale/imx8mp-aristainetos3a-som-v1.dtsi‎

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

904904
pinctrl_pmic: aristainetos3-pmic-grp {
905905
fsl,pins = <
906-
MX8MP_IOMUXC_GPIO1_IO03__GPIO1_IO03 0x41
906+
MX8MP_IOMUXC_GPIO1_IO03__GPIO1_IO03 0x1c0
907907
>;
908908
};
909909

‎arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@
10011001
pinctrl_pmic: pmic-grp {
10021002
fsl,pins = <
10031003
/* PMIC_nINT */
1004-
MX8MP_IOMUXC_GPIO1_IO03__GPIO1_IO03 0x40000090
1004+
MX8MP_IOMUXC_GPIO1_IO03__GPIO1_IO03 0x1c0
10051005
>;
10061006
};
10071007

‎arch/arm64/boot/dts/freescale/imx8mp-debix-model-a.dts‎

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

441441
pinctrl_pmic: pmicirqgrp {
442442
fsl,pins = <
443-
MX8MP_IOMUXC_GPIO1_IO03__GPIO1_IO03 0x41
443+
MX8MP_IOMUXC_GPIO1_IO03__GPIO1_IO03 0x1c0
444444
>;
445445
};
446446

‎arch/arm64/boot/dts/freescale/imx8mp-debix-som-a-bmb-08.dts‎

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

500500
pinctrl_pmic: pmicgrp {
501501
fsl,pins = <
502-
MX8MP_IOMUXC_GPIO1_IO03__GPIO1_IO03 0x41
502+
MX8MP_IOMUXC_GPIO1_IO03__GPIO1_IO03 0x1c0
503503
>;
504504
};
505505

‎arch/arm64/boot/dts/freescale/imx8mp-debix-som-a.dtsi‎

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

242242
pinctrl_pmic: pmicgrp {
243243
fsl,pins = <
244-
MX8MP_IOMUXC_GPIO1_IO03__GPIO1_IO03 0x41
244+
MX8MP_IOMUXC_GPIO1_IO03__GPIO1_IO03 0x1c0
245245
>;
246246
};
247247

‎arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@
989989
pinctrl_pmic: dhcom-pmic-grp {
990990
fsl,pins = <
991991
/* PMIC_nINT */
992-
MX8MP_IOMUXC_GPIO1_IO03__GPIO1_IO03 0x40000090
992+
MX8MP_IOMUXC_GPIO1_IO03__GPIO1_IO03 0x1c0
993993
>;
994994
};
995995

0 commit comments

Comments
 (0)