From: David Lechner <david@lechnology.com> To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@codeaurora.org>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Sekhar Nori <nsekhar@ti.com>, Kevin Hilman <khilman@kernel.org>, Bartosz Golaszewski <bgolaszewski@baylibre.com>, Adam Ford <aford173@gmail.com>, linux-kernel@vger.kernel.org, David Lechner <david@lechnology.com> Subject: [PATCH v10 15/27] ARM: davinci: switch to common clock framework Date: Wed, 9 May 2018 12:25:54 -0500 [thread overview] Message-ID: <20180509172606.29387-16-david@lechnology.com> (raw) In-Reply-To: <20180509172606.29387-1-david@lechnology.com> This switches ARCH_DAVINCI to use the common clock framework. The legacy clock code in arch/arm/mach-davinci/ is no longer used. New drivers in drivers/clk/davinci/ are used instead. A few macros had to be moved to prevent compilation errors. Signed-off-by: David Lechner <david@lechnology.com> --- v10 changes: - none v9 changes: - none v8 changes: - none v7 changes: - s/compile/compilation and space instead of tab - add PM_GENERIC_DOMAINS dependencies v6 changes: - clean up indent on Common objects section arch/arm/Kconfig | 5 ++++- arch/arm/mach-davinci/Makefile | 4 ++-- arch/arm/mach-davinci/clock.h | 4 ---- arch/arm/mach-davinci/davinci.h | 4 ++++ arch/arm/mach-davinci/psc.h | 2 -- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a7f8e7f4b88f..a57ad13810c8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -609,13 +609,16 @@ config ARCH_S3C24XX config ARCH_DAVINCI bool "TI DaVinci" select ARCH_HAS_HOLES_MEMORYMODEL - select CLKDEV_LOOKUP + select COMMON_CLK select CPU_ARM926T select GENERIC_ALLOCATOR select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP select GPIOLIB select HAVE_IDE + select PM_GENERIC_DOMAINS if PM + select PM_GENERIC_DOMAINS_OF if PM && OF + select RESET_CONTROLLER select USE_OF select ZONE_DMA help diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile index 4e8178050027..8725d8bea567 100644 --- a/arch/arm/mach-davinci/Makefile +++ b/arch/arm/mach-davinci/Makefile @@ -5,8 +5,8 @@ # # Common objects -obj-y := time.o clock.o serial.o psc.o \ - usb.o common.o sram.o aemif.o +obj-y := time.o serial.o usb.o \ + common.o sram.o aemif.o obj-$(CONFIG_DAVINCI_MUX) += mux.o diff --git a/arch/arm/mach-davinci/clock.h b/arch/arm/mach-davinci/clock.h index d7894d5aaa25..2d058568e004 100644 --- a/arch/arm/mach-davinci/clock.h +++ b/arch/arm/mach-davinci/clock.h @@ -12,10 +12,6 @@ #ifndef __ARCH_ARM_DAVINCI_CLOCK_H #define __ARCH_ARM_DAVINCI_CLOCK_H -#define DAVINCI_PLL1_BASE 0x01c40800 -#define DAVINCI_PLL2_BASE 0x01c40c00 -#define MAX_PLL 2 - /* PLL/Reset register offsets */ #define PLLCTL 0x100 #define PLLCTL_PLLEN BIT(0) diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h index fa99197d36f9..db4c95ef4d5c 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h @@ -35,6 +35,10 @@ #include <media/davinci/vpbe.h> #include <media/davinci/vpbe_osd.h> +#define DAVINCI_PLL1_BASE 0x01c40800 +#define DAVINCI_PLL2_BASE 0x01c40c00 +#define DAVINCI_PWR_SLEEP_CNTRL_BASE 0x01c41000 + #define DAVINCI_SYSTEM_MODULE_BASE 0x01c40000 #define SYSMOD_VDAC_CONFIG 0x2c #define SYSMOD_VIDCLKCTL 0x38 diff --git a/arch/arm/mach-davinci/psc.h b/arch/arm/mach-davinci/psc.h index 8af9f09fc10c..b58707cf7033 100644 --- a/arch/arm/mach-davinci/psc.h +++ b/arch/arm/mach-davinci/psc.h @@ -27,8 +27,6 @@ #ifndef __ASM_ARCH_PSC_H #define __ASM_ARCH_PSC_H -#define DAVINCI_PWR_SLEEP_CNTRL_BASE 0x01C41000 - /* Power and Sleep Controller (PSC) Domains */ #define DAVINCI_GPSC_ARMDOMAIN 0 #define DAVINCI_GPSC_DSPDOMAIN 1 -- 2.17.0
WARNING: multiple messages have this Message-ID (diff)
From: david@lechnology.com (David Lechner) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v10 15/27] ARM: davinci: switch to common clock framework Date: Wed, 9 May 2018 12:25:54 -0500 [thread overview] Message-ID: <20180509172606.29387-16-david@lechnology.com> (raw) In-Reply-To: <20180509172606.29387-1-david@lechnology.com> This switches ARCH_DAVINCI to use the common clock framework. The legacy clock code in arch/arm/mach-davinci/ is no longer used. New drivers in drivers/clk/davinci/ are used instead. A few macros had to be moved to prevent compilation errors. Signed-off-by: David Lechner <david@lechnology.com> --- v10 changes: - none v9 changes: - none v8 changes: - none v7 changes: - s/compile/compilation and space instead of tab - add PM_GENERIC_DOMAINS dependencies v6 changes: - clean up indent on Common objects section arch/arm/Kconfig | 5 ++++- arch/arm/mach-davinci/Makefile | 4 ++-- arch/arm/mach-davinci/clock.h | 4 ---- arch/arm/mach-davinci/davinci.h | 4 ++++ arch/arm/mach-davinci/psc.h | 2 -- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a7f8e7f4b88f..a57ad13810c8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -609,13 +609,16 @@ config ARCH_S3C24XX config ARCH_DAVINCI bool "TI DaVinci" select ARCH_HAS_HOLES_MEMORYMODEL - select CLKDEV_LOOKUP + select COMMON_CLK select CPU_ARM926T select GENERIC_ALLOCATOR select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP select GPIOLIB select HAVE_IDE + select PM_GENERIC_DOMAINS if PM + select PM_GENERIC_DOMAINS_OF if PM && OF + select RESET_CONTROLLER select USE_OF select ZONE_DMA help diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile index 4e8178050027..8725d8bea567 100644 --- a/arch/arm/mach-davinci/Makefile +++ b/arch/arm/mach-davinci/Makefile @@ -5,8 +5,8 @@ # # Common objects -obj-y := time.o clock.o serial.o psc.o \ - usb.o common.o sram.o aemif.o +obj-y := time.o serial.o usb.o \ + common.o sram.o aemif.o obj-$(CONFIG_DAVINCI_MUX) += mux.o diff --git a/arch/arm/mach-davinci/clock.h b/arch/arm/mach-davinci/clock.h index d7894d5aaa25..2d058568e004 100644 --- a/arch/arm/mach-davinci/clock.h +++ b/arch/arm/mach-davinci/clock.h @@ -12,10 +12,6 @@ #ifndef __ARCH_ARM_DAVINCI_CLOCK_H #define __ARCH_ARM_DAVINCI_CLOCK_H -#define DAVINCI_PLL1_BASE 0x01c40800 -#define DAVINCI_PLL2_BASE 0x01c40c00 -#define MAX_PLL 2 - /* PLL/Reset register offsets */ #define PLLCTL 0x100 #define PLLCTL_PLLEN BIT(0) diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h index fa99197d36f9..db4c95ef4d5c 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h @@ -35,6 +35,10 @@ #include <media/davinci/vpbe.h> #include <media/davinci/vpbe_osd.h> +#define DAVINCI_PLL1_BASE 0x01c40800 +#define DAVINCI_PLL2_BASE 0x01c40c00 +#define DAVINCI_PWR_SLEEP_CNTRL_BASE 0x01c41000 + #define DAVINCI_SYSTEM_MODULE_BASE 0x01c40000 #define SYSMOD_VDAC_CONFIG 0x2c #define SYSMOD_VIDCLKCTL 0x38 diff --git a/arch/arm/mach-davinci/psc.h b/arch/arm/mach-davinci/psc.h index 8af9f09fc10c..b58707cf7033 100644 --- a/arch/arm/mach-davinci/psc.h +++ b/arch/arm/mach-davinci/psc.h @@ -27,8 +27,6 @@ #ifndef __ASM_ARCH_PSC_H #define __ASM_ARCH_PSC_H -#define DAVINCI_PWR_SLEEP_CNTRL_BASE 0x01C41000 - /* Power and Sleep Controller (PSC) Domains */ #define DAVINCI_GPSC_ARMDOMAIN 0 #define DAVINCI_GPSC_DSPDOMAIN 1 -- 2.17.0
next prev parent reply other threads:[~2018-05-09 17:27 UTC|newest] Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-09 17:25 [PATCH v10 00/27] ARM: davinci: convert to common clock framework David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 01/27] clk: davinci: pll: allow dev == NULL David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 02/27] clk: davinci: da850-pll: change PLL0 to CLK_OF_DECLARE David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-15 13:31 ` Sekhar Nori 2018-05-15 13:31 ` Sekhar Nori 2018-05-15 13:31 ` Sekhar Nori 2018-05-15 15:42 ` David Lechner 2018-05-15 15:42 ` David Lechner 2018-05-16 5:51 ` Sekhar Nori 2018-05-16 5:51 ` Sekhar Nori 2018-05-16 5:51 ` Sekhar Nori 2018-05-09 17:25 ` [PATCH v10 03/27] clk: davinci: psc: allow for dev == NULL David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-15 13:42 ` Sekhar Nori 2018-05-15 13:42 ` Sekhar Nori 2018-05-15 13:42 ` Sekhar Nori 2018-05-09 17:25 ` [PATCH v10 04/27] ARM: davinci: pass clock as parameter to davinci_timer_init() David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 05/27] ARM: davinci: da830: add new clock init using common clock framework David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 06/27] ARM: davinci: da850: " David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 07/27] ARM: davinci: dm355: " David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 08/27] ARM: davinci: dm365: " David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 09/27] ARM: davinci: dm644x: " David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 10/27] ARM: davinci: dm646x: " David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 11/27] ARM: davinci: da8xx: add new USB PHY " David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 12/27] ARM: davinci: da8xx: add new sata_refclk " David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 13/27] ARM: davinci: remove CONFIG_DAVINCI_RESET_CLOCKS David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 14/27] ARM: davinci_all_defconfig: " David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` David Lechner [this message] 2018-05-09 17:25 ` [PATCH v10 15/27] ARM: davinci: switch to common clock framework David Lechner 2018-05-09 17:25 ` [PATCH v10 16/27] ARM: davinci: da830: Remove legacy clock init David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 17/27] ARM: davinci: da850: " David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 18/27] ARM: davinci: dm355: " David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 19/27] ARM: davinci: dm365: " David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:25 ` [PATCH v10 20/27] ARM: davinci: dm644x: " David Lechner 2018-05-09 17:25 ` David Lechner 2018-05-09 17:26 ` [PATCH v10 21/27] ARM: davinci: dm646x: " David Lechner 2018-05-09 17:26 ` David Lechner 2018-05-09 17:26 ` [PATCH v10 22/27] ARM: davinci: da8xx: Remove legacy USB and SATA " David Lechner 2018-05-09 17:26 ` David Lechner 2018-05-09 17:26 ` [PATCH v10 23/27] ARM: davinci: remove legacy clocks David Lechner 2018-05-09 17:26 ` David Lechner 2018-05-09 17:26 ` [PATCH v10 24/27] dt-bindings: timer: new bindings for TI DaVinci timer David Lechner 2018-05-09 17:26 ` David Lechner 2018-05-18 14:24 ` Rob Herring 2018-05-18 14:24 ` Rob Herring 2018-05-09 17:26 ` [PATCH v10 25/27] ARM: davinci: add device tree support to timer David Lechner 2018-05-09 17:26 ` David Lechner 2018-05-17 14:35 ` Sekhar Nori 2018-05-17 14:35 ` Sekhar Nori 2018-05-17 14:35 ` Sekhar Nori 2018-05-17 15:09 ` David Lechner 2018-05-17 15:09 ` David Lechner 2018-05-18 6:05 ` Sekhar Nori 2018-05-18 6:05 ` Sekhar Nori 2018-05-18 6:05 ` Sekhar Nori 2018-05-18 15:35 ` David Lechner 2018-05-18 15:35 ` David Lechner 2018-05-09 17:26 ` [PATCH v10 26/27] ARM: davinci: da8xx-dt: switch to device tree clocks David Lechner 2018-05-09 17:26 ` David Lechner 2018-05-09 17:26 ` [PATCH v10 27/27] ARM: dts: da850: Add clocks David Lechner 2018-05-09 17:26 ` David Lechner 2018-05-11 15:26 ` [PATCH v10 00/27] ARM: davinci: convert to common clock framework Sekhar Nori 2018-05-11 15:26 ` Sekhar Nori 2018-05-11 15:26 ` Sekhar Nori 2018-05-12 21:11 ` David Lechner 2018-05-12 21:11 ` David Lechner 2018-05-14 0:40 ` Adam Ford 2018-05-14 0:40 ` Adam Ford 2018-05-14 1:50 ` David Lechner 2018-05-14 1:50 ` David Lechner 2018-05-15 9:25 ` Bartosz Golaszewski 2018-05-15 9:25 ` Bartosz Golaszewski 2018-05-15 22:44 ` Adam Ford 2018-05-15 22:44 ` Adam Ford 2018-05-16 0:31 ` David Lechner 2018-05-16 0:31 ` David Lechner 2018-05-16 7:47 ` Bartosz Golaszewski 2018-05-16 7:47 ` Bartosz Golaszewski 2018-05-16 10:43 ` Sekhar Nori 2018-05-16 10:43 ` Sekhar Nori 2018-05-17 0:46 ` Adam Ford 2018-05-17 0:46 ` Adam Ford
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=20180509172606.29387-16-david@lechnology.com \ --to=david@lechnology.com \ --cc=aford173@gmail.com \ --cc=bgolaszewski@baylibre.com \ --cc=devicetree@vger.kernel.org \ --cc=khilman@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mturquette@baylibre.com \ --cc=nsekhar@ti.com \ --cc=robh+dt@kernel.org \ --cc=sboyd@codeaurora.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.