| Message ID | 1444938513-10758-9-git-send-email-jonmason@broadcom.com |
|---|---|
| State | Accepted |
| Commit | f7225a832dde995325b486b41728dfbe4634311c |
| Headers | show |
We need some sort of kconfig option to differentiate NS2 clock driver from being pulled in all the time. On 15-10-15 12:48 PM, Jon Mason wrote: > The Broadcom Northstar 2 SoC is architected under the iProc > architecture. It has the following PLLs: GENPLL SCR, GENPLL SW, > LCPLL DDR, LCPLL Ports, all derived from an onboard crystal. > > Signed-off-by: Jon Mason <jonmason@broadcom.com> > --- > drivers/clk/Makefile | 2 +- > drivers/clk/bcm/Makefile | 1 + > drivers/clk/bcm/clk-ns2.c | 288 ++++++++++++++++++++++++++++++++++++ > include/dt-bindings/clock/bcm-ns2.h | 72 +++++++++ > 4 files changed, 362 insertions(+), 1 deletion(-) > create mode 100644 drivers/clk/bcm/clk-ns2.c > create mode 100644 include/dt-bindings/clock/bcm-ns2.h > > diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile > index d08b3e5..6124bd3 100644 > --- a/drivers/clk/Makefile > +++ b/drivers/clk/Makefile > @@ -47,7 +47,7 @@ obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o > obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o > obj-$(CONFIG_COMMON_CLK_PWM) += clk-pwm.o > obj-$(CONFIG_COMMON_CLK_AT91) += at91/ > -obj-$(CONFIG_ARCH_BCM) += bcm/ > +obj-y += bcm/ > obj-$(CONFIG_ARCH_BERLIN) += berlin/ > obj-$(CONFIG_ARCH_HISI) += hisilicon/ > obj-$(CONFIG_ARCH_MXC) += imx/ > diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile > index e258b28..2d1cbc5 100644 > --- a/drivers/clk/bcm/Makefile > +++ b/drivers/clk/bcm/Makefile > @@ -3,6 +3,7 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-kona-setup.o > 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_COMMON_CLK_IPROC) += clk-ns2.o NS2 code is dragged in for all IPROC SoCs. We need a config option for NS2 (CONFIG_ARCH_BCM_NS2) to avoid this (if Arnd allows this for ARMv8 processors... ?). You can see below ARMv7 processors don't have this problem. If not we need to add CONFIG_CLK_NS2. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On 10/15/2015 1:40 PM, Scott Branden wrote: > We need some sort of kconfig option to differentiate NS2 clock driver > from being pulled in all the time. > > On 15-10-15 12:48 PM, Jon Mason wrote: >> The Broadcom Northstar 2 SoC is architected under the iProc >> architecture. It has the following PLLs: GENPLL SCR, GENPLL SW, >> LCPLL DDR, LCPLL Ports, all derived from an onboard crystal. >> >> Signed-off-by: Jon Mason <jonmason@broadcom.com> >> --- >> drivers/clk/Makefile | 2 +- >> drivers/clk/bcm/Makefile | 1 + >> drivers/clk/bcm/clk-ns2.c | 288 >> ++++++++++++++++++++++++++++++++++++ >> include/dt-bindings/clock/bcm-ns2.h | 72 +++++++++ >> 4 files changed, 362 insertions(+), 1 deletion(-) >> create mode 100644 drivers/clk/bcm/clk-ns2.c >> create mode 100644 include/dt-bindings/clock/bcm-ns2.h >> >> diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile >> index d08b3e5..6124bd3 100644 >> --- a/drivers/clk/Makefile >> +++ b/drivers/clk/Makefile >> @@ -47,7 +47,7 @@ obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o >> obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o >> obj-$(CONFIG_COMMON_CLK_PWM) += clk-pwm.o >> obj-$(CONFIG_COMMON_CLK_AT91) += at91/ >> -obj-$(CONFIG_ARCH_BCM) += bcm/ >> +obj-y += bcm/ >> obj-$(CONFIG_ARCH_BERLIN) += berlin/ >> obj-$(CONFIG_ARCH_HISI) += hisilicon/ >> obj-$(CONFIG_ARCH_MXC) += imx/ >> diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile >> index e258b28..2d1cbc5 100644 >> --- a/drivers/clk/bcm/Makefile >> +++ b/drivers/clk/bcm/Makefile >> @@ -3,6 +3,7 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-kona-setup.o >> 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_COMMON_CLK_IPROC) += clk-ns2.o > > NS2 code is dragged in for all IPROC SoCs. We need a config option for > NS2 (CONFIG_ARCH_BCM_NS2) to avoid this (if Arnd allows this for ARMv8 > processors... ?). > > You can see below ARMv7 processors don't have this problem. > The arm64 maintainers (Catalin, Mark, and etc.) stated they only want one ARCH options per chip family. > If not we need to add CONFIG_CLK_NS2. If using CONFIG_CLK_NS2, how is it going to be enabled/selected? Ray -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Hi Ray, Comment at near end. On 15-10-15 01:55 PM, Ray Jui wrote: > > > On 10/15/2015 1:40 PM, Scott Branden wrote: >> We need some sort of kconfig option to differentiate NS2 clock driver >> from being pulled in all the time. >> >> On 15-10-15 12:48 PM, Jon Mason wrote: >>> The Broadcom Northstar 2 SoC is architected under the iProc >>> architecture. It has the following PLLs: GENPLL SCR, GENPLL SW, >>> LCPLL DDR, LCPLL Ports, all derived from an onboard crystal. >>> >>> Signed-off-by: Jon Mason <jonmason@broadcom.com> >>> --- >>> drivers/clk/Makefile | 2 +- >>> drivers/clk/bcm/Makefile | 1 + >>> drivers/clk/bcm/clk-ns2.c | 288 >>> ++++++++++++++++++++++++++++++++++++ >>> include/dt-bindings/clock/bcm-ns2.h | 72 +++++++++ >>> 4 files changed, 362 insertions(+), 1 deletion(-) >>> create mode 100644 drivers/clk/bcm/clk-ns2.c >>> create mode 100644 include/dt-bindings/clock/bcm-ns2.h >>> >>> diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile >>> index d08b3e5..6124bd3 100644 >>> --- a/drivers/clk/Makefile >>> +++ b/drivers/clk/Makefile >>> @@ -47,7 +47,7 @@ obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o >>> obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o >>> obj-$(CONFIG_COMMON_CLK_PWM) += clk-pwm.o >>> obj-$(CONFIG_COMMON_CLK_AT91) += at91/ >>> -obj-$(CONFIG_ARCH_BCM) += bcm/ >>> +obj-y += bcm/ >>> obj-$(CONFIG_ARCH_BERLIN) += berlin/ >>> obj-$(CONFIG_ARCH_HISI) += hisilicon/ >>> obj-$(CONFIG_ARCH_MXC) += imx/ >>> diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile >>> index e258b28..2d1cbc5 100644 >>> --- a/drivers/clk/bcm/Makefile >>> +++ b/drivers/clk/bcm/Makefile >>> @@ -3,6 +3,7 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-kona-setup.o >>> 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_COMMON_CLK_IPROC) += clk-ns2.o >> >> NS2 code is dragged in for all IPROC SoCs. We need a config option for >> NS2 (CONFIG_ARCH_BCM_NS2) to avoid this (if Arnd allows this for ARMv8 >> processors... ?). >> >> You can see below ARMv7 processors don't have this problem. >> > > The arm64 maintainers (Catalin, Mark, and etc.) stated they only want > one ARCH options per chip family. > >> If not we need to add CONFIG_CLK_NS2. > > If using CONFIG_CLK_NS2, how is it going to be enabled/selected? Since CONFIG_ARCH_BCM_NS2 isn't "allowed" to be introduced we will need to create and select a CONFIG_CLK_BCM_NS2 in the defconfig instead. > > Ray > Regards, Scott -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Oct 15, 2015 at 02:04:09PM -0700, Scott Branden wrote: > Hi Ray, > > Comment at near end. > > On 15-10-15 01:55 PM, Ray Jui wrote: > > > > > >On 10/15/2015 1:40 PM, Scott Branden wrote: > >>We need some sort of kconfig option to differentiate NS2 clock driver > >>from being pulled in all the time. > >> > >>On 15-10-15 12:48 PM, Jon Mason wrote: > >>>The Broadcom Northstar 2 SoC is architected under the iProc > >>>architecture. It has the following PLLs: GENPLL SCR, GENPLL SW, > >>>LCPLL DDR, LCPLL Ports, all derived from an onboard crystal. > >>> > >>>Signed-off-by: Jon Mason <jonmason@broadcom.com> > >>>--- > >>> drivers/clk/Makefile | 2 +- > >>> drivers/clk/bcm/Makefile | 1 + > >>> drivers/clk/bcm/clk-ns2.c | 288 > >>>++++++++++++++++++++++++++++++++++++ > >>> include/dt-bindings/clock/bcm-ns2.h | 72 +++++++++ > >>> 4 files changed, 362 insertions(+), 1 deletion(-) > >>> create mode 100644 drivers/clk/bcm/clk-ns2.c > >>> create mode 100644 include/dt-bindings/clock/bcm-ns2.h > >>> > >>>diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile > >>>index d08b3e5..6124bd3 100644 > >>>--- a/drivers/clk/Makefile > >>>+++ b/drivers/clk/Makefile > >>>@@ -47,7 +47,7 @@ obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o > >>> obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o > >>> obj-$(CONFIG_COMMON_CLK_PWM) += clk-pwm.o > >>> obj-$(CONFIG_COMMON_CLK_AT91) += at91/ > >>>-obj-$(CONFIG_ARCH_BCM) += bcm/ > >>>+obj-y += bcm/ > >>> obj-$(CONFIG_ARCH_BERLIN) += berlin/ > >>> obj-$(CONFIG_ARCH_HISI) += hisilicon/ > >>> obj-$(CONFIG_ARCH_MXC) += imx/ > >>>diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile > >>>index e258b28..2d1cbc5 100644 > >>>--- a/drivers/clk/bcm/Makefile > >>>+++ b/drivers/clk/bcm/Makefile > >>>@@ -3,6 +3,7 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-kona-setup.o > >>> 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_COMMON_CLK_IPROC) += clk-ns2.o > >> > >>NS2 code is dragged in for all IPROC SoCs. We need a config option for > >>NS2 (CONFIG_ARCH_BCM_NS2) to avoid this (if Arnd allows this for ARMv8 > >>processors... ?). > >> > >>You can see below ARMv7 processors don't have this problem. > >> > > > >The arm64 maintainers (Catalin, Mark, and etc.) stated they only want > >one ARCH options per chip family. > > > >>If not we need to add CONFIG_CLK_NS2. > > > >If using CONFIG_CLK_NS2, how is it going to be enabled/selected? > > Since CONFIG_ARCH_BCM_NS2 isn't "allowed" to be introduced we will > need to create and select a CONFIG_CLK_BCM_NS2 in the defconfig > instead. Is this better than the binary becoming slightly bigger? I thought the extra complexity was worse than having an unused chunk of clk code (and Kona is already doing the same thing above). I believe Ray was in agreement with me during the internal review of this code. Thanks, Jon > > > >Ray > > > > Regards, > Scott -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/15/2015 2:10 PM, Jon Mason wrote: > On Thu, Oct 15, 2015 at 02:04:09PM -0700, Scott Branden wrote: >> Hi Ray, >> >> Comment at near end. >> >> On 15-10-15 01:55 PM, Ray Jui wrote: >>> >>> >>> On 10/15/2015 1:40 PM, Scott Branden wrote: >>>> We need some sort of kconfig option to differentiate NS2 clock driver >>> >from being pulled in all the time. >>>> >>>> On 15-10-15 12:48 PM, Jon Mason wrote: >>>>> The Broadcom Northstar 2 SoC is architected under the iProc >>>>> architecture. It has the following PLLs: GENPLL SCR, GENPLL SW, >>>>> LCPLL DDR, LCPLL Ports, all derived from an onboard crystal. >>>>> >>>>> Signed-off-by: Jon Mason <jonmason@broadcom.com> >>>>> --- >>>>> drivers/clk/Makefile | 2 +- >>>>> drivers/clk/bcm/Makefile | 1 + >>>>> drivers/clk/bcm/clk-ns2.c | 288 >>>>> ++++++++++++++++++++++++++++++++++++ >>>>> include/dt-bindings/clock/bcm-ns2.h | 72 +++++++++ >>>>> 4 files changed, 362 insertions(+), 1 deletion(-) >>>>> create mode 100644 drivers/clk/bcm/clk-ns2.c >>>>> create mode 100644 include/dt-bindings/clock/bcm-ns2.h >>>>> >>>>> diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile >>>>> index d08b3e5..6124bd3 100644 >>>>> --- a/drivers/clk/Makefile >>>>> +++ b/drivers/clk/Makefile >>>>> @@ -47,7 +47,7 @@ obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o >>>>> obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o >>>>> obj-$(CONFIG_COMMON_CLK_PWM) += clk-pwm.o >>>>> obj-$(CONFIG_COMMON_CLK_AT91) += at91/ >>>>> -obj-$(CONFIG_ARCH_BCM) += bcm/ >>>>> +obj-y += bcm/ >>>>> obj-$(CONFIG_ARCH_BERLIN) += berlin/ >>>>> obj-$(CONFIG_ARCH_HISI) += hisilicon/ >>>>> obj-$(CONFIG_ARCH_MXC) += imx/ >>>>> diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile >>>>> index e258b28..2d1cbc5 100644 >>>>> --- a/drivers/clk/bcm/Makefile >>>>> +++ b/drivers/clk/bcm/Makefile >>>>> @@ -3,6 +3,7 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-kona-setup.o >>>>> 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_COMMON_CLK_IPROC) += clk-ns2.o >>>> >>>> NS2 code is dragged in for all IPROC SoCs. We need a config option for >>>> NS2 (CONFIG_ARCH_BCM_NS2) to avoid this (if Arnd allows this for ARMv8 >>>> processors... ?). >>>> >>>> You can see below ARMv7 processors don't have this problem. >>>> >>> >>> The arm64 maintainers (Catalin, Mark, and etc.) stated they only want >>> one ARCH options per chip family. >>> >>>> If not we need to add CONFIG_CLK_NS2. >>> >>> If using CONFIG_CLK_NS2, how is it going to be enabled/selected? >> >> Since CONFIG_ARCH_BCM_NS2 isn't "allowed" to be introduced we will >> need to create and select a CONFIG_CLK_BCM_NS2 in the defconfig >> instead. > > Is this better than the binary becoming slightly bigger? I thought > the extra complexity was worse than having an unused chunk of clk code > (and Kona is already doing the same thing above). I believe Ray was > in agreement with me during the internal review of this code. > > Thanks, > Jon > Yes, I'm okay with leaving it as it is. I even prefer changing the current Makefile to make all iProc based core clock drivers and SoC specific clock tables under CONFIG_COMMON_CLK_IPROC, which is what some of the other vendors do. >>> >>> Ray >>> >> >> Regards, >> Scott -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On 15-10-15 02:15 PM, Ray Jui wrote: > > > On 10/15/2015 2:10 PM, Jon Mason wrote: >> On Thu, Oct 15, 2015 at 02:04:09PM -0700, Scott Branden wrote: >>> Hi Ray, >>> >>> Comment at near end. >>> >>> On 15-10-15 01:55 PM, Ray Jui wrote: >>>> >>>> >>>> On 10/15/2015 1:40 PM, Scott Branden wrote: >>>>> We need some sort of kconfig option to differentiate NS2 clock driver >>>> >from being pulled in all the time. >>>>> >>>>> On 15-10-15 12:48 PM, Jon Mason wrote: >>>>>> The Broadcom Northstar 2 SoC is architected under the iProc >>>>>> architecture. It has the following PLLs: GENPLL SCR, GENPLL SW, >>>>>> LCPLL DDR, LCPLL Ports, all derived from an onboard crystal. >>>>>> >>>>>> Signed-off-by: Jon Mason <jonmason@broadcom.com> >>>>>> --- >>>>>> drivers/clk/Makefile | 2 +- >>>>>> drivers/clk/bcm/Makefile | 1 + >>>>>> drivers/clk/bcm/clk-ns2.c | 288 >>>>>> ++++++++++++++++++++++++++++++++++++ >>>>>> include/dt-bindings/clock/bcm-ns2.h | 72 +++++++++ >>>>>> 4 files changed, 362 insertions(+), 1 deletion(-) >>>>>> create mode 100644 drivers/clk/bcm/clk-ns2.c >>>>>> create mode 100644 include/dt-bindings/clock/bcm-ns2.h >>>>>> >>>>>> diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile >>>>>> index d08b3e5..6124bd3 100644 >>>>>> --- a/drivers/clk/Makefile >>>>>> +++ b/drivers/clk/Makefile >>>>>> @@ -47,7 +47,7 @@ obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o >>>>>> obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o >>>>>> obj-$(CONFIG_COMMON_CLK_PWM) += clk-pwm.o >>>>>> obj-$(CONFIG_COMMON_CLK_AT91) += at91/ >>>>>> -obj-$(CONFIG_ARCH_BCM) += bcm/ >>>>>> +obj-y += bcm/ >>>>>> obj-$(CONFIG_ARCH_BERLIN) += berlin/ >>>>>> obj-$(CONFIG_ARCH_HISI) += hisilicon/ >>>>>> obj-$(CONFIG_ARCH_MXC) += imx/ >>>>>> diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile >>>>>> index e258b28..2d1cbc5 100644 >>>>>> --- a/drivers/clk/bcm/Makefile >>>>>> +++ b/drivers/clk/bcm/Makefile >>>>>> @@ -3,6 +3,7 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-kona-setup.o >>>>>> 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_COMMON_CLK_IPROC) += clk-ns2.o >>>>> >>>>> NS2 code is dragged in for all IPROC SoCs. We need a config option for >>>>> NS2 (CONFIG_ARCH_BCM_NS2) to avoid this (if Arnd allows this for ARMv8 >>>>> processors... ?). >>>>> >>>>> You can see below ARMv7 processors don't have this problem. >>>>> >>>> >>>> The arm64 maintainers (Catalin, Mark, and etc.) stated they only want >>>> one ARCH options per chip family. >>>> >>>>> If not we need to add CONFIG_CLK_NS2. >>>> >>>> If using CONFIG_CLK_NS2, how is it going to be enabled/selected? >>> >>> Since CONFIG_ARCH_BCM_NS2 isn't "allowed" to be introduced we will >>> need to create and select a CONFIG_CLK_BCM_NS2 in the defconfig >>> instead. >> >> Is this better than the binary becoming slightly bigger? I thought >> the extra complexity was worse than having an unused chunk of clk code >> (and Kona is already doing the same thing above). I believe Ray was >> in agreement with me during the internal review of this code. >> >> Thanks, >> Jon >> > > Yes, I'm okay with leaving it as it is. I even prefer changing the > current Makefile to make all iProc based core clock drivers and SoC > specific clock tables under CONFIG_COMMON_CLK_IPROC, which is what some > of the other vendors do. > I'd leave it exactly as is then rather than pulling in more dead code when not needed. This ns2 clock code is very minor compared to other code bloat in the kernel and drivers. >>>> >>>> Ray >>>> >>> >>> Regards, >>> Scott -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/15, Scott Branden wrote: > On 15-10-15 02:15 PM, Ray Jui wrote: > >On 10/15/2015 2:10 PM, Jon Mason wrote: > >>On Thu, Oct 15, 2015 at 02:04:09PM -0700, Scott Branden wrote: > >>>On 15-10-15 01:55 PM, Ray Jui wrote: > >>>>On 10/15/2015 1:40 PM, Scott Branden wrote: > >>>> > >>>>If using CONFIG_CLK_NS2, how is it going to be enabled/selected? > >>> > >>>Since CONFIG_ARCH_BCM_NS2 isn't "allowed" to be introduced we will > >>>need to create and select a CONFIG_CLK_BCM_NS2 in the defconfig > >>>instead. > >> > >>Is this better than the binary becoming slightly bigger? I thought > >>the extra complexity was worse than having an unused chunk of clk code > >>(and Kona is already doing the same thing above). I believe Ray was > >>in agreement with me during the internal review of this code. > >> > >>Thanks, > >>Jon > >> > > > >Yes, I'm okay with leaving it as it is. I even prefer changing the > >current Makefile to make all iProc based core clock drivers and SoC > >specific clock tables under CONFIG_COMMON_CLK_IPROC, which is what some > >of the other vendors do. > > > I'd leave it exactly as is then rather than pulling in more dead > code when not needed. This ns2 clock code is very minor compared to > other code bloat in the kernel and drivers. We should really make these visible options that can be selected by anyone. Having selects in the ARCH config area is simple, but also has some downsides: 1) select is a reverse dependency and is hard for people to understand and can sometimes be a pain to track down 2) build coverage goes down because configs are hidden 3) we get code bloat like is being discussed here So I'd really like to see someone take a good look at this whole Makefile situation that's going on and clean it up so that they're user visible options and then throw the config options into the defconfig. It isn't going to block this series, but it would be nice to do at some later point.
On 10/15, Jon Mason wrote: > The Broadcom Northstar 2 SoC is architected under the iProc > architecture. It has the following PLLs: GENPLL SCR, GENPLL SW, > LCPLL DDR, LCPLL Ports, all derived from an onboard crystal. > > Signed-off-by: Jon Mason <jonmason@broadcom.com> > --- Applied to clk-iproc
On Wed, Oct 21, 2015 at 05:22:47PM -0700, Stephen Boyd wrote: > On 10/15, Scott Branden wrote: > > On 15-10-15 02:15 PM, Ray Jui wrote: > > >On 10/15/2015 2:10 PM, Jon Mason wrote: > > >>On Thu, Oct 15, 2015 at 02:04:09PM -0700, Scott Branden wrote: > > >>>On 15-10-15 01:55 PM, Ray Jui wrote: > > >>>>On 10/15/2015 1:40 PM, Scott Branden wrote: > > >>>> > > >>>>If using CONFIG_CLK_NS2, how is it going to be enabled/selected? > > >>> > > >>>Since CONFIG_ARCH_BCM_NS2 isn't "allowed" to be introduced we will > > >>>need to create and select a CONFIG_CLK_BCM_NS2 in the defconfig > > >>>instead. > > >> > > >>Is this better than the binary becoming slightly bigger? I thought > > >>the extra complexity was worse than having an unused chunk of clk code > > >>(and Kona is already doing the same thing above). I believe Ray was > > >>in agreement with me during the internal review of this code. > > >> > > >>Thanks, > > >>Jon > > >> > > > > > >Yes, I'm okay with leaving it as it is. I even prefer changing the > > >current Makefile to make all iProc based core clock drivers and SoC > > >specific clock tables under CONFIG_COMMON_CLK_IPROC, which is what some > > >of the other vendors do. > > > > > I'd leave it exactly as is then rather than pulling in more dead > > code when not needed. This ns2 clock code is very minor compared to > > other code bloat in the kernel and drivers. > > We should really make these visible options that can be selected > by anyone. Having selects in the ARCH config area is simple, but > also has some downsides: > > 1) select is a reverse dependency and is hard for people to > understand and can sometimes be a pain to track down > > 2) build coverage goes down because configs are hidden > > 3) we get code bloat like is being discussed here > > So I'd really like to see someone take a good look at this whole > Makefile situation that's going on and clean it up so that > they're user visible options and then throw the config options > into the defconfig. It isn't going to block this series, but it > would be nice to do at some later point. I'll do a pass at this today and send it out for review. Thanks, Jon > > -- > Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, > a Linux Foundation Collaborative Project -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index d08b3e5..6124bd3 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -47,7 +47,7 @@ obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o obj-$(CONFIG_COMMON_CLK_PWM) += clk-pwm.o obj-$(CONFIG_COMMON_CLK_AT91) += at91/ -obj-$(CONFIG_ARCH_BCM) += bcm/ +obj-y += bcm/ obj-$(CONFIG_ARCH_BERLIN) += berlin/ obj-$(CONFIG_ARCH_HISI) += hisilicon/ obj-$(CONFIG_ARCH_MXC) += imx/ diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile index e258b28..2d1cbc5 100644 --- a/drivers/clk/bcm/Makefile +++ b/drivers/clk/bcm/Makefile @@ -3,6 +3,7 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-kona-setup.o 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_COMMON_CLK_IPROC) += clk-ns2.o obj-$(CONFIG_ARCH_BCM_CYGNUS) += clk-cygnus.o obj-$(CONFIG_ARCH_BCM_NSP) += clk-nsp.o obj-$(CONFIG_ARCH_BCM_5301X) += clk-nsp.o diff --git a/drivers/clk/bcm/clk-ns2.c b/drivers/clk/bcm/clk-ns2.c new file mode 100644 index 0000000..a564e92 --- /dev/null +++ b/drivers/clk/bcm/clk-ns2.c @@ -0,0 +1,288 @@ +/* + * Copyright (C) 2015 Broadcom Corporation + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation version 2. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/kernel.h> +#include <linux/err.h> +#include <linux/clk-provider.h> +#include <linux/io.h> +#include <linux/of.h> +#include <linux/of_address.h> + +#include <dt-bindings/clock/bcm-ns2.h> +#include "clk-iproc.h" + +#define REG_VAL(o, s, w) { .offset = o, .shift = s, .width = w, } + +#define AON_VAL(o, pw, ps, is) { .offset = o, .pwr_width = pw, \ + .pwr_shift = ps, .iso_shift = is } + +#define RESET_VAL(o, rs, prs) { .offset = o, .reset_shift = rs, \ + .p_reset_shift = prs } + +#define DF_VAL(o, kis, kiw, kps, kpw, kas, kaw) { .offset = o, .ki_shift = kis,\ + .ki_width = kiw, .kp_shift = kps, .kp_width = kpw, .ka_shift = kas, \ + .ka_width = kaw } + +#define VCO_CTRL_VAL(uo, lo) { .u_offset = uo, .l_offset = lo } + +#define ENABLE_VAL(o, es, hs, bs) { .offset = o, .enable_shift = es, \ + .hold_shift = hs, .bypass_shift = bs } + +static const struct iproc_pll_ctrl genpll_scr = { + .flags = IPROC_CLK_AON | IPROC_CLK_PLL_SPLIT_STAT_CTRL, + .aon = AON_VAL(0x0, 1, 15, 12), + .reset = RESET_VAL(0x4, 2, 1), + .dig_filter = DF_VAL(0x0, 9, 3, 5, 4, 2, 3), + .ndiv_int = REG_VAL(0x8, 4, 10), + .pdiv = REG_VAL(0x8, 0, 4), + .vco_ctrl = VCO_CTRL_VAL(0x10, 0xc), + .status = REG_VAL(0x0, 27, 1), +}; + + +static const struct iproc_clk_ctrl genpll_scr_clk[] = { + /* bypass_shift, the last value passed into ENABLE_VAL(), is not defined + * in NS2. However, it doesn't appear to be used anywhere, so setting + * it to 0. + */ + [BCM_NS2_GENPLL_SCR_SCR_CLK] = { + .channel = BCM_NS2_GENPLL_SCR_SCR_CLK, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 18, 12, 0), + .mdiv = REG_VAL(0x18, 0, 8), + }, + [BCM_NS2_GENPLL_SCR_FS_CLK] = { + .channel = BCM_NS2_GENPLL_SCR_FS_CLK, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 19, 13, 0), + .mdiv = REG_VAL(0x18, 8, 8), + }, + [BCM_NS2_GENPLL_SCR_AUDIO_CLK] = { + .channel = BCM_NS2_GENPLL_SCR_AUDIO_CLK, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 20, 14, 0), + .mdiv = REG_VAL(0x14, 0, 8), + }, + [BCM_NS2_GENPLL_SCR_CH3_UNUSED] = { + .channel = BCM_NS2_GENPLL_SCR_CH3_UNUSED, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 21, 15, 0), + .mdiv = REG_VAL(0x14, 8, 8), + }, + [BCM_NS2_GENPLL_SCR_CH4_UNUSED] = { + .channel = BCM_NS2_GENPLL_SCR_CH4_UNUSED, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 22, 16, 0), + .mdiv = REG_VAL(0x14, 16, 8), + }, + [BCM_NS2_GENPLL_SCR_CH5_UNUSED] = { + .channel = BCM_NS2_GENPLL_SCR_CH5_UNUSED, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 23, 17, 0), + .mdiv = REG_VAL(0x14, 24, 8), + }, +}; + +static void __init ns2_genpll_scr_clk_init(struct device_node *node) +{ + iproc_pll_clk_setup(node, &genpll_scr, NULL, 0, genpll_scr_clk, + ARRAY_SIZE(genpll_scr_clk)); +} +CLK_OF_DECLARE(ns2_genpll_src_clk, "brcm,ns2-genpll-scr", + ns2_genpll_scr_clk_init); + +static const struct iproc_pll_ctrl genpll_sw = { + .flags = IPROC_CLK_AON | IPROC_CLK_PLL_SPLIT_STAT_CTRL, + .aon = AON_VAL(0x0, 2, 9, 8), + .reset = RESET_VAL(0x4, 2, 1), + .dig_filter = DF_VAL(0x0, 9, 3, 5, 4, 2, 3), + .ndiv_int = REG_VAL(0x8, 4, 10), + .pdiv = REG_VAL(0x8, 0, 4), + .vco_ctrl = VCO_CTRL_VAL(0x10, 0xc), + .status = REG_VAL(0x0, 13, 1), +}; + +static const struct iproc_clk_ctrl genpll_sw_clk[] = { + /* bypass_shift, the last value passed into ENABLE_VAL(), is not defined + * in NS2. However, it doesn't appear to be used anywhere, so setting + * it to 0. + */ + [BCM_NS2_GENPLL_SW_RPE_CLK] = { + .channel = BCM_NS2_GENPLL_SW_RPE_CLK, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 18, 12, 0), + .mdiv = REG_VAL(0x18, 0, 8), + }, + [BCM_NS2_GENPLL_SW_250_CLK] = { + .channel = BCM_NS2_GENPLL_SW_250_CLK, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 19, 13, 0), + .mdiv = REG_VAL(0x18, 8, 8), + }, + [BCM_NS2_GENPLL_SW_NIC_CLK] = { + .channel = BCM_NS2_GENPLL_SW_NIC_CLK, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 20, 14, 0), + .mdiv = REG_VAL(0x14, 0, 8), + }, + [BCM_NS2_GENPLL_SW_CHIMP_CLK] = { + .channel = BCM_NS2_GENPLL_SW_CHIMP_CLK, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 21, 15, 0), + .mdiv = REG_VAL(0x14, 8, 8), + }, + [BCM_NS2_GENPLL_SW_PORT_CLK] = { + .channel = BCM_NS2_GENPLL_SW_PORT_CLK, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 22, 16, 0), + .mdiv = REG_VAL(0x14, 16, 8), + }, + [BCM_NS2_GENPLL_SW_SDIO_CLK] = { + .channel = BCM_NS2_GENPLL_SW_SDIO_CLK, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 23, 17, 0), + .mdiv = REG_VAL(0x14, 24, 8), + }, +}; + +static void __init ns2_genpll_sw_clk_init(struct device_node *node) +{ + iproc_pll_clk_setup(node, &genpll_sw, NULL, 0, genpll_sw_clk, + ARRAY_SIZE(genpll_sw_clk)); +} +CLK_OF_DECLARE(ns2_genpll_sw_clk, "brcm,ns2-genpll-sw", + ns2_genpll_sw_clk_init); + +static const struct iproc_pll_ctrl lcpll_ddr = { + .flags = IPROC_CLK_AON | IPROC_CLK_PLL_SPLIT_STAT_CTRL, + .aon = AON_VAL(0x0, 2, 1, 0), + .reset = RESET_VAL(0x4, 2, 1), + .dig_filter = DF_VAL(0x0, 9, 3, 5, 4, 1, 4), + .ndiv_int = REG_VAL(0x8, 4, 10), + .pdiv = REG_VAL(0x8, 0, 4), + .vco_ctrl = VCO_CTRL_VAL(0x10, 0xc), + .status = REG_VAL(0x0, 0, 1), +}; + +static const struct iproc_clk_ctrl lcpll_ddr_clk[] = { + /* bypass_shift, the last value passed into ENABLE_VAL(), is not defined + * in NS2. However, it doesn't appear to be used anywhere, so setting + * it to 0. + */ + [BCM_NS2_LCPLL_DDR_PCIE_SATA_USB_CLK] = { + .channel = BCM_NS2_LCPLL_DDR_PCIE_SATA_USB_CLK, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 18, 12, 0), + .mdiv = REG_VAL(0x14, 0, 8), + }, + [BCM_NS2_LCPLL_DDR_DDR_CLK] = { + .channel = BCM_NS2_LCPLL_DDR_DDR_CLK, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 19, 13, 0), + .mdiv = REG_VAL(0x14, 8, 8), + }, + [BCM_NS2_LCPLL_DDR_CH2_UNUSED] = { + .channel = BCM_NS2_LCPLL_DDR_CH2_UNUSED, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 20, 14, 0), + .mdiv = REG_VAL(0x10, 0, 8), + }, + [BCM_NS2_LCPLL_DDR_CH3_UNUSED] = { + .channel = BCM_NS2_LCPLL_DDR_CH3_UNUSED, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 21, 15, 0), + .mdiv = REG_VAL(0x10, 8, 8), + }, + [BCM_NS2_LCPLL_DDR_CH4_UNUSED] = { + .channel = BCM_NS2_LCPLL_DDR_CH4_UNUSED, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 22, 16, 0), + .mdiv = REG_VAL(0x10, 16, 8), + }, + [BCM_NS2_LCPLL_DDR_CH5_UNUSED] = { + .channel = BCM_NS2_LCPLL_DDR_CH5_UNUSED, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 23, 17, 0), + .mdiv = REG_VAL(0x10, 24, 8), + }, +}; + +static void __init ns2_lcpll_ddr_clk_init(struct device_node *node) +{ + iproc_pll_clk_setup(node, &lcpll_ddr, NULL, 0, lcpll_ddr_clk, + ARRAY_SIZE(lcpll_ddr_clk)); +} +CLK_OF_DECLARE(ns2_lcpll_ddr_clk, "brcm,ns2-lcpll-ddr", + ns2_lcpll_ddr_clk_init); + +static const struct iproc_pll_ctrl lcpll_ports = { + .flags = IPROC_CLK_AON | IPROC_CLK_PLL_SPLIT_STAT_CTRL, + .aon = AON_VAL(0x0, 2, 5, 4), + .reset = RESET_VAL(0x4, 2, 1), + .dig_filter = DF_VAL(0x0, 9, 3, 5, 4, 1, 4), + .ndiv_int = REG_VAL(0x8, 4, 10), + .pdiv = REG_VAL(0x8, 0, 4), + .vco_ctrl = VCO_CTRL_VAL(0x10, 0xc), + .status = REG_VAL(0x0, 0, 1), +}; + +static const struct iproc_clk_ctrl lcpll_ports_clk[] = { + /* bypass_shift, the last value passed into ENABLE_VAL(), is not defined + * in NS2. However, it doesn't appear to be used anywhere, so setting + * it to 0. + */ + [BCM_NS2_LCPLL_PORTS_WAN_CLK] = { + .channel = BCM_NS2_LCPLL_PORTS_WAN_CLK, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 18, 12, 0), + .mdiv = REG_VAL(0x14, 0, 8), + }, + [BCM_NS2_LCPLL_PORTS_RGMII_CLK] = { + .channel = BCM_NS2_LCPLL_PORTS_RGMII_CLK, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 19, 13, 0), + .mdiv = REG_VAL(0x14, 8, 8), + }, + [BCM_NS2_LCPLL_PORTS_CH2_UNUSED] = { + .channel = BCM_NS2_LCPLL_PORTS_CH2_UNUSED, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 20, 14, 0), + .mdiv = REG_VAL(0x10, 0, 8), + }, + [BCM_NS2_LCPLL_PORTS_CH3_UNUSED] = { + .channel = BCM_NS2_LCPLL_PORTS_CH3_UNUSED, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 21, 15, 0), + .mdiv = REG_VAL(0x10, 8, 8), + }, + [BCM_NS2_LCPLL_PORTS_CH4_UNUSED] = { + .channel = BCM_NS2_LCPLL_PORTS_CH4_UNUSED, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 22, 16, 0), + .mdiv = REG_VAL(0x10, 16, 8), + }, + [BCM_NS2_LCPLL_PORTS_CH5_UNUSED] = { + .channel = BCM_NS2_LCPLL_PORTS_CH5_UNUSED, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x0, 23, 17, 0), + .mdiv = REG_VAL(0x10, 24, 8), + }, +}; + +static void __init ns2_lcpll_ports_clk_init(struct device_node *node) +{ + iproc_pll_clk_setup(node, &lcpll_ports, NULL, 0, lcpll_ports_clk, + ARRAY_SIZE(lcpll_ports_clk)); +} +CLK_OF_DECLARE(ns2_lcpll_ports_clk, "brcm,ns2-lcpll-ports", + ns2_lcpll_ports_clk_init); diff --git a/include/dt-bindings/clock/bcm-ns2.h b/include/dt-bindings/clock/bcm-ns2.h new file mode 100644 index 0000000..d99c7a2 --- /dev/null +++ b/include/dt-bindings/clock/bcm-ns2.h @@ -0,0 +1,72 @@ +/* + * BSD LICENSE + * + * Copyright(c) 2015 Broadcom Corporation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Broadcom Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _CLOCK_BCM_NS2_H +#define _CLOCK_BCM_NS2_H + +/* GENPLL SCR clock channel ID */ +#define BCM_NS2_GENPLL_SCR 0 +#define BCM_NS2_GENPLL_SCR_SCR_CLK 1 +#define BCM_NS2_GENPLL_SCR_FS_CLK 2 +#define BCM_NS2_GENPLL_SCR_AUDIO_CLK 3 +#define BCM_NS2_GENPLL_SCR_CH3_UNUSED 4 +#define BCM_NS2_GENPLL_SCR_CH4_UNUSED 5 +#define BCM_NS2_GENPLL_SCR_CH5_UNUSED 6 + +/* GENPLL SW clock channel ID */ +#define BCM_NS2_GENPLL_SW 0 +#define BCM_NS2_GENPLL_SW_RPE_CLK 1 +#define BCM_NS2_GENPLL_SW_250_CLK 2 +#define BCM_NS2_GENPLL_SW_NIC_CLK 3 +#define BCM_NS2_GENPLL_SW_CHIMP_CLK 4 +#define BCM_NS2_GENPLL_SW_PORT_CLK 5 +#define BCM_NS2_GENPLL_SW_SDIO_CLK 6 + +/* LCPLL DDR clock channel ID */ +#define BCM_NS2_LCPLL_DDR 0 +#define BCM_NS2_LCPLL_DDR_PCIE_SATA_USB_CLK 1 +#define BCM_NS2_LCPLL_DDR_DDR_CLK 2 +#define BCM_NS2_LCPLL_DDR_CH2_UNUSED 3 +#define BCM_NS2_LCPLL_DDR_CH3_UNUSED 4 +#define BCM_NS2_LCPLL_DDR_CH4_UNUSED 5 +#define BCM_NS2_LCPLL_DDR_CH5_UNUSED 6 + +/* LCPLL PORTS clock channel ID */ +#define BCM_NS2_LCPLL_PORTS 0 +#define BCM_NS2_LCPLL_PORTS_WAN_CLK 1 +#define BCM_NS2_LCPLL_PORTS_RGMII_CLK 2 +#define BCM_NS2_LCPLL_PORTS_CH2_UNUSED 3 +#define BCM_NS2_LCPLL_PORTS_CH3_UNUSED 4 +#define BCM_NS2_LCPLL_PORTS_CH4_UNUSED 5 +#define BCM_NS2_LCPLL_PORTS_CH5_UNUSED 6 + +#endif /* _CLOCK_BCM_NS2_H */
The Broadcom Northstar 2 SoC is architected under the iProc architecture. It has the following PLLs: GENPLL SCR, GENPLL SW, LCPLL DDR, LCPLL Ports, all derived from an onboard crystal. Signed-off-by: Jon Mason <jonmason@broadcom.com> --- drivers/clk/Makefile | 2 +- drivers/clk/bcm/Makefile | 1 + drivers/clk/bcm/clk-ns2.c | 288 ++++++++++++++++++++++++++++++++++++ include/dt-bindings/clock/bcm-ns2.h | 72 +++++++++ 4 files changed, 362 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/bcm/clk-ns2.c create mode 100644 include/dt-bindings/clock/bcm-ns2.h