diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-06-09 15:56:07 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-06-09 15:56:07 +0300 |
| commit | 08750aa8beef5fe120d74f1781b756f1a2988b56 (patch) | |
| tree | 7d551793f9d2f87a9c57637c04ff7503e333996d /arch | |
| parent | 739c4c317e20dbaab9b05780598932995e68b569 (diff) | |
| parent | e2ff42b4f1caf37ce8fca06f69e4970d6fa5ad69 (diff) | |
| download | linux-08750aa8beef5fe120d74f1781b756f1a2988b56.tar.xz | |
Merge tag 'zynq-dt-for-v6.5' of https://github.com/Xilinx/linux-xlnx into soc/dt
ARM: Zynq DT changes for v6.5
- Setup 400k as default i2c frequency
- Wire i2c recovery via gpio on zc702
* tag 'zynq-dt-for-v6.5' of https://github.com/Xilinx/linux-xlnx:
ARM: zynq: dts: Add SCL & SDA GPIO entries for recovery
ARM: zynq: dts: Setting default i2c clock frequency to 400kHz
Link: https://lore.kernel.org/r/c5c99ba2-f004-306c-6251-551826f90df8@amd.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/zynq-7000.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/zynq-zc702.dts | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index cd9931f6bcbd..a7db3f3009f2 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi @@ -149,6 +149,7 @@ clocks = <&clkc 38>; interrupt-parent = <&intc>; interrupts = <0 25 4>; + clock-frequency = <400000>; reg = <0xe0004000 0x1000>; #address-cells = <1>; #size-cells = <0>; @@ -160,6 +161,7 @@ clocks = <&clkc 39>; interrupt-parent = <&intc>; interrupts = <0 48 4>; + clock-frequency = <400000>; reg = <0xe0005000 0x1000>; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index d23201ba8cd7..6efdbca9d3ef 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -5,6 +5,7 @@ */ /dts-v1/; #include "zynq-7000.dtsi" +#include <dt-bindings/gpio/gpio.h> / { model = "Xilinx ZC702 board"; @@ -106,8 +107,11 @@ &i2c0 { status = "okay"; clock-frequency = <400000>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c0_default>; + pinctrl-1 = <&pinctrl_i2c0_gpio>; + scl-gpios = <&gpio0 50 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + sda-gpios = <&gpio0 51 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; i2c-mux@74 { compatible = "nxp,pca9548"; @@ -298,6 +302,19 @@ }; }; + pinctrl_i2c0_gpio: i2c0-gpio { + mux { + groups = "gpio0_50_grp", "gpio0_51_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_50_grp", "gpio0_51_grp"; + slew-rate = <0>; + io-standard = <1>; + }; + }; + pinctrl_sdhci0_default: sdhci0-default { mux { groups = "sdio0_2_grp"; |