From patchwork Mon Nov 22 18:06:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Aaltonen X-Patchwork-Id: 1558165 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HyZzS1WdZz9sXS for ; Tue, 23 Nov 2021 05:09:22 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mpDkX-0007ac-3d; Mon, 22 Nov 2021 18:09:05 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mpDi8-0000a6-5s for kernel-team@lists.ubuntu.com; Mon, 22 Nov 2021 18:06:36 +0000 Received: from leon.. (mobile-user-c1d2e5-215.dhcp.inet.fi [193.210.229.215]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 80E9940079 for ; Mon, 22 Nov 2021 18:06:34 +0000 (UTC) From: Timo Aaltonen To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/3] Revert "UBUNTU: SAUCE: (no-up) rename the adv7511 drm driver to adv7511_drm" Date: Mon, 22 Nov 2021 20:06:01 +0200 Message-Id: <20211122180632.72792-3-tjaalton@ubuntu.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211122180632.72792-1-tjaalton@ubuntu.com> References: <20211122180632.72792-1-tjaalton@ubuntu.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Timo Aaltonen This reverts commit ec786666ca5a562cc722bfd137f9f09b271cbe2a. adv7511 media driver was renamed by upstream commit commit b2ce5617dad254230551feda3599f2cc68e53ad8 Author: Anders Roxell Date: Wed Jun 12 12:19:35 2019 -0400 media: i2c: fix warning same module names so this commit can be reverted now. Signed-off-by: Timo Aaltonen --- debian.master/abi/arm64/generic-64k.modules | 2 +- debian.master/abi/arm64/generic.modules | 2 +- debian.master/abi/armhf/generic-lpae.modules | 2 +- debian.master/abi/armhf/generic.modules | 2 +- debian.master/abi/ppc64el/generic.modules | 2 +- drivers/gpu/drm/bridge/adv7511/Makefile | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian.master/abi/arm64/generic-64k.modules b/debian.master/abi/arm64/generic-64k.modules index ab19a24bce4e..2b579b919aef 100644 --- a/debian.master/abi/arm64/generic-64k.modules +++ b/debian.master/abi/arm64/generic-64k.modules @@ -240,7 +240,7 @@ adv7183 adv7343 adv7393 adv748x -adv7511_drm +adv7511 adv7604 adv7842 adv_pci1710 diff --git a/debian.master/abi/arm64/generic.modules b/debian.master/abi/arm64/generic.modules index d065a6f0b4d4..e93134dcf52b 100644 --- a/debian.master/abi/arm64/generic.modules +++ b/debian.master/abi/arm64/generic.modules @@ -240,7 +240,7 @@ adv7183 adv7343 adv7393 adv748x -adv7511_drm +adv7511 adv7604 adv7842 adv_pci1710 diff --git a/debian.master/abi/armhf/generic-lpae.modules b/debian.master/abi/armhf/generic-lpae.modules index bda8c8d56390..6e4af53cdeb0 100644 --- a/debian.master/abi/armhf/generic-lpae.modules +++ b/debian.master/abi/armhf/generic-lpae.modules @@ -232,7 +232,7 @@ adv7183 adv7343 adv7393 adv748x -adv7511_drm +adv7511 adv7604 adv7842 adv_pci1710 diff --git a/debian.master/abi/armhf/generic.modules b/debian.master/abi/armhf/generic.modules index 6bf0991bfce7..d5c4a2810fb9 100644 --- a/debian.master/abi/armhf/generic.modules +++ b/debian.master/abi/armhf/generic.modules @@ -234,7 +234,7 @@ adv7183 adv7343 adv7393 adv748x -adv7511_drm +adv7511 adv7604 adv7842 adv_pci1710 diff --git a/debian.master/abi/ppc64el/generic.modules b/debian.master/abi/ppc64el/generic.modules index 04c7d6b84de0..a55189d290ea 100644 --- a/debian.master/abi/ppc64el/generic.modules +++ b/debian.master/abi/ppc64el/generic.modules @@ -231,7 +231,7 @@ adv7183 adv7343 adv7393 adv748x -adv7511_drm +adv7511 adv7604 adv7842 adv_pci1710 diff --git a/drivers/gpu/drm/bridge/adv7511/Makefile b/drivers/gpu/drm/bridge/adv7511/Makefile index c426b9064c92..d8ceb534b51f 100644 --- a/drivers/gpu/drm/bridge/adv7511/Makefile +++ b/drivers/gpu/drm/bridge/adv7511/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -adv7511_drm-y := adv7511_drv.o adv7533.o -adv7511_drm-$(CONFIG_DRM_I2C_ADV7511_AUDIO) += adv7511_audio.o -adv7511_drm-$(CONFIG_DRM_I2C_ADV7511_CEC) += adv7511_cec.o -obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511_drm.o +adv7511-y := adv7511_drv.o adv7533.o +adv7511-$(CONFIG_DRM_I2C_ADV7511_AUDIO) += adv7511_audio.o +adv7511-$(CONFIG_DRM_I2C_ADV7511_CEC) += adv7511_cec.o +obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511.o