Skip to content

CC13XX CC26XX : transition from pinmux to pinctrl #44492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 18, 2022
Merged

CC13XX CC26XX : transition from pinmux to pinctrl #44492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a2eb84
drivers: pinctrl: add CC13XX/CC26XX pinctrl driver
vaishnavachath Apr 15, 2022
9f87f1b
drivers: CC1XX/CC26XX based boards: transition to pinctrl driver
vaishnavachath Apr 15, 2022
c251fb9
drivers: pinmux: remove cc13xx_cc26xx pinmux driver
vaishnavachath Apr 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions boards/arm/cc1352r1_launchxl/cc1352r1_launchxl-pinctrl.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/*
* Copyright (c) 2022 Vaishnav Achath
*
* SPDX-License-Identifier: Apache-2.0
*/

#include <dt-bindings/pinctrl/cc13xx_cc26xx-pinctrl.h>

&pinctrl {
/* UART0 */
uart0_tx_default: uart0_tx_default {
pinmux = <13 IOC_PORT_MCU_UART0_TX>;
bias-disable;
};
uart0_rx_default: uart0_rx_default {
pinmux = <12 IOC_PORT_MCU_UART0_RX>;
bias-disable;
input-enable;
};

/* I2C0 */
i2c0_scl_default: i2c0_scl_default {
pinmux = <4 IOC_PORT_MCU_I2C_MSSCL>;
bias-pull-up;
drive-open-drain;
input-enable;
};
i2c0_sda_default: i2c0_sda_default {
pinmux = <5 IOC_PORT_MCU_I2C_MSSDA>;
bias-pull-up;
drive-open-drain;
input-enable;
};
i2c0_scl_sleep: i2c0_scl_sleep {
pinmux = <4 IOC_PORT_GPIO>;
bias-disable;
};
i2c0_sda_sleep: i2c0_sda_sleep {
pinmux = <5 IOC_PORT_GPIO>;
bias-disable;
};

/* SPI0 */
spi0_sck_default: spi0_sck_default {
pinmux = <10 IOC_PORT_MCU_SSI0_CLK>;
bias-disable;
};
spi0_mosi_default: spi0_mosi_default {
pinmux = <9 IOC_PORT_MCU_SSI0_TX>;
bias-disable;
};
spi0_miso_default: spi0_miso_default {
pinmux = <8 IOC_PORT_MCU_SSI0_RX>;
bias-disable;
input-enable;
};
spi0_cs_default: spi0_cs_default {
pinmux = <11 IOC_PORT_MCU_SSI0_FSS>;
bias-disable;
};
};
24 changes: 9 additions & 15 deletions boards/arm/cc1352r1_launchxl/cc1352r1_launchxl.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@

#include <ti/cc1352r.dtsi>
#include "boosterpack_connector.dtsi"

/*
* Define some constants from driverlib/ioc.h in TI HAL,
* since we don't have a way to include the file directly.
*/
#define IOC_PORT_MCU_UART0_TX 0x00000010
#define IOC_PORT_MCU_UART0_RX 0x0000000F
#include "cc1352r1_launchxl-pinctrl.dtsi"

#define BTN_GPIO_FLAGS (GPIO_ACTIVE_LOW | GPIO_PULL_UP)

Expand Down Expand Up @@ -92,22 +86,22 @@
&uart0 {
status = "okay";
current-speed = <115200>;
tx-pin = <13 IOC_PORT_MCU_UART0_TX>;
rx-pin = <12 IOC_PORT_MCU_UART0_RX>;
pinctrl-0 = <&uart0_rx_default &uart0_tx_default>;
pinctrl-names = "default";
};

&i2c0 {
status = "okay";
scl-pin = <4>;
sda-pin = <5>;
pinctrl-0 = <&i2c0_scl_default &i2c0_sda_default>;
pinctrl-1 = <&i2c0_scl_sleep &i2c0_sda_sleep>;
pinctrl-names = "default", "sleep";
};

&spi0 {
status = "okay";
sck-pin = <10>;
mosi-pin = <9>;
miso-pin = <8>;
cs-pin = <11>;
pinctrl-0 = <&spi0_sck_default &spi0_mosi_default
&spi0_miso_default &spi0_cs_default>;
pinctrl-names = "default";
cs-gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
};

Expand Down
2 changes: 1 addition & 1 deletion boards/arm/cc1352r1_launchxl/cc1352r1_launchxl_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CONFIG_CC13X2_CC26X2_BOOTLOADER_ENABLE=y
CONFIG_CC13X2_CC26X2_BOOTLOADER_BACKDOOR_ENABLE=y
CONFIG_CC13X2_CC26X2_BOOTLOADER_BACKDOOR_PIN=15

