diff --git a/debian/changelog b/debian/changelog index 2db2e49be..113af20ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ linux (4.16-1~exp2) UNRELEASED; urgency=medium * [arm64] Enable features to support Pinebook and other A64 systems: CONFIG_USB_MUSB_HDRC, CONFIG_USB_MUSB_SUNXI, CONFIG_SUN8I_DE2_CCU, CONFIG_DMA_SUN6I + * [arm64] Add patch enabling simplefb LCD on A64. -- Ben Hutchings Sun, 08 Apr 2018 19:03:49 +0100 diff --git a/debian/patches/features/arm64/arm64-dts-allwinner-a64-add-simplefb-for-A64-SoC.patch b/debian/patches/features/arm64/arm64-dts-allwinner-a64-add-simplefb-for-A64-SoC.patch new file mode 100644 index 000000000..6cd80eee9 --- /dev/null +++ b/debian/patches/features/arm64/arm64-dts-allwinner-a64-add-simplefb-for-A64-SoC.patch @@ -0,0 +1,52 @@ +From d7dcf718bacf638a4a6c5a62110d49c88e70ae3f Mon Sep 17 00:00:00 2001 +From: Harald Geyer +Date: Thu, 15 Mar 2018 16:25:08 +0000 +Subject: [PATCH] arm64: dts: allwinner: a64: add simplefb for A64 SoC + +The A64 SoC features two display pipelines, one has a LCD output, the +other has a HDMI output. + +Add support for simplefb for the LCD output. Tested on Teres I. + +This patch was inspired by work of Icenowy Zheng. + +Signed-off-by: Harald Geyer +Signed-off-by: Maxime Ripard +--- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +index 5a70ed2093cd..58d1199ef9dd 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +@@ -56,6 +56,26 @@ + #address-cells = <1>; + #size-cells = <1>; + ++ chosen { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges; ++ ++/* ++ * The pipeline mixer0-lcd0 depends on clock CLK_MIXER0 from DE2 CCU. ++ * However there is no support for this clock on A64 yet, so we depend ++ * on the upstream clocks here to keep them (and thus CLK_MIXER0) up. ++ */ ++ simplefb_lcd: framebuffer-lcd { ++ compatible = "allwinner,simple-framebuffer", ++ "simple-framebuffer"; ++ allwinner,pipeline = "mixer0-lcd0"; ++ clocks = <&ccu CLK_TCON0>, ++ <&ccu CLK_DE>, <&ccu CLK_BUS_DE>; ++ status = "disabled"; ++ }; ++ }; ++ + cpus { + #address-cells = <1>; + #size-cells = <0>; +-- +2.11.0 + diff --git a/debian/patches/series b/debian/patches/series index 40ce7b7ef..b2d9a8283 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -88,6 +88,7 @@ features/arm64/tegra210-sata/0004-ata-ahci_tegra-disable-DIPM.patch features/arm64/tegra210-sata/0005-ata-ahci_tegra-Add-AHCI-support-for-Tegra210.patch features/arm64/tegra210-sata/0006-arm64-tegra-Add-SATA-node-for-Tegra210.patch features/arm64/tegra210-sata/0007-arm64-tegra-Enable-AHCI-on-Jetson-TX1.patch +features/arm64/arm64-dts-allwinner-a64-add-simplefb-for-A64-SoC.patch # Miscellaneous bug fixes bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch