Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: imx7-tqma7: add SPI-NOR flash

The SPI-NOR flash on the SoM was missing from the device tree.

The TQMa7 as a designated QSPI_RESET# pin, however depending on the
hardware configuration the pin may be unconnected, or be used for a
different purpose. With this in mind, we mux the pin as a pullup and
define an input hog for it, but keep it a separate pin group, so that it
is easy for dependent Device Trees to modify the configuration.

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Matthias Schiffer and committed by
Shawn Guo
61b2f7b1 bac185ef

+43
+43
arch/arm/boot/dts/imx7-tqma7.dtsi
··· 19 19 cpu-supply = <&sw1a_reg>; 20 20 }; 21 21 22 + &gpio2 { 23 + /* Configured as pullup by QSPI pin group */ 24 + qspi-reset-hog { 25 + gpio-hog; 26 + gpios = <4 GPIO_ACTIVE_LOW>; 27 + input; 28 + line-name = "qspi-reset"; 29 + }; 30 + }; 31 + 22 32 &i2c1 { 23 33 pinctrl-names = "default"; 24 34 pinctrl-0 = <&pinctrl_i2c1>; ··· 170 160 >; 171 161 }; 172 162 163 + pinctrl_qspi: qspigrp { 164 + fsl,pins = < 165 + MX7D_PAD_EPDC_DATA00__QSPI_A_DATA0 0x5A 166 + MX7D_PAD_EPDC_DATA01__QSPI_A_DATA1 0x5A 167 + MX7D_PAD_EPDC_DATA02__QSPI_A_DATA2 0x5A 168 + MX7D_PAD_EPDC_DATA03__QSPI_A_DATA3 0x5A 169 + MX7D_PAD_EPDC_DATA05__QSPI_A_SCLK 0x11 170 + MX7D_PAD_EPDC_DATA06__QSPI_A_SS0_B 0x54 171 + MX7D_PAD_EPDC_DATA07__QSPI_A_SS1_B 0x54 172 + >; 173 + }; 174 + 175 + pinctrl_qspi_reset: qspi_resetgrp { 176 + fsl,pins = < 177 + /* #QSPI_RESET */ 178 + MX7D_PAD_EPDC_DATA04__GPIO2_IO4 0x52 179 + >; 180 + }; 181 + 173 182 pinctrl_usdhc3: usdhc3grp { 174 183 fsl,pins = < 175 184 MX7D_PAD_SD3_CMD__SD3_CMD 0x59 ··· 243 214 fsl,pins = < 244 215 MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x30 245 216 >; 217 + }; 218 + }; 219 + 220 + &qspi { 221 + pinctrl-names = "default"; 222 + pinctrl-0 = <&pinctrl_qspi &pinctrl_qspi_reset>; 223 + status = "okay"; 224 + 225 + flash0: flash@0 { 226 + compatible = "jedec,spi-nor"; 227 + reg = <0>; 228 + spi-max-frequency = <29000000>; 229 + spi-rx-bus-width = <4>; 230 + spi-tx-bus-width = <4>; 246 231 }; 247 232 }; 248 233