CONFIG_PINMUX=y
CONFIG_PINCTRL=y
CONFIG_GPIO=y
CONFIG_SERIAL=y

Expand Down
61 changes: 61 additions & 0 deletions boards/arm/cc1352r_sensortag/cc1352r_sensortag-pinctrl.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/*
* Copyright (c) 2022 Vaishnav Achath
*
* SPDX-License-Identifier: Apache-2.0
*/

#include <dt-bindings/pinctrl/cc13xx_cc26xx-pinctrl.h>

&pinctrl {
/* UART0 */
uart0_tx_default: uart0_tx_default {
pinmux = <13 IOC_PORT_MCU_UART0_TX>;
bias-disable;
};
uart0_rx_default: uart0_rx_default {
pinmux = <12 IOC_PORT_MCU_UART0_RX>;
bias-disable;
input-enable;
};

/* I2C0 */
i2c0_scl_default: i2c0_scl_default {
pinmux = <4 IOC_PORT_MCU_I2C_MSSCL>;
bias-pull-up;
drive-open-drain;
input-enable;
};
i2c0_sda_default: i2c0_sda_default {
pinmux = <5 IOC_PORT_MCU_I2C_MSSDA>;
bias-pull-up;
drive-open-drain;
input-enable;
};
i2c0_scl_sleep: i2c0_scl_sleep {
pinmux = <4 IOC_PORT_GPIO>;
bias-disable;
};
i2c0_sda_sleep: i2c0_sda_sleep {
pinmux = <5 IOC_PORT_GPIO>;
bias-disable;
};

/* SPI0 */
spi0_sck_default: spi0_sck_default {
pinmux = <10 IOC_PORT_MCU_SSI0_CLK>;
bias-disable;
};
spi0_mosi_default: spi0_mosi_default {
pinmux = <9 IOC_PORT_MCU_SSI0_TX>;
bias-disable;
};
spi0_miso_default: spi0_miso_default {
pinmux = <8 IOC_PORT_MCU_SSI0_RX>;
bias-disable;
input-enable;
};
spi0_cs_default: spi0_cs_default {
pinmux = <11 IOC_PORT_MCU_SSI0_FSS>;
bias-disable;
};
};
23 changes: 9 additions & 14 deletions boards/arm/cc1352r_sensortag/cc1352r_sensortag.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,7 @@

#include <ti/cc1352r.dtsi>
#include "../cc1352r1_launchxl/boosterpack_connector.dtsi"

/*
* Define some constants from driverlib/ioc.h in TI HAL,
* since we don't have a way to include the file directly.
*/
#define IOC_PORT_MCU_UART0_TX 0x00000010
#define IOC_PORT_MCU_UART0_RX 0x0000000F
#include "cc1352r_sensortag-pinctrl.dtsi"

#define BTN_GPIO_FLAGS (GPIO_ACTIVE_LOW | GPIO_PULL_UP)

Expand Down Expand Up @@ -101,14 +95,15 @@
&uart0 {
status = "okay";
current-speed = <115200>;
tx-pin = <13 IOC_PORT_MCU_UART0_TX>;
rx-pin = <12 IOC_PORT_MCU_UART0_RX>;
pinctrl-0 = <&uart0_rx_default &uart0_tx_default>;
pinctrl-names = "default";
};

&i2c0 {
status = "okay";
scl-pin = <4>;
sda-pin = <5>;
pinctrl-0 = <&i2c0_scl_default &i2c0_sda_default>;
pinctrl-1 = <&i2c0_scl_sleep &i2c0_sda_sleep>;
pinctrl-names = "default", "sleep";

sensor0: sensor@44 {
compatible = "ti,opt3001";
Expand All @@ -126,9 +121,9 @@

&spi0 {
status = "okay";
sck-pin = <10>;
mosi-pin = <9>;
miso-pin = <8>;
pinctrl-0 = <&spi0_sck_default &spi0_mosi_default
&spi0_miso_default>;
pinctrl-names = "default";
cs-gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;

sensor1: sensor@0 {
Expand Down
2 changes: 1 addition & 1 deletion boards/arm/cc1352r_sensortag/cc1352r_sensortag_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CONFIG_CC13X2_CC26X2_BOOTLOADER_ENABLE=y
CONFIG_CC13X2_CC26X2_BOOTLOADER_BACKDOOR_ENABLE=y
CONFIG_CC13X2_CC26X2_BOOTLOADER_BACKDOOR_PIN=15

CONFIG_PINMUX=y
CONFIG_PINCTRL=y
CONFIG_GPIO=y
CONFIG_SERIAL=y

Expand Down
61 changes: 61 additions & 0 deletions boards/arm/cc26x2r1_launchxl/cc26x2r1_launchxl-pinctrl.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/*
* Copyright (c) 2022 Vaishnav Achath
*
* SPDX-License-Identifier: Apache-2.0
*/

#include <dt-bindings/pinctrl/cc13xx_cc26xx-pinctrl.h>

&pinctrl {
/* UART0 */
uart0_tx_default: uart0_tx_default {
pinmux = <3 IOC_PORT_MCU_UART0_TX>;
bias-disable;
};
uart0_rx_default: uart0_rx_default {
pinmux = <2 IOC_PORT_MCU_UART0_RX>;
bias-disable;
input-enable;
};

/* I2C0 */
i2c0_scl_default: i2c0_scl_default {
pinmux = <4 IOC_PORT_MCU_I2C_MSSCL>;
bias-pull-up;
drive-open-drain;
input-enable;
};
i2c0_sda_default: i2c0_sda_default {
pinmux = <5 IOC_PORT_MCU_I2C_MSSDA>;
bias-pull-up;
drive-open-drain;
input-enable;
};
i2c0_scl_sleep: i2c0_scl_sleep {
pinmux = <4 IOC_PORT_GPIO>;
bias-disable;
};
i2c0_sda_sleep: i2c0_sda_sleep {
pinmux = <5 IOC_PORT_GPIO>;
bias-disable;
};

/* SPI0 */
spi0_sck_default: spi0_sck_default {
pinmux = <10 IOC_PORT_MCU_SSI0_CLK>;
bias-disable;
};
spi0_mosi_default: spi0_mosi_default {
pinmux = <9 IOC_PORT_MCU_SSI0_TX>;
bias-disable;
};
spi0_miso_default: spi0_miso_default {
pinmux = <8 IOC_PORT_MCU_SSI0_RX>;
bias-disable;
input-enable;
};
spi0_cs_default: spi0_cs_default {
pinmux = <11 IOC_PORT_MCU_SSI0_FSS>;
bias-disable;
};
};
25 changes: 10 additions & 15 deletions boards/arm/cc26x2r1_launchxl/cc26x2r1_launchxl.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@

#include <ti/cc2652r.dtsi>
#include "boosterpack_connector.dtsi"

/*
* Define some constants from driverlib/ioc.h in TI HAL,
* since we don't have a way to include the file directly.
*/
#define IOC_PORT_MCU_UART0_TX 0x00000010
#define IOC_PORT_MCU_UART0_RX 0x0000000F
#include "cc26x2r1_launchxl-pinctrl.dtsi"

#define BTN_GPIO_FLAGS (GPIO_ACTIVE_LOW | GPIO_PULL_UP)

Expand Down Expand Up @@ -92,22 +86,23 @@
&uart0 {
status = "okay";
current-speed = <115200>;
tx-pin = <3 IOC_PORT_MCU_UART0_TX>;
rx-pin = <2 IOC_PORT_MCU_UART0_RX>;
pinctrl-0 = <&uart0_rx_default &uart0_tx_default>;
pinctrl-names = "default";
};

&i2c0 {
status = "okay";
scl-pin = <4>;
sda-pin = <5>;
pinctrl-0 = <&i2c0_scl_default &i2c0_sda_default>;
pinctrl-1 = <&i2c0_scl_sleep &i2c0_sda_sleep>;
pinctrl-names = "default", "sleep";
};

&spi0 {
status = "okay";
sck-pin = <10>;
mosi-pin = <9>;
miso-pin = <8>;
cs-pin = <11>;
pinctrl-0 = <&spi0_sck_default &spi0_mosi_default
&spi0_miso_default &spi0_cs_default>;
pinctrl-names = "default";

cs-gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
};

Expand Down
2 changes: 1 addition & 1 deletion boards/arm/cc26x2r1_launchxl/cc26x2r1_launchxl_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CONFIG_CC13X2_CC26X2_BOOTLOADER_ENABLE=y
CONFIG_CC13X2_CC26X2_BOOTLOADER_BACKDOOR_ENABLE=y
CONFIG_CC13X2_CC26X2_BOOTLOADER_BACKDOOR_PIN=13

CONFIG_PINMUX=y
CONFIG_PINCTRL=y
CONFIG_GPIO=y
CONFIG_SERIAL=y

Expand Down
Loading