arm64: dts: ti: k3-j721e-*: Fix up pinmux and aliases
Subsystems (2)
Nishanth Menon
maintainercover arm64: dts: ti: k3-j721e-*: Fix up pinmux and aliases
Hi,
This series cleansup k3-j721e platforms for pinmuxes and aliases. Provide complete description of uart and i2c instead of piggy-backing on bootloader configurations, ensure board detection eeproms are defined, aliases be defined in the board files as well.
Many of these changes were maintained in u-boot tree, and this moves those orphan changes to the super set definition in kernel.
Sample bootlog: j721e-common-proc-board in idk-gw configuration:
https://gist.github.com/nmenon/65fee02cb7a5207ac0d078f6abac6b6e
Nishanth Menon (9):
arm64: dts: ti: k3-j721e-sk: Add missing uart pinmuxes
arm64: dts: ti: k3-j721e-sk: Enable wakeup_i2c0 and eeprom
arm64: dts: ti: j721e-som/common-proc-board: Add product links
arm64: dts: ti: j721e-common-proc-board: Add uart pinmux
arm64: dts: ti: k3-j721e-som-p0: Enable wakeup_i2c0 and eeprom
arm64: dts: ti: k3-j721e-beagleboneai64: Add wakeup_uart pinmux
arm64: dts: ti: k3-j721e-sk: Define aliases at board level
arm64: dts: ti: k3-j721e-common-proc-board: Define aliases at board
level
arm64: dts: ti: k3-j721e: Drop SoC level aliases
.../boot/dts/ti/k3-j721e-beagleboneai64.dts | 9 +++ .../dts/ti/k3-j721e-common-proc-board.dts | 76 ++++++++++++++++++- arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 53 ++++++++++++- arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 15 ++++ arch/arm64/boot/dts/ti/k3-j721e.dtsi | 19 ----- 5 files changed, 147 insertions(+), 25 deletions(-)
Signature · 1 line
2.40.0
Nishanth Menon
maintainerPATCH 1/9 arm64: dts: ti: k3-j721e-sk: Add missing uart pinmuxes
Rather than depend on the default pinmuxes, explicitly describe the pinmux
--- arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 31 ++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e-sk.dts +29 -2
@@ -302,6 +302,13 @@ J721E_IOPAD(0x1ec, PIN_OUTPUT, 0) /* (AB3) UART0_TXD */ >; }; + main_uart1_pins_default: main-uart1-pins-default { + pinctrl-single,pins = < + J721E_IOPAD(0x1f8, PIN_INPUT, 0) /* (AA4) UART1_RXD */ + J721E_IOPAD(0x1fc, PIN_OUTPUT, 0) /* (AB4) UART1_TXD */ + >; + }; + main_i2c0_pins_default: main-i2c0-pins-default { pinctrl-single,pins = < J721E_IOPAD(0x220, PIN_INPUT_PULLUP, 0) /* (AC5) I2C0_SCL */
@@ -495,6 +502,22 @@ J721E_WKUP_IOPAD(0xd4, PIN_OUTPUT, 7) /* (G26) WKUP_GPIO0_9 */ >; }; + wkup_uart0_pins_default: wkup-uart0-pins-default { + pinctrl-single,pins = < + J721E_WKUP_IOPAD(0xa0, PIN_INPUT, 0) /* (J29) WKUP_UART0_RXD */ + J721E_WKUP_IOPAD(0xa4, PIN_OUTPUT, 0) /* (J28) WKUP_UART0_TXD */ + >; + }; + + mcu_uart0_pins_default: mcu-uart0-pins-default { + pinctrl-single,pins = < + J721E_WKUP_IOPAD(0xf0, PIN_INPUT, 2) /* (D26) MCU_I3C0_SCL.MCU_UART0_CTSn */ + J721E_WKUP_IOPAD(0xf4, PIN_OUTPUT, 2)/* (D25) MCU_I3C0_SDA.MCU_UART0_RTSn */ + J721E_WKUP_IOPAD(0xe4, PIN_INPUT, 0) /* (H28) WKUP_GPIO0_13.MCU_UART0_RXD */ + J721E_WKUP_IOPAD(0xe0, PIN_OUTPUT, 0)/* (G29) WKUP_GPIO0_12.MCU_UART0_TXD */ + >; + }; + wkup_i2c0_pins_default: wkup-i2c0-pins-default { pinctrl-single,pins = < J721E_WKUP_IOPAD(0xf8, PIN_INPUT_PULLUP, 0) /* (J25) WKUP_I2C0_SCL */
@@ -513,11 +536,14 @@ J721E_WKUP_IOPAD(0xdc, PIN_INPUT, 7) /* (H27) WKUP_GPIO0_11 */ &wkup_uart0 { /* Wakeup UART is used by System firmware */ status = "reserved"; + pinctrl-names = "default"; + pinctrl-0 = <&wkup_uart0_pins_default>; }; &mcu_uart0 { status = "okay"; - /* Default pinmux */ + pinctrl-names = "default"; + pinctrl-0 = <&mcu_uart0_pins_default>; }; &main_uart0 {
@@ -530,7 +556,8 @@ &main_uart0 { &main_uart1 { status = "okay"; - /* Default pinmux */ + pinctrl-names = "default"; + pinctrl-0 = <&main_uart1_pins_default>; }; &main_sdhci0 {
Signature · 1 line
2.40.0
Nishanth Menon
maintainerPATCH 2/9 arm64: dts: ti: k3-j721e-sk: Enable wakeup_i2c0 and eeprom
In reply to Nishanth MenonEnable wakeup_i2c and use un-used pinmux. While at it, describe the board detection eeprom present on the board.
--- arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/arm64/boot/dts/ti/k3-j721e-sk.dts +13 -0
@@ -540,6 +540,19 @@ &wkup_uart0 { pinctrl-0 = <&wkup_uart0_pins_default>; }; +&wkup_i2c0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&wkup_i2c0_pins_default>; + clock-frequency = <400000>; + + eeprom@51 { + /* AT24C512C-MAHM-T */ + compatible = "atmel,24c512"; + reg = <0x51>; + }; +}; + &mcu_uart0 { status = "okay"; pinctrl-names = "default";
Signature · 1 line
2.40.0
Nishanth Menon
maintainerPATCH 3/9 arm64: dts: ti: j721e-som/common-proc-board: Add product links
In reply to Nishanth MenonAdd product links to get reference to schematics and design files
---
We missed this during the initial days of k3 patches, but it is never late to cleanup..
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts | 2 ++ arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 2 ++ 2 files changed, 4 insertions(+)
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +2 -0
@@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2019 Texas Instruments Incorporated - https://www.ti.com/ + * + * Product Link: https://www.ti.com/tool/J721EXCPXEVM */ /dts-v1/;
arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi +2 -0
@@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2019-2020 Texas Instruments Incorporated - https://www.ti.com/ + * + * Product Link: https://www.ti.com/tool/J721EXSOMXEVM */ /dts-v1/;
Signature · 1 line
2.40.0
Nishanth Menon
maintainerPATCH 4/9 arm64: dts: ti: j721e-common-proc-board: Add uart pinmux
In reply to Nishanth MenonExplicitly define the pinmux rather than depend on bootloader configured pinmux for the platform.
--- .../dts/ti/k3-j721e-common-proc-board.dts | 62 +++++++++++++++++-- 1 file changed, 58 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +58 -4
@@ -174,6 +174,36 @@ dp_connector_in: endpoint { }; &main_pmx0 { + main_uart0_pins_default: main-uart0-pins-default { + pinctrl-single,pins = < + J721E_IOPAD(0x1d4, PIN_INPUT, 1) /* (Y3) SPI1_CS0.UART0_CTSn */ + J721E_IOPAD(0x1c0, PIN_OUTPUT, 1) /* (AA2) SPI0_CS0.UART0_RTSn */ + J721E_IOPAD(0x1e8, PIN_INPUT, 0) /* (AB2) UART0_RXD */ + J721E_IOPAD(0x1ec, PIN_OUTPUT, 0) /* (AB3) UART0_TXD */ + >; + }; + + main_uart1_pins_default: main-uart1-pins-default { + pinctrl-single,pins = < + J721E_IOPAD(0x1f8, PIN_INPUT, 0) /* (AA4) UART1_RXD */ + J721E_IOPAD(0x1fc, PIN_OUTPUT, 0) /* (AB4) UART1_TXD */ + >; + }; + + main_uart2_pins_default: main-uart2-pins-default { + pinctrl-single,pins = < + J721E_IOPAD(0x1dc, PIN_INPUT, 3) /* (Y1) SPI1_CLK.UART2_RXD */ + J721E_IOPAD(0x1e0, PIN_OUTPUT, 3) /* (Y5) SPI1_D0.UART2_TXD */ + >; + }; + + main_uart4_pins_default: main-uart4-pins-default { + pinctrl-single,pins = < + J721E_IOPAD(0x190, PIN_INPUT, 1) /* (W23) RGMII6_TD3.UART4_RXD */ + J721E_IOPAD(0x194, PIN_OUTPUT, 1) /* (W28) RGMII6_TD2.UART4_TXD */ + >; + }; + sw10_button_pins_default: sw10-button-pins-default { pinctrl-single,pins = < J721E_IOPAD(0x0, PIN_INPUT, 7) /* (AC18) EXTINTn.GPIO0_0 */
@@ -295,6 +325,22 @@ J721E_IOPAD(0x200, PIN_INPUT, 7) /* (AC4) UART1_CTSn.GPIO0_127 */ }; &wkup_pmx0 { + wkup_uart0_pins_default: wkup-uart0-pins-default { + pinctrl-single,pins = < + J721E_WKUP_IOPAD(0xa0, PIN_INPUT, 0) /* (J29) WKUP_UART0_RXD */ + J721E_WKUP_IOPAD(0xa4, PIN_OUTPUT, 0) /* (J28) WKUP_UART0_TXD */ + >; + }; + + mcu_uart0_pins_default: mcu-uart0-pins-default { + pinctrl-single,pins = < + J721E_WKUP_IOPAD(0xe8, PIN_INPUT, 0) /* (H29) WKUP_GPIO0_14.MCU_UART0_CTSn */ + J721E_WKUP_IOPAD(0xec, PIN_OUTPUT, 0) /* (J27) WKUP_GPIO0_15.MCU_UART0_RTSn */ + J721E_WKUP_IOPAD(0xe4, PIN_INPUT, 0) /* (H28) WKUP_GPIO0_13.MCU_UART0_RXD */ + J721E_WKUP_IOPAD(0xe0, PIN_OUTPUT, 0) /* (G29) WKUP_GPIO0_12.MCU_UART0_TXD */ + >; + }; + sw11_button_pins_default: sw11-button-pins-default { pinctrl-single,pins = < J721E_WKUP_IOPAD(0xcc, PIN_INPUT, 7) /* (G28) WKUP_GPIO0_7 */
@@ -369,32 +415,40 @@ J721E_WKUP_IOPAD(0xb8, PIN_INPUT, 7) /* (F28) WKUP_GPIO0_2 */ &wkup_uart0 { /* Wakeup UART is used by System firmware */ status = "reserved"; + pinctrl-names = "default"; + pinctrl-0 = <&wkup_uart0_pins_default>; }; &mcu_uart0 { status = "okay"; - /* Default pinmux */ + pinctrl-names = "default"; + pinctrl-0 = <&mcu_uart0_pins_default>; }; &main_uart0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&main_uart0_pins_default>; /* Shared with ATF on this platform */ power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>; }; &main_uart1 { status = "okay"; - /* Default pinmux */ + pinctrl-names = "default"; + pinctrl-0 = <&main_uart1_pins_default>; }; &main_uart2 { status = "okay"; - /* Default pinmux */ + pinctrl-names = "default"; + pinctrl-0 = <&main_uart2_pins_default>; }; &main_uart4 { status = "okay"; - /* Default pinmux */ + pinctrl-names = "default"; + pinctrl-0 = <&main_uart4_pins_default>; }; &main_gpio2 {
Signature · 1 line
2.40.0
Nishanth Menon
maintainerPATCH 5/9 arm64: dts: ti: k3-j721e-som-p0: Enable wakeup_i2c0 and eeprom
In reply to Nishanth MenonEnable wakeup_i2c and use un-used pinmux. While at it, describe the board detection eeprom present on the board.
--- arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi +13 -0
@@ -169,6 +169,19 @@ J721E_WKUP_IOPAD(0x002c, PIN_OUTPUT, 0) /* MCU_OSPI0_CSn0 */ }; }; +&wkup_i2c0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&wkup_i2c0_pins_default>; + clock-frequency = <400000>; + + eeprom@50 { + /* CAV24C256WE-GT3 */ + compatible = "atmel,24c256"; + reg = <0x50>; + }; +}; + &ospi0 { pinctrl-names = "default"; pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;
Signature · 1 line
2.40.0
Nishanth Menon
maintainerPATCH 6/9 arm64: dts: ti: k3-j721e-beagleboneai64: Add wakeup_uart pinmux
In reply to Nishanth MenonDefine the wakeup uart pin-mux for completeness. This allows the device tree usage in bootloader and firmwares that can configure the same appropriately.
--- arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts +9 -0
@@ -531,6 +531,13 @@ J721E_WKUP_IOPAD(0xfc, PIN_INPUT_PULLUP, 0) /* (H24) WKUP_I2C0_SDA */ >; }; + wkup_uart0_pins_default: wkup-uart0-pins-default { + pinctrl-single,pins = < + J721E_WKUP_IOPAD(0xa0, PIN_INPUT, 0) /* (J29) WKUP_UART0_RXD */ + J721E_WKUP_IOPAD(0xa4, PIN_OUTPUT, 0) /* (J28) WKUP_UART0_TXD */ + >; + }; + mcu_usbss1_pins_default: mcu-usbss1-pins-default { pinctrl-single,pins = < J721E_WKUP_IOPAD(0x3c, PIN_OUTPUT_PULLUP, 5) /* (A23) MCU_OSPI1_LBCLKO.WKUP_GPIO0_30 */
@@ -541,6 +548,8 @@ J721E_WKUP_IOPAD(0x3c, PIN_OUTPUT_PULLUP, 5) /* (A23) MCU_OSPI1_LBCLKO.WKUP_GPIO &wkup_uart0 { /* Wakeup UART is used by TIFS firmware. */ status = "reserved"; + pinctrl-names = "default"; + pinctrl-0 = <&wkup_uart0_pins_default>; }; &main_uart0 {
Signature · 1 line
2.40.0
Re: [PATCH 6/9] arm64: dts: ti: k3-j721e-beagleboneai64: Add wakeup_uart pinmux
Hi Nishanth,
Quoted 28 lines · Nishanth Menon
Define the wakeup uart pin-mux for completeness. This allows the device tree usage in bootloader and firmwares that can configure the same appropriately.
Signed-off-by Nishanth Menon <[email protected]>--- arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts | 9 +++++++++ 1 file changed, 9 insertions(+)arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts +7
-0@@ -531,6 +531,13 @@ J721E_WKUP_IOPAD(0xfc, PIN_INPUT_PULLUP, 0) /* (H24) WKUP_I2C0_SDA */ >; }; + wkup_uart0_pins_default: wkup-uart0-pins-default { + pinctrl-single,pins = < + J721E_WKUP_IOPAD(0xa0, PIN_INPUT, 0) /* (J29) WKUP_UART0_RXD */ + J721E_WKUP_IOPAD(0xa4, PIN_OUTPUT, 0) /* (J28) WKUP_UART0_TXD */ + >; + }; + mcu_usbss1_pins_default: mcu-usbss1-pins-default { pinctrl-single,pins = < J721E_WKUP_IOPAD(0x3c, PIN_OUTPUT_PULLUP, 5) /* (A23) MCU_OSPI1_LBCLKO.WKUP_GPIO0_30 */
arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts J721E_WKUP_IOPAD(0x3c, PIN_OUTPUT_PULLUP, 5) /* (A23) MCU_OSPI1_LBCLKO.WKUP_GPIO · line 553
Quoted 6 lines
arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts +2
-0@@ -541,6 +548,8 @@ J721E_WKUP_IOPAD(0x3c, PIN_OUTPUT_PULLUP, 5) /* (A23) MCU_OSPI1_LBCLKO.WKUP_GPIO &wkup_uart0 { /* Wakeup UART is used by TIFS firmware. */ status = "reserved"; + pinctrl-names = "default"; + pinctrl-0 = <&wkup_uart0_pins_default>; };
If you like to consider alias for wkup_uart0 for this board ,
Just to align with other boards for this SOC family. I understand wkup_uart0 is not being used.
Quoted 2 lines
arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts +0
-0&main_uart0 {
Nishanth Menon
maintainerRe: [PATCH 6/9] arm64: dts: ti: k3-j721e-beagleboneai64: Add wakeup_uart pinmux
Quoted 40 lines · Udit
Hi Nishanth,
Quoted 27 lines · Nishanth Menon
Define the wakeup uart pin-mux for completeness. This allows the device tree usage in bootloader and firmwares that can configure the same appropriately.
Signed-off-by Nishanth Menon <[email protected]>--- arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts | 9 +++++++++ 1 file changed, 9 insertions(+)arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts +7
-0@@ -531,6 +531,13 @@ J721E_WKUP_IOPAD(0xfc, PIN_INPUT_PULLUP, 0) /* (H24) WKUP_I2C0_SDA */ >; }; + wkup_uart0_pins_default: wkup-uart0-pins-default { + pinctrl-single,pins = < + J721E_WKUP_IOPAD(0xa0, PIN_INPUT, 0) /* (J29) WKUP_UART0_RXD */ + J721E_WKUP_IOPAD(0xa4, PIN_OUTPUT, 0) /* (J28) WKUP_UART0_TXD */ + >; + }; + mcu_usbss1_pins_default: mcu-usbss1-pins-default { pinctrl-single,pins = < J721E_WKUP_IOPAD(0x3c, PIN_OUTPUT_PULLUP, 5) /* (A23) MCU_OSPI1_LBCLKO.WKUP_GPIO0_30 */arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts J721E_WKUP_IOPAD(0x3c, PIN_OUTPUT_PULLUP, 5) /* (A23) MCU_OSPI1_LBCLKO.WKUP_GPIO · line 553
Quoted 6 lines
arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts +2
-0@@ -541,6 +548,8 @@ J721E_WKUP_IOPAD(0x3c, PIN_OUTPUT_PULLUP, 5) /* (A23) MCU_OSPI1_LBCLKO.WKUP_GPIO &wkup_uart0 { /* Wakeup UART is used by TIFS firmware. */ status = "reserved"; + pinctrl-names = "default"; + pinctrl-0 = <&wkup_uart0_pins_default>; };If you like to consider alias for
wkup_uart0for this board ,
Quoted 2 lines
Just to align with other boards for this SOC family. I understand
wkup_uart0is not being used.
Vignesh,
could you squash this locally OR if you like, I can post a v2:
arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts +1 -0
@@ -20,6 +20,7 @@ / { model = "BeagleBoard.org BeagleBone AI-64"; aliases { + serial0 = &wkup_uart0; serial2 = &main_uart0; mmc0 = &main_sdhci0; mmc1 = &main_sdhci1;
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Vignesh Raghavendra
maintainerRe: [PATCH 6/9] arm64: dts: ti: k3-j721e-beagleboneai64: Add wakeup_uart pinmux
Quoted 53 lines · Nishanth Menon
Quoted 40 lines · Udit
Hi Nishanth,
Quoted 27 lines · Nishanth Menon
Define the wakeup uart pin-mux for completeness. This allows the device tree usage in bootloader and firmwares that can configure the same appropriately.
Signed-off-by Nishanth Menon <[email protected]>--- arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts | 9 +++++++++ 1 file changed, 9 insertions(+)arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts +7
-0@@ -531,6 +531,13 @@ J721E_WKUP_IOPAD(0xfc, PIN_INPUT_PULLUP, 0) /* (H24) WKUP_I2C0_SDA */ >; }; + wkup_uart0_pins_default: wkup-uart0-pins-default { + pinctrl-single,pins = < + J721E_WKUP_IOPAD(0xa0, PIN_INPUT, 0) /* (J29) WKUP_UART0_RXD */ + J721E_WKUP_IOPAD(0xa4, PIN_OUTPUT, 0) /* (J28) WKUP_UART0_TXD */ + >; + }; + mcu_usbss1_pins_default: mcu-usbss1-pins-default { pinctrl-single,pins = < J721E_WKUP_IOPAD(0x3c, PIN_OUTPUT_PULLUP, 5) /* (A23) MCU_OSPI1_LBCLKO.WKUP_GPIO0_30 */arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts J721E_WKUP_IOPAD(0x3c, PIN_OUTPUT_PULLUP, 5) /* (A23) MCU_OSPI1_LBCLKO.WKUP_GPIO · line 553
Quoted 6 lines
arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts +2
-0@@ -541,6 +548,8 @@ J721E_WKUP_IOPAD(0x3c, PIN_OUTPUT_PULLUP, 5) /* (A23) MCU_OSPI1_LBCLKO.WKUP_GPIO &wkup_uart0 { /* Wakeup UART is used by TIFS firmware. */ status = "reserved"; + pinctrl-names = "default"; + pinctrl-0 = <&wkup_uart0_pins_default>; };If you like to consider alias for
wkup_uart0for this board ,Quoted 2 lines
Just to align with other boards for this SOC family. I understand
wkup_uart0is not being used.Vignesh,
could you squash this locally OR if you like, I can post a v2:arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts +0
-0
arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts / { · line 26
Quoted 7 lines
arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts +1
-0@@ -20,6 +20,7 @@ / { model = "BeagleBoard.org BeagleBone AI-64"; aliases { + serial0 = &wkup_uart0; serial2 = &main_uart0; mmc0 = &main_sdhci0; mmc1 = &main_sdhci1;
Squashed locally before queuing, no need to resend
Signature · 7 lines
Regards Vignesh _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Nishanth Menon
maintainerPATCH 7/9 arm64: dts: ti: k3-j721e-sk: Define aliases at board level
In reply to Nishanth MenonDefine the aliases at the board level instead of using generic aliases at SoC level.
--- arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm64/boot/dts/ti/k3-j721e-sk.dts +9 -0
@@ -16,6 +16,15 @@ / { compatible = "ti,j721e-sk", "ti,j721e"; model = "Texas Instruments J721E SK"; + aliases { + serial0 = &wkup_uart0; + serial1 = &mcu_uart0; + serial2 = &main_uart0; + serial3 = &main_uart1; + ethernet0 = &cpsw_port1; + mmc1 = &main_sdhci1; + }; + chosen { stdout-path = "serial2:115200n8"; };
Signature · 1 line
2.40.0
Nishanth Menon
maintainerPATCH 8/9 arm64: dts: ti: k3-j721e-common-proc-board: Define aliases at board level
In reply to Nishanth MenonDefine the aliases at the board level instead of using generic aliases at SoC level.
--- .../arm64/boot/dts/ti/k3-j721e-common-proc-board.dts | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +12 -0
@@ -17,6 +17,18 @@ / { compatible = "ti,j721e-evm", "ti,j721e"; model = "Texas Instruments J721e EVM"; + aliases { + serial0 = &wkup_uart0; + serial1 = &mcu_uart0; + serial2 = &main_uart0; + serial3 = &main_uart1; + serial4 = &main_uart2; + serial6 = &main_uart4; + ethernet0 = &cpsw_port1; + mmc0 = &main_sdhci0; + mmc1 = &main_sdhci1; + }; + chosen { stdout-path = "serial2:115200n8"; };
Signature · 1 line
2.40.0
Nishanth Menon
maintainerPATCH 9/9 arm64: dts: ti: k3-j721e: Drop SoC level aliases
In reply to Nishanth MenonDrop the SoC level aliases as these need to be done at board level.
--- arch/arm64/boot/dts/ti/k3-j721e.dtsi | 19 ------------------- 1 file changed, 19 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e.dtsi +0 -19
@@ -18,25 +18,6 @@ / { #address-cells = <2>; #size-cells = <2>; - aliases { - serial0 = &wkup_uart0; - serial1 = &mcu_uart0; - serial2 = &main_uart0; - serial3 = &main_uart1; - serial4 = &main_uart2; - serial5 = &main_uart3; - serial6 = &main_uart4; - serial7 = &main_uart5; - serial8 = &main_uart6; - serial9 = &main_uart7; - serial10 = &main_uart8; - serial11 = &main_uart9; - ethernet0 = &cpsw_port1; - mmc0 = &main_sdhci0; - mmc1 = &main_sdhci1; - mmc2 = &main_sdhci2; - }; - chosen { }; cpus {
Signature · 1 line
2.40.0
Hi Nishanth Menon,
Quoted 9 lines · Nishanth Menon
This series cleansup k3-j721e platforms for pinmuxes and aliases. Provide complete description of uart and i2c instead of piggy-backing on bootloader configurations, ensure board detection eeproms are defined, aliases be defined in the board files as well.
Many of these changes were maintained in u-boot tree, and this moves those orphan changes to the super set definition in kernel.
[...]
I have applied the following to branch ti-k3-dts-next on [1]. Thank you!
[1/9] arm64: dts: ti: k3-j721e-sk: Add missing uart pinmuxes
commit: acfb362a9c78d6708080cdd850b036225c78371b
[2/9] arm64: dts: ti: k3-j721e-sk: Enable wakeup_i2c0 and eeprom
commit: 1b4b376c878b36d1a1c848ebc885487e4cad2546
[3/9] arm64: dts: ti: j721e-som/common-proc-board: Add product links
commit: 26efc8d1ad0cc14e2740d310935fa146b1fc5a58
[4/9] arm64: dts: ti: j721e-common-proc-board: Add uart pinmux
commit: 86718345b4d3c0d386b3f73ef43e7f72ff04cf4a
[5/9] arm64: dts: ti: k3-j721e-som-p0: Enable wakeup_i2c0 and eeprom
commit: b04b18ccb3d5c19c864c10f7cc7b014218aecb22
[6/9] arm64: dts: ti: k3-j721e-beagleboneai64: Add wakeup_uart pinmux
commit: 4c2c99026ca1525912b40cbc1b69306145ce7082
[7/9] arm64: dts: ti: k3-j721e-sk: Define aliases at board level
commit: d1a4304c149d1a26a912d532501ead42e5952501
[8/9] arm64: dts: ti: k3-j721e-common-proc-board: Define aliases at board level
commit: ff59580bf2580ec262098399aab03dfca537bec8
[9/9] arm64: dts: ti: k3-j721e: Drop SoC level aliases
commit: 8be20986e0c54420e52048d20bdc31e3a8aec93fAll being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent up the chain during the next merge window (or sooner if it is a relevant bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
--
Vignesh
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel