]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm64: dts: imx8mm-beacon: Resync imx8mm-beacon-som with 5.11-rc4
authorAdam Ford <aford173@gmail.com>
Mon, 18 Jan 2021 21:43:09 +0000 (15:43 -0600)
committerStefano Babic <sbabic@denx.de>
Sat, 23 Jan 2021 12:40:29 +0000 (13:40 +0100)
In order to support the QSPI chip on the SOM, the Flexspi bus
needs to be configured to talk with the SPI chip.
Resync the som device tree with 5.11-rc4

Signed-off-by: Adam Ford <aford173@gmail.com>
Acked-by: Peng Fan <peng.fan@nxp.com>
arch/arm/dts/imx8mm-beacon-som.dtsi

index b88c3c99b007eaf6011ea2656a194ce338c3928d..d897913537ca1f940b4cb4df7c0e5e62fe0fb758 100644 (file)
@@ -4,6 +4,11 @@
  */
 
 / {
+       aliases {
+               rtc0 = &rtc;
+               rtc1 = &snvs_rtc;
+       };
+
        usdhc1_pwrseq: usdhc1_pwrseq {
                compatible = "mmc-pwrseq-simple";
                pinctrl-names = "default";
        cpu-supply = <&buck2_reg>;
 };
 
+&A53_1 {
+       cpu-supply = <&buck2_reg>;
+};
+
+&A53_2 {
+       cpu-supply = <&buck2_reg>;
+};
+
+&A53_3 {
+       cpu-supply = <&buck2_reg>;
+};
+
 &ddrc {
        operating-points-v2 = <&ddrc_opp_table>;
 
        };
 };
 
+&flexspi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexspi>;
+       status = "okay";
+
+       flash@0 {
+               reg = <0>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               spi-max-frequency = <80000000>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
+       };
+};
+
 &i2c1 {
        clock-frequency = <400000>;
        pinctrl-names = "default";
                interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
                rohm,reset-snvs-powered;
 
+               #clock-cells = <0>;
+               clocks = <&osc_32k 0>;
+               clock-output-names = "clk-32k-out";
+
                regulators {
                        buck1_reg: BUCK1 {
                                regulator-name = "buck1";
                reg = <0x50>;
        };
 
-       rtc@51 {
+       rtc: rtc@51 {
                compatible = "nxp,pcf85263";
                reg = <0x51>;
        };
 };
 
 &iomuxc {
-               pinctrl_fec1: fec1grp {
-                       fsl,pins = <
-                               MX8MM_IOMUXC_ENET_MDC_ENET1_MDC         0x3
-                               MX8MM_IOMUXC_ENET_MDIO_ENET1_MDIO       0x3
-                               MX8MM_IOMUXC_ENET_TD3_ENET1_RGMII_TD3   0x1f
-                               MX8MM_IOMUXC_ENET_TD2_ENET1_RGMII_TD2   0x1f
-                               MX8MM_IOMUXC_ENET_TD1_ENET1_RGMII_TD1   0x1f
-                               MX8MM_IOMUXC_ENET_TD0_ENET1_RGMII_TD0   0x1f
-                               MX8MM_IOMUXC_ENET_RD3_ENET1_RGMII_RD3   0x91
-                               MX8MM_IOMUXC_ENET_RD2_ENET1_RGMII_RD2   0x91
-                               MX8MM_IOMUXC_ENET_RD1_ENET1_RGMII_RD1   0x91
-                               MX8MM_IOMUXC_ENET_RD0_ENET1_RGMII_RD0   0x91
-                               MX8MM_IOMUXC_ENET_TXC_ENET1_RGMII_TXC   0x1f
-                               MX8MM_IOMUXC_ENET_RXC_ENET1_RGMII_RXC   0x91
-                               MX8MM_IOMUXC_ENET_RX_CTL_ENET1_RGMII_RX_CTL     0x91
-                               MX8MM_IOMUXC_ENET_TX_CTL_ENET1_RGMII_TX_CTL     0x1f
-                               MX8MM_IOMUXC_SAI2_RXC_GPIO4_IO22        0x19
-                       >;
-               };
+       pinctrl_fec1: fec1grp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_ENET_MDC_ENET1_MDC         0x3
+                       MX8MM_IOMUXC_ENET_MDIO_ENET1_MDIO       0x3
+                       MX8MM_IOMUXC_ENET_TD3_ENET1_RGMII_TD3   0x1f
+                       MX8MM_IOMUXC_ENET_TD2_ENET1_RGMII_TD2   0x1f
+                       MX8MM_IOMUXC_ENET_TD1_ENET1_RGMII_TD1   0x1f
+                       MX8MM_IOMUXC_ENET_TD0_ENET1_RGMII_TD0   0x1f
+                       MX8MM_IOMUXC_ENET_RD3_ENET1_RGMII_RD3   0x91
+                       MX8MM_IOMUXC_ENET_RD2_ENET1_RGMII_RD2   0x91
+                       MX8MM_IOMUXC_ENET_RD1_ENET1_RGMII_RD1   0x91
+                       MX8MM_IOMUXC_ENET_RD0_ENET1_RGMII_RD0   0x91
+                       MX8MM_IOMUXC_ENET_TXC_ENET1_RGMII_TXC   0x1f
+                       MX8MM_IOMUXC_ENET_RXC_ENET1_RGMII_RXC   0x91
+                       MX8MM_IOMUXC_ENET_RX_CTL_ENET1_RGMII_RX_CTL     0x91
+                       MX8MM_IOMUXC_ENET_TX_CTL_ENET1_RGMII_TX_CTL     0x1f
+                       MX8MM_IOMUXC_SAI2_RXC_GPIO4_IO22        0x19
+               >;
+       };
 
-               pinctrl_i2c1: i2c1grp {
-                       fsl,pins = <
-                               MX8MM_IOMUXC_I2C1_SCL_I2C1_SCL          0x400001c3
-                               MX8MM_IOMUXC_I2C1_SDA_I2C1_SDA          0x400001c3
-                       >;
-               };
+       pinctrl_i2c1: i2c1grp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_I2C1_SCL_I2C1_SCL          0x400001c3
+                       MX8MM_IOMUXC_I2C1_SDA_I2C1_SDA          0x400001c3
+               >;
+       };
 
-               pinctrl_i2c3: i2c3grp {
-                       fsl,pins = <
-                               MX8MM_IOMUXC_I2C3_SCL_I2C3_SCL          0x400001c3
-                               MX8MM_IOMUXC_I2C3_SDA_I2C3_SDA          0x400001c3
-                       >;
-               };
+       pinctrl_i2c3: i2c3grp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_I2C3_SCL_I2C3_SCL          0x400001c3
+                       MX8MM_IOMUXC_I2C3_SDA_I2C3_SDA          0x400001c3
+               >;
+       };
 
-               pinctrl_pmic: pmicirqgrp {
-                       fsl,pins = <
-                               MX8MM_IOMUXC_GPIO1_IO03_GPIO1_IO3       0x141
-                       >;
-               };
+       pinctrl_flexspi: flexspigrp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_NAND_ALE_QSPI_A_SCLK               0x1c2
+                       MX8MM_IOMUXC_NAND_CE0_B_QSPI_A_SS0_B            0x82
+                       MX8MM_IOMUXC_NAND_DATA00_QSPI_A_DATA0           0x82
+                       MX8MM_IOMUXC_NAND_DATA01_QSPI_A_DATA1           0x82
+                       MX8MM_IOMUXC_NAND_DATA02_QSPI_A_DATA2           0x82
+                       MX8MM_IOMUXC_NAND_DATA03_QSPI_A_DATA3           0x82
+               >;
+       };
 
-               pinctrl_uart1: uart1grp {
-                       fsl,pins = <
-                               MX8MM_IOMUXC_UART1_RXD_UART1_DCE_RX     0x140
-                               MX8MM_IOMUXC_UART1_TXD_UART1_DCE_TX     0x140
-                               MX8MM_IOMUXC_UART3_RXD_UART1_DCE_CTS_B  0x140
-                               MX8MM_IOMUXC_UART3_TXD_UART1_DCE_RTS_B  0x140
-                               MX8MM_IOMUXC_SD1_DATA4_GPIO2_IO6        0x19
-                               MX8MM_IOMUXC_SD1_DATA5_GPIO2_IO7        0x19
-                               MX8MM_IOMUXC_SD1_DATA6_GPIO2_IO8        0x19
-                               MX8MM_IOMUXC_GPIO1_IO00_ANAMIX_REF_CLK_32K      0x141
-                       >;
-               };
+       pinctrl_pmic: pmicirqgrp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_GPIO1_IO03_GPIO1_IO3       0x141
+               >;
+       };
 
-               pinctrl_usdhc1_gpio: usdhc1gpiogrp {
-                       fsl,pins = <
-                               MX8MM_IOMUXC_SD1_RESET_B_GPIO2_IO10     0x41
-                       >;
-               };
+       pinctrl_uart1: uart1grp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_UART1_RXD_UART1_DCE_RX     0x140
+                       MX8MM_IOMUXC_UART1_TXD_UART1_DCE_TX     0x140
+                       MX8MM_IOMUXC_UART3_RXD_UART1_DCE_CTS_B  0x140
+                       MX8MM_IOMUXC_UART3_TXD_UART1_DCE_RTS_B  0x140
+                       MX8MM_IOMUXC_SD1_DATA4_GPIO2_IO6        0x19
+                       MX8MM_IOMUXC_SD1_DATA5_GPIO2_IO7        0x19
+                       MX8MM_IOMUXC_SD1_DATA6_GPIO2_IO8        0x19
+                       MX8MM_IOMUXC_GPIO1_IO00_ANAMIX_REF_CLK_32K      0x141
+               >;
+       };
 
-               pinctrl_usdhc1: usdhc1grp {
-                       fsl,pins = <
-                               MX8MM_IOMUXC_SD1_CLK_USDHC1_CLK         0x190
-                               MX8MM_IOMUXC_SD1_CMD_USDHC1_CMD         0x1d0
-                               MX8MM_IOMUXC_SD1_DATA0_USDHC1_DATA0     0x1d0
-                               MX8MM_IOMUXC_SD1_DATA1_USDHC1_DATA1     0x1d0
-                               MX8MM_IOMUXC_SD1_DATA2_USDHC1_DATA2     0x1d0
-                               MX8MM_IOMUXC_SD1_DATA3_USDHC1_DATA3     0x1d0
-                       >;
-               };
+       pinctrl_usdhc1_gpio: usdhc1gpiogrp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_SD1_RESET_B_GPIO2_IO10     0x41
+               >;
+       };
 
-               pinctrl_usdhc1_100mhz: usdhc1-100mhzgrp {
-                       fsl,pins = <
-                               MX8MM_IOMUXC_SD1_CLK_USDHC1_CLK         0x194
-                               MX8MM_IOMUXC_SD1_CMD_USDHC1_CMD         0x1d4
-                               MX8MM_IOMUXC_SD1_DATA0_USDHC1_DATA0     0x1d4
-                               MX8MM_IOMUXC_SD1_DATA1_USDHC1_DATA1     0x1d4
-                               MX8MM_IOMUXC_SD1_DATA2_USDHC1_DATA2     0x1d4
-                               MX8MM_IOMUXC_SD1_DATA3_USDHC1_DATA3     0x1d4
-                       >;
-               };
+       pinctrl_usdhc1: usdhc1grp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_SD1_CLK_USDHC1_CLK         0x190
+                       MX8MM_IOMUXC_SD1_CMD_USDHC1_CMD         0x1d0
+                       MX8MM_IOMUXC_SD1_DATA0_USDHC1_DATA0     0x1d0
+                       MX8MM_IOMUXC_SD1_DATA1_USDHC1_DATA1     0x1d0
+                       MX8MM_IOMUXC_SD1_DATA2_USDHC1_DATA2     0x1d0
+                       MX8MM_IOMUXC_SD1_DATA3_USDHC1_DATA3     0x1d0
+               >;
+       };
 
-               pinctrl_usdhc1_200mhz: usdhc1-200mhzgrp {
-                       fsl,pins = <
-                               MX8MM_IOMUXC_SD1_CLK_USDHC1_CLK         0x196
-                               MX8MM_IOMUXC_SD1_CMD_USDHC1_CMD         0x1d6
-                               MX8MM_IOMUXC_SD1_DATA0_USDHC1_DATA0     0x1d6
-                               MX8MM_IOMUXC_SD1_DATA1_USDHC1_DATA1     0x1d6
-                               MX8MM_IOMUXC_SD1_DATA2_USDHC1_DATA2     0x1d6
-                               MX8MM_IOMUXC_SD1_DATA3_USDHC1_DATA3     0x1d6
-                       >;
-               };
+       pinctrl_usdhc1_100mhz: usdhc1-100mhzgrp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_SD1_CLK_USDHC1_CLK         0x194
+                       MX8MM_IOMUXC_SD1_CMD_USDHC1_CMD         0x1d4
+                       MX8MM_IOMUXC_SD1_DATA0_USDHC1_DATA0     0x1d4
+                       MX8MM_IOMUXC_SD1_DATA1_USDHC1_DATA1     0x1d4
+                       MX8MM_IOMUXC_SD1_DATA2_USDHC1_DATA2     0x1d4
+                       MX8MM_IOMUXC_SD1_DATA3_USDHC1_DATA3     0x1d4
+               >;
+       };
 
-               pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <
-                               MX8MM_IOMUXC_NAND_WE_B_USDHC3_CLK               0x190
-                               MX8MM_IOMUXC_NAND_WP_B_USDHC3_CMD               0x1d0
-                               MX8MM_IOMUXC_NAND_DATA04_USDHC3_DATA0           0x1d0
-                               MX8MM_IOMUXC_NAND_DATA05_USDHC3_DATA1           0x1d0
-                               MX8MM_IOMUXC_NAND_DATA06_USDHC3_DATA2           0x1d0
-                               MX8MM_IOMUXC_NAND_DATA07_USDHC3_DATA3           0x1d0
-                               MX8MM_IOMUXC_NAND_RE_B_USDHC3_DATA4             0x1d0
-                               MX8MM_IOMUXC_NAND_CE2_B_USDHC3_DATA5            0x1d0
-                               MX8MM_IOMUXC_NAND_CE3_B_USDHC3_DATA6            0x1d0
-                               MX8MM_IOMUXC_NAND_CLE_USDHC3_DATA7              0x1d0
-                               MX8MM_IOMUXC_NAND_CE1_B_USDHC3_STROBE           0x190
-                       >;
-               };
+       pinctrl_usdhc1_200mhz: usdhc1-200mhzgrp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_SD1_CLK_USDHC1_CLK         0x196
+                       MX8MM_IOMUXC_SD1_CMD_USDHC1_CMD         0x1d6
+                       MX8MM_IOMUXC_SD1_DATA0_USDHC1_DATA0     0x1d6
+                       MX8MM_IOMUXC_SD1_DATA1_USDHC1_DATA1     0x1d6
+                       MX8MM_IOMUXC_SD1_DATA2_USDHC1_DATA2     0x1d6
+                       MX8MM_IOMUXC_SD1_DATA3_USDHC1_DATA3     0x1d6
+               >;
+       };
 
-               pinctrl_usdhc3_100mhz: usdhc3-100mhzgrp {
-                       fsl,pins = <
-                               MX8MM_IOMUXC_NAND_WE_B_USDHC3_CLK               0x194
-                               MX8MM_IOMUXC_NAND_WP_B_USDHC3_CMD               0x1d4
-                               MX8MM_IOMUXC_NAND_DATA04_USDHC3_DATA0           0x1d4
-                               MX8MM_IOMUXC_NAND_DATA05_USDHC3_DATA1           0x1d4
-                               MX8MM_IOMUXC_NAND_DATA06_USDHC3_DATA2           0x1d4
-                               MX8MM_IOMUXC_NAND_DATA07_USDHC3_DATA3           0x1d4
-                               MX8MM_IOMUXC_NAND_RE_B_USDHC3_DATA4             0x1d4
-                               MX8MM_IOMUXC_NAND_CE2_B_USDHC3_DATA5            0x1d4
-                               MX8MM_IOMUXC_NAND_CE3_B_USDHC3_DATA6            0x1d4
-                               MX8MM_IOMUXC_NAND_CLE_USDHC3_DATA7              0x1d4
-                               MX8MM_IOMUXC_NAND_CE1_B_USDHC3_STROBE           0x194
-                       >;
-               };
+       pinctrl_usdhc3: usdhc3grp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_NAND_WE_B_USDHC3_CLK               0x190
+                       MX8MM_IOMUXC_NAND_WP_B_USDHC3_CMD               0x1d0
+                       MX8MM_IOMUXC_NAND_DATA04_USDHC3_DATA0           0x1d0
+                       MX8MM_IOMUXC_NAND_DATA05_USDHC3_DATA1           0x1d0
+                       MX8MM_IOMUXC_NAND_DATA06_USDHC3_DATA2           0x1d0
+                       MX8MM_IOMUXC_NAND_DATA07_USDHC3_DATA3           0x1d0
+                       MX8MM_IOMUXC_NAND_RE_B_USDHC3_DATA4             0x1d0
+                       MX8MM_IOMUXC_NAND_CE2_B_USDHC3_DATA5            0x1d0
+                       MX8MM_IOMUXC_NAND_CE3_B_USDHC3_DATA6            0x1d0
+                       MX8MM_IOMUXC_NAND_CLE_USDHC3_DATA7              0x1d0
+                       MX8MM_IOMUXC_NAND_CE1_B_USDHC3_STROBE           0x190
+               >;
+       };
 
