Skip to content

L
linux
Commit e5963e15 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'zynqmp-dt-for-6.6' of https://github.com/Xilinx/linux-xlnx into soc/dt 

arm64: ZynqMP DT changes for v6.6

- Describe caches
- Fix i2c gpio recovery description
- Setting up default i2c frequency
- Describe GEM TSU clock and assigned rates for SOMs
- Reserved 1MB for internal firmware usage
- Fix dwc3 IRQ description
- Describe interrupts by using macros

* tag 'zynqmp-dt-for-6.6' of https://github.com/Xilinx/linux-xlnx:
  arm64: zynqmp: Describe interrupts by using macros
  arm64: zynqmp: Fix dwc3 usb interrupt description
  arm64: zynqmp: Add memory reserved node for k26 Kria SOM board
  arm64: zynqmp: Assign TSU clock frequency for GEMs
  arm64: zynqmp: Setting default i2c clock frequency to 400kHz
  arm64: zynqmp: Fix open drain warning on ZynqMP
  arm64: zynqmp: Add L2 cache nodes

Link: https://lore.kernel.org/r/fde6d7b4-c751-219d-3ec5-04e5bad2aa17@monstr.euSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents bda81ccc cf0e27cd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 109 deletions
arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi
View file @ e5963e15
...@@ -146,24 +146,28 @@ &gem0 { ...@@ -146,24 +146,28 @@ &gem0 {
clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM0_REF>, clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM0_REF>,
<&zynqmp_clk GEM0_TX>, <&zynqmp_clk GEM0_RX>, <&zynqmp_clk GEM0_TX>, <&zynqmp_clk GEM0_RX>,
<&zynqmp_clk GEM_TSU>; <&zynqmp_clk GEM_TSU>;
assigned-clocks = <&zynqmp_clk GEM_TSU>;
}; };
&gem1 { &gem1 {
clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM1_REF>, clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM1_REF>,
<&zynqmp_clk GEM1_TX>, <&zynqmp_clk GEM1_RX>, <&zynqmp_clk GEM1_TX>, <&zynqmp_clk GEM1_RX>,
<&zynqmp_clk GEM_TSU>; <&zynqmp_clk GEM_TSU>;
assigned-clocks = <&zynqmp_clk GEM_TSU>;
}; };
&gem2 { &gem2 {
clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM2_REF>, clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM2_REF>,
<&zynqmp_clk GEM2_TX>, <&zynqmp_clk GEM2_RX>, <&zynqmp_clk GEM2_TX>, <&zynqmp_clk GEM2_RX>,
<&zynqmp_clk GEM_TSU>; <&zynqmp_clk GEM_TSU>;
assigned-clocks = <&zynqmp_clk GEM_TSU>;
}; };
&gem3 { &gem3 {
clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM3_REF>, clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM3_REF>,
<&zynqmp_clk GEM3_TX>, <&zynqmp_clk GEM3_RX>, <&zynqmp_clk GEM3_TX>, <&zynqmp_clk GEM3_RX>,
<&zynqmp_clk GEM_TSU>; <&zynqmp_clk GEM_TSU>;
assigned-clocks = <&zynqmp_clk GEM_TSU>;
}; };
&gpio { &gpio {
......
arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso
View file @ e5963e15
...@@ -27,8 +27,8 @@ &i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */ ...@@ -27,8 +27,8 @@ &i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1_default>; pinctrl-0 = <&pinctrl_i2c1_default>;
pinctrl-1 = <&pinctrl_i2c1_gpio>; pinctrl-1 = <&pinctrl_i2c1_gpio>;
scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
/* u14 - 0x40 - ina260 */ /* u14 - 0x40 - ina260 */
/* u27 - 0xe0 - STDP4320 DP/HDMI splitter */ /* u27 - 0xe0 - STDP4320 DP/HDMI splitter */
...@@ -145,6 +145,7 @@ &gem3 { /* required by spec */ ...@@ -145,6 +145,7 @@ &gem3 { /* required by spec */
pinctrl-0 = <&pinctrl_gem3_default>; pinctrl-0 = <&pinctrl_gem3_default>;
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
assigned-clock-rates = <250000000>;
mdio: mdio { mdio: mdio {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso
View file @ e5963e15
...@@ -22,8 +22,8 @@ &i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */ ...@@ -22,8 +22,8 @@ &i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1_default>; pinctrl-0 = <&pinctrl_i2c1_default>;
pinctrl-1 = <&pinctrl_i2c1_gpio>; pinctrl-1 = <&pinctrl_i2c1_gpio>;
scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
/* u14 - 0x40 - ina260 */ /* u14 - 0x40 - ina260 */
/* u43 - 0x2d - usb5744 */ /* u43 - 0x2d - usb5744 */
...@@ -128,6 +128,7 @@ &gem3 { /* required by spec */ ...@@ -128,6 +128,7 @@ &gem3 { /* required by spec */
pinctrl-0 = <&pinctrl_gem3_default>; pinctrl-0 = <&pinctrl_gem3_default>;
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
assigned-clock-rates = <250000000>;
mdio: mdio { mdio: mdio {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts
View file @ e5963e15
...@@ -50,6 +50,17 @@ memory@0 { ...@@ -50,6 +50,17 @@ memory@0 {
reg = <0x0 0x0 0x0 0x80000000>, <0x8 0x00000000 0x0 0x80000000>; reg = <0x0 0x0 0x0 0x80000000>, <0x8 0x00000000 0x0 0x80000000>;
}; };
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
ranges;
pmu_region: pmu@7ff00000 {
reg = <0x0 0x7ff00000 0x0 0x100000>;
no-map;
};
};
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
autorepeat; autorepeat;
...@@ -245,8 +256,8 @@ &i2c1 { ...@@ -245,8 +256,8 @@ &i2c1 {
status = "okay"; status = "okay";
bootph-all; bootph-all;
clock-frequency = <400000>; clock-frequency = <400000>;
scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
eeprom: eeprom@50 { /* u46 - also at address 0x58 */ eeprom: eeprom@50 { /* u46 - also at address 0x58 */
bootph-all; bootph-all;
......
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts
View file @ e5963e15
...@@ -119,8 +119,8 @@ &i2c1 { ...@@ -119,8 +119,8 @@ &i2c1 {
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1_default>; pinctrl-0 = <&pinctrl_i2c1_default>;
pinctrl-1 = <&pinctrl_i2c1_gpio>; pinctrl-1 = <&pinctrl_i2c1_gpio>;
scl-gpios = <&gpio 36 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 36 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 37 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
eeprom: eeprom@55 { eeprom: eeprom@55 {
compatible = "atmel,24c64"; /* 24AA64 */ compatible = "atmel,24c64"; /* 24AA64 */
......
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts
View file @ e5963e15
...@@ -110,8 +110,8 @@ &i2c0 { ...@@ -110,8 +110,8 @@ &i2c0 {
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c0_default>; pinctrl-0 = <&pinctrl_i2c0_default>;
pinctrl-1 = <&pinctrl_i2c0_gpio>; pinctrl-1 = <&pinctrl_i2c0_gpio>;
scl-gpios = <&gpio 6 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
tca6416_u26: gpio@20 { tca6416_u26: gpio@20 {
compatible = "ti,tca6416"; compatible = "ti,tca6416";
......
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts
View file @ e5963e15
...@@ -91,8 +91,8 @@ &i2c0 { ...@@ -91,8 +91,8 @@ &i2c0 {
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c0_default>; pinctrl-0 = <&pinctrl_i2c0_default>;
pinctrl-1 = <&pinctrl_i2c0_gpio>; pinctrl-1 = <&pinctrl_i2c0_gpio>;
scl-gpios = <&gpio 74 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 74 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 75 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 75 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
}; };
&i2c1 { &i2c1 {
...@@ -100,8 +100,8 @@ &i2c1 { ...@@ -100,8 +100,8 @@ &i2c1 {
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1_default>; pinctrl-0 = <&pinctrl_i2c1_default>;
pinctrl-1 = <&pinctrl_i2c1_gpio>; pinctrl-1 = <&pinctrl_i2c1_gpio>;
scl-gpios = <&gpio 76 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 76 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 77 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 77 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
}; };
......
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
View file @ e5963e15
...@@ -180,8 +180,8 @@ &i2c1 { ...@@ -180,8 +180,8 @@ &i2c1 {
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1_default>; pinctrl-0 = <&pinctrl_i2c1_default>;
pinctrl-1 = <&pinctrl_i2c1_gpio>; pinctrl-1 = <&pinctrl_i2c1_gpio>;
scl-gpios = <&gpio 4 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
clock-frequency = <100000>; clock-frequency = <100000>;
i2c-mux@75 { /* u11 */ i2c-mux@75 { /* u11 */
compatible = "nxp,pca9548"; compatible = "nxp,pca9548";
......
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
View file @ e5963e15
...@@ -233,8 +233,8 @@ &i2c0 { ...@@ -233,8 +233,8 @@ &i2c0 {
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c0_default>; pinctrl-0 = <&pinctrl_i2c0_default>;
pinctrl-1 = <&pinctrl_i2c0_gpio>; pinctrl-1 = <&pinctrl_i2c0_gpio>;
scl-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 14 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 15 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
tca6416_u97: gpio@20 { tca6416_u97: gpio@20 {
compatible = "ti,tca6416"; compatible = "ti,tca6416";
...@@ -497,8 +497,8 @@ &i2c1 { ...@@ -497,8 +497,8 @@ &i2c1 {
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1_default>; pinctrl-0 = <&pinctrl_i2c1_default>;
pinctrl-1 = <&pinctrl_i2c1_gpio>; pinctrl-1 = <&pinctrl_i2c1_gpio>;
scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
/* PL i2c via PCA9306 - u45 */ /* PL i2c via PCA9306 - u45 */
i2c-mux@74 { /* u34 */ i2c-mux@74 { /* u34 */
......
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts
View file @ e5963e15
...@@ -140,8 +140,8 @@ &i2c1 { ...@@ -140,8 +140,8 @@ &i2c1 {
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1_default>; pinctrl-0 = <&pinctrl_i2c1_default>;
pinctrl-1 = <&pinctrl_i2c1_gpio>; pinctrl-1 = <&pinctrl_i2c1_gpio>;
scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
/* Another connection to this bus via PL i2c via PCA9306 - u45 */ /* Another connection to this bus via PL i2c via PCA9306 - u45 */
i2c-mux@74 { /* u34 */ i2c-mux@74 { /* u34 */
......
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts
View file @ e5963e15
...@@ -145,8 +145,8 @@ &i2c1 { ...@@ -145,8 +145,8 @@ &i2c1 {
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1_default>; pinctrl-0 = <&pinctrl_i2c1_default>;
pinctrl-1 = <&pinctrl_i2c1_gpio>; pinctrl-1 = <&pinctrl_i2c1_gpio>;
scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
tca6416_u97: gpio@20 { tca6416_u97: gpio@20 {
compatible = "ti,tca6416"; compatible = "ti,tca6416";
......
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
View file @ e5963e15
...@@ -245,8 +245,8 @@ &i2c0 { ...@@ -245,8 +245,8 @@ &i2c0 {
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c0_default>; pinctrl-0 = <&pinctrl_i2c0_default>;
pinctrl-1 = <&pinctrl_i2c0_gpio>; pinctrl-1 = <&pinctrl_i2c0_gpio>;
scl-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 14 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 15 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
tca6416_u97: gpio@20 { tca6416_u97: gpio@20 {
compatible = "ti,tca6416"; compatible = "ti,tca6416";
...@@ -508,8 +508,8 @@ &i2c1 { ...@@ -508,8 +508,8 @@ &i2c1 {
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1_default>; pinctrl-0 = <&pinctrl_i2c1_default>;
pinctrl-1 = <&pinctrl_i2c1_gpio>; pinctrl-1 = <&pinctrl_i2c1_gpio>;
scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
/* PL i2c via PCA9306 - u45 */ /* PL i2c via PCA9306 - u45 */
i2c-mux@74 { /* u34 */ i2c-mux@74 { /* u34 */
......
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
View file @ e5963e15
...@@ -205,8 +205,8 @@ &i2c0 { ...@@ -205,8 +205,8 @@ &i2c0 {
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c0_default>; pinctrl-0 = <&pinctrl_i2c0_default>;
pinctrl-1 = <&pinctrl_i2c0_gpio>; pinctrl-1 = <&pinctrl_i2c0_gpio>;
scl-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 14 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 15 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
tca6416_u22: gpio@20 { tca6416_u22: gpio@20 {
compatible = "ti,tca6416"; compatible = "ti,tca6416";
...@@ -385,8 +385,8 @@ &i2c1 { ...@@ -385,8 +385,8 @@ &i2c1 {
pinctrl-names = "default", "gpio"; pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1_default>; pinctrl-0 = <&pinctrl_i2c1_default>;
pinctrl-1 = <&pinctrl_i2c1_gpio>; pinctrl-1 = <&pinctrl_i2c1_gpio>;
scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
i2c-mux@74 { /* u26 */ i2c-mux@74 { /* u26 */
compatible = "nxp,pca9548"; compatible = "nxp,pca9548";
......
arch/arm64/boot/dts/xilinx/zynqmp.dtsi
View file @ e5963e15
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7