December 2015 - U-Boot

[U-Boot] [PATCH v4 1/8] include: Add support for "do_div" macro
by Wills Wang 26 Dec '15

26 Dec '15

Use the div64 header files from the kernel. Signed-off-by: Wills Wang <wills.wang(a)live.com> --- Changes in v4: None Changes in v3: None Changes in v2: None arch/mips/include/asm/div64.h | 68 +++++++++++++++++++++++++++++++++++++++++++ include/asm-generic/div64.h | 59 +++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+) create mode 100644 arch/mips/include/asm/div64.h create mode 100644 include/asm-generic/div64.h diff --git a/arch/mips/include/asm/div64.h b/arch/mips/include/asm/div64.h new file mode 100644 index 0000000..e5e6782 --- /dev/null +++ b/arch/mips/include/asm/div64.h @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2000, 2004 Maciej W. Rozycki + * Copyright (C) 2003, 07 Ralf Baechle (ralf(a)linux-mips.org) + * + * 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. + */ +#ifndef __ASM_DIV64_H +#define __ASM_DIV64_H + +#include <asm-generic/div64.h> + +#if BITS_PER_LONG == 64 + +#include <linux/types.h> + +/* + * No traps on overflows for any of these... + */ + +#define __div64_32(n, base) \ +({ \ + unsigned long __cf, __tmp, __tmp2, __i; \ + unsigned long __quot32, __mod32; \ + unsigned long __high, __low; \ + unsigned long long __n; \ + \ + __high = *__n >> 32; \ + __low = __n; \ + __asm__( \ + " .set push\n" \ + " .set noat\n" \ + " .set noreorder\n" \ + " move %2, $0\n" \ + " move %3, $0\n" \ + " b 1f\n" \ + " li %4, 0x21\n" \ + "0:\n" \ + " sll $1, %0, 0x1\n" \ + " srl %3, %0, 0x1f\n" \ + " or %0, $1, %5\n" \ + " sll %1, %1, 0x1\n" \ + " sll %2, %2, 0x1\n" \ + "1:\n" \ + " bnez %3, 2f\n" \ + " sltu %5, %0, %z6\n" \ + " bnez %5, 3f\n" \ + "2:\n" \ + " addiu %4, %4, -1\n" \ + " subu %0, %0, %z6\n" \ + " addiu %2, %2, 1\n" \ + "3:\n" \ + " bnez %4, 0b\n\t" \ + " srl %5, %1, 0x1f\n\t" \ + " .set pop" \ + : "=&r" (__mod32), "=&r" (__tmp), \ + "=&r" (__quot32), "=&r" (__cf), \ + "=&r" (__i), "=&r" (__tmp2) \ + : "Jr" (base), "0" (__high), "1" (__low)); \ + \ + (__n) = __quot32; \ + __mod32; \ +}) + +#endif /* BITS_PER_LONG == 64 */ + +#endif /* __ASM_DIV64_H */ diff --git a/include/asm-generic/div64.h b/include/asm-generic/div64.h new file mode 100644 index 0000000..d689fc4 --- /dev/null +++ b/include/asm-generic/div64.h @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2003 Bernardo Innocenti <bernie(a)develer.com> + * Based on former asm-ppc/div64.h and asm-m68knommu/div64.h + * + * The semantics of do_div() are: + * + * uint32_t do_div(uint64_t *n, uint32_t base) + * { + * uint32_t remainder = *n % base; + * *n = *n / base; + * return remainder; + * } + * + * NOTE: macro parameter n is evaluated multiple times, + * beware of side effects! + */ + +#ifndef _ASM_GENERIC_DIV64_H +#define _ASM_GENERIC_DIV64_H + +#include <linux/types.h> +#include <linux/compiler.h> + +#if BITS_PER_LONG == 64 + +# define do_div(n, base) ({ \ + uint32_t __base = (base); \ + uint32_t __rem; \ + __rem = ((uint64_t)(n)) % __base; \ + (n) = ((uint64_t)(n)) / __base; \ + __rem; \ +}) + +#elif BITS_PER_LONG == 32 + +extern uint32_t __div64_32(uint64_t *dividend, uint32_t divisor); + +/* The unnecessary pointer compare is there + * to check for type safety (n must be 64bit) + */ +# define do_div(n, base) ({ \ + uint32_t __base = (base); \ + uint32_t __rem; \ + (void)(((typeof((n)) *)0) == ((uint64_t *)0)); \ + if (likely(((n) >> 32) == 0)) { \ + __rem = (uint32_t)(n) % __base; \ + (n) = (uint32_t)(n) / __base; \ + } else \ + __rem = __div64_32(&(n), __base); \ + __rem; \ +}) + +#else /* BITS_PER_LONG == ?? */ + +# error do_div() does not yet support the C64 + +#endif /* BITS_PER_LONG */ + +#endif /* _ASM_GENERIC_DIV64_H */ -- 1.9.1

3 4

[U-Boot] [PATCH v4 0/8] add support for atheros ath79 based SOCs
by Wills Wang 26 Dec '15

26 Dec '15

