ARM: tegra: use common reset and DMA bindings
Subsystems (46)
PATCH 21/31 staging: nvec: use reset framework
In reply to Stephen WarrenFrom: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
--- drivers/staging/nvec/nvec.c | 11 ++++++++--- drivers/staging/nvec/nvec.h | 5 ++++- 2 files changed, 12 insertions(+), 4 deletions(-)
drivers/staging/nvec/nvec.c +8 -3
@@ -36,7 +36,6 @@#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/workqueue.h> -#include <linux/clk/tegra.h> #include "nvec.h"
@@ -733,9 +732,9 @@ static void tegra_init_i2c_slave(struct nvec_chip *nvec)clk_prepare_enable (nvec->i2c_clk); -tegra_periph_reset_assert (nvec->i2c_clk); +reset_control_assert (nvec->rst);udelay (2 ); -tegra_periph_reset_deassert (nvec->i2c_clk); +reset_control_deassert (nvec->rst); val =I2C_CNFG_NEW_MASTER_SFM |I2C_CNFG_PACKET_MODE_EN | (0x2 <<I2C_CNFG_DEBOUNCE_CNT_SHIFT );
@@ -836,6 +835,12 @@ static int tegra_nvec_probe(struct platform_device *pdev)return -ENODEV ; } + nvec->rst =devm_reset_control_get (&pdev->dev,"i2c" ); +if (IS_ERR (nvec->rst)) { +dev_err (nvec->dev,"failed to get controller reset\n" ); +return PTR_ERR (nvec->rst); + } + nvec->base = base; nvec->irq = res->start; nvec->i2c_clk = i2c_clk;
drivers/staging/nvec/nvec.h +4 -1
@@ -23,6 +23,7 @@#include <linux/list.h> #include <linux/mutex.h> #include <linux/notifier.h> +#include <linux/reset.h> #include <linux/spinlock.h> #include <linux/workqueue.h>
@@ -109,7 +110,8 @@ struct nvec_msg {* @irq: The IRQ of the I2C device * @i2c_addr: The address of the I2C slave * @base: The base of the memory mapped region of the I2C device -* @clk: The clock of the I2C device +* @i2c_clk: The clock of the I2C device +* @rst: The reset of the I2C device * @notifier_list: Notifiers to be called on received messages, see * nvec_register_notifier() * @rx_data: Received messages that have to be processed
@@ -139,6 +141,7 @@ struct nvec_chip {int i2c_addr;void __iomem *base;struct clk *i2c_clk; +struct reset_control *rst;struct atomic_notifier_head notifier_list;struct list_head rx_data, tx_data;struct notifier_block nvec_status_notifier;
Signature · 1 line
1.8.1.5
Marc Dietrich
maintainerPATCH 21/31 staging: nvec: use reset framework
Quoted 6 lines · On Friday 15 November 2013 13:54:16 Stephen Warren wrote:
From: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (
include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.
Quoted 10 lines
Cc treding at nvidia.comCc pdeschrijver at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Julian Andres Klode <[email protected]>Cc Marc Dietrich <[email protected]>Cc ac100 at lists.launchpad.netCc Greg Kroah-Hartman <[email protected]>Cc devel at driverdev.osuosl.orgSigned-off-by Stephen Warren <[email protected]>
Quoted 77 lines
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.--- drivers/staging/nvec/nvec.c | 11 ++++++++--- drivers/staging/nvec/nvec.h | 5 ++++- 2 files changed, 12 insertions(+), 4 deletions(-)drivers/staging/nvec/nvec.c +8
-3@@ -36,7 +36,6 @@#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/workqueue.h> -#include <linux/clk/tegra.h> #include "nvec.h" @@ -733,9 +732,9 @@ static void tegra_init_i2c_slave(struct nvec_chip *nvec)clk_prepare_enable (nvec->i2c_clk); -tegra_periph_reset_assert (nvec->i2c_clk); +reset_control_assert (nvec->rst);udelay (2 ); -tegra_periph_reset_deassert (nvec->i2c_clk); +reset_control_deassert (nvec->rst); val =I2C_CNFG_NEW_MASTER_SFM |I2C_CNFG_PACKET_MODE_EN | (0x2 <<I2C_CNFG_DEBOUNCE_CNT_SHIFT );@@ -836,6 +835,12 @@ static int tegra_nvec_probe(struct platform_device *pdev) return -ENODEV; } + nvec->rst =devm_reset_control_get (&pdev->dev,"i2c" ); +if (IS_ERR (nvec->rst)) { +dev_err (nvec->dev,"failed to get controller reset\n" ); +return PTR_ERR (nvec->rst); + } + nvec->base = base; nvec->irq = res->start; nvec->i2c_clk = i2c_clk;drivers/staging/nvec/nvec.h +4
-1@@ -23,6 +23,7 @@#include <linux/list.h> #include <linux/mutex.h> #include <linux/notifier.h> +#include <linux/reset.h> #include <linux/spinlock.h> #include <linux/workqueue.h> @@ -109,7 +110,8 @@ struct nvec_msg {* @irq: The IRQ of the I2C device * @i2c_addr: The address of the I2C slave * @base: The base of the memory mapped region of the I2C device -* @clk: The clock of the I2C device +* @i2c_clk: The clock of the I2C device +* @rst: The reset of the I2C device * @notifier_list: Notifiers to be called on received messages, see * nvec_register_notifier() * @rx_data: Received messages that have to be processed @@ -139,6 +141,7 @@ struct nvec_chip {int i2c_addr;void __iomem *base;struct clk *i2c_clk; +struct reset_control *rst;struct atomic_notifier_head notifier_list;struct list_head rx_data, tx_data;struct notifier_block nvec_status_notifier;
Greg Kroah-Hartman
maintainerPATCH 21/31 staging: nvec: use reset framework
In reply to Stephen WarrenQuoted 16 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (
include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.Cc treding at nvidia.comCc pdeschrijver at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Julian Andres Klode <[email protected]>Cc Marc Dietrich <[email protected]>Cc ac100 at lists.launchpad.netCc Greg Kroah-Hartman <[email protected]>Cc devel at driverdev.osuosl.orgSigned-off-by Stephen Warren <[email protected]>
Quoted 5 lines
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
PATCH 21/31 staging: nvec: use reset framework
In reply to Stephen WarrenQuoted 21 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (
include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.Cc treding at nvidia.comCc pdeschrijver at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Julian Andres Klode <[email protected]>Cc Marc Dietrich <[email protected]>Cc ac100 at lists.launchpad.netCc Greg Kroah-Hartman <[email protected]>Cc devel at driverdev.osuosl.orgSigned-off-by Stephen Warren <[email protected]>---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
Quoted 4 lines
--- drivers/staging/nvec/nvec.c | 11 ++++++++--- drivers/staging/nvec/nvec.h | 5 ++++- 2 files changed, 12 insertions(+), 4 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131129/3d1cca1e/attachment.sig>
PATCH 22/31 spi: tegra: use reset framework
In reply to Stephen WarrenFrom: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
--- drivers/spi/Kconfig | 3 +++ drivers/spi/spi-tegra114.c | 18 +++++++++++++----- drivers/spi/spi-tegra20-sflash.c | 18 +++++++++++++----- drivers/spi/spi-tegra20-slink.c | 18 +++++++++++++----- 4 files changed, 42 insertions(+), 15 deletions(-)
drivers/spi/Kconfig +3 -0
@@ -448,6 +448,7 @@ config SPI_MXS config SPI_TEGRA114 tristate "NVIDIA Tegra114 SPI Controller" depends on (ARCH_TEGRA && TEGRA20_APB_DMA) || COMPILE_TEST + depends on RESET_CONTROLLER help SPI driver for NVIDIA Tegra114 SPI Controller interface. This controller is different than the older SoCs SPI controller and also register interface
@@ -456,6 +457,7 @@ config SPI_TEGRA114 config SPI_TEGRA20_SFLASH tristate "Nvidia Tegra20 Serial flash Controller" depends on ARCH_TEGRA || COMPILE_TEST + depends on RESET_CONTROLLER help SPI driver for Nvidia Tegra20 Serial flash Controller interface. The main usecase of this controller is to use spi flash as boot
@@ -464,6 +466,7 @@ config SPI_TEGRA20_SFLASH config SPI_TEGRA20_SLINK tristate "Nvidia Tegra20/Tegra30 SLINK Controller" depends on (ARCH_TEGRA && TEGRA20_APB_DMA) || COMPILE_TEST + depends on RESET_CONTROLLER help SPI driver for Nvidia Tegra20/Tegra30 SLINK Controller interface.
drivers/spi/spi-tegra114.c +13 -5
@@ -17,7 +17,6 @@*/ #include <linux/clk.h> -#include <linux/clk/tegra.h> #include <linux/completion.h> #include <linux/delay.h> #include <linux/dmaengine.h>
@@ -34,6 +33,7 @@#include <linux/pm_runtime.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/reset.h> #include <linux/spi/spi.h> #define SPI_COMMAND1 0x000
@@ -174,6 +174,7 @@ struct tegra_spi_data {spinlock_t lock;struct clk *clk; +struct reset_control *rst;void __iomem *base;phys_addr_t phys;unsigned irq;
@@ -918,9 +919,9 @@ static irqreturn_t handle_cpu_based_xfer(struct tegra_spi_data *tspi) tspi->status_reg);dev_err (tspi->dev,"CpuXfer 0x%08x:0x%08x\n" , tspi->command1_reg, tspi->dma_control_reg); -tegra_periph_reset_assert (tspi->clk); +reset_control_assert (tspi->rst);udelay (2 ); -tegra_periph_reset_deassert (tspi->clk); +reset_control_deassert (tspi->rst);complete (&tspi->xfer_completion); goto exit; }
@@ -990,9 +991,9 @@ static irqreturn_t handle_dma_based_xfer(struct tegra_spi_data *tspi) tspi->status_reg);dev_err (tspi->dev,"DmaXfer 0x%08x:0x%08x\n" , tspi->command1_reg, tspi->dma_control_reg); -tegra_periph_reset_assert (tspi->clk); +reset_control_assert (tspi->rst);udelay (2 ); -tegra_periph_reset_deassert (tspi->clk); +reset_control_deassert (tspi->rst);complete (&tspi->xfer_completion);spin_unlock_irqrestore (&tspi->lock, flags);return IRQ_HANDLED ;
@@ -1127,6 +1128,13 @@ static int tegra_spi_probe(struct platform_device *pdev) goto exit_free_irq; } + tspi->rst =devm_reset_control_get (&pdev->dev,"spi" ); +if (IS_ERR (tspi->rst)) { +dev_err (&pdev->dev,"can not get reset\n" ); + ret =PTR_ERR (tspi->rst); + goto exit_free_irq; + } + tspi->max_buf_size =SPI_FIFO_DEPTH <<2 ; tspi->dma_buf_size =DEFAULT_SPI_DMA_BUF_LEN ;
drivers/spi/spi-tegra20-sflash.c +13 -5
@@ -32,8 +32,8 @@#include <linux/pm_runtime.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/reset.h> #include <linux/spi/spi.h> -#include <linux/clk/tegra.h> #define SPI_COMMAND 0x000#define SPI_GO BIT(30)
@@ -118,6 +118,7 @@ struct tegra_sflash_data {spinlock_t lock;struct clk *clk; +struct reset_control *rst;void __iomem *base;unsigned irq;u32 spi_max_frequency;
@@ -389,9 +390,9 @@ static irqreturn_t handle_cpu_based_xfer(struct tegra_sflash_data *tsd)dev_err (tsd->dev,"CpuXfer 0x%08x:0x%08x\n" , tsd->command_reg, tsd->dma_control_reg); -tegra_periph_reset_assert (tsd->clk); +reset_control_assert (tsd->rst);udelay (2 ); -tegra_periph_reset_deassert (tsd->clk); +reset_control_deassert (tsd->rst);complete (&tsd->xfer_completion); goto exit; }
@@ -505,6 +506,13 @@ static int tegra_sflash_probe(struct platform_device *pdev) goto exit_free_irq; } + tsd->rst =devm_reset_control_get (&pdev->dev,"spi" ); +if (IS_ERR (tsd->rst)) { +dev_err (&pdev->dev,"can not get reset\n" ); + ret =PTR_ERR (tsd->rst); + goto exit_free_irq; + } +init_completion (&tsd->xfer_completion);pm_runtime_enable (&pdev->dev);if (!pm_runtime_enabled (&pdev->dev)) {
@@ -520,9 +528,9 @@ static int tegra_sflash_probe(struct platform_device *pdev) }/* Reset controller */ -tegra_periph_reset_assert (tsd->clk); +reset_control_assert (tsd->rst);udelay (2 ); -tegra_periph_reset_deassert (tsd->clk); +reset_control_deassert (tsd->rst); tsd->def_command_reg =SPI_M_S |SPI_CS_SW ;tegra_sflash_writel (tsd, tsd->def_command_reg,SPI_COMMAND );
drivers/spi/spi-tegra20-slink.c +13 -5
@@ -33,8 +33,8 @@#include <linux/pm_runtime.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/reset.h> #include <linux/spi/spi.h> -#include <linux/clk/tegra.h> #define SLINK_COMMAND 0x000#define SLINK_BIT_LENGTH (x) (((x) & 0x1f) << 0)
@@ -167,6 +167,7 @@ struct tegra_slink_data {spinlock_t lock;struct clk *clk; +struct reset_control *rst;void __iomem *base;phys_addr_t phys;unsigned irq;
@@ -884,9 +885,9 @@ static irqreturn_t handle_cpu_based_xfer(struct tegra_slink_data *tspi)dev_err (tspi->dev,"CpuXfer 0x%08x:0x%08x:0x%08x\n" , tspi->command_reg, tspi->command2_reg, tspi->dma_control_reg); -tegra_periph_reset_assert (tspi->clk); +reset_control_assert (tspi->rst);udelay (2 ); -tegra_periph_reset_deassert (tspi->clk); +reset_control_deassert (tspi->rst);complete (&tspi->xfer_completion); goto exit; }
@@ -957,9 +958,9 @@ static irqreturn_t handle_dma_based_xfer(struct tegra_slink_data *tspi)dev_err (tspi->dev,"DmaXfer 0x%08x:0x%08x:0x%08x\n" , tspi->command_reg, tspi->command2_reg, tspi->dma_control_reg); -tegra_periph_reset_assert (tspi->clk); +reset_control_assert (tspi->rst);udelay (2 ); -tegra_periph_reset_deassert (tspi->clk); +reset_control_assert (tspi->rst);complete (&tspi->xfer_completion);spin_unlock_irqrestore (&tspi->lock, flags);return IRQ_HANDLED ;
@@ -1118,6 +1119,13 @@ static int tegra_slink_probe(struct platform_device *pdev) goto exit_free_irq; } + tspi->rst =devm_reset_control_get (&pdev->dev,"spi" ); +if (IS_ERR (tspi->rst)) { +dev_err (&pdev->dev,"can not get reset\n" ); + ret =PTR_ERR (tspi->rst); + goto exit_free_irq; + } + tspi->max_buf_size =SLINK_FIFO_DEPTH <<2 ; tspi->dma_buf_size =DEFAULT_SPI_DMA_BUF_LEN ;
Signature · 1 line
1.8.1.5
Mark Brown
maintainerPATCH 22/31 spi: tegra: use reset framework
Quoted 5 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (
include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131116/dbb68c6b/attachment.sig>
PATCH 22/31 spi: tegra: use reset framework
In reply to Stephen WarrenQuoted 18 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (
include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.Cc treding at nvidia.comCc pdeschrijver at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Mark Brown <[email protected]>Cc linux-spi at vger.kernel.orgSigned-off-by Stephen Warren <[email protected]>---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
Quoted 6 lines
--- drivers/spi/Kconfig | 3 +++ drivers/spi/spi-tegra114.c | 18 +++++++++++++----- drivers/spi/spi-tegra20-sflash.c | 18 +++++++++++++----- drivers/spi/spi-tegra20-slink.c | 18 +++++++++++++----- 4 files changed, 42 insertions(+), 15 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131129/1451806a/attachment-0001.sig>
PATCH 23/31 spi: tegra: convert to standard DMA DT bindings
In reply to Stephen WarrenFrom: Stephen Warren <[email protected]>
By using dma_request_slave_channel_or_err(), the DMA slave ID can be looked up from standard DT properties, and squirrelled away during channel allocation. Hence, there's no need to use a custom DT property to store the slave ID.
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
--- drivers/spi/spi-tegra114.c | 48 +++++++++++++++-------------------------- drivers/spi/spi-tegra20-slink.c | 48 +++++++++++++++-------------------------- 2 files changed, 34 insertions(+), 62 deletions(-)
drivers/spi/spi-tegra114.c +17 -31
@@ -178,7 +178,6 @@ struct tegra_spi_data {void __iomem *base;phys_addr_t phys;unsigned irq; -int dma_req_sel;u32 spi_max_frequency;u32 cur_speed;
@@ -601,15 +600,15 @@ static int tegra_spi_init_dma_param(struct tegra_spi_data *tspi,dma_addr_t dma_phys;int ret;struct dma_slave_config dma_sconfig; -dma_cap_mask_t mask; -dma_cap_zero (mask); -dma_cap_set (DMA_SLAVE , mask); - dma_chan =dma_request_channel (mask,NULL ,NULL ); -if (!dma_chan) { -dev_err (tspi->dev, -"Dma channel is not available, will try later\n" ); -return -EPROBE_DEFER ; + dma_chan =dma_request_slave_channel_or_err (tspi->dev, + dma_to_memory ?"rx" :"tx" ); +if (IS_ERR (dma_chan)) { + ret =PTR_ERR (dma_chan); +if (ret != -EPROBE_DEFER ) +dev_err (tspi->dev, +"Dma channel is not available: %d\n" , ret); +return ret; } dma_buf = dma_alloc_coherent(tspi->dev, tspi->dma_buf_size,
@@ -620,7 +619,6 @@ static int tegra_spi_init_dma_param(struct tegra_spi_data *tspi,return -ENOMEM ; } - dma_sconfig.slave_id = tspi->dma_req_sel;if (dma_to_memory) { dma_sconfig.src_addr = tspi->phys +SPI_RX_FIFO ; dma_sconfig.src_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ;
@@ -1055,11 +1053,6 @@ static void tegra_spi_parse_dt(struct platform_device *pdev, struct tegra_spi_data *tspi) {struct device_node *np = pdev->dev.of_node; -u32 of_dma[2 ]; - -if (of_property_read_u32_array (np,"nvidia,dma-request-selector" , - of_dma,2 ) >=0 ) - tspi->dma_req_sel = of_dma[1 ];if (of_property_read_u32 (np,"spi-max-frequency" , &tspi->spi_max_frequency))
@@ -1138,22 +1131,15 @@ static int tegra_spi_probe(struct platform_device *pdev) tspi->max_buf_size =SPI_FIFO_DEPTH <<2 ; tspi->dma_buf_size =DEFAULT_SPI_DMA_BUF_LEN ; -if (tspi->dma_req_sel) { - ret =tegra_spi_init_dma_param (tspi, true); -if (ret <0 ) { -dev_err (&pdev->dev,"RxDma Init failed, err %d\n" , ret); - goto exit_free_irq; - } - - ret =tegra_spi_init_dma_param (tspi, false); -if (ret <0 ) { -dev_err (&pdev->dev,"TxDma Init failed, err %d\n" , ret); - goto exit_rx_dma_free; - } - tspi->max_buf_size = tspi->dma_buf_size; -init_completion (&tspi->tx_dma_complete); -init_completion (&tspi->rx_dma_complete); - } + ret =tegra_spi_init_dma_param (tspi, true); +if (ret <0 ) + goto exit_free_irq; + ret =tegra_spi_init_dma_param (tspi, false); +if (ret <0 ) + goto exit_rx_dma_free; + tspi->max_buf_size = tspi->dma_buf_size; +init_completion (&tspi->tx_dma_complete); +init_completion (&tspi->rx_dma_complete);init_completion (&tspi->xfer_completion);
drivers/spi/spi-tegra20-slink.c +17 -31
79 lines not on this page · raw message
Signature · 1 line
1.8.1.5
Mark Brown
maintainerPATCH 23/31 spi: tegra: convert to standard DMA DT bindings
Quoted 3 lines · Stephen Warren
From: Stephen Warren <[email protected]>
By using
dma_request_slave_channel_or_err(), the DMA slave ID can be
Is this function introduced earlier in the series? One of the things I'm looking at is trying to factor out some DMA code in the SPI framework so perhaps using this straight off would be good. But perhaps the channel request stuff will all be in the drivers and it'll just pass a handle to the framework code so there'll be no issue.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131116/b159256d/attachment.sig>
PATCH 23/31 spi: tegra: convert to standard DMA DT bindings
Quoted 8 lines · Mark Brown
Quoted 3 lines · Stephen Warren
From: Stephen Warren <[email protected]>
By using
dma_request_slave_channel_or_err(), the DMA slave ID can beAcked-by Mark Brown <[email protected]>Is this function introduced earlier in the series?
Yes, patch 11/31 introduced this.
Quoted 5 lines
One of the things
I'm looking at is trying to factor out some DMA code in the SPI framework so perhaps using this straight off would be good. But perhaps the channel request stuff will all be in the drivers and it'll just pass a handle to the framework code so there'll be no issue.
I think I can make a "core changes" branch that contains:
[PATCH 11/31] dma: add channel request API that supports deferred probe
[PATCH 14/31] ASoC: dmaengine: support deferred probe for DMA channels
[PATCH 15/31] ASoC: dmaengine: add custom DMA config to snd_dmaengine_pcm_config
That could be merged into relevant subsystems alone, if they only depend on the core changes and not any of the Tegra driver changes.
However, I suspect that the Tegra driver changes may need to be merged into any subsystem that's doing much other work on the Tegra drivers, especially any significant refactoring, so the subsystem would probably have to pick up the whole series anyway. Still, I'll make sure I re-order the branch to put the core changes first so we have as much flexibility as possible.
Mark Brown
maintainerPATCH 23/31 spi: tegra: convert to standard DMA DT bindings
Quoted 6 lines · Stephen Warren
However, I suspect that the Tegra driver changes may need to be merged into any subsystem that's doing much other work on the Tegra drivers, especially any significant refactoring, so the subsystem would probably have to pick up the whole series anyway. Still, I'll make sure I re-order the branch to put the core changes first so we have as much flexibility as possible.
At least in the ASoC case my main consideration is other drivers wanting
to use the core changes rather than changes being made to the Tegra
drivers. Let's try to just share the core code and merge the rest over
later if needed?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131118/aad32f00/attachment.sig>
PATCH 24/31 serial: tegra: use reset framework
In reply to Stephen WarrenFrom: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
--- drivers/tty/serial/serial-tegra.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/tty/serial/serial-tegra.c +10 -4
@@ -34,6 +34,7 @@#include <linux/of_device.h> #include <linux/pagemap.h> #include <linux/platform_device.h> +#include <linux/reset.h> #include <linux/serial.h> #include <linux/serial_8250.h> #include <linux/serial_core.h>
@@ -44,8 +45,6 @@#include <linux/tty.h> #include <linux/tty_flip.h> -#include <linux/clk/tegra.h> -#define TEGRA_UART_TYPE "TEGRA_UART"#define TX_EMPTY_STATUS (UART_LSR_TEMT | UART_LSR_THRE)#define BYTES_TO_ALIGN (x) ((unsigned long)(x) & 0x3)
@@ -103,6 +102,7 @@ struct tegra_uart_port {const struct tegra_uart_chip_data *cdata;struct clk *uart_clk; +struct reset_control *rst;unsigned int current_baud;/* Register shadow */
@@ -832,9 +832,9 @@ static int tegra_uart_hw_init(struct tegra_uart_port *tup)clk_prepare_enable (tup->uart_clk);/* Reset the UART controller to clear all previous status.*/ -tegra_periph_reset_assert (tup->uart_clk); +reset_control_assert (tup->rst);udelay (10 ); -tegra_periph_reset_deassert (tup->uart_clk); +reset_control_deassert (tup->rst); tup->rx_in_progress =0 ; tup->tx_in_progress =0 ;
@@ -1320,6 +1320,12 @@ static int tegra_uart_probe(struct platform_device *pdev)return PTR_ERR (tup->uart_clk); } + tup->rst =devm_reset_control_get (&pdev->dev,"serial" ); +if (IS_ERR (tup->rst)) { +dev_err (&pdev->dev,"Couldn't get the reset\n" ); +return PTR_ERR (tup->rst); + } + u->iotype =UPIO_MEM32 ; u->irq =platform_get_irq (pdev,0 ); u->regshift =2 ;
Signature · 1 line
1.8.1.5
Greg Kroah-Hartman
maintainerPATCH 24/31 serial: tegra: use reset framework
Quoted 13 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (
include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.Cc Greg Kroah-Hartman <[email protected]>Signed-off-by Stephen Warren <[email protected]>
Quoted 5 lines
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
PATCH 24/31 serial: tegra: use reset framework
In reply to Stephen WarrenQuoted 13 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (
include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.Cc treding at nvidia.comCc pdeschrijver at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Greg Kroah-Hartman <[email protected]>Cc linux-serial at vger.kernel.orgSigned-off-by Stephen Warren <[email protected]>
Quoted 8 lines
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.--- drivers/tty/serial/serial-tegra.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131129/11553bea/attachment.sig>
PATCH 25/31 serial: tegra: convert to standard DMA DT bindings
In reply to Stephen WarrenFrom: Stephen Warren <[email protected]>
By using dma_request_slave_channel_or_err(), the DMA slave ID can be looked up from standard DT properties, and squirrelled away during channel allocation. Hence, there's no need to use a custom DT property to store the slave ID.
DMA channel allocation is moved to probe() so that deferred probe works.
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
--- drivers/tty/serial/serial-tegra.c | 72 ++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 42 deletions(-)
drivers/tty/serial/serial-tegra.c +30 -42
@@ -120,7 +120,6 @@ struct tegra_uart_port {bool rx_timeout;int rx_in_progress;int symb_bit; -int dma_req_sel;struct dma_chan *rx_dma_chan;struct dma_chan *tx_dma_chan;
@@ -910,15 +909,15 @@ static int tegra_uart_dma_channel_allocate(struct tegra_uart_port *tup,dma_addr_t dma_phys;int ret;struct dma_slave_config dma_sconfig; -dma_cap_mask_t mask; -dma_cap_zero (mask); -dma_cap_set (DMA_SLAVE , mask); - dma_chan =dma_request_channel (mask,NULL ,NULL ); -if (!dma_chan) { -dev_err (tup->uport.dev, -"Dma channel is not available, will try later\n" ); -return -EPROBE_DEFER ; + dma_chan =dma_request_slave_channel_or_err (tup->uport.dev, + dma_to_memory ?"rx" :"tx" ); +if (IS_ERR (dma_chan)) { + ret =PTR_ERR (dma_chan); +if (ret != -EPROBE_DEFER ) +dev_err (tup->uport.dev, +"DMA channel alloc failed: %d\n" , ret); +return ret; }if (dma_to_memory) {
@@ -938,7 +937,6 @@ static int tegra_uart_dma_channel_allocate(struct tegra_uart_port *tup, dma_buf = tup->uport.state->xmit.buf; } - dma_sconfig.slave_id = tup->dma_req_sel;if (dma_to_memory) { dma_sconfig.src_addr = tup->uport.mapbase; dma_sconfig.src_addr_width =DMA_SLAVE_BUSWIDTH_1_BYTE ;
@@ -1000,37 +998,20 @@ static int tegra_uart_startup(struct uart_port *u)struct tegra_uart_port *tup =to_tegra_uport (u);int ret; - ret =tegra_uart_dma_channel_allocate (tup, false); -if (ret <0 ) { -dev_err (u->dev,"Tx Dma allocation failed, err = %d\n" , ret); -return ret; - } - - ret =tegra_uart_dma_channel_allocate (tup, true); -if (ret <0 ) { -dev_err (u->dev,"Rx Dma allocation failed, err = %d\n" , ret); - goto fail_rx_dma; - } - ret =tegra_uart_hw_init (tup);if (ret <0 ) {dev_err (u->dev,"Uart HW init failed, err = %d\n" , ret); - goto fail_hw_init; +return ret; } ret =request_irq (u->irq, tegra_uart_isr,0 ,dev_name (u->dev), tup);if (ret <0 ) {dev_err (u->dev,"Failed to register ISR for IRQ %d\n" , u->irq); - goto fail_hw_init; +return ret; } -return 0 ; -fail_hw_init: -tegra_uart_dma_channel_free (tup, true); -fail_rx_dma: -tegra_uart_dma_channel_free (tup, false); -return ret; +return 0 ; }static void tegra_uart_shutdown (struct uart_port *u)
@@ -1042,8 +1023,6 @@ static void tegra_uart_shutdown(struct uart_port *u) tup->rx_in_progress =0 ; tup->tx_in_progress =0 ; -tegra_uart_dma_channel_free (tup, true); -tegra_uart_dma_channel_free (tup, false);free_irq (u->irq, tup); }
@@ -1222,17 +1201,8 @@ static int tegra_uart_parse_dt(struct platform_device *pdev, struct tegra_uart_port *tup) {struct device_node *np = pdev->dev.of_node; -u32 of_dma[2 ];int port; -if (of_property_read_u32_array (np,"nvidia,dma-request-selector" , - of_dma,2 ) >=0 ) { - tup->dma_req_sel = of_dma[1 ]; - }else { -dev_err (&pdev->dev,"missing dma requestor in device tree\n" ); -return -EINVAL ; - } - port =of_alias_get_id (np,"serial" );if (port <0 ) {dev_err (&pdev->dev,"failed to get alias id, errno %d\n" , port);
@@ -1326,14 +1296,29 @@ static int tegra_uart_probe(struct platform_device *pdev)return PTR_ERR (tup->rst); } + ret =tegra_uart_dma_channel_allocate (tup, false); +if (ret <0 ) +return ret; + + ret =tegra_uart_dma_channel_allocate (tup, true); +if (ret <0 ) + goto err_free_dma_tx; + u->iotype =UPIO_MEM32 ; u->irq =platform_get_irq (pdev,0 ); u->regshift =2 ; ret =uart_add_one_port (&tegra_uart_driver, u);if (ret <0 ) {dev_err (&pdev->dev,"Failed to add uart port, err %d\n" , ret); -return ret; + goto err_free_dma_rx; } + +return 0 ; + +err_free_dma_tx: +tegra_uart_dma_channel_free (tup, false); +err_free_dma_rx: +tegra_uart_dma_channel_free (tup, true);return ret; }
@@ -1343,6 +1328,9 @@ static int tegra_uart_remove(struct platform_device *pdev)struct uart_port *u = &tup->uport;uart_remove_one_port (&tegra_uart_driver, u); +tegra_uart_dma_channel_free (tup, true); +tegra_uart_dma_channel_free (tup, false); +return 0 ; }
Signature · 1 line
1.8.1.5
Greg Kroah-Hartman
maintainerPATCH 25/31 serial: tegra: convert to standard DMA DT bindings
Quoted 15 lines · Stephen Warren
From: Stephen Warren <[email protected]>
By using
dma_request_slave_channel_or_err(), the DMA slave ID can be looked up from standard DT properties, and squirrelled away during channel allocation. Hence, there's no need to use a custom DT property to store the slave ID.DMA channel allocation is moved to
probe()so that deferred probe works.Cc treding at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Greg Kroah-Hartman <[email protected]>Cc linux-serial at vger.kernel.orgSigned-off-by Stephen Warren <[email protected]>
Quoted 5 lines
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
PATCH 26/31 Input: tegra-kbc - use reset framework
In reply to Stephen WarrenFrom: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
--- drivers/input/keyboard/tegra-kbc.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/input/keyboard/tegra-kbc.c +10 -3
@@ -31,7 +31,7 @@#include <linux/clk.h> #include <linux/slab.h> #include <linux/input/matrix_keypad.h> -#include <linux/clk/tegra.h> +#include <linux/reset.h> #include <linux/err.h> #define KBC_MAX_KPENT 8
@@ -116,6 +116,7 @@ struct tegra_kbc {u32 wakeup_key;struct timer_list timer;struct clk *clk; +struct reset_control *rst;const struct tegra_kbc_hw_support *hw_support;int max_keys;int num_rows_and_columns;
@@ -373,9 +374,9 @@ static int tegra_kbc_start(struct tegra_kbc *kbc)clk_prepare_enable (kbc->clk);/* Reset the KBC controller to clear all previous status.*/ -tegra_periph_reset_assert (kbc->clk); +reset_control_assert (kbc->rst);udelay (100 ); -tegra_periph_reset_deassert (kbc->clk); +reset_control_assert (kbc->rst);udelay (100 );tegra_kbc_config_pins (kbc);
@@ -663,6 +664,12 @@ static int tegra_kbc_probe(struct platform_device *pdev)return PTR_ERR (kbc->clk); } + kbc->rst =devm_reset_control_get (&pdev->dev,"kbc" ); +if (IS_ERR (kbc->rst)) { +dev_err (&pdev->dev,"failed to get keyboard reset\n" ); +return PTR_ERR (kbc->rst); + } +/* * The time delay between two consecutive reads of the FIFO is * the sum of the repeat time and the time taken for scanning
Signature · 1 line
1.8.1.5
Dmitry Torokhov
maintainerPATCH 26/31 Input: tegra-kbc - use reset framework
Quoted 6 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (
include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.
Quoted 8 lines
Cc treding at nvidia.comCc pdeschrijver at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Dmitry Torokhov <[email protected]>Cc Dmitry Torokhov <[email protected]>Cc linux-input at vger.kernel.orgSigned-off-by Stephen Warren <[email protected]>
Quoted 58 lines
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.--- drivers/input/keyboard/tegra-kbc.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)drivers/input/keyboard/tegra-kbc.c +10
-3@@ -31,7 +31,7 @@#include <linux/clk.h> #include <linux/slab.h> #include <linux/input/matrix_keypad.h> -#include <linux/clk/tegra.h> +#include <linux/reset.h> #include <linux/err.h> #define KBC_MAX_KPENT 8@@ -116,6 +116,7 @@ struct tegra_kbc {u32 wakeup_key;struct timer_list timer;struct clk *clk; +struct reset_control *rst;const struct tegra_kbc_hw_support *hw_support;int max_keys;int num_rows_and_columns;@@ -373,9 +374,9 @@ static int tegra_kbc_start(struct tegra_kbc *kbc)clk_prepare_enable (kbc->clk);/* Reset the KBC controller to clear all previous status.*/ -tegra_periph_reset_assert (kbc->clk); +reset_control_assert (kbc->rst);udelay (100 ); -tegra_periph_reset_deassert (kbc->clk); +reset_control_assert (kbc->rst);udelay (100 );tegra_kbc_config_pins (kbc);@@ -663,6 +664,12 @@ static int tegra_kbc_probe(struct platform_device *pdev)return PTR_ERR (kbc->clk); } + kbc->rst =devm_reset_control_get (&pdev->dev,"kbc" ); +if (IS_ERR (kbc->rst)) { +dev_err (&pdev->dev,"failed to get keyboard reset\n" ); +return PTR_ERR (kbc->rst); + } +/* * The time delay between two consecutive reads of the FIFO is * the sum of the repeat time and the time taken for scanning Signature · 1 line
1.8.1.5
Signature · 1 line
Dmitry
PATCH 26/31 Input: tegra-kbc - use reset framework
In reply to Stephen WarrenQuoted 14 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (
include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.Cc treding at nvidia.comCc pdeschrijver at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Dmitry Torokhov <[email protected]>Cc Dmitry Torokhov <[email protected]>Cc linux-input at vger.kernel.orgSigned-off-by Stephen Warren <[email protected]>
Quoted 8 lines
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.--- drivers/input/keyboard/tegra-kbc.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131129/e12dcb33/attachment.sig>
PATCH 27/31 USB: EHCI: tegra: use reset framework
In reply to Stephen WarrenFrom: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
--- drivers/usb/host/ehci-tegra.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/usb/host/ehci-tegra.c +11 -3
@@ -17,7 +17,6 @@*/ #include <linux/clk.h> -#include <linux/clk/tegra.h> #include <linux/dma-mapping.h> #include <linux/err.h> #include <linux/gpio.h>
@@ -29,6 +28,7 @@#include <linux/of_gpio.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> +#include <linux/reset.h> #include <linux/slab.h> #include <linux/usb/ehci_def.h> #include <linux/usb/tegra_usb_phy.h>
@@ -62,6 +62,7 @@ static int (*orig_hub_control)(struct usb_hcd *hcd,struct tegra_ehci_hcd {struct tegra_usb_phy *phy;struct clk *clk; +struct reset_control *rst;int port_resuming;bool needs_double_reset;enum tegra_usb_phy_port_speed port_speed;
@@ -385,13 +386,20 @@ static int tegra_ehci_probe(struct platform_device *pdev) goto cleanup_hcd_create; } + tegra->rst =devm_reset_control_get (&pdev->dev,"usb" ); +if (IS_ERR (tegra->rst)) { +dev_err (&pdev->dev,"Can't get ehci reset\n" ); + err =PTR_ERR (tegra->rst); + goto cleanup_hcd_create; + } + err =clk_prepare_enable (tegra->clk);if (err) goto cleanup_hcd_create; -tegra_periph_reset_assert (tegra->clk); +reset_control_assert (tegra->rst);udelay (1 ); -tegra_periph_reset_deassert (tegra->clk); +reset_control_deassert (tegra->rst); u_phy =devm_usb_get_phy_by_phandle (&pdev->dev,"nvidia,phy" ,0 );if (IS_ERR (u_phy)) {
Signature · 1 line
1.8.1.5
Alan Stern
maintainerPATCH 27/31 USB: EHCI: tegra: use reset framework
Quoted 14 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (
include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.Cc treding at nvidia.comCc pdeschrijver at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Greg Kroah-Hartman <[email protected]>Cc Alan Stern <[email protected]>Cc linux-usb at vger.kernel.orgSigned-off-by Stephen Warren <[email protected]>
Quoted 5 lines
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
Greg Kroah-Hartman
maintainerPATCH 27/31 USB: EHCI: tegra: use reset framework
In reply to Stephen WarrenQuoted 6 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (
include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.
Quoted 8 lines
Cc treding at nvidia.comCc pdeschrijver at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Greg Kroah-Hartman <[email protected]>Cc Alan Stern <[email protected]>Cc linux-usb at vger.kernel.orgSigned-off-by Stephen Warren <[email protected]>
PATCH 27/31 USB: EHCI: tegra: use reset framework
In reply to Stephen WarrenQuoted 14 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Tegra's clock driver now provides an implementation of the common reset API (
include/linux/reset.h). Use this instead of the old Tegra- specific API; that will soon be removed.Cc treding at nvidia.comCc pdeschrijver at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Greg Kroah-Hartman <[email protected]>Cc Alan Stern <[email protected]>Cc linux-usb at vger.kernel.orgSigned-off-by Stephen Warren <[email protected]>
Quoted 8 lines
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.--- drivers/usb/host/ehci-tegra.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131129/378af942/attachment.sig>
PATCH 28/31 ARM: tegra: remove legacy clock entries from DT
In reply to Stephen WarrenFrom: Stephen Warren <[email protected]>
Now that all Tegra drivers have been converted to use the common reset framework, we can remove all the legacy DT clocks/clock-names entries for "clocks" that were only used with the old custom Tegra module reset API.
--- arch/arm/boot/dts/tegra20.dtsi | 3 +-- arch/arm/boot/dts/tegra30.dtsi | 18 +++--------------- 2 files changed, 4 insertions(+), 17 deletions(-)
arch/arm/boot/dts/tegra20.dtsi +1 -2
@@ -576,9 +576,8 @@ clocks = <&tegra_car TEGRA20_CLK_PEX>, <&tegra_car TEGRA20_CLK_AFI>, - <&tegra_car TEGRA20_CLK_PCIE_XCLK>, <&tegra_car TEGRA20_CLK_PLL_E>; - clock-names = "pex", "afi", "pcie_xclk", "pll_e"; + clock-names = "pex", "afi", "pll_e"; resets = <&tegra_car 70>, <&tegra_car 72>, <&tegra_car 74>;
arch/arm/boot/dts/tegra30.dtsi +3 -15
@@ -40,10 +40,9 @@ clocks = <&tegra_car TEGRA30_CLK_PCIE>, <&tegra_car TEGRA30_CLK_AFI>, - <&tegra_car TEGRA30_CLK_PCIEX>, <&tegra_car TEGRA30_CLK_PLL_E>, <&tegra_car TEGRA30_CLK_CML0>; - clock-names = "pex", "afi", "pcie_xclk", "pll_e", "cml"; + clock-names = "pex", "afi", "pll_e", "cml"; resets = <&tegra_car 70>, <&tegra_car 72>, <&tegra_car 74>;
@@ -641,19 +640,8 @@ interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; nvidia,dma-request-selector = <&apbdma 1>; clocks = <&tegra_car TEGRA30_CLK_D_AUDIO>, - <&tegra_car TEGRA30_CLK_APBIF>, - <&tegra_car TEGRA30_CLK_I2S0>, - <&tegra_car TEGRA30_CLK_I2S1>, - <&tegra_car TEGRA30_CLK_I2S2>, - <&tegra_car TEGRA30_CLK_I2S3>, - <&tegra_car TEGRA30_CLK_I2S4>, - <&tegra_car TEGRA30_CLK_DAM0>, - <&tegra_car TEGRA30_CLK_DAM1>, - <&tegra_car TEGRA30_CLK_DAM2>, - <&tegra_car TEGRA30_CLK_SPDIF_IN>; - clock-names = "d_audio", "apbif", "i2s0", "i2s1", "i2s2", - "i2s3", "i2s4", "dam0", "dam1", "dam2", - "spdif_in"; + <&tegra_car TEGRA30_CLK_APBIF>; + clock-names = "d_audio", "apbif"; resets = <&tegra_car 106>, /* d_audio */ <&tegra_car 107>, /* apbif */ <&tegra_car 30>, /* i2s0 */
Signature · 1 line
1.8.1.5
PATCH 28/31 ARM: tegra: remove legacy clock entries from DT
Quoted 16 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Now that all Tegra drivers have been converted to use the common reset framework, we can remove all the legacy DT clocks/clock-names entries for "clocks" that were only used with the old custom Tegra module reset API.
Cc treding at nvidia.comCc pdeschrijver at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Rob Herring <[email protected]>Cc Pawel Moll <[email protected]>Cc Mark Rutland <[email protected]>Cc Ian Campbell <[email protected]>Cc devicetree at vger.kernel.orgSigned-off-by Stephen Warren <[email protected]>
Quoted 4 lines
--- arch/arm/boot/dts/tegra20.dtsi | 3 +-- arch/arm/boot/dts/tegra30.dtsi | 18 +++--------------- 2 files changed, 4 insertions(+), 17 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131129/0b621f35/attachment-0001.sig>
PATCH 29/31 ARM: tegra: remove legacy DMA entries from DT
In reply to Stephen WarrenFrom: Stephen Warren <[email protected]>
Now that all Tegra drivers have been converted to use DMA APIs which retrieve DMA channel information from standard DMA DT properties, we can remove all the legacy DT DMA-related properties.
--- arch/arm/boot/dts/tegra114.dtsi | 14 -------------- arch/arm/boot/dts/tegra20.dtsi | 13 ------------- arch/arm/boot/dts/tegra30.dtsi | 12 ------------ 3 files changed, 39 deletions(-)
arch/arm/boot/dts/tegra114.dtsi +0 -14
@@ -128,7 +128,6 @@ reg = <0x70006000 0x40>; reg-shift = <2>; interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 8>; clocks = <&tegra_car TEGRA114_CLK_UARTA>; resets = <&tegra_car 6>; reset-names = "serial";
@@ -142,7 +141,6 @@ reg = <0x70006040 0x40>; reg-shift = <2>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 9>; clocks = <&tegra_car TEGRA114_CLK_UARTB>; resets = <&tegra_car 7>; reset-names = "serial";
@@ -156,7 +154,6 @@ reg = <0x70006200 0x100>; reg-shift = <2>; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 10>; clocks = <&tegra_car TEGRA114_CLK_UARTC>; resets = <&tegra_car 55>; reset-names = "serial";
@@ -170,7 +167,6 @@ reg = <0x70006300 0x100>; reg-shift = <2>; interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 19>; clocks = <&tegra_car TEGRA114_CLK_UARTD>; resets = <&tegra_car 65>; reset-names = "serial";
@@ -268,7 +264,6 @@ compatible = "nvidia,tegra114-spi"; reg = <0x7000d400 0x200>; interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 15>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA114_CLK_SBC1>;
@@ -284,7 +279,6 @@ compatible = "nvidia,tegra114-spi"; reg = <0x7000d600 0x200>; interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 16>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA114_CLK_SBC2>;
@@ -300,7 +294,6 @@ compatible = "nvidia,tegra114-spi"; reg = <0x7000d800 0x200>; interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 17>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA114_CLK_SBC3>;
@@ -316,7 +309,6 @@ compatible = "nvidia,tegra114-spi"; reg = <0x7000da00 0x200>; interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 18>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA114_CLK_SBC4>;
@@ -332,7 +324,6 @@ compatible = "nvidia,tegra114-spi"; reg = <0x7000dc00 0x200>; interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 27>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA114_CLK_SBC5>;
@@ -348,7 +339,6 @@ compatible = "nvidia,tegra114-spi"; reg = <0x7000de00 0x200>; interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 28>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA114_CLK_SBC6>;
@@ -401,10 +391,6 @@ <0x70080200 0x100>, <0x70081000 0x200>; interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 1>, <&apbdma 2>, - <&apbdma 3>, <&apbdma 4>, <&apbdma 6>, <&apbdma 7>, - <&apbdma 12>, <&apbdma 13>, <&apbdma 14>, - <&apbdma 29>; clocks = <&tegra_car TEGRA114_CLK_D_AUDIO>, <&tegra_car TEGRA114_CLK_APBIF>, <&tegra_car TEGRA114_CLK_I2S0>,
arch/arm/boot/dts/tegra20.dtsi +0 -13
@@ -248,7 +248,6 @@ compatible = "nvidia,tegra20-ac97"; reg = <0x70002000 0x200>; interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 12>; clocks = <&tegra_car TEGRA20_CLK_AC97>; resets = <&tegra_car 3>; reset-names = "ac97";
@@ -261,7 +260,6 @@ compatible = "nvidia,tegra20-i2s"; reg = <0x70002800 0x200>; interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 2>; clocks = <&tegra_car TEGRA20_CLK_I2S1>; resets = <&tegra_car 11>; reset-names = "i2s";
@@ -274,7 +272,6 @@ compatible = "nvidia,tegra20-i2s"; reg = <0x70002a00 0x200>; interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 1>; clocks = <&tegra_car TEGRA20_CLK_I2S2>; resets = <&tegra_car 18>; reset-names = "i2s";
@@ -295,7 +292,6 @@ reg = <0x70006000 0x40>; reg-shift = <2>; interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 8>; clocks = <&tegra_car TEGRA20_CLK_UARTA>; resets = <&tegra_car 6>; reset-names = "serial";
@@ -309,7 +305,6 @@ reg = <0x70006040 0x40>; reg-shift = <2>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 9>; clocks = <&tegra_car TEGRA20_CLK_UARTB>; resets = <&tegra_car 7>; reset-names = "serial";
@@ -323,7 +318,6 @@ reg = <0x70006200 0x100>; reg-shift = <2>; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 10>; clocks = <&tegra_car TEGRA20_CLK_UARTC>; resets = <&tegra_car 55>; reset-names = "serial";
@@ -337,7 +331,6 @@ reg = <0x70006300 0x100>; reg-shift = <2>; interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 19>; clocks = <&tegra_car TEGRA20_CLK_UARTD>; resets = <&tegra_car 65>; reset-names = "serial";
@@ -351,7 +344,6 @@ reg = <0x70006400 0x100>; reg-shift = <2>; interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 20>; clocks = <&tegra_car TEGRA20_CLK_UARTE>; resets = <&tegra_car 66>; reset-names = "serial";
@@ -397,7 +389,6 @@ compatible = "nvidia,tegra20-sflash"; reg = <0x7000c380 0x80>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 11>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA20_CLK_SPI>;
@@ -460,7 +451,6 @@ compatible = "nvidia,tegra20-slink"; reg = <0x7000d400 0x200>; interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 15>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA20_CLK_SBC1>;
@@ -475,7 +465,6 @@ compatible = "nvidia,tegra20-slink"; reg = <0x7000d600 0x200>; interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 16>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA20_CLK_SBC2>;
@@ -490,7 +479,6 @@ compatible = "nvidia,tegra20-slink"; reg = <0x7000d800 0x200>; interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 17>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA20_CLK_SBC3>;
@@ -505,7 +493,6 @@ compatible = "nvidia,tegra20-slink"; reg = <0x7000da00 0x200>; interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 18>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA20_CLK_SBC4>;
arch/arm/boot/dts/tegra30.dtsi +0 -12
@@ -345,7 +345,6 @@ reg = <0x70006000 0x40>; reg-shift = <2>; interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 8>; clocks = <&tegra_car TEGRA30_CLK_UARTA>; resets = <&tegra_car 6>; reset-names = "serial";
@@ -359,7 +358,6 @@ reg = <0x70006040 0x40>; reg-shift = <2>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 9>; clocks = <&tegra_car TEGRA30_CLK_UARTB>; resets = <&tegra_car 7>; reset-names = "serial";
@@ -373,7 +371,6 @@ reg = <0x70006200 0x100>; reg-shift = <2>; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 10>; clocks = <&tegra_car TEGRA30_CLK_UARTC>; resets = <&tegra_car 55>; reset-names = "serial";
@@ -387,7 +384,6 @@ reg = <0x70006300 0x100>; reg-shift = <2>; interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 19>; clocks = <&tegra_car TEGRA30_CLK_UARTD>; resets = <&tegra_car 65>; reset-names = "serial";
@@ -401,7 +397,6 @@ reg = <0x70006400 0x100>; reg-shift = <2>; interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 20>; clocks = <&tegra_car TEGRA30_CLK_UARTE>; resets = <&tegra_car 66>; reset-names = "serial";
@@ -511,7 +506,6 @@ compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; reg = <0x7000d400 0x200>; interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 15>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA30_CLK_SBC1>;
@@ -526,7 +520,6 @@ compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; reg = <0x7000d600 0x200>; interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 16>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA30_CLK_SBC2>;
@@ -541,7 +534,6 @@ compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; reg = <0x7000d800 0x200>; interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 17>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA30_CLK_SBC3>;
@@ -556,7 +548,6 @@ compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; reg = <0x7000da00 0x200>; interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 18>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA30_CLK_SBC4>;
@@ -571,7 +562,6 @@ compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; reg = <0x7000dc00 0x200>; interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 27>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA30_CLK_SBC5>;
@@ -586,7 +576,6 @@ compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; reg = <0x7000de00 0x200>; interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 28>; #address-cells = <1>; #size-cells = <0>; clocks = <&tegra_car TEGRA30_CLK_SBC6>;
@@ -638,7 +627,6 @@ reg = <0x70080000 0x200 0x70080200 0x100>; interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; - nvidia,dma-request-selector = <&apbdma 1>; clocks = <&tegra_car TEGRA30_CLK_D_AUDIO>, <&tegra_car TEGRA30_CLK_APBIF>; clock-names = "d_audio", "apbif";
Signature · 1 line
1.8.1.5
PATCH 29/31 ARM: tegra: remove legacy DMA entries from DT
Quoted 15 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Now that all Tegra drivers have been converted to use DMA APIs which retrieve DMA channel information from standard DMA DT properties, we can remove all the legacy DT DMA-related properties.
Cc treding at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Rob Herring <[email protected]>Cc Pawel Moll <[email protected]>Cc Mark Rutland <[email protected]>Cc Ian Campbell <[email protected]>Cc devicetree at vger.kernel.orgSigned-off-by Stephen Warren <[email protected]>
Quoted 5 lines
--- arch/arm/boot/dts/tegra114.dtsi | 14 -------------- arch/arm/boot/dts/tegra20.dtsi | 13 ------------- arch/arm/boot/dts/tegra30.dtsi | 12 ------------ 3 files changed, 39 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131129/0097ad8c/attachment.sig>
PATCH 30/31 clk: tegra: remove legacy reset APIs
In reply to Stephen WarrenFrom: Stephen Warren <[email protected]>
Now that no code uses the custom Tegra module reset API, we can remove its implementation.
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
--- drivers/clk/tegra/clk-periph-gate.c | 22 -------------------- drivers/clk/tegra/clk-periph.c | 40 ------------------------------------- drivers/clk/tegra/clk.h | 1 - include/linux/clk/tegra.h | 7 ------- 4 files changed, 70 deletions(-)
drivers/clk/tegra/clk-periph-gate.c +0 -22
@@ -36,8 +36,6 @@ static DEFINE_SPINLOCK(periph_ref_lock);#define read_rst (gate) \ readl_relaxed(gate->clk_base + (gate->regs->rst_reg)) -#define write_rst_set (val, gate) \ - writel_relaxed(val, gate->clk_base + (gate->regs->rst_set_reg))#define write_rst_clr (val, gate) \ writel_relaxed(val, gate->clk_base + (gate->regs->rst_clr_reg))
@@ -123,26 +121,6 @@ static void clk_periph_disable(struct clk_hw *hw)spin_unlock_irqrestore (&periph_ref_lock, flags); } -void tegra_periph_reset (struct tegra_clk_periph_gate *gate,bool assert) -{ -if (gate->flags &TEGRA_PERIPH_NO_RESET ) -return ; - -if (assert) { -/* -* If peripheral is in the APB bus then read the APB bus to -* flush the write operation in apb bus. This will avoid the -* peripheral access after disabling clock -*/ -if (gate->flags &TEGRA_PERIPH_ON_APB ) -tegra_read_chipid (); - -write_rst_set (periph_clk_to_bit (gate), gate); - }else { -write_rst_clr (periph_clk_to_bit (gate), gate); - } -} -const struct clk_ops tegra_clk_periph_gate_ops = { .is_enabled = clk_periph_is_enabled, .enable = clk_periph_enable,
drivers/clk/tegra/clk-periph.c +0 -40
@@ -111,46 +111,6 @@ static void clk_periph_disable(struct clk_hw *hw) gate_ops->disable (gate_hw); } -void tegra_periph_reset_deassert (struct clk *c) -{ -struct clk_hw *hw =__clk_get_hw (c); -struct tegra_clk_periph *periph =to_clk_periph (hw); -struct tegra_clk_periph_gate *gate; - -if (periph->magic !=TEGRA_CLK_PERIPH_MAGIC ) { - gate =to_clk_periph_gate (hw); -if (gate->magic !=TEGRA_CLK_PERIPH_GATE_MAGIC ) { -WARN_ON (1 ); -return ; - } - }else { - gate = &periph->gate; - } - -tegra_periph_reset (gate,0 ); -} -EXPORT_SYMBOL (tegra_periph_reset_deassert); - -void tegra_periph_reset_assert (struct clk *c) -{ -struct clk_hw *hw =__clk_get_hw (c); -struct tegra_clk_periph *periph =to_clk_periph (hw); -struct tegra_clk_periph_gate *gate; - -if (periph->magic !=TEGRA_CLK_PERIPH_MAGIC ) { - gate =to_clk_periph_gate (hw); -if (gate->magic !=TEGRA_CLK_PERIPH_GATE_MAGIC ) { -WARN_ON (1 ); -return ; - } - }else { - gate = &periph->gate; - } - -tegra_periph_reset (gate,1 ); -} -EXPORT_SYMBOL (tegra_periph_reset_assert); -const struct clk_ops tegra_clk_periph_ops = { .get_parent = clk_periph_get_parent, .set_parent = clk_periph_set_parent,
drivers/clk/tegra/clk.h +0 -1
@@ -392,7 +392,6 @@ struct tegra_clk_periph_gate {#define TEGRA_PERIPH_WAR_1005168 BIT(3)#define TEGRA_PERIPH_NO_DIV BIT(4) -void tegra_periph_reset (struct tegra_clk_periph_gate *gate,bool assert);extern const struct clk_ops tegra_clk_periph_gate_ops; struct clk *tegra_clk_register_periph_gate(const char *name, const char *parent_name, u8 gate_flags, void __iomem *clk_base,
include/linux/clk/tegra.h +0 -7
@@ -120,13 +120,6 @@ static inline void tegra_cpu_clock_resume(void) }#endif -#ifdef CONFIG_ARCH_TEGRA -void tegra_periph_reset_deassert (struct clk *c); -void tegra_periph_reset_assert (struct clk *c); -#else -static inline void tegra_periph_reset_deassert (struct clk *c) {} -static inline void tegra_periph_reset_assert (struct clk *c) {} -#endif void tegra_clocks_apply_init_table (void );#endif /* __LINUX_CLK_TEGRA_H_ */
Signature · 1 line
1.8.1.5
PATCH 30/31 clk: tegra: remove legacy reset APIs
Quoted 16 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Now that no code uses the custom Tegra module reset API, we can remove its implementation.
Cc treding at nvidia.comCc pdeschrijver at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Mike Turquette <[email protected]>Signed-off-by Stephen Warren <[email protected]>---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
Quoted 6 lines
--- drivers/clk/tegra/clk-periph-gate.c | 22 -------------------- drivers/clk/tegra/clk-periph.c | 40 ------------------------------------- drivers/clk/tegra/clk.h | 1 - include/linux/clk/tegra.h | 7 ------- 4 files changed, 70 deletions(-)
Very nice!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131129/4ec29560/attachment.sig>
PATCH 31/31 clk: tegra: remove bogus PCIE_XCLK
In reply to Stephen WarrenFrom: Stephen Warren <[email protected]>
The "pcie_xclk" clock is not actually a clock at all, but rather a reset domain. Now that the custom Tegra module reset API has been removed, we can remove the definition of any "clocks" that existed solely to support it.
---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
--- drivers/clk/tegra/clk-tegra20.c | 6 ------ drivers/clk/tegra/clk-tegra30.c | 7 ------- include/dt-bindings/clock/tegra20-car.h | 2 +- include/dt-bindings/clock/tegra30-car.h | 2 +- 4 files changed, 2 insertions(+), 15 deletions(-)
drivers/clk/tegra/clk-tegra20.c +0 -6
@@ -473,7 +473,6 @@ static struct tegra_devclk devclks[] __initdata = { { .con_id = "isp", .dev_id = "tegra_camera", .dt_id = TEGRA20_CLK_ISP }, { .con_id = "pex", .dt_id = TEGRA20_CLK_PEX }, { .con_id = "afi", .dt_id = TEGRA20_CLK_AFI }, - { .con_id = "pcie_xclk", .dt_id = TEGRA20_CLK_PCIE_XCLK }, { .con_id = "cdev1", .dt_id = TEGRA20_CLK_CDEV1 }, { .con_id = "cdev2", .dt_id = TEGRA20_CLK_CDEV2 }, { .con_id = "clk_32k", .dt_id = TEGRA20_CLK_CLK_32K },
@@ -839,11 +838,6 @@ static void __init tegra20_periph_clk_init(void) periph_clk_enb_refcnt); clks[TEGRA20_CLK_PEX ] = clk; -/* pcie_xclk */ - clk =tegra_clk_register_periph_gate ("pcie_xclk" ,"clk_m" ,0 , clk_base, -0 ,74 , periph_clk_enb_refcnt); - clks[TEGRA20_CLK_PCIE_XCLK ] = clk; -/* cdev1 */ clk =clk_register_fixed_rate (NULL ,"cdev1_fixed" ,NULL ,CLK_IS_ROOT ,26000000 );
drivers/clk/tegra/clk-tegra30.c +0 -7
@@ -658,7 +658,6 @@ static struct tegra_devclk devclks[] __initdata = { { .con_id = "isp", .dev_id = "tegra_camera", .dt_id = TEGRA30_CLK_ISP }, { .con_id = "pcie", .dev_id = "tegra-pcie", .dt_id = TEGRA30_CLK_PCIE }, { .con_id = "afi", .dev_id = "tegra-pcie", .dt_id = TEGRA30_CLK_AFI }, - { .con_id = "pciex", .dev_id = "tegra-pcie", .dt_id = TEGRA30_CLK_PCIEX }, { .con_id = "fuse", .dev_id = "fuse-tegra", .dt_id = TEGRA30_CLK_FUSE }, { .con_id = "fuse_burn", .dev_id = "fuse-tegra", .dt_id = TEGRA30_CLK_FUSE_BURN }, { .con_id = "apbif", .dev_id = "tegra30-ahub", .dt_id = TEGRA30_CLK_APBIF },
@@ -1159,11 +1158,6 @@ static void __init tegra30_periph_clk_init(void) periph_clk_enb_refcnt); clks[TEGRA30_CLK_AFI ] = clk; -/* pciex */ - clk =tegra_clk_register_periph_gate ("pciex" ,"pll_e" ,0 , clk_base,0 , -74 , periph_clk_enb_refcnt); - clks[TEGRA30_CLK_PCIEX ] = clk; -/* emc */ clk = clk_register_mux(NULL, "emc_mux", mux_pllmcp_clkm, ARRAY_SIZE(mux_pllmcp_clkm),
@@ -1404,7 +1398,6 @@ static struct tegra_clk_duplicate tegra_clk_duplicates[] = {TEGRA_CLK_DUPLICATE (TEGRA30_CLK_BSEA ,"nvavp" ,"bsea" ),TEGRA_CLK_DUPLICATE (TEGRA30_CLK_CML1 ,"tegra_sata_cml" ,NULL ),TEGRA_CLK_DUPLICATE (TEGRA30_CLK_CML0 ,"tegra_pcie" ,"cml" ), -TEGRA_CLK_DUPLICATE (TEGRA30_CLK_PCIEX ,"tegra_pcie" ,"pciex" ),TEGRA_CLK_DUPLICATE (TEGRA30_CLK_VCP ,"nvavp" ,"vcp" ), TEGRA_CLK_DUPLICATE(TEGRA30_CLK_CLK_MAX, NULL, NULL), /* MUST be the last entry */ };
include/dt-bindings/clock/tegra20-car.h +1 -1
@@ -92,7 +92,7 @@#define TEGRA20_CLK_OWR 71#define TEGRA20_CLK_AFI 72#define TEGRA20_CLK_CSITE 73 -#define TEGRA20_CLK_PCIE_XCLK 74 +/* 74 */ #define TEGRA20_CLK_AVPUCQ 75#define TEGRA20_CLK_LA 76/* 77 */
include/dt-bindings/clock/tegra30-car.h +1 -1
@@ -92,7 +92,7 @@#define TEGRA30_CLK_OWR 71#define TEGRA30_CLK_AFI 72#define TEGRA30_CLK_CSITE 73 -#define TEGRA30_CLK_PCIEX 74 +/* 74 */ #define TEGRA30_CLK_AVPUCQ 75#define TEGRA30_CLK_LA 76/* 77 */
Signature · 1 line
1.8.1.5
PATCH 31/31 clk: tegra: remove bogus PCIE_XCLK
Quoted 18 lines · Stephen Warren
From: Stephen Warren <[email protected]>
The "
pcie_xclk" clock is not actually a clock at all, but rather a reset domain. Now that the custom Tegra module reset API has been removed, we can remove the definition of any "clocks" that existed solely to support it.Cc treding at nvidia.comCc pdeschrijver at nvidia.comCc linux-tegra at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc Mike Turquette <[email protected]>Signed-off-by Stephen Warren <[email protected]>---
This patch is part of a series with strong internal depdendencies. I'm looking for an ack so that I can take the entire series through the Tegra and arm-soc trees. The series will be part of a stable branch that can be merged into other subsystems if needed to avoid/resolve dependencies.
Quoted 6 lines
--- drivers/clk/tegra/clk-tegra20.c | 6 ------ drivers/clk/tegra/clk-tegra30.c | 7 ------- include/dt-bindings/clock/tegra20-car.h | 2 +- include/dt-bindings/clock/tegra30-car.h | 2 +- 4 files changed, 2 insertions(+), 15 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131129/c89c816d/attachment.sig>
Quoted 29 lines · Stephen Warren
From: Stephen Warren <[email protected]>
This series implements a common reset framework driver for Tegra, and updates all relevant Tegra drivers to use it. It also removes the custom DMA bindings and replaced them with the standard DMA DT bindings.
Historically, the Tegra clock driver has exported a custom API for module reset. This series removes that API, and transitions DT and drivers to the new reset framework.
The custom API used a "struct clk" to identify which module to reset, and consequently some DT bindings and drivers required clocks to be provided where they really needed just a reset identifier instead. Due to this known deficiency, I have always considered most Tegra bindings to be unstable. This series removes this excuse for instability, although I still consider some Tegra bindings unstable due to the need to convert to the common DMA bindings.
Historically, Tegra DMA channels have been represented in DT using a custom nvidia,dma-request-selector property. Now that standard DMA DT bindings exist, convert all Tegra bindings, DTs, and drivers to use the standard instead.
This series makes a DT-ABI-incompatible change to:
- Require reset specifiers in DT where relevant.
- Require standard DMA specifiers.
- Remove clock specifiers from DT where they were only needed for reset.
- Remove legacy DMA specifier properties.
Quoted 8 lines
I anticipate merging this whole series into the Tegra and arm-soc trees as its own branch, due to internal dependencies. This branch will be stable and can then be merged into any other subsystem trees should any conflicts arise.
This series depends on Peter's Tegra clock driver rework, available at
git://nv-tegra.nvidia.com/user/pdeschrijver/linuxtegra-clk-tegra124-0 (or whatever version of that gets included in 3.14)
Overall, a good change. For host1x part:
This patch does not change the behavior, but we have in original code the problem that we don't flush the MC queue when resetting an engine. This can cause some memory writes to not hit memory. There was an earlier discussion on that, but we seem to have lost track of the issue.
Terje
Quoted 3 lines · Stephen Warren
This series implements a common reset framework driver for Tegra, and updates all relevant Tegra drivers to use it. It also removes the custom DMA bindings and replaced them with the standard DMA DT bindings.
The series is rather long, so I may have missed it, but I think you need one more patch to the apbdma binding to document the use of #dma-cells, what value it has, and what the format of the dma specifiers in slave drivers needs to be.
Arnd
Quoted 9 lines · Arnd Bergmann
Quoted 3 lines · Stephen Warren
This series implements a common reset framework driver for Tegra, and updates all relevant Tegra drivers to use it. It also removes the custom DMA bindings and replaced them with the standard DMA DT bindings.
The series is rather long, so I may have missed it, but I think you need one more patch to the apbdma binding to document the use of #dma-cells, what value it has, and what the format of the dma specifiers in slave drivers needs to be.
Yes, you're right. I will fold the following into "ARM: tegra: document use of standard DMA DT bindings":
Quoted 21 lines
Documentation/devicetree/bindings/dma/tegra20-apbdma.txt +5
-0@@ -11,6 +11,10 @@ Required properties: See ../reset/reset.txt for details. - reset-names : Must include the following entries: - dma +- #iommu-cells : Must be <1>. This dictates the length of DMA specifiers in + client nodes' dmas properties. The specifier represents the DMA request + select value for the peripheral. For more details, consult the Tegra TRM's + documentation of the APB DMA channel control register REQ_SEL field. Examples:@@ -36,4 +40,5 @@ apbdma: dma@6000a000 { clocks = <&tegra_car 34>; resets = <&tegra_car 34>; reset-names = "dma"; + #iommu-cells = <1>; };
Quoted 5 lines · Stephen Warren
Quoted 5 lines
+- #iommu-cells : Must be <1>. This dictates the length of DMA specifiers in
(quoted diff) +3
-0+ client nodes' dmas properties. The specifier represents the DMA request + select value for the peripheral. For more details, consult the Tegra TRM's + documentation of the APB DMA channel control register REQ_SEL field.
Quoted 7 lines
Review apbdma: dma@6000a000 { · line 43
Quoted 7 lines
Examples:
(quoted diff) +1
-0@@ -36,4 +40,5 @@ apbdma: dma@6000a000 { clocks = <&tegra_car 34>; resets = <&tegra_car 34>; reset-names = "dma"; + #iommu-cells = <1>;
s/iommu/dma/
Otherwise looks good. The dts files are correct, so I guess it's just a typo here.
Arnd
Quoted 17 lines · Arnd Bergmann
Quoted 5 lines · Stephen Warren
Quoted 5 lines
+- #iommu-cells : Must be <1>. This dictates the length of DMA specifiers in
(quoted diff) +3
-0+ client nodes' dmas properties. The specifier represents the DMA request + select value for the peripheral. For more details, consult the Tegra TRM's + documentation of the APB DMA channel control register REQ_SEL field.Quoted 7 lines
Review apbdma: dma@6000a000 { · line 43
Quoted 7 lines
Examples:
(quoted diff) +1
-0@@ -36,4 +40,5 @@ apbdma: dma@6000a000 { clocks = <&tegra_car 34>; resets = <&tegra_car 34>; reset-names = "dma"; + #iommu-cells = <1>;s/iommu/dma/
Quoted 2 lines
Otherwise looks good. The dts files are correct, so I guess it's just a typo here.
Thanks, fixed locally.
Dear all,
My ac100 screen is flickering so much. I realized I'm not using it anymore. So if anyone wants to have it for free would be for me a huge pleasure to give it away. I'm based in milan and I'll be in London for the next week. Maybe someone needs it.
Martino
2013/11/20 Stephen Warren <[email protected]>
Quoted 34 lines · Arnd Bergmann
Quoted 6 lines · Stephen Warren
Quoted 3 lines
This series implements a common reset framework driver for Tegra, and updates all relevant Tegra drivers to use it. It also removes the custom DMA bindings and replaced them with the standard DMA DT bindings.
The series is rather long, so I may have missed it, but I think you need
one
Quoted 3 lines
more patch to the apbdma binding to document the use of #dma-cells, what value it has, and what the format of the dma specifiers in slave drivers needs to be.
Yes, you're right. I will fold the following into "ARM: tegra: document use of standard DMA DT bindings":
Review
Quoted 1 line
(quoted diff) +0
-0
b/Documentation/devicetree/bindings/dma/tegra20-apbdma.txtDocumentation/devicetree/bindings/dma/tegra20-apbdma.txt Required properties: · line 14
Quoted 8 lines
index
0b1e577ab9d3..0b0f9498e265100644Documentation/devicetree/bindings/dma/tegra20-apbdma.txt +1
-0@@ -11,6 +11,10 @@ Required properties: See ../reset/reset.txt for details. - reset-names : Must include the following entries: - dma +- #iommu-cells : Must be <1>. This dictates the length of DMAspecifiers in
Documentation/devicetree/bindings/dma/tegra20-apbdma.txt Required properties: · line 15
Quoted 1 line
Documentation/devicetree/bindings/dma/tegra20-apbdma.txt +1
-0+ client nodes' dmas properties. The specifier represents the DMArequest
Documentation/devicetree/bindings/dma/tegra20-apbdma.txt Required properties: · line 16
Quoted 1 line
Documentation/devicetree/bindings/dma/tegra20-apbdma.txt +1
-0+ select value for the peripheral. For more details, consult the TegraTRM's
Quoted 4 lines
Documentation/devicetree/bindings/dma/tegra20-apbdma.txt +1
-0+ documentation of the APB DMA channel control register REQ_SEL field. Examples:
Quoted 14 lines
Documentation/devicetree/bindings/dma/tegra20-apbdma.txt apbdma: dma@6000a000 { · line 44
Quoted 6 lines
Documentation/devicetree/bindings/dma/tegra20-apbdma.txt +1
-0@@ -36,4 +40,5 @@ apbdma: dma@6000a000 { clocks = <&tegra_car 34>; resets = <&tegra_car 34>; reset-names = "dma"; + #iommu-cells = <1>; };_______________________________________________
Mailing list: https://launchpad.net/~ac100
Post to : [email protected]
Unsubscribe : https://launchpad.net/~ac100
More help : https://help.launchpad.net/ListHelp
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 29 lines · Stephen Warren
From: Stephen Warren <[email protected]>
This series implements a common reset framework driver for Tegra, and updates all relevant Tegra drivers to use it. It also removes the custom DMA bindings and replaced them with the standard DMA DT bindings.
Historically, the Tegra clock driver has exported a custom API for module reset. This series removes that API, and transitions DT and drivers to the new reset framework.
The custom API used a "struct clk" to identify which module to reset, and consequently some DT bindings and drivers required clocks to be provided where they really needed just a reset identifier instead. Due to this known deficiency, I have always considered most Tegra bindings to be unstable. This series removes this excuse for instability, although I still consider some Tegra bindings unstable due to the need to convert to the common DMA bindings.
Historically, Tegra DMA channels have been represented in DT using a custom nvidia,dma-request-selector property. Now that standard DMA DT bindings exist, convert all Tegra bindings, DTs, and drivers to use the standard instead.
This series makes a DT-ABI-incompatible change to:
- Require reset specifiers in DT where relevant.
- Require standard DMA specifiers.
- Remove clock specifiers from DT where they were only needed for reset.
- Remove legacy DMA specifier properties.
Quoted 8 lines
I anticipate merging this whole series into the Tegra and arm-soc trees as its own branch, due to internal dependencies. This branch will be stable and can then be merged into any other subsystem trees should any conflicts arise.
This series depends on Peter's Tegra clock driver rework, available at
git://nv-tegra.nvidia.com/user/pdeschrijver/linuxtegra-clk-tegra124-0 (or whatever version of that gets included in 3.14)
I've applied this series (and pulled in the DMA/ASoC/clk dependencies required) to Tegra's for-3.14/dmas-resets-rework branch.