UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

AT91 dt for 5.14: 

- A fix for sama5d4 gpio mux
 - A trivial fix for DT documentation
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQQ5TRCVIBiyi/S+BG4fOrpwrNPNDAUCYMNX7gAKCRAfOrpwrNPN
 DJa1AQCeS3dhkLRYeDZ56/QLM5fEOc8Udqml4JS2iGX16wJ9hQD9FdBKiXbRUvUV
 mq2JQ0C1smb6Ro5KPpHqlpJTtIfxNAE=
 =HggT
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2021-06-12 08:49:10 -07:00
parent 796f0ae8e7 92e669017f
commit 9495e151f1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/i2c/i2c-at91.txt
View File

@ -73,7 +73,7 @@ i2c0: i2c@f8034600 {
pinctrl-0 = <&pinctrl_i2c0>;
pinctrl-1 = <&pinctrl_i2c0_gpio>;
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 {
compatible = "wm8731";

2
arch/arm/boot/dts/sama5d4.dtsi
View File

@ -787,7 +787,7 @@
0xffffffff 0x3ffcfe7c 0x1c010101 /* pioA */
0x7fffffff 0xfffccc3a 0x3f00cc3a /* pioB */
0xffffffff 0x3ff83fff 0xff00ffff /* pioC */
0x0003ff00 0x8002a800 0x00000000 /* pioD */
0xb003ff00 0x8002a800 0x00000000 /* pioD */
0xffffffff 0x7fffffff 0x76fff1bf /* pioE */
>;