Received: by 2002:a05:6500:2018:b0:1fb:9675:f89d with SMTP id t24csp698737lqh; Fri, 31 May 2024 13:40:56 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUtvqQtt4JRjxeBF6Q86W8o+xQbxkiFMvAjPToUGn++70Il+CdxEulQri1om4J+fsBDUVNaO69eMbZTyBgHoCxuJelOafS6pWCG/uS4RQ== X-Google-Smtp-Source: AGHT+IGQflS9tiGqB7K/Z9lDRJ3EQ4lSMbRc5+zogAbmdx+Q5I8SvN/qPUG76Xt4jrDdbYd7GbHn X-Received: by 2002:a17:903:6cb:b0:1f4:89e4:b5de with SMTP id d9443c01a7336-1f63709e290mr21095175ad.50.1717188056098; Fri, 31 May 2024 13:40:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717188056; cv=pass; d=google.com; s=arc-20160816; b=VR7Jc1VhNVAZ3XgFu4bR1tA79tbreokXSqCwbRg5GJxG8URRF0uUReRrJH7zjqId1l lOlqiRh9SCOn1/NvPrH5Dh0rZbjmNImkih4w11RDXvpdZRv8WimKZbXhprxAwLa7x7am zrBpDsJjxieQMe6u+lx0vcDsmLjCe4u+PzcspRvpClpGCl+MdWYpTK4GcErNfOPt8U5e eBHLjMOxKzpfiBGB+U4/N13HIT9umKoVHvURCGMtNUtUxnZwkmJMyURIwoJyT3MDVQAr tIgSFLypYGQUQYH6gOwqUnawPs2c6L/rDD2NeN6ky1eKVDt7sQDi/4vZlgK13BPQ+e5H MInQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=ju9yTVd43srfUJ18SKWRLayOxfYeLI5ol3mcv7TLf3M=; fh=Dd+RHkZyvVoGvmR0RpBbJaSfPxMU+uo3hhKbrwL/8Zw=; b=yEa9QFZyL/V4SmPvb7ErV1BDEg2R5jFjgxz/M3FVJIGLK6+m7CaprU3XC1FHxL5AZK J0UNapjwROT9lvMCEf9/+GcKSV+RVNOgL05k0o5zxA1EOXw6qX4dEL3WlV3gwC43U2AG C/k5ZYcAfDL6icbKBDZ5BE2WUybNwlfSUVWC2s+xuVdikfE8ps0zH6DEkK6foj9MU+xf QLdQk8S5JXD5fzo5iXrwqadyOXGEN0gKNr7XpYxL2qxwdsOy+iFWB+xGZFmmt0V6gdbl 1rNTh2GjpKcqJSd0xtxRL4y3ufI+smah5lY9odNU1vg97++Nd8a/4f5y8t37/vjWYhpw LW0w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@alliedtelesis.co.nz header.s=mail181024 header.b=IPxHxbWD; arc=pass (i=1 spf=pass spfdomain=alliedtelesis.co.nz dkim=pass dkdomain=alliedtelesis.co.nz dmarc=pass fromdomain=alliedtelesis.co.nz); spf=pass (google.com: domain of linux-kernel+bounces-196024-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-196024-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=REJECT dis=NONE) header.from=alliedtelesis.co.nz Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id d9443c01a7336-1f6323ebd7asi21016545ad.406.2024.05.31.13.40.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 May 2024 13:40:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-196024-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@alliedtelesis.co.nz header.s=mail181024 header.b=IPxHxbWD; arc=pass (i=1 spf=pass spfdomain=alliedtelesis.co.nz dkim=pass dkdomain=alliedtelesis.co.nz dmarc=pass fromdomain=alliedtelesis.co.nz); spf=pass (google.com: domain of linux-kernel+bounces-196024-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-196024-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=REJECT dis=NONE) header.from=alliedtelesis.co.nz Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 33C96286782 for ; Thu, 30 May 2024 23:21:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9ADF117E450; Thu, 30 May 2024 23:21:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=alliedtelesis.co.nz header.i=@alliedtelesis.co.nz header.b="IPxHxbWD" Received: from gate2.alliedtelesis.co.nz (gate2.alliedtelesis.co.nz [202.36.163.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 902324D8C3 for ; Thu, 30 May 2024 23:21:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.36.163.20 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717111265; cv=none; b=WqbAD3eK5PKitFaP36jZ/IQBl6v7m/xFLHdr2n7ikKIyT2cS1OpxhAo6MmvKiZhbyEGMk2fWPO9rpKucA3NZNqZE5PCTuFt/zkPbfsboq2/eqiMsBJ2mzEmUbG57Z6+6j+cJD6oaL/FvqWjOkEEcZVK3FpznrJDftNkfCcHJcpM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717111265; c=relaxed/simple; bh=jzhCryJW5JtNI2X+iLQwWD6k73DG4yDa1rDTIWEKIZU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=A4Kaul9xpb19mr5mWUHDZiYL0tfPuE40rkm7MSOVurjjO3pvJtH5mgcwMFYmx6OuVyh1Tg8mNN3L1PhtNohLiZyk9gIU/a5uM/e9u3ltDnCl4pquA4z/N0/IrbuPyCZ4fDBGOQEGYOVzvhrUhZdtOBcRep72/7WAjdCWejEpVjI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=alliedtelesis.co.nz; spf=pass smtp.mailfrom=alliedtelesis.co.nz; dkim=pass (2048-bit key) header.d=alliedtelesis.co.nz header.i=@alliedtelesis.co.nz header.b=IPxHxbWD; arc=none smtp.client-ip=202.36.163.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=alliedtelesis.co.nz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=alliedtelesis.co.nz Received: from svr-chch-seg1.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 9F97F2C00CF; Fri, 31 May 2024 11:20:59 +1200 (NZST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1717111259; bh=ju9yTVd43srfUJ18SKWRLayOxfYeLI5ol3mcv7TLf3M=; h=From:To:Cc:Subject:Date:From; b=IPxHxbWDOEfDLuXgWZvHoY/TiBUNet6uR0RyRSWt99Mbm/VtmI+G7Mylqmzrb74rg /BLFaUxgMT56nIIAwpJVotEwiF7Emni98z89gJ9xDg5zqOBCuv+mXD+IY0utEdwqAr PIxwPoxC5uxnPGBQd5QD2accuVPvk9PC/oPhjXhlDsd4lvxyo+GXfzAvEFTFkS6BpA bz+LmNVKIjQrMJ8uwQ9aWdQ/mGFCMIORxDQFsK7EQ17pVKb78Tne8/y2zxNGueBLAc NMFDDVBEGqu3E6xRcn7J8sboxSTuBnsMAcE8ytnN9y8ms4XTfgt0YY6poD7G5oUNCT Gn/BL9FZKN5vw== Received: from pat.atlnz.lc (Not Verified[10.32.16.33]) by svr-chch-seg1.atlnz.lc with Trustwave SEG (v8,2,6,11305) id ; Fri, 31 May 2024 11:20:59 +1200 Received: from chrisp-dl.ws.atlnz.lc (chrisp-dl.ws.atlnz.lc [10.33.22.30]) by pat.atlnz.lc (Postfix) with ESMTP id 6A08613EDFA; Fri, 31 May 2024 11:20:59 +1200 (NZST) Received: by chrisp-dl.ws.atlnz.lc (Postfix, from userid 1030) id 657FB280481; Fri, 31 May 2024 11:20:59 +1200 (NZST) From: Chris Packham To: andy@kernel.org, geert@linux-m68k.org, tzimmermann@suse.de, ojeda@kernel.org Cc: linux-kernel@vger.kernel.org, Chris Packham Subject: [PATCH] auxdisplay: linedisp: Support configuring the boot message Date: Fri, 31 May 2024 11:20:54 +1200 Message-ID: <20240530232054.3559043-1-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.45.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SEG-SpamProfiler-Analysis: v=2.4 cv=F9L0dbhN c=1 sm=1 tr=0 ts=665909db a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=TpHVaj0NuXgA:10 a=mV-LYs_grPyxVDLXzvUA:9 a=3ZKOabzyN94A:10 X-SEG-SpamProfiler-Score: 0 x-atlnz-ls: pat Like we do for charlcd, allow the configuration of the initial message on line-display devices. Signed-off-by: Chris Packham --- drivers/auxdisplay/Kconfig | 2 +- drivers/auxdisplay/line-display.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig index 69d2138d7efb..21545ffba065 100644 --- a/drivers/auxdisplay/Kconfig +++ b/drivers/auxdisplay/Kconfig @@ -316,7 +316,7 @@ endif # PARPORT_PANEL =20 config PANEL_CHANGE_MESSAGE bool "Change LCD initialization message ?" - depends on CHARLCD + depends on CHARLCD || LINEDISP help This allows you to replace the boot message indicating the kernel ver= sion and the driver version with a custom message. This is useful on appli= ances diff --git a/drivers/auxdisplay/line-display.c b/drivers/auxdisplay/line-= display.c index e2b546210f8d..837ca63c8368 100644 --- a/drivers/auxdisplay/line-display.c +++ b/drivers/auxdisplay/line-display.c @@ -8,7 +8,9 @@ * Copyright (C) 2021 Glider bv */ =20 +#ifndef CONFIG_PANEL_BOOT_MESSAGE #include +#endif =20 #include #include @@ -312,6 +314,12 @@ static int linedisp_init_map(struct linedisp *linedi= sp) return 0; } =20 +#ifdef CONFIG_PANEL_BOOT_MESSAGE +#define LINE_DISP_INIT_TEXT CONFIG_PANEL_BOOT_MESSAGE +#else +#define LINE_DISP_INIT_TEXT "Linux " UTS_RELEASE " " +#endif + /** * linedisp_register - register a character line display * @linedisp: pointer to character line display structure @@ -359,7 +367,7 @@ int linedisp_register(struct linedisp *linedisp, stru= ct device *parent, goto out_del_timer; =20 /* display a default message */ - err =3D linedisp_display(linedisp, "Linux " UTS_RELEASE " ", -1); + err =3D linedisp_display(linedisp, LINE_DISP_INIT_TEXT, -1); if (err) goto out_del_dev; =20 --=20 2.45.1