Hi Icenowy,
thanks for sending this!
On 11/09/17 16:54, Icenowy Zheng wrote:
As the DE2 simplefb setup code can also benefit from the simplefb match code, extract it to a new source file.
Signed-off-by: Icenowy Zheng icenowy@aosc.io
drivers/video/sunxi/Makefile | 2 +- drivers/video/sunxi/simplefb_common.c | 29 +++++++++++++++++++++++++++++ drivers/video/sunxi/simplefb_common.h | 22 ++++++++++++++++++++++ drivers/video/sunxi/sunxi_display.c | 13 ++----------- 4 files changed, 54 insertions(+), 12 deletions(-) create mode 100644 drivers/video/sunxi/simplefb_common.c create mode 100644 drivers/video/sunxi/simplefb_common.h
diff --git a/drivers/video/sunxi/Makefile b/drivers/video/sunxi/Makefile index 0d64c2021f..10862edaca 100644 --- a/drivers/video/sunxi/Makefile +++ b/drivers/video/sunxi/Makefile @@ -5,5 +5,5 @@ # SPDX-License-Identifier: GPL-2.0+ #
-obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o lcdc.o tve_common.o ../videomodes.o +obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o simplefb_common.o lcdc.o tve_common.o ../videomodes.o obj-$(CONFIG_VIDEO_DE2) += sunxi_de2.o sunxi_dw_hdmi.o lcdc.o ../dw_hdmi.o diff --git a/drivers/video/sunxi/simplefb_common.c b/drivers/video/sunxi/simplefb_common.c new file mode 100644 index 0000000000..4823f13a0c --- /dev/null +++ b/drivers/video/sunxi/simplefb_common.c @@ -0,0 +1,29 @@ +/*
- Common code for Allwinner SimpleFB with pipeline.
- (C) Copyright 2014-2015 Hans de Goede hdegoede@redhat.com
- (C) Copyright 2017 Icenowy Zheng icenowy@aosc.io
- SPDX-License-Identifier: GPL-2.0+
- */
+#include <fdtdec.h>
+int sunxi_simplefb_fdt_match(void *blob, const char *pipeline) +{
- int offset, ret;
- /* Find a prefilled simpefb node, matching out pipeline config */
- offset = fdt_node_offset_by_compatible(blob, -1,
"allwinner,simple-framebuffer");- while (offset >= 0) {
ret = fdt_stringlist_search(blob, offset, "allwinner,pipeline",pipeline);if (ret == 0)break;offset = fdt_node_offset_by_compatible(blob, offset,"allwinner,simple-framebuffer");- }
- return offset;
+} diff --git a/drivers/video/sunxi/simplefb_common.h b/drivers/video/sunxi/simplefb_common.h new file mode 100644 index 0000000000..ac9bfcb087 --- /dev/null +++ b/drivers/video/sunxi/simplefb_common.h @@ -0,0 +1,22 @@ +/*
- (C) Copyright 2017 Icenowy Zheng icenowy@aosc.io
- SPDX-License-Identifier: GPL-2.0+
- */
+#ifndef __SIMPLEFB_COMMON_H +#define __SIMPLEFB_COMMON_H
+/*
Just a nit, but I think kerndoc requires two asterisks here ("/**").
The rest looks fine to me, so:
Reviewed-by: Andre Przywara andre.przywara@arm.com
Cheers, Andre.
- sunxi_simplefb_fdt_match() - match a sunxi simplefb node
- Match a sunxi simplefb device node with a specified pipeline, and
- return its offset.
- @blob: device tree blob
- @pipeline: display pipeline
- @return device node offset in blob, or negative values if failed
- */
+int sunxi_simplefb_fdt_match(void *blob, const char *pipeline);
+#endif diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c index de768ba94a..7f25ed5f26 100644 --- a/drivers/video/sunxi/sunxi_display.c +++ b/drivers/video/sunxi/sunxi_display.c @@ -29,6 +29,7 @@ #include "../anx9804.h" #include "../hitachi_tx18d42vm_lcd.h" #include "../ssd2828.h" +#include "simplefb_common.h"
#ifdef CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW #define PWM_ON 0 @@ -1377,17 +1378,7 @@ int sunxi_simplefb_setup(void *blob) break; }
- /* Find a prefilled simpefb node, matching out pipeline config */
- offset = fdt_node_offset_by_compatible(blob, -1,
"allwinner,simple-framebuffer");- while (offset >= 0) {
ret = fdt_stringlist_search(blob, offset, "allwinner,pipeline",pipeline);if (ret == 0)break;offset = fdt_node_offset_by_compatible(blob, offset,"allwinner,simple-framebuffer");- }
- offset = sunxi_simplefb_fdt_match(blob, pipeline); if (offset < 0) { eprintf("Cannot setup simplefb: node not found\n"); return 0; /* Keep older kernels working */