Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / stm32mp15-pinctrl.dtsi

diff --git a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
index d84686e..20a59e8 100644 (file)
--- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
@@ -349,6 +349,61 @@
                };
        };
 
+       fmc_pins_b: fmc-1 {
+               pins {
+                       pinmux = <STM32_PINMUX('D', 4, AF12)>, /* FMC_NOE */
+                                <STM32_PINMUX('D', 5, AF12)>, /* FMC_NWE */
+                                <STM32_PINMUX('B', 7, AF12)>, /* FMC_NL */
+                                <STM32_PINMUX('D', 14, AF12)>, /* FMC_D0 */
+                                <STM32_PINMUX('D', 15, AF12)>, /* FMC_D1 */
+                                <STM32_PINMUX('D', 0, AF12)>, /* FMC_D2 */
+                                <STM32_PINMUX('D', 1, AF12)>, /* FMC_D3 */
+                                <STM32_PINMUX('E', 7, AF12)>, /* FMC_D4 */
+                                <STM32_PINMUX('E', 8, AF12)>, /* FMC_D5 */
+                                <STM32_PINMUX('E', 9, AF12)>, /* FMC_D6 */
+                                <STM32_PINMUX('E', 10, AF12)>, /* FMC_D7 */
+                                <STM32_PINMUX('E', 11, AF12)>, /* FMC_D8 */
+                                <STM32_PINMUX('E', 12, AF12)>, /* FMC_D9 */
+                                <STM32_PINMUX('E', 13, AF12)>, /* FMC_D10 */
+                                <STM32_PINMUX('E', 14, AF12)>, /* FMC_D11 */
+                                <STM32_PINMUX('E', 15, AF12)>, /* FMC_D12 */
+                                <STM32_PINMUX('D', 8, AF12)>, /* FMC_D13 */
+                                <STM32_PINMUX('D', 9, AF12)>, /* FMC_D14 */
+                                <STM32_PINMUX('D', 10, AF12)>, /* FMC_D15 */
+                                <STM32_PINMUX('G', 9, AF12)>, /* FMC_NE2_FMC_NCE */
+                                <STM32_PINMUX('G', 12, AF12)>; /* FMC_NE4 */
+                       bias-disable;
+                       drive-push-pull;
+                       slew-rate = <3>;
+               };
+       };
+
+       fmc_sleep_pins_b: fmc-sleep-1 {
+               pins {
+                       pinmux = <STM32_PINMUX('D', 4, ANALOG)>, /* FMC_NOE */
+                                <STM32_PINMUX('D', 5, ANALOG)>, /* FMC_NWE */
+                                <STM32_PINMUX('B', 7, ANALOG)>, /* FMC_NL */
+                                <STM32_PINMUX('D', 14, ANALOG)>, /* FMC_D0 */
+                                <STM32_PINMUX('D', 15, ANALOG)>, /* FMC_D1 */
+                                <STM32_PINMUX('D', 0, ANALOG)>, /* FMC_D2 */
+                                <STM32_PINMUX('D', 1, ANALOG)>, /* FMC_D3 */
+                                <STM32_PINMUX('E', 7, ANALOG)>, /* FMC_D4 */
+                                <STM32_PINMUX('E', 8, ANALOG)>, /* FMC_D5 */
+                                <STM32_PINMUX('E', 9, ANALOG)>, /* FMC_D6 */
+                                <STM32_PINMUX('E', 10, ANALOG)>, /* FMC_D7 */
+                                <STM32_PINMUX('E', 11, ANALOG)>, /* FMC_D8 */
+                                <STM32_PINMUX('E', 12, ANALOG)>, /* FMC_D9 */
+                                <STM32_PINMUX('E', 13, ANALOG)>, /* FMC_D10 */
+                                <STM32_PINMUX('E', 14, ANALOG)>, /* FMC_D11 */
+                                <STM32_PINMUX('E', 15, ANALOG)>, /* FMC_D12 */
+                                <STM32_PINMUX('D', 8, ANALOG)>, /* FMC_D13 */
+                                <STM32_PINMUX('D', 9, ANALOG)>, /* FMC_D14 */
+                                <STM32_PINMUX('D', 10, ANALOG)>, /* FMC_D15 */
+                                <STM32_PINMUX('G', 9, ANALOG)>, /* FMC_NE2_FMC_NCE */
+                                <STM32_PINMUX('G', 12, ANALOG)>; /* FMC_NE4 */
+               };
+       };
+
        i2c1_pins_a: i2c1-0 {
                pins {
                        pinmux = <STM32_PINMUX('D', 12, AF5)>, /* I2C1_SCL */
@@ -1591,6 +1646,27 @@
                };
        };
 
+       spi4_pins_a: spi4-0 {
+               pins {
+                       pinmux = <STM32_PINMUX('E', 12, AF5)>, /* SPI4_SCK */
+                                <STM32_PINMUX('E', 6, AF5)>;  /* SPI4_MOSI */
+                       bias-disable;
+                       drive-push-pull;
+                       slew-rate = <1>;
+               };
+               pins2 {
+                       pinmux = <STM32_PINMUX('E', 13, AF5)>; /* SPI4_MISO */
+                       bias-disable;
+               };
+       };
+
+       stusb1600_pins_a: stusb1600-0 {
+               pins {
+                       pinmux = <STM32_PINMUX('I', 11, ANALOG)>;
+                       bias-pull-up;
+               };
+       };
+
        uart4_pins_a: uart4-0 {
                pins1 {
                        pinmux = <STM32_PINMUX('G', 11, AF6)>; /* UART4_TX */
@@ -1726,20 +1802,6 @@
                };
        };
 
-       spi4_pins_a: spi4-0 {
-               pins {
-                       pinmux = <STM32_PINMUX('E', 12, AF5)>, /* SPI4_SCK */
-                                <STM32_PINMUX('E', 6, AF5)>;  /* SPI4_MOSI */
-                       bias-disable;
-                       drive-push-pull;
-                       slew-rate = <1>;
-               };
-               pins2 {
-                       pinmux = <STM32_PINMUX('E', 13, AF5)>; /* SPI4_MISO */
-                       bias-disable;
-               };
-       };
-
        usart2_pins_a: usart2-0 {
                pins1 {
                        pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */