-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'zynq-dt-for-v5.10' of https://github.com/Xilinx/linux-xlnx …
…into arm/dt ARM: dts: zynq: DT changes for v5.11 - Adding support for Zturn-v5 - Small DT changes to clean errors from dt_binding_check * tag 'zynq-dt-for-v5.10' of https://github.com/Xilinx/linux-xlnx: ARM: zynq: Fix incorrect reference to XM013 instead of XM011 ARM: zynq: Convert at25 binding to new description on zc770-xm013 ARM: zynq: Fix OCM mapping to be aligned with binding on zc702 ARM: zynq: Fix leds subnode name for zc702/zybo-z7 ARM: zynq: Rename bus to be align with simple-bus yaml ARM: zynq: Fix compatible string for adi,adxl345 chip ARM: zynq: Add Z-turn board V5
- Loading branch information
Showing
9 changed files
with
142 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -92,7 +92,7 @@ | |
| }; | ||
| }; | ||
|
|
||
| amba: amba { | ||
| amba: axi { | ||
| compatible = "simple-bus"; | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| // SPDX-License-Identifier: GPL-2.0 | ||
| /* | ||
| * Copyright (C) 2015 Andrea Merello <adnrea.merello@gmail.com> | ||
| * Copyright (C) 2017 Alexander Graf <agraf@suse.de> | ||
| * | ||
| * Based on zynq-zed.dts which is: | ||
| * Copyright (C) 2011 - 2014 Xilinx | ||
| * Copyright (C) 2012 National Instruments Corp. | ||
| * | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
| /include/ "zynq-7000.dtsi" | ||
|
|
||
| / { | ||
| compatible = "xlnx,zynq-7000"; | ||
|
|
||
| aliases { | ||
| ethernet0 = &gem0; | ||
| serial0 = &uart1; | ||
| serial1 = &uart0; | ||
| mmc0 = &sdhci0; | ||
| }; | ||
|
|
||
| memory@0 { | ||
| device_type = "memory"; | ||
| reg = <0x0 0x40000000>; | ||
| }; | ||
|
|
||
| chosen { | ||
| stdout-path = "serial0:115200n8"; | ||
| }; | ||
|
|
||
| gpio-leds { | ||
| compatible = "gpio-leds"; | ||
| usr-led1 { | ||
| label = "usr-led1"; | ||
| gpios = <&gpio0 0x0 0x1>; | ||
| default-state = "off"; | ||
| }; | ||
|
|
||
| usr-led2 { | ||
| label = "usr-led2"; | ||
| gpios = <&gpio0 0x9 0x1>; | ||
| default-state = "off"; | ||
| }; | ||
| }; | ||
|
|
||
| gpio-keys { | ||
| compatible = "gpio-keys"; | ||
| autorepeat; | ||
| K1 { | ||
| label = "K1"; | ||
| gpios = <&gpio0 0x32 0x1>; | ||
| linux,code = <0x66>; | ||
| wakeup-source; | ||
| autorepeat; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &clkc { | ||
| ps-clk-frequency = <33333333>; | ||
| }; | ||
|
|
||
| &gem0 { | ||
| status = "okay"; | ||
| phy-mode = "rgmii-id"; | ||
| phy-handle = <ðernet_phy>; | ||
|
|
||
| ethernet_phy: ethernet-phy@0 { | ||
| }; | ||
| }; | ||
|
|
||
| &sdhci0 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &uart0 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &uart1 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &usb0 { | ||
| status = "okay"; | ||
| dr_mode = "host"; | ||
| }; | ||
|
|
||
| &can0 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &i2c0 { | ||
| status = "okay"; | ||
| clock-frequency = <400000>; | ||
|
|
||
| stlm75@49 { | ||
| status = "okay"; | ||
| compatible = "lm75"; | ||
| reg = <0x49>; | ||
| }; | ||
|
|
||
| accelerometer@53 { | ||
| compatible = "adi,adxl345"; | ||
| reg = <0x53>; | ||
| interrupt-parent = <&intc>; | ||
| interrupts = <0x0 0x1e 0x4>; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| // SPDX-License-Identifier: GPL-2.0 | ||
|
|
||
| /dts-v1/; | ||
| /include/ "zynq-zturn-common.dtsi" | ||
|
|
||
| / { | ||
| model = "Zynq Z-Turn MYIR Board V5"; | ||
| compatible = "myir,zynq-zturn-v5", "xlnx,zynq-7000"; | ||
| }; | ||
|
|
||
| &gem0 { | ||
| ethernet_phy: ethernet-phy@0 { | ||
| reg = <0x3>; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,114 +1,15 @@ | ||
| // SPDX-License-Identifier: GPL-2.0 | ||
| /* | ||
| * Copyright (C) 2015 Andrea Merello <adnrea.merello@gmail.com> | ||
| * Copyright (C) 2017 Alexander Graf <agraf@suse.de> | ||
| * | ||
| * Based on zynq-zed.dts which is: | ||
| * Copyright (C) 2011 - 2014 Xilinx | ||
| * Copyright (C) 2012 National Instruments Corp. | ||
| * | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
| /include/ "zynq-7000.dtsi" | ||
| /include/ "zynq-zturn-common.dtsi" | ||
|
|
||
| / { | ||
| model = "Zynq Z-Turn MYIR Board"; | ||
| compatible = "myir,zynq-zturn", "xlnx,zynq-7000"; | ||
|
|
||
| aliases { | ||
| ethernet0 = &gem0; | ||
| serial0 = &uart1; | ||
| serial1 = &uart0; | ||
| mmc0 = &sdhci0; | ||
| }; | ||
|
|
||
| memory@0 { | ||
| device_type = "memory"; | ||
| reg = <0x0 0x40000000>; | ||
| }; | ||
|
|
||
| chosen { | ||
| stdout-path = "serial0:115200n8"; | ||
| }; | ||
|
|
||
| gpio-leds { | ||
| compatible = "gpio-leds"; | ||
| usr-led1 { | ||
| label = "usr-led1"; | ||
| gpios = <&gpio0 0x0 0x1>; | ||
| default-state = "off"; | ||
| }; | ||
|
|
||
| usr-led2 { | ||
| label = "usr-led2"; | ||
| gpios = <&gpio0 0x9 0x1>; | ||
| default-state = "off"; | ||
| }; | ||
| }; | ||
|
|
||
| gpio-keys { | ||
| compatible = "gpio-keys"; | ||
| autorepeat; | ||
| K1 { | ||
| label = "K1"; | ||
| gpios = <&gpio0 0x32 0x1>; | ||
| linux,code = <0x66>; | ||
| wakeup-source; | ||
| autorepeat; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &clkc { | ||
| ps-clk-frequency = <33333333>; | ||
| }; | ||
|
|
||
| &gem0 { | ||
| status = "okay"; | ||
| phy-mode = "rgmii-id"; | ||
| phy-handle = <ðernet_phy>; | ||
|
|
||
| ethernet_phy: ethernet-phy@0 { | ||
| reg = <0x0>; | ||
| }; | ||
| }; | ||
|
|
||
| &sdhci0 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &uart0 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &uart1 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &usb0 { | ||
| status = "okay"; | ||
| dr_mode = "host"; | ||
| }; | ||
|
|
||
| &can0 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &i2c0 { | ||
| status = "okay"; | ||
| clock-frequency = <400000>; | ||
|
|
||
| stlm75@49 { | ||
| status = "okay"; | ||
| compatible = "lm75"; | ||
| reg = <0x49>; | ||
| }; | ||
|
|
||
| accelerometer@53 { | ||
| compatible = "adi,adxl345", "adxl345", "adi,adxl34x", "adxl34x"; | ||
| reg = <0x53>; | ||
| interrupt-parent = <&intc>; | ||
| interrupts = <0x0 0x1e 0x4>; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters