tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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.com
Signed-off-by: Olof Johansson <olof@lixom.net>

Olof Johansson 9495e151 796f0ae8

+2 -2
+1 -1
Documentation/devicetree/bindings/i2c/i2c-at91.txt
··· 73 73 pinctrl-0 = <&pinctrl_i2c0>; 74 74 pinctrl-1 = <&pinctrl_i2c0_gpio>; 75 75 sda-gpios = <&pioA 30 GPIO_ACTIVE_HIGH>; 76 - scl-gpios = <&pioA 31 GPIO_ACTIVE_HIGH>; 76 + scl-gpios = <&pioA 31 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 77 77 78 78 wm8731: wm8731@1a { 79 79 compatible = "wm8731";
+1 -1
arch/arm/boot/dts/sama5d4.dtsi
··· 787 787 0xffffffff 0x3ffcfe7c 0x1c010101 /* pioA */ 788 788 0x7fffffff 0xfffccc3a 0x3f00cc3a /* pioB */ 789 789 0xffffffff 0x3ff83fff 0xff00ffff /* pioC */ 790 - 0x0003ff00 0x8002a800 0x00000000 /* pioD */ 790 + 0xb003ff00 0x8002a800 0x00000000 /* pioD */ 791 791 0xffffffff 0x7fffffff 0x76fff1bf /* pioE */ 792 792 >; 793 793