diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-10-19 17:24:03 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-19 17:24:03 -0400 |
| commit | b41fb43911b4cb864812adec88d028cc6219f23e (patch) | |
| tree | f383de554dc3640ec3081ad41fa34f7cab68de82 /arch/arm/boot/dts/omap3.dtsi | |
| parent | 0963d59bc0bbed48b06733950f5eb167e9b9a8fa (diff) | |
| parent | 31d141e3a666269a3b6fcccddb0351caf7454240 (diff) | |
Merge tag 'v3.12-rc6' into devel
Linux 3.12-rc6
Conflicts:
drivers/gpio/gpio-lynxpoint.c
Diffstat (limited to 'arch/arm/boot/dts/omap3.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 7d95cda1fae4..b41bd57f4328 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi | |||
| @@ -108,7 +108,7 @@ | |||
| 108 | #address-cells = <1>; | 108 | #address-cells = <1>; |
| 109 | #size-cells = <0>; | 109 | #size-cells = <0>; |
| 110 | pinctrl-single,register-width = <16>; | 110 | pinctrl-single,register-width = <16>; |
| 111 | pinctrl-single,function-mask = <0x7f1f>; | 111 | pinctrl-single,function-mask = <0xff1f>; |
| 112 | }; | 112 | }; |
| 113 | 113 | ||
| 114 | omap3_pmx_wkup: pinmux@0x48002a00 { | 114 | omap3_pmx_wkup: pinmux@0x48002a00 { |
| @@ -117,7 +117,7 @@ | |||
| 117 | #address-cells = <1>; | 117 | #address-cells = <1>; |
| 118 | #size-cells = <0>; | 118 | #size-cells = <0>; |
| 119 | pinctrl-single,register-width = <16>; | 119 | pinctrl-single,register-width = <16>; |
| 120 | pinctrl-single,function-mask = <0x7f1f>; | 120 | pinctrl-single,function-mask = <0xff1f>; |
| 121 | }; | 121 | }; |
| 122 | 122 | ||
| 123 | gpio1: gpio@48310000 { | 123 | gpio1: gpio@48310000 { |