-               pinctrl_usdhc3_200mhz: usdhc3-200mhzgrp {
-                       fsl,pins = <
-                               MX8MM_IOMUXC_NAND_WE_B_USDHC3_CLK               0x196
-                               MX8MM_IOMUXC_NAND_WP_B_USDHC3_CMD               0x1d6
-                               MX8MM_IOMUXC_NAND_DATA04_USDHC3_DATA0           0x1d6
-                               MX8MM_IOMUXC_NAND_DATA05_USDHC3_DATA1           0x1d6
-                               MX8MM_IOMUXC_NAND_DATA06_USDHC3_DATA2           0x1d6
-                               MX8MM_IOMUXC_NAND_DATA07_USDHC3_DATA3           0x1d6
-                               MX8MM_IOMUXC_NAND_RE_B_USDHC3_DATA4             0x1d6
-                               MX8MM_IOMUXC_NAND_CE2_B_USDHC3_DATA5            0x1d6
-                               MX8MM_IOMUXC_NAND_CE3_B_USDHC3_DATA6            0x1d6
-                               MX8MM_IOMUXC_NAND_CLE_USDHC3_DATA7              0x1d6
-                               MX8MM_IOMUXC_NAND_CE1_B_USDHC3_STROBE           0x196
-                       >;
-               };
+       pinctrl_usdhc3_100mhz: usdhc3-100mhzgrp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_NAND_WE_B_USDHC3_CLK               0x194
+                       MX8MM_IOMUXC_NAND_WP_B_USDHC3_CMD               0x1d4
+                       MX8MM_IOMUXC_NAND_DATA04_USDHC3_DATA0           0x1d4
+                       MX8MM_IOMUXC_NAND_DATA05_USDHC3_DATA1           0x1d4
+                       MX8MM_IOMUXC_NAND_DATA06_USDHC3_DATA2           0x1d4
+                       MX8MM_IOMUXC_NAND_DATA07_USDHC3_DATA3           0x1d4
+                       MX8MM_IOMUXC_NAND_RE_B_USDHC3_DATA4             0x1d4
+                       MX8MM_IOMUXC_NAND_CE2_B_USDHC3_DATA5            0x1d4
+                       MX8MM_IOMUXC_NAND_CE3_B_USDHC3_DATA6            0x1d4
+                       MX8MM_IOMUXC_NAND_CLE_USDHC3_DATA7              0x1d4
+                       MX8MM_IOMUXC_NAND_CE1_B_USDHC3_STROBE           0x194
+               >;
+       };
 
-               pinctrl_wdog: wdoggrp {
-                       fsl,pins = <
-                               MX8MM_IOMUXC_GPIO1_IO02_WDOG1_WDOG_B            0xc6
-                       >;
-               };
+       pinctrl_usdhc3_200mhz: usdhc3-200mhzgrp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_NAND_WE_B_USDHC3_CLK               0x196
+                       MX8MM_IOMUXC_NAND_WP_B_USDHC3_CMD               0x1d6
+                       MX8MM_IOMUXC_NAND_DATA04_USDHC3_DATA0           0x1d6
+                       MX8MM_IOMUXC_NAND_DATA05_USDHC3_DATA1           0x1d6
+                       MX8MM_IOMUXC_NAND_DATA06_USDHC3_DATA2           0x1d6
+                       MX8MM_IOMUXC_NAND_DATA07_USDHC3_DATA3           0x1d6
+                       MX8MM_IOMUXC_NAND_RE_B_USDHC3_DATA4             0x1d6
+                       MX8MM_IOMUXC_NAND_CE2_B_USDHC3_DATA5            0x1d6
+                       MX8MM_IOMUXC_NAND_CE3_B_USDHC3_DATA6            0x1d6
+                       MX8MM_IOMUXC_NAND_CLE_USDHC3_DATA7              0x1d6
+                       MX8MM_IOMUXC_NAND_CE1_B_USDHC3_STROBE           0x196
+               >;
+       };
 
-               pinctrl_wlan: wlangrp {
-                       fsl,pins = <
-                               MX8MM_IOMUXC_SD1_DATA7_GPIO2_IO9                0x111
-                       >;
-               };
+       pinctrl_wdog: wdoggrp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_GPIO1_IO02_WDOG1_WDOG_B            0x166
+               >;
+       };
+
+       pinctrl_wlan: wlangrp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_SD1_DATA7_GPIO2_IO9                0x111
+               >;
+       };
 };