diff options
| author | Olof Johansson <olof@lixom.net> | 2020-10-03 12:44:07 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-10-03 12:44:08 -0700 |
| commit | 1ddaaa42ac3b992b0dc56374db657576baeab977 (patch) | |
| tree | 872254a8106d171897a302d508a5d0b23903153a /arch/arm/boot/dts/dra72-evm-common.dtsi | |
| parent | 02d0bf1ae82ae7d6d440efffae9dd414c7831058 (diff) | |
| parent | 5e7998b8017f83d421fcf41421c562f63ed125cc (diff) | |
Merge tag 'omap-for-v5.10/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt
More dts changes for omaps for v5.10 merge window
Some more dts changes that did not make it to the first set of
dts changes:
- Drop unnessary nokia,nvm-size property
- A series of changes to use "okay" instead of "ok"
- A series of changes to move boards to use new cpsw switch
driver and drop the drop legacy cpsw dt node
- A series of changes to fix issues with the GPIO binding
usage
* tag 'omap-for-v5.10/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: am3874: iceboard: fix GPIO expander reset GPIOs
ARM: dts: am335x: t335: align GPIO hog names with dtschema
ARM: dts: am335x: lxm: fix PCA9539 GPIO expander properties
ARM: dts: am437x-l4: drop legacy cpsw dt node
ARM: dts: am437x: switch to new cpsw switch drv
ARM: dts: am437x-l4: add dt node for new cpsw switchdev driver
ARM: dts: dra7: drop legacy cpsw dt node
ARM: dts: am57xx-cl-som-am57x: switch to new cpsw switch drv
ARM: dts: dra7x-evm: switch to new cpsw switch drv
ARM: dts: beagle-x15: switch to new cpsw switch drv
ARM: dts: am57xx-idk: switch to new cpsw switch drv
ARM: dts: am5729: beagleboneai: switch to new cpsw switch drv
ARM: dts: am43xx: replace status value "ok" by "okay"
ARM: dts: dra7xx: replace status value "ok" by "okay"
ARM: dts: omap: replace status value "ok" by "okay"
ARM: dts: n9, n950: Remove nokia,nvm-size property
Link: https://lore.kernel.org/r/pull-1601445968-476435@atomide.com-2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/dra72-evm-common.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/dra72-evm-common.dtsi | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi index 9273a7d6fa29..b65b2dd094d0 100644 --- a/arch/arm/boot/dts/dra72-evm-common.dtsi +++ b/arch/arm/boot/dts/dra72-evm-common.dtsi @@ -462,12 +462,8 @@ }; }; -&mac { - status = "okay"; -}; - &dcan1 { - status = "ok"; + status = "okay"; pinctrl-names = "default", "sleep", "active"; pinctrl-0 = <&dcan1_pins_sleep>; pinctrl-1 = <&dcan1_pins_sleep>; @@ -536,11 +532,11 @@ }; &dss { - status = "ok"; + status = "okay"; }; &hdmi { - status = "ok"; + status = "okay"; port { hdmi_out: endpoint { |