Merge tag 'sunxi-simplefb-for-3.19' of... (fe0c888b) · Commits · 戴 / test

Merge tag 'sunxi-simplefb-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt Pull "Allwinner simple frambuffer support" from Maxime Ripard: This enables the simple framebuffer on all the supported Allwinner SoCs (but the A80). That allows to have at last a video display usable by using the framebuffer the firmware might have set up. * tag 'sunxi-simplefb-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux : (55 commits) ARM: dts: sunxi: Update simplefb nodes so that u-boot can find them ARM: dts: sunxi: Add de_be0 clk parent pll to simplefb node ARM: dts: sun7i: Add simplefb node ARM: dts: sun6i: Add simplefb node ARM: dts: sun5i: Add simplefb node ARM: dts: sun4i: Add simplefb node ARM: dts: sun6i: Add ethernet support to M9 board ARM: sun6i: DT: Add PLL6 multiple outputs ARM: dts: sun6i: Add support for the status led ARM: dts: sun6i: Add EHCI support for the M9 board ARM: dts: sunxi: Add regulator-boot-on property to ahci-5v regulator ARM: dts: sun7i: Cubietruck: add power supply regulator for USB OTG VBUS ARM: dts: sun7i: Cubietruck: override regulator pin ARM: sun7i: dtsi: add support for usbphy0 ARM: dtsi: sunxi: add common VBUS regulator ARM: dts: sunxi: Banana Pi: increase startup-delay for the GMAC PHY regulator ARM: sun5i: olinuxino: Relicense the device tree under GPLv2/X11 ARM: sun4i: cubieboard: Relicense the device tree under GPLv2/X11 ARM: sun7i: pcduino3: Relicense the device tree under GPLv2/X11 ARM: sun4i: pcduino: Relicense the device tree under GPLv2/X11 ... Signed-off-by:

Arnd Bergmann <arnd@arndb.de>

arch/arm/boot/dts/sun4i-a10.dtsi

+14 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,20 @@
		serial7 = &uart7;
		};

		chosen {
		#address-cells = <1>;
		#size-cells = <1>;
		ranges;

		framebuffer@0 {
		compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
		allwinner,pipeline = "de_be0-lcd0-hdmi";
		clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
		<&ahb_gates 44>;
		status = "disabled";
		};
		};

		cpus {
		#address-cells = <1>;
		#size-cells = <0>;

arch/arm/boot/dts/sun5i-a10s.dtsi

+14 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,20 @@
		serial3 = &uart3;
		};

		chosen {
		#address-cells = <1>;
		#size-cells = <1>;
		ranges;

		framebuffer@0 {
		compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
		allwinner,pipeline = "de_be0-lcd0-hdmi";
		clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
		<&ahb_gates 44>;
		status = "disabled";
		};
		};

		cpus {
		cpu@0 {
		compatible = "arm,cortex-a8";

arch/arm/boot/dts/sun6i-a31.dtsi

+12 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,18 @@
		ethernet0 = &gmac;
		};

		chosen {
		#address-cells = <1>;
		#size-cells = <1>;
		ranges;

		framebuffer@0 {
		compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
		allwinner,pipeline = "de_be0-lcd0-hdmi";
		clocks = <&pll6 0>;
		status = "disabled";
		};
		};

		cpus {
		enable-method = "allwinner,sun6i-a31";

arch/arm/boot/dts/sun7i-a20.dtsi

+14 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,20 @@
		serial7 = &uart7;
		};

		chosen {
		#address-cells = <1>;
		#size-cells = <1>;
		ranges;

		framebuffer@0 {
		compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
		allwinner,pipeline = "de_be0-lcd0-hdmi";
		clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
		<&ahb_gates 44>;
		status = "disabled";
		};
		};

		cpus {
		#address-cells = <1>;
		#size-cells = <0>;

Admin message