Merge branch 'for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos4210-origen.dts

diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index 7d2cfba..1c53941 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -43,7 +43,7 @@
                enable-active-high;
        };
 
-       gpio_keys {
+       gpio-keys {
                compatible = "gpio-keys";
 
                up {
@@ -171,7 +171,7 @@
        pinctrl-0 = <&i2c0_bus>;
        pinctrl-names = "default";
 
-       max8997_pmic@66 {
+       pmic@66 {
                compatible = "maxim,max8997-pmic";
                reg = <0x66>;
                interrupt-parent = <&gpx0>;