diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-28 16:56:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-28 16:56:43 -0400 |
| commit | 446d37c1acc76680770400fd90e6c502e49d72df (patch) | |
| tree | f309e83e262b0ee6e41d0f1bf92af9fb0e3faa18 /arch | |
| parent | ab0a6a5dba740afb490e6e7d417e345284e0dbec (diff) | |
| parent | bef87adf95e7ca923f866e27bbcccb2dad85df9f (diff) | |
| download | talos-obmc-uboot-446d37c1acc76680770400fd90e6c502e49d72df.tar.gz talos-obmc-uboot-446d37c1acc76680770400fd90e6c502e49d72df.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/zynq-7000.dtsi | 12 | ||||
| -rw-r--r-- | arch/arm/dts/zynq-microzed.dts | 5 | ||||
| -rw-r--r-- | arch/arm/dts/zynq-zc702.dts | 5 | ||||
| -rw-r--r-- | arch/arm/dts/zynq-zc706.dts | 5 | ||||
| -rw-r--r-- | arch/arm/dts/zynq-zc770-xm010.dts | 7 | ||||
| -rw-r--r-- | arch/arm/dts/zynq-zed.dts | 5 |
6 files changed, 38 insertions, 1 deletions
diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi index 0b62cb0936..84c15b5c79 100644 --- a/arch/arm/dts/zynq-7000.dtsi +++ b/arch/arm/dts/zynq-7000.dtsi @@ -191,6 +191,18 @@ #size-cells = <0>; }; + qspi: spi@e000d000 { + clock-names = "ref_clk", "pclk"; + clocks = <&clkc 10>, <&clkc 43>; + compatible = "xlnx,zynq-qspi-1.0"; + status = "disabled"; + interrupt-parent = <&intc>; + interrupts = <0 19 4>; + reg = <0xe000d000 0x1000>; + #address-cells = <1>; + #size-cells = <0>; + }; + gem0: ethernet@e000b000 { compatible = "cdns,zynq-gem", "cdns,gem"; reg = <0xe000b000 0x1000>; diff --git a/arch/arm/dts/zynq-microzed.dts b/arch/arm/dts/zynq-microzed.dts index c373a2cc31..d5e0050893 100644 --- a/arch/arm/dts/zynq-microzed.dts +++ b/arch/arm/dts/zynq-microzed.dts @@ -14,6 +14,7 @@ aliases { serial0 = &uart1; + spi0 = &qspi; }; memory { @@ -21,3 +22,7 @@ reg = <0 0x40000000>; }; }; + +&qspi { + status = "okay"; +}; diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts index 6691a8de24..4d8696021b 100644 --- a/arch/arm/dts/zynq-zc702.dts +++ b/arch/arm/dts/zynq-zc702.dts @@ -17,6 +17,7 @@ ethernet0 = &gem0; i2c0 = &i2c0; serial0 = &uart1; + spi0 = &qspi; }; memory { @@ -380,6 +381,10 @@ pinctrl-0 = <&pinctrl_uart1_default>; }; +&qspi { + status = "okay"; +}; + &usb0 { status = "okay"; dr_mode = "host"; diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts index cf7bce4468..fc336ea5c9 100644 --- a/arch/arm/dts/zynq-zc706.dts +++ b/arch/arm/dts/zynq-zc706.dts @@ -17,6 +17,7 @@ ethernet0 = &gem0; i2c0 = &i2c0; serial0 = &uart1; + spi0 = &qspi; }; memory { @@ -301,6 +302,10 @@ pinctrl-0 = <&pinctrl_uart1_default>; }; +&qspi { + status = "okay"; +}; + &usb0 { status = "okay"; dr_mode = "host"; diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts index 680f24c9c4..cf56ac8d82 100644 --- a/arch/arm/dts/zynq-zc770-xm010.dts +++ b/arch/arm/dts/zynq-zc770-xm010.dts @@ -16,7 +16,8 @@ ethernet0 = &gem0; i2c0 = &i2c0; serial0 = &uart1; - spi0 = &spi1; + spi0 = &qspi; + spi1 = &spi1; }; chosen { @@ -53,6 +54,10 @@ }; }; +&qspi { + status = "okay"; +}; + &can0 { status = "okay"; }; diff --git a/arch/arm/dts/zynq-zed.dts b/arch/arm/dts/zynq-zed.dts index 5762576fea..363049085f 100644 --- a/arch/arm/dts/zynq-zed.dts +++ b/arch/arm/dts/zynq-zed.dts @@ -16,6 +16,7 @@ aliases { ethernet0 = &gem0; serial0 = &uart1; + spi0 = &qspi; }; memory { @@ -56,6 +57,10 @@ status = "okay"; }; +&qspi { + status = "okay"; +}; + &usb0 { status = "okay"; dr_mode = "host"; |
