Merge git://git.denx.de/u-boot-video

[oweals/u-boot.git] / arch / arm / dts / exynos4x12-pinctrl-uboot.dtsi

diff --git a/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi b/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi
index c02796d2b37e420aea244b4ad75b30ad4d5308e1..33ecc148a79ee78e1d4a0f82005be9f09f5c5787 100644 (file)
--- a/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi
+++ b/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi
@@ -2,45 +2,44 @@
  * U-Boot additions to enable a generic Exynos GPIO driver
  *
  * Copyright (c) 2014 Google, Inc
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /{
        pinctrl_0: pinctrl@11400000 {
                #address-cells = <1>;
-               #size-cells = <0>;
+               #size-cells = <1>;
                gpf0: gpf0 {
-                       reg = <0xc180>;
+                       reg = <0x180 0x20>;
                };
                gpj0: gpj0 {
-                       reg = <0x240>;
+                       reg = <0x240 0x20>;
                };
        };
 
        pinctrl_1: pinctrl@11000000 {
                #address-cells = <1>;
-               #size-cells = <0>;
+               #size-cells = <1>;
                gpk0: gpk0 {
-                       reg = <0x40>;
+                       reg = <0x40 0x20>;
                };
                gpm0: gpm0 {
-                       reg = <0x260>;
-               };
-               gpy0: gpy0 {
-                       reg = <0x120>;
+                       reg = <0x260 0x20>;
                };
                gpx0: gpx0 {
-                       reg = <0xc00>;
+                       reg = <0xc00 0x20>;
                };
        };
 
        pinctrl_2: pinctrl@03860000 {
                #address-cells = <1>;
-               #size-cells = <0>;
+               #size-cells = <1>;
        };
 
        pinctrl_3: pinctrl@106E0000 {
                #address-cells = <1>;
-               #size-cells = <0>;
+               #size-cells = <1>;
        };
 
 };