spi: tegra114: Convert to use master->max_speed_hz
Subsystems (3)
PATCH 1/3 spi: tegra114: Convert to use master->max_speed_hz
Use master->max_speed_hz instead of tspi->spi_max_frequency, so spi core will handle checking transfer speed.
In additional, since commit 052eb2d49006 'spi: core: Set max_speed_hz of spi_device default to max_speed_hz of controller',
spi core will also set default spi->max_speed_hz if it is not set. So remove the duplicate code in tegra_spi_setup.
--- drivers/spi/spi-tegra114.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-)
drivers/spi/spi-tegra114.c +3 -16
@@ -171,7 +171,6 @@ struct tegra_spi_data {void __iomem *base;phys_addr_t phys;unsigned irq; -u32 spi_max_frequency;u32 cur_speed;struct spi_device *cur_spi;
@@ -762,9 +761,6 @@ static int tegra_spi_setup(struct spi_device *spi)BUG_ON (spi->chip_select >=MAX_CHIP_SELECT ); -/* Set speed to the spi max fequency if spi device has not set */ - spi->max_speed_hz = spi->max_speed_hz ? : tspi->spi_max_frequency; - ret =pm_runtime_get_sync (tspi->dev);if (ret <0 ) {dev_err (tspi->dev,"pm runtime failed, e = %d\n" , ret);
@@ -1018,16 +1014,6 @@ static irqreturn_t tegra_spi_isr(int irq, void *context_data)return IRQ_WAKE_THREAD ; } -static void tegra_spi_parse_dt (struct platform_device *pdev, -struct tegra_spi_data *tspi) -{ -struct device_node *np = pdev->dev.of_node; - -if (of_property_read_u32 (np,"spi-max-frequency" , - &tspi->spi_max_frequency)) - tspi->spi_max_frequency =25000000 ;/* 25MHz */ -} -static struct of_device_id tegra_spi_of_match[] = { { .compatible ="nvidia,tegra114-spi" , }, {}
@@ -1049,8 +1035,9 @@ static int tegra_spi_probe(struct platform_device *pdev)platform_set_drvdata (pdev, master); tspi =spi_master_get_devdata (master); -/* Parse DT */ -tegra_spi_parse_dt (pdev, tspi); +if (of_property_read_u32 (pdev->dev.of_node,"spi-max-frequency" , + &master->max_speed_hz)) + master->max_speed_hz =25000000 ;/* 25MHz */ /* the spi->mode bits understood by this driver: */ master->mode_bits =SPI_CPOL |SPI_CPHA |SPI_CS_HIGH ;
Signature · 8 lines
1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 2/3 spi: tegra20-sflash: Convert to use master->max_speed_hz
Use master->max_speed_hz instead of tspi->spi_max_frequency, so spi core will handle checking transfer speed.
In additional, since commit 052eb2d49006 'spi: core: Set max_speed_hz of spi_device default to max_speed_hz of controller',
spi core will also set default spi->max_speed_hz if it is not set. So remove tegra_sflash_setup().
--- drivers/spi/spi-tegra20-sflash.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-)
drivers/spi/spi-tegra20-sflash.c +3 -21
@@ -120,7 +120,6 @@ struct tegra_sflash_data {struct reset_control *rst;void __iomem *base;unsigned irq; -u32 spi_max_frequency;u32 cur_speed;struct spi_device *cur_spi;
@@ -314,15 +313,6 @@ static int tegra_sflash_start_transfer_one(struct spi_device *spi,return tegra_sflash_start_cpu_based_transfer (tsd, t); } -static int tegra_sflash_setup (struct spi_device *spi) -{ -struct tegra_sflash_data *tsd =spi_master_get_devdata (spi->master); - -/* Set speed to the spi max fequency if spi device has not set */ - spi->max_speed_hz = spi->max_speed_hz ? : tsd->spi_max_frequency; -return 0 ; -} -static int tegra_sflash_transfer_one_message (struct spi_master *master,struct spi_message *msg) {
@@ -429,15 +419,6 @@ static irqreturn_t tegra_sflash_isr(int irq, void *context_data)return handle_cpu_based_xfer (tsd); } -static void tegra_sflash_parse_dt (struct tegra_sflash_data *tsd) -{ -struct device_node *np = tsd->dev->of_node; - -if (of_property_read_u32 (np,"spi-max-frequency" , - &tsd->spi_max_frequency)) - tsd->spi_max_frequency =25000000 ;/* 25MHz */ -} -static struct of_device_id tegra_sflash_of_match[] = { { .compatible ="nvidia,tegra20-sflash" , }, {}
@@ -466,7 +447,6 @@ static int tegra_sflash_probe(struct platform_device *pdev)/* the spi->mode bits understood by this driver: */ master->mode_bits =SPI_CPOL |SPI_CPHA ; - master->setup = tegra_sflash_setup; master->transfer_one_message = tegra_sflash_transfer_one_message; master->auto_runtime_pm = true; master->num_chipselect =MAX_CHIP_SELECT ;
@@ -478,7 +458,9 @@ static int tegra_sflash_probe(struct platform_device *pdev) tsd->dev = &pdev->dev;spin_lock_init (&tsd->lock); -tegra_sflash_parse_dt (tsd); +if (of_property_read_u32 (tsd->dev->of_node,"spi-max-frequency" , + &master->max_speed_hz)) + master->max_speed_hz =25000000 ;/* 25MHz */ r =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); tsd->base =devm_ioremap_resource (&pdev->dev, r);
Signature · 8 lines
1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 3/3 spi: tegra20-slink: Convert to use master->max_speed_hz
In reply to Axel LinUse master->max_speed_hz instead of tspi->spi_max_frequency, so spi core will handle checking transfer speed.
In additional, since commit 052eb2d49006 'spi: core: Set max_speed_hz of spi_device default to max_speed_hz of controller',
spi core will also set default spi->max_speed_hz if it is not set. So remove the duplicate code in tegra_slink_setup.
--- drivers/spi/spi-tegra20-slink.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)
drivers/spi/spi-tegra20-slink.c +3 -13
@@ -170,7 +170,6 @@ struct tegra_slink_data {void __iomem *base;phys_addr_t phys;unsigned irq; -u32 spi_max_frequency;u32 cur_speed;struct spi_device *cur_spi;
@@ -762,8 +761,6 @@ static int tegra_slink_setup(struct spi_device *spi)BUG_ON (spi->chip_select >=MAX_CHIP_SELECT ); -/* Set speed to the spi max fequency if spi device has not set */ - spi->max_speed_hz = spi->max_speed_hz ? : tspi->spi_max_frequency; ret =pm_runtime_get_sync (tspi->dev);if (ret <0 ) {dev_err (tspi->dev,"pm runtime failed, e = %d\n" , ret);
@@ -998,15 +995,6 @@ static irqreturn_t tegra_slink_isr(int irq, void *context_data)return IRQ_WAKE_THREAD ; } -static void tegra_slink_parse_dt (struct tegra_slink_data *tspi) -{ -struct device_node *np = tspi->dev->of_node; - -if (of_property_read_u32 (np,"spi-max-frequency" , - &tspi->spi_max_frequency)) - tspi->spi_max_frequency =25000000 ;/* 25MHz */ -} -static const struct tegra_slink_chip_data tegra30_spi_cdata = { .cs_hold_time = true, };
@@ -1061,7 +1049,9 @@ static int tegra_slink_probe(struct platform_device *pdev) tspi->chip_data = cdata;spin_lock_init (&tspi->lock); -tegra_slink_parse_dt (tspi); +if (of_property_read_u32 (tspi->dev->of_node,"spi-max-frequency" , + &master->max_speed_hz)) + master->max_speed_hz =25000000 ;/* 25MHz */ r =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (!r) {
Signature · 8 lines
1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 7 lines · Axel Lin
Use
master->max_speed_hzinstead oftspi->spi_max_frequency, so spi core will handle checking transfer speed.In additional, since commit
052eb2d49006'spi: core: Setmax_speed_hzofspi_devicedefault tomax_speed_hzof controller',
spi core will also set defaultspi->max_speed_hzif it is not set. So remove the duplicate code integra_spi_setup.
The series,
I wonder ...
drivers/spi/spi-tegra114.c static int tegra_spi_probe(struct platform_device *pdev) · line 1038
Quoted 9 lines
drivers/spi/spi-tegra114.c +3
-2@@ -1049,8 +1035,9 @@ static int tegra_spi_probe(struct platform_device *pdev) -/* Parse DT */ -tegra_spi_parse_dt (pdev, tspi); +if (of_property_read_u32 (pdev->dev.of_node,"spi-max-frequency" , + &master->max_speed_hz)) + master->max_speed_hz =25000000 ;/* 25MHz */
... if that DT parsing can be done in common code too?
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 9 lines · Stephen Warren
On 02/10/2014 06:48 AM, Axel Lin wrote:
I wonder ...
drivers/spi/spi-tegra114.c static int tegra_spi_probe(struct platform_device *pdev) · line 1040
Quoted 3 lines
drivers/spi/spi-tegra114.c +3
-0+if (of_property_read_u32 (pdev->dev.of_node,"spi-max-frequency" , + &master->max_speed_hz)) + master->max_speed_hz =25000000 ;/* 25MHz */ ... if that DT parsing can be done in common code too?
Yes, there is in general a lot of opportunity in the SPI subsystem to factor code out into the core. The DT stuff (things like this and also GPIO chip selects) is part of it.
Mark Brown
AppliedQuoted 2 lines · Axel Lin
Use
master->max_speed_hzinstead oftspi->spi_max_frequency, so spi core will handle checking transfer speed.
Applied all, thanks.