diff --git a/boards/arm/mps3/mps3-pinctrl.dtsi b/boards/arm/mps3/mps3-pinctrl.dtsi new file mode 100644 index 00000000000..17b143ae644 --- /dev/null +++ b/boards/arm/mps3/mps3-pinctrl.dtsi @@ -0,0 +1,68 @@ +/* + * Copyright 2025 Arm Limited and/or its affiliates + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +&pinctrl { + /omit-if-no-ref/ uart3_default: uart3_default { + group1 { + pinmux = ; + }; + + group2 { + pinmux = ; + input-enable; + }; + }; + + /omit-if-no-ref/ uart4_default: uart4_default { + group1 { + pinmux = ; + }; + + group2 { + pinmux = ; + input-enable; + }; + }; + + /omit-if-no-ref/ spi3_default: spi3_default { + group1 { + pinmux = , , + ; + }; + + group2 { + pinmux = ; + input-enable; + }; + }; + + /omit-if-no-ref/ spi4_default: spi4_default { + group1 { + pinmux = , , ; + }; + + group2 { + pinmux = ; + input-enable; + }; + }; + + /omit-if-no-ref/ sbcon2_default: sbcon2_default { + group1 { + pinmux = , ; + input-enable; + }; + }; + + /omit-if-no-ref/ sbcon3_default: sbcon3_default { + group1 { + pinmux = , ; + input-enable; + }; + }; +}; diff --git a/boards/arm/mps3/mps3_common.dtsi b/boards/arm/mps3/mps3_common.dtsi index 798af263310..3348101bc72 100644 --- a/boards/arm/mps3/mps3_common.dtsi +++ b/boards/arm/mps3/mps3_common.dtsi @@ -1,5 +1,5 @@ /* - * Copyright 2024 Arm Limited and/or its affiliates + * Copyright 2024-2025 Arm Limited and/or its affiliates * * SPDX-License-Identifier: Apache-2.0 */ @@ -104,3 +104,4 @@ &nvic { arm,num-irq-priority-bits = <3>; }; +#include "mps3-pinctrl.dtsi" diff --git a/boards/arm/mps3/mps3_common_soc_peripheral.dtsi b/boards/arm/mps3/mps3_common_soc_peripheral.dtsi index 4fc90627eec..d46f6c602cf 100644 --- a/boards/arm/mps3/mps3_common_soc_peripheral.dtsi +++ b/boards/arm/mps3/mps3_common_soc_peripheral.dtsi @@ -1,6 +1,6 @@ /* * Copyright (c) 2019-2021 Linaro Limited - * Copyright 2024 Arm Limited and/or its affiliates + * Copyright 2024-2025 Arm Limited and/or its affiliates * * SPDX-License-Identifier: Apache-2.0 */ @@ -85,6 +85,8 @@ spi_shield0: spi@9203000 { clocks = <&sysclk>; #address-cells = <1>; #size-cells = <0>; + pinctrl-0 = <&spi3_default>; + pinctrl-names = "default"; }; spi_shield1: spi@9204000 { @@ -95,6 +97,8 @@ spi_shield1: spi@9204000 { clocks = <&sysclk>; #address-cells = <1>; #size-cells = <0>; + pinctrl-0 = <&spi4_default>; + pinctrl-names = "default"; }; i2c_shield0: i2c@9205000 { @@ -103,6 +107,8 @@ i2c_shield0: i2c@9205000 { #address-cells = <1>; #size-cells = <0>; reg = <0x9205000 0x1000>; + pinctrl-0 = <&sbcon2_default>; + pinctrl-names = "default"; }; i2c_shield1: i2c@9206000 { @@ -111,6 +117,8 @@ i2c_shield1: i2c@9206000 { #address-cells = <1>; #size-cells = <0>; reg = <0x9206000 0x1000>; + pinctrl-0 = <&sbcon3_default>; + pinctrl-names = "default"; }; i2c_ddr4_eeprom: i2c@9208000 { @@ -183,6 +191,8 @@ uart3: uart@9306000 { interrupt-names = "tx", "rx"; clocks = <&sysclk>; current-speed = <115200>; + pinctrl-0 = <&uart3_default>; + pinctrl-names = "default"; }; uart4: uart@9307000 { @@ -192,6 +202,8 @@ uart4: uart@9307000 { interrupt-names = "tx", "rx"; clocks = <&sysclk>; current-speed = <115200>; + pinctrl-0 = <&uart4_default>; + pinctrl-names = "default"; }; uart5: uart@9308000 { @@ -203,3 +215,8 @@ uart5: uart@9308000 { clocks = <&sysclk>; current-speed = <115200>; }; + +pinctrl: pinctrl { + compatible = "arm,mps3-pinctrl"; + status = "okay"; +}; diff --git a/boards/arm/mps3/mps3_corstone300_an547.dts b/boards/arm/mps3/mps3_corstone300_an547.dts index ae71ddf7282..55188180f0c 100644 --- a/boards/arm/mps3/mps3_corstone300_an547.dts +++ b/boards/arm/mps3/mps3_corstone300_an547.dts @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2021 Linaro Limited - * Copyright 2024 Arm Limited and/or its affiliates + * Copyright 2024-2025 Arm Limited and/or its affiliates * * SPDX-License-Identifier: Apache-2.0 */ @@ -11,7 +11,6 @@ #include #include #include -#include "mps3_common.dtsi" / { compatible = "arm,mps3-an547"; @@ -95,3 +94,4 @@ }; }; }; +#include "mps3_common.dtsi" diff --git a/boards/arm/mps3/mps3_corstone300_an547_ns.dts b/boards/arm/mps3/mps3_corstone300_an547_ns.dts index 5a4e0031946..9540682e37b 100644 --- a/boards/arm/mps3/mps3_corstone300_an547_ns.dts +++ b/boards/arm/mps3/mps3_corstone300_an547_ns.dts @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2021 Linaro Limited - * Copyright 2024 Arm Limited and/or its affiliates + * Copyright 2024-2025 Arm Limited and/or its affiliates * * SPDX-License-Identifier: Apache-2.0 */ @@ -11,7 +11,6 @@ #include #include #include -#include "mps3_common.dtsi" / { compatible = "arm,mps3-an547"; @@ -100,3 +99,4 @@ }; }; }; +#include "mps3_common.dtsi" diff --git a/boards/arm/mps3/mps3_corstone300_an552.dts b/boards/arm/mps3/mps3_corstone300_an552.dts index 7c7ec8d02a5..51aabcda2fa 100644 --- a/boards/arm/mps3/mps3_corstone300_an552.dts +++ b/boards/arm/mps3/mps3_corstone300_an552.dts @@ -1,5 +1,5 @@ /* - * Copyright 2024 Arm Limited and/or its affiliates + * Copyright 2024-2025 Arm Limited and/or its affiliates * * SPDX-License-Identifier: Apache-2.0 */ @@ -10,7 +10,6 @@ #include #include #include -#include "mps3_common.dtsi" / { compatible = "arm,mps3-an552"; @@ -94,3 +93,4 @@ }; }; }; +#include "mps3_common.dtsi" diff --git a/boards/arm/mps3/mps3_corstone300_an552_ns.dts b/boards/arm/mps3/mps3_corstone300_an552_ns.dts index 17e9d259bca..7b8bab99ff6 100644 --- a/boards/arm/mps3/mps3_corstone300_an552_ns.dts +++ b/boards/arm/mps3/mps3_corstone300_an552_ns.dts @@ -1,5 +1,5 @@ /* - * Copyright 2024 Arm Limited and/or its affiliates + * Copyright 2024-2025 Arm Limited and/or its affiliates * * SPDX-License-Identifier: Apache-2.0 */ @@ -10,7 +10,6 @@ #include #include #include -#include "mps3_common.dtsi" / { compatible = "arm,mps3-an552"; @@ -99,3 +98,4 @@ }; }; }; +#include "mps3_common.dtsi" diff --git a/boards/arm/mps3/mps3_corstone300_fvp.dts b/boards/arm/mps3/mps3_corstone300_fvp.dts index eff11378c61..886b8d77629 100644 --- a/boards/arm/mps3/mps3_corstone300_fvp.dts +++ b/boards/arm/mps3/mps3_corstone300_fvp.dts @@ -1,5 +1,5 @@ /* - * Copyright 2024 Arm Limited and/or its affiliates + * Copyright 2024-2025 Arm Limited and/or its affiliates * * SPDX-License-Identifier: Apache-2.0 */ @@ -10,7 +10,6 @@ #include #include #include -#include "mps3_common.dtsi" / { compatible = "arm,mps3-fvp"; @@ -94,3 +93,4 @@ }; }; }; +#include "mps3_common.dtsi" diff --git a/boards/arm/mps3/mps3_corstone300_fvp_ns.dts b/boards/arm/mps3/mps3_corstone300_fvp_ns.dts index 8a9704cae3a..d2be764eb50 100644 --- a/boards/arm/mps3/mps3_corstone300_fvp_ns.dts +++ b/boards/arm/mps3/mps3_corstone300_fvp_ns.dts @@ -1,5 +1,5 @@ /* - * Copyright 2024 Arm Limited and/or its affiliates + * Copyright 2024-2025 Arm Limited and/or its affiliates * * SPDX-License-Identifier: Apache-2.0 */ @@ -10,7 +10,6 @@ #include #include #include -#include "mps3_common.dtsi" / { compatible = "arm,mps3-fvp"; @@ -99,3 +98,4 @@ }; }; }; +#include "mps3_common.dtsi" diff --git a/boards/arm/mps3/mps3_corstone310_an555.dts b/boards/arm/mps3/mps3_corstone310_an555.dts index a34fd0e4227..47c2a9626a8 100644 --- a/boards/arm/mps3/mps3_corstone310_an555.dts +++ b/boards/arm/mps3/mps3_corstone310_an555.dts @@ -10,7 +10,6 @@ #include #include #include -#include "mps3_common.dtsi" / { compatible = "arm,mps3-an555"; @@ -94,3 +93,4 @@ }; }; }; +#include "mps3_common.dtsi" diff --git a/boards/arm/mps3/mps3_corstone310_an555_ns.dts b/boards/arm/mps3/mps3_corstone310_an555_ns.dts index 786ca6d9eb1..4a910777e11 100644 --- a/boards/arm/mps3/mps3_corstone310_an555_ns.dts +++ b/boards/arm/mps3/mps3_corstone310_an555_ns.dts @@ -1,5 +1,5 @@ /* - * Copyright 2024 Arm Limited and/or its affiliates + * Copyright 2024-2025 Arm Limited and/or its affiliates * * SPDX-License-Identifier: Apache-2.0 */ @@ -10,7 +10,6 @@ #include #include #include -#include "mps3_common.dtsi" / { compatible = "arm,mps3-an555"; @@ -99,3 +98,4 @@ }; }; }; +#include "mps3_common.dtsi" diff --git a/boards/arm/mps3/mps3_corstone310_fvp.dts b/boards/arm/mps3/mps3_corstone310_fvp.dts index 596e0e6e637..585a7297d72 100644 --- a/boards/arm/mps3/mps3_corstone310_fvp.dts +++ b/boards/arm/mps3/mps3_corstone310_fvp.dts @@ -10,7 +10,6 @@ #include #include #include -#include "mps3_common.dtsi" / { compatible = "arm,mps3-fvp"; @@ -94,3 +93,4 @@ }; }; }; +#include "mps3_common.dtsi" diff --git a/boards/arm/mps3/mps3_corstone310_fvp_ns.dts b/boards/arm/mps3/mps3_corstone310_fvp_ns.dts index acc9b5fb737..9cd73ee3959 100644 --- a/boards/arm/mps3/mps3_corstone310_fvp_ns.dts +++ b/boards/arm/mps3/mps3_corstone310_fvp_ns.dts @@ -1,5 +1,5 @@ /* - * Copyright 2024 Arm Limited and/or its affiliates + * Copyright 2024-2025 Arm Limited and/or its affiliates * * SPDX-License-Identifier: Apache-2.0 */ @@ -10,7 +10,6 @@ #include #include #include -#include "mps3_common.dtsi" / { compatible = "arm,mps3-fvp"; @@ -99,3 +98,4 @@ }; }; }; +#include "mps3_common.dtsi"