arm64: dts: zynqmp: DT changes for v5.0
- Fix node names - Fix wakeup-source - Wire ddrc - Label gpio controller (PS gpio) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlwSeVMACgkQykllyylKDCE1dwCfVyz11cDu9/j5dgSNnDOO9f4A txUAoIrpD9f5nfAb//SEq/GRZn2mXMgw =i6pK -----END PGP SIGNATURE----- Merge tag 'zynqmp-dt-for-v5.0' of https://github.com/Xilinx/linux-xlnx into next/dt arm64: dts: zynqmp: DT changes for v5.0 - Fix node names - Fix wakeup-source - Wire ddrc - Label gpio controller (PS gpio) * tag 'zynqmp-dt-for-v5.0' of https://github.com/Xilinx/linux-xlnx: arm64: dts: zynqmp: Fix node names which contain "_" arm64: dts: zynqmp: Add missing gpio-controller to ps gpio arm64: dts: zynqmp: Add DDRC node arm64: dts: zynqmp: replace gpio-key,wakeup with wakeup-source property arm64: dts: zynqmp: Use mmc@ instead sdhci@ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
5385c226b6
@ -58,13 +58,13 @@
|
||||
clock-accuracy = <100>;
|
||||
};
|
||||
|
||||
dpdma_clk: dpdma_clk {
|
||||
dpdma_clk: dpdma-clk {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0x0>;
|
||||
clock-frequency = <533000000>;
|
||||
};
|
||||
|
||||
drm_clock: drm_clock {
|
||||
drm_clock: drm-clock {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0x0>;
|
||||
clock-frequency = <262750000>;
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
label = "sw4";
|
||||
gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
|
||||
linux,code = <KEY_POWER>;
|
||||
gpio-key,wakeup;
|
||||
wakeup-source;
|
||||
autorepeat;
|
||||
};
|
||||
};
|
||||
@ -82,7 +82,7 @@
|
||||
linux,default-trigger = "bluetooth-power";
|
||||
};
|
||||
|
||||
vbus_det { /* U5 USB5744 VBUS detection via MIO25 */
|
||||
vbus-det { /* U5 USB5744 VBUS detection via MIO25 */
|
||||
label = "vbus_det";
|
||||
gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
|
||||
default-state = "on";
|
||||
@ -98,7 +98,7 @@
|
||||
regulator-boot-on;
|
||||
};
|
||||
|
||||
sdio_pwrseq: sdio_pwrseq {
|
||||
sdio_pwrseq: sdio-pwrseq {
|
||||
compatible = "mmc-pwrseq-simple";
|
||||
reset-gpios = <&gpio 7 GPIO_ACTIVE_LOW>; /* WIFI_EN */
|
||||
};
|
||||
|
||||
@ -46,14 +46,14 @@
|
||||
label = "sw19";
|
||||
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
|
||||
linux,code = <KEY_DOWN>;
|
||||
gpio-key,wakeup;
|
||||
wakeup-source;
|
||||
autorepeat;
|
||||
};
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
heartbeat_led {
|
||||
heartbeat-led {
|
||||
label = "heartbeat";
|
||||
gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
|
||||
linux,default-trigger = "heartbeat";
|
||||
@ -139,25 +139,25 @@
|
||||
* 7, 10 - 17 - not connected
|
||||
*/
|
||||
|
||||
gtr_sel0 {
|
||||
gtr-sel0 {
|
||||
gpio-hog;
|
||||
gpios = <0 0>;
|
||||
output-low; /* PCIE = 0, DP = 1 */
|
||||
line-name = "sel0";
|
||||
};
|
||||
gtr_sel1 {
|
||||
gtr-sel1 {
|
||||
gpio-hog;
|
||||
gpios = <1 0>;
|
||||
output-high; /* PCIE = 0, DP = 1 */
|
||||
line-name = "sel1";
|
||||
};
|
||||
gtr_sel2 {
|
||||
gtr-sel2 {
|
||||
gpio-hog;
|
||||
gpios = <2 0>;
|
||||
output-high; /* PCIE = 0, USB0 = 1 */
|
||||
line-name = "sel2";
|
||||
};
|
||||
gtr_sel3 {
|
||||
gtr-sel3 {
|
||||
gpio-hog;
|
||||
gpios = <3 0>;
|
||||
output-high; /* PCIE = 0, SATA = 1 */
|
||||
|
||||
@ -46,14 +46,14 @@
|
||||
label = "sw19";
|
||||
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
|
||||
linux,code = <KEY_DOWN>;
|
||||
gpio-key,wakeup;
|
||||
wakeup-source;
|
||||
autorepeat;
|
||||
};
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
heartbeat_led {
|
||||
heartbeat-led {
|
||||
label = "heartbeat";
|
||||
gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
|
||||
linux,default-trigger = "heartbeat";
|
||||
|
||||
@ -46,14 +46,14 @@
|
||||
label = "sw19";
|
||||
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
|
||||
linux,code = <KEY_DOWN>;
|
||||
gpio-key,wakeup;
|
||||
wakeup-source;
|
||||
autorepeat;
|
||||
};
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
heartbeat_led {
|
||||
heartbeat-led {
|
||||
label = "heartbeat";
|
||||
gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
|
||||
linux,default-trigger = "heartbeat";
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
cpu_opp_table: cpu_opp_table {
|
||||
cpu_opp_table: cpu-opp-table {
|
||||
compatible = "operating-points-v2";
|
||||
opp-shared;
|
||||
opp00 {
|
||||
@ -124,7 +124,7 @@
|
||||
<1 10 0xf08>;
|
||||
};
|
||||
|
||||
amba_apu: amba_apu@0 {
|
||||
amba_apu: amba-apu@0 {
|
||||
compatible = "simple-bus";
|
||||
#address-cells = <2>;
|
||||
#size-cells = <1>;
|
||||
@ -355,6 +355,13 @@
|
||||
xlnx,bus-width = <64>;
|
||||
};
|
||||
|
||||
mc: memory-controller@fd070000 {
|
||||
compatible = "xlnx,zynqmp-ddrc-2.40a";
|
||||
reg = <0x0 0xfd070000 0x0 0x30000>;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 112 4>;
|
||||
};
|
||||
|
||||
gem0: ethernet@ff0b0000 {
|
||||
compatible = "cdns,zynqmp-gem", "cdns,gem";
|
||||
status = "disabled";
|
||||
@ -403,6 +410,7 @@
|
||||
compatible = "xlnx,zynqmp-gpio-1.0";
|
||||
status = "disabled";
|
||||
#gpio-cells = <0x2>;
|
||||
gpio-controller;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 16 4>;
|
||||
interrupt-controller;
|
||||
@ -484,7 +492,7 @@
|
||||
interrupts = <0 133 4>;
|
||||
};
|
||||
|
||||
sdhci0: sdhci@ff160000 {
|
||||
sdhci0: mmc@ff160000 {
|
||||
compatible = "arasan,sdhci-8.9a";
|
||||
status = "disabled";
|
||||
interrupt-parent = <&gic>;
|
||||
@ -493,7 +501,7 @@
|
||||
clock-names = "clk_xin", "clk_ahb";
|
||||
};
|
||||
|
||||
sdhci1: sdhci@ff170000 {
|
||||
sdhci1: mmc@ff170000 {
|
||||
compatible = "arasan,sdhci-8.9a";
|
||||
status = "disabled";
|
||||
interrupt-parent = <&gic>;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user