2014-09-29 13:30 GMT+04:00 Jonas Gorski <jogo@xxxxxxxxxxx>:
> On Sun, Sep 28, 2014 at 8:33 PM, Sergey Ryazanov <ryazanov.s.a@xxxxxxxxx> wrote:
>> Add common code for Atheros AR5312 and Atheros AR2315 SoCs families.
>>
>> Signed-off-by: Sergey Ryazanov <ryazanov.s.a@xxxxxxxxx>
>> ---
>> arch/mips/Kbuild.platforms | 1 +
>> arch/mips/Kconfig | 13 ++++
>> arch/mips/ar231x/Makefile | 11 ++++
>> arch/mips/ar231x/Platform | 6 ++
>> arch/mips/ar231x/board.c | 53 +++++++++++++++
>> arch/mips/ar231x/devices.c | 20 ++++++
>> arch/mips/ar231x/devices.h | 22 +++++++
>> arch/mips/ar231x/prom.c | 26 ++++++++
>> arch/mips/include/asm/mach-ar231x/ar231x.h | 29 +++++++++
>> .../asm/mach-ar231x/cpu-feature-overrides.h | 76 ++++++++++++++++++++++
>> arch/mips/include/asm/mach-ar231x/dma-coherence.h | 64 ++++++++++++++++++
>> arch/mips/include/asm/mach-ar231x/gpio.h | 16 +++++
>> arch/mips/include/asm/mach-ar231x/war.h | 25 +++++++
>> 13 files changed, 362 insertions(+)
>> create mode 100644 arch/mips/ar231x/Makefile
>> create mode 100644 arch/mips/ar231x/Platform
>> create mode 100644 arch/mips/ar231x/board.c
>> create mode 100644 arch/mips/ar231x/devices.c
>> create mode 100644 arch/mips/ar231x/devices.h
>> create mode 100644 arch/mips/ar231x/prom.c
>> create mode 100644 arch/mips/include/asm/mach-ar231x/ar231x.h
>> create mode 100644 arch/mips/include/asm/mach-ar231x/cpu-feature-overrides.h
>> create mode 100644 arch/mips/include/asm/mach-ar231x/dma-coherence.h
>> create mode 100644 arch/mips/include/asm/mach-ar231x/gpio.h
>> create mode 100644 arch/mips/include/asm/mach-ar231x/war.h
>>
>> diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
>> index f5e18bf..ee1940a 100644
>> --- a/arch/mips/Kbuild.platforms
>> +++ b/arch/mips/Kbuild.platforms
>> @@ -1,6 +1,7 @@
>> # All platforms listed in alphabetic order
>>
>> platforms += alchemy
>> +platforms += ar231x
>> platforms += ar7
>> platforms += ath79
>> platforms += bcm47xx
>> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
>> index 01c0389..6adae4c 100644
>> --- a/arch/mips/Kconfig
>> +++ b/arch/mips/Kconfig
>> @@ -73,6 +73,19 @@ config MIPS_ALCHEMY
>> select SYS_SUPPORTS_ZBOOT
>> select COMMON_CLK
>>
>> +config AR231X
>
> I would suggest naming it ATH25, to match the other atheros target (ATH79).
I have been thinking about such name. But decided to keep code closer
to owrt realization. May be maintainers could suggest smth. Ralf, what
do you think?
>
>> + bool "Atheros AR231x/AR531x SoC support"
>> + select CEVT_R4K
>> + select CSRC_R4K
>> + select DMA_NONCOHERENT
>> + select IRQ_CPU
>> + select SYS_HAS_CPU_MIPS32_R1
>> + select SYS_SUPPORTS_BIG_ENDIAN
>> + select SYS_SUPPORTS_32BIT_KERNEL
>> + select ARCH_REQUIRE_GPIOLIB
>> + help
>> + Support for Atheros AR231x and Atheros AR531x based boards
>> +
>> config AR7
>> bool "Texas Instruments AR7"
>> select BOOT_ELF32
>> diff --git a/arch/mips/ar231x/Makefile b/arch/mips/ar231x/Makefile
>> new file mode 100644
>> index 0000000..9199fa1
>> --- /dev/null
>> +++ b/arch/mips/ar231x/Makefile
>> @@ -0,0 +1,11 @@
>> +#
>> +# This file is subject to the terms and conditions of the GNU General Public
>> +# License. See the file "COPYING" in the main directory of this archive
>> +# for more details.
>> +#
>> +# Copyright (C) 2006 FON Technology, SL.
>> +# Copyright (C) 2006 Imre Kaloz <kaloz@xxxxxxxxxxx>
>> +# Copyright (C) 2006-2009 Felix Fietkau <nbd@xxxxxxxxxxx>
>> +#
>> +
>> +obj-y += board.o prom.o devices.o
>> diff --git a/arch/mips/ar231x/Platform b/arch/mips/ar231x/Platform
>> new file mode 100644
>> index 0000000..c924fd1
>> --- /dev/null
>> +++ b/arch/mips/ar231x/Platform
>> @@ -0,0 +1,6 @@
>> +#
>> +# Atheros AR531X/AR231X WiSoC
>> +#
>> +platform-$(CONFIG_AR231X) += ar231x/
>> +cflags-$(CONFIG_AR231X) += -I$(srctree)/arch/mips/include/asm/mach-ar231x
>> +load-$(CONFIG_AR231X) += 0xffffffff80041000
>> diff --git a/arch/mips/ar231x/board.c b/arch/mips/ar231x/board.c
>> new file mode 100644
>> index 0000000..9cde045
>> --- /dev/null
>> +++ b/arch/mips/ar231x/board.c
>> @@ -0,0 +1,53 @@
>> +/*
>> + * This file is subject to the terms and conditions of the GNU General Public
>> + * License. See the file "COPYING" in the main directory of this archive
>> + * for more details.
>> + *
>> + * Copyright (C) 2003 Atheros Communications, Inc., All Rights Reserved.
>> + * Copyright (C) 2006 FON Technology, SL.
>> + * Copyright (C) 2006 Imre Kaloz <kaloz@xxxxxxxxxxx>
>> + * Copyright (C) 2006-2009 Felix Fietkau <nbd@xxxxxxxxxxx>
>> + */
>> +
>> +#include <linux/init.h>
>> +#include <linux/interrupt.h>
>> +#include <asm/irq_cpu.h>
>> +#include <asm/reboot.h>
>> +#include <asm/bootinfo.h>
>> +#include <asm/time.h>
>> +
>> +static void ar231x_halt(void)
>> +{
>> + local_irq_disable();
>> + while (1)
>> + ;
>> +}
>> +
>> +void __init plat_mem_setup(void)
>> +{
>> + _machine_halt = ar231x_halt;
>> + pm_power_off = ar231x_halt;
>> +
>> + /* Disable data watchpoints */
>> + write_c0_watchlo0(0);
>> +}
>> +
>> +asmlinkage void plat_irq_dispatch(void)
>> +{
>> +}
>> +
>> +void __init plat_time_init(void)
>> +{
>> +}
>> +
>> +unsigned int __cpuinit get_c0_compare_int(void)
>> +{
>> + return CP0_LEGACY_COMPARE_IRQ;
>> +}
>> +
>> +void __init arch_init_irq(void)
>> +{
>> + clear_c0_status(ST0_IM);
>> + mips_cpu_irq_init();
>> +}
>> +
>> diff --git a/arch/mips/ar231x/devices.c b/arch/mips/ar231x/devices.c
>> new file mode 100644
>> index 0000000..f71a643
>> --- /dev/null
>> +++ b/arch/mips/ar231x/devices.c
>> @@ -0,0 +1,20 @@
>> +#include <linux/kernel.h>
>> +#include <linux/init.h>
>> +#include <asm/bootinfo.h>
>> +
>> +#include "devices.h"
>> +
>> +int ar231x_devtype = DEV_TYPE_UNKNOWN;
>> +
>> +static const char * const devtype_strings[] = {
>> + [DEV_TYPE_UNKNOWN] = "Atheros (unknown)",
>> +};
>> +
>> +const char *get_system_type(void)
>> +{
>> + if ((ar231x_devtype >= ARRAY_SIZE(devtype_strings)) ||
>> + !devtype_strings[ar231x_devtype])
>> + return devtype_strings[DEV_TYPE_UNKNOWN];
>> + return devtype_strings[ar231x_devtype];
>> +}
>> +
>> diff --git a/arch/mips/ar231x/devices.h b/arch/mips/ar231x/devices.h
>> new file mode 100644
>> index 0000000..1590577
>> --- /dev/null
>> +++ b/arch/mips/ar231x/devices.h
>> @@ -0,0 +1,22 @@
>> +#ifndef __AR231X_DEVICES_H
>> +#define __AR231X_DEVICES_H
>> +
>> +#include <linux/cpu.h>
>> +
>> +enum {
>> + DEV_TYPE_UNKNOWN
>> +};
>> +
>> +extern int ar231x_devtype;
>> +
>> +static inline bool is_2315(void)
>
> Since this is matching the whole family of ar231x SoCs, I would
> suggest to give it a prefix and call it ath25_is_231x.
Only AR2315 and later chips have the 4KEc core.
>> +{
>> + return (current_cpu_data.cputype == CPU_4KEC);
>
> Unnecessary ().
Thank you, I missed this braces during cleanup.
>
>> +}
>> +
>> +static inline bool is_5312(void)
>
> Same comment here for 5312 -> 531x.
>
This test is true for AR5312, AR2312 and AR2313 (see SoC type
detection patch), also we support only AR5312 SoC from whole AR531x
series.
>> +{
>> + return !is_2315();
>> +}
>> +
>> +#endif
>
>
> Regards
> Jonas
--
BR,
Sergey
