Adds bootph-* properties to the leaf nodes to enable bootloaders to
utilise them.
Following adds bootph-* to:
- pmic regulator for enabling AVS Support
- main_uart0, mcu_uart0(DM), wkup_uart0(TIFS) for Traces
- mmc0, mmc1, usb0, ospi0, ospi1, hbmc for enabling various bootmodes.
Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
---
arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts | 13 +++++++++++++
arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 6 ++++++
2 files changed, 19 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
index 6593c5da82c0..d03690b8d652 100644
--- a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
@@ -129,6 +129,7 @@ J721E_WKUP_IOPAD(0x94, PIN_OUTPUT, 0) /* (E21) MCU_UART0_RTSn */
J721E_WKUP_IOPAD(0x8c, PIN_INPUT, 0) /* (D20) MCU_UART0_RXD */
J721E_WKUP_IOPAD(0x88, PIN_OUTPUT, 0) /* (D19) MCU_UART0_TXD */
>;
+ bootph-all;
};
wkup_uart0_pins_default: wkup-uart0-default-pins {
@@ -136,6 +137,7 @@ wkup_uart0_pins_default: wkup-uart0-default-pins {
J721E_WKUP_IOPAD(0x48, PIN_INPUT, 0) /* (B14) WKUP_UART0_RXD */
J721E_WKUP_IOPAD(0x4c, PIN_OUTPUT, 0) /* (A14) WKUP_UART0_TXD */
>;
+ bootph-all;
};
mcu_cpsw_pins_default: mcu-cpsw-default-pins {
@@ -204,6 +206,7 @@ J721E_IOPAD(0xb4, PIN_OUTPUT, 0) /* (T17) UART0_TXD */
J721E_IOPAD(0xc0, PIN_INPUT, 2) /* (W3) SPI0_CS0.UART0_CTSn */
J721E_IOPAD(0xc4, PIN_OUTPUT, 2) /* (U5) SPI0_CS1.UART0_RTSn */
>;
+ bootph-all;
};
main_uart1_pins_default: main-uart1-default-pins {
@@ -238,6 +241,7 @@ J721E_IOPAD(0xf0, PIN_INPUT, 0) /* (N20) MMC1_DAT2 */
J721E_IOPAD(0xec, PIN_INPUT, 0) /* (N19) MMC1_DAT3 */
J721E_IOPAD(0xe4, PIN_INPUT, 8) /* (V1) TIMER_IO0.MMC1_SDCD */
>;
+ bootph-all;
};
vdd_sd_dv_pins_default: vdd-sd-dv-default-pins {
@@ -259,6 +263,7 @@ main_usbss0_pins_default: main-usbss0-default-pins {
pinctrl-single,pins = <
J721E_IOPAD(0x04, PIN_OUTPUT, 0) /* (T4) USB0_DRVVBUS */
>;
+ bootph-all;
};
};
@@ -267,12 +272,14 @@ &wkup_uart0 {
status = "reserved";
pinctrl-names = "default";
pinctrl-0 = <&wkup_uart0_pins_default>;
+ bootph-all;
};
&mcu_uart0 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&mcu_uart0_pins_default>;
+ bootph-all;
};
&main_uart0 {
@@ -281,6 +288,7 @@ &main_uart0 {
power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
pinctrl-names = "default";
pinctrl-0 = <&main_uart0_pins_default>;
+ bootph-all;
};
&main_uart1 {
@@ -379,6 +387,7 @@ &main_sdhci0 {
/* eMMC */
status = "okay";
non-removable;
+ bootph-all;
ti,driver-strength-ohm = <50>;
disable-wp;
};
@@ -390,6 +399,7 @@ &main_sdhci1 {
pinctrl-names = "default";
vmmc-supply = <&vdd_mmc1>;
vqmmc-supply = <&vdd_sd_dv>;
+ bootph-all;
ti,driver-strength-ohm = <50>;
disable-wp;
};
@@ -401,11 +411,13 @@ &serdes_ln_ctrl {
&usb_serdes_mux {
idle-states = <1>; /* USB0 to SERDES lane 3 */
+ bootph-all;
};
&usbss0 {
pinctrl-names = "default";
pinctrl-0 = <&main_usbss0_pins_default>;
+ bootph-all;
ti,vbus-divider;
ti,usb2-only;
};
@@ -413,6 +425,7 @@ &usbss0 {
&usb0 {
dr_mode = "otg";
maximum-speed = "high-speed";
+ bootph-all;
};
&tscadc0 {
diff --git a/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi
index e78b4622a7d1..291ab9bb414d 100644
--- a/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi
@@ -121,6 +121,7 @@ J721E_WKUP_IOPAD(0x20, PIN_INPUT, 1) /* (B8) MCU_OSPI0_D5.MCU_HYPERBUS0_DQ5 */
J721E_WKUP_IOPAD(0x24, PIN_INPUT, 1) /* (A8) MCU_OSPI0_D6.MCU_HYPERBUS0_DQ6 */
J721E_WKUP_IOPAD(0x28, PIN_INPUT, 1) /* (A7) MCU_OSPI0_D7.MCU_HYPERBUS0_DQ7 */
>;
+ bootph-all;
};
mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-default-pins {
@@ -137,6 +138,7 @@ J721E_WKUP_IOPAD(0x0024, PIN_INPUT, 0) /* MCU_OSPI0_D6 */
J721E_WKUP_IOPAD(0x0028, PIN_INPUT, 0) /* MCU_OSPI0_D7 */
J721E_WKUP_IOPAD(0x0008, PIN_INPUT, 0) /* MCU_OSPI0_DQS */
>;
+ bootph-all;
};
};
@@ -146,6 +148,7 @@ wkup_i2c0_pins_default: wkup-i2c0-default-pins {
J721E_WKUP_IOPAD(0x98, PIN_INPUT_PULLUP, 0) /* (F20) WKUP_I2C0_SCL */
J721E_WKUP_IOPAD(0x9c, PIN_INPUT_PULLUP, 0) /* (H21) WKUP_I2C0_SDA */
>;
+ bootph-all;
};
};
@@ -186,6 +189,7 @@ &hbmc {
flash@0,0 {
compatible = "cypress,hyperflash", "cfi-flash";
reg = <0x00 0x00 0x4000000>;
+ bootph-all;
partitions {
compatible = "fixed-partitions";
@@ -347,6 +351,7 @@ bucka1: buck1 {
regulator-max-microvolt = <1800000>;
regulator-boot-on;
regulator-always-on;
+ bootph-all;
};
bucka2: buck2 {
@@ -520,6 +525,7 @@ partition@800000 {
partition@3fc0000 {
label = "ospi.phypattern";
reg = <0x3fc0000 0x40000>;
+ bootph-all;
};
};
};
--
2.46.0
On 23/10/24 12:27, Manorit Chawdhry wrote: > Adds bootph-* properties to the leaf nodes to enable bootloaders to > utilise them. > > Following adds bootph-* to: > - pmic regulator for enabling AVS Support > - main_uart0, mcu_uart0(DM), wkup_uart0(TIFS) for Traces > - mmc0, mmc1, usb0, ospi0, ospi1, hbmc for enabling various bootmodes. > > Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> Reviewed-by: Aniket Limaye <a-limaye@ti.com> > --- > arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts | 13 +++++++++++++ > arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 6 ++++++ > 2 files changed, 19 insertions(+) > > diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts > index 6593c5da82c0..d03690b8d652 100644 > --- a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts > +++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts > @@ -129,6 +129,7 @@ J721E_WKUP_IOPAD(0x94, PIN_OUTPUT, 0) /* (E21) MCU_UART0_RTSn */ > J721E_WKUP_IOPAD(0x8c, PIN_INPUT, 0) /* (D20) MCU_UART0_RXD */ > J721E_WKUP_IOPAD(0x88, PIN_OUTPUT, 0) /* (D19) MCU_UART0_TXD */ > >; > + bootph-all; > }; > > wkup_uart0_pins_default: wkup-uart0-default-pins { > @@ -136,6 +137,7 @@ wkup_uart0_pins_default: wkup-uart0-default-pins { > J721E_WKUP_IOPAD(0x48, PIN_INPUT, 0) /* (B14) WKUP_UART0_RXD */ > J721E_WKUP_IOPAD(0x4c, PIN_OUTPUT, 0) /* (A14) WKUP_UART0_TXD */ > >; > + bootph-all; > }; > > mcu_cpsw_pins_default: mcu-cpsw-default-pins { > @@ -204,6 +206,7 @@ J721E_IOPAD(0xb4, PIN_OUTPUT, 0) /* (T17) UART0_TXD */ > J721E_IOPAD(0xc0, PIN_INPUT, 2) /* (W3) SPI0_CS0.UART0_CTSn */ > J721E_IOPAD(0xc4, PIN_OUTPUT, 2) /* (U5) SPI0_CS1.UART0_RTSn */ > >; > + bootph-all; > }; > > main_uart1_pins_default: main-uart1-default-pins { > @@ -238,6 +241,7 @@ J721E_IOPAD(0xf0, PIN_INPUT, 0) /* (N20) MMC1_DAT2 */ > J721E_IOPAD(0xec, PIN_INPUT, 0) /* (N19) MMC1_DAT3 */ > J721E_IOPAD(0xe4, PIN_INPUT, 8) /* (V1) TIMER_IO0.MMC1_SDCD */ > >; > + bootph-all; > }; > > vdd_sd_dv_pins_default: vdd-sd-dv-default-pins { > @@ -259,6 +263,7 @@ main_usbss0_pins_default: main-usbss0-default-pins { > pinctrl-single,pins = < > J721E_IOPAD(0x04, PIN_OUTPUT, 0) /* (T4) USB0_DRVVBUS */ > >; > + bootph-all; > }; > }; > > @@ -267,12 +272,14 @@ &wkup_uart0 { > status = "reserved"; > pinctrl-names = "default"; > pinctrl-0 = <&wkup_uart0_pins_default>; > + bootph-all; > }; > > &mcu_uart0 { > status = "okay"; > pinctrl-names = "default"; > pinctrl-0 = <&mcu_uart0_pins_default>; > + bootph-all; > }; > > &main_uart0 { > @@ -281,6 +288,7 @@ &main_uart0 { > power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>; > pinctrl-names = "default"; > pinctrl-0 = <&main_uart0_pins_default>; > + bootph-all; > }; > > &main_uart1 { > @@ -379,6 +387,7 @@ &main_sdhci0 { > /* eMMC */ > status = "okay"; > non-removable; > + bootph-all; > ti,driver-strength-ohm = <50>; > disable-wp; > }; > @@ -390,6 +399,7 @@ &main_sdhci1 { > pinctrl-names = "default"; > vmmc-supply = <&vdd_mmc1>; > vqmmc-supply = <&vdd_sd_dv>; > + bootph-all; > ti,driver-strength-ohm = <50>; > disable-wp; > }; > @@ -401,11 +411,13 @@ &serdes_ln_ctrl { > > &usb_serdes_mux { > idle-states = <1>; /* USB0 to SERDES lane 3 */ > + bootph-all; > }; > > &usbss0 { > pinctrl-names = "default"; > pinctrl-0 = <&main_usbss0_pins_default>; > + bootph-all; > ti,vbus-divider; > ti,usb2-only; > }; > @@ -413,6 +425,7 @@ &usbss0 { > &usb0 { > dr_mode = "otg"; > maximum-speed = "high-speed"; > + bootph-all; > }; > > &tscadc0 { > diff --git a/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi > index e78b4622a7d1..291ab9bb414d 100644 > --- a/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi > +++ b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi > @@ -121,6 +121,7 @@ J721E_WKUP_IOPAD(0x20, PIN_INPUT, 1) /* (B8) MCU_OSPI0_D5.MCU_HYPERBUS0_DQ5 */ > J721E_WKUP_IOPAD(0x24, PIN_INPUT, 1) /* (A8) MCU_OSPI0_D6.MCU_HYPERBUS0_DQ6 */ > J721E_WKUP_IOPAD(0x28, PIN_INPUT, 1) /* (A7) MCU_OSPI0_D7.MCU_HYPERBUS0_DQ7 */ > >; > + bootph-all; > }; > > mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-default-pins { > @@ -137,6 +138,7 @@ J721E_WKUP_IOPAD(0x0024, PIN_INPUT, 0) /* MCU_OSPI0_D6 */ > J721E_WKUP_IOPAD(0x0028, PIN_INPUT, 0) /* MCU_OSPI0_D7 */ > J721E_WKUP_IOPAD(0x0008, PIN_INPUT, 0) /* MCU_OSPI0_DQS */ > >; > + bootph-all; > }; > }; > > @@ -146,6 +148,7 @@ wkup_i2c0_pins_default: wkup-i2c0-default-pins { > J721E_WKUP_IOPAD(0x98, PIN_INPUT_PULLUP, 0) /* (F20) WKUP_I2C0_SCL */ > J721E_WKUP_IOPAD(0x9c, PIN_INPUT_PULLUP, 0) /* (H21) WKUP_I2C0_SDA */ > >; > + bootph-all; > }; > }; > > @@ -186,6 +189,7 @@ &hbmc { > flash@0,0 { > compatible = "cypress,hyperflash", "cfi-flash"; > reg = <0x00 0x00 0x4000000>; > + bootph-all; > > partitions { > compatible = "fixed-partitions"; > @@ -347,6 +351,7 @@ bucka1: buck1 { > regulator-max-microvolt = <1800000>; > regulator-boot-on; > regulator-always-on; > + bootph-all; > }; > > bucka2: buck2 { > @@ -520,6 +525,7 @@ partition@800000 { > partition@3fc0000 { > label = "ospi.phypattern"; > reg = <0x3fc0000 0x40000>; > + bootph-all; > }; > }; > }; >
On 23/10/24 20:35, Aniket Limaye wrote: > > > On 23/10/24 12:27, Manorit Chawdhry wrote: >> Adds bootph-* properties to the leaf nodes to enable bootloaders to >> utilise them. >> >> Following adds bootph-* to: >> - pmic regulator for enabling AVS Support >> - main_uart0, mcu_uart0(DM), wkup_uart0(TIFS) for Traces >> - mmc0, mmc1, usb0, ospi0, ospi1, hbmc for enabling various bootmodes. >> >> Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> Just realized: Needs update to commit msg: No ospi1 for j7200 You can keep R-by with above change^ Thanks, Aniket > > Reviewed-by: Aniket Limaye <a-limaye@ti.com> > >> --- >> arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts | 13 >> +++++++++++++ >> arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 6 ++++++ >> 2 files changed, 19 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts >> b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts >> index 6593c5da82c0..d03690b8d652 100644 >> --- a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts >> +++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts >> @@ -129,6 +129,7 @@ J721E_WKUP_IOPAD(0x94, PIN_OUTPUT, 0) /* (E21) >> MCU_UART0_RTSn */ >> J721E_WKUP_IOPAD(0x8c, PIN_INPUT, 0) /* (D20) >> MCU_UART0_RXD */ >> J721E_WKUP_IOPAD(0x88, PIN_OUTPUT, 0) /* (D19) >> MCU_UART0_TXD */ >> >; >> + bootph-all; >> }; >> wkup_uart0_pins_default: wkup-uart0-default-pins { >> @@ -136,6 +137,7 @@ wkup_uart0_pins_default: wkup-uart0-default-pins { >> J721E_WKUP_IOPAD(0x48, PIN_INPUT, 0) /* (B14) >> WKUP_UART0_RXD */ >> J721E_WKUP_IOPAD(0x4c, PIN_OUTPUT, 0) /* (A14) >> WKUP_UART0_TXD */ >> >; >> + bootph-all; >> }; >> mcu_cpsw_pins_default: mcu-cpsw-default-pins { >> @@ -204,6 +206,7 @@ J721E_IOPAD(0xb4, PIN_OUTPUT, 0) /* (T17) >> UART0_TXD */ >> J721E_IOPAD(0xc0, PIN_INPUT, 2) /* (W3) >> SPI0_CS0.UART0_CTSn */ >> J721E_IOPAD(0xc4, PIN_OUTPUT, 2) /* (U5) >> SPI0_CS1.UART0_RTSn */ >> >; >> + bootph-all; >> }; >> main_uart1_pins_default: main-uart1-default-pins { >> @@ -238,6 +241,7 @@ J721E_IOPAD(0xf0, PIN_INPUT, 0) /* (N20) MMC1_DAT2 */ >> J721E_IOPAD(0xec, PIN_INPUT, 0) /* (N19) MMC1_DAT3 */ >> J721E_IOPAD(0xe4, PIN_INPUT, 8) /* (V1) >> TIMER_IO0.MMC1_SDCD */ >> >; >> + bootph-all; >> }; >> vdd_sd_dv_pins_default: vdd-sd-dv-default-pins { >> @@ -259,6 +263,7 @@ main_usbss0_pins_default: main-usbss0-default-pins { >> pinctrl-single,pins = < >> J721E_IOPAD(0x04, PIN_OUTPUT, 0) /* (T4) USB0_DRVVBUS */ >> >; >> + bootph-all; >> }; >> }; >> @@ -267,12 +272,14 @@ &wkup_uart0 { >> status = "reserved"; >> pinctrl-names = "default"; >> pinctrl-0 = <&wkup_uart0_pins_default>; >> + bootph-all; >> }; >> &mcu_uart0 { >> status = "okay"; >> pinctrl-names = "default"; >> pinctrl-0 = <&mcu_uart0_pins_default>; >> + bootph-all; >> }; >> &main_uart0 { >> @@ -281,6 +288,7 @@ &main_uart0 { >> power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>; >> pinctrl-names = "default"; >> pinctrl-0 = <&main_uart0_pins_default>; >> + bootph-all; >> }; >> &main_uart1 { >> @@ -379,6 +387,7 @@ &main_sdhci0 { >> /* eMMC */ >> status = "okay"; >> non-removable; >> + bootph-all; >> ti,driver-strength-ohm = <50>; >> disable-wp; >> }; >> @@ -390,6 +399,7 @@ &main_sdhci1 { >> pinctrl-names = "default"; >> vmmc-supply = <&vdd_mmc1>; >> vqmmc-supply = <&vdd_sd_dv>; >> + bootph-all; >> ti,driver-strength-ohm = <50>; >> disable-wp; >> }; >> @@ -401,11 +411,13 @@ &serdes_ln_ctrl { >> &usb_serdes_mux { >> idle-states = <1>; /* USB0 to SERDES lane 3 */ >> + bootph-all; >> }; >> &usbss0 { >> pinctrl-names = "default"; >> pinctrl-0 = <&main_usbss0_pins_default>; >> + bootph-all; >> ti,vbus-divider; >> ti,usb2-only; >> }; >> @@ -413,6 +425,7 @@ &usbss0 { >> &usb0 { >> dr_mode = "otg"; >> maximum-speed = "high-speed"; >> + bootph-all; >> }; >> &tscadc0 { >> diff --git a/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi >> b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi >> index e78b4622a7d1..291ab9bb414d 100644 >> --- a/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi >> +++ b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi >> @@ -121,6 +121,7 @@ J721E_WKUP_IOPAD(0x20, PIN_INPUT, 1) /* (B8) >> MCU_OSPI0_D5.MCU_HYPERBUS0_DQ5 */ >> J721E_WKUP_IOPAD(0x24, PIN_INPUT, 1) /* (A8) >> MCU_OSPI0_D6.MCU_HYPERBUS0_DQ6 */ >> J721E_WKUP_IOPAD(0x28, PIN_INPUT, 1) /* (A7) >> MCU_OSPI0_D7.MCU_HYPERBUS0_DQ7 */ >> >; >> + bootph-all; >> }; >> mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-default-pins { >> @@ -137,6 +138,7 @@ J721E_WKUP_IOPAD(0x0024, PIN_INPUT, 0) /* >> MCU_OSPI0_D6 */ >> J721E_WKUP_IOPAD(0x0028, PIN_INPUT, 0) /* MCU_OSPI0_D7 */ >> J721E_WKUP_IOPAD(0x0008, PIN_INPUT, 0) /* MCU_OSPI0_DQS */ >> >; >> + bootph-all; >> }; >> }; >> @@ -146,6 +148,7 @@ wkup_i2c0_pins_default: wkup-i2c0-default-pins { >> J721E_WKUP_IOPAD(0x98, PIN_INPUT_PULLUP, 0) /* (F20) >> WKUP_I2C0_SCL */ >> J721E_WKUP_IOPAD(0x9c, PIN_INPUT_PULLUP, 0) /* (H21) >> WKUP_I2C0_SDA */ >> >; >> + bootph-all; >> }; >> }; >> @@ -186,6 +189,7 @@ &hbmc { >> flash@0,0 { >> compatible = "cypress,hyperflash", "cfi-flash"; >> reg = <0x00 0x00 0x4000000>; >> + bootph-all; >> partitions { >> compatible = "fixed-partitions"; >> @@ -347,6 +351,7 @@ bucka1: buck1 { >> regulator-max-microvolt = <1800000>; >> regulator-boot-on; >> regulator-always-on; >> + bootph-all; >> }; >> bucka2: buck2 { >> @@ -520,6 +525,7 @@ partition@800000 { >> partition@3fc0000 { >> label = "ospi.phypattern"; >> reg = <0x3fc0000 0x40000>; >> + bootph-all; >> }; >> }; >> }; >>
© 2016 - 2024 Red Hat, Inc.