Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27287abb authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'topic-arcpgu-sim' of... 

Merge branch 'topic-arcpgu-sim' of https://github.com/foss-for-synopsys-dwc-arc-processors/linux into drm-next

Add support for arcgpu on the sim platform.

* 'topic-arcpgu-sim' of https://github.com/foss-for-synopsys-dwc-arc-processors/linux:
  ARC: [nsimosci] Enable ARC PGU on nSIM OSCI virtual platforms
  ARCv2: [vdk] Enable ARC PGU on HS38 VDK
  drm/arcpgu: Make ARC PGU usable on simulation platforms
parents 3c85f20a 830c6578

arch/arc/boot/dts/nsimosci.dts

+11 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
		/* this is for console on PGU */

		/* bootargs = "console=tty0 consoleblank=0"; */

		/* this is for console on serial */

		bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug";

		bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug video=640x480-24";

	};



	aliases {
@@ -58,9 +58,17 @@ 
			no-loopback-test = <1>;

		};



		pgu0: pgu@f9000000 {

			compatible = "snps,arcpgufb";

		pguclk: pguclk {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <25175000>;

		};



		pgu@f9000000 {

			compatible = "snps,arcpgu";

			reg = <0xf9000000 0x400>;

			clocks = <&pguclk>;

			clock-names = "pxlclk";

		};



		ps2: ps2@f9001000 {

arch/arc/boot/dts/nsimosci_hs.dts

+11 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
		/* this is for console on PGU */

		/* bootargs = "console=tty0 consoleblank=0"; */

		/* this is for console on serial */

		bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug";

		bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug video=640x480-24";

	};



	aliases {
@@ -58,9 +58,17 @@ 
			no-loopback-test = <1>;

		};



		pgu0: pgu@f9000000 {

			compatible = "snps,arcpgufb";

		pguclk: pguclk {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <25175000>;

		};



		pgu@f9000000 {

			compatible = "snps,arcpgu";

			reg = <0xf9000000 0x400>;

			clocks = <&pguclk>;

			clock-names = "pxlclk";

		};



		ps2: ps2@f9001000 {

arch/arc/boot/dts/nsimosci_hs_idu.dts

+11 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


	chosen {

		/* this is for console on serial */

		bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblan=0 debug";

		bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblan=0 debug video=640x480-24";

	};



	aliases {
@@ -77,9 +77,17 @@ 
			no-loopback-test = <1>;

		};



		pgu0: pgu@f9000000 {

			compatible = "snps,arcpgufb";

		pguclk: pguclk {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <25175000>;

		};



		pgu@f9000000 {

			compatible = "snps,arcpgu";

			reg = <0xf9000000 0x400>;

			clocks = <&pguclk>;

			clock-names = "pxlclk";

		};



		ps2: ps2@f9001000 {

arch/arc/boot/dts/vdk_axs10x_mb.dtsi

+9 −4
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ 
				#clock-cells = <0>;

			};



			pguclk: pguclk {

				#clock-cells = <0>;

				compatible = "fixed-clock";

				clock-frequency = <25175000>;

			};

		};



		ethernet@0x18000 {
@@ -75,11 +80,11 @@ 
		};



/* PGU output directly sent to virtual LCD screen; hdmi controller not modelled */

		pgu@0x17000 {

			compatible = "snps,arcpgufb";

		pgu@17000 {

			compatible = "snps,arcpgu";

			reg = <0x17000 0x400>;

			clock-frequency = <51000000>; /* PGU'clock is initated in init function */

			/* interrupts = <5>;   PGU interrupts not used, this vector is used for ps2 below */

			clocks = <&pguclk>;

			clock-names = "pxlclk";

		};



/* VDK has additional ps2 keyboard/mouse interface integrated in LCD screen model */

arch/arc/boot/dts/vdk_hs38_smp.dts

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
	compatible = "snps,axs103";



	chosen {

		bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0";

		bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0 video=640x480-24";

	};

};