Draft: WIP Kontron i.MX8MM/MP OSM-S Devicetree Improvements
Compare changes
Files
4
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -18,8 +18,6 @@ aliases {
@@ -35,8 +33,6 @@ pwm-beeper {
@@ -189,6 +185,10 @@ &pwm2 {
@@ -260,6 +260,9 @@ &usb3_phy1 {
@@ -277,12 +280,6 @@ MX8MP_IOMUXC_GPIO1_IO00__GPIO1_IO00 0x46
@@ -290,12 +287,6 @@ MX8MP_IOMUXC_SD2_WP__GPIO2_IO20 0x46