Unverified Commit 08750aa8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 739c4c31 e2ff42b4

arch/arm/boot/dts/zynq-7000.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ i2c0: i2c@e0004000 { 
			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 @@ i2c1: i2c@e0005000 { 
			clocks = <&clkc 39>;

			interrupt-parent = <&intc>;

			interrupts = <0 48 4>;

			clock-frequency = <400000>;

			reg = <0xe0005000 0x1000>;

			#address-cells = <1>;

			#size-cells = <0>;

arch/arm/boot/dts/zynq-zc702.dts

+18 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 */

/dts-v1/;

#include "zynq-7000.dtsi"

#include <dt-bindings/gpio/gpio.h>



/ {

	model = "Xilinx ZC702 board";
@@ -106,8 +107,11 @@ &gpio0 { 
&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 @@ conf { 
		};

	};



	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";