These series of patch add support for atheros ath79 based SOCs in u-boot, at the present moment it's just available for ar933x chip. Changes in v4: - Add div64 macro for MIPS - Convert physical address to uncached and cached(KSEG0/1) memory range in map_physmem - Auto calculate baudrate for serial driver - Move pinctrl code in serial driver into arch/mips/mach-ath79 - Use global_data to save CPU/DDR/AHB clock - Use get_serial_clock to serial clock source - Use get_bus_freq instead of hardcode in SPI driver - Use arch_global_data to save SOC's type, revison and id - move CPU optimize tuning flag from config.mk to Kconfig Changes in v3: - Convert serial driver to driver model - Convert spi driver to driver model - Add support for device tree - Move SoC specific header files into arch/mips/mach-ath79/include/mach - Optimize assembly code - Same code style convertion Changes in v2: - Move all SoC specific header files into arch/mips/include/asm/arch-ath79 - Check SOC type and extract common code into arch/mips/mach-ath79 - Add a compatible spi driver - Move serial driver code into drivers/serial - Add a reference board implemention Wills Wang (8): include: Add support for "do_div" macro mips: implement to access the KSEG0/1 memory range in map_physmem mips: add base support for atheros ath79 based SOCs mips: ath79: add serial driver for ar933x SOC mips: ath79: add spi driver mips: ath79: add AP121 reference board mips: support optimize tuning for same common processor cores mips: move optimize tuning option from deprecated config.mk to Kconfig arch/mips/Kconfig | 17 + arch/mips/Makefile | 8 + arch/mips/dts/Makefile | 2 +- arch/mips/dts/ap121.dts | 37 + arch/mips/dts/ar933x.dtsi | 64 ++ arch/mips/include/asm/div64.h | 68 ++ arch/mips/include/asm/global_data.h | 5 + arch/mips/include/asm/io.h | 7 +- arch/mips/mach-ath79/Makefile | 9 + arch/mips/mach-ath79/ar933x/Makefile | 8 + arch/mips/mach-ath79/ar933x/clk.c | 86 ++ arch/mips/mach-ath79/ar933x/cpu.c | 32 + arch/mips/mach-ath79/ar933x/ddr_tap.S | 268 +++++ arch/mips/mach-ath79/ar933x/lowlevel_init.S | 460 ++++++++ arch/mips/mach-ath79/cpu.c | 171 +++ arch/mips/mach-ath79/dram.c | 27 + arch/mips/mach-ath79/include/mach/ar71xx_regs.h | 1144 ++++++++++++++++++++ arch/mips/mach-ath79/include/mach/ath79.h | 143 +++ arch/mips/mach-ath79/include/mach/ddr.h | 13 + arch/mips/mach-ath79/reset.c | 46 + board/ath79/ap121/Kconfig | 15 + board/ath79/ap121/MAINTAINERS | 6 + .../config.mk => board/ath79/ap121/Makefile | 4 +- board/ath79/ap121/README | 18 + board/ath79/ap121/ap121.c | 17 + board/ath79/ap121/config.mk | 16 + configs/ap121_defconfig | 42 + drivers/serial/Makefile | 1 + drivers/serial/serial_ar933x.c | 225 ++++ drivers/spi/Kconfig | 8 + drivers/spi/Makefile | 1 + drivers/spi/ath79_spi.c | 211 ++++ include/asm-generic/div64.h | 59 + include/configs/ap121.h | 82 ++ 34 files changed, 3315 insertions(+), 5 deletions(-) create mode 100644 arch/mips/dts/ap121.dts create mode 100644 arch/mips/dts/ar933x.dtsi create mode 100644 arch/mips/include/asm/div64.h create mode 100644 arch/mips/mach-ath79/Makefile create mode 100644 arch/mips/mach-ath79/ar933x/Makefile create mode 100644 arch/mips/mach-ath79/ar933x/clk.c create mode 100644 arch/mips/mach-ath79/ar933x/cpu.c create mode 100644 arch/mips/mach-ath79/ar933x/ddr_tap.S create mode 100644 arch/mips/mach-ath79/ar933x/lowlevel_init.S create mode 100644 arch/mips/mach-ath79/cpu.c create mode 100644 arch/mips/mach-ath79/dram.c create mode 100644 arch/mips/mach-ath79/include/mach/ar71xx_regs.h create mode 100644 arch/mips/mach-ath79/include/mach/ath79.h create mode 100644 arch/mips/mach-ath79/include/mach/ddr.h create mode 100644 arch/mips/mach-ath79/reset.c create mode 100644 board/ath79/ap121/Kconfig create mode 100644 board/ath79/ap121/MAINTAINERS rename arch/mips/mach-au1x00/config.mk => board/ath79/ap121/Makefile (65%) create mode 100644 board/ath79/ap121/README create mode 100644 board/ath79/ap121/ap121.c create mode 100644 board/ath79/ap121/config.mk create mode 100644 configs/ap121_defconfig create mode 100644 drivers/serial/serial_ar933x.c create mode 100644 drivers/spi/ath79_spi.c create mode 100644 include/asm-generic/div64.h create mode 100644 include/configs/ap121.h -- 1.9.1

2 1

[U-Boot] [PATCH v4 2/8] mips: implement to access the KSEG0/1 memory range in map_physmem
by Wills Wang 26 Dec '15

26 Dec '15

U-boot just use the no MMU virtual address segment(KSEG0/1), this patch enable access the uncached memory range(KSEG1) by flag "MAP_NOCACHE", other flag for KSEG0 access. Signed-off-by: Wills Wang <wills.wang(a)live.com> --- Changes in v4: None Changes in v3: None Changes in v2: None arch/mips/include/asm/io.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index a7ab087..943053d 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -485,7 +485,7 @@ static inline void sync(void) * that can be used to access the memory range with the caching * properties specified by "flags". */ -#define MAP_NOCACHE (0) +#define MAP_NOCACHE (1) #define MAP_WRCOMBINE (0) #define MAP_WRBACK (0) #define MAP_WRTHROUGH (0) @@ -493,7 +493,10 @@ static inline void sync(void) static inline void * map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags) { - return (void *)paddr; + if (flags) + return (void *)KSEG1ADDR(paddr); + else + return (void *)KSEG0ADDR(paddr); } /* -- 1.9.1

