Message ID | 1391743388-5539-2-git-send-email-drambo@broadcom.com |
---|---|
State | Superseded |
Delegated to: | Albert ARIBAUD |
Headers | show |
Hi Darwin, On Thu, 6 Feb 2014 19:23:03 -0800, Darwin Rambo <drambo@broadcom.com> wrote: > The Kona architecture is present on a number of Broadcom mobile SoCs > including the bcm281xx family of chips. > > Signed-off-by: Darwin Rambo <drambo@broadcom.com> > Reviewed-by: Steve Rae <srae@broadcom.com> > Reviewed-by: Tim Kryger <tkryger@linaro.org> > --- > arch/arm/cpu/armv7/Makefile | 1 + > arch/arm/cpu/armv7/kona-common/Makefile | 9 ++++++++ > arch/arm/cpu/armv7/kona-common/clk-stubs.c | 21 +++++++++++++++++ > arch/arm/cpu/armv7/kona-common/hwinit-common.c | 16 +++++++++++++ > arch/arm/cpu/armv7/kona-common/s_init.c | 12 ++++++++++ > arch/arm/include/asm/kona-common/clk.h | 29 ++++++++++++++++++++++++ > arch/arm/include/asm/kona-common/kona_sdhci.h | 12 ++++++++++ > 7 files changed, 100 insertions(+) > create mode 100644 arch/arm/cpu/armv7/kona-common/Makefile > create mode 100644 arch/arm/cpu/armv7/kona-common/clk-stubs.c > create mode 100644 arch/arm/cpu/armv7/kona-common/hwinit-common.c > create mode 100644 arch/arm/cpu/armv7/kona-common/s_init.c > create mode 100644 arch/arm/include/asm/kona-common/clk.h > create mode 100644 arch/arm/include/asm/kona-common/kona_sdhci.h > > diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile > index 0467d00..119ebb3 100644 > --- a/arch/arm/cpu/armv7/Makefile > +++ b/arch/arm/cpu/armv7/Makefile > @@ -23,6 +23,7 @@ obj-y += nonsec_virt.o > obj-y += virt-v7.o > endif > > +obj-$(CONFIG_KONA) += kona-common/ > obj-$(CONFIG_OMAP_COMMON) += omap-common/ > obj-$(CONFIG_TEGRA) += tegra-common/ > > diff --git a/arch/arm/cpu/armv7/kona-common/Makefile b/arch/arm/cpu/armv7/kona-common/Makefile > new file mode 100644 > index 0000000..8af6f2c > --- /dev/null > +++ b/arch/arm/cpu/armv7/kona-common/Makefile > @@ -0,0 +1,9 @@ > +# > +# Copyright 2013 Broadcom Corporation. All rights reserved. > +# > +# SPDX-License-Identifier: GPL-2.0+ Is the "All rights reserved" mention compatible with GPL-2.0+? Ditto for other occurrences. Amicalement,
On Mon, Feb 10, 2014 at 09:44:58AM +0100, Albert ARIBAUD wrote: > Hi Darwin, > > On Thu, 6 Feb 2014 19:23:03 -0800, Darwin Rambo <drambo@broadcom.com> > wrote: > > > The Kona architecture is present on a number of Broadcom mobile SoCs > > including the bcm281xx family of chips. > > > > Signed-off-by: Darwin Rambo <drambo@broadcom.com> > > Reviewed-by: Steve Rae <srae@broadcom.com> > > Reviewed-by: Tim Kryger <tkryger@linaro.org> > > --- > > arch/arm/cpu/armv7/Makefile | 1 + > > arch/arm/cpu/armv7/kona-common/Makefile | 9 ++++++++ > > arch/arm/cpu/armv7/kona-common/clk-stubs.c | 21 +++++++++++++++++ > > arch/arm/cpu/armv7/kona-common/hwinit-common.c | 16 +++++++++++++ > > arch/arm/cpu/armv7/kona-common/s_init.c | 12 ++++++++++ > > arch/arm/include/asm/kona-common/clk.h | 29 ++++++++++++++++++++++++ > > arch/arm/include/asm/kona-common/kona_sdhci.h | 12 ++++++++++ > > 7 files changed, 100 insertions(+) > > create mode 100644 arch/arm/cpu/armv7/kona-common/Makefile > > create mode 100644 arch/arm/cpu/armv7/kona-common/clk-stubs.c > > create mode 100644 arch/arm/cpu/armv7/kona-common/hwinit-common.c > > create mode 100644 arch/arm/cpu/armv7/kona-common/s_init.c > > create mode 100644 arch/arm/include/asm/kona-common/clk.h > > create mode 100644 arch/arm/include/asm/kona-common/kona_sdhci.h > > > > diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile > > index 0467d00..119ebb3 100644 > > --- a/arch/arm/cpu/armv7/Makefile > > +++ b/arch/arm/cpu/armv7/Makefile > > @@ -23,6 +23,7 @@ obj-y += nonsec_virt.o > > obj-y += virt-v7.o > > endif > > > > +obj-$(CONFIG_KONA) += kona-common/ > > obj-$(CONFIG_OMAP_COMMON) += omap-common/ > > obj-$(CONFIG_TEGRA) += tegra-common/ > > > > diff --git a/arch/arm/cpu/armv7/kona-common/Makefile b/arch/arm/cpu/armv7/kona-common/Makefile > > new file mode 100644 > > index 0000000..8af6f2c > > --- /dev/null > > +++ b/arch/arm/cpu/armv7/kona-common/Makefile > > @@ -0,0 +1,9 @@ > > +# > > +# Copyright 2013 Broadcom Corporation. All rights reserved. > > +# > > +# SPDX-License-Identifier: GPL-2.0+ > > Is the "All rights reserved" mention compatible with GPL-2.0+? Ditto > for other occurrences. Checking out some debian-legal archives, it's meaningless these days, so lets drop it from the next go-round. Any other comments about the series?
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 0467d00..119ebb3 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -23,6 +23,7 @@ obj-y += nonsec_virt.o obj-y += virt-v7.o endif +obj-$(CONFIG_KONA) += kona-common/ obj-$(CONFIG_OMAP_COMMON) += omap-common/ obj-$(CONFIG_TEGRA) += tegra-common/ diff --git a/arch/arm/cpu/armv7/kona-common/Makefile b/arch/arm/cpu/armv7/kona-common/Makefile new file mode 100644 index 0000000..8af6f2c --- /dev/null +++ b/arch/arm/cpu/armv7/kona-common/Makefile @@ -0,0 +1,9 @@ +# +# Copyright 2013 Broadcom Corporation. All rights reserved. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += s_init.o +obj-y += hwinit-common.o +obj-y += clk-stubs.o diff --git a/arch/arm/cpu/armv7/kona-common/clk-stubs.c b/arch/arm/cpu/armv7/kona-common/clk-stubs.c new file mode 100644 index 0000000..824d597 --- /dev/null +++ b/arch/arm/cpu/armv7/kona-common/clk-stubs.c @@ -0,0 +1,21 @@ +/* + * Copyright 2013 Broadcom Corporation. All rights reserved. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> + +/* + * These weak functions are available to kona architectures that don't + * require clock enables from the driver code. + */ +int __weak clk_sdio_enable(void *base, u32 rate, u32 *actual_ratep) +{ + return 0; +} + +int __weak clk_bsc_enable(void *base, u32 rate, u32 *actual_ratep) +{ + return 0; +} diff --git a/arch/arm/cpu/armv7/kona-common/hwinit-common.c b/arch/arm/cpu/armv7/kona-common/hwinit-common.c new file mode 100644 index 0000000..eb046a5 --- /dev/null +++ b/arch/arm/cpu/armv7/kona-common/hwinit-common.c @@ -0,0 +1,16 @@ +/* + * Copyright 2013 Broadcom Corporation. All rights reserved. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/sizes.h> + +#ifndef CONFIG_SYS_DCACHE_OFF +void enable_caches(void) +{ + /* Enable D-cache. I-cache is already enabled in start.S */ + dcache_enable(); +} +#endif diff --git a/arch/arm/cpu/armv7/kona-common/s_init.c b/arch/arm/cpu/armv7/kona-common/s_init.c new file mode 100644 index 0000000..000442c --- /dev/null +++ b/arch/arm/cpu/armv7/kona-common/s_init.c @@ -0,0 +1,12 @@ +/* + * Copyright 2014 Broadcom Corporation. All rights reserved. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/* + * Early system init. Currently empty. + */ +void s_init(void) +{ +} diff --git a/arch/arm/include/asm/kona-common/clk.h b/arch/arm/include/asm/kona-common/clk.h new file mode 100644 index 0000000..52031d3 --- /dev/null +++ b/arch/arm/include/asm/kona-common/clk.h @@ -0,0 +1,29 @@ +/* + * Copyright 2013 Broadcom Corporation. All rights reserved. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/* This API file is loosely based on u-boot/drivers/video/ipu.h and linux */ + +#ifndef __KONA_COMMON_CLK_H +#define __KONA_COMMON_CLK_H + +#include <linux/types.h> + +struct clk; + +/* Only implement required functions for your specific architecture */ +int clk_init(void); +struct clk *clk_get(const char *id); +int clk_enable(struct clk *clk); +void clk_disable(struct clk *clk); +unsigned long clk_get_rate(struct clk *clk); +long clk_round_rate(struct clk *clk, unsigned long rate); +int clk_set_rate(struct clk *clk, unsigned long rate); +int clk_set_parent(struct clk *clk, struct clk *parent); +struct clk *clk_get_parent(struct clk *clk); +int clk_sdio_enable(void *base, u32 rate, u32 *actual_ratep); +int clk_bsc_enable(void *base); + +#endif diff --git a/arch/arm/include/asm/kona-common/kona_sdhci.h b/arch/arm/include/asm/kona-common/kona_sdhci.h new file mode 100644 index 0000000..03f04dd --- /dev/null +++ b/arch/arm/include/asm/kona-common/kona_sdhci.h @@ -0,0 +1,12 @@ +/* + * Copyright 2013 Broadcom Corporation. All rights reserved. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __KONA_SDHCI_H +#define __KONA_SDHCI_H + +int kona_sdhci_init(int dev_index, u32 min_clk, u32 quirks); + +#endif