{"id":812436,"url":"http://patchwork.ozlabs.org/api/patches/812436/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170911155458.62806-2-icenowy@aosc.io/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170911155458.62806-2-icenowy@aosc.io>","list_archive_url":null,"date":"2017-09-11T15:54:57","name":"[U-Boot,v2,1/2] video: sunxi: extract simplefb match code to a new file","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"87aba01835e80303187141bbe0b728974a1f5e64","submitter":{"id":71295,"url":"http://patchwork.ozlabs.org/api/people/71295/?format=json","name":"Icenowy Zheng","email":"icenowy@aosc.io"},"delegate":{"id":17739,"url":"http://patchwork.ozlabs.org/api/users/17739/?format=json","username":"jagan","first_name":"Jagannadha Sutradharudu","last_name":"Teki","email":"jagannadh.teki@gmail.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20170911155458.62806-2-icenowy@aosc.io/mbox/","series":[{"id":2519,"url":"http://patchwork.ozlabs.org/api/series/2519/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=2519","date":"2017-09-11T15:54:56","name":"Allwinner DE2 HDMI SimpleFB support","version":2,"mbox":"http://patchwork.ozlabs.org/series/2519/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812436/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812436/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xrXZv33K4z9s7f\n\tfor ;\n\tTue, 12 Sep 2017 01:55:51 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 00769C21E67; Mon, 11 Sep 2017 15:55:42 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 2F52CC21EEA;\n\tMon, 11 Sep 2017 15:55:36 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid D0211C21E40; Mon, 11 Sep 2017 15:55:30 +0000 (UTC)","from eastern.birch.relay.mailchannels.net\n\t(eastern.birch.relay.mailchannels.net [23.83.209.55])\n\tby lists.denx.de (Postfix) with ESMTPS id 25E48C21F09\n\tfor ; Mon, 11 Sep 2017 15:55:25 +0000 (UTC)","from relay.mailchannels.net (localhost [127.0.0.1])\n\tby relay.mailchannels.net (Postfix) with ESMTP id 20E61208401;\n\tMon, 11 Sep 2017 15:55:23 +0000 (UTC)","from hermes.aosc.io (unknown [100.96.134.127])\n\t(Authenticated sender: lmn-TZDUIOWCRQMW)\n\tby relay.mailchannels.net (Postfix) with ESMTPA id 509DF2087B7;\n\tMon, 11 Sep 2017 15:55:22 +0000 (UTC)","from hermes.aosc.io (hermes.aosc.io [172.20.104.49])\n\t(using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384)\n\tby 0.0.0.0:2500 (trex/5.9.14); Mon, 11 Sep 2017 15:55:23 +0000","from localhost (localhost [127.0.0.1]) (Authenticated sender:\n\ticenowy@aosc.io)\n\tby hermes.aosc.io (Postfix) with ESMTPSA id AF52B47003;\n\tMon, 11 Sep 2017 15:55:18 +0000 (UTC)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE\n\tautolearn=unavailable autolearn_force=no version=3.4.0","X-Sender-Id":["lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io","lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io"],"X-MC-Relay":"Neutral","X-MailChannels-SenderId":"lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io","X-MailChannels-Auth-Id":"lmn-TZDUIOWCRQMW","X-Decisive-Madly":"79dd691508a72aed_1505145322883_547197756","X-MC-Loop-Signature":"1505145322883:1487460996","X-MC-Ingress-Time":"1505145322882","From":"Icenowy Zheng ","To":"Maxime Ripard ,\n\tJagan Teki ","Date":"Mon, 11 Sep 2017 23:54:57 +0800","Message-Id":"<20170911155458.62806-2-icenowy@aosc.io>","In-Reply-To":"<20170911155458.62806-1-icenowy@aosc.io>","References":"<20170911155458.62806-1-icenowy@aosc.io>","Cc":"u-boot@lists.denx.de, linux-sunxi@googlegroups.com,\n\tIcenowy Zheng ","Subject":"[U-Boot] [PATCH v2 1/2] video: sunxi: extract simplefb match code\n\tto a new file","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"As the DE2 simplefb setup code can also benefit from the simplefb match\ncode, extract it to a new source file.\n\nSigned-off-by: Icenowy Zheng \n---\n drivers/video/sunxi/Makefile | 2 +-\n drivers/video/sunxi/simplefb_common.c | 29 +++++++++++++++++++++++++++++\n drivers/video/sunxi/simplefb_common.h | 22 ++++++++++++++++++++++\n drivers/video/sunxi/sunxi_display.c | 13 ++-----------\n 4 files changed, 54 insertions(+), 12 deletions(-)\n create mode 100644 drivers/video/sunxi/simplefb_common.c\n create mode 100644 drivers/video/sunxi/simplefb_common.h","diff":"diff --git a/drivers/video/sunxi/Makefile b/drivers/video/sunxi/Makefile\nindex 0d64c2021f..10862edaca 100644\n--- a/drivers/video/sunxi/Makefile\n+++ b/drivers/video/sunxi/Makefile\n@@ -5,5 +5,5 @@\n # SPDX-License-Identifier:\tGPL-2.0+\n #\n \n-obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o lcdc.o tve_common.o ../videomodes.o\n+obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o simplefb_common.o lcdc.o tve_common.o ../videomodes.o\n obj-$(CONFIG_VIDEO_DE2) += sunxi_de2.o sunxi_dw_hdmi.o lcdc.o ../dw_hdmi.o\ndiff --git a/drivers/video/sunxi/simplefb_common.c b/drivers/video/sunxi/simplefb_common.c\nnew file mode 100644\nindex 0000000000..4823f13a0c\n--- /dev/null\n+++ b/drivers/video/sunxi/simplefb_common.c\n@@ -0,0 +1,29 @@\n+/*\n+ * Common code for Allwinner SimpleFB with pipeline.\n+ *\n+ * (C) Copyright 2014-2015 Hans de Goede \n+ * (C) Copyright 2017 Icenowy Zheng \n+ *\n+ * SPDX-License-Identifier:\tGPL-2.0+\n+ */\n+\n+#include \n+\n+int sunxi_simplefb_fdt_match(void *blob, const char *pipeline)\n+{\n+\tint offset, ret;\n+\n+\t/* Find a prefilled simpefb node, matching out pipeline config */\n+\toffset = fdt_node_offset_by_compatible(blob, -1,\n+\t\t\t\t\t \"allwinner,simple-framebuffer\");\n+\twhile (offset >= 0) {\n+\t\tret = fdt_stringlist_search(blob, offset, \"allwinner,pipeline\",\n+\t\t\t\t\t pipeline);\n+\t\tif (ret == 0)\n+\t\t\tbreak;\n+\t\toffset = fdt_node_offset_by_compatible(blob, offset,\n+\t\t\t\t\t \"allwinner,simple-framebuffer\");\n+\t}\n+\n+\treturn offset;\n+}\ndiff --git a/drivers/video/sunxi/simplefb_common.h b/drivers/video/sunxi/simplefb_common.h\nnew file mode 100644\nindex 0000000000..ac9bfcb087\n--- /dev/null\n+++ b/drivers/video/sunxi/simplefb_common.h\n@@ -0,0 +1,22 @@\n+/*\n+ * (C) Copyright 2017 Icenowy Zheng \n+ *\n+ * SPDX-License-Identifier:\tGPL-2.0+\n+ */\n+\n+#ifndef __SIMPLEFB_COMMON_H\n+#define __SIMPLEFB_COMMON_H\n+\n+/*\n+ * sunxi_simplefb_fdt_match() - match a sunxi simplefb node\n+ *\n+ * Match a sunxi simplefb device node with a specified pipeline, and\n+ * return its offset.\n+ *\n+ * @blob: device tree blob\n+ * @pipeline: display pipeline\n+ * @return device node offset in blob, or negative values if failed\n+ */\n+int sunxi_simplefb_fdt_match(void *blob, const char *pipeline);\n+\n+#endif\ndiff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c\nindex de768ba94a..7f25ed5f26 100644\n--- a/drivers/video/sunxi/sunxi_display.c\n+++ b/drivers/video/sunxi/sunxi_display.c\n@@ -29,6 +29,7 @@\n #include \"../anx9804.h\"\n #include \"../hitachi_tx18d42vm_lcd.h\"\n #include \"../ssd2828.h\"\n+#include \"simplefb_common.h\"\n \n #ifdef CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW\n #define PWM_ON 0\n@@ -1377,17 +1378,7 @@ int sunxi_simplefb_setup(void *blob)\n \t\tbreak;\n \t}\n \n-\t/* Find a prefilled simpefb node, matching out pipeline config */\n-\toffset = fdt_node_offset_by_compatible(blob, -1,\n-\t\t\t\t\t \"allwinner,simple-framebuffer\");\n-\twhile (offset >= 0) {\n-\t\tret = fdt_stringlist_search(blob, offset, \"allwinner,pipeline\",\n-\t\t\t\t\t pipeline);\n-\t\tif (ret == 0)\n-\t\t\tbreak;\n-\t\toffset = fdt_node_offset_by_compatible(blob, offset,\n-\t\t\t\t\t \"allwinner,simple-framebuffer\");\n-\t}\n+\toffset = sunxi_simplefb_fdt_match(blob, pipeline);\n \tif (offset < 0) {\n \t\teprintf(\"Cannot setup simplefb: node not found\\n\");\n \t\treturn 0; /* Keep older kernels working */\n","prefixes":["U-Boot","v2","1/2"]}