2 1

[U-Boot] [PATCH v3 00/10] Add support for Synology DS414 and some related fixes
by Phil Sutter 25 Dec '15

25 Dec '15

This is version 3 of my patch series to support Synology DS414 NAS after rebasing it onto mvebu-dm-spl-2015-12-14 branch of u-boot-a38x.git plus the following four patches: * arm: mvebu: Print CPU and SDRAM frequency upon startup * arm: mvebu: Consolidate board Kconfig options into one file * arm: mvebu: Move SoC selection (A38X vs AXP) into Kconfig * arm: mvebu: Remove leftover Makefile The changes since v2 in detail: * Dropped "mvebu: Fix for non-DM ehci-marvell support". * Changed implementation of "drivers/pci/pci_mvebu: Fix for boards with X4 lanes" to comply with feedback. * New patch "mvebu: axp: refactor board_sat_r_get() and caller", simplifying how serdes_phy_config() gathers board specific satr11 value and allowing for boards to override the getter function. * New patch "mvebu: Introduce kconfig symbols for SoC variants", to improve how the SoC variant is selected by boards. * New patch "mvebu: axp: Rename MV_DDR_32BIT to CONFIG_DDR_32BIT", as agreed upon during v2 review. * Description added to patch "mvebu: Add rudimental MV78230 support". * Adjusted patch "mvebu: Support Synology DS414" according to upstream changes and feedback: * Board kconfig integrated into Vendor kconfig file. * Build DT blob along with others for CONFIG_ARCH_MVEBU. * Make TARGET_DS414 select MV78230. * Dropped no longer needed changes to high_speed_env_lib.c. * Added missing license/copyright file headers. * Removed commented code. * Add board-specific board_sat_r_get() function. * Statically enable CONFIG_DM_USB. * Dropped unused CONFIG_SYS_MVEBU_DDR_AXP and CONFIG_SYNOLOGY_DS414 defines. * Moved syno command set into board/Synology directory. Phil Sutter (10): drivers/pci: Fix for debug builds without CONFIG_PCI_ENUM_ONLY README: Review the u-boot porting guide list axp: Fix debugging support in DDR3 write leveling drivers/pci/pci_mvebu: Fix for boards with X4 lanes mvebu: axp: refactor board_sat_r_get() and caller mvebu: Introduce kconfig symbols for SoC variants mvebu: axp: Rename MV_DDR_32BIT to CONFIG_DDR_32BIT mvebu: Add rudimental MV78230 support mvebu: Support Synology DS414 common: Implement Synology specific command set README | 11 +- arch/arm/dts/Makefile | 3 +- arch/arm/dts/armada-xp-synology-ds414.dts | 337 +++++++++++++++++++++ arch/arm/mach-mvebu/Kconfig | 31 +- arch/arm/mach-mvebu/cpu.c | 16 +- arch/arm/mach-mvebu/include/mach/soc.h | 3 + arch/arm/mach-mvebu/serdes/axp/board_env_spec.h | 2 +- .../arm/mach-mvebu/serdes/axp/high_speed_env_lib.c | 52 ++-- board/Synology/common/Makefile | 7 + board/Synology/common/cmd_syno.c | 227 ++++++++++++++ board/Synology/ds414/Makefile | 7 + board/Synology/ds414/ds414.c | 185 +++++++++++ board/Synology/ds414/kwbimage.cfg | 12 + configs/ds414_defconfig | 18 ++ drivers/ddr/marvell/axp/ddr3_axp_config.h | 2 +- drivers/ddr/marvell/axp/ddr3_axp_mc_static.h | 20 +- drivers/ddr/marvell/axp/ddr3_write_leveling.c | 4 +- drivers/pci/pci_auto_old.c | 2 +- drivers/pci/pci_mvebu.c | 14 + include/configs/clearfog.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/ds414.h | 162 ++++++++++ 22 files changed, 1051 insertions(+), 66 deletions(-) create mode 100644 arch/arm/dts/armada-xp-synology-ds414.dts create mode 100644 board/Synology/common/Makefile create mode 100644 board/Synology/common/cmd_syno.c create mode 100644 board/Synology/ds414/Makefile create mode 100644 board/Synology/ds414/ds414.c create mode 100644 board/Synology/ds414/kwbimage.cfg create mode 100644 configs/ds414_defconfig create mode 100644 include/configs/ds414.h -- 2.5.3

1 0

[U-Boot] [PATCH v3 0/4] add support for atheros ath79 based SOCs
by Wills Wang 24 Dec '15

24 Dec '15

