From: Arnd Bergmann <arnd@kernel.org> To: linux-omap@vger.kernel.org, tony@atomide.com, aaro.koskinen@iki.fi, jmkrzyszt@gmail.com Cc: Ulf Hansson <ulf.hansson@linaro.org>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, linux-fbdev@vger.kernel.org, Dominik Brodowski <linux@dominikbrodowski.net>, Lee Jones <lee.jones@linaro.org>, Daniel Thompson <daniel.thompson@linaro.org>, Kevin Hilman <khilman@kernel.org>, Peter Ujfalusi <peter.ujfalusi@gmail.com>, Helge Deller <deller@gmx.de>, Russell King <linux@armlinux.org.uk>, Krzysztof Kozlowski <krzk@kernel.org>, Alan Stern <stern@rowland.harvard.edu>, linux-serial@vger.kernel.org, linux-input@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>, Mark Brown <broonie@kernel.org>, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, Felipe Balbi <balbi@kernel.org>, Paul Walmsley <paul@pwsan.com>, Jingoo Han <jingoohan1@gmail.com>, linux-usb@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Vinod Koul <vkoul@kernel.org>, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH 34/41] ARM: OMAP1: clock: Remove noop code Date: Tue, 19 Apr 2022 15:37:16 +0200 [thread overview] Message-ID: <20220419133723.1394715-35-arnd@kernel.org> (raw) In-Reply-To: <20220419133723.1394715-1-arnd@kernel.org> From: Janusz Krzysztofik <jmkrzyszt@gmail.com> There are some OMAP1 clock code bits that have no effect: - crystal_type variable is set to 0 but never changed, then crystal_type == 2 condition is never true and ck_ref.rate never set to 19200000, - clk->ops->allow_idle() is called from omap_clk_enable_autoidle_all() but that op is not configured for any clock, then the function does nothing and the op field is not needed, - ENABLE_ON_INIT flag is set for some clocks but is never checked by any code, then not needed. Drop that code. Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-omap1/clock.c | 17 ----------------- arch/arm/mach-omap1/clock.h | 3 --- arch/arm/mach-omap1/clock_data.c | 8 +------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 5ea8ec026a85..e5bd4d3b742d 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c @@ -798,22 +798,6 @@ void clk_unregister(struct clk *clk) } EXPORT_SYMBOL(clk_unregister); -int omap_clk_enable_autoidle_all(void) -{ - struct clk *c; - unsigned long flags; - - spin_lock_irqsave(&clockfw_lock, flags); - - list_for_each_entry(c, &clocks, node) - if (c->ops->allow_idle) - c->ops->allow_idle(c); - - spin_unlock_irqrestore(&clockfw_lock, flags); - - return 0; -} - /* * Low level helpers */ @@ -871,7 +855,6 @@ static int __init clk_disable_unused(void) return 0; } late_initcall(clk_disable_unused); -late_initcall(omap_clk_enable_autoidle_all); #endif #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h index 7bebd488f1be..8025e4a22469 100644 --- a/arch/arm/mach-omap1/clock.h +++ b/arch/arm/mach-omap1/clock.h @@ -53,7 +53,6 @@ struct omap_clk { struct clkops { int (*enable)(struct clk *); void (*disable)(struct clk *); - void (*allow_idle)(struct clk *); }; /* @@ -64,7 +63,6 @@ struct clkops { #define ENABLE_REG_32BIT (1 << 0) /* Use 32-bit access */ #define CLOCK_IDLE_CONTROL (1 << 1) #define CLOCK_NO_IDLE_PARENT (1 << 2) -#define ENABLE_ON_INIT (1 << 3) /* Enable upon framework init */ /** * struct clk - OMAP struct clk @@ -135,7 +133,6 @@ extern void clk_unregister(struct clk *clk); extern void propagate_rate(struct clk *clk); extern unsigned long followparent_recalc(struct clk *clk); unsigned long omap_fixed_divisor_recalc(struct clk *clk); -extern int omap_clk_enable_autoidle_all(void); extern const struct clkops clkops_null; diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c index 57d3752babf8..9b9c9fcc61c2 100644 --- a/arch/arm/mach-omap1/clock_data.c +++ b/arch/arm/mach-omap1/clock_data.c @@ -92,8 +92,7 @@ static struct arm_idlect1_clk ck_dpll1out = { .name = "ck_dpll1out", .ops = &clkops_generic, .parent = &ck_dpll1, - .flags = CLOCK_IDLE_CONTROL | ENABLE_REG_32BIT | - ENABLE_ON_INIT, + .flags = CLOCK_IDLE_CONTROL | ENABLE_REG_32BIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT2), .enable_bit = EN_CKOUT_ARM, .recalc = &followparent_recalc, @@ -146,7 +145,6 @@ static struct clk arm_gpio_ck = { .name = "ick", .ops = &clkops_generic, .parent = &ck_dpll1, - .flags = ENABLE_ON_INIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT2), .enable_bit = EN_GPIOCK, .recalc = &followparent_recalc, @@ -316,7 +314,6 @@ static struct clk tc2_ck = { .name = "tc2_ck", .ops = &clkops_generic, .parent = &tc_ck.clk, - .flags = ENABLE_ON_INIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT3), .enable_bit = EN_TC2_CK, .recalc = &followparent_recalc, @@ -762,7 +759,6 @@ u32 cpu_mask; int __init omap1_clk_init(void) { struct omap_clk *c; - int crystal_type = 0; /* Default 12 MHz */ u32 reg; #ifdef CONFIG_DEBUG_LL @@ -810,8 +806,6 @@ int __init omap1_clk_init(void) if (cpu_is_omap7xx()) ck_ref.rate = 13000000; - if (cpu_is_omap16xx() && crystal_type == 2) - ck_ref.rate = 19200000; pr_info("Clocks: ARM_SYSST: 0x%04x DPLL_CTL: 0x%04x ARM_CKCTL: 0x%04x\n", omap_readw(ARM_SYSST), omap_readw(DPLL_CTL), -- 2.29.2
WARNING: multiple messages have this Message-ID
From: Arnd Bergmann <arnd@kernel.org> To: linux-omap@vger.kernel.org, tony@atomide.com, aaro.koskinen@iki.fi, jmkrzyszt@gmail.com Cc: Arnd Bergmann <arnd@arndb.de>, Russell King <linux@armlinux.org.uk>, Paul Walmsley <paul@pwsan.com>, Kevin Hilman <khilman@kernel.org>, Peter Ujfalusi <peter.ujfalusi@gmail.com>, Vinod Koul <vkoul@kernel.org>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, Ulf Hansson <ulf.hansson@linaro.org>, Dominik Brodowski <linux@dominikbrodowski.net>, Mark Brown <broonie@kernel.org>, Felipe Balbi <balbi@kernel.org>, Alan Stern <stern@rowland.harvard.edu>, Lee Jones <lee.jones@linaro.org>, Daniel Thompson <daniel.thompson@linaro.org>, Jingoo Han <jingoohan1@gmail.com>, Helge Deller <deller@gmx.de>, Linus Walleij <linus.walleij@linaro.org>, Krzysztof Kozlowski <krzk@kernel.org>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, dmaengine@vger.kernel.org, linux-input@vger.kernel.org, linux-mmc@vger.kernel.org, linux-serial@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH 34/41] ARM: OMAP1: clock: Remove noop code Date: Tue, 19 Apr 2022 15:37:16 +0200 [thread overview] Message-ID: <20220419133723.1394715-35-arnd@kernel.org> (raw) In-Reply-To: <20220419133723.1394715-1-arnd@kernel.org> From: Janusz Krzysztofik <jmkrzyszt@gmail.com> There are some OMAP1 clock code bits that have no effect: - crystal_type variable is set to 0 but never changed, then crystal_type == 2 condition is never true and ck_ref.rate never set to 19200000, - clk->ops->allow_idle() is called from omap_clk_enable_autoidle_all() but that op is not configured for any clock, then the function does nothing and the op field is not needed, - ENABLE_ON_INIT flag is set for some clocks but is never checked by any code, then not needed. Drop that code. Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-omap1/clock.c | 17 ----------------- arch/arm/mach-omap1/clock.h | 3 --- arch/arm/mach-omap1/clock_data.c | 8 +------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 5ea8ec026a85..e5bd4d3b742d 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c @@ -798,22 +798,6 @@ void clk_unregister(struct clk *clk) } EXPORT_SYMBOL(clk_unregister); -int omap_clk_enable_autoidle_all(void) -{ - struct clk *c; - unsigned long flags; - - spin_lock_irqsave(&clockfw_lock, flags); - - list_for_each_entry(c, &clocks, node) - if (c->ops->allow_idle) - c->ops->allow_idle(c); - - spin_unlock_irqrestore(&clockfw_lock, flags); - - return 0; -} - /* * Low level helpers */ @@ -871,7 +855,6 @@ static int __init clk_disable_unused(void) return 0; } late_initcall(clk_disable_unused); -late_initcall(omap_clk_enable_autoidle_all); #endif #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h index 7bebd488f1be..8025e4a22469 100644 --- a/arch/arm/mach-omap1/clock.h +++ b/arch/arm/mach-omap1/clock.h @@ -53,7 +53,6 @@ struct omap_clk { struct clkops { int (*enable)(struct clk *); void (*disable)(struct clk *); - void (*allow_idle)(struct clk *); }; /* @@ -64,7 +63,6 @@ struct clkops { #define ENABLE_REG_32BIT (1 << 0) /* Use 32-bit access */ #define CLOCK_IDLE_CONTROL (1 << 1) #define CLOCK_NO_IDLE_PARENT (1 << 2) -#define ENABLE_ON_INIT (1 << 3) /* Enable upon framework init */ /** * struct clk - OMAP struct clk @@ -135,7 +133,6 @@ extern void clk_unregister(struct clk *clk); extern void propagate_rate(struct clk *clk); extern unsigned long followparent_recalc(struct clk *clk); unsigned long omap_fixed_divisor_recalc(struct clk *clk); -extern int omap_clk_enable_autoidle_all(void); extern const struct clkops clkops_null; diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c index 57d3752babf8..9b9c9fcc61c2 100644 --- a/arch/arm/mach-omap1/clock_data.c +++ b/arch/arm/mach-omap1/clock_data.c @@ -92,8 +92,7 @@ static struct arm_idlect1_clk ck_dpll1out = { .name = "ck_dpll1out", .ops = &clkops_generic, .parent = &ck_dpll1, - .flags = CLOCK_IDLE_CONTROL | ENABLE_REG_32BIT | - ENABLE_ON_INIT, + .flags = CLOCK_IDLE_CONTROL | ENABLE_REG_32BIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT2), .enable_bit = EN_CKOUT_ARM, .recalc = &followparent_recalc, @@ -146,7 +145,6 @@ static struct clk arm_gpio_ck = { .name = "ick", .ops = &clkops_generic, .parent = &ck_dpll1, - .flags = ENABLE_ON_INIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT2), .enable_bit = EN_GPIOCK, .recalc = &followparent_recalc, @@ -316,7 +314,6 @@ static struct clk tc2_ck = { .name = "tc2_ck", .ops = &clkops_generic, .parent = &tc_ck.clk, - .flags = ENABLE_ON_INIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT3), .enable_bit = EN_TC2_CK, .recalc = &followparent_recalc, @@ -762,7 +759,6 @@ u32 cpu_mask; int __init omap1_clk_init(void) { struct omap_clk *c; - int crystal_type = 0; /* Default 12 MHz */ u32 reg; #ifdef CONFIG_DEBUG_LL @@ -810,8 +806,6 @@ int __init omap1_clk_init(void) if (cpu_is_omap7xx()) ck_ref.rate = 13000000; - if (cpu_is_omap16xx() && crystal_type == 2) - ck_ref.rate = 19200000; pr_info("Clocks: ARM_SYSST: 0x%04x DPLL_CTL: 0x%04x ARM_CKCTL: 0x%04x\n", omap_readw(ARM_SYSST), omap_readw(DPLL_CTL), -- 2.29.2
WARNING: multiple messages have this Message-ID
From: Arnd Bergmann <arnd@kernel.org> To: linux-omap@vger.kernel.org, tony@atomide.com, aaro.koskinen@iki.fi, jmkrzyszt@gmail.com Cc: Ulf Hansson <ulf.hansson@linaro.org>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, Linus Walleij <linus.walleij@linaro.org>, linux-fbdev@vger.kernel.org, Dominik Brodowski <linux@dominikbrodowski.net>, Lee Jones <lee.jones@linaro.org>, Daniel Thompson <daniel.thompson@linaro.org>, Kevin Hilman <khilman@kernel.org>, Peter Ujfalusi <peter.ujfalusi@gmail.com>, Helge Deller <deller@gmx.de>, Russell King <linux@armlinux.org.uk>, Krzysztof Kozlowski <krzk@kernel.org>, Alan Stern <stern@rowland.harvard.edu>, linux-serial@vger.kernel.org, linux-input@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>, Mark Brown <broonie@kernel.org>, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, Felipe Balbi <balbi@kernel.org>, Paul Walmsley <paul@pwsan.com>, Jingoo Han <jingoohan1@gmail.com>, linux-usb@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Vinod Koul <vkoul@kernel.org>, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH 34/41] ARM: OMAP1: clock: Remove noop code Date: Tue, 19 Apr 2022 15:37:16 +0200 [thread overview] Message-ID: <20220419133723.1394715-35-arnd@kernel.org> (raw) In-Reply-To: <20220419133723.1394715-1-arnd@kernel.org> From: Janusz Krzysztofik <jmkrzyszt@gmail.com> There are some OMAP1 clock code bits that have no effect: - crystal_type variable is set to 0 but never changed, then crystal_type == 2 condition is never true and ck_ref.rate never set to 19200000, - clk->ops->allow_idle() is called from omap_clk_enable_autoidle_all() but that op is not configured for any clock, then the function does nothing and the op field is not needed, - ENABLE_ON_INIT flag is set for some clocks but is never checked by any code, then not needed. Drop that code. Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-omap1/clock.c | 17 ----------------- arch/arm/mach-omap1/clock.h | 3 --- arch/arm/mach-omap1/clock_data.c | 8 +------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 5ea8ec026a85..e5bd4d3b742d 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c @@ -798,22 +798,6 @@ void clk_unregister(struct clk *clk) } EXPORT_SYMBOL(clk_unregister); -int omap_clk_enable_autoidle_all(void) -{ - struct clk *c; - unsigned long flags; - - spin_lock_irqsave(&clockfw_lock, flags); - - list_for_each_entry(c, &clocks, node) - if (c->ops->allow_idle) - c->ops->allow_idle(c); - - spin_unlock_irqrestore(&clockfw_lock, flags); - - return 0; -} - /* * Low level helpers */ @@ -871,7 +855,6 @@ static int __init clk_disable_unused(void) return 0; } late_initcall(clk_disable_unused); -late_initcall(omap_clk_enable_autoidle_all); #endif #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h index 7bebd488f1be..8025e4a22469 100644 --- a/arch/arm/mach-omap1/clock.h +++ b/arch/arm/mach-omap1/clock.h @@ -53,7 +53,6 @@ struct omap_clk { struct clkops { int (*enable)(struct clk *); void (*disable)(struct clk *); - void (*allow_idle)(struct clk *); }; /* @@ -64,7 +63,6 @@ struct clkops { #define ENABLE_REG_32BIT (1 << 0) /* Use 32-bit access */ #define CLOCK_IDLE_CONTROL (1 << 1) #define CLOCK_NO_IDLE_PARENT (1 << 2) -#define ENABLE_ON_INIT (1 << 3) /* Enable upon framework init */ /** * struct clk - OMAP struct clk @@ -135,7 +133,6 @@ extern void clk_unregister(struct clk *clk); extern void propagate_rate(struct clk *clk); extern unsigned long followparent_recalc(struct clk *clk); unsigned long omap_fixed_divisor_recalc(struct clk *clk); -extern int omap_clk_enable_autoidle_all(void); extern const struct clkops clkops_null; diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c index 57d3752babf8..9b9c9fcc61c2 100644 --- a/arch/arm/mach-omap1/clock_data.c +++ b/arch/arm/mach-omap1/clock_data.c @@ -92,8 +92,7 @@ static struct arm_idlect1_clk ck_dpll1out = { .name = "ck_dpll1out", .ops = &clkops_generic, .parent = &ck_dpll1, - .flags = CLOCK_IDLE_CONTROL | ENABLE_REG_32BIT | - ENABLE_ON_INIT, + .flags = CLOCK_IDLE_CONTROL | ENABLE_REG_32BIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT2), .enable_bit = EN_CKOUT_ARM, .recalc = &followparent_recalc, @@ -146,7 +145,6 @@ static struct clk arm_gpio_ck = { .name = "ick", .ops = &clkops_generic, .parent = &ck_dpll1, - .flags = ENABLE_ON_INIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT2), .enable_bit = EN_GPIOCK, .recalc = &followparent_recalc, @@ -316,7 +314,6 @@ static struct clk tc2_ck = { .name = "tc2_ck", .ops = &clkops_generic, .parent = &tc_ck.clk, - .flags = ENABLE_ON_INIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT3), .enable_bit = EN_TC2_CK, .recalc = &followparent_recalc, @@ -762,7 +759,6 @@ u32 cpu_mask; int __init omap1_clk_init(void) { struct omap_clk *c; - int crystal_type = 0; /* Default 12 MHz */ u32 reg; #ifdef CONFIG_DEBUG_LL @@ -810,8 +806,6 @@ int __init omap1_clk_init(void) if (cpu_is_omap7xx()) ck_ref.rate = 13000000; - if (cpu_is_omap16xx() && crystal_type == 2) - ck_ref.rate = 19200000; pr_info("Clocks: ARM_SYSST: 0x%04x DPLL_CTL: 0x%04x ARM_CKCTL: 0x%04x\n", omap_readw(ARM_SYSST), omap_readw(DPLL_CTL), -- 2.29.2
WARNING: multiple messages have this Message-ID
From: Arnd Bergmann <arnd@kernel.org> To: linux-omap@vger.kernel.org, tony@atomide.com, aaro.koskinen@iki.fi, jmkrzyszt@gmail.com Cc: Arnd Bergmann <arnd@arndb.de>, Russell King <linux@armlinux.org.uk>, Paul Walmsley <paul@pwsan.com>, Kevin Hilman <khilman@kernel.org>, Peter Ujfalusi <peter.ujfalusi@gmail.com>, Vinod Koul <vkoul@kernel.org>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, Ulf Hansson <ulf.hansson@linaro.org>, Dominik Brodowski <linux@dominikbrodowski.net>, Mark Brown <broonie@kernel.org>, Felipe Balbi <balbi@kernel.org>, Alan Stern <stern@rowland.harvard.edu>, Lee Jones <lee.jones@linaro.org>, Daniel Thompson <daniel.thompson@linaro.org>, Jingoo Han <jingoohan1@gmail.com>, Helge Deller <deller@gmx.de>, Linus Walleij <linus.walleij@linaro.org>, Krzysztof Kozlowski <krzk@kernel.org>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, dmaengine@vger.kernel.org, linux-input@vger.kernel.org, linux-mmc@vger.kernel.org, linux-serial@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH 34/41] ARM: OMAP1: clock: Remove noop code Date: Tue, 19 Apr 2022 15:37:16 +0200 [thread overview] Message-ID: <20220419133723.1394715-35-arnd@kernel.org> (raw) In-Reply-To: <20220419133723.1394715-1-arnd@kernel.org> From: Janusz Krzysztofik <jmkrzyszt@gmail.com> There are some OMAP1 clock code bits that have no effect: - crystal_type variable is set to 0 but never changed, then crystal_type == 2 condition is never true and ck_ref.rate never set to 19200000, - clk->ops->allow_idle() is called from omap_clk_enable_autoidle_all() but that op is not configured for any clock, then the function does nothing and the op field is not needed, - ENABLE_ON_INIT flag is set for some clocks but is never checked by any code, then not needed. Drop that code. Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-omap1/clock.c | 17 ----------------- arch/arm/mach-omap1/clock.h | 3 --- arch/arm/mach-omap1/clock_data.c | 8 +------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 5ea8ec026a85..e5bd4d3b742d 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c @@ -798,22 +798,6 @@ void clk_unregister(struct clk *clk) } EXPORT_SYMBOL(clk_unregister); -int omap_clk_enable_autoidle_all(void) -{ - struct clk *c; - unsigned long flags; - - spin_lock_irqsave(&clockfw_lock, flags); - - list_for_each_entry(c, &clocks, node) - if (c->ops->allow_idle) - c->ops->allow_idle(c); - - spin_unlock_irqrestore(&clockfw_lock, flags); - - return 0; -} - /* * Low level helpers */ @@ -871,7 +855,6 @@ static int __init clk_disable_unused(void) return 0; } late_initcall(clk_disable_unused); -late_initcall(omap_clk_enable_autoidle_all); #endif #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h index 7bebd488f1be..8025e4a22469 100644 --- a/arch/arm/mach-omap1/clock.h +++ b/arch/arm/mach-omap1/clock.h @@ -53,7 +53,6 @@ struct omap_clk { struct clkops { int (*enable)(struct clk *); void (*disable)(struct clk *); - void (*allow_idle)(struct clk *); }; /* @@ -64,7 +63,6 @@ struct clkops { #define ENABLE_REG_32BIT (1 << 0) /* Use 32-bit access */ #define CLOCK_IDLE_CONTROL (1 << 1) #define CLOCK_NO_IDLE_PARENT (1 << 2) -#define ENABLE_ON_INIT (1 << 3) /* Enable upon framework init */ /** * struct clk - OMAP struct clk @@ -135,7 +133,6 @@ extern void clk_unregister(struct clk *clk); extern void propagate_rate(struct clk *clk); extern unsigned long followparent_recalc(struct clk *clk); unsigned long omap_fixed_divisor_recalc(struct clk *clk); -extern int omap_clk_enable_autoidle_all(void); extern const struct clkops clkops_null; diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c index 57d3752babf8..9b9c9fcc61c2 100644 --- a/arch/arm/mach-omap1/clock_data.c +++ b/arch/arm/mach-omap1/clock_data.c @@ -92,8 +92,7 @@ static struct arm_idlect1_clk ck_dpll1out = { .name = "ck_dpll1out", .ops = &clkops_generic, .parent = &ck_dpll1, - .flags = CLOCK_IDLE_CONTROL | ENABLE_REG_32BIT | - ENABLE_ON_INIT, + .flags = CLOCK_IDLE_CONTROL | ENABLE_REG_32BIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT2), .enable_bit = EN_CKOUT_ARM, .recalc = &followparent_recalc, @@ -146,7 +145,6 @@ static struct clk arm_gpio_ck = { .name = "ick", .ops = &clkops_generic, .parent = &ck_dpll1, - .flags = ENABLE_ON_INIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT2), .enable_bit = EN_GPIOCK, .recalc = &followparent_recalc, @@ -316,7 +314,6 @@ static struct clk tc2_ck = { .name = "tc2_ck", .ops = &clkops_generic, .parent = &tc_ck.clk, - .flags = ENABLE_ON_INIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT3), .enable_bit = EN_TC2_CK, .recalc = &followparent_recalc, @@ -762,7 +759,6 @@ u32 cpu_mask; int __init omap1_clk_init(void) { struct omap_clk *c; - int crystal_type = 0; /* Default 12 MHz */ u32 reg; #ifdef CONFIG_DEBUG_LL @@ -810,8 +806,6 @@ int __init omap1_clk_init(void) if (cpu_is_omap7xx()) ck_ref.rate = 13000000; - if (cpu_is_omap16xx() && crystal_type == 2) - ck_ref.rate = 19200000; pr_info("Clocks: ARM_SYSST: 0x%04x DPLL_CTL: 0x%04x ARM_CKCTL: 0x%04x\n", omap_readw(ARM_SYSST), omap_readw(DPLL_CTL), -- 2.29.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-04-19 13:41 UTC|newest] Thread overview: 245+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-19 13:36 [PATCH 00/41] OMAP1 full multiplatform conversion Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 01/41] video: fbdev: omapfb: lcd_ams_delta: fix unused variable warning Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-20 9:24 ` Sergei Shtylyov 2022-04-20 9:24 ` Sergei Shtylyov 2022-04-20 9:24 ` Sergei Shtylyov 2022-04-20 9:24 ` Sergei Shtylyov 2022-04-20 11:32 ` Arnd Bergmann 2022-04-20 11:32 ` Arnd Bergmann 2022-04-20 11:32 ` Arnd Bergmann 2022-04-20 11:32 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 02/41] ARM: omap1: innovator: pass lcd control address as pdata Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 03/41] ARM: omap1: move lcd_dma code into omapfb driver Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 04/41] ARM: omap1: declare a dummy omap_set_dma_priority Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 05/41] fbdev: omap: pass irqs as resource Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 06/41] ARM: omap1: ams-delta: remove camera leftovers Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 07/41] ARM: omap1: move mach/usb.h to include/linux/soc Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 08/41] ARM: omap1: move some headers " Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 09/41] ARM: omap1: move perseus spi pinconf to board file Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 10/41] ARM: omap1: move CF chipselect setup " Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 11/41] fbdev: omap: avoid using mach/*.h files Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 12/41] usb: omap: avoid mach/*.h headers Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 13/41] clocksource: ti-dmtimer: avoid using mach/hardware.h Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 14/41] serial: 8250/omap1: include linux/soc/ti/omap1-soc.h Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-20 14:46 ` Greg KH 2022-04-20 14:46 ` Greg KH 2022-04-20 14:46 ` Greg KH 2022-04-20 14:46 ` Greg KH 2022-04-19 13:36 ` [PATCH 15/41] input: omap: void using mach/*.h headers Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-20 20:44 ` Dmitry Torokhov 2022-04-20 20:44 ` Dmitry Torokhov 2022-04-20 20:44 ` Dmitry Torokhov 2022-04-20 20:44 ` Dmitry Torokhov 2022-04-19 13:36 ` [PATCH 16/41] ARM: omap1: innovator: move ohci phy power handling to board file Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` [PATCH 17/41] ARM: omap1: move 32k counter from plat-omap to mach-omap1 Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-19 13:36 ` Arnd Bergmann 2022-04-21 6:17 ` Tony Lindgren 2022-04-21 6:17 ` Tony Lindgren 2022-04-21 6:17 ` Tony Lindgren 2022-04-21 6:17 ` Tony Lindgren 2022-04-19 13:37 ` [PATCH 18/41] ARM: omap: remove debug-leds driver Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 19/41] ARM: omap: dma: make usb support optional Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-29 19:24 ` Péter Ujfalusi 2022-04-29 19:24 ` Péter Ujfalusi 2022-04-29 19:24 ` Péter Ujfalusi 2022-04-19 13:37 ` [PATCH 20/41] dma: omap: hide legacy interface Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-22 5:55 ` Vinod Koul 2022-04-22 5:55 ` Vinod Koul 2022-04-22 5:55 ` Vinod Koul 2022-04-22 5:55 ` Vinod Koul 2022-04-19 13:37 ` [PATCH 21/41] ARM: omap1: dma: remove omap2 specific bits Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-29 19:26 ` Péter Ujfalusi 2022-04-29 19:26 ` Péter Ujfalusi 2022-04-29 19:26 ` Péter Ujfalusi 2022-04-19 13:37 ` [PATCH 22/41] ARM: omap1: move plat/dma.c to mach/omap-dma.c Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-29 19:36 ` Péter Ujfalusi 2022-04-29 19:36 ` Péter Ujfalusi 2022-04-29 19:36 ` Péter Ujfalusi 2022-04-19 13:37 ` [PATCH 23/41] ARM: omap: split up arch/arm/plat-omap/Kconfig Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 24/41] ARM: omap: un-merge plat/sram.c Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-21 6:32 ` Tony Lindgren 2022-04-21 6:32 ` Tony Lindgren 2022-04-21 6:32 ` Tony Lindgren 2022-04-21 6:32 ` Tony Lindgren 2022-04-19 13:37 ` [PATCH 25/41] ARM: omap: remove empty plat-omap directory Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 26/41] ARM: omap1: relocate static I/O mapping Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-20 13:46 ` Aaro Koskinen 2022-04-20 13:46 ` Aaro Koskinen 2022-04-20 13:46 ` Aaro Koskinen 2022-04-20 13:46 ` Aaro Koskinen 2022-04-20 19:20 ` Arnd Bergmann 2022-04-20 19:20 ` Arnd Bergmann 2022-04-20 19:20 ` Arnd Bergmann 2022-04-20 19:20 ` Arnd Bergmann 2022-04-21 5:19 ` Tony Lindgren 2022-04-21 5:19 ` Tony Lindgren 2022-04-21 5:19 ` Tony Lindgren 2022-04-21 5:19 ` Tony Lindgren 2022-04-19 13:37 ` [PATCH 27/41] ARM: omap1: use pci_remap_iospace() for omap_cf Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 28/41] ARM: omap1: move mach/*.h into mach directory Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 29/41] ARM: omap1: fix build with no SoC selected Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 30/41] ARM: OMAP1: Prepare for conversion of OMAP1 clocks to CCF Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 31/41] ARM: OMAP1: clock: Fix early UART rate issues Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 32/41] ARM: OMAP1: clock: Fix UART rate reporting algorithm Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 33/41] ARM: OMAP1: clock: Remove unused code Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann [this message] 2022-04-19 13:37 ` [PATCH 34/41] ARM: OMAP1: clock: Remove noop code Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 35/41] usb: host: ohci-omap: Make it CCF clk API compatible Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 36/41] usb: gadget: omap_udc: " Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 37/41] [MERGED] video: fbdev: omap: " Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 38/41] [MERGED] mmc: " Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 39/41] [MERGED] ASoC: ti: osk5912: " Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` [PATCH 40/41] [TO BE REBASED] ARM: OMAP1: clock: Convert to CCF Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-21 6:24 ` Tony Lindgren 2022-04-21 6:24 ` Tony Lindgren 2022-04-21 6:24 ` Tony Lindgren 2022-04-21 6:24 ` Tony Lindgren 2022-04-19 13:37 ` [PATCH 41/41] [TO BE REBASED] ARM: omap1: enable multiplatform Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 13:37 ` Arnd Bergmann 2022-04-19 14:15 ` [PATCH 00/41] OMAP1 full multiplatform conversion Ulf Hansson 2022-04-19 14:15 ` Ulf Hansson 2022-04-19 14:15 ` Ulf Hansson 2022-04-19 14:15 ` Ulf Hansson 2022-04-21 6:27 ` Tony Lindgren 2022-04-21 6:27 ` Tony Lindgren 2022-04-21 6:27 ` Tony Lindgren 2022-04-21 6:27 ` Tony Lindgren 2022-04-20 17:08 ` Aaro Koskinen 2022-04-20 17:08 ` Aaro Koskinen 2022-04-20 17:08 ` Aaro Koskinen 2022-04-20 17:08 ` Aaro Koskinen 2022-04-20 20:00 ` Arnd Bergmann 2022-04-20 20:00 ` Arnd Bergmann 2022-04-20 20:00 ` Arnd Bergmann 2022-04-20 20:00 ` Arnd Bergmann 2022-04-21 13:34 ` Aaro Koskinen 2022-04-21 13:34 ` Aaro Koskinen 2022-04-21 13:34 ` Aaro Koskinen 2022-04-21 13:34 ` Aaro Koskinen 2022-04-21 14:46 ` Arnd Bergmann 2022-04-21 14:46 ` Arnd Bergmann 2022-04-21 14:46 ` Arnd Bergmann 2022-04-21 14:46 ` Arnd Bergmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220419133723.1394715-35-arnd@kernel.org \ --to=arnd@kernel.org \ --cc=aaro.koskinen@iki.fi \ --cc=alsa-devel@alsa-project.org \ --cc=arnd@arndb.de \ --cc=balbi@kernel.org \ --cc=broonie@kernel.org \ --cc=daniel.thompson@linaro.org \ --cc=deller@gmx.de \ --cc=dmaengine@vger.kernel.org \ --cc=dmitry.torokhov@gmail.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=jingoohan1@gmail.com \ --cc=jmkrzyszt@gmail.com \ --cc=khilman@kernel.org \ --cc=krzk@kernel.org \ --cc=lee.jones@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-serial@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=linux@dominikbrodowski.net \ --cc=paul@pwsan.com \ --cc=peter.ujfalusi@gmail.com \ --cc=stern@rowland.harvard.edu \ --cc=tony@atomide.com \ --cc=ulf.hansson@linaro.org \ --cc=vkoul@kernel.org \ --subject='Re: [PATCH 34/41] ARM: OMAP1: clock: Remove noop code' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.