diff options
| author | Tom Rini <[email protected]> | 2021-09-28 13:57:56 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-09-28 13:57:56 -0400 |
| commit | b5d7a200a81097fddef7ba5ec42e330d49fa2f33 (patch) | |
| tree | 1fa564e36db8678724af5817e5163060f2852d54 /arch | |
| parent | 0b9bcf665cd98fe9db0956c894006b250a7d465f (diff) | |
| parent | 24ea366add54b8ca753eb3259bff8b50693dc8ef (diff) | |
Merge branch '2021-09-28-regression-fixes'
- Reintroduce creating internally the "nor%d" style names, in order to
fix some use U-Boot use-cases involving the "mtd" command.
- Fix a regression over the default SPI bus mode shown by having the
compiled default actually start being used. The correct default here
is 0.
- Fix ethernet on imx7d-sdb
- Fix a regression with MTD NAND devices when OF_LIVE is enabled
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/imx7d-sdb.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/dts/imx7d-sdb.dts b/arch/arm/dts/imx7d-sdb.dts index 8191ac7c334..ea2e58dd5aa 100644 --- a/arch/arm/dts/imx7d-sdb.dts +++ b/arch/arm/dts/imx7d-sdb.dts @@ -44,9 +44,9 @@ compatible = "spi-gpio"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_spi4>; - gpio-sck = <&gpio1 13 GPIO_ACTIVE_LOW>; - gpio-mosi = <&gpio1 9 GPIO_ACTIVE_LOW>; - cs-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpio-sck = <&gpio1 13 GPIO_ACTIVE_HIGH>; + gpio-mosi = <&gpio1 9 GPIO_ACTIVE_HIGH>; + cs-gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; num-chipselects = <1>; #address-cells = <1>; #size-cells = <0>; |