From mboxrd@z Thu Jan 1 00:00:00 1970 From: kernel@martin.sperl.org (kernel at martin.sperl.org) Date: Sun, 28 Feb 2016 15:37:10 +0000 Subject: [PATCH v5 19/20] clk: bcm2835: add gates that require PM_DEBUG to be set In-Reply-To: <1456673831-2408-1-git-send-email-kernel@martin.sperl.org> References: <1456673831-2408-1-git-send-email-kernel@martin.sperl.org> Message-ID: <1456673831-2408-20-git-send-email-kernel@martin.sperl.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Martin Sperl Add clocks that require PM_DEBUG to be set and mark this fact in the gate_data structure, so that this fact can get referred to if needed. Signed-off-by: Martin Sperl --- drivers/clk/bcm/clk-bcm2835.c | 16 +++++++++++++++- include/dt-bindings/clock/bcm2835.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index 4f002b7..fb5706c 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -447,6 +447,8 @@ struct bcm2835_gate_data { const char *parent; u32 ctl_reg; + + bool requires_pm_debug; }; struct bcm2835_pll { @@ -2051,10 +2053,22 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { * don't bother exposing) are individual gates off of the * non-stop vpu clock. */ + [BCM2835_CLOCK_PERA] = REGISTER_GATE( + .name = "pera", + .parent = "vpu", + .ctl_reg = CM_PERIACTL, + .requires_pm_debug = true), [BCM2835_CLOCK_PERI_IMAGE] = REGISTER_GATE( .name = "peri_image", .parent = "vpu", - .ctl_reg = CM_PERIICTL), + .ctl_reg = CM_PERIICTL, + .requires_pm_debug = true), + [BCM2835_CLOCK_SYS] = REGISTER_GATE( + .name = "sys", + .parent = "vpu", + .ctl_reg = CM_SYSCTL, + .requires_pm_debug = true), + }; static int bcm2835_clk_probe(struct platform_device *pdev) diff --git a/include/dt-bindings/clock/bcm2835.h b/include/dt-bindings/clock/bcm2835.h index 109086e..7bc03cd 100644 --- a/include/dt-bindings/clock/bcm2835.h +++ b/include/dt-bindings/clock/bcm2835.h @@ -71,3 +71,5 @@ #define BCM2835_CLOCK_DSI1E 53 #define BCM2835_CLOCK_DSI1_IMAGE 54 #define BCM2835_CLOCK_ARM 55 +#define BCM2835_CLOCK_PERA 56 +#define BCM2835_CLOCK_SYS 57 -- 1.7.10.4