Commit eaad992e authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'at91-fixes-7.0' of...

Merge tag 'at91-fixes-7.0' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes

Microchip AT91 fixes for v7.0

This update includes:
- fix gpio-lines for SAM9X7 PIOB GPIO controller

* tag 'at91-fixes-7.0' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/at91/linux

:
  ARM: dts: microchip: sam9x7: fix gpio-lines count for pioB

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parents b986e98c 907150bb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ pioB: gpio@fffff600 {
				interrupt-controller;
				#gpio-cells = <2>;
				gpio-controller;
				#gpio-lines = <26>;
				#gpio-lines = <27>;
				clocks = <&pmc PMC_TYPE_PERIPHERAL 3>;
			};