Merge tag 'efi-2020-07-rc2-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
[oweals/u-boot.git] / arch / arm / dts / stm32746g-eval-u-boot.dtsi
index 27d3c8a4457a900d489b741d5c85938f5dc41bfd..d5fb92795d6653d957951ed481a3973838050ffc 100644 (file)
@@ -19,7 +19,7 @@
                gpio8 = &gpioi;
                gpio9 = &gpioj;
                gpio10 = &gpiok;
-               mmc0 = &sdio;
+               mmc0 = &sdio1;
                spi0 = &qspi;
        };
 
 &pinctrl {
        ethernet_mii: mii@0 {
                pins {
-                       pinmux = <STM32F746_PG13_FUNC_ETH_MII_TXD0_ETH_RMII_TXD0>,
-                                <STM32F746_PG14_FUNC_ETH_MII_TXD1_ETH_RMII_TXD1>,
-                                <STM32F746_PG11_FUNC_ETH_MII_TX_EN_ETH_RMII_TX_EN>,
-                                <STM32F746_PA2_FUNC_ETH_MDIO>,
-                                <STM32F746_PC1_FUNC_ETH_MDC>,
-                                <STM32F746_PA1_FUNC_ETH_MII_RX_CLK_ETH_RMII_REF_CLK>,
-                                <STM32F746_PA7_FUNC_ETH_MII_RX_DV_ETH_RMII_CRS_DV>,
-                                <STM32F746_PC4_FUNC_ETH_MII_RXD0_ETH_RMII_RXD0>,
-                               <STM32F746_PC5_FUNC_ETH_MII_RXD1_ETH_RMII_RXD1>;
+                       pinmux = <STM32_PINMUX('A', 0, AF11)>, /*ETH_MII_CRS */
+                                <STM32_PINMUX('A', 1, AF11)>, /*ETH_MII_RX_CLK */
+                                <STM32_PINMUX('A', 7, AF11)>, /*ETH_MII_RX_DV */
+                                <STM32_PINMUX('A', 8, AF0)>, /*ETH_MII_MCO1 */
+                                <STM32_PINMUX('G',13, AF11)>, /*ETH_MII_TXD0 */
+                                <STM32_PINMUX('G',14, AF11)>, /*ETH_MII_TXD1 */
+                                <STM32_PINMUX('C', 2, AF11)>, /*ETH_MII_TXD2 */
+                                <STM32_PINMUX('E', 2, AF11)>, /*ETH_MII_TXD3 */
+                                <STM32_PINMUX('C', 3, AF11)>, /*ETH_MII_TX_CLK */
+                                <STM32_PINMUX('C', 4, AF11)>, /*ETH_MII_RXD0 */
+                                <STM32_PINMUX('C', 5, AF11)>, /*ETH_MII_RXD1 */
+                                <STM32_PINMUX('H', 6, AF11)>, /*ETH_MII_RXD2 */
+                                <STM32_PINMUX('H', 7, AF11)>, /*ETH_MII_RXD3 */
+                                <STM32_PINMUX('G',11, AF11)>, /*ETH_MII_TX_EN */
+                                <STM32_PINMUX('C', 1, AF11)>, /*ETH_MII_MDC */
+                                <STM32_PINMUX('A', 2, AF11)>; /*ETH_MII_MDIO */
                        slew-rate = <2>;
                };
        };
 
        fmc_pins: fmc@0 {
                pins {
-                       pinmux = <STM32F746_PI10_FUNC_FMC_D31>, /* FMC_D31 */
-                                <STM32F746_PI9_FUNC_FMC_D30>,  /* FMC_D30*/
-                                <STM32F746_PI7_FUNC_FMC_D29>,  /* FMC_D29 */
-                                <STM32F746_PI6_FUNC_FMC_D28>,  /* FMC_D28 */
-                                <STM32F746_PI3_FUNC_FMC_D27>,  /* FMC_D27 */
-                                <STM32F746_PI2_FUNC_FMC_D26>,  /* FMC_D26 */
-                                <STM32F746_PI1_FUNC_FMC_D25>,  /* FMC_D25 */
-                                <STM32F746_PI0_FUNC_FMC_D24>,  /* FMC_D24 */
-                                <STM32F746_PH15_FUNC_FMC_D23>, /* FMC_D23 */
-                                <STM32F746_PH14_FUNC_FMC_D22>, /* FMC_D22 */
-                                <STM32F746_PH13_FUNC_FMC_D21>, /* FMC_D21 */
-                                <STM32F746_PH12_FUNC_FMC_D20>, /* FMC_D20 */
-                                <STM32F746_PH11_FUNC_FMC_D19>, /* FMC_D19 */
-                                <STM32F746_PH10_FUNC_FMC_D18>, /* FMC_D18 */
-                                <STM32F746_PH9_FUNC_FMC_D17>,  /* FMC_D17 */
-                                <STM32F746_PH8_FUNC_FMC_D16>,  /* FMC_D16 */
-
-                                <STM32F746_PD10_FUNC_FMC_D15>, /* FMC_D15 */
-                                <STM32F746_PD9_FUNC_FMC_D14>, /* FMC_D14*/
-                                <STM32F746_PD8_FUNC_FMC_D13>, /* FMC_D13 */
-                                <STM32F746_PE15_FUNC_FMC_D12>,/* FMC_D12 */
-                                <STM32F746_PE14_FUNC_FMC_D11>,/* FMC_D11 */
-                                <STM32F746_PE13_FUNC_FMC_D10>,/* FMC_D10 */
-                                <STM32F746_PE12_FUNC_FMC_D9>, /* FMC_D9 */
-                                <STM32F746_PE11_FUNC_FMC_D8>, /* FMC_D8 */
-                                <STM32F746_PE10_FUNC_FMC_D7>, /* FMC_D7 */
-                                <STM32F746_PE9_FUNC_FMC_D6>,  /* FMC_D6 */
-                                <STM32F746_PE8_FUNC_FMC_D5>,  /* FMC_D5*/
-                                <STM32F746_PE7_FUNC_FMC_D4>,  /* FMC_D4 */
-                                <STM32F746_PD1_FUNC_FMC_D3>,  /* FMC_D3 */
-                                <STM32F746_PD0_FUNC_FMC_D2>,  /* FMC_D2 */
-                                <STM32F746_PD15_FUNC_FMC_D1>, /* FMC_D1 */
-                                <STM32F746_PD14_FUNC_FMC_D0>, /* FMC_D0 */
-
-                                <STM32F746_PI5_FUNC_FMC_NBL3>, /* FMC_NBL3 */
-                                <STM32F746_PI4_FUNC_FMC_NBL2>, /* FMC_NBL2 */
-                                <STM32F746_PE1_FUNC_FMC_NBL1>, /* FMC_NBL1 */
-                                <STM32F746_PE0_FUNC_FMC_NBL0>, /* FMC_NBL0 */
-
-                                <STM32F746_PG5_FUNC_FMC_A15_FMC_BA1>, /* FMC_A15 FMC_BA1 */
-                                <STM32F746_PG4_FUNC_FMC_A14_FMC_BA0>, /* FMC_A14 FMC_BA0*/
-
-                                <STM32F746_PG1_FUNC_FMC_A11>, /* FMC_A11 */
-                                <STM32F746_PG0_FUNC_FMC_A10>, /* FMC_A10 */
-                                <STM32F746_PF15_FUNC_FMC_A9>, /* FMC_A9 */
-                                <STM32F746_PF14_FUNC_FMC_A8>, /* FMC_A8 */
-                                <STM32F746_PF13_FUNC_FMC_A7>, /* FMC_A7 */
-                                <STM32F746_PF12_FUNC_FMC_A6>, /* FMC_A6 */
-                                <STM32F746_PF5_FUNC_FMC_A5>,  /* FUNC_FMC_A5 */
-                                <STM32F746_PF4_FUNC_FMC_A4>,  /* FMC_A4 */
-                                <STM32F746_PF3_FUNC_FMC_A3>,  /* FMC_A3 */
-                                <STM32F746_PF2_FUNC_FMC_A2>,  /* FMC_A2 */
-                                <STM32F746_PF1_FUNC_FMC_A1>,  /* FMC_A1 */
-                                <STM32F746_PF0_FUNC_FMC_A0>,  /* FMC_A0 */
-
-                                <STM32F746_PH3_FUNC_FMC_SDNE0>,/* FMC_SDNE0 */
-                                <STM32F746_PH5_FUNC_FMC_SDNWE>, /* FMC_SDNWE */
-                                <STM32F746_PF11_FUNC_FMC_SDNRAS>, /* FMC_SDNRAS */
-                                <STM32F746_PG15_FUNC_FMC_SDNCAS>, /* FMC_SDNCAS */
-                                <STM32F746_PH2_FUNC_FMC_SDCKE0>, /* FMC_SDCKE0 */
-                                <STM32F746_PG8_FUNC_FMC_SDCLK>; /* FMC_SDCLK */
+                       pinmux = <STM32_PINMUX('I',10, AF12)>, /* D31 */
+                                <STM32_PINMUX('I', 9, AF12)>, /* D30 */
+                                <STM32_PINMUX('I', 7, AF12)>, /* D29 */
+                                <STM32_PINMUX('I', 6, AF12)>, /* D28 */
+                                <STM32_PINMUX('I', 3, AF12)>, /* D27 */
+                                <STM32_PINMUX('I', 2, AF12)>, /* D26 */
+                                <STM32_PINMUX('I', 1, AF12)>, /* D25 */
+                                <STM32_PINMUX('I', 0, AF12)>, /* D24 */
+                                <STM32_PINMUX('H',15, AF12)>, /* D23 */
+                                <STM32_PINMUX('H',14, AF12)>, /* D22 */
+                                <STM32_PINMUX('H',13, AF12)>, /* D21 */
+                                <STM32_PINMUX('H',12, AF12)>, /* D20 */
+                                <STM32_PINMUX('H',11, AF12)>, /* D19 */
+                                <STM32_PINMUX('H',10, AF12)>, /* D18 */
+                                <STM32_PINMUX('H', 9, AF12)>, /* D17 */
+                                <STM32_PINMUX('H', 8, AF12)>, /* D16 */
+
+                                <STM32_PINMUX('D',10, AF12)>, /* D15 */
+                                <STM32_PINMUX('D', 9, AF12)>, /* D14 */
+                                <STM32_PINMUX('D', 8, AF12)>, /* D13 */
+                                <STM32_PINMUX('E',15, AF12)>, /* D12 */
+                                <STM32_PINMUX('E',14, AF12)>, /* D11 */
+                                <STM32_PINMUX('E',13, AF12)>, /* D10 */
+                                <STM32_PINMUX('E',12, AF12)>, /* D9 */
+                                <STM32_PINMUX('E',11, AF12)>, /* D8 */
+                                <STM32_PINMUX('E',10, AF12)>, /* D7 */
+                                <STM32_PINMUX('E', 9, AF12)>, /* D6 */
+                                <STM32_PINMUX('E', 8, AF12)>, /* D5 */
+                                <STM32_PINMUX('E', 7, AF12)>, /* D4 */
+                                <STM32_PINMUX('D', 1, AF12)>, /* D3 */
+                                <STM32_PINMUX('D', 0, AF12)>, /* D2 */
+                                <STM32_PINMUX('D',15, AF12)>, /* D1 */
+                                <STM32_PINMUX('D',14, AF12)>, /* D0 */
+
+                                <STM32_PINMUX('I', 5, AF12)>, /* NBL3 */
+                                <STM32_PINMUX('I', 4, AF12)>, /* NBL2 */
+                                <STM32_PINMUX('E', 1, AF12)>, /* NBL1 */
+                                <STM32_PINMUX('E', 0, AF12)>, /* NBL0 */
+
+                                <STM32_PINMUX('G', 5, AF12)>, /* BA1 */
+                                <STM32_PINMUX('G', 4, AF12)>, /* BA0 */
+
+                                <STM32_PINMUX('G', 1, AF12)>, /* A11 */
+                                <STM32_PINMUX('G', 0, AF12)>, /* A10 */
+                                <STM32_PINMUX('F',15, AF12)>, /* A9 */
+                                <STM32_PINMUX('F',14, AF12)>, /* A8 */
+                                <STM32_PINMUX('F',13, AF12)>, /* A7 */
+                                <STM32_PINMUX('F',12, AF12)>, /* A6 */
+                                <STM32_PINMUX('F', 5, AF12)>, /* A5 */
+                                <STM32_PINMUX('F', 4, AF12)>, /* A4 */
+                                <STM32_PINMUX('F', 3, AF12)>, /* A3 */
+                                <STM32_PINMUX('F', 2, AF12)>, /* A2 */
+                                <STM32_PINMUX('F', 1, AF12)>, /* A1 */
+                                <STM32_PINMUX('F', 0, AF12)>, /* A0 */
+
+                                <STM32_PINMUX('H', 3, AF12)>, /* SDNE0 */
+                                <STM32_PINMUX('H', 5, AF12)>, /* SDNWE */
+                                <STM32_PINMUX('F',11, AF12)>, /* SDNRAS */
+                                <STM32_PINMUX('G',15, AF12)>, /* SDNCAS */
+                                <STM32_PINMUX('C', 3, AF12)>, /* SDCKE0 */
+                                <STM32_PINMUX('G', 8, AF12)>; /* SDCLK> */
                        slew-rate = <2>;
                };
        };
 
        qspi_pins: qspi@0 {
                pins {
-                       pinmux = <STM32F746_PB2_FUNC_QUADSPI_CLK>,
-                                <STM32F746_PB6_FUNC_QUADSPI_BK1_NCS>,
-                                <STM32F746_PF8_FUNC_QUADSPI_BK1_IO0>,
-                                <STM32F746_PF9_FUNC_QUADSPI_BK1_IO1>,
-                                <STM32F746_PF6_FUNC_QUADSPI_BK1_IO3>,
-                                <STM32F746_PF7_FUNC_QUADSPI_BK1_IO2>;
+                       pinmux = <STM32_PINMUX('B', 2, AF9)>, /* _FUNC_QUADSPI_CLK */
+                                <STM32_PINMUX('B', 6, AF10)>, /*_FUNC_QUADSPI_BK1_NCS */
+                                <STM32_PINMUX('F', 8, AF10)>, /* _FUNC_QUADSPI_BK1_IO0 */
+                                <STM32_PINMUX('F', 9, AF10)>, /* _FUNC_QUADSPI_BK1_IO1 */
+                                <STM32_PINMUX('F', 6, AF9)>, /* AF_FUNC_QUADSPI_BK1_IO3 */
+                                <STM32_PINMUX('F', 7, AF9)>; /* _FUNC_QUADSPI_BK1_IO2 */
                        slew-rate = <2>;
                };
        };
+
+       usart1_pins_a: usart1@0 {
+               u-boot,dm-pre-reloc;
+               pins1 {
+                       u-boot,dm-pre-reloc;
+               };
+               pins2 {
+                       u-boot,dm-pre-reloc;
+               };
+       };
 };
 
 &qspi {
+       reg = <0xA0001000 0x1000>, <0x90000000 0x4000000>;
        qflash0: n25q512a {
                #address-cells = <1>;
                #size-cells = <1>;
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <108000000>;
-               spi-tx-bus-width = <1>;
-               spi-rx-bus-width = <1>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
                reg = <0>;
        };
 };