Skip to content

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

Merge tag 'renesas-fixes-for-v5.7-tag2' of... 

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

Renesas fixes for v5.7 (take two)

  - Fix a wrong clock configuration on R-Mobile A1,
  - Minor fixes that are fast-tracked to avoid introducing regressions
    during conversion of DT bindings to json-schema.

* tag 'renesas-fixes-for-v5.7-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  ARM: dts: iwg20d-q7-dbcm-ca: Remove unneeded properties in hdmi@39
  ARM: dts: renesas: Make hdmi encoder nodes compliant with DT bindings
  arm64: dts: renesas: Make hdmi encoder nodes compliant with DT bindings
  ARM: dts: r8a7740: Add missing extal2 to CPG node

Link: https://lore.kernel.org/r/20200515125043.22811-1-geert+renesas@glider.beSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 495e1356 c8e233bf
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 41 deletions
arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi
View file @ d5fef88c
...@@ -72,8 +72,6 @@ hdmi@39 { ...@@ -72,8 +72,6 @@ hdmi@39 {
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/r8a7740.dtsi
View file @ d5fef88c
...@@ -479,7 +479,7 @@ fsibck_clk: fsibck { ...@@ -479,7 +479,7 @@ fsibck_clk: fsibck {
cpg_clocks: cpg_clocks@e6150000 { cpg_clocks: cpg_clocks@e6150000 {
compatible = "renesas,r8a7740-cpg-clocks"; compatible = "renesas,r8a7740-cpg-clocks";
reg = <0xe6150000 0x10000>; reg = <0xe6150000 0x10000>;
clocks = <&extal1_clk>, <&extalr_clk>; clocks = <&extal1_clk>, <&extal2_clk>, <&extalr_clk>;
#clock-cells = <1>; #clock-cells = <1>;
clock-output-names = "system", "pllc0", "pllc1", clock-output-names = "system", "pllc0", "pllc1",
"pllc2", "r", "pllc2", "r",
......
arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts
View file @ d5fef88c
...@@ -84,8 +84,6 @@ hdmi@39 { ...@@ -84,8 +84,6 @@ hdmi@39 {
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/r8a7790-lager.dts
View file @ d5fef88c
...@@ -364,8 +364,6 @@ hdmi@39 { ...@@ -364,8 +364,6 @@ hdmi@39 {
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/r8a7790-stout.dts
View file @ d5fef88c
...@@ -297,8 +297,6 @@ hdmi@39 { ...@@ -297,8 +297,6 @@ hdmi@39 {
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/r8a7791-koelsch.dts
View file @ d5fef88c
...@@ -387,8 +387,6 @@ hdmi@39 { ...@@ -387,8 +387,6 @@ hdmi@39 {
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/r8a7791-porter.dts
View file @ d5fef88c
...@@ -181,8 +181,6 @@ hdmi@39 { ...@@ -181,8 +181,6 @@ hdmi@39 {
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/r8a7792-blanche.dts
View file @ d5fef88c
...@@ -289,8 +289,6 @@ hdmi@39 { ...@@ -289,8 +289,6 @@ hdmi@39 {
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/r8a7792-wheat.dts
View file @ d5fef88c
...@@ -249,14 +249,12 @@ &i2c4 { ...@@ -249,14 +249,12 @@ &i2c4 {
*/ */
hdmi@3d { hdmi@3d {
compatible = "adi,adv7513"; compatible = "adi,adv7513";
reg = <0x3d>, <0x2d>, <0x4d>, <0x5d>; reg = <0x3d>, <0x4d>, <0x2d>, <0x5d>;
reg-names = "main", "cec", "edid", "packet"; reg-names = "main", "edid", "cec", "packet";
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
...@@ -280,14 +278,12 @@ adv7513_0_out: endpoint { ...@@ -280,14 +278,12 @@ adv7513_0_out: endpoint {
hdmi@39 { hdmi@39 {
compatible = "adi,adv7513"; compatible = "adi,adv7513";
reg = <0x39>, <0x29>, <0x49>, <0x59>; reg = <0x39>, <0x49>, <0x29>, <0x59>;
reg-names = "main", "cec", "edid", "packet"; reg-names = "main", "edid", "cec", "packet";
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/r8a7793-gose.dts
View file @ d5fef88c
...@@ -366,8 +366,6 @@ hdmi@39 { ...@@ -366,8 +366,6 @@ hdmi@39 {
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/r8a7794-silk.dts
View file @ d5fef88c
...@@ -255,8 +255,6 @@ hdmi@39 { ...@@ -255,8 +255,6 @@ hdmi@39 {
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm64/boot/dts/renesas/r8a77970-eagle.dts
View file @ d5fef88c
...@@ -137,8 +137,6 @@ hdmi@39 { ...@@ -137,8 +137,6 @@ hdmi@39 {
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts
View file @ d5fef88c
...@@ -150,8 +150,6 @@ hdmi@39{ ...@@ -150,8 +150,6 @@ hdmi@39{
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm64/boot/dts/renesas/r8a77980-condor.dts
View file @ d5fef88c
...@@ -174,8 +174,6 @@ hdmi@39 { ...@@ -174,8 +174,6 @@ hdmi@39 {
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts
View file @ d5fef88c
...@@ -141,8 +141,6 @@ hdmi@39 { ...@@ -141,8 +141,6 @@ hdmi@39 {
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts
View file @ d5fef88c
...@@ -360,8 +360,6 @@ hdmi-encoder@39 { ...@@ -360,8 +360,6 @@ hdmi-encoder@39 {
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm64/boot/dts/renesas/r8a77995-draak.dts
View file @ d5fef88c
...@@ -272,8 +272,8 @@ adv7180_out: endpoint { ...@@ -272,8 +272,8 @@ adv7180_out: endpoint {
hdmi-encoder@39 { hdmi-encoder@39 {
compatible = "adi,adv7511w"; compatible = "adi,adv7511w";
reg = <0x39>, <0x3f>, <0x38>, <0x3c>; reg = <0x39>, <0x3f>, <0x3c>, <0x38>;
reg-names = "main", "edid", "packet", "cec"; reg-names = "main", "edid", "cec", "packet";
interrupt-parent = <&gpio1>; interrupt-parent = <&gpio1>;
interrupts = <28 IRQ_TYPE_LEVEL_LOW>; interrupts = <28 IRQ_TYPE_LEVEL_LOW>;
...@@ -284,8 +284,6 @@ hdmi-encoder@39 { ...@@ -284,8 +284,6 @@ hdmi-encoder@39 {
adi,input-depth = <8>; adi,input-depth = <8>;
adi,input-colorspace = "rgb"; adi,input-colorspace = "rgb";
adi,input-clock = "1x"; adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports { ports {
#address-cells = <1>; #address-cells = <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