Merge tag 'for-5.15/io_uring-2021-09-04' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / marvell / cn9132-db.dts
index 81fba02..1f2e637 100644 (file)
  * Device tree for the CN9132-DB board.
  */
 
-#include "cn9131-db.dts"
+#include "cn9132-db.dtsi"
 
 / {
-       model = "Marvell Armada CN9132-DB";
-       compatible = "marvell,cn9132", "marvell,cn9131", "marvell,cn9130",
-                    "marvell,armada-ap807-quad", "marvell,armada-ap807";
-
-       aliases {
-               gpio5 = &cp2_gpio1;
-               gpio6 = &cp2_gpio2;
-               ethernet5 = &cp2_eth0;
-       };
-
-       cp2_reg_usb3_vbus0: cp2_usb3_vbus@0 {
-               compatible = "regulator-fixed";
-               regulator-name = "cp2-xhci0-vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               enable-active-high;
-               gpio = <&cp2_gpio1 2 GPIO_ACTIVE_HIGH>;
-       };
-
-       cp2_usb3_0_phy0: cp2_usb3_phy0 {
-               compatible = "usb-nop-xceiv";
-               vcc-supply = <&cp2_reg_usb3_vbus0>;
-       };
-
-       cp2_reg_usb3_vbus1: cp2_usb3_vbus@1 {
-               compatible = "regulator-fixed";
-               regulator-name = "cp2-xhci1-vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               enable-active-high;
-               gpio = <&cp2_gpio1 3 GPIO_ACTIVE_HIGH>;
-       };
-
-       cp2_usb3_0_phy1: cp2_usb3_phy1 {
-               compatible = "usb-nop-xceiv";
-               vcc-supply = <&cp2_reg_usb3_vbus1>;
-       };
-
-       cp2_reg_sd_vccq: cp2_sd_vccq@0 {
-               compatible = "regulator-gpio";
-               regulator-name = "cp2_sd_vcc";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <3300000>;
-               gpios = <&cp2_gpio2 17 GPIO_ACTIVE_HIGH>;
-               states = <1800000 0x1 3300000 0x0>;
-       };
-
-       cp2_sfp_eth0: sfp-eth0 {
-               compatible = "sff,sfp";
-               i2c-bus = <&cp2_sfpp0_i2c>;
-               los-gpio = <&cp2_module_expander1 11 GPIO_ACTIVE_HIGH>;
-               mod-def0-gpio = <&cp2_module_expander1 10 GPIO_ACTIVE_LOW>;
-               tx-disable-gpio = <&cp2_module_expander1 9 GPIO_ACTIVE_HIGH>;
-               tx-fault-gpio = <&cp2_module_expander1 8 GPIO_ACTIVE_HIGH>;
-               /*
-                * SFP cages are unconnected on early PCBs because of an the I2C
-                * lanes not being connected. Prevent the port for being
-                * unusable by disabling the SFP node.
-                */
-               status = "disabled";
-       };
+       model = "Marvell Armada CN9132-DB setup A";
 };
 
-/*
- * Instantiate the second slave CP115
+/* Setup A has SPI1 flash as a boot device, while setup B uses NAND flash.
+ * Since CP0 SPI1 and CP0 NAND are sharing some pins, they cannot be activated
+ * simultaneously. When SPI controller is enabled, NAND should be disabled.
  */
 
