[U-Boot] [PATCH v7 1/7] mips: add base support for QCA/Atheros ath79 SOCs

[Marek Vasut]

On Saturday, January 16, 2016 at 07:13:47 PM, Wills Wang wrote:

Commit message is missing.

> Signed-off-by: Wills Wang <wills.wang at live.com>
> ---
> 
> Changes in v7:
> - Use setbits_32
> - Fix include path for SoC specific headers
> 
> Changes in v6:
> - Move ar933x as separate patch
> - Add get_bootstrap in reset.c
> - Use map_physmem instead of KSEG1ADDR
> - Add arch_cpu_init for detect SOC type for early

[...]

> diff --git a/arch/mips/mach-ath79/Kconfig b/arch/mips/mach-ath79/Kconfig
> new file mode 100644
> index 0000000..df84876
> --- /dev/null
> +++ b/arch/mips/mach-ath79/Kconfig
> @@ -0,0 +1,10 @@
> +menu "QCA/Athroes 7xxx/9xxx platforms"
> +	depends on ARCH_ATH79
> +
> +config SYS_VENDOR
> +	default "ath79"

Vendor should be atheros I believe.

> +config SYS_SOC
> +	default "ath79"
> +
> +endmenu
> diff --git a/arch/mips/mach-ath79/Makefile b/arch/mips/mach-ath79/Makefile
> new file mode 100644
> index 0000000..6203cf0
> --- /dev/null
> +++ b/arch/mips/mach-ath79/Makefile
> @@ -0,0 +1,7 @@
> +#
> +# SPDX-License-Identifier:	GPL-2.0+
> +#
> +
> +obj-y += reset.o
> +obj-y += cpu.o
> +obj-y += dram.o
> diff --git a/arch/mips/mach-ath79/cpu.c b/arch/mips/mach-ath79/cpu.c
> new file mode 100644
> index 0000000..d8910a0
> --- /dev/null
> +++ b/arch/mips/mach-ath79/cpu.c
> @@ -0,0 +1,203 @@
> +/*
> + * Copyright (C) 2015-2016 Wills Wang <wills.wang at live.com>
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +#include <common.h>
> +#include <asm/io.h>
> +#include <asm/addrspace.h>
> +#include <asm/types.h>
> +#include <mach/ath79.h>
> +#include <mach/ar71xx_regs.h>
> +
> +struct ath79_soc_desc {
> +	enum ath79_soc_type soc;
> +	const char *chip;
> +};
> +
> +static struct ath79_soc_desc desc[] = {
> +	{ATH79_SOC_AR7130,      "7130"},
> +	{ATH79_SOC_AR7141,      "7141"},
> +	{ATH79_SOC_AR7161,      "7161"},

Just curious, were 7161 chips ever tested ?

> +	{ATH79_SOC_AR7240,      "7240"},
> +	{ATH79_SOC_AR7242,      "7242"},
> +	{ATH79_SOC_AR9130,      "9130"},
> +	{ATH79_SOC_AR9132,      "9132"},
> +	{ATH79_SOC_AR9330,      "9330"},
> +	{ATH79_SOC_AR9331,      "9331"},
> +	{ATH79_SOC_AR9341,      "9341"},
> +	{ATH79_SOC_AR9342,      "9342"},
> +	{ATH79_SOC_AR9344,      "9344"},
> +	{ATH79_SOC_QCA9533,     "9533"},
> +	{ATH79_SOC_QCA9556,     "9556"},
> +	{ATH79_SOC_QCA9558,     "9558"},
> +	{ATH79_SOC_TP9343,      "9343"},
> +	{ATH79_SOC_QCA9561,     "9561"},
> +};
> +
> +int arch_cpu_init(void)
> +{
> +	void __iomem *base;
> +	enum ath79_soc_type soc = ATH79_SOC_UNKNOWN;
> +	u32 id, major, minor;
> +	u32 rev = 0;
> +	u32 ver = 1;
> +
> +	base = map_physmem(AR71XX_RESET_BASE, AR71XX_RESET_SIZE,
> +			   MAP_NOCACHE);
> +
> +	id = readl(base + AR71XX_RESET_REG_REV_ID);
> +	major = id & REV_ID_MAJOR_MASK;
> +
> +	switch (major) {
> +	case REV_ID_MAJOR_AR71XX:
> +		minor = id & AR71XX_REV_ID_MINOR_MASK;
> +		rev = id >> AR71XX_REV_ID_REVISION_SHIFT;
> +		rev &= AR71XX_REV_ID_REVISION_MASK;
> +		switch (minor) {
> +		case AR71XX_REV_ID_MINOR_AR7130:
> +			soc = ATH79_SOC_AR7130;
> +			break;
> +
> +		case AR71XX_REV_ID_MINOR_AR7141:
> +			soc = ATH79_SOC_AR7141;
> +			break;
> +
> +		case AR71XX_REV_ID_MINOR_AR7161:
> +			soc = ATH79_SOC_AR7161;
> +			break;
> +		}
> +		break;

This could easily be a lookup-table instead of such big switch statement.

> +	case REV_ID_MAJOR_AR7240:
> +		soc = ATH79_SOC_AR7240;
> +		rev = id & AR71XX_REV_ID_REVISION_MASK;
> +		break;


[...]

> diff --git a/arch/mips/mach-ath79/include/mach/ar71xx_regs.h
> b/arch/mips/mach-ath79/include/mach/ar71xx_regs.h new file mode 100644
> index 0000000..5e80eaf
> --- /dev/null
> +++ b/arch/mips/mach-ath79/include/mach/ar71xx_regs.h
> @@ -0,0 +1,1187 @@
> +/*
> + * Atheros AR71XX/AR724X/AR913X SoC register definitions
> + *
> + * Copyright (C) 2015-2016 Wills Wang <wills.wang at live.com>
> + * Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan at atheros.com>
> + * Copyright (C) 2008-2010 Gabor Juhos <juhosg at openwrt.org>
> + * Copyright (C) 2008 Imre Kaloz <kaloz at openwrt.org>
> + *
> + * SPDX-License-Identifier:     GPL-2.0+
> + */
> +
> +#ifndef __ASM_MACH_AR71XX_REGS_H
> +#define __ASM_MACH_AR71XX_REGS_H
> +
> +#ifndef __ASSEMBLY__
> +#include <linux/bitops.h>
> +#else
> +#ifndef BIT
> +#define BIT(nr)                 (1 << (nr))

Linux defines the macro as (1ul << (nr))

> +#endif
> +#endif

[...]