From patchwork Mon Jan 14 09:57:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 10761863 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1F3FF13B5 for ; Mon, 14 Jan 2019 09:58:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D83128ADD for ; Mon, 14 Jan 2019 09:58:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F390028AF3; Mon, 14 Jan 2019 09:58:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 888F828AE7 for ; Mon, 14 Jan 2019 09:58:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726598AbfANJ57 (ORCPT ); Mon, 14 Jan 2019 04:57:59 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:37808 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726525AbfANJ57 (ORCPT ); Mon, 14 Jan 2019 04:57:59 -0500 Received: by mail-lf1-f66.google.com with SMTP id y11so15126873lfj.4 for ; Mon, 14 Jan 2019 01:57:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=TZeGN3rlRP+BY2QvEk3qQEzkoTkwqoKfmJP5E6E9R+U=; b=BAHt31rlG9ugX7GNkSQ9IQMxQXOCNsAl+g2MFZgDG1d35EKxagIDsIaPKF3jB2BQ9F BQIh1bzTmWWLRSQZXu7H6fBgtTuNOERB7JS2MqG5JxBUAl+ga/gL72fwDFy7/lm+Trk0 RtMlLl/ZdNGx7FtNfiKbRQRaT4LQrOh4QRIqQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TZeGN3rlRP+BY2QvEk3qQEzkoTkwqoKfmJP5E6E9R+U=; b=RbdSwfIqOtuIM9Pjv797t3M7hVR9o80Wu9MJ3uKsegAXOi6UaPr2NmgBxZVbSLqepM LSaPL3icgSXazKZziZnT3vLA9LZ4Ld10qxy+25tyE1F6mQcdge3J8nJrczOOFXMT5kWc 2XyJtqdCoLUEom/eWF/9nAhe7Jp6kbkBOo9HjdDis8RQ+LxC0SS/h4CvVZenFUIPiu/2 DYpfBAiPwt6/3flzwkhdX+3xd5rqu8gOaO/exeUevClI8JBS2gwpH71rZtOkfxSP2Hyh XIjsSkZsMJCvQGoEchQViy7guj3TGCFuE3aoyLp730C3y/+8N0wMNLqlJFq/sW02B2AQ Bgnw== X-Gm-Message-State: AJcUukfeHw5ikZw3O+P1ETvspUaiSxmyinOFplq27hMr4mwd8izyAFnJ W827x39PDwVTwVGVIzHxvjk/GA== X-Google-Smtp-Source: ALg8bN4CuKicsbu2IVtGrvUr+ISks7OeB2qmc+DMq6H9Dt1jTVYyN84SqAB7x0/EVF5NVmKsvca7CQ== X-Received: by 2002:a19:ee08:: with SMTP id g8mr13283753lfb.72.1547459877456; Mon, 14 Jan 2019 01:57:57 -0800 (PST) Received: from localhost (c-573670d5.07-21-73746f28.bbcust.telenor.se. [213.112.54.87]) by smtp.gmail.com with ESMTPSA id u12-v6sm17389497ljk.79.2019.01.14.01.57.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 01:57:56 -0800 (PST) From: Anders Roxell To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Anders Roxell Subject: [PATCH 3/3] input: touchscreen: fix link error Date: Mon, 14 Jan 2019 10:57:54 +0100 Message-Id: <20190114095754.23175-1-anders.roxell@linaro.org> X-Mailer: git-send-email 2.11.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix link error when TOUCHSCREEN_RASPBERRYPI_FW is enabled as a module and the dependent module is built-in. The 'depends on RASPBERRYPI_FIRMWARE' by itself prevents the touchscreen driver from being built-in when the firmware is configured as a module. However, the '|| COMPILE_TEST' still allows it unless we explicitly prevent that configuration with '|| (RASPBERRYPI_FIRMWARE=n && COMPILE_TEST)' ld: drivers/input/touchscreen/raspberrypi-ts.o: in function `rpi_ts_probe': raspberrypi-ts.c:(.text+0x3a8): undefined reference to `rpi_firmware_get' ld: raspberrypi-ts.c:(.text+0x3a8): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `rpi_firmware_get' ld: raspberrypi-ts.c:(.text+0x4c8): undefined reference to `rpi_firmware_property' ld: raspberrypi-ts.c:(.text+0x4c8): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `rpi_firmware_property' Rework so that TOUCHSCREEN_RASPBERRYPI_FW depends on RASPBERRYPI_FIRMWARE=n if COMPILE_TEST is enabled. Suggested-by: Arnd Bergmann Signed-off-by: Anders Roxell --- drivers/input/touchscreen/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index af6027cc7bbf..068dbbc610fc 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -698,7 +698,7 @@ config TOUCHSCREEN_EDT_FT5X06 config TOUCHSCREEN_RASPBERRYPI_FW tristate "Raspberry Pi's firmware base touch screen support" - depends on RASPBERRYPI_FIRMWARE || COMPILE_TEST + depends on RASPBERRYPI_FIRMWARE || (RASPBERRYPI_FIRMWARE=n && COMPILE_TEST) help Say Y here if you have the official Raspberry Pi 7 inch screen on your system.