[PATCH 09/13] arm64: dts: ti: k3-j721s2: Enable GPIO nodes at the board level

[Dhruva Gole]

On 03/08/23 02:23, Andrew Davis wrote:
> GPIO nodes defined in the top-level J721s2 SoC dtsi files are incomplete
> and may not be functional unless they are extended with pinmux and
> device information.
> 
> Disable the GPIO nodes in the dtsi files and only enable the ones that
> are actually pinned out on a given board.
> 
> Signed-off-by: Andrew Davis <afd at ti.com>
> ---
>   .../boot/dts/ti/k3-am68-sk-base-board.dts      | 18 ++----------------
>   .../dts/ti/k3-j721s2-common-proc-board.dts     | 18 ++++++------------
>   arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi     |  4 ++++
>   .../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi      |  2 ++
>   4 files changed, 14 insertions(+), 28 deletions(-)
> 

Reviewed-by: Dhruva Gole <d-gole at ti.com>

> diff --git a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts
> index ffca12df0a6da..4c855dffb4cd2 100644
> --- a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts
> @@ -297,31 +297,17 @@ J721S2_WKUP_IOPAD(0x000, PIN_INPUT, 7) /* (K26) WKUP_GPIO0_49 */
>   };
>   
>   &main_gpio0 {
> +	status = "okay";
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&rpi_header_gpio0_pins_default>;
>   };
>   
> -&main_gpio2 {
> -	status = "disabled";
> -};
> -
> -&main_gpio4 {
> -	status = "disabled";
> -};
> -
> -&main_gpio6 {
> -	status = "disabled";
> -};
> -
>   &wkup_gpio0 {
> +	status = "okay";
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&mcu_rpi_header_gpio0_pins0_default>, <&mcu_rpi_header_gpio0_pins1_default>;
>   };
>   
> -&wkup_gpio1 {
> -	status = "disabled";
> -};
> -
>   &wkup_uart0 {
>   	status = "reserved";
>   	pinctrl-names = "default";
> diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
> index 3a8e6eb402448..6f248d27a30a4 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
> +++ b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
> @@ -266,20 +266,14 @@ J721S2_WKUP_IOPAD(0x044, PIN_INPUT, 0) /* (B20) MCU_OSPI1_LBCLKO */
>   	};
>   };
>   
> -&main_gpio2 {
> -	status = "disabled";
> -};
> -
> -&main_gpio4 {
> -	status = "disabled";
> -};
> -
> -&main_gpio6 {
> -	status = "disabled";
> +&main_gpio0 {
> +	status = "okay";
> +	/* default pins */
>   };
>   
> -&wkup_gpio1 {
> -	status = "disabled";
> +&wkup_gpio0 {
> +	status = "okay";
> +	/* default pins */
>   };
>   
>   &wkup_uart0 {
> diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
> index c46079fe4ed6e..0cc8057fce13c 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
> @@ -507,6 +507,7 @@ main_gpio0: gpio at 600000 {
>   		power-domains = <&k3_pds 111 TI_SCI_PD_EXCLUSIVE>;
>   		clocks = <&k3_clks 111 0>;
>   		clock-names = "gpio";
> +		status = "disabled";
>   	};
>   
>   	main_gpio2: gpio at 610000 {
> @@ -523,6 +524,7 @@ main_gpio2: gpio at 610000 {
>   		power-domains = <&k3_pds 112 TI_SCI_PD_EXCLUSIVE>;
>   		clocks = <&k3_clks 112 0>;
>   		clock-names = "gpio";
> +		status = "disabled";
>   	};
>   
>   	main_gpio4: gpio at 620000 {
> @@ -539,6 +541,7 @@ main_gpio4: gpio at 620000 {
>   		power-domains = <&k3_pds 113 TI_SCI_PD_EXCLUSIVE>;
>   		clocks = <&k3_clks 113 0>;
>   		clock-names = "gpio";
> +		status = "disabled";
>   	};
>   
>   	main_gpio6: gpio at 630000 {
> @@ -555,6 +558,7 @@ main_gpio6: gpio at 630000 {
>   		power-domains = <&k3_pds 114 TI_SCI_PD_EXCLUSIVE>;
>   		clocks = <&k3_clks 114 0>;
>   		clock-names = "gpio";
> +		status = "disabled";
>   	};
>   
>   	main_i2c0: i2c at 2000000 {
> diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
> index 736ec5fa0ea28..3557f3338377d 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
> @@ -323,6 +323,7 @@ wkup_gpio0: gpio at 42110000 {
>   		power-domains = <&k3_pds 115 TI_SCI_PD_EXCLUSIVE>;
>   		clocks = <&k3_clks 115 0>;
>   		clock-names = "gpio";
> +		status = "disabled";
>   	};
>   
>   	wkup_gpio1: gpio at 42100000 {
> @@ -339,6 +340,7 @@ wkup_gpio1: gpio at 42100000 {
>   		power-domains = <&k3_pds 116 TI_SCI_PD_EXCLUSIVE>;
>   		clocks = <&k3_clks 116 0>;
>   		clock-names = "gpio";
> +		status = "disabled";
>   	};
>   
>   	wkup_i2c0: i2c at 42120000 {

-- 
Thanks and Regards,
Dhruva Gole