These series of patch add support for atheros ath79 based SOCs in u-boot, at the present moment it's just available for ar933x chip. Changes in v3: - Convert serial driver to driver model - Convert spi driver to driver model - Add support for device tree - Move SoC specific header files into arch/mips/mach-ath79/include/mach - Optimize assembly code - Same code style convertion Changes in v2: - Move all SoC specific header files into arch/mips/include/asm/arch-ath79 - Check SOC type and extract common code into arch/mips/mach-ath79 - Add a compatible spi driver - Move serial driver code into drivers/serial - Add a reference board implemention Wills Wang (4): mips: add base support for atheros ath79 based SOCs mips: ath79: add serial driver for ar933x SOC mips: ath79: add spi driver mips: ath79: add AP121 reference board arch/mips/Kconfig | 8 + arch/mips/Makefile | 1 + arch/mips/config.mk | 1 + arch/mips/dts/Makefile | 2 +- arch/mips/dts/ap121.dts | 37 + arch/mips/dts/ar933x.dtsi | 64 ++ arch/mips/mach-ath79/Makefile | 9 + arch/mips/mach-ath79/ar933x/Makefile | 6 + arch/mips/mach-ath79/ar933x/ddr_tap.S | 268 ++++++ arch/mips/mach-ath79/ar933x/lowlevel_init.S | 460 +++++++++ arch/mips/mach-ath79/cpu.c | 269 ++++++ arch/mips/mach-ath79/dram.c | 27 + arch/mips/mach-ath79/include/mach/ar71xx_regs.h | 1144 +++++++++++++++++++++++ arch/mips/mach-ath79/include/mach/ar933x_uart.h | 66 ++ arch/mips/mach-ath79/include/mach/ath79.h | 143 +++ arch/mips/mach-ath79/include/mach/ddr.h | 13 + arch/mips/mach-ath79/reset.c | 55 ++ board/ath79/ap121/Kconfig | 15 + board/ath79/ap121/MAINTAINERS | 6 + board/ath79/ap121/Makefile | 8 + board/ath79/ap121/README | 18 + board/ath79/ap121/ap121.c | 18 + board/ath79/ap121/config.mk | 16 + configs/ap121_defconfig | 42 + drivers/serial/Makefile | 1 + drivers/serial/serial_ar933x.c | 274 ++++++ drivers/spi/Kconfig | 6 + drivers/spi/Makefile | 1 + drivers/spi/ath79_spi.c | 211 +++++ include/configs/ap121.h | 79 ++ 30 files changed, 3267 insertions(+), 1 deletion(-) create mode 100644 arch/mips/dts/ap121.dts create mode 100644 arch/mips/dts/ar933x.dtsi create mode 100644 arch/mips/mach-ath79/Makefile create mode 100644 arch/mips/mach-ath79/ar933x/Makefile create mode 100644 arch/mips/mach-ath79/ar933x/ddr_tap.S create mode 100644 arch/mips/mach-ath79/ar933x/lowlevel_init.S create mode 100644 arch/mips/mach-ath79/cpu.c create mode 100644 arch/mips/mach-ath79/dram.c create mode 100644 arch/mips/mach-ath79/include/mach/ar71xx_regs.h create mode 100644 arch/mips/mach-ath79/include/mach/ar933x_uart.h create mode 100644 arch/mips/mach-ath79/include/mach/ath79.h create mode 100644 arch/mips/mach-ath79/include/mach/ddr.h create mode 100644 arch/mips/mach-ath79/reset.c create mode 100644 board/ath79/ap121/Kconfig create mode 100644 board/ath79/ap121/MAINTAINERS create mode 100644 board/ath79/ap121/Makefile create mode 100644 board/ath79/ap121/README create mode 100644 board/ath79/ap121/ap121.c create mode 100644 board/ath79/ap121/config.mk create mode 100644 configs/ap121_defconfig create mode 100644 drivers/serial/serial_ar933x.c create mode 100644 drivers/spi/ath79_spi.c create mode 100644 include/configs/ap121.h -- 1.9.1

2 1

[U-Boot] [PATCH v3 3/4] mips: ath79: add spi driver
by Wills Wang 24 Dec '15

24 Dec '15

