diff options
| author | Tom Rini <trini@konsulko.com> | 2016-03-25 12:57:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-25 12:57:18 -0400 |
| commit | a6164205ee933fa956d9f07f4ae08b39b64629e7 (patch) | |
| tree | f69f88b79602a47527409b83aa0c30091362f95b /arch | |
| parent | b5b84be8a7356d4c3618b6edcb501885e53569f5 (diff) | |
| parent | 7497a6a1f13eb86d68a936edecfd682bbad5752d (diff) | |
| download | u-boot-a6164205ee933fa956d9f07f4ae08b39b64629e7.tar.gz | |
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/armada-xp-theadorable.dts | 21 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mvebu/spi.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/include/mach/cpu.h | 3 |
3 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/dts/armada-xp-theadorable.dts b/arch/arm/dts/armada-xp-theadorable.dts index cf1be2a3d4..7087ccfc2f 100644 --- a/arch/arm/dts/armada-xp-theadorable.dts +++ b/arch/arm/dts/armada-xp-theadorable.dts @@ -69,6 +69,7 @@ aliases { spi0 = &spi0; + spi1 = &spi1; ethernet0 = ð0; }; @@ -137,6 +138,26 @@ reg = <0>; /* Chip select 0 */ spi-max-frequency = <27777777>; }; + + fpga@1 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-generic-device"; + reg = <1>; /* Chip select 1 */ + spi-max-frequency = <27777777>; + }; + }; + + spi1: spi@10680 { + status = "okay"; + + fpga@2 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-generic-device"; + reg = <2>; /* Chip select 2 */ + spi-max-frequency = <27777777>; + }; }; }; }; diff --git a/arch/arm/include/asm/arch-mvebu/spi.h b/arch/arm/include/asm/arch-mvebu/spi.h index e512dcec16..526fea68e6 100644 --- a/arch/arm/include/asm/arch-mvebu/spi.h +++ b/arch/arm/include/asm/arch-mvebu/spi.h @@ -19,6 +19,9 @@ struct kwspi_registers { u32 din; /* 0x1060c */ u32 irq_cause; /* 0x10610 */ u32 irq_mask; /* 0x10614 */ + u32 timing1; /* 0x10618 */ + u32 timing2; /* 0x1061c */ + u32 dw_cfg; /* 0x10620 - Direct Write Configuration */ }; /* They are used to define CONFIG_SYS_KW_SPI_MPP diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h index 017d55f412..dd58b4adc4 100644 --- a/arch/arm/mach-mvebu/include/mach/cpu.h +++ b/arch/arm/mach-mvebu/include/mach/cpu.h @@ -47,6 +47,9 @@ enum cpu_attrib { CPU_ATTR_DRAM_CS3 = 0x07, CPU_ATTR_NANDFLASH = 0x2f, CPU_ATTR_SPIFLASH = 0x1e, + CPU_ATTR_SPI0_CS0 = 0x1e, + CPU_ATTR_SPI0_CS1 = 0x5e, + CPU_ATTR_SPI1_CS2 = 0x9a, CPU_ATTR_BOOTROM = 0x1d, CPU_ATTR_PCIE_IO = 0xe0, CPU_ATTR_PCIE_MEM = 0xe8, |