Hi,
On 3/3/2020 4:04 PM, Keerthy wrote:
> Enable the ospi1/qspi module while at it move the corresponding
> pins to common u-boot.dtsi file.
>
> Signed-off-by: Keerthy <j-keer...@ti.com>
> ---
> .../k3-j721e-common-proc-board-u-boot.dtsi | 23 +++++++++++++++++++
> arch/arm/dts/k3-j721e-common-proc-board.dts | 13 -----------
> 2 files changed, 23 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
> b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
> index d422100d42..d15b5181f4 100644
> --- a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
> +++ b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
> @@ -260,6 +260,20 @@
> J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* (L4)
> MCU_MDIO0_MDIO */
> >;
> };
> +
> + mcu_fss0_ospi1_pins_default: mcu-fss0-ospi1-pins-default {
> + pinctrl-single,pins = <
> + J721E_WKUP_IOPAD(0x34, PIN_OUTPUT, 0) /* (F22)
> MCU_OSPI1_CLK */
> + J721E_WKUP_IOPAD(0x50, PIN_OUTPUT, 0) /* (C22)
> MCU_OSPI1_CSn0 */
> + J721E_WKUP_IOPAD(0x40, PIN_INPUT, 0) /* (D22)
> MCU_OSPI1_D0 */
> + J721E_WKUP_IOPAD(0x44, PIN_INPUT, 0) /* (G22)
> MCU_OSPI1_D1 */
> + J721E_WKUP_IOPAD(0x48, PIN_INPUT, 0) /* (D23)
> MCU_OSPI1_D2 */
> + J721E_WKUP_IOPAD(0x4c, PIN_INPUT, 0) /* (C23)
> MCU_OSPI1_D3 */
> + J721E_WKUP_IOPAD(0x3c, PIN_INPUT, 0) /* (B23)
> MCU_OSPI1_DQS */
> + J721E_WKUP_IOPAD(0x38, PIN_INPUT, 0) /* (A23)
> MCU_OSPI1_LBCLKO */
> + >;
> + u-boot,dm-spl;
pinmux should be in k3-j721e-common-proc-board.dts like in kernel DT.
Replicate the pinmux in R5 dts file for use in R5 SPL.
Only u-boot specific property "u-boot,dm-spl" should be added in
k3-j721e-common-proc-board-u-boot.dtsi
> + };
> };
>
> &main_pmx0 {
> @@ -365,3 +379,12 @@
> u-boot,dm-spl;
> };
> };
> +
> +&ospi1 {
> + status = "okay";
No need to for status = "okay" as OSPI1 is enabled by default.
> + u-boot,dm-spl;
> +
> + flash@0 {
> + u-boot,dm-spl;
> + };
> +};
> diff --git a/arch/arm/dts/k3-j721e-common-proc-board.dts
> b/arch/arm/dts/k3-j721e-common-proc-board.dts
> index 496a15e1d1..d02422ed25 100644
> --- a/arch/arm/dts/k3-j721e-common-proc-board.dts
> +++ b/arch/arm/dts/k3-j721e-common-proc-board.dts
> @@ -123,19 +123,6 @@
> J721E_WKUP_IOPAD(0xfc, PIN_INPUT_PULLUP, 0) /* (H24)
> WKUP_I2C0_SDA */
> >;
> };
> -
> - mcu_fss0_ospi1_pins_default: mcu-fss0-ospi1-pins-default {
> - pinctrl-single,pins = <
> - J721E_WKUP_IOPAD(0x34, PIN_OUTPUT, 0) /* (F22)
> MCU_OSPI1_CLK */
> - J721E_WKUP_IOPAD(0x50, PIN_OUTPUT, 0) /* (C22)
> MCU_OSPI1_CSn0 */
> - J721E_WKUP_IOPAD(0x40, PIN_INPUT, 0) /* (D22)
> MCU_OSPI1_D0 */
> - J721E_WKUP_IOPAD(0x44, PIN_INPUT, 0) /* (G22)
> MCU_OSPI1_D1 */
> - J721E_WKUP_IOPAD(0x48, PIN_INPUT, 0) /* (D23)
> MCU_OSPI1_D2 */
> - J721E_WKUP_IOPAD(0x4c, PIN_INPUT, 0) /* (C23)
> MCU_OSPI1_D3 */
> - J721E_WKUP_IOPAD(0x3c, PIN_INPUT, 0) /* (B23)
> MCU_OSPI1_DQS */
> - J721E_WKUP_IOPAD(0x38, PIN_INPUT, 0) /* (A23)
> MCU_OSPI1_LBCLKO */
> - >;
> - };
> };
>
> &usbss0 {
>