Signed-off-by: Wills Wang <wills.wang(a)live.com> --- Changes in v3: None Changes in v2: None drivers/spi/Kconfig | 6 ++ drivers/spi/Makefile | 1 + drivers/spi/ath79_spi.c | 211 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 218 insertions(+) create mode 100644 drivers/spi/ath79_spi.c diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 2cdb110..04a24ab 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -23,6 +23,12 @@ config ALTERA_SPI IP core. Please find details on the "Embedded Peripherals IP User Guide" of Altera. +config ATH79_SPI + bool "Atheros SPI driver" + help + Enable the Atheros SPI driver, used to access SPI NOR flash and + other SPI peripherals on Atheros ar7xxx/ar9xxx SoCs. + config CADENCE_QSPI bool "Cadence QSPI driver" help diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 3eca745..7fb2926 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -17,6 +17,7 @@ endif obj-$(CONFIG_ALTERA_SPI) += altera_spi.o obj-$(CONFIG_ARMADA100_SPI) += armada100_spi.o +obj-$(CONFIG_ATH79_SPI) += ath79_spi.o obj-$(CONFIG_ATMEL_DATAFLASH_SPI) += atmel_dataflash_spi.o obj-$(CONFIG_ATMEL_SPI) += atmel_spi.o obj-$(CONFIG_BFIN_SPI) += bfin_spi.o diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c new file mode 100644 index 0000000..ddfc807 --- /dev/null +++ b/drivers/spi/ath79_spi.c @@ -0,0 +1,211 @@ +/* + * (C) Copyright 2015 + * Wills Wang, <wills.wang(a)live.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <spi.h> +#include <dm.h> +#include <errno.h> +#include <asm/io.h> +#include <asm/addrspace.h> +#include <asm/types.h> +#include <asm/arch/ar71xx_regs.h> + +/* CLOCK_DIVIDER = 3 (SPI clock = 200 / 8 ~ 25 MHz) */ +#define SPI_CLK_DIV(x) ((x >> 1) - 1) + +struct ath79_spi_platdata { + void __iomem *regs; +}; + +struct ath79_spi_priv { + void __iomem *regs; +}; + +static inline u32 ath79_spi_read(struct udevice *bus, u32 offset) +{ + struct ath79_spi_priv *priv = dev_get_priv(bus); + const void __iomem *base = (void __iomem *)KSEG1ADDR(priv->regs); + return readl(base + offset); +} + +static inline void ath79_spi_write(struct udevice *bus, u32 val, + u32 offset) +{ + struct ath79_spi_priv *priv = dev_get_priv(bus); + const void __iomem *base = (void __iomem *)KSEG1ADDR(priv->regs); + writel(val, base + offset); +} + +static int ath79_spi_claim_bus(struct udevice *dev) +{ + return 0; +} + +static int ath79_spi_release_bus(struct udevice *dev) +{ + return 0; +} + +static int ath79_spi_xfer(struct udevice *dev, unsigned int bitlen, + const void *dout, void *din, unsigned long flags) +{ + struct udevice *bus = dev->parent; + struct dm_spi_slave_platdata *slave = dev_get_parent_platdata(dev); + uint8_t *rx = din; + const uint8_t *tx = dout; + uint8_t curbyte, curbitlen, restbits; + uint32_t bytes = bitlen / 8; + uint32_t out; + uint32_t in; + + if (flags & SPI_XFER_BEGIN) { + ath79_spi_write(bus, AR71XX_SPI_FS_GPIO, AR71XX_SPI_REG_FS); + ath79_spi_write(bus, AR71XX_SPI_IOC_CS_ALL, AR71XX_SPI_REG_IOC); + } + + restbits = (bitlen % 8); + if (restbits) + bytes++; + + /* enable chip select */ + out = AR71XX_SPI_IOC_CS_ALL & ~(AR71XX_SPI_IOC_CS(slave->cs)); + while (bytes--) { + curbyte = 0; + if (tx) + curbyte = *tx++; + + if (restbits) { + curbitlen = restbits; + curbyte <<= 8 - restbits; + } else { + curbitlen = 8; + } + + /* clock starts at inactive polarity */ + for (curbyte <<= (8 - curbitlen); curbitlen; curbitlen--) { + if (curbyte & 0x80) + out |= AR71XX_SPI_IOC_DO; + else + out &= ~(AR71XX_SPI_IOC_DO); + + /* setup MSB (to slave) on trailing edge */ + ath79_spi_write(bus, out, AR71XX_SPI_REG_IOC); + ath79_spi_write(bus, out | AR71XX_SPI_IOC_CLK, + AR71XX_SPI_REG_IOC); + curbyte <<= 1; + } + + in = ath79_spi_read(bus, AR71XX_SPI_REG_RDS); + if (rx) { + if (restbits) + *rx++ = (in << (8 - restbits)); + else + *rx++ = in; + } + } + + if (flags & SPI_XFER_END) { + ath79_spi_write(bus, AR71XX_SPI_IOC_CS(slave->cs), + AR71XX_SPI_REG_IOC); + ath79_spi_write(bus, AR71XX_SPI_IOC_CS_ALL, AR71XX_SPI_REG_IOC); + ath79_spi_write(bus, 0, AR71XX_SPI_REG_FS); + } + + return 0; +} + + +static int ath79_spi_set_speed(struct udevice *bus, uint speed) +{ + u32 val, div = 0; + + if (speed) + div = 200000000 / speed; + + if (div > 63) + div = 63; + + if (div < 5) + div = 5; + + ath79_spi_write(bus, AR71XX_SPI_FS_GPIO, AR71XX_SPI_REG_FS); + val = ath79_spi_read(bus, AR71XX_SPI_REG_CTRL); + val &= ~AR71XX_SPI_CTRL_DIV_MASK; + val |= SPI_CLK_DIV(div); + ath79_spi_write(bus, val, AR71XX_SPI_REG_CTRL); + ath79_spi_write(bus, 0, AR71XX_SPI_REG_FS); + return 0; +} + +static int ath79_spi_set_mode(struct udevice *bus, uint mode) +{ + return 0; +} + +static int ath79_spi_probe(struct udevice *bus) +{ + struct ath79_spi_priv *priv = dev_get_priv(bus); + struct ath79_spi_platdata *plat = dev_get_platdata(bus); + + priv->regs = plat->regs; + + /* Init SPI Hardware, disable remap, set clock */ + ath79_spi_write(bus, AR71XX_SPI_FS_GPIO, AR71XX_SPI_REG_FS); + ath79_spi_write(bus, AR71XX_SPI_CTRL_RD | SPI_CLK_DIV(8), + AR71XX_SPI_REG_CTRL); + ath79_spi_write(bus, 0, AR71XX_SPI_REG_FS); + + return 0; +} + +static int ath79_cs_info(struct udevice *bus, uint cs, + struct spi_cs_info *info) +{ + /* Always allow activity on CS 0/1/2 */ + if (cs >= 3) + return -ENODEV; + + return 0; +} + +static int ath79_spi_ofdata_to_platdata(struct udevice *bus) +{ + struct ath79_spi_platdata *plat = dev_get_platdata(bus); + fdt_addr_t addr; + + addr = dev_get_addr(bus); + if (addr == FDT_ADDR_T_NONE) + return -EINVAL; + + plat->regs = (void __iomem *)addr; + return 0; +} + +static const struct dm_spi_ops ath79_spi_ops = { + .claim_bus = ath79_spi_claim_bus, + .release_bus = ath79_spi_release_bus, + .xfer = ath79_spi_xfer, + .set_speed = ath79_spi_set_speed, + .set_mode = ath79_spi_set_mode, + .cs_info = ath79_cs_info, +}; + +static const struct udevice_id ath79_spi_ids[] = { + { .compatible = "ath79,ath79-spi" }, + {} +}; + +U_BOOT_DRIVER(ath79_spi) = { + .name = "ath79_spi", + .id = UCLASS_SPI, + .of_match = ath79_spi_ids, + .ops = &ath79_spi_ops, + .ofdata_to_platdata = ath79_spi_ofdata_to_platdata, + .platdata_auto_alloc_size = sizeof(struct ath79_spi_platdata), + .priv_auto_alloc_size = sizeof(struct ath79_spi_priv), + .probe = ath79_spi_probe, +}; -- 1.9.1

