@@ -210,9 +210,9 @@ void esdhc_dspi_status_fixup(void *blob)
{
const char esdhc0_path[] = "/soc/esdhc at 2140000";
const char esdhc1_path[] = "/soc/esdhc at 2150000";
- const char dspi0_path[] = "/soc/dspi at 2100000";
- const char dspi1_path[] = "/soc/dspi at 2110000";
- const char dspi2_path[] = "/soc/dspi at 2120000";
+ const char dspi0_path[] = "/soc/spi at 2100000";
+ const char dspi1_path[] = "/soc/spi at 2110000";
+ const char dspi2_path[] = "/soc/spi at 2120000";
struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR);
u32 sdhc1_base_pmux;
@@ -262,10 +262,12 @@ void esdhc_dspi_status_fixup(void *blob)
& FSL_CHASSIS3_IIC5_PMUX_MASK;
iic5_pmux >>= FSL_CHASSIS3_IIC5_PMUX_SHIFT;
- if (iic5_pmux == IIC5_PMUX_SPI3) {
+ if (iic5_pmux == IIC5_PMUX_SPI3)
do_fixup_by_path(blob, dspi2_path, "status", "okay",
sizeof("okay"), 1);
- }
+ else
+ do_fixup_by_path(blob, dspi2_path, "status", "disabled",
+ sizeof("disabled"), 1);
}
#endif
The dts node of the DSPI controller in kernel is spi instead of dspi, it is not correct if ues "/soc/dspi@" to fix up the status of the dts in kernel, so, modify it to "/soc/spi@". The DSPI2 and I2C5 are muxed, and the status of DSPI2 node in kernel dts default value is okay, set the status of DSPI2 node is disabled if it used to I2C5. Signed-off-by: Xiaowei Bao <xiaowei.bao at nxp.com> --- v2: - Modify the subject and commit message. board/freescale/lx2160a/lx2160a.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)