Commit 7089f574 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc/for-5.4/devicetree-arm64-fixes' of... 

Merge tag 'arm-soc/for-5.4/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux into arm/fixes

This pull request contains Broadcom ARM64-based SoCs Device Tree fixes
for 5.4, please pull the following:

- Rayangonda fixes the GPIO pins assignment for the Stringray SoCs

* tag 'arm-soc/for-5.4/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux:
  arm64: dts: Fix gpio to pinmux mapping

Link: https://lore.kernel.org/r/20191015172356.9650-2-f.fainelli@gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents dd163ca3 965f6603

arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -42,13 +42,14 @@ 


		pinmux: pinmux@14029c {

			compatible = "pinctrl-single";

			reg = <0x0014029c 0x250>;

			reg = <0x0014029c 0x26c>;

			#address-cells = <1>;

			#size-cells = <1>;

			pinctrl-single,register-width = <32>;

			pinctrl-single,function-mask = <0xf>;

			pinctrl-single,gpio-range = <

				&range 0 154 MODE_GPIO

				&range 0  91 MODE_GPIO

				&range 95 60 MODE_GPIO

				>;

			range: gpio-range {

				#pinctrl-single,gpio-range-cells = <3>;

arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -464,8 +464,7 @@ 
					<&pinmux 108 16 27>,

					<&pinmux 135 77 6>,

					<&pinmux 141 67 4>,

					<&pinmux 145 149 6>,

					<&pinmux 151 91 4>;

					<&pinmux 145 149 6>;

		};



		i2c1: i2c@e0000 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE