Merge remote-tracking branch 'spi/topic/hspi' into spi-next

diff --cc drivers/spi/spi-sh-hspi.c
index 7e749a2,8a147d9..292567a
--- 1/drivers/spi/spi-sh-hspi.c
--- 2/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@@ -303,9 -303,10 +303,10 @@@ static int hspi_probe(struct platform_d
        master->setup           = hspi_setup;
        master->cleanup         = hspi_cleanup;
        master->mode_bits       = SPI_CPOL | SPI_CPHA;
+       master->dev.of_node     = pdev->dev.of_node;
        master->auto_runtime_pm = true;
        master->transfer_one_message            = hspi_transfer_one_message;
 -      ret = spi_register_master(master);
 +      ret = devm_spi_register_master(&pdev->dev, master);
        if (ret < 0) {
                dev_err(&pdev->dev, "spi_register_master error.\n");
                goto error1;