2 1

[U-Boot] [PATCH v3 4/4] mips: ath79: add AP121 reference board
by Wills Wang 24 Dec '15

24 Dec '15

Signed-off-by: Wills Wang <wills.wang(a)live.com> --- Changes in v3: - Convert serial driver to driver model - Convert spi driver to driver model - Add support for device tree - Move SoC specific header files into arch/mips/mach-ath79/include/mach - Optimize assembly code - Same code style convertion Changes in v2: - Move all SoC specific header files into arch/mips/include/asm/arch-ath79 - Check SOC type and extract common code into arch/mips/mach-ath79 - Add a compatible spi driver - Move serial driver code into drivers/serial - Add a reference board implemention arch/mips/Kconfig | 8 +++++ arch/mips/dts/Makefile | 2 +- arch/mips/dts/ap121.dts | 37 ++++++++++++++++++++ arch/mips/dts/ar933x.dtsi | 64 +++++++++++++++++++++++++++++++++++ board/ath79/ap121/Kconfig | 15 ++++++++ board/ath79/ap121/MAINTAINERS | 6 ++++ board/ath79/ap121/Makefile | 8 +++++ board/ath79/ap121/README | 18 ++++++++++ board/ath79/ap121/ap121.c | 18 ++++++++++ board/ath79/ap121/config.mk | 16 +++++++++ configs/ap121_defconfig | 42 +++++++++++++++++++++++ include/configs/ap121.h | 79 +++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 312 insertions(+), 1 deletion(-) create mode 100644 arch/mips/dts/ap121.dts create mode 100644 arch/mips/dts/ar933x.dtsi create mode 100644 board/ath79/ap121/Kconfig create mode 100644 board/ath79/ap121/MAINTAINERS create mode 100644 board/ath79/ap121/Makefile create mode 100644 board/ath79/ap121/README create mode 100644 board/ath79/ap121/ap121.c create mode 100644 board/ath79/ap121/config.mk create mode 100644 configs/ap121_defconfig create mode 100644 include/configs/ap121.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 7f7e258..09b8709 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -51,6 +51,13 @@ config TARGET_PB1X00 select SUPPORTS_CPU_MIPS32_R2 select SYS_MIPS_CACHE_INIT_RAM_LOAD +config TARGET_AP121 + bool "Support ap121" + select SUPPORTS_BIG_ENDIAN + select SUPPORTS_CPU_MIPS32_R1 + select SUPPORTS_CPU_MIPS32_R2 + select SYS_MIPS_CACHE_INIT_RAM_LOAD + endchoice @@ -59,6 +66,7 @@ source "board/imgtec/malta/Kconfig" source "board/micronas/vct/Kconfig" source "board/pb1x00/Kconfig" source "board/qemu-mips/Kconfig" +source "board/ath79/ap121/Kconfig" if MIPS diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile index 47b6eb5..6f8b413 100644 --- a/arch/mips/dts/Makefile +++ b/arch/mips/dts/Makefile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -dtb-y += +dtb-$(CONFIG_TARGET_AP121) += ap121.dtb targets += $(dtb-y) diff --git a/arch/mips/dts/ap121.dts b/arch/mips/dts/ap121.dts new file mode 100644 index 0000000..769458a --- /dev/null +++ b/arch/mips/dts/ap121.dts @@ -0,0 +1,37 @@ +/dts-v1/; +#include "ar933x.dtsi" + +/ { + model = "AP121 Reference Board"; + compatible = "ath79,ap121", "ath79,ar933x"; + + aliases { + spi0 = &spi0; + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&xtal { + clock-frequency = <25000000>; +}; + +&uart0 { + status = "okay"; +}; + +&spi0 { + spi-max-frequency = <25000000>; + status = "okay"; + spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash"; + memory-map = <0x9f000000 0x00800000>; + spi-max-frequency = <25000000>; + reg = <0>; + }; +}; diff --git a/arch/mips/dts/ar933x.dtsi b/arch/mips/dts/ar933x.dtsi new file mode 100644 index 0000000..64b30f7 --- /dev/null +++ b/arch/mips/dts/ar933x.dtsi @@ -0,0 +1,64 @@ +#include "skeleton.dtsi" + +/ { + compatible = "ath79,ar933x"; + + #address-cells = <1>; + #size-cells = <1>; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0 { + device_type = "cpu"; + compatible = "mips,mips24Kc"; + reg = <0>; + }; + }; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + xtal: xtal { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-output-names = "xtal"; + }; + }; + + ahb { + compatible = "simple-bus"; + ranges; + + #address-cells = <1>; + #size-cells = <1>; + + apb { + compatible = "simple-bus"; + ranges; + + #address-cells = <1>; + #size-cells = <1>; + + uart0: uart@18020000 { + compatible = "ath79,ar933x-uart"; + reg = <0x18020000 0x20>; + + status = "disabled"; + }; + }; + + spi0: spi@1f000000 { + compatible = "ath79,ath79-spi"; + reg = <0x1f000000 0x10>; + + status = "disabled"; + + #address-cells = <1>; + #size-cells = <0>; + }; + }; +}; diff --git a/board/ath79/ap121/Kconfig b/board/ath79/ap121/Kconfig new file mode 100644 index 0000000..88d9eff --- /dev/null +++ b/board/ath79/ap121/Kconfig @@ -0,0 +1,15 @@ +if TARGET_AP121 + +config SYS_BOARD + default "ap121" + +config SYS_VENDOR + default "ath79" + +config SYS_SOC + default "ath79" + +config SYS_CONFIG_NAME + default "ap121" + +endif diff --git a/board/ath79/ap121/MAINTAINERS b/board/ath79/ap121/MAINTAINERS new file mode 100644 index 0000000..319b521 --- /dev/null +++ b/board/ath79/ap121/MAINTAINERS @@ -0,0 +1,6 @@ +AP121 BOARD +M: Wills Wang <wills.wang(a)live.com> +S: Maintained +F: board/ath79/ap121/ +F: include/configs/ap121.h +F: configs/ap121_defconfig diff --git a/board/ath79/ap121/Makefile b/board/ath79/ap121/Makefile new file mode 100644 index 0000000..9132118 --- /dev/null +++ b/board/ath79/ap121/Makefile @@ -0,0 +1,8 @@ +# +# (C) Copyright 2003-2006 +# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y = ap121.o diff --git a/board/ath79/ap121/README b/board/ath79/ap121/README new file mode 100644 index 0000000..104850f --- /dev/null +++ b/board/ath79/ap121/README @@ -0,0 +1,18 @@ +ATHEROS AP121 +================== + +Supported hardware: AP121 referance board. + +Files of the AP121 port +-------------------------- + +arch/mips/mach-ath79/ar933x/ - The CPU support code for the Atheros ar933x +arch/mips/include/asm/arch-ath79 - Header files for the Atheros ath79 +board/ath79/ap121/ - AP121 board specific files +include/configs/ap121.h - AP121 configuration file + +Configure +------------------- + +To configure for the current board + make ap121_defconfig diff --git a/board/ath79/ap121/ap121.c b/board/ath79/ap121/ap121.c new file mode 100644 index 0000000..3a3d782 --- /dev/null +++ b/board/ath79/ap121/ap121.c @@ -0,0 +1,18 @@ +/* + * (C) Copyright 2015 + * Wills Wang, <wills.wang(a)live.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <command.h> +#include <asm/mipsregs.h> +#include <asm/addrspace.h> +#include <asm/io.h> + +int checkboard(void) +{ + puts("Board: AP121\n"); + return 0; +} diff --git a/board/ath79/ap121/config.mk b/board/ath79/ap121/config.mk new file mode 100644 index 0000000..f7dd3b7 --- /dev/null +++ b/board/ath79/ap121/config.mk @@ -0,0 +1,16 @@ +# +# (C) Copyright 2003 +# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +# +# AP121 referance board, MIPS32 core +# + +# ROM version +CONFIG_SYS_TEXT_BASE = 0x9f000000 + +# RAM version +#CONFIG_SYS_TEXT_BASE = 0x80010000 diff --git a/configs/ap121_defconfig b/configs/ap121_defconfig new file mode 100644 index 0000000..cec0bb7 --- /dev/null +++ b/configs/ap121_defconfig @@ -0,0 +1,42 @@ +CONFIG_MIPS=y +CONFIG_TARGET_AP121=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_SYS_PROMPT="ap121 # " +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="ap121" +CONFIG_DM=y +CONFIG_DM_SERIAL=y +CONFIG_DM_SPI=y +CONFIG_DM_SPI_FLASH=y +CONFIG_ATH79_SPI=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_ATMEL=y +CONFIG_SPI_FLASH_EON=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_SST=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_USE_4K_SECTORS=y +CONFIG_SPI_FLASH_DATAFLASH=y +CONFIG_SPI_FLASH_MTD=y +CONFIG_CMD_DM=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +# CONFIG_NET is not set +# CONFIG_CMD_BDI is not set +# CONFIG_CMD_CONSOLE is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_ELF is not set +# CONFIG_CMD_EXPORTENV is not set +# CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_EDITENV is not set +# CONFIG_CMD_CRC32 is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +# CONFIG_CMD_NFS is not set +# CONFIG_CMD_NET is not set +CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/include/configs/ap121.h b/include/configs/ap121.h new file mode 100644 index 0000000..3481922 --- /dev/null +++ b/include/configs/ap121.h @@ -0,0 +1,79 @@ +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <linux/kconfig.h> +#include <linux/sizes.h> + +#define CONFIG_ARCH_ATH79 +#define CONFIG_SOC_AR933X + +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO + +#define CONFIG_OF_LIBFDT + +#define CONFIG_SYS_HZ 1000 +#define CONFIG_SYS_MHZ 200 +#define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000) + +/* Cache Configuration */ +#define CONFIG_SYS_DCACHE_SIZE 32 * SZ_1K +#define CONFIG_SYS_ICACHE_SIZE 64 * SZ_1K +#define CONFIG_SYS_CACHELINE_SIZE 32 + +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE + +#define CONFIG_SYS_MALLOC_LEN ROUND(0x30000 + 128 * SZ_1K, 0x1000) + +#define CONFIG_SYS_BOOTPARAMS_LEN 128 * SZ_1K + +#define CONFIG_SYS_SDRAM_BASE 0x80000000 +#define CONFIG_SYS_LOAD_ADDR 0x81000000 + +#define CONFIG_SYS_INIT_SP_OFFSET 0x20000 +#define CONFIG_SYS_NO_FLASH + +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_ENV_OFFSET (256 * SZ_1K) +#define CONFIG_ENV_SECT_SIZE (64 * SZ_1K) +#define CONFIG_ENV_SIZE (64 * SZ_1K) + +#define CONFIG_AR933X_SERIAL +#define CONFIG_BAUDRATE 115200 +#define CONFIG_SYS_BAUDRATE_TABLE { 600, 1200, 2400, 4800, 9600, 14400, \ + 19200, 28800, 38400, 56000, 57600, 115200, \ + 128000, 153600, 230400, 250000, 256000, 460800, \ + 576000, 921600, 1000000, 1152000, 1500000, 2000000 } + +#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs" +#define CONFIG_BOOTCOMMAND "sf probe;mtdparts default;bootm 0x9f300000" +#define CONFIG_LZMA + +#define MTDIDS_DEFAULT "nor0=spi-flash.0" +#define MTDPARTS_DEFAULT "mtdparts=spi-flash.0:" \ + "256k(u-boot),64k(u-boot-env),2752k(rootfs),896k(uImage),64k(NVRAM),64k(ART)" + +/* + * Command + */ +#define CONFIG_CMD_MTDPARTS + +/* Miscellaneous configurable options */ +#define CONFIG_SYS_CBSIZE 256 +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_LONGHELP +#define CONFIG_CMDLINE_EDITING +#define CONFIG_AUTO_COMPLETE +#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " + +/* + * Diagnostics + */ +#define CONFIG_SYS_MEMTEST_START 0x80100000 +#define CONFIG_SYS_MEMTEST_END 0x83f00000 +#define CONFIG_CMD_MEMTEST + +#endif /* __CONFIG_H */ -- 1.9.1

1 0

[U-Boot] [Patch V2 0/3] LS1043AQDS related patches
by Gong Qianyu 24 Dec '15

24 Dec '15

Hi all, The version 2 patchset has: - Fixed some format issues according to the comments. - Changed the core frequency to 1600M for SD boot with QSPI support. Also note that to apply the patchset and work well on LS1043AQDS board, it depends on the QSPI&I2C driver bug fixing and QIXIS patchsets that I have already sent out and are still under review. [Patch V2 1/3] armv8/ls1043aqds: add DSPI support [Patch V2 2/3] armv8/ls1043aqds: add QSPI support in SD boot [Patch V2 3/3] armv8/ls1043aqds: add QSPI boot support Regards, Qianyu

1 3

[U-Boot] [PATCH 0/7] driver: net: fsl-mc: Update existing driver for MC FW 9.0.0
by Prabhakar Kushwaha 24 Dec '15

24 Dec '15

Freescale's Management complex firmware version 9.0.0 provide support of new APIs, update in existing APIs, change in Major and minor version DPAA2 objects, provide new requirements etc. This patch set provide support of new Management Complex firmware 9.0.0. This patch set depends upon "http://patchwork.ozlabs.org/patch/559982/" Prabhakar Kushwaha (7): driver: net: fsl-mc: Add version check for MC objects driver: net: fsl-mc: flib changes for MC FW 9.0.0 driver: net: fsl-mc: Prepare extended cfg for DPNI create driver: net: ldpaa: Report back only error frames for tx driver: net: ldpaa: Increase num of buffers for a pool driver: net: ldpaa: Add debug info of printing DPMAC stats driver: net: fsl-mc: Remove portal id hard-coding drivers/net/fsl-mc/dpni.c | 81 ++++++ drivers/net/fsl-mc/mc.c | 67 ++++- drivers/net/ldpaa_eth/ldpaa_eth.c | 122 ++++++++- drivers/net/ldpaa_eth/ldpaa_eth.h | 2 +- include/fsl-mc/fsl_dpbp.h | 2 +- include/fsl-mc/fsl_dpio.h | 5 +- include/fsl-mc/fsl_dpmac.h | 2 +- include/fsl-mc/fsl_dpmng.h | 2 +- include/fsl-mc/fsl_dpni.h | 539 +++++++++++++++++++++++++++----------- include/fsl-mc/fsl_dprc.h | 94 ++++++- include/fsl-mc/fsl_mc_cmd.h | 5 +- 11 files changed, 748 insertions(+), 173 deletions(-) -- 1.9.1

