diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-05-28 19:08:55 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-05-28 19:12:43 +0200 |
commit | 77e97abf129c5028385dd72587eabab68db0d954 (patch) | |
tree | fc52a8c2ba346da77281f00538a1eb6de49deb5d /target/linux/bcm27xx/patches-5.4/950-0536-clk-bcm-Add-BCM2711-DVP-driver.patch | |
parent | 5d3a0c6b26144eb5d62515b99613b5ad8dbdc717 (diff) | |
download | upstream-77e97abf129c5028385dd72587eabab68db0d954.tar.gz upstream-77e97abf129c5028385dd72587eabab68db0d954.tar.bz2 upstream-77e97abf129c5028385dd72587eabab68db0d954.zip |
bcm27xx: update to latest patches from RPi foundation
Also removes random module and switches to new bcm2711 thermal driver.
Boot tested on RPi 4B v1.1 4G.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0536-clk-bcm-Add-BCM2711-DVP-driver.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0536-clk-bcm-Add-BCM2711-DVP-driver.patch | 172 |
1 files changed, 172 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0536-clk-bcm-Add-BCM2711-DVP-driver.patch b/target/linux/bcm27xx/patches-5.4/950-0536-clk-bcm-Add-BCM2711-DVP-driver.patch new file mode 100644 index 0000000000..23105057a9 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0536-clk-bcm-Add-BCM2711-DVP-driver.patch @@ -0,0 +1,172 @@ +From 0a2b9668e391b5fef4c54f992d7f8f99e5f50ef3 Mon Sep 17 00:00:00 2001 +From: Maxime Ripard <maxime@cerno.tech> +Date: Tue, 28 Jan 2020 09:36:27 +0100 +Subject: [PATCH] clk: bcm: Add BCM2711 DVP driver + +The HDMI block has a block that controls clocks and reset signals to the +HDMI0 and HDMI1 controllers. + +Let's expose that through a clock driver implementing a clock and reset +provider. + +Cc: Michael Turquette <mturquette@baylibre.com> +Cc: Stephen Boyd <sboyd@kernel.org> +Cc: Rob Herring <robh+dt@kernel.org> +Cc: linux-clk@vger.kernel.org +Cc: devicetree@vger.kernel.org +Signed-off-by: Maxime Ripard <maxime@cerno.tech> +--- + drivers/clk/bcm/Kconfig | 1 + + drivers/clk/bcm/Makefile | 1 + + drivers/clk/bcm/clk-bcm2711-dvp.c | 125 ++++++++++++++++++++++++++++++ + 3 files changed, 127 insertions(+) + create mode 100644 drivers/clk/bcm/clk-bcm2711-dvp.c + +--- a/drivers/clk/bcm/Kconfig ++++ b/drivers/clk/bcm/Kconfig +@@ -4,6 +4,7 @@ config CLK_BCM2835 + depends on ARCH_BCM2835 || ARCH_BRCMSTB || COMPILE_TEST + depends on COMMON_CLK + default ARCH_BCM2835 || ARCH_BRCMSTB ++ select RESET_SIMPLE + help + Enable common clock framework support for Broadcom BCM2835 + SoCs. +--- a/drivers/clk/bcm/Makefile ++++ b/drivers/clk/bcm/Makefile +@@ -6,6 +6,7 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-kona-s + obj-$(CONFIG_CLK_BCM_KONA) += clk-bcm281xx.o + obj-$(CONFIG_CLK_BCM_KONA) += clk-bcm21664.o + obj-$(CONFIG_COMMON_CLK_IPROC) += clk-iproc-armpll.o clk-iproc-pll.o clk-iproc-asiu.o ++obj-$(CONFIG_CLK_BCM2835) += clk-bcm2711-dvp.o + obj-$(CONFIG_CLK_BCM2835) += clk-bcm2835.o + obj-$(CONFIG_CLK_BCM2835) += clk-bcm2835-aux.o + obj-$(CONFIG_CLK_RASPBERRYPI) += clk-raspberrypi.o +--- /dev/null ++++ b/drivers/clk/bcm/clk-bcm2711-dvp.c +@@ -0,0 +1,125 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later ++// Copyright 2020 Cerno ++ ++#include <linux/clk-provider.h> ++#include <linux/module.h> ++#include <linux/platform_device.h> ++#include <linux/reset-controller.h> ++#include <linux/reset/reset-simple.h> ++ ++#define DVP_HT_RPI_SW_INIT 0x04 ++#define DVP_HT_RPI_MISC_CONFIG 0x08 ++ ++#define NR_CLOCKS 2 ++#define NR_RESETS 6 ++ ++struct clk_dvp { ++ struct clk_hw_onecell_data *data; ++ struct reset_simple_data reset; ++}; ++ ++static int clk_dvp_probe(struct platform_device *pdev) ++{ ++ struct clk_hw_onecell_data *data; ++ struct resource *res; ++ struct clk_dvp *dvp; ++ void __iomem *base; ++ const char *parent; ++ int ret; ++ ++ dvp = devm_kzalloc(&pdev->dev, sizeof(*dvp), GFP_KERNEL); ++ if (!dvp) ++ return -ENOMEM; ++ platform_set_drvdata(pdev, dvp); ++ ++ dvp->data = devm_kzalloc(&pdev->dev, ++ struct_size(dvp->data, hws, NR_CLOCKS), ++ GFP_KERNEL); ++ if (!dvp->data) ++ return -ENOMEM; ++ data = dvp->data; ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ base = devm_ioremap_resource(&pdev->dev, res); ++ if (IS_ERR(base)) ++ return PTR_ERR(base); ++ ++ dvp->reset.rcdev.owner = THIS_MODULE; ++ dvp->reset.rcdev.nr_resets = NR_RESETS; ++ dvp->reset.rcdev.ops = &reset_simple_ops; ++ dvp->reset.rcdev.of_node = pdev->dev.of_node; ++ dvp->reset.membase = base + DVP_HT_RPI_SW_INIT; ++ spin_lock_init(&dvp->reset.lock); ++ ++ ret = reset_controller_register(&dvp->reset.rcdev); ++ if (ret) ++ return ret; ++ ++ parent = of_clk_get_parent_name(pdev->dev.of_node, 0); ++ if (!parent) ++ goto unregister_reset; ++ ++ data->hws[0] = clk_hw_register_gate(&pdev->dev, "hdmi0-108MHz", ++ parent, 0, ++ base + DVP_HT_RPI_MISC_CONFIG, 3, ++ CLK_GATE_SET_TO_DISABLE, &dvp->reset.lock); ++ if (IS_ERR(data->hws[0])) { ++ ret = PTR_ERR(data->hws[0]); ++ goto unregister_reset; ++ } ++ ++ data->hws[1] = clk_hw_register_gate(&pdev->dev, "hdmi1-108MHz", ++ parent, 0, ++ base + DVP_HT_RPI_MISC_CONFIG, 4, ++ CLK_GATE_SET_TO_DISABLE, &dvp->reset.lock); ++ if (IS_ERR(data->hws[1])) { ++ ret = PTR_ERR(data->hws[1]); ++ goto unregister_clk0; ++ } ++ ++ data->num = NR_CLOCKS; ++ ret = of_clk_add_hw_provider(pdev->dev.of_node, of_clk_hw_onecell_get, ++ data); ++ if (ret) ++ goto unregister_clk1; ++ ++ return 0; ++ ++ ++unregister_clk1: ++ clk_hw_unregister_gate(data->hws[1]); ++ ++unregister_clk0: ++ clk_hw_unregister_gate(data->hws[0]); ++ ++unregister_reset: ++ reset_controller_unregister(&dvp->reset.rcdev); ++ return ret; ++}; ++ ++static int clk_dvp_remove(struct platform_device *pdev) ++{ ++ struct clk_dvp *dvp = platform_get_drvdata(pdev); ++ struct clk_hw_onecell_data *data = dvp->data; ++ ++ clk_hw_unregister_gate(data->hws[1]); ++ clk_hw_unregister_gate(data->hws[0]); ++ reset_controller_unregister(&dvp->reset.rcdev); ++ ++ return 0; ++} ++ ++static const struct of_device_id clk_dvp_dt_ids[] = { ++ { .compatible = "brcm,brcm2711-dvp", }, ++ { /* sentinel */ } ++}; ++ ++static struct platform_driver clk_dvp_driver = { ++ .probe = clk_dvp_probe, ++ .remove = clk_dvp_remove, ++ .driver = { ++ .name = "brcm2711-dvp", ++ .of_match_table = clk_dvp_dt_ids, ++ }, ++}; ++module_platform_driver(clk_dvp_driver); |