diff options
| author | Olof Johansson <olof@lixom.net> | 2021-06-12 08:49:10 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2021-06-12 08:49:11 -0700 |
| commit | 9495e151f1c7c1a2711da5fa0e11b94112240e1d (patch) | |
| tree | 55a7c2302cc74d688ef5ed76caa7ab41013d6e29 /arch/arm/boot | |
| parent | 796f0ae8e74a5be48812000f0d9a9aaa04f6bb71 (diff) | |
| parent | 92e669017ff1616ba7d8ba3c65f5193bc2a7acbe (diff) | |
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>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/sama5d4.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi index 05c55875835d..f70a8528b959 100644 --- a/arch/arm/boot/dts/sama5d4.dtsi +++ b/arch/arm/boot/dts/sama5d4.dtsi @@ -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 */ >; |