-#define CP11X_NAME             cp2
-#define CP11X_BASE             f6000000
-#define CP11X_PCIEx_MEM_BASE(iface) (0xe5000000 + (iface * 0x1000000))
-#define CP11X_PCIEx_MEM_SIZE(iface) 0xf00000
-#define CP11X_PCIE0_BASE       f6600000
-#define CP11X_PCIE1_BASE       f6620000
-#define CP11X_PCIE2_BASE       f6640000
-
-#include "armada-cp115.dtsi"
-
-#undef CP11X_NAME
-#undef CP11X_BASE
-#undef CP11X_PCIEx_MEM_BASE
-#undef CP11X_PCIEx_MEM_SIZE
-#undef CP11X_PCIE0_BASE
-#undef CP11X_PCIE1_BASE
-#undef CP11X_PCIE2_BASE
-
-&cp2_crypto {
-       status = "disabled";
-};
-
-&cp2_ethernet {
+&cp0_spi1 {
        status = "okay";
 };
 
-/* SLM-1521-V2, CON9 */
-&cp2_eth0 {
-       status = "disabled";
-       phy-mode = "10gbase-kr";
-       /* Generic PHY, providing serdes lanes */
-       phys = <&cp2_comphy4 0>;
-       managed = "in-band-status";
-       sfp = <&cp2_sfp_eth0>;
-};
-
-&cp2_gpio1 {
-       status = "okay";
-};
-
-&cp2_gpio2 {
-       status = "okay";
-};
-
-&cp2_i2c0 {
-       clock-frequency = <100000>;
-
-       /* SLM-1521-V2 - U3 */
-       i2c-mux@72 {
-               compatible = "nxp,pca9544";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <0x72>;
-               cp2_sfpp0_i2c: i2c@0 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0>;
-               };
-
-               i2c@1 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <1>;
-                       /* U12 */
-                       cp2_module_expander1: pca9555@21 {
-                               compatible = "nxp,pca9555";
-                               pinctrl-names = "default";
-                               gpio-controller;
-                               #gpio-cells = <2>;
-                               reg = <0x21>;
-                       };
-               };
-       };
-};
-
-/* SLM-1521-V2, CON6 */
-&cp2_pcie0 {
-       status = "okay";
-       num-lanes = <2>;
-       num-viewport = <8>;
-       /* Generic PHY, providing serdes lanes */
-       phys = <&cp2_comphy0 0
-               &cp2_comphy1 0>;
-};
-
-/* SLM-1521-V2, CON8 */
-&cp2_pcie2 {
-       status = "okay";
-       num-lanes = <1>;
-       num-viewport = <8>;
-       /* Generic PHY, providing serdes lanes */
-       phys = <&cp2_comphy5 2>;
-};
-
-&cp2_sata0 {
-       status = "okay";
-
-       /* SLM-1521-V2, CON4 */
-       sata-port@0 {
-               /* Generic PHY, providing serdes lanes */
-               phys = <&cp2_comphy2 0>;
-       };
-};
-
-/* CON 2 on SLM-1683 - microSD */
-&cp2_sdhci0 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&cp2_sdhci_pins>;
-       bus-width = <4>;
-       cd-gpios = <&cp2_gpio2 23 GPIO_ACTIVE_LOW>;
-       vqmmc-supply = <&cp2_reg_sd_vccq>;
-};
-
-&cp2_syscon0 {
-       cp2_pinctrl: pinctrl {
-               compatible = "marvell,cp115-standalone-pinctrl";
-
-               cp2_i2c0_pins: cp2-i2c-pins-0 {
-                       marvell,pins = "mpp37", "mpp38";
-                       marvell,function = "i2c0";
-               };
-               cp2_sdhci_pins: cp2-sdhi-pins-0 {
-                       marvell,pins = "mpp56", "mpp57", "mpp58",
-                                      "mpp59", "mpp60", "mpp61";
-                       marvell,function = "sdio";
-               };
-       };
-};
-
-&cp2_utmi {
-       status = "okay";
-};
-
-&cp2_usb3_0 {
-       status = "okay";
-       usb-phy = <&cp2_usb3_0_phy0>;
-       phys = <&cp2_utmi0>;
-       phy-names = "usb";
-       dr_mode = "host";
-};
-
-/* SLM-1521-V2, CON11 */
-&cp2_usb3_1 {
-       status = "okay";
-       usb-phy = <&cp2_usb3_0_phy1>;
-       /* Generic PHY, providing serdes lanes */
-       phys = <&cp2_comphy3 1>, <&cp2_utmi1>;
-       phy-names = "usb", "utmi";
-       dr_mode = "host";
-};