Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / amlogic / meson-g12b-odroid-n2.dts

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
index 6cfc2c69bb4facf84c683f9d9f8a28c91e5ae68b..42f15405750cd9f7ed1f01373580c86db0ee3b73 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
@@ -66,8 +66,8 @@
                gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>;
                gpios-states = <0>;
 
-               states = <3300000 0
-                         1800000 1>;
+               states = <3300000 0>,
+                        <1800000 1>;
        };
 
        flash_1v8: regulator-flash_1v8 {
@@ -395,6 +395,7 @@
        status = "okay";
        pinctrl-0 = <&remote_input_ao_pins>;
        pinctrl-names = "default";
+       linux,rc-map-name = "rc-odroid";
 };
 
 &pwm_ab {