1 0

[U-Boot] [PATCH] axs103: add support of generic OHCI USB 1.1 controller
by Alexey Brodkin 24 Dec '15

24 Dec '15

This commit adds support of USB 1.1 storage media on AXS103 board. For some yet unknown reason USB 2.0 doesn't work on AXS103 board issuing messages like this: ------------------------>8------------------- AXS# usb start starting USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... EHCI timed out on TD - token=0x80008c80 unable to get device descriptor (error=-1) 1 USB Device(s) found ------------------------>8------------------- As a work-around we're falling back to USB 1.1. Indeed it is much slower but at least USB storage devices are usable on AXS103. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> --- arch/arc/dts/axs10x.dts | 6 ++++++ configs/axs103_defconfig | 3 +-- include/configs/axs101.h | 6 ++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/arc/dts/axs10x.dts b/arch/arc/dts/axs10x.dts index 80e6d6b..391d067 100644 --- a/arch/arc/dts/axs10x.dts +++ b/arch/arc/dts/axs10x.dts @@ -48,4 +48,10 @@ reg = < 0xe0040000 0x100 >; interrupts = < 8 >; }; + + ohci@0xe0060000 { + compatible = "generic-ohci"; + reg = < 0xe0060000 0x100 >; + interrupts = < 8 >; + }; }; diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig index 3c65c83..a208a27 100644 --- a/configs/axs103_defconfig +++ b/configs/axs103_defconfig @@ -21,7 +21,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_STORAGE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/include/configs/axs101.h b/include/configs/axs101.h index 650d97d..c92cca2 100644 --- a/include/configs/axs101.h +++ b/include/configs/axs101.h @@ -105,6 +105,12 @@ #define CONFIG_DW_AUTONEG /* + * USB 1.1 configuration + */ +#define CONFIG_USB_OHCI_NEW +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 + +/* * Commands still not supported in Kconfig */ #define CONFIG_CMD_FAT -- 2.4.3

2 10