aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-4.19/950-0049-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-02-08 21:58:55 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-02-14 14:10:51 +0100
commit7d7aa2fd924c27829ec25f825481554dd81bce97 (patch)
tree658b87b89331670266163e522ea5fb52535633cb /target/linux/bcm27xx/patches-4.19/950-0049-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch
parente7bfda2c243e66a75ff966ba04c28b1590b5d24c (diff)
downloadupstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.gz
upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.bz2
upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.zip
brcm2708: rename target to bcm27xx
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-4.19/950-0049-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch')
-rw-r--r--target/linux/bcm27xx/patches-4.19/950-0049-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch170
1 files changed, 170 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-4.19/950-0049-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch b/target/linux/bcm27xx/patches-4.19/950-0049-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch
new file mode 100644
index 0000000000..c7cb1e6d86
--- /dev/null
+++ b/target/linux/bcm27xx/patches-4.19/950-0049-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch
@@ -0,0 +1,170 @@
+From f7cccb2e66f0187f69a432536f227b32a458f94b Mon Sep 17 00:00:00 2001
+From: Martin Sperl <kernel@martin.sperl.org>
+Date: Tue, 26 Apr 2016 14:59:21 +0000
+Subject: [PATCH] MISC: bcm2835: smi: use clock manager and fix reload
+ issues
+
+Use clock manager instead of self-made clockmanager.
+
+Also fix some error paths that showd up during development
+(especially missing release of dma resources on rmmod)
+
+Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
+---
+ drivers/misc/bcm2835_smi.c | 86 +++++++++++++-------------------------
+ 1 file changed, 28 insertions(+), 58 deletions(-)
+
+--- a/drivers/misc/bcm2835_smi.c
++++ b/drivers/misc/bcm2835_smi.c
+@@ -34,6 +34,7 @@
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
++#include <linux/clk.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/of.h>
+@@ -62,7 +63,7 @@
+ struct bcm2835_smi_instance {
+ struct device *dev;
+ struct smi_settings settings;
+- __iomem void *smi_regs_ptr, *cm_smi_regs_ptr;
++ __iomem void *smi_regs_ptr;
+ dma_addr_t smi_regs_busaddr;
+
+ struct dma_chan *dma_chan;
+@@ -72,8 +73,7 @@ struct bcm2835_smi_instance {
+
+ struct scatterlist buffer_sgl;
+
+- int clock_source;
+- int clock_divisor;
++ struct clk *clk;
+
+ /* Sometimes we are called into in an atomic context (e.g. by
+ JFFS2 + MTD) so we can't use a mutex */
+@@ -82,42 +82,6 @@ struct bcm2835_smi_instance {
+
+ /****************************************************************************
+ *
+-* SMI clock manager setup
+-*
+-***************************************************************************/
+-
+-static inline void write_smi_cm_reg(struct bcm2835_smi_instance *inst,
+- u32 val, unsigned reg)
+-{
+- writel(CM_PWD | val, inst->cm_smi_regs_ptr + reg);
+-}
+-
+-static inline u32 read_smi_cm_reg(struct bcm2835_smi_instance *inst,
+- unsigned reg)
+-{
+- return readl(inst->cm_smi_regs_ptr + reg);
+-}
+-
+-static void smi_setup_clock(struct bcm2835_smi_instance *inst)
+-{
+- dev_dbg(inst->dev, "Setting up clock...");
+- /* Disable SMI clock and wait for it to stop. */
+- write_smi_cm_reg(inst, 0, CM_SMI_CTL);
+- while (read_smi_cm_reg(inst, CM_SMI_CTL) & CM_SMI_CTL_BUSY)
+- ;
+-
+- write_smi_cm_reg(inst, (inst->clock_divisor << CM_SMI_DIV_DIVI_OFFS),
+- CM_SMI_DIV);
+- write_smi_cm_reg(inst, (inst->clock_source << CM_SMI_CTL_SRC_OFFS),
+- CM_SMI_CTL);
+-
+- /* Enable the clock */
+- write_smi_cm_reg(inst, (inst->clock_source << CM_SMI_CTL_SRC_OFFS) |
+- CM_SMI_CTL_ENAB, CM_SMI_CTL);
+-}
+-
+-/****************************************************************************
+-*
+ * SMI peripheral setup
+ *
+ ***************************************************************************/
+@@ -894,42 +858,40 @@ static int bcm2835_smi_probe(struct plat
+ struct device_node *node = dev->of_node;
+ struct resource *ioresource;
+ struct bcm2835_smi_instance *inst;
++ const __be32 *addr;
+
++ /* We require device tree support */
++ if (!node)
++ return -EINVAL;
+ /* Allocate buffers and instance data */
+-
+ inst = devm_kzalloc(dev, sizeof(struct bcm2835_smi_instance),
+ GFP_KERNEL);
+-
+ if (!inst)
+ return -ENOMEM;
+
+ inst->dev = dev;
+ spin_lock_init(&inst->transaction_lock);
+
+- /* We require device tree support */
+- if (!node)
+- return -EINVAL;
+-
+ ioresource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ inst->smi_regs_ptr = devm_ioremap_resource(dev, ioresource);
+- ioresource = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+- inst->cm_smi_regs_ptr = devm_ioremap_resource(dev, ioresource);
+- inst->smi_regs_busaddr = be32_to_cpu(
+- *of_get_address(node, 0, NULL, NULL));
+- of_property_read_u32(node,
+- "brcm,smi-clock-source",
+- &inst->clock_source);
+- of_property_read_u32(node,
+- "brcm,smi-clock-divisor",
+- &inst->clock_divisor);
++ if (IS_ERR(inst->smi_regs_ptr)) {
++ err = PTR_ERR(inst->smi_regs_ptr);
++ goto err;
++ }
++ addr = of_get_address(node, 0, NULL, NULL);
++ inst->smi_regs_busaddr = be32_to_cpu(addr);
+
+ err = bcm2835_smi_dma_setup(inst);
+ if (err)
+- return err;
++ goto err;
+
+- /* Finally, do peripheral setup */
++ /* request clock */
++ inst->clk = devm_clk_get(dev, NULL);
++ if (!inst->clk)
++ goto err;
++ clk_prepare_enable(inst->clk);
+
+- smi_setup_clock(inst);
++ /* Finally, do peripheral setup */
+ smi_setup_regs(inst);
+
+ platform_set_drvdata(pdev, inst);
+@@ -937,6 +899,9 @@ static int bcm2835_smi_probe(struct plat
+ dev_info(inst->dev, "initialised");
+
+ return 0;
++err:
++ kfree(inst);
++ return err;
+ }
+
+ /****************************************************************************
+@@ -950,6 +915,11 @@ static int bcm2835_smi_remove(struct pla
+ struct bcm2835_smi_instance *inst = platform_get_drvdata(pdev);
+ struct device *dev = inst->dev;
+
++ dmaengine_terminate_all(inst->dma_chan);
++ dma_release_channel(inst->dma_chan);
++
++ clk_disable_unprepare(inst->clk);
++
+ dev_info(dev, "SMI device removed - OK");
+ return 0;
+ }