diff options
| author | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-10 14:19:59 +0200 |
|---|---|---|
| committer | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-10 14:19:59 +0200 |
| commit | c1d2a6fa7e3635a0ac4e2a7cbe7ccbc2059b6968 (patch) | |
| tree | 15a6a12998f4d638a02a6cdcbaf5c418f7fc6ef8 /arch/arm/boot | |
| parent | b9b41da981217b17e1e9171a781c65ae8dde1688 (diff) | |
| parent | 89b6869b942b8730467f2a0760ea466044aa52d2 (diff) | |
Merge tag 'v5.4.156' into HEAD
This is the 5.4.156 stable release
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/spear3xx.dtsi | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts index 89f0c9979b89..4f63158d6b9b 100644 --- a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts +++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts @@ -69,7 +69,6 @@ isc: isc@f0008000 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_isc_base &pinctrl_isc_data_8bit &pinctrl_isc_data_9_10 &pinctrl_isc_data_11_12>; - status = "okay"; }; qspi1: spi@f0024000 { diff --git a/arch/arm/boot/dts/spear3xx.dtsi b/arch/arm/boot/dts/spear3xx.dtsi index f266b7b03482..cc88ebe7a60c 100644 --- a/arch/arm/boot/dts/spear3xx.dtsi +++ b/arch/arm/boot/dts/spear3xx.dtsi @@ -47,7 +47,7 @@ }; gmac: eth@e0800000 { - compatible = "st,spear600-gmac"; + compatible = "snps,dwmac-3.40a"; reg = <0xe0800000 0x8000>; interrupts = <23 22>; interrupt-names = "macirq", "eth_wake_irq"; |