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

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

Merge tag 'amlogic-fixes' of... 

Merge tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into fixes

Pull "Amlogic fixes for v4.10" from Kevin Hilman:

- DT: GXL: fix GPIO include
- add DT and defconfig for newly merged DRM driver

This pull has one real fix, as a couple non-critical ones.  The DRM
DT/defconfig patches are coming now because I didn't expect the new
driver to make it for the v4.10 merge window, but since it did[1], the
DT and defconfig should go into the same release.

[1] bbbe775e drm: Add support for Amlogic Meson Graphic Controller

* tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM64: defconfig: enable DRM_MESON as module
  ARM64: dts: meson-gx: Add Graphic Controller nodes
  ARM64: dts: meson-gxl: fix GPIO include
parents 5c6ec6a0 fcdaf1a2

arch/arm64/boot/dts/amlogic/meson-gx.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -356,5 +356,21 @@ 
				status = "disabled";

			};

		};



		vpu: vpu@d0100000 {

			compatible = "amlogic,meson-gx-vpu";

			reg = <0x0 0xd0100000 0x0 0x100000>,

			      <0x0 0xc883c000 0x0 0x1000>,

			      <0x0 0xc8838000 0x0 0x1000>;

			reg-names = "vpu", "hhi", "dmc";

			interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;

			#address-cells = <1>;

			#size-cells = <0>;



			/* CVBS VDAC output port */

			cvbs_vdac_port: port@0 {

				reg = <0>;

			};

		};

	};

};

arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts

+16 −0
Original line number Diff line number Diff line
@@ -142,6 +142,16 @@ 
		clocks = <&wifi32k>;

		clock-names = "ext_clock";

	};



	cvbs-connector {

		compatible = "composite-video-connector";



		port {

			cvbs_connector_in: endpoint {

				remote-endpoint = <&cvbs_vdac_out>;

			};

		};

	};

};



&uart_AO {
@@ -229,3 +239,9 @@ 
	clocks = <&clkc CLKID_FCLK_DIV4>;

	clock-names = "clkin0";

};



&cvbs_vdac_port {

	cvbs_vdac_out: endpoint {

		remote-endpoint = <&cvbs_connector_in>;

	};

};

arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -125,6 +125,16 @@ 
		clocks = <&wifi32k>;

		clock-names = "ext_clock";

	};



	cvbs-connector {

		compatible = "composite-video-connector";



		port {

			cvbs_connector_in: endpoint {

				remote-endpoint = <&cvbs_vdac_out>;

			};

		};

	};

};



/* This UART is brought out to the DB9 connector */
@@ -234,3 +244,9 @@ 
	clocks = <&clkc CLKID_FCLK_DIV4>;

	clock-names = "clkin0";

};



&cvbs_vdac_port {

	cvbs_vdac_out: endpoint {

		remote-endpoint = <&cvbs_connector_in>;

	};

};

arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -506,3 +506,7 @@ 
		 <&clkc CLKID_FCLK_DIV2>;

	clock-names = "core", "clkin0", "clkin1";

};



&vpu {

	compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu";

};

arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts

+16 −0
Original line number Diff line number Diff line
@@ -117,6 +117,16 @@ 
		clocks = <&wifi32k>;

		clock-names = "ext_clock";

	};



	cvbs-connector {

		compatible = "composite-video-connector";



		port {

			cvbs_connector_in: endpoint {

				remote-endpoint = <&cvbs_vdac_out>;

			};

		};

	};

};



&uart_AO {
@@ -203,3 +213,9 @@ 
	clocks = <&clkc CLKID_FCLK_DIV4>;

	clock-names = "clkin0";

};



&cvbs_vdac_port {

	cvbs_vdac_out: endpoint {

		remote-endpoint = <&cvbs_connector_in>;

	};

};