From e031bc4b48e321b38ea99b966be4329eaaa95981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Bol=C3=ADvar?= Date: Fri, 15 Jan 2021 12:43:49 -0800 Subject: [PATCH] dts: nordic,nrf-gpio: add port property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This property is required information for extracting PSEL bits relevant to peripheral pinmux from this node. Signed-off-by: Martí Bolívar --- dts/arm/nordic/nrf51822.dtsi | 1 + dts/arm/nordic/nrf52805.dtsi | 1 + dts/arm/nordic/nrf52810.dtsi | 1 + dts/arm/nordic/nrf52811.dtsi | 1 + dts/arm/nordic/nrf52820.dtsi | 1 + dts/arm/nordic/nrf52832.dtsi | 1 + dts/arm/nordic/nrf52833.dtsi | 2 ++ dts/arm/nordic/nrf52840.dtsi | 2 ++ dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi | 2 ++ dts/arm/nordic/nrf5340_cpunet.dtsi | 2 ++ dts/arm/nordic/nrf9160_common.dtsi | 1 + dts/bindings/gpio/nordic,nrf-gpio.yaml | 12 ++++++++++++ 12 files changed, 27 insertions(+) diff --git a/dts/arm/nordic/nrf51822.dtsi b/dts/arm/nordic/nrf51822.dtsi index 0164428a190..ccd919e40fd 100644 --- a/dts/arm/nordic/nrf51822.dtsi +++ b/dts/arm/nordic/nrf51822.dtsi @@ -94,6 +94,7 @@ #gpio-cells = <2>; label = "GPIO_0"; status = "disabled"; + port = <0>; }; i2c0: i2c@40003000 { diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi index 11e08bd7665..282a05e8329 100644 --- a/dts/arm/nordic/nrf52805.dtsi +++ b/dts/arm/nordic/nrf52805.dtsi @@ -79,6 +79,7 @@ #gpio-cells = <2>; label = "GPIO_0"; status = "disabled"; + port = <0>; }; gpiote: gpiote@40006000 { diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi index 912388fe266..8c343d0ae0b 100644 --- a/dts/arm/nordic/nrf52810.dtsi +++ b/dts/arm/nordic/nrf52810.dtsi @@ -92,6 +92,7 @@ #gpio-cells = <2>; label = "GPIO_0"; status = "disabled"; + port = <0>; }; i2c0: i2c@40003000 { diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi index 21f01dcb9cf..fda8a790d0f 100644 --- a/dts/arm/nordic/nrf52811.dtsi +++ b/dts/arm/nordic/nrf52811.dtsi @@ -99,6 +99,7 @@ #gpio-cells = <2>; label = "GPIO_0"; status = "disabled"; + port = <0>; }; i2c0: i2c@40003000 { diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi index 6e7b942c093..330c882cb69 100644 --- a/dts/arm/nordic/nrf52820.dtsi +++ b/dts/arm/nordic/nrf52820.dtsi @@ -89,6 +89,7 @@ #gpio-cells = <2>; label = "GPIO_0"; status = "disabled"; + port = <0>; }; i2c0: i2c@40003000 { diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi index aec55925fe4..2c094d7093f 100644 --- a/dts/arm/nordic/nrf52832.dtsi +++ b/dts/arm/nordic/nrf52832.dtsi @@ -92,6 +92,7 @@ #gpio-cells = <2>; label = "GPIO_0"; status = "disabled"; + port = <0>; }; i2c0: i2c@40003000 { diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi index e81f837a6c6..d930a6b2c36 100644 --- a/dts/arm/nordic/nrf52833.dtsi +++ b/dts/arm/nordic/nrf52833.dtsi @@ -105,6 +105,7 @@ #gpio-cells = <2>; label = "GPIO_0"; status = "disabled"; + port = <0>; }; gpio1: gpio@50000300 { @@ -116,6 +117,7 @@ ngpios = <10>; label = "GPIO_1"; status = "disabled"; + port = <1>; }; i2c0: i2c@40003000 { diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi index 4627c07b268..8365518c032 100644 --- a/dts/arm/nordic/nrf52840.dtsi +++ b/dts/arm/nordic/nrf52840.dtsi @@ -101,6 +101,7 @@ #gpio-cells = <2>; label = "GPIO_0"; status = "disabled"; + port = <0>; }; gpio1: gpio@50000300 { @@ -112,6 +113,7 @@ ngpios = <16>; label = "GPIO_1"; status = "disabled"; + port = <1>; }; i2c0: i2c@40003000 { diff --git a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi index 05850e66fd6..f1c8017cc08 100644 --- a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi +++ b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi @@ -332,6 +332,7 @@ gpio0: gpio@842500 { #gpio-cells = <2>; label = "GPIO_0"; status = "disabled"; + port = <0>; }; gpio1: gpio@842800 { @@ -342,6 +343,7 @@ gpio1: gpio@842800 { ngpios = <16>; label = "GPIO_1"; status = "disabled"; + port = <1>; }; qspi: qspi@2b000 { diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi index 34d2e9aa63e..f04cfcec84a 100644 --- a/dts/arm/nordic/nrf5340_cpunet.dtsi +++ b/dts/arm/nordic/nrf5340_cpunet.dtsi @@ -101,6 +101,7 @@ #gpio-cells = <2>; label = "GPIO_0"; status = "disabled"; + port = <0>; }; gpio1: gpio@418c0800 { @@ -111,6 +112,7 @@ ngpios = <16>; label = "GPIO_1"; status = "disabled"; + port = <1>; }; gpiote: gpiote@4100a000 { diff --git a/dts/arm/nordic/nrf9160_common.dtsi b/dts/arm/nordic/nrf9160_common.dtsi index bf818818164..0d604b3cb46 100644 --- a/dts/arm/nordic/nrf9160_common.dtsi +++ b/dts/arm/nordic/nrf9160_common.dtsi @@ -307,6 +307,7 @@ gpio0: gpio@842500 { #gpio-cells = <2>; label = "GPIO_0"; status = "disabled"; + port = <0>; }; rtc0: rtc@14000 { diff --git a/dts/bindings/gpio/nordic,nrf-gpio.yaml b/dts/bindings/gpio/nordic,nrf-gpio.yaml index d7ba4436ef5..b292c92ca2d 100644 --- a/dts/bindings/gpio/nordic,nrf-gpio.yaml +++ b/dts/bindings/gpio/nordic,nrf-gpio.yaml @@ -17,6 +17,18 @@ properties: "#gpio-cells": const: 2 + port: + type: int + required: true + description: | + The GPIO port number. GPIO port P0 has: + + port = <0>; + + And P1 has: + + port = <1>; + gpio-cells: - pin - flags