From: Felipe Balbi Date: Fri, 5 Dec 2014 21:09:52 -0600 Subject: [U-Boot] [PATCH v1] bcm281xx: add support for "USB OTG clock" In-Reply-To: <1417827736-21817-1-git-send-email-srae@broadcom.com> References: <1417827736-21817-1-git-send-email-srae@broadcom.com> Message-ID: <20141206030952.GB16151@saruman> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi, On Fri, Dec 05, 2014 at 05:02:16PM -0800, Steve Rae wrote: > enable this clock with the following: > clk_usb_otg_enable((void *)HSOTG_BASE_ADDR) > > Signed-off-by: Steve Rae > --- > > arch/arm/cpu/armv7/bcm281xx/Makefile | 3 ++- > arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c | 20 ++++++++++++++++-- > arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c | 32 +++++++++++++++++++++++++++++ > arch/arm/cpu/armv7/kona-common/clk-stubs.c | 9 ++++++-- > arch/arm/include/asm/arch-bcm281xx/sysmap.h | 6 ++++-- > arch/arm/include/asm/kona-common/clk.h | 5 +++-- > 6 files changed, 66 insertions(+), 9 deletions(-) > create mode 100644 arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c > > diff --git a/arch/arm/cpu/armv7/bcm281xx/Makefile b/arch/arm/cpu/armv7/bcm281xx/Makefile > index bd867a2..0d8b291 100644 > --- a/arch/arm/cpu/armv7/bcm281xx/Makefile > +++ b/arch/arm/cpu/armv7/bcm281xx/Makefile > @@ -1,5 +1,5 @@ > # > -# Copyright 2013 Broadcom Corporation. > +# Copyright 2014 Broadcom Corporation. unrelated change, also we usually append years but don't loose copyright on older ones. This would look like: Copyright 2013-2014 In any case, check with your lawyers what they really think is the correct way. > # > # SPDX-License-Identifier: GPL-2.0+ > # > @@ -10,3 +10,4 @@ obj-y += clk-bcm281xx.o > obj-y += clk-sdio.o > obj-y += clk-bsc.o > obj-$(CONFIG_BCM_SF2_ETH) += clk-eth.o > +obj-y += clk-usb-otg.o > diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c > index d16b99f..a1c2750 100644 > --- a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c > +++ b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c > @@ -1,7 +1,7 @@ > /* > - * Copyright 2013 Broadcom Corporation. > + * Copyright 2014 Broadcom Corporation. > * > - * SPDX-License-Identifier: GPL-2.0+ > + * SPDX-License-Identifier: GPL-2.0+ both are unrelated changes. > */ > > /* > @@ -209,6 +209,10 @@ static struct peri_clk_data sdio4_sleep_data = { > .gate = SW_ONLY_GATE(0x0360, 20, 4), > }; > > +static struct bus_clk_data usb_otg_ahb_data = { > + .gate = HW_SW_GATE_AUTO(0x0348, 16, 0, 1), > +}; > + > static struct bus_clk_data sdio1_ahb_data = { > .gate = HW_SW_GATE_AUTO(0x0358, 16, 0, 1), > }; > @@ -331,6 +335,17 @@ static struct ccu_clock esub_ccu_clk = { > */ > > /* KPM bus clocks */ > +static struct bus_clock usb_otg_ahb_clk = { > + .clk = { > + .name = "usb_otg_ahb_clk", > + .parent = &kpm_ccu_clk.clk, > + .ops = &bus_clk_ops, > + .ccu_clk_mgr_base = KONA_MST_CLK_BASE_ADDR, > + }, > + .freq_tbl = master_ahb_freq_tbl, > + .data = &usb_otg_ahb_data, > +}; > + > static struct bus_clock sdio1_ahb_clk = { > .clk = { > .name = "sdio1_ahb_clk", > @@ -541,6 +556,7 @@ struct clk_lookup arch_clk_tbl[] = { > CLK_LK(bsc2), > CLK_LK(bsc3), > /* Bus clocks */ > + CLK_LK(usb_otg_ahb), > CLK_LK(sdio1_ahb), > CLK_LK(sdio2_ahb), > CLK_LK(sdio3_ahb), > diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c > new file mode 100644 > index 0000000..b7efd8e > --- /dev/null > +++ b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c > @@ -0,0 +1,32 @@ > +/* > + * Copyright 2014 Broadcom Corporation. > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +#include > +#include > +#include > +#include "clk-core.h" > + > +/* Enable appropriate clocks for the USB OTG port */ > +int clk_usb_otg_enable(void *base) > +{ > + int ret; > + char *ahbstr; > + > + switch ((u32) base) { > + case HSOTG_BASE_ADDR: > + ahbstr = "usb_otg_ahb_clk"; > + break; > + default: > + printf("%s: base 0x%p not found\n", __func__, base); > + return -EINVAL; > + } > + > + ret = clk_get_and_enable(ahbstr); > + if (ret) > + return ret; > + > + return 0; > +} > diff --git a/arch/arm/cpu/armv7/kona-common/clk-stubs.c b/arch/arm/cpu/armv7/kona-common/clk-stubs.c > index 338e0e4..1859cf9 100644 > --- a/arch/arm/cpu/armv7/kona-common/clk-stubs.c > +++ b/arch/arm/cpu/armv7/kona-common/clk-stubs.c > @@ -1,7 +1,7 @@ > /* > - * Copyright 2013 Broadcom Corporation. > + * Copyright 2014 Broadcom Corporation. > * > - * SPDX-License-Identifier: GPL-2.0+ > + * SPDX-License-Identifier: GPL-2.0+ > */ unrelated changes. > @@ -19,3 +19,8 @@ int __weak clk_bsc_enable(void *base, u32 rate, u32 *actual_ratep) > { > return 0; > } > + > +int __weak clk_usb_otg_enable(void *base) > +{ > + return 0; > +} > diff --git a/arch/arm/include/asm/arch-bcm281xx/sysmap.h b/arch/arm/include/asm/arch-bcm281xx/sysmap.h > index 350e7f6..b9e46a9 100644 > --- a/arch/arm/include/asm/arch-bcm281xx/sysmap.h > +++ b/arch/arm/include/asm/arch-bcm281xx/sysmap.h > @@ -1,7 +1,7 @@ > /* > - * Copyright 2013 Broadcom Corporation. > + * Copyright 2014 Broadcom Corporation. > * > - * SPDX-License-Identifier: GPL-2.0+ > + * SPDX-License-Identifier: GPL-2.0+ > */ unrelated changes. > diff --git a/arch/arm/include/asm/kona-common/clk.h b/arch/arm/include/asm/kona-common/clk.h > index 2c7e829..d0732eb 100644 > --- a/arch/arm/include/asm/kona-common/clk.h > +++ b/arch/arm/include/asm/kona-common/clk.h > @@ -1,7 +1,7 @@ > /* > - * Copyright 2013 Broadcom Corporation. > + * Copyright 2014 Broadcom Corporation. > * > - * SPDX-License-Identifier: GPL-2.0+ > + * SPDX-License-Identifier: GPL-2.0+ > */ unrelated changes -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: