@@ -299,7 +299,7 @@ static int mchp_coreqspi_setup_clock(struct mchp_coreqspi *qspi, struct spi_devi
299299
300300static int mchp_coreqspi_setup_op (struct spi_device * spi_dev )
301301{
302- struct spi_controller * ctlr = spi_dev -> master ;
302+ struct spi_controller * ctlr = spi_dev -> controller ;
303303 struct mchp_coreqspi * qspi = spi_controller_get_devdata (ctlr );
304304 u32 control = readl_relaxed (qspi -> regs + REG_CONTROL );
305305
@@ -368,7 +368,7 @@ static inline void mchp_coreqspi_config_op(struct mchp_coreqspi *qspi, const str
368368static int mchp_qspi_wait_for_ready (struct spi_mem * mem )
369369{
370370 struct mchp_coreqspi * qspi = spi_controller_get_devdata
371- (mem -> spi -> master );
371+ (mem -> spi -> controller );
372372 u32 status ;
373373 int ret ;
374374
@@ -387,7 +387,7 @@ static int mchp_qspi_wait_for_ready(struct spi_mem *mem)
387387static int mchp_coreqspi_exec_op (struct spi_mem * mem , const struct spi_mem_op * op )
388388{
389389 struct mchp_coreqspi * qspi = spi_controller_get_devdata
390- (mem -> spi -> master );
390+ (mem -> spi -> controller );
391391 u32 address = op -> addr .val ;
392392 u8 opcode = op -> cmd .opcode ;
393393 u8 opaddr [5 ];
@@ -505,10 +505,10 @@ static int mchp_coreqspi_probe(struct platform_device *pdev)
505505 struct device_node * np = dev -> of_node ;
506506 int ret ;
507507
508- ctlr = devm_spi_alloc_master (& pdev -> dev , sizeof (* qspi ));
508+ ctlr = devm_spi_alloc_host (& pdev -> dev , sizeof (* qspi ));
509509 if (!ctlr )
510510 return dev_err_probe (& pdev -> dev , - ENOMEM ,
511- "unable to allocate master for QSPI controller\n" );
511+ "unable to allocate host for QSPI controller\n" );
512512
513513 qspi = spi_controller_get_devdata (ctlr );
514514 platform_set_drvdata (pdev , qspi );
0 commit comments