Commit 9495e151 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'at91-dt-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt

AT91 dt for 5.14:

- A fix for sama5d4 gpio mux
- A trivial fix for DT documentation

* tag 'at91-dt-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  dt-bindings: i2c: at91: fix example for scl-gpios
  ARM: dts: at91: sama5d4: fix pinctrl muxing

Link: https://lore.kernel.org/r/20210611123446.20510-1-nicolas.ferre@microchip.comSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 796f0ae8 92e66901
...@@ -73,7 +73,7 @@ i2c0: i2c@f8034600 { ...@@ -73,7 +73,7 @@ i2c0: i2c@f8034600 {
pinctrl-0 = <&pinctrl_i2c0>; pinctrl-0 = <&pinctrl_i2c0>;
pinctrl-1 = <&pinctrl_i2c0_gpio>; pinctrl-1 = <&pinctrl_i2c0_gpio>;
sda-gpios = <&pioA 30 GPIO_ACTIVE_HIGH>; sda-gpios = <&pioA 30 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioA 31 GPIO_ACTIVE_HIGH>; scl-gpios = <&pioA 31 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
wm8731: wm8731@1a { wm8731: wm8731@1a {
compatible = "wm8731"; compatible = "wm8731";
......
...@@ -787,7 +787,7 @@ pinctrl: pinctrl@fc06a000 { ...@@ -787,7 +787,7 @@ pinctrl: pinctrl@fc06a000 {
0xffffffff 0x3ffcfe7c 0x1c010101 /* pioA */ 0xffffffff 0x3ffcfe7c 0x1c010101 /* pioA */
0x7fffffff 0xfffccc3a 0x3f00cc3a /* pioB */ 0x7fffffff 0xfffccc3a 0x3f00cc3a /* pioB */
0xffffffff 0x3ff83fff 0xff00ffff /* pioC */ 0xffffffff 0x3ff83fff 0xff00ffff /* pioC */
0x0003ff00 0x8002a800 0x00000000 /* pioD */ 0xb003ff00 0x8002a800 0x00000000 /* pioD */
0xffffffff 0x7fffffff 0x76fff1bf /* pioE */ 0xffffffff 0x7fffffff 0x76fff1bf /* pioE */
>; >;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment