Skip to content

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

Merge tag 'renesas-arm-dt-for-v5.7-tag1' of... 

Merge tag 'renesas-arm-dt-for-v5.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt

Renesas ARM DT updates for v5.7

  - Miscellaneous fixes and improvements.

* tag 'renesas-arm-dt-for-v5.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  ARM: dts: rzg1: Add reset control properties for display
  ARM: dts: rcar-gen2: Add reset control properties for display
  ARM: dts: r8a7745: Convert to new DU DT bindings
  ARM: dts: r7s72100: Add SPIBSC clocks
  ARM: dts: renesas: Group tuples in operating-points properties
  ARM: dts: renesas: Add missing ethernet PHY reset GPIO on Gen2 reference boards

Link: https://lore.kernel.org/r/20200226110221.19288-2-geert+renesas@glider.beSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 98d54f81 9e123263
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 26 deletions
arch/arm/boot/dts/r7s72100-gr-peach.dts
View file @ 3cd3fabd
...@@ -41,6 +41,9 @@ flash@18000000 { ...@@ -41,6 +41,9 @@ flash@18000000 {
bank-width = <4>; bank-width = <4>;
device-width = <1>; device-width = <1>;
clocks = <&mstp9_clks R7S72100_CLK_SPIBSC0>;
power-domains = <&cpg_clocks>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
arch/arm/boot/dts/r7s72100.dtsi
View file @ 3cd3fabd
...@@ -467,11 +467,12 @@ mstp9_clks: mstp9_clks@fcfe0438 { ...@@ -467,11 +467,12 @@ mstp9_clks: mstp9_clks@fcfe0438 {
#clock-cells = <1>; #clock-cells = <1>;
compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks"; compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";
reg = <0xfcfe0438 4>; reg = <0xfcfe0438 4>;
clocks = <&p0_clk>, <&p0_clk>, <&p0_clk>, <&p0_clk>; clocks = <&p0_clk>, <&p0_clk>, <&p0_clk>, <&p0_clk>, <&b_clk>, <&b_clk>;
clock-indices = < clock-indices = <
R7S72100_CLK_I2C0 R7S72100_CLK_I2C1 R7S72100_CLK_I2C2 R7S72100_CLK_I2C3 R7S72100_CLK_I2C0 R7S72100_CLK_I2C1 R7S72100_CLK_I2C2 R7S72100_CLK_I2C3
R7S72100_CLK_SPIBSC0 R7S72100_CLK_SPIBSC1
>; >;
clock-output-names = "i2c0", "i2c1", "i2c2", "i2c3"; clock-output-names = "i2c0", "i2c1", "i2c2", "i2c3", "spibsc0", "spibsc1";
}; };
mstp10_clks: mstp10_clks@fcfe043c { mstp10_clks: mstp10_clks@fcfe043c {
......
arch/arm/boot/dts/r8a73a4-ape6evm.dts
View file @ 3cd3fabd
...@@ -157,11 +157,8 @@ vdd_dvfs: regulator@1b { ...@@ -157,11 +157,8 @@ vdd_dvfs: regulator@1b {
&cpu0 { &cpu0 {
cpu0-supply = <&vdd_dvfs>; cpu0-supply = <&vdd_dvfs>;
operating-points = < operating-points = <1950000 1115000>, /* kHz uV */
/* kHz uV */ <1462500 995000>;
1950000 1115000
1462500 995000
>;
voltage-tolerance = <1>; /* 1% */ voltage-tolerance = <1>; /* 1% */
}; };
......
arch/arm/boot/dts/r8a7743.dtsi
View file @ 3cd3fabd
...@@ -1669,9 +1669,10 @@ du: display@feb00000 { ...@@ -1669,9 +1669,10 @@ du: display@feb00000 {
reg = <0 0xfeb00000 0 0x40000>; reg = <0 0xfeb00000 0 0x40000>;
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 724>, clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
<&cpg CPG_MOD 723>;
clock-names = "du.0", "du.1"; clock-names = "du.0", "du.1";
resets = <&cpg 724>;
reset-names = "du.0";
status = "disabled"; status = "disabled";
ports { ports {
......
arch/arm/boot/dts/r8a7744.dtsi
View file @ 3cd3fabd
...@@ -1655,9 +1655,10 @@ du: display@feb00000 { ...@@ -1655,9 +1655,10 @@ du: display@feb00000 {
reg = <0 0xfeb00000 0 0x40000>; reg = <0 0xfeb00000 0 0x40000>;
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 724>, clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
<&cpg CPG_MOD 723>;
clock-names = "du.0", "du.1"; clock-names = "du.0", "du.1";
resets = <&cpg 724>;
reset-names = "du.0";
status = "disabled"; status = "disabled";
ports { ports {
......
arch/arm/boot/dts/r8a7745.dtsi
View file @ 3cd3fabd
...@@ -1506,11 +1506,12 @@ vsp@fe930000 { ...@@ -1506,11 +1506,12 @@ vsp@fe930000 {
du: display@feb00000 { du: display@feb00000 {
compatible = "renesas,du-r8a7745"; compatible = "renesas,du-r8a7745";
reg = <0 0xfeb00000 0 0x40000>; reg = <0 0xfeb00000 0 0x40000>;
reg-names = "du";
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>; clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
clock-names = "du.0", "du.1"; clock-names = "du.0", "du.1";
resets = <&cpg 724>;
reset-names = "du.0";
status = "disabled"; status = "disabled";
ports { ports {
......
arch/arm/boot/dts/r8a77470.dtsi
View file @ 3cd3fabd
...@@ -942,9 +942,10 @@ du: display@feb00000 { ...@@ -942,9 +942,10 @@ du: display@feb00000 {
reg = <0 0xfeb00000 0 0x40000>; reg = <0 0xfeb00000 0 0x40000>;
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 724>, clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
<&cpg CPG_MOD 723>;
clock-names = "du.0", "du.1"; clock-names = "du.0", "du.1";
resets = <&cpg 724>;
reset-names = "du.0";
status = "disabled"; status = "disabled";
ports { ports {
......
arch/arm/boot/dts/r8a7790-lager.dts
View file @ 3cd3fabd
...@@ -674,6 +674,7 @@ phy1: ethernet-phy@1 { ...@@ -674,6 +674,7 @@ phy1: ethernet-phy@1 {
interrupt-parent = <&irqc0>; interrupt-parent = <&irqc0>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>; interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
micrel,led-mode = <1>; micrel,led-mode = <1>;
reset-gpios = <&gpio5 31 GPIO_ACTIVE_LOW>;
}; };
}; };
......
arch/arm/boot/dts/r8a7790-stout.dts
View file @ 3cd3fabd
...@@ -203,6 +203,7 @@ phy1: ethernet-phy@1 { ...@@ -203,6 +203,7 @@ phy1: ethernet-phy@1 {
interrupt-parent = <&irqc0>; interrupt-parent = <&irqc0>;
interrupts = <1 IRQ_TYPE_LEVEL_LOW>; interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
micrel,led-mode = <1>; micrel,led-mode = <1>;
reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
}; };
}; };
......
arch/arm/boot/dts/r8a7790.dtsi
View file @ 3cd3fabd
...@@ -1719,6 +1719,8 @@ du: display@feb00000 { ...@@ -1719,6 +1719,8 @@ du: display@feb00000 {
clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
<&cpg CPG_MOD 722>; <&cpg CPG_MOD 722>;
clock-names = "du.0", "du.1", "du.2"; clock-names = "du.0", "du.1", "du.2";
resets = <&cpg 724>;
reset-names = "du.0";
status = "disabled"; status = "disabled";
ports { ports {
......
arch/arm/boot/dts/r8a7791-koelsch.dts
View file @ 3cd3fabd
...@@ -633,6 +633,7 @@ phy1: ethernet-phy@1 { ...@@ -633,6 +633,7 @@ phy1: ethernet-phy@1 {
interrupt-parent = <&irqc0>; interrupt-parent = <&irqc0>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>; interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
micrel,led-mode = <1>; micrel,led-mode = <1>;
reset-gpios = <&gpio5 22 GPIO_ACTIVE_LOW>;
}; };
}; };
......
arch/arm/boot/dts/r8a7791-porter.dts
View file @ 3cd3fabd
...@@ -307,6 +307,7 @@ phy1: ethernet-phy@1 { ...@@ -307,6 +307,7 @@ phy1: ethernet-phy@1 {
interrupt-parent = <&irqc0>; interrupt-parent = <&irqc0>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>; interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
micrel,led-mode = <1>; micrel,led-mode = <1>;
reset-gpios = <&gpio5 22 GPIO_ACTIVE_LOW>;
}; };
}; };
......
arch/arm/boot/dts/r8a7791.dtsi
View file @ 3cd3fabd
...@@ -1681,9 +1681,10 @@ du: display@feb00000 { ...@@ -1681,9 +1681,10 @@ du: display@feb00000 {
reg = <0 0xfeb00000 0 0x40000>; reg = <0 0xfeb00000 0 0x40000>;
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 724>, clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
<&cpg CPG_MOD 723>;
clock-names = "du.0", "du.1"; clock-names = "du.0", "du.1";
resets = <&cpg 724>;
reset-names = "du.0";
status = "disabled"; status = "disabled";
ports { ports {
......
arch/arm/boot/dts/r8a7792.dtsi
View file @ 3cd3fabd
...@@ -852,9 +852,10 @@ du: display@feb00000 { ...@@ -852,9 +852,10 @@ du: display@feb00000 {
reg = <0 0xfeb00000 0 0x40000>; reg = <0 0xfeb00000 0 0x40000>;
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 724>, clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
<&cpg CPG_MOD 723>;
clock-names = "du.0", "du.1"; clock-names = "du.0", "du.1";
resets = <&cpg 724>;
reset-names = "du.0";
status = "disabled"; status = "disabled";
ports { ports {
......
arch/arm/boot/dts/r8a7793-gose.dts
View file @ 3cd3fabd
...@@ -591,6 +591,7 @@ phy1: ethernet-phy@1 { ...@@ -591,6 +591,7 @@ phy1: ethernet-phy@1 {
interrupt-parent = <&irqc0>; interrupt-parent = <&irqc0>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>; interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
micrel,led-mode = <1>; micrel,led-mode = <1>;
reset-gpios = <&gpio5 22 GPIO_ACTIVE_LOW>;
}; };
}; };
......
arch/arm/boot/dts/r8a7793.dtsi
View file @ 3cd3fabd
...@@ -1341,9 +1341,10 @@ du: display@feb00000 { ...@@ -1341,9 +1341,10 @@ du: display@feb00000 {
reg = <0 0xfeb00000 0 0x40000>; reg = <0 0xfeb00000 0 0x40000>;
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 724>, clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
<&cpg CPG_MOD 723>;
clock-names = "du.0", "du.1"; clock-names = "du.0", "du.1";
resets = <&cpg 724>;
reset-names = "du.0";
status = "disabled"; status = "disabled";
ports { ports {
......
arch/arm/boot/dts/r8a7794-alt.dts
View file @ 3cd3fabd
...@@ -343,6 +343,7 @@ phy1: ethernet-phy@1 { ...@@ -343,6 +343,7 @@ phy1: ethernet-phy@1 {
interrupt-parent = <&irqc0>; interrupt-parent = <&irqc0>;
interrupts = <8 IRQ_TYPE_LEVEL_LOW>; interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
micrel,led-mode = <1>; micrel,led-mode = <1>;
reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
}; };
}; };
......
arch/arm/boot/dts/r8a7794-silk.dts
View file @ 3cd3fabd
...@@ -394,6 +394,7 @@ phy1: ethernet-phy@1 { ...@@ -394,6 +394,7 @@ phy1: ethernet-phy@1 {
interrupt-parent = <&irqc0>; interrupt-parent = <&irqc0>;
interrupts = <8 IRQ_TYPE_LEVEL_LOW>; interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
micrel,led-mode = <1>; micrel,led-mode = <1>;
reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
}; };
}; };
......
arch/arm/boot/dts/r8a7794.dtsi
View file @ 3cd3fabd
...@@ -1356,6 +1356,8 @@ du: display@feb00000 { ...@@ -1356,6 +1356,8 @@ du: display@feb00000 {
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>; clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
clock-names = "du.0", "du.1"; clock-names = "du.0", "du.1";
resets = <&cpg 724>;
reset-names = "du.0";
status = "disabled"; status = "disabled";
ports { ports {
......
arch/arm/boot/dts/sh73a0-kzm9g.dts
View file @ 3cd3fabd
...@@ -25,12 +25,9 @@ aliases { ...@@ -25,12 +25,9 @@ aliases {
cpus { cpus {
cpu@0 { cpu@0 {
cpu0-supply = <&vdd_dvfs>; cpu0-supply = <&vdd_dvfs>;
operating-points = < operating-points = <1196000 1315000>, /* kHz uV */
/* kHz uV */ < 598000 1175000>,
1196000 1315000 < 398667 1065000>;
598000 1175000
398667 1065000
>;
voltage-tolerance = <1>; /* 1% */ voltage-tolerance = <1>; /* 1% */
}; };
}; };
......
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