diff options
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 | ||||
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/Kconfig | 16 |
7 files changed, 38 insertions, 17 deletions
diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi index 0b62cb0..84c15b5 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 c373a2c..d5e0050 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 6691a8d..4d86960 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 cf7bce4..fc336ea 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 680f24c..cf56ac8 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 5762576..3630490 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"; diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index ce58d86..945e771 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -28,9 +28,6 @@ config TARGET_CANYONLANDS select DM select DM_SERIAL -config TARGET_EBONY - bool "Support ebony" - config TARGET_KATMAI bool "Support katmai" @@ -43,21 +40,12 @@ config TARGET_LUAN config TARGET_MAKALU bool "Support makalu" -config TARGET_OCOTEA - bool "Support ocotea" - config TARGET_REDWOOD bool "Support redwood" config TARGET_SEQUOIA bool "Support sequoia" -config TARGET_TAIHU - bool "Support taihu" - -config TARGET_TAISHAN - bool "Support taishan" - config TARGET_WALNUT bool "Support walnut" @@ -142,16 +130,12 @@ source "board/amcc/acadia/Kconfig" source "board/amcc/bamboo/Kconfig" source "board/amcc/bubinga/Kconfig" source "board/amcc/canyonlands/Kconfig" -source "board/amcc/ebony/Kconfig" source "board/amcc/katmai/Kconfig" source "board/amcc/kilauea/Kconfig" source "board/amcc/luan/Kconfig" source "board/amcc/makalu/Kconfig" -source "board/amcc/ocotea/Kconfig" source "board/amcc/redwood/Kconfig" source "board/amcc/sequoia/Kconfig" -source "board/amcc/taihu/Kconfig" -source "board/amcc/taishan/Kconfig" source "board/amcc/walnut/Kconfig" source "board/amcc/yosemite/Kconfig" source "board/amcc/yucca/Kconfig" |