diff options
| -rw-r--r-- | arch/arm/dts/k3-am642-evm-u-boot.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/dts/k3-am642-sk-u-boot.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi | 8 | ||||
| -rw-r--r-- | configs/am64x_evm_a53_defconfig | 1 | ||||
| -rw-r--r-- | drivers/firmware/ti_sci.c | 1 | ||||
| -rw-r--r-- | drivers/firmware/ti_sci.h | 2 | ||||
| -rw-r--r-- | include/environment/ti/dfu.h | 4 |
7 files changed, 22 insertions, 2 deletions
diff --git a/arch/arm/dts/k3-am642-evm-u-boot.dtsi b/arch/arm/dts/k3-am642-evm-u-boot.dtsi index 9b0ba6b..10dea7a 100644 --- a/arch/arm/dts/k3-am642-evm-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-evm-u-boot.dtsi @@ -60,6 +60,10 @@ &dmsc { u-boot,dm-spl; + k3_sysreset: sysreset-controller { + compatible = "ti,sci-sysreset"; + u-boot,dm-spl; + }; }; &k3_pds { diff --git a/arch/arm/dts/k3-am642-sk-u-boot.dtsi b/arch/arm/dts/k3-am642-sk-u-boot.dtsi index 4ac7f5d..35b49df 100644 --- a/arch/arm/dts/k3-am642-sk-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-sk-u-boot.dtsi @@ -60,6 +60,10 @@ &dmsc { u-boot,dm-spl; + k3_sysreset: sysreset-controller { + compatible = "ti,sci-sysreset"; + u-boot,dm-spl; + }; }; &k3_pds { 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 3384ed9..fe095a6 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 @@ -193,3 +193,11 @@ &mcu_fss0_ospi1_pins_default { u-boot,dm-spl; }; + +&main_r5fss0 { + ti,cluster-mode = <0>; +}; + +&main_r5fss1 { + ti,cluster-mode = <0>; +}; diff --git a/configs/am64x_evm_a53_defconfig b/configs/am64x_evm_a53_defconfig index 08bb8af..304f5b4 100644 --- a/configs/am64x_evm_a53_defconfig +++ b/configs/am64x_evm_a53_defconfig @@ -75,6 +75,7 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHY_TI=y +CONFIG_PHY_TI_DP83867=y CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_TI_AM65_CPSW_NUSS=y diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index 2aec2e3..4671a5e 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -1588,6 +1588,7 @@ static int ti_sci_cmd_core_reboot(const struct ti_sci_handle *handle) dev_err(info->dev, "Message alloc failed(%d)\n", ret); return ret; } + req.domain = 0; ret = ti_sci_do_xfer(info, xfer); if (ret) { diff --git a/drivers/firmware/ti_sci.h b/drivers/firmware/ti_sci.h index eec488f..e4a087c 100644 --- a/drivers/firmware/ti_sci.h +++ b/drivers/firmware/ti_sci.h @@ -137,12 +137,14 @@ struct ti_sci_msg_resp_version { /** * struct ti_sci_msg_req_reboot - Reboot the SoC * @hdr: Generic Header + * @domain: Domain to be reset, 0 for full SoC reboot. * * Request type is TI_SCI_MSG_SYS_RESET, responded with a generic * ACK/NACK message. */ struct ti_sci_msg_req_reboot { struct ti_sci_msg_hdr hdr; + u8 domain; } __packed; /** diff --git a/include/environment/ti/dfu.h b/include/environment/ti/dfu.h index 720c345..3c90570 100644 --- a/include/environment/ti/dfu.h +++ b/include/environment/ti/dfu.h @@ -13,7 +13,7 @@ "boot part 0 1;" \ "rootfs part 0 2;" \ "MLO fat 0 1;" \ - "MLO.raw raw 0x100 0x100;" \ + "MLO.raw raw 0x100 0x200;" \ "u-boot.img.raw raw 0x300 0x1000;" \ "u-env.raw raw 0x1300 0x200;" \ "spl-os-args.raw raw 0x1500 0x200;" \ @@ -29,7 +29,7 @@ "boot part 1 1;" \ "rootfs part 1 2;" \ "MLO fat 1 1;" \ - "MLO.raw raw 0x100 0x100;" \ + "MLO.raw raw 0x100 0x200;" \ "u-boot.img.raw raw 0x300 0x1000;" \ "u-env.raw raw 0x1300 0x200;" \ "spl-os-args.raw raw 0x1500 0x200;" \ |