Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / arch / arm / dts / stm32f746-disco.dts

diff --git a/arch/arm/dts/stm32f746-disco.dts b/arch/arm/dts/stm32f746-disco.dts
index 454b515..9430dc0 100644 (file)
--- a/arch/arm/dts/stm32f746-disco.dts
+++ b/arch/arm/dts/stm32f746-disco.dts
@@ -1,68 +1,53 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
- * Copyright 2016 - Michael Kurz <michi.kurz@gmail.com>
+ * Copyright 2017 - Vikas MANOCHA <vikas.manocha@st.com>
  *
- * Based on:
- * stm32f469-disco.dts from Linux
- * Copyright 2016 - Lee Jones <lee.jones@linaro.org>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This file is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- * Or, alternatively,
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use,
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
 /dts-v1/;
 #include "stm32f746.dtsi"
+#include "stm32f746-pinctrl.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
 
 / {
        model = "STMicroelectronics STM32F746-DISCO board";
        compatible = "st,stm32f746-disco", "st,stm32f746";
 
        chosen {
-               bootargs = "root=/dev/ram rdinit=/linuxrc";
+               bootargs = "root=/dev/ram";
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@c0000000 {
+               device_type = "memory";
                reg = <0xC0000000 0x800000>;
        };
 
        aliases {
                serial0 = &usart1;
-               spi0 = &qspi;
+       };
+
+       usbotg_hs_phy: usb-phy {
+               #phy-cells = <0>;
+               compatible = "usb-nop-xceiv";
+               clocks = <&rcc 0 STM32F7_AHB1_CLOCK(OTGHSULPI)>;
+               clock-names = "main_clk";
+       };
+
+       /* This turns on vbus for otg fs for host mode (dwc2) */
+       vcc5v_otg_fs: vcc5v-otg-fs-regulator {
+               compatible = "regulator-fixed";
+               gpio = <&gpiod 5 0>;
+               regulator-name = "vcc5_host1";
+               regulator-always-on;
+       };
+
+       mmc_vcard: mmc_vcard {
+               compatible = "regulator-fixed";
+               regulator-name = "mmc_vcard";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
        };
 };
 
@@ -70,32 +55,42 @@
        clock-frequency = <25000000>;
 };
 
-&mac {
+&i2c1 {
+       pinctrl-0 = <&i2c1_pins_b>;
+       pinctrl-names = "default";
+       i2c-scl-rising-time-ns = <185>;
+       i2c-scl-falling-time-ns = <20>;
        status = "okay";
-       phy-mode = "rmii";
-       phy-handle = <&phy0>;
+};
 
-       mdio0 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "snps,dwmac-mdio";
-               phy0: ethernet-phy@0 {
-                       reg = <0>;
-               };
-       };
+&sdio1 {
+       status = "okay";
+       vmmc-supply = <&mmc_vcard>;
+       cd-gpios = <&gpioc 13 GPIO_ACTIVE_LOW>;
+       pinctrl-names = "default", "opendrain";
+       pinctrl-0 = <&sdio_pins_a>;
+       pinctrl-1 = <&sdio_pins_od_a>;
+       bus-width = <4>;
 };
 
-&qspi {
+&usart1 {
+       pinctrl-0 = <&usart1_pins_b>;
+       pinctrl-names = "default";
        status = "okay";
+};
 
-       qflash0: n25q128a {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       compatible = "micron,n25q128a13", "spi-flash";
-                       spi-max-frequency = <108000000>;
-                       spi-tx-bus-width = <1>;
-                       spi-rx-bus-width = <1>;
-                       memory-map = <0x90000000 0x1000000>;
-                       reg = <0>;
-       };
+&usbotg_fs {
+       dr_mode = "host";
+       pinctrl-0 = <&usbotg_fs_pins_a>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
+&usbotg_hs {
+       dr_mode = "host";
+       phys = <&usbotg_hs_phy>;
+       phy-names = "usb2-phy";
+       pinctrl-0 = <&usbotg_hs_pins_b>;
+       pinctrl-names = "default";
+       status = "okay";
 };