]> Git Repo - u-boot.git/commitdiff
arm64: zynqmp: rename overlay sources to .dtso
authorRasmus Villemoes <[email protected]>
Mon, 25 Sep 2023 08:09:07 +0000 (10:09 +0200)
committerTom Rini <[email protected]>
Wed, 11 Oct 2023 17:22:32 +0000 (13:22 -0400)
Distinguish more clearly between source files meant for producing .dtb
from those meant for producing .dtbo. No functional change, as we
currently have rules for producing a foo.dtbo from either foo.dts or
foo.dtso.

Note that in the linux tree, all device tree overlay sources have been
renamed to .dtso, and the .dts->.dtbo rule is gone since v6.5 (commit
81d362732bac). So this is also a step towards staying closer to linux
with respect to both Kbuild and device tree sources.

Signed-off-by: Rasmus Villemoes <[email protected]>
arch/arm/dts/zynqmp-sck-kr-g-revA.dts [deleted file]
arch/arm/dts/zynqmp-sck-kr-g-revA.dtso [new file with mode: 0644]
arch/arm/dts/zynqmp-sck-kr-g-revB.dts [deleted file]
arch/arm/dts/zynqmp-sck-kr-g-revB.dtso [new file with mode: 0644]
arch/arm/dts/zynqmp-sck-kv-g-revA.dts [deleted file]
arch/arm/dts/zynqmp-sck-kv-g-revA.dtso [new file with mode: 0644]
arch/arm/dts/zynqmp-sck-kv-g-revB.dts [deleted file]
arch/arm/dts/zynqmp-sck-kv-g-revB.dtso [new file with mode: 0644]

diff --git a/arch/arm/dts/zynqmp-sck-kr-g-revA.dts b/arch/arm/dts/zynqmp-sck-kr-g-revA.dts
deleted file mode 100644 (file)
index 30a0230..0000000
+++ /dev/null
@@ -1,397 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * dts file for KR260 revA Carrier Card
- *
- * (C) Copyright 2021, Xilinx, Inc.
- *
- * Michal Simek <[email protected]>
- */
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/net/ti-dp83867.h>
-#include <dt-bindings/phy/phy.h>
-#include <dt-bindings/pinctrl/pinctrl-zynqmp.h>
-
-/dts-v1/;
-/plugin/;
-
-&{/} {
-       compatible = "xlnx,zynqmp-sk-kr260-revA",
-                    "xlnx,zynqmp-sk-kr260", "xlnx,zynqmp";
-       model = "ZynqMP KR260 revA";
-
-       ina260-u14 {
-               compatible = "iio-hwmon";
-               io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
-       };
-
-       si5332_0: si5332_0 { /* u17 - GEM0/1 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <125000000>;
-       };
-
-       si5332_1: si5332_1 { /* u17 - DP */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <27000000>;
-       };
-
-       si5332_2: si5332_2 { /* u17 - USB */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <26000000>;
-       };
-
-       si5332_3: si5332_3 { /* u17 - SFP+ */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <156250000>;
-       };
-
-       si5332_4: si5332_4 { /* u17 - GEM2 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <25000000>;
-       };
-
-       si5332_5: si5332_5 { /* u17 - GEM3 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <25000000>;
-       };
-};
-
-&i2c1 { /* I2C_SCK C26/C27 - MIO from SOM */
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default", "gpio";
-       pinctrl-0 = <&pinctrl_i2c1_default>;
-       pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-       sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-
-       u14: ina260@40 { /* u14 */
-               compatible = "ti,ina260";
-               #io-channel-cells = <1>;
-               label = "ina260-u14";
-               reg = <0x40>;
-       };
-
-       slg7xl45106: gpio@11 { /* u19 - reset logic */
-               compatible = "dlg,slg7xl45106";
-               reg = <0x11>;
-               label = "resetchip";
-               gpio-controller;
-               #gpio-cells = <2>;
-               gpio-line-names = "USB0_PHY_RESET_B", "USB1_PHY_RESET_B",
-                                 "SD_RESET_B", "USB0_HUB_RESET_B",
-                                 "USB1_HUB_RESET_B", "PS_GEM0_RESET_B",
-                                 "PS_GEM1_RESET_B", "";
-       };
-
-       i2c-mux@74 { /* u18 */
-               compatible = "nxp,pca9546";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <0x74>;
-               usbhub_i2c0: i2c@0 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0>;
-               };
-               usbhub_i2c1: i2c@1 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <1>;
-               };
-               /* Bus 2/3 are not connected */
-       };
-
-       /* si5332@6a - u17 - clock-generator */
-};
-
-/* GEM SGMII/DP and USB 3.0 */
-&psgtr {
-       status = "okay";
-       /* gem0/1, dp, usb */
-       clocks = <&si5332_0>, <&si5332_1>, <&si5332_2>;
-       clock-names = "ref0", "ref1", "ref2";
-};
-
-&zynqmp_dpsub {
-       status = "okay";
-       phy-names = "dp-phy0";
-       phys = <&psgtr 1 PHY_TYPE_DP 0 1>;
-       assigned-clock-rates = <27000000>, <25000000>, <300000000>;
-};
-
-&zynqmp_dpdma {
-       status = "okay";
-       assigned-clock-rates = <600000000>;
-};
-
-&usb0 { /* mio52 - mio63 */
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usb0_default>;
-       phy-names = "usb3-phy";
-       phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
-       reset-gpios = <&slg7xl45106 0 GPIO_ACTIVE_LOW>;
-       assigned-clock-rates = <250000000>, <20000000>;
-
-       usbhub0: usb-hub { /* u43 */
-               i2c-bus = <&usbhub_i2c0>;
-               compatible = "microchip,usb5744";
-               reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>;
-       };
-
-       usb2244: usb-sd { /* u38 */
-               compatible = "microchip,usb2244";
-               reset-gpios = <&slg7xl45106 2 GPIO_ACTIVE_LOW>;
-       };
-};
-
-&dwc3_0 {
-       status = "okay";
-       dr_mode = "host";
-       snps,usb3_lpm_capable;
-       maximum-speed = "super-speed";
-};
-
-&usb1 { /* mio64 - mio75 */
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usb1_default>;
-       phy-names = "usb3-phy";
-       phys = <&psgtr 3 PHY_TYPE_USB3 1 2>;
-       reset-gpios = <&slg7xl45106 1 GPIO_ACTIVE_LOW>;
-       assigned-clock-rates = <250000000>, <20000000>;
-
-       usbhub1: usb-hub { /* u84 */
-               i2c-bus = <&usbhub_i2c1>;
-               compatible = "microchip,usb5744";
-               reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>;
-       };
-};
-
-&dwc3_1 {
-       status = "okay";
-       dr_mode = "host";
-       snps,usb3_lpm_capable;
-       maximum-speed = "super-speed";
-};
-
-&gem0 { /* mdio mio50/51 */
-       status = "okay";
-       phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>;
-       phy-handle = <&phy0>;
-       phy-mode = "sgmii";
-       is-internal-pcspma;
-       assigned-clock-rates = <250000000>;
-};
-
-&gem1 { /* mdio mio50/51, gem mio38 - mio49 */
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_gem1_default>;
-       phy-handle = <&phy1>;
-       phy-mode = "rgmii-id";
-       assigned-clock-rates = <250000000>;
-
-       mdio: mdio {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               phy0: ethernet-phy@4 { /* u81 */
-                       #phy-cells = <1>;
-                       compatible = "ethernet-phy-id2000.a231";
-                       reg = <4>;
-                       ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
-                       ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_75_NS>;
-                       ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
-                       ti,dp83867-rxctrl-strap-quirk;
-                       reset-assert-us = <300>;
-                       reset-deassert-us = <280>;
-                       reset-gpios = <&slg7xl45106 5 GPIO_ACTIVE_LOW>;
-               };
-               phy1: ethernet-phy@8 { /* u36 */
-                       #phy-cells = <1>;
-                       compatible = "ethernet-phy-id2000.a231";
-                       reg = <8>;
-                       ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
-                       ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_75_NS>;
-                       ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
-                       ti,dp83867-rxctrl-strap-quirk;
-                       reset-assert-us = <100>;
-                       reset-deassert-us = <280>;
-                       reset-gpios = <&slg7xl45106 6 GPIO_ACTIVE_LOW>;
-               };
-       };
-};
-
-/* gem2/gem3 via PL with phys u79@2 and u80@3 */
-
-&pinctrl0 {
-       status = "okay";
-
-       pinctrl_uart1_default: uart1-default {
-               conf {
-                       groups = "uart1_9_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-                       drive-strength = <12>;
-               };
-
-               conf-rx {
-                       pins = "MIO37";
-                       bias-high-impedance;
-               };
-
-               conf-tx {
-                       pins = "MIO36";
-                       bias-disable;
-                       output-enable;
-               };
-
-               mux {
-                       groups = "uart1_9_grp";
-                       function = "uart1";
-               };
-       };
-
-       pinctrl_i2c1_default: i2c1-default {
-               conf {
-                       groups = "i2c1_6_grp";
-                       bias-pull-up;
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               mux {
-                       groups = "i2c1_6_grp";
-                       function = "i2c1";
-               };
-       };
-
-       pinctrl_i2c1_gpio: i2c1-gpio {
-               conf {
-                       groups = "gpio0_24_grp", "gpio0_25_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               mux {
-                       groups = "gpio0_24_grp", "gpio0_25_grp";
-                       function = "gpio0";
-               };
-       };
-
-       pinctrl_gem1_default: gem1-default {
-               conf {
-                       groups = "ethernet1_0_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO44", "MIO46", "MIO48";
-                       bias-high-impedance;
-                       low-power-disable;
-               };
-
-               conf-bootstrap {
-                       pins = "MIO45", "MIO47", "MIO49";
-                       bias-disable;
-                       output-enable;
-                       low-power-disable;
-               };
-
-               conf-tx {
-                       pins = "MIO38", "MIO39", "MIO40",
-                               "MIO41", "MIO42", "MIO43";
-                       bias-disable;
-                       output-enable;
-                       low-power-enable;
-               };
-
-               conf-mdio {
-                       groups = "mdio1_0_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-                       bias-disable;
-                       output-enable;
-               };
-
-               mux-mdio {
-                       function = "mdio1";
-                       groups = "mdio1_0_grp";
-               };
-
-               mux {
-                       function = "ethernet1";
-                       groups = "ethernet1_0_grp";
-               };
-       };
-
-       pinctrl_usb0_default: usb0-default {
-               conf {
-                       groups = "usb0_0_grp";
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO52", "MIO53", "MIO55";
-                       bias-high-impedance;
-                       drive-strength = <12>;
-                       slew-rate = <SLEW_RATE_FAST>;
-               };
-
-               conf-tx {
-                       pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59",
-                       "MIO60", "MIO61", "MIO62", "MIO63";
-                       bias-disable;
-                       output-enable;
-                       drive-strength = <4>;
-                       slew-rate = <SLEW_RATE_SLOW>;
-               };
-
-               mux {
-                       groups = "usb0_0_grp";
-                       function = "usb0";
-               };
-       };
-
-       pinctrl_usb1_default: usb1-default {
-               conf {
-                       groups = "usb1_0_grp";
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO64", "MIO65", "MIO67";
-                       bias-high-impedance;
-                       drive-strength = <12>;
-                       slew-rate = <SLEW_RATE_FAST>;
-               };
-
-               conf-tx {
-                       pins = "MIO66", "MIO68", "MIO69", "MIO70", "MIO71",
-                       "MIO72", "MIO73", "MIO74", "MIO75";
-                       bias-disable;
-                       output-enable;
-                       drive-strength = <4>;
-                       slew-rate = <SLEW_RATE_SLOW>;
-               };
-
-               mux {
-                       groups = "usb1_0_grp";
-                       function = "usb1";
-               };
-       };
-};
-
-&uart1 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1_default>;
-};
diff --git a/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso b/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso
new file mode 100644 (file)
index 0000000..30a0230
--- /dev/null
@@ -0,0 +1,397 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * dts file for KR260 revA Carrier Card
+ *
+ * (C) Copyright 2021, Xilinx, Inc.
+ *
+ * Michal Simek <[email protected]>
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/net/ti-dp83867.h>
+#include <dt-bindings/phy/phy.h>
+#include <dt-bindings/pinctrl/pinctrl-zynqmp.h>
+
+/dts-v1/;
+/plugin/;
+
+&{/} {
+       compatible = "xlnx,zynqmp-sk-kr260-revA",
+                    "xlnx,zynqmp-sk-kr260", "xlnx,zynqmp";
+       model = "ZynqMP KR260 revA";
+
+       ina260-u14 {
+               compatible = "iio-hwmon";
+               io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
+       };
+
+       si5332_0: si5332_0 { /* u17 - GEM0/1 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <125000000>;
+       };
+
+       si5332_1: si5332_1 { /* u17 - DP */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <27000000>;
+       };
+
+       si5332_2: si5332_2 { /* u17 - USB */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <26000000>;
+       };
+
+       si5332_3: si5332_3 { /* u17 - SFP+ */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <156250000>;
+       };
+
+       si5332_4: si5332_4 { /* u17 - GEM2 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <25000000>;
+       };
+
+       si5332_5: si5332_5 { /* u17 - GEM3 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <25000000>;
+       };
+};
+
+&i2c1 { /* I2C_SCK C26/C27 - MIO from SOM */
+       #address-cells = <1>;
+       #size-cells = <0>;
+       pinctrl-names = "default", "gpio";
+       pinctrl-0 = <&pinctrl_i2c1_default>;
+       pinctrl-1 = <&pinctrl_i2c1_gpio>;
+       scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+
+       u14: ina260@40 { /* u14 */
+               compatible = "ti,ina260";
+               #io-channel-cells = <1>;
+               label = "ina260-u14";
+               reg = <0x40>;
+       };
+
+       slg7xl45106: gpio@11 { /* u19 - reset logic */
+               compatible = "dlg,slg7xl45106";
+               reg = <0x11>;
+               label = "resetchip";
+               gpio-controller;
+               #gpio-cells = <2>;
+               gpio-line-names = "USB0_PHY_RESET_B", "USB1_PHY_RESET_B",
+                                 "SD_RESET_B", "USB0_HUB_RESET_B",
+                                 "USB1_HUB_RESET_B", "PS_GEM0_RESET_B",
+                                 "PS_GEM1_RESET_B", "";
+       };
+
+       i2c-mux@74 { /* u18 */
+               compatible = "nxp,pca9546";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0x74>;
+               usbhub_i2c0: i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+               };
+               usbhub_i2c1: i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+               };
+               /* Bus 2/3 are not connected */
+       };
+
+       /* si5332@6a - u17 - clock-generator */
+};
+
+/* GEM SGMII/DP and USB 3.0 */
+&psgtr {
+       status = "okay";
+       /* gem0/1, dp, usb */
+       clocks = <&si5332_0>, <&si5332_1>, <&si5332_2>;
+       clock-names = "ref0", "ref1", "ref2";
+};
+
+&zynqmp_dpsub {
+       status = "okay";
+       phy-names = "dp-phy0";
+       phys = <&psgtr 1 PHY_TYPE_DP 0 1>;
+       assigned-clock-rates = <27000000>, <25000000>, <300000000>;
+};
+
+&zynqmp_dpdma {
+       status = "okay";
+       assigned-clock-rates = <600000000>;
+};
+
+&usb0 { /* mio52 - mio63 */
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usb0_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
+       reset-gpios = <&slg7xl45106 0 GPIO_ACTIVE_LOW>;
+       assigned-clock-rates = <250000000>, <20000000>;
+
+       usbhub0: usb-hub { /* u43 */
+               i2c-bus = <&usbhub_i2c0>;
+               compatible = "microchip,usb5744";
+               reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>;
+       };
+
+       usb2244: usb-sd { /* u38 */
+               compatible = "microchip,usb2244";
+               reset-gpios = <&slg7xl45106 2 GPIO_ACTIVE_LOW>;
+       };
+};
+
+&dwc3_0 {
+       status = "okay";
+       dr_mode = "host";
+       snps,usb3_lpm_capable;
+       maximum-speed = "super-speed";
+};
+
+&usb1 { /* mio64 - mio75 */
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usb1_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 3 PHY_TYPE_USB3 1 2>;
+       reset-gpios = <&slg7xl45106 1 GPIO_ACTIVE_LOW>;
+       assigned-clock-rates = <250000000>, <20000000>;
+
+       usbhub1: usb-hub { /* u84 */
+               i2c-bus = <&usbhub_i2c1>;
+               compatible = "microchip,usb5744";
+               reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>;
+       };
+};
+
+&dwc3_1 {
+       status = "okay";
+       dr_mode = "host";
+       snps,usb3_lpm_capable;
+       maximum-speed = "super-speed";
+};
+
+&gem0 { /* mdio mio50/51 */
+       status = "okay";
+       phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>;
+       phy-handle = <&phy0>;
+       phy-mode = "sgmii";
+       is-internal-pcspma;
+       assigned-clock-rates = <250000000>;
+};
+
+&gem1 { /* mdio mio50/51, gem mio38 - mio49 */
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_gem1_default>;
+       phy-handle = <&phy1>;
+       phy-mode = "rgmii-id";
+       assigned-clock-rates = <250000000>;
+
+       mdio: mdio {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               phy0: ethernet-phy@4 { /* u81 */
+                       #phy-cells = <1>;
+                       compatible = "ethernet-phy-id2000.a231";
+                       reg = <4>;
+                       ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
+                       ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_75_NS>;
+                       ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
+                       ti,dp83867-rxctrl-strap-quirk;
+                       reset-assert-us = <300>;
+                       reset-deassert-us = <280>;
+                       reset-gpios = <&slg7xl45106 5 GPIO_ACTIVE_LOW>;
+               };
+               phy1: ethernet-phy@8 { /* u36 */
+                       #phy-cells = <1>;
+                       compatible = "ethernet-phy-id2000.a231";
+                       reg = <8>;
+                       ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
+                       ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_75_NS>;
+                       ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
+                       ti,dp83867-rxctrl-strap-quirk;
+                       reset-assert-us = <100>;
+                       reset-deassert-us = <280>;
+                       reset-gpios = <&slg7xl45106 6 GPIO_ACTIVE_LOW>;
+               };
+       };
+};
+
+/* gem2/gem3 via PL with phys u79@2 and u80@3 */
+
+&pinctrl0 {
+       status = "okay";
+
+       pinctrl_uart1_default: uart1-default {
+               conf {
+                       groups = "uart1_9_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+                       drive-strength = <12>;
+               };
+
+               conf-rx {
+                       pins = "MIO37";
+                       bias-high-impedance;
+               };
+
+               conf-tx {
+                       pins = "MIO36";
+                       bias-disable;
+                       output-enable;
+               };
+
+               mux {
+                       groups = "uart1_9_grp";
+                       function = "uart1";
+               };
+       };
+
+       pinctrl_i2c1_default: i2c1-default {
+               conf {
+                       groups = "i2c1_6_grp";
+                       bias-pull-up;
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               mux {
+                       groups = "i2c1_6_grp";
+                       function = "i2c1";
+               };
+       };
+
+       pinctrl_i2c1_gpio: i2c1-gpio {
+               conf {
+                       groups = "gpio0_24_grp", "gpio0_25_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               mux {
+                       groups = "gpio0_24_grp", "gpio0_25_grp";
+                       function = "gpio0";
+               };
+       };
+
+       pinctrl_gem1_default: gem1-default {
+               conf {
+                       groups = "ethernet1_0_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               conf-rx {
+                       pins = "MIO44", "MIO46", "MIO48";
+                       bias-high-impedance;
+                       low-power-disable;
+               };
+
+               conf-bootstrap {
+                       pins = "MIO45", "MIO47", "MIO49";
+                       bias-disable;
+                       output-enable;
+                       low-power-disable;
+               };
+
+               conf-tx {
+                       pins = "MIO38", "MIO39", "MIO40",
+                               "MIO41", "MIO42", "MIO43";
+                       bias-disable;
+                       output-enable;
+                       low-power-enable;
+               };
+
+               conf-mdio {
+                       groups = "mdio1_0_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+                       bias-disable;
+                       output-enable;
+               };
+
+               mux-mdio {
+                       function = "mdio1";
+                       groups = "mdio1_0_grp";
+               };
+
+               mux {
+                       function = "ethernet1";
+                       groups = "ethernet1_0_grp";
+               };
+       };
+
+       pinctrl_usb0_default: usb0-default {
+               conf {
+                       groups = "usb0_0_grp";
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               conf-rx {
+                       pins = "MIO52", "MIO53", "MIO55";
+                       bias-high-impedance;
+                       drive-strength = <12>;
+                       slew-rate = <SLEW_RATE_FAST>;
+               };
+
+               conf-tx {
+                       pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59",
+                       "MIO60", "MIO61", "MIO62", "MIO63";
+                       bias-disable;
+                       output-enable;
+                       drive-strength = <4>;
+                       slew-rate = <SLEW_RATE_SLOW>;
+               };
+
+               mux {
+                       groups = "usb0_0_grp";
+                       function = "usb0";
+               };
+       };
+
+       pinctrl_usb1_default: usb1-default {
+               conf {
+                       groups = "usb1_0_grp";
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               conf-rx {
+                       pins = "MIO64", "MIO65", "MIO67";
+                       bias-high-impedance;
+                       drive-strength = <12>;
+                       slew-rate = <SLEW_RATE_FAST>;
+               };
+
+               conf-tx {
+                       pins = "MIO66", "MIO68", "MIO69", "MIO70", "MIO71",
+                       "MIO72", "MIO73", "MIO74", "MIO75";
+                       bias-disable;
+                       output-enable;
+                       drive-strength = <4>;
+                       slew-rate = <SLEW_RATE_SLOW>;
+               };
+
+               mux {
+                       groups = "usb1_0_grp";
+                       function = "usb1";
+               };
+       };
+};
+
+&uart1 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1_default>;
+};
diff --git a/arch/arm/dts/zynqmp-sck-kr-g-revB.dts b/arch/arm/dts/zynqmp-sck-kr-g-revB.dts
deleted file mode 100644 (file)
index 8f4c52d..0000000
+++ /dev/null
@@ -1,397 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * dts file for KR260 revB Carrier Card (A03 revision)
- *
- * (C) Copyright 2021 - 2022, Xilinx, Inc.
- *
- * Michal Simek <[email protected]>
- */
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/net/ti-dp83867.h>
-#include <dt-bindings/phy/phy.h>
-#include <dt-bindings/pinctrl/pinctrl-zynqmp.h>
-
-/dts-v1/;
-/plugin/;
-
-&{/} {
-       compatible = "xlnx,zynqmp-sk-kr260-revB",
-                    "xlnx,zynqmp-sk-kr260", "xlnx,zynqmp";
-       model = "ZynqMP KR260 revB";
-
-       ina260-u14 {
-               compatible = "iio-hwmon";
-               io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
-       };
-
-       clk_125: clock0 { /* u87 - GEM0/1 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <125000000>;
-       };
-
-       clk_27: clock1 { /* u86 - DP */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <27000000>;
-       };
-
-       clk_26: clock2 { /* u89 - USB */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <26000000>;
-       };
-
-       clk_156: clock3 { /* u90 - SFP+ */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <156250000>;
-       };
-
-       clk_25_0: clock4 { /* u92/u91 - GEM2 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <25000000>;
-       };
-
-       clk_25_1: clock5 { /* u92/u91 - GEM3 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <25000000>;
-       };
-};
-
-&i2c1 { /* I2C_SCK C26/C27 - MIO from SOM */
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default", "gpio";
-       pinctrl-0 = <&pinctrl_i2c1_default>;
-       pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-       sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-
-       u14: ina260@40 { /* u14 */
-               compatible = "ti,ina260";
-               #io-channel-cells = <1>;
-               label = "ina260-u14";
-               reg = <0x40>;
-       };
-
-       slg7xl45106: gpio@11 { /* u19 - reset logic */
-               compatible = "dlg,slg7xl45106";
-               reg = <0x11>;
-               label = "resetchip";
-               gpio-controller;
-               #gpio-cells = <2>;
-               gpio-line-names = "USB0_PHY_RESET_B", "USB1_PHY_RESET_B",
-                                 "SD_RESET_B", "USB0_HUB_RESET_B",
-                                 "USB1_HUB_RESET_B", "PS_GEM0_RESET_B",
-                                 "PS_GEM1_RESET_B", "";
-       };
-
-       i2c-mux@74 { /* u18 */
-               compatible = "nxp,pca9546";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <0x74>;
-               usbhub_i2c0: i2c@0 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0>;
-               };
-               usbhub_i2c1: i2c@1 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <1>;
-               };
-               /* Bus 2/3 are not connected */
-       };
-
-       /* si5332@6a - u17 - clock-generator */
-};
-
-/* GEM SGMII/DP and USB 3.0 */
-&psgtr {
-       status = "okay";
-       /* gem0/1, dp, usb */
-       clocks = <&clk_125>, <&clk_27>, <&clk_26>;
-       clock-names = "ref0", "ref1", "ref2";
-};
-
-&zynqmp_dpsub {
-       status = "okay";
-       phy-names = "dp-phy0";
-       phys = <&psgtr 1 PHY_TYPE_DP 0 1>;
-       assigned-clock-rates = <27000000>, <25000000>, <300000000>;
-};
-
-&zynqmp_dpdma {
-       status = "okay";
-       assigned-clock-rates = <600000000>;
-};
-
-&usb0 { /* mio52 - mio63 */
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usb0_default>;
-       phy-names = "usb3-phy";
-       phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
-       reset-gpios = <&slg7xl45106 0 GPIO_ACTIVE_LOW>;
-       assigned-clock-rates = <250000000>, <20000000>;
-
-       usbhub0: usb-hub { /* u43 */
-               i2c-bus = <&usbhub_i2c0>;
-               compatible = "microchip,usb5744";
-               reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>;
-       };
-
-       usb2244: usb-sd { /* u38 */
-               compatible = "microchip,usb2244";
-               reset-gpios = <&slg7xl45106 2 GPIO_ACTIVE_LOW>;
-       };
-};
-
-&dwc3_0 {
-       status = "okay";
-       dr_mode = "host";
-       snps,usb3_lpm_capable;
-       maximum-speed = "super-speed";
-};
-
-&usb1 { /* mio64 - mio75 */
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usb1_default>;
-       phy-names = "usb3-phy";
-       phys = <&psgtr 3 PHY_TYPE_USB3 1 2>;
-       reset-gpios = <&slg7xl45106 1 GPIO_ACTIVE_LOW>;
-       assigned-clock-rates = <250000000>, <20000000>;
-
-       usbhub1: usb-hub { /* u84 */
-               i2c-bus = <&usbhub_i2c1>;
-               compatible = "microchip,usb5744";
-               reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>;
-       };
-};
-
-&dwc3_1 {
-       status = "okay";
-       dr_mode = "host";
-       snps,usb3_lpm_capable;
-       maximum-speed = "super-speed";
-};
-
-&gem0 { /* mdio mio50/51 */
-       status = "okay";
-       phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>;
-       phy-handle = <&phy0>;
-       phy-mode = "sgmii";
-       is-internal-pcspma;
-       assigned-clock-rates = <250000000>;
-};
-
-&gem1 { /* mdio mio50/51, gem mio38 - mio49 */
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_gem1_default>;
-       phy-handle = <&phy1>;
-       phy-mode = "rgmii-id";
-       assigned-clock-rates = <250000000>;
-
-       mdio: mdio {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               phy0: ethernet-phy@4 { /* u81 */
-                       #phy-cells = <1>;
-                       compatible = "ethernet-phy-id2000.a231";
-                       reg = <4>;
-                       ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
-                       ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_75_NS>;
-                       ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
-                       ti,dp83867-rxctrl-strap-quirk;
-                       reset-assert-us = <300>;
-                       reset-deassert-us = <280>;
-                       reset-gpios = <&slg7xl45106 5 GPIO_ACTIVE_LOW>;
-               };
-               phy1: ethernet-phy@8 { /* u36 */
-                       #phy-cells = <1>;
-                       compatible = "ethernet-phy-id2000.a231";
-                       reg = <8>;
-                       ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
-                       ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_75_NS>;
-                       ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
-                       ti,dp83867-rxctrl-strap-quirk;
-                       reset-assert-us = <100>;
-                       reset-deassert-us = <280>;
-                       reset-gpios = <&slg7xl45106 6 GPIO_ACTIVE_LOW>;
-               };
-       };
-};
-
-/* gem2/gem3 via PL with phys u79@2 and u80@3 */
-
-&pinctrl0 {
-       status = "okay";
-
-       pinctrl_uart1_default: uart1-default {
-               conf {
-                       groups = "uart1_9_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-                       drive-strength = <12>;
-               };
-
-               conf-rx {
-                       pins = "MIO37";
-                       bias-high-impedance;
-               };
-
-               conf-tx {
-                       pins = "MIO36";
-                       bias-disable;
-                       output-enable;
-               };
-
-               mux {
-                       groups = "uart1_9_grp";
-                       function = "uart1";
-               };
-       };
-
-       pinctrl_i2c1_default: i2c1-default {
-               conf {
-                       groups = "i2c1_6_grp";
-                       bias-pull-up;
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               mux {
-                       groups = "i2c1_6_grp";
-                       function = "i2c1";
-               };
-       };
-
-       pinctrl_i2c1_gpio: i2c1-gpio {
-               conf {
-                       groups = "gpio0_24_grp", "gpio0_25_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               mux {
-                       groups = "gpio0_24_grp", "gpio0_25_grp";
-                       function = "gpio0";
-               };
-       };
-
-       pinctrl_gem1_default: gem1-default {
-               conf {
-                       groups = "ethernet1_0_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO44", "MIO46", "MIO48";
-                       bias-high-impedance;
-                       low-power-disable;
-               };
-
-               conf-bootstrap {
-                       pins = "MIO45", "MIO47", "MIO49";
-                       bias-disable;
-                       output-enable;
-                       low-power-disable;
-               };
-
-               conf-tx {
-                       pins = "MIO38", "MIO39", "MIO40",
-                               "MIO41", "MIO42", "MIO43";
-                       bias-disable;
-                       output-enable;
-                       low-power-enable;
-               };
-
-               conf-mdio {
-                       groups = "mdio1_0_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-                       bias-disable;
-                       output-enable;
-               };
-
-               mux-mdio {
-                       function = "mdio1";
-                       groups = "mdio1_0_grp";
-               };
-
-               mux {
-                       function = "ethernet1";
-                       groups = "ethernet1_0_grp";
-               };
-       };
-
-       pinctrl_usb0_default: usb0-default {
-               conf {
-                       groups = "usb0_0_grp";
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO52", "MIO53", "MIO55";
-                       bias-high-impedance;
-                       drive-strength = <12>;
-                       slew-rate = <SLEW_RATE_FAST>;
-               };
-
-               conf-tx {
-                       pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59",
-                       "MIO60", "MIO61", "MIO62", "MIO63";
-                       bias-disable;
-                       output-enable;
-                       drive-strength = <4>;
-                       slew-rate = <SLEW_RATE_SLOW>;
-               };
-
-               mux {
-                       groups = "usb0_0_grp";
-                       function = "usb0";
-               };
-       };
-
-       pinctrl_usb1_default: usb1-default {
-               conf {
-                       groups = "usb1_0_grp";
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO64", "MIO65", "MIO67";
-                       bias-high-impedance;
-                       drive-strength = <12>;
-                       slew-rate = <SLEW_RATE_FAST>;
-               };
-
-               conf-tx {
-                       pins = "MIO66", "MIO68", "MIO69", "MIO70", "MIO71",
-                       "MIO72", "MIO73", "MIO74", "MIO75";
-                       bias-disable;
-                       output-enable;
-                       drive-strength = <4>;
-                       slew-rate = <SLEW_RATE_SLOW>;
-               };
-
-               mux {
-                       groups = "usb1_0_grp";
-                       function = "usb1";
-               };
-       };
-};
-
-&uart1 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1_default>;
-};
diff --git a/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso b/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso
new file mode 100644 (file)
index 0000000..8f4c52d
--- /dev/null
@@ -0,0 +1,397 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * dts file for KR260 revB Carrier Card (A03 revision)
+ *
+ * (C) Copyright 2021 - 2022, Xilinx, Inc.
+ *
+ * Michal Simek <[email protected]>
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/net/ti-dp83867.h>
+#include <dt-bindings/phy/phy.h>
+#include <dt-bindings/pinctrl/pinctrl-zynqmp.h>
+
+/dts-v1/;
+/plugin/;
+
+&{/} {
+       compatible = "xlnx,zynqmp-sk-kr260-revB",
+                    "xlnx,zynqmp-sk-kr260", "xlnx,zynqmp";
+       model = "ZynqMP KR260 revB";
+
+       ina260-u14 {
+               compatible = "iio-hwmon";
+               io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
+       };
+
+       clk_125: clock0 { /* u87 - GEM0/1 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <125000000>;
+       };
+
+       clk_27: clock1 { /* u86 - DP */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <27000000>;
+       };
+
+       clk_26: clock2 { /* u89 - USB */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <26000000>;
+       };
+
+       clk_156: clock3 { /* u90 - SFP+ */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <156250000>;
+       };
+
+       clk_25_0: clock4 { /* u92/u91 - GEM2 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <25000000>;
+       };
+
+       clk_25_1: clock5 { /* u92/u91 - GEM3 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <25000000>;
+       };
+};
+
+&i2c1 { /* I2C_SCK C26/C27 - MIO from SOM */
+       #address-cells = <1>;
+       #size-cells = <0>;
+       pinctrl-names = "default", "gpio";
+       pinctrl-0 = <&pinctrl_i2c1_default>;
+       pinctrl-1 = <&pinctrl_i2c1_gpio>;
+       scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+
+       u14: ina260@40 { /* u14 */
+               compatible = "ti,ina260";
+               #io-channel-cells = <1>;
+               label = "ina260-u14";
+               reg = <0x40>;
+       };
+
+       slg7xl45106: gpio@11 { /* u19 - reset logic */
+               compatible = "dlg,slg7xl45106";
+               reg = <0x11>;
+               label = "resetchip";
+               gpio-controller;
+               #gpio-cells = <2>;
+               gpio-line-names = "USB0_PHY_RESET_B", "USB1_PHY_RESET_B",
+                                 "SD_RESET_B", "USB0_HUB_RESET_B",
+                                 "USB1_HUB_RESET_B", "PS_GEM0_RESET_B",
+                                 "PS_GEM1_RESET_B", "";
+       };
+
+       i2c-mux@74 { /* u18 */
+               compatible = "nxp,pca9546";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0x74>;
+               usbhub_i2c0: i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+               };
+               usbhub_i2c1: i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+               };
+               /* Bus 2/3 are not connected */
+       };
+
+       /* si5332@6a - u17 - clock-generator */
+};
+
+/* GEM SGMII/DP and USB 3.0 */
+&psgtr {
+       status = "okay";
+       /* gem0/1, dp, usb */
+       clocks = <&clk_125>, <&clk_27>, <&clk_26>;
+       clock-names = "ref0", "ref1", "ref2";
+};
+
+&zynqmp_dpsub {
+       status = "okay";
+       phy-names = "dp-phy0";
+       phys = <&psgtr 1 PHY_TYPE_DP 0 1>;
+       assigned-clock-rates = <27000000>, <25000000>, <300000000>;
+};
+
+&zynqmp_dpdma {
+       status = "okay";
+       assigned-clock-rates = <600000000>;
+};
+
+&usb0 { /* mio52 - mio63 */
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usb0_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
+       reset-gpios = <&slg7xl45106 0 GPIO_ACTIVE_LOW>;
+       assigned-clock-rates = <250000000>, <20000000>;
+
+       usbhub0: usb-hub { /* u43 */
+               i2c-bus = <&usbhub_i2c0>;
+               compatible = "microchip,usb5744";
+               reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>;
+       };
+
+       usb2244: usb-sd { /* u38 */
+               compatible = "microchip,usb2244";
+               reset-gpios = <&slg7xl45106 2 GPIO_ACTIVE_LOW>;
+       };
+};
+
+&dwc3_0 {
+       status = "okay";
+       dr_mode = "host";
+       snps,usb3_lpm_capable;
+       maximum-speed = "super-speed";
+};
+
+&usb1 { /* mio64 - mio75 */
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usb1_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 3 PHY_TYPE_USB3 1 2>;
+       reset-gpios = <&slg7xl45106 1 GPIO_ACTIVE_LOW>;
+       assigned-clock-rates = <250000000>, <20000000>;
+
+       usbhub1: usb-hub { /* u84 */
+               i2c-bus = <&usbhub_i2c1>;
+               compatible = "microchip,usb5744";
+               reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>;
+       };
+};
+
+&dwc3_1 {
+       status = "okay";
+       dr_mode = "host";
+       snps,usb3_lpm_capable;
+       maximum-speed = "super-speed";
+};
+
+&gem0 { /* mdio mio50/51 */
+       status = "okay";
+       phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>;
+       phy-handle = <&phy0>;
+       phy-mode = "sgmii";
+       is-internal-pcspma;
+       assigned-clock-rates = <250000000>;
+};
+
+&gem1 { /* mdio mio50/51, gem mio38 - mio49 */
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_gem1_default>;
+       phy-handle = <&phy1>;
+       phy-mode = "rgmii-id";
+       assigned-clock-rates = <250000000>;
+
+       mdio: mdio {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               phy0: ethernet-phy@4 { /* u81 */
+                       #phy-cells = <1>;
+                       compatible = "ethernet-phy-id2000.a231";
+                       reg = <4>;
+                       ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
+                       ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_75_NS>;
+                       ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
+                       ti,dp83867-rxctrl-strap-quirk;
+                       reset-assert-us = <300>;
+                       reset-deassert-us = <280>;
+                       reset-gpios = <&slg7xl45106 5 GPIO_ACTIVE_LOW>;
+               };
+               phy1: ethernet-phy@8 { /* u36 */
+                       #phy-cells = <1>;
+                       compatible = "ethernet-phy-id2000.a231";
+                       reg = <8>;
+                       ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
+                       ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_75_NS>;
+                       ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
+                       ti,dp83867-rxctrl-strap-quirk;
+                       reset-assert-us = <100>;
+                       reset-deassert-us = <280>;
+                       reset-gpios = <&slg7xl45106 6 GPIO_ACTIVE_LOW>;
+               };
+       };
+};
+
+/* gem2/gem3 via PL with phys u79@2 and u80@3 */
+
+&pinctrl0 {
+       status = "okay";
+
+       pinctrl_uart1_default: uart1-default {
+               conf {
+                       groups = "uart1_9_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+                       drive-strength = <12>;
+               };
+
+               conf-rx {
+                       pins = "MIO37";
+                       bias-high-impedance;
+               };
+
+               conf-tx {
+                       pins = "MIO36";
+                       bias-disable;
+                       output-enable;
+               };
+
+               mux {
+                       groups = "uart1_9_grp";
+                       function = "uart1";
+               };
+       };
+
+       pinctrl_i2c1_default: i2c1-default {
+               conf {
+                       groups = "i2c1_6_grp";
+                       bias-pull-up;
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               mux {
+                       groups = "i2c1_6_grp";
+                       function = "i2c1";
+               };
+       };
+
+       pinctrl_i2c1_gpio: i2c1-gpio {
+               conf {
+                       groups = "gpio0_24_grp", "gpio0_25_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               mux {
+                       groups = "gpio0_24_grp", "gpio0_25_grp";
+                       function = "gpio0";
+               };
+       };
+
+       pinctrl_gem1_default: gem1-default {
+               conf {
+                       groups = "ethernet1_0_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               conf-rx {
+                       pins = "MIO44", "MIO46", "MIO48";
+                       bias-high-impedance;
+                       low-power-disable;
+               };
+
+               conf-bootstrap {
+                       pins = "MIO45", "MIO47", "MIO49";
+                       bias-disable;
+                       output-enable;
+                       low-power-disable;
+               };
+
+               conf-tx {
+                       pins = "MIO38", "MIO39", "MIO40",
+                               "MIO41", "MIO42", "MIO43";
+                       bias-disable;
+                       output-enable;
+                       low-power-enable;
+               };
+
+               conf-mdio {
+                       groups = "mdio1_0_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+                       bias-disable;
+                       output-enable;
+               };
+
+               mux-mdio {
+                       function = "mdio1";
+                       groups = "mdio1_0_grp";
+               };
+
+               mux {
+                       function = "ethernet1";
+                       groups = "ethernet1_0_grp";
+               };
+       };
+
+       pinctrl_usb0_default: usb0-default {
+               conf {
+                       groups = "usb0_0_grp";
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               conf-rx {
+                       pins = "MIO52", "MIO53", "MIO55";
+                       bias-high-impedance;
+                       drive-strength = <12>;
+                       slew-rate = <SLEW_RATE_FAST>;
+               };
+
+               conf-tx {
+                       pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59",
+                       "MIO60", "MIO61", "MIO62", "MIO63";
+                       bias-disable;
+                       output-enable;
+                       drive-strength = <4>;
+                       slew-rate = <SLEW_RATE_SLOW>;
+               };
+
+               mux {
+                       groups = "usb0_0_grp";
+                       function = "usb0";
+               };
+       };
+
+       pinctrl_usb1_default: usb1-default {
+               conf {
+                       groups = "usb1_0_grp";
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               conf-rx {
+                       pins = "MIO64", "MIO65", "MIO67";
+                       bias-high-impedance;
+                       drive-strength = <12>;
+                       slew-rate = <SLEW_RATE_FAST>;
+               };
+
+               conf-tx {
+                       pins = "MIO66", "MIO68", "MIO69", "MIO70", "MIO71",
+                       "MIO72", "MIO73", "MIO74", "MIO75";
+                       bias-disable;
+                       output-enable;
+                       drive-strength = <4>;
+                       slew-rate = <SLEW_RATE_SLOW>;
+               };
+
+               mux {
+                       groups = "usb1_0_grp";
+                       function = "usb1";
+               };
+       };
+};
+
+&uart1 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1_default>;
+};
diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revA.dts b/arch/arm/dts/zynqmp-sck-kv-g-revA.dts
deleted file mode 100644 (file)
index 55bef1d..0000000
+++ /dev/null
@@ -1,351 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * dts file for KV260 revA Carrier Card
- *
- * (C) Copyright 2020 - 2021, Xilinx, Inc.
- *
- * SD level shifter:
- * "A" â€“ A01 board un-modified (NXP)
- * "Y" â€“ A01 board modified with legacy interposer (Nexperia)
- * "Z" â€“ A01 board modified with Diode interposer
- *
- * Michal Simek <[email protected]>
- */
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/net/ti-dp83867.h>
-#include <dt-bindings/phy/phy.h>
-#include <dt-bindings/pinctrl/pinctrl-zynqmp.h>
-
-/dts-v1/;
-/plugin/;
-
-&{/} {
-       compatible = "xlnx,zynqmp-sk-kv260-revA",
-                    "xlnx,zynqmp-sk-kv260-revY",
-                    "xlnx,zynqmp-sk-kv260-revZ",
-                    "xlnx,zynqmp-sk-kv260", "xlnx,zynqmp";
-       model = "ZynqMP KV260 revA";
-};
-
-&i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default", "gpio";
-       pinctrl-0 = <&pinctrl_i2c1_default>;
-       pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-       sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-
-       u14: ina260@40 { /* u14 */
-               compatible = "ti,ina260";
-               #io-channel-cells = <1>;
-               label = "ina260-u14";
-               reg = <0x40>;
-       };
-       /* u27 - 0xe0 - STDP4320 DP/HDMI splitter */
-};
-
-&amba {
-       ina260-u14 {
-               compatible = "iio-hwmon";
-               io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
-       };
-
-       si5332_0: si5332_0 { /* u17 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <125000000>;
-       };
-
-       si5332_1: si5332_1 { /* u17 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <25000000>;
-       };
-
-       si5332_2: si5332_2 { /* u17 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <48000000>;
-       };
-
-       si5332_3: si5332_3 { /* u17 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <24000000>;
-       };
-
-       si5332_4: si5332_4 { /* u17 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <26000000>;
-       };
-
-       si5332_5: si5332_5 { /* u17 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <27000000>;
-       };
-};
-
-/* DP/USB 3.0 and SATA */
-&psgtr {
-       status = "okay";
-       /* pcie, usb3, sata */
-       clocks = <&si5332_5>, <&si5332_4>, <&si5332_0>;
-       clock-names = "ref0", "ref1", "ref2";
-};
-
-&sata {
-       status = "okay";
-       /* SATA OOB timing settings */
-       ceva,p0-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>;
-       ceva,p0-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>;
-       ceva,p0-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
-       ceva,p0-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
-       ceva,p1-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>;
-       ceva,p1-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>;
-       ceva,p1-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
-       ceva,p1-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
-       phy-names = "sata-phy";
-       phys = <&psgtr 3 PHY_TYPE_SATA 1 2>;
-};
-
-&zynqmp_dpsub {
-       status = "okay";
-       phy-names = "dp-phy0", "dp-phy1";
-       phys = <&psgtr 1 PHY_TYPE_DP 0 0>, <&psgtr 0 PHY_TYPE_DP 1 0>;
-       assigned-clock-rates = <27000000>, <25000000>, <300000000>;
-};
-
-&zynqmp_dpdma {
-       status = "okay";
-       assigned-clock-rates = <600000000>;
-};
-
-&usb0 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usb0_default>;
-       phy-names = "usb3-phy";
-       phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;
-       usbhub: usb5744 { /* u43 */
-               compatible = "microchip,usb5744";
-               reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
-       };
-};
-
-&dwc3_0 {
-       status = "okay";
-       dr_mode = "host";
-       snps,usb3_lpm_capable;
-       maximum-speed = "super-speed";
-};
-
-&sdhci1 { /* on CC with tuned parameters */
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_sdhci1_default>;
-       /*
-        * SD 3.0 requires level shifter and this property
-        * should be removed if the board has level shifter and
-        * need to work in UHS mode
-        */
-       no-1-8-v;
-       disable-wp;
-       xlnx,mio-bank = <1>;
-       assigned-clock-rates = <187498123>;
-       bus-width = <8>;
-};
-
-&gem3 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_gem3_default>;
-       phy-handle = <&phy0>;
-       phy-mode = "rgmii-id";
-       assigned-clock-rates = <250000000>;
-
-       mdio: mdio {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               phy0: ethernet-phy@1 {
-                       #phy-cells = <1>;
-                       reg = <1>;
-                       compatible = "ethernet-phy-id2000.a231";
-                       ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
-                       ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_75_NS>;
-                       ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
-                       ti,dp83867-rxctrl-strap-quirk;
-                       reset-assert-us = <100>;
-                       reset-deassert-us = <280>;
-                       reset-gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
-               };
-       };
-};
-
-&pinctrl0 {
-       status = "okay";
-
-       pinctrl_uart1_default: uart1-default {
-               conf {
-                       groups = "uart1_9_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-                       drive-strength = <12>;
-               };
-
-               conf-rx {
-                       pins = "MIO37";
-                       bias-high-impedance;
-               };
-
-               conf-tx {
-                       pins = "MIO36";
-                       bias-disable;
-                       output-enable;
-               };
-
-               mux {
-                       groups = "uart1_9_grp";
-                       function = "uart1";
-               };
-       };
-
-       pinctrl_i2c1_default: i2c1-default {
-               conf {
-                       groups = "i2c1_6_grp";
-                       bias-pull-up;
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               mux {
-                       groups = "i2c1_6_grp";
-                       function = "i2c1";
-               };
-       };
-
-       pinctrl_i2c1_gpio: i2c1-gpio {
-               conf {
-                       groups = "gpio0_24_grp", "gpio0_25_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               mux {
-                       groups = "gpio0_24_grp", "gpio0_25_grp";
-                       function = "gpio0";
-               };
-       };
-
-       pinctrl_gem3_default: gem3-default {
-               conf {
-                       groups = "ethernet3_0_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO70", "MIO72", "MIO74";
-                       bias-high-impedance;
-                       low-power-disable;
-               };
-
-               conf-bootstrap {
-                       pins = "MIO71", "MIO73", "MIO75";
-                       bias-disable;
-                       output-enable;
-                       low-power-disable;
-               };
-
-               conf-tx {
-                       pins = "MIO64", "MIO65", "MIO66",
-                               "MIO67", "MIO68", "MIO69";
-                       bias-disable;
-                       output-enable;
-                       low-power-enable;
-               };
-
-               conf-mdio {
-                       groups = "mdio3_0_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-                       bias-disable;
-                       output-enable;
-               };
-
-               mux-mdio {
-                       function = "mdio3";
-                       groups = "mdio3_0_grp";
-               };
-
-               mux {
-                       function = "ethernet3";
-                       groups = "ethernet3_0_grp";
-               };
-       };
-
-       pinctrl_usb0_default: usb0-default {
-               conf {
-                       groups = "usb0_0_grp";
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO52", "MIO53", "MIO55";
-                       bias-high-impedance;
-                       drive-strength = <12>;
-                       slew-rate = <SLEW_RATE_FAST>;
-               };
-
-               conf-tx {
-                       pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59",
-                       "MIO60", "MIO61", "MIO62", "MIO63";
-                       bias-disable;
-                       output-enable;
-                       drive-strength = <4>;
-                       slew-rate = <SLEW_RATE_SLOW>;
-               };
-
-               mux {
-                       groups = "usb0_0_grp";
-                       function = "usb0";
-               };
-       };
-
-       pinctrl_sdhci1_default: sdhci1-default {
-               conf {
-                       groups = "sdio1_0_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-                       bias-disable;
-               };
-
-               conf-cd {
-                       groups = "sdio1_cd_0_grp";
-                       bias-high-impedance;
-                       bias-pull-up;
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               mux-cd {
-                       groups = "sdio1_cd_0_grp";
-                       function = "sdio1_cd";
-               };
-
-               mux {
-                       groups = "sdio1_0_grp";
-                       function = "sdio1";
-               };
-       };
-};
-
-&uart1 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1_default>;
-};
diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso b/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso
new file mode 100644 (file)
index 0000000..55bef1d
--- /dev/null
@@ -0,0 +1,351 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * dts file for KV260 revA Carrier Card
+ *
+ * (C) Copyright 2020 - 2021, Xilinx, Inc.
+ *
+ * SD level shifter:
+ * "A" â€“ A01 board un-modified (NXP)
+ * "Y" â€“ A01 board modified with legacy interposer (Nexperia)
+ * "Z" â€“ A01 board modified with Diode interposer
+ *
+ * Michal Simek <[email protected]>
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/net/ti-dp83867.h>
+#include <dt-bindings/phy/phy.h>
+#include <dt-bindings/pinctrl/pinctrl-zynqmp.h>
+
+/dts-v1/;
+/plugin/;
+
+&{/} {
+       compatible = "xlnx,zynqmp-sk-kv260-revA",
+                    "xlnx,zynqmp-sk-kv260-revY",
+                    "xlnx,zynqmp-sk-kv260-revZ",
+                    "xlnx,zynqmp-sk-kv260", "xlnx,zynqmp";
+       model = "ZynqMP KV260 revA";
+};
+
+&i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */
+       #address-cells = <1>;
+       #size-cells = <0>;
+       pinctrl-names = "default", "gpio";
+       pinctrl-0 = <&pinctrl_i2c1_default>;
+       pinctrl-1 = <&pinctrl_i2c1_gpio>;
+       scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+
+       u14: ina260@40 { /* u14 */
+               compatible = "ti,ina260";
+               #io-channel-cells = <1>;
+               label = "ina260-u14";
+               reg = <0x40>;
+       };
+       /* u27 - 0xe0 - STDP4320 DP/HDMI splitter */
+};
+
+&amba {
+       ina260-u14 {
+               compatible = "iio-hwmon";
+               io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
+       };
+
+       si5332_0: si5332_0 { /* u17 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <125000000>;
+       };
+
+       si5332_1: si5332_1 { /* u17 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <25000000>;
+       };
+
+       si5332_2: si5332_2 { /* u17 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <48000000>;
+       };
+
+       si5332_3: si5332_3 { /* u17 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <24000000>;
+       };
+
+       si5332_4: si5332_4 { /* u17 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <26000000>;
+       };
+
+       si5332_5: si5332_5 { /* u17 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <27000000>;
+       };
+};
+
+/* DP/USB 3.0 and SATA */
+&psgtr {
+       status = "okay";
+       /* pcie, usb3, sata */
+       clocks = <&si5332_5>, <&si5332_4>, <&si5332_0>;
+       clock-names = "ref0", "ref1", "ref2";
+};
+
+&sata {
+       status = "okay";
+       /* SATA OOB timing settings */
+       ceva,p0-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>;
+       ceva,p0-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>;
+       ceva,p0-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+       ceva,p0-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+       ceva,p1-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>;
+       ceva,p1-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>;
+       ceva,p1-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+       ceva,p1-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+       phy-names = "sata-phy";
+       phys = <&psgtr 3 PHY_TYPE_SATA 1 2>;
+};
+
+&zynqmp_dpsub {
+       status = "okay";
+       phy-names = "dp-phy0", "dp-phy1";
+       phys = <&psgtr 1 PHY_TYPE_DP 0 0>, <&psgtr 0 PHY_TYPE_DP 1 0>;
+       assigned-clock-rates = <27000000>, <25000000>, <300000000>;
+};
+
+&zynqmp_dpdma {
+       status = "okay";
+       assigned-clock-rates = <600000000>;
+};
+
+&usb0 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usb0_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;
+       usbhub: usb5744 { /* u43 */
+               compatible = "microchip,usb5744";
+               reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
+       };
+};
+
+&dwc3_0 {
+       status = "okay";
+       dr_mode = "host";
+       snps,usb3_lpm_capable;
+       maximum-speed = "super-speed";
+};
+
+&sdhci1 { /* on CC with tuned parameters */
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_sdhci1_default>;
+       /*
+        * SD 3.0 requires level shifter and this property
+        * should be removed if the board has level shifter and
+        * need to work in UHS mode
+        */
+       no-1-8-v;
+       disable-wp;
+       xlnx,mio-bank = <1>;
+       assigned-clock-rates = <187498123>;
+       bus-width = <8>;
+};
+
+&gem3 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_gem3_default>;
+       phy-handle = <&phy0>;
+       phy-mode = "rgmii-id";
+       assigned-clock-rates = <250000000>;
+
+       mdio: mdio {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               phy0: ethernet-phy@1 {
+                       #phy-cells = <1>;
+                       reg = <1>;
+                       compatible = "ethernet-phy-id2000.a231";
+                       ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
+                       ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_75_NS>;
+                       ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
+                       ti,dp83867-rxctrl-strap-quirk;
+                       reset-assert-us = <100>;
+                       reset-deassert-us = <280>;
+                       reset-gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
+               };
+       };
+};
+
+&pinctrl0 {
+       status = "okay";
+
+       pinctrl_uart1_default: uart1-default {
+               conf {
+                       groups = "uart1_9_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+                       drive-strength = <12>;
+               };
+
+               conf-rx {
+                       pins = "MIO37";
+                       bias-high-impedance;
+               };
+
+               conf-tx {
+                       pins = "MIO36";
+                       bias-disable;
+                       output-enable;
+               };
+
+               mux {
+                       groups = "uart1_9_grp";
+                       function = "uart1";
+               };
+       };
+
+       pinctrl_i2c1_default: i2c1-default {
+               conf {
+                       groups = "i2c1_6_grp";
+                       bias-pull-up;
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               mux {
+                       groups = "i2c1_6_grp";
+                       function = "i2c1";
+               };
+       };
+
+       pinctrl_i2c1_gpio: i2c1-gpio {
+               conf {
+                       groups = "gpio0_24_grp", "gpio0_25_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               mux {
+                       groups = "gpio0_24_grp", "gpio0_25_grp";
+                       function = "gpio0";
+               };
+       };
+
+       pinctrl_gem3_default: gem3-default {
+               conf {
+                       groups = "ethernet3_0_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               conf-rx {
+                       pins = "MIO70", "MIO72", "MIO74";
+                       bias-high-impedance;
+                       low-power-disable;
+               };
+
+               conf-bootstrap {
+                       pins = "MIO71", "MIO73", "MIO75";
+                       bias-disable;
+                       output-enable;
+                       low-power-disable;
+               };
+
+               conf-tx {
+                       pins = "MIO64", "MIO65", "MIO66",
+                               "MIO67", "MIO68", "MIO69";
+                       bias-disable;
+                       output-enable;
+                       low-power-enable;
+               };
+
+               conf-mdio {
+                       groups = "mdio3_0_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+                       bias-disable;
+                       output-enable;
+               };
+
+               mux-mdio {
+                       function = "mdio3";
+                       groups = "mdio3_0_grp";
+               };
+
+               mux {
+                       function = "ethernet3";
+                       groups = "ethernet3_0_grp";
+               };
+       };
+
+       pinctrl_usb0_default: usb0-default {
+               conf {
+                       groups = "usb0_0_grp";
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               conf-rx {
+                       pins = "MIO52", "MIO53", "MIO55";
+                       bias-high-impedance;
+                       drive-strength = <12>;
+                       slew-rate = <SLEW_RATE_FAST>;
+               };
+
+               conf-tx {
+                       pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59",
+                       "MIO60", "MIO61", "MIO62", "MIO63";
+                       bias-disable;
+                       output-enable;
+                       drive-strength = <4>;
+                       slew-rate = <SLEW_RATE_SLOW>;
+               };
+
+               mux {
+                       groups = "usb0_0_grp";
+                       function = "usb0";
+               };
+       };
+
+       pinctrl_sdhci1_default: sdhci1-default {
+               conf {
+                       groups = "sdio1_0_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+                       bias-disable;
+               };
+
+               conf-cd {
+                       groups = "sdio1_cd_0_grp";
+                       bias-high-impedance;
+                       bias-pull-up;
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               mux-cd {
+                       groups = "sdio1_cd_0_grp";
+                       function = "sdio1_cd";
+               };
+
+               mux {
+                       groups = "sdio1_0_grp";
+                       function = "sdio1";
+               };
+       };
+};
+
+&uart1 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1_default>;
+};
diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revB.dts b/arch/arm/dts/zynqmp-sck-kv-g-revB.dts
deleted file mode 100644 (file)
index 1b1d9e7..0000000
+++ /dev/null
@@ -1,339 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * dts file for KV260 revA Carrier Card
- *
- * (C) Copyright 2020 - 2021, Xilinx, Inc.
- *
- * Michal Simek <[email protected]>
- */
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/net/ti-dp83867.h>
-#include <dt-bindings/phy/phy.h>
-#include <dt-bindings/pinctrl/pinctrl-zynqmp.h>
-
-/dts-v1/;
-/plugin/;
-
-&{/} {
-       compatible = "xlnx,zynqmp-sk-kv260-rev2",
-                    "xlnx,zynqmp-sk-kv260-rev1",
-                    "xlnx,zynqmp-sk-kv260-revB",
-                    "xlnx,zynqmp-sk-kv260", "xlnx,zynqmp";
-       model = "ZynqMP KV260 revB";
-};
-
-&i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default", "gpio";
-       pinctrl-0 = <&pinctrl_i2c1_default>;
-       pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-       sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-
-       u14: ina260@40 { /* u14 */
-               compatible = "ti,ina260";
-               #io-channel-cells = <1>;
-               label = "ina260-u14";
-               reg = <0x40>;
-       };
-       /* u43 - 0x2d - USB hub */
-       /* u27 - 0xe0 - STDP4320 DP/HDMI splitter */
-};
-
-&amba {
-       ina260-u14 {
-               compatible = "iio-hwmon";
-               io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
-       };
-
-       si5332_0: si5332_0 { /* u17 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <125000000>;
-       };
-
-       si5332_1: si5332_1 { /* u17 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <25000000>;
-       };
-
-       si5332_2: si5332_2 { /* u17 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <48000000>;
-       };
-
-       si5332_3: si5332_3 { /* u17 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <24000000>;
-       };
-
-       si5332_4: si5332_4 { /* u17 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <26000000>;
-       };
-
-       si5332_5: si5332_5 { /* u17 */
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <27000000>;
-       };
-};
-
-/* DP/USB 3.0 */
-&psgtr {
-       status = "okay";
-       /* pcie, usb3, sata */
-       clocks = <&si5332_5>, <&si5332_4>, <&si5332_0>;
-       clock-names = "ref0", "ref1", "ref2";
-};
-
-&zynqmp_dpsub {
-       status = "okay";
-       phy-names = "dp-phy0", "dp-phy1";
-       phys = <&psgtr 1 PHY_TYPE_DP 0 0>, <&psgtr 0 PHY_TYPE_DP 1 0>;
-       assigned-clock-rates = <27000000>, <25000000>, <300000000>;
-};
-
-&zynqmp_dpdma {
-       status = "okay";
-       assigned-clock-rates = <600000000>;
-};
-
-&usb0 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usb0_default>;
-       phy-names = "usb3-phy";
-       phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;
-       assigned-clock-rates = <250000000>, <20000000>;
-
-       usb5744: usb-hub { /* u43 */
-               status = "okay";
-               compatible = "microchip,usb5744";
-               i2c-bus = <&i2c1>;
-               reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
-       };
-};
-
-&dwc3_0 {
-       status = "okay";
-       dr_mode = "host";
-       snps,usb3_lpm_capable;
-       maximum-speed = "super-speed";
-};
-
-&sdhci1 { /* on CC with tuned parameters */
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_sdhci1_default>;
-       /*
-        * SD 3.0 requires level shifter and this property
-        * should be removed if the board has level shifter and
-        * need to work in UHS mode
-        */
-       no-1-8-v;
-       disable-wp;
-       xlnx,mio-bank = <1>;
-       clk-phase-sd-hs = <126>, <60>;
-       clk-phase-uhs-sdr25 = <120>, <60>;
-       clk-phase-uhs-ddr50 = <126>, <48>;
-       assigned-clock-rates = <187498123>;
-       bus-width = <8>;
-};
-
-&gem3 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_gem3_default>;
-       phy-handle = <&phy0>;
-       phy-mode = "rgmii-id";
-       assigned-clock-rates = <250000000>;
-
-       mdio: mdio {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               phy0: ethernet-phy@1 {
-                       #phy-cells = <1>;
-                       reg = <1>;
-                       compatible = "ethernet-phy-id2000.a231";
-                       ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
-                       ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_75_NS>;
-                       ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
-                       ti,dp83867-rxctrl-strap-quirk;
-                       reset-assert-us = <100>;
-                       reset-deassert-us = <280>;
-                       reset-gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
-               };
-       };
-};
-
-&pinctrl0 {
-       status = "okay";
-
-       pinctrl_uart1_default: uart1-default {
-               conf {
-                       groups = "uart1_9_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-                       drive-strength = <12>;
-               };
-
-               conf-rx {
-                       pins = "MIO37";
-                       bias-high-impedance;
-               };
-
-               conf-tx {
-                       pins = "MIO36";
-                       bias-disable;
-                       output-enable;
-               };
-
-               mux {
-                       groups = "uart1_9_grp";
-                       function = "uart1";
-               };
-       };
-
-       pinctrl_i2c1_default: i2c1-default {
-               conf {
-                       groups = "i2c1_6_grp";
-                       bias-pull-up;
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               mux {
-                       groups = "i2c1_6_grp";
-                       function = "i2c1";
-               };
-       };
-
-       pinctrl_i2c1_gpio: i2c1-gpio {
-               conf {
-                       groups = "gpio0_24_grp", "gpio0_25_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               mux {
-                       groups = "gpio0_24_grp", "gpio0_25_grp";
-                       function = "gpio0";
-               };
-       };
-
-       pinctrl_gem3_default: gem3-default {
-               conf {
-                       groups = "ethernet3_0_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO70", "MIO72", "MIO74";
-                       bias-high-impedance;
-                       low-power-disable;
-               };
-
-               conf-bootstrap {
-                       pins = "MIO71", "MIO73", "MIO75";
-                       bias-disable;
-                       output-enable;
-                       low-power-disable;
-               };
-
-               conf-tx {
-                       pins = "MIO64", "MIO65", "MIO66",
-                               "MIO67", "MIO68", "MIO69";
-                       bias-disable;
-                       output-enable;
-                       low-power-enable;
-               };
-
-               conf-mdio {
-                       groups = "mdio3_0_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-                       bias-disable;
-                       output-enable;
-               };
-
-               mux-mdio {
-                       function = "mdio3";
-                       groups = "mdio3_0_grp";
-               };
-
-               mux {
-                       function = "ethernet3";
-                       groups = "ethernet3_0_grp";
-               };
-       };
-
-       pinctrl_usb0_default: usb0-default {
-               conf {
-                       groups = "usb0_0_grp";
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO52", "MIO53", "MIO55";
-                       bias-high-impedance;
-                       drive-strength = <12>;
-                       slew-rate = <SLEW_RATE_FAST>;
-               };
-
-               conf-tx {
-                       pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59",
-                       "MIO60", "MIO61", "MIO62", "MIO63";
-                       bias-disable;
-                       output-enable;
-                       drive-strength = <4>;
-                       slew-rate = <SLEW_RATE_SLOW>;
-               };
-
-               mux {
-                       groups = "usb0_0_grp";
-                       function = "usb0";
-               };
-       };
-
-       pinctrl_sdhci1_default: sdhci1-default {
-               conf {
-                       groups = "sdio1_0_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-                       bias-disable;
-               };
-
-               conf-cd {
-                       groups = "sdio1_cd_0_grp";
-                       bias-high-impedance;
-                       bias-pull-up;
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       power-source = <IO_STANDARD_LVCMOS18>;
-               };
-
-               mux-cd {
-                       groups = "sdio1_cd_0_grp";
-                       function = "sdio1_cd";
-               };
-
-               mux {
-                       groups = "sdio1_0_grp";
-                       function = "sdio1";
-               };
-       };
-};
-
-&uart1 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1_default>;
-};
diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso b/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso
new file mode 100644 (file)
index 0000000..1b1d9e7
--- /dev/null
@@ -0,0 +1,339 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * dts file for KV260 revA Carrier Card
+ *
+ * (C) Copyright 2020 - 2021, Xilinx, Inc.
+ *
+ * Michal Simek <[email protected]>
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/net/ti-dp83867.h>
+#include <dt-bindings/phy/phy.h>
+#include <dt-bindings/pinctrl/pinctrl-zynqmp.h>
+
+/dts-v1/;
+/plugin/;
+
+&{/} {
+       compatible = "xlnx,zynqmp-sk-kv260-rev2",
+                    "xlnx,zynqmp-sk-kv260-rev1",
+                    "xlnx,zynqmp-sk-kv260-revB",
+                    "xlnx,zynqmp-sk-kv260", "xlnx,zynqmp";
+       model = "ZynqMP KV260 revB";
+};
+
+&i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */
+       #address-cells = <1>;
+       #size-cells = <0>;
+       pinctrl-names = "default", "gpio";
+       pinctrl-0 = <&pinctrl_i2c1_default>;
+       pinctrl-1 = <&pinctrl_i2c1_gpio>;
+       scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+
+       u14: ina260@40 { /* u14 */
+               compatible = "ti,ina260";
+               #io-channel-cells = <1>;
+               label = "ina260-u14";
+               reg = <0x40>;
+       };
+       /* u43 - 0x2d - USB hub */
+       /* u27 - 0xe0 - STDP4320 DP/HDMI splitter */
+};
+
+&amba {
+       ina260-u14 {
+               compatible = "iio-hwmon";
+               io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
+       };
+
+       si5332_0: si5332_0 { /* u17 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <125000000>;
+       };
+
+       si5332_1: si5332_1 { /* u17 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <25000000>;
+       };
+
+       si5332_2: si5332_2 { /* u17 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <48000000>;
+       };
+
+       si5332_3: si5332_3 { /* u17 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <24000000>;
+       };
+
+       si5332_4: si5332_4 { /* u17 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <26000000>;
+       };
+
+       si5332_5: si5332_5 { /* u17 */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <27000000>;
+       };
+};
+
+/* DP/USB 3.0 */
+&psgtr {
+       status = "okay";
+       /* pcie, usb3, sata */
+       clocks = <&si5332_5>, <&si5332_4>, <&si5332_0>;
+       clock-names = "ref0", "ref1", "ref2";
+};
+
+&zynqmp_dpsub {
+       status = "okay";
+       phy-names = "dp-phy0", "dp-phy1";
+       phys = <&psgtr 1 PHY_TYPE_DP 0 0>, <&psgtr 0 PHY_TYPE_DP 1 0>;
+       assigned-clock-rates = <27000000>, <25000000>, <300000000>;
+};
+
+&zynqmp_dpdma {
+       status = "okay";
+       assigned-clock-rates = <600000000>;
+};
+
+&usb0 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usb0_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;
+       assigned-clock-rates = <250000000>, <20000000>;
+
+       usb5744: usb-hub { /* u43 */
+               status = "okay";
+               compatible = "microchip,usb5744";
+               i2c-bus = <&i2c1>;
+               reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
+       };
+};
+
+&dwc3_0 {
+       status = "okay";
+       dr_mode = "host";
+       snps,usb3_lpm_capable;
+       maximum-speed = "super-speed";
+};
+
+&sdhci1 { /* on CC with tuned parameters */
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_sdhci1_default>;
+       /*
+        * SD 3.0 requires level shifter and this property
+        * should be removed if the board has level shifter and
+        * need to work in UHS mode
+        */
+       no-1-8-v;
+       disable-wp;
+       xlnx,mio-bank = <1>;
+       clk-phase-sd-hs = <126>, <60>;
+       clk-phase-uhs-sdr25 = <120>, <60>;
+       clk-phase-uhs-ddr50 = <126>, <48>;
+       assigned-clock-rates = <187498123>;
+       bus-width = <8>;
+};
+
+&gem3 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_gem3_default>;
+       phy-handle = <&phy0>;
+       phy-mode = "rgmii-id";
+       assigned-clock-rates = <250000000>;
+
+       mdio: mdio {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               phy0: ethernet-phy@1 {
+                       #phy-cells = <1>;
+                       reg = <1>;
+                       compatible = "ethernet-phy-id2000.a231";
+                       ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
+                       ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_75_NS>;
+                       ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
+                       ti,dp83867-rxctrl-strap-quirk;
+                       reset-assert-us = <100>;
+                       reset-deassert-us = <280>;
+                       reset-gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
+               };
+       };
+};
+
+&pinctrl0 {
+       status = "okay";
+
+       pinctrl_uart1_default: uart1-default {
+               conf {
+                       groups = "uart1_9_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+                       drive-strength = <12>;
+               };
+
+               conf-rx {
+                       pins = "MIO37";
+                       bias-high-impedance;
+               };
+
+               conf-tx {
+                       pins = "MIO36";
+                       bias-disable;
+                       output-enable;
+               };
+
+               mux {
+                       groups = "uart1_9_grp";
+                       function = "uart1";
+               };
+       };
+
+       pinctrl_i2c1_default: i2c1-default {
+               conf {
+                       groups = "i2c1_6_grp";
+                       bias-pull-up;
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               mux {
+                       groups = "i2c1_6_grp";
+                       function = "i2c1";
+               };
+       };
+
+       pinctrl_i2c1_gpio: i2c1-gpio {
+               conf {
+                       groups = "gpio0_24_grp", "gpio0_25_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               mux {
+                       groups = "gpio0_24_grp", "gpio0_25_grp";
+                       function = "gpio0";
+               };
+       };
+
+       pinctrl_gem3_default: gem3-default {
+               conf {
+                       groups = "ethernet3_0_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               conf-rx {
+                       pins = "MIO70", "MIO72", "MIO74";
+                       bias-high-impedance;
+                       low-power-disable;
+               };
+
+               conf-bootstrap {
+                       pins = "MIO71", "MIO73", "MIO75";
+                       bias-disable;
+                       output-enable;
+                       low-power-disable;
+               };
+
+               conf-tx {
+                       pins = "MIO64", "MIO65", "MIO66",
+                               "MIO67", "MIO68", "MIO69";
+                       bias-disable;
+                       output-enable;
+                       low-power-enable;
+               };
+
+               conf-mdio {
+                       groups = "mdio3_0_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+                       bias-disable;
+                       output-enable;
+               };
+
+               mux-mdio {
+                       function = "mdio3";
+                       groups = "mdio3_0_grp";
+               };
+
+               mux {
+                       function = "ethernet3";
+                       groups = "ethernet3_0_grp";
+               };
+       };
+
+       pinctrl_usb0_default: usb0-default {
+               conf {
+                       groups = "usb0_0_grp";
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               conf-rx {
+                       pins = "MIO52", "MIO53", "MIO55";
+                       bias-high-impedance;
+                       drive-strength = <12>;
+                       slew-rate = <SLEW_RATE_FAST>;
+               };
+
+               conf-tx {
+                       pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59",
+                       "MIO60", "MIO61", "MIO62", "MIO63";
+                       bias-disable;
+                       output-enable;
+                       drive-strength = <4>;
+                       slew-rate = <SLEW_RATE_SLOW>;
+               };
+
+               mux {
+                       groups = "usb0_0_grp";
+                       function = "usb0";
+               };
+       };
+
+       pinctrl_sdhci1_default: sdhci1-default {
+               conf {
+                       groups = "sdio1_0_grp";
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+                       bias-disable;
+               };
+
+               conf-cd {
+                       groups = "sdio1_cd_0_grp";
+                       bias-high-impedance;
+                       bias-pull-up;
+                       slew-rate = <SLEW_RATE_SLOW>;
+                       power-source = <IO_STANDARD_LVCMOS18>;
+               };
+
+               mux-cd {
+                       groups = "sdio1_cd_0_grp";
+                       function = "sdio1_cd";
+               };
+
+               mux {
+                       groups = "sdio1_0_grp";
+                       function = "sdio1";
+               };
+       };
+};
+
+&uart1 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1_default>;
+};
This page took 0.122745 seconds and 4 git commands to generate.