Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ab24635 authored by Jonas Gorski's avatar Jonas Gorski Committed by Mark Brown
Browse files

spi/bcm63xx-hsspi: allow for probing through devicetree 



Add required binding support to probe through device tree.

Signed-off-by: default avatarJonas Gorski <jonas.gorski@gmail.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8c0951af

drivers/spi/spi-bcm63xx-hsspi.c

+20 −3
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/spi/spi.h>

#include <linux/spi/spi.h>

#include <linux/mutex.h>

#include <linux/mutex.h>

#include <linux/of.h>





#define HSSPI_GLOBAL_CTRL_REG			0x0

#define HSSPI_GLOBAL_CTRL_REG			0x0

#define GLOBAL_CTRL_CS_POLARITY_SHIFT		0

#define GLOBAL_CTRL_CS_POLARITY_SHIFT		0
@@ -91,6 +92,7 @@ 




#define HSSPI_MAX_SYNC_CLOCK			30000000

#define HSSPI_MAX_SYNC_CLOCK			30000000





#define HSSPI_SPI_MAX_CS			8

#define HSSPI_BUS_NUM				1 /* 0 is legacy SPI */

#define HSSPI_BUS_NUM				1 /* 0 is legacy SPI */





struct bcm63xx_hsspi {

struct bcm63xx_hsspi {
@@ -332,7 +334,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct device *dev = &pdev->dev;

	struct clk *clk;

	struct clk *clk;

	int irq, ret;

	int irq, ret;

	u32 reg, rate;

	u32 reg, rate, num_cs = HSSPI_SPI_MAX_CS;





	irq = platform_get_irq(pdev, 0);

	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

	if (irq < 0) {
@@ -382,8 +384,17 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) 
	mutex_init(&bs->bus_mutex);

	mutex_init(&bs->bus_mutex);

	init_completion(&bs->done);

	init_completion(&bs->done);





	master->dev.of_node = dev->of_node;

	if (!dev->of_node)

		master->bus_num = HSSPI_BUS_NUM;

		master->bus_num = HSSPI_BUS_NUM;

	master->num_chipselect = 8;



	of_property_read_u32(dev->of_node, "num-cs", &num_cs);

	if (num_cs > 8) {

		dev_warn(dev, "unsupported number of cs (%i), reducing to 8\n",

			 num_cs);

		num_cs = HSSPI_SPI_MAX_CS;

	}

	master->num_chipselect = num_cs;

	master->setup = bcm63xx_hsspi_setup;

	master->setup = bcm63xx_hsspi_setup;

	master->transfer_one_message = bcm63xx_hsspi_transfer_one;

	master->transfer_one_message = bcm63xx_hsspi_transfer_one;

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH |

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH |
@@ -469,10 +480,16 @@ static int bcm63xx_hsspi_resume(struct device *dev) 
static SIMPLE_DEV_PM_OPS(bcm63xx_hsspi_pm_ops, bcm63xx_hsspi_suspend,

static SIMPLE_DEV_PM_OPS(bcm63xx_hsspi_pm_ops, bcm63xx_hsspi_suspend,

			 bcm63xx_hsspi_resume);

			 bcm63xx_hsspi_resume);





static const struct of_device_id bcm63xx_hsspi_of_match[] = {

	{ .compatible = "brcm,bcm6328-hsspi", },

	{ },

};



static struct platform_driver bcm63xx_hsspi_driver = {

static struct platform_driver bcm63xx_hsspi_driver = {

	.driver = {

	.driver = {

		.name	= "bcm63xx-hsspi",

		.name	= "bcm63xx-hsspi",

		.pm	= &bcm63xx_hsspi_pm_ops,

		.pm	= &bcm63xx_hsspi_pm_ops,

		.of_match_table = bcm63xx_hsspi_of_match,

	},

	},

	.probe		= bcm63xx_hsspi_probe,

	.probe		= bcm63xx_hsspi_probe,

	.remove		= bcm63xx_hsspi_remove,

	.remove		= bcm63xx_hsspi_remove,