Commit d5fef88c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 495e1356 c8e233bf

arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi

+0 −2
Original line number Original line Diff line number Diff line
@@ -72,8 +72,6 @@ 
		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

+1 −1
Original line number Original line Diff line number Diff line
@@ -479,7 +479,7 @@ 
		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

+0 −2
Original line number Original line Diff line number Diff line
@@ -84,8 +84,6 @@ 
		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

+0 −2
Original line number Original line Diff line number Diff line
@@ -364,8 +364,6 @@ 
			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

+0 −2
Original line number Original line Diff line number Diff line
@@ -297,8 +297,6 @@ 
		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>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE