From patchwork Tue May 13 14:23:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Zapolskiy X-Patchwork-Id: 889659 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B90EA2BD009 for ; Tue, 13 May 2025 14:24:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747146247; cv=none; b=q5ioQlZsm48sueJCyNt/VrC5CRWzT6TPRfo6kK0tAlPTCHLraGpT510Ri3U7YfNPkY+vPXRZNIEItCVAQYHDRnNZ+AMpRiQHH7s7yaS/RC3f4uXaHyUdxRcWpwcp+qY/+l+4FRe4GKVB57HuWAeth8cvJmKtbFZLA86hpd9Tf6M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747146247; c=relaxed/simple; bh=1dbZKTa/g+MzsnzTQFCT1jdM3evL1vIx93omGHH0mS4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JMw9GtT1a3Twmc5SH2dE01RgE8+cPnLnoWkLMFmjT40RjvP6LnqKAvpMq2KvkSoj/PLPChN9NvWURY51erBbQLjOH+ANTigHP2LeeTdnaWNu6Zvc/amqLz3uoXDTUg71Ohb92Z8eYvPsJXwJpaEQw4+YxXRr2i7mvv5ZRxCYqeE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Vs5/NShG; arc=none smtp.client-ip=209.85.167.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Vs5/NShG" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-54fcdc99478so349604e87.0 for ; Tue, 13 May 2025 07:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747146244; x=1747751044; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FLyQNl/IfprA8mrvUU0qzCD9YVX1jlfRaaDTODi+QbM=; b=Vs5/NShGV04HpSXCK/5zy/JjMa9blTs5UiwgGyiEK1kvBWF/aTzhATN5kAGKAy5H7V bkGZVDaoz0zKMABDVh43J4iQiKbee1mKP/+XNbsv2dtmgCV4xLSdiTo+uLQi6J1Cq8Kt 88xNudE8lFtgC6163eAFf/Diblf/r0zyz6Ll1YYaLwk5mGfBjzxiLizcPZOy60zyDLgL r6/+AsJ0gHTxd47sqHEy8ReEEuSXEbTC6C6tK5ymH0o0Xe68Q1gnhiv57ZcJVzzMClYQ R4cJlwbtthIJj8qUUdjdsWwTHPi1XN5Md93CARSX3bl1x124R8RZHZIbm6wHLylWUkoE Huqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747146244; x=1747751044; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FLyQNl/IfprA8mrvUU0qzCD9YVX1jlfRaaDTODi+QbM=; b=rb3QM0tZRXZQ4FYNksVyMUraouHmRxmAT4LAR2EMkFatD2Tme+RLU2xffVLnkLNCih 7PunI3n/OSFtMP880IMbiv0EKd7+vkMA1StJURmzDb1sjugYIl7TfdHqIJDHbV1WLtF8 oRwXPtR+dxdNU9wNBWzQl4wExltnVAIcKDV8obn4qhHdOsueVhD8RN+ZrsYarCw0Yxz0 /b7ZMhQkL44oiq8QbPsY0wzyJb1ERIbTBYTIytxZKTW/VRDTlfppQQ7LeSvO85JfCcYY ErLepTjLha9ka303buJOUmtq7er3kstrDnAfVfbKi6IDDmpi1WNTpxhOujtTZ1X4cmI4 7tqQ== X-Forwarded-Encrypted: i=1; AJvYcCWciVnu3IUgZDckBQXzqwYzZovZ1jNsxWySbO2GSPtKgB/ho9Pywitqp1fUfHMn0bkoWNLSVe1CunoxYe9E@vger.kernel.org X-Gm-Message-State: AOJu0YztKo/tQh7GICPbFk+4Mw01QVNbKKgGPplIqhnpvqY/X5128Iba ZEy7H0S7TidIeAEdBxYy7vzBQ8j95TU0GLkCnp6UmaX3Yeg+9z3eirNm9tREYUNkpKm4m1kzzkS u X-Gm-Gg: ASbGncv+iLpfJcz1geMojHmzXSNoOhtK6MVgy/qlfxd1RRZQUWoEAEAS3GRE3Wgan4T ElazLUWog2GAefbu9MsqhVbS7GX/2V8P5jlUUwbL8+B/C6HeBIp5i7XbORbAliPAS6FoFZzjXxf T2rWZS/ERE9E2inTgda0jSTdN5kqcn8FwC40nw4hVDa3AImL+1WqoRLJhC4WQiUIOdfsAsaAJ7O Gmya5NQUsxLv+cPK1fBmPL43+St/XZdcBRr65MG3LNYVtD5TlbUIplw7RUaQwIivXmJb3YKnXIv /upgJ/iNEkN8BoyHcbOGBBC3FO2u7iCS7I2ckT2bgPrpD8Bs/Xh1ie204elAMvvIEgWeG5OZmh1 j+cqnDPr1ZoX7kjeuVYtPZJLw48PqVaT3q7ntD4eq X-Google-Smtp-Source: AGHT+IHtk921lEO/dQfipJFfEuJ1GeNiLuhJwnGHgJR1JF/11YYx8N67y8WnOW6vPy9eWziLe0e9eQ== X-Received: by 2002:a05:6512:3da6:b0:54f:c10b:7286 with SMTP id 2adb3069b0e04-54fc67ad7f5mr2070039e87.3.1747146243820; Tue, 13 May 2025 07:24:03 -0700 (PDT) Received: from localhost.localdomain (88-112-131-206.elisa-laajakaista.fi. [88.112.131.206]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54fc644fba0sm1871813e87.23.2025.05.13.07.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 May 2025 07:24:03 -0700 (PDT) From: Vladimir Zapolskiy To: Robert Foss , Todor Tomov , Bryan O'Donoghue , Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 2/9] media: qcom: camss: remove duplicated csiphy_formats_sc7280 data Date: Tue, 13 May 2025 17:23:46 +0300 Message-ID: <20250513142353.2572563-3-vladimir.zapolskiy@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250513142353.2572563-1-vladimir.zapolskiy@linaro.org> References: <20250513142353.2572563-1-vladimir.zapolskiy@linaro.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 It's sufficient to have just one previously set csiphy_formats_sdm845 data. Signed-off-by: Vladimir Zapolskiy --- drivers/media/platform/qcom/camss/camss-csiphy.c | 5 ----- drivers/media/platform/qcom/camss/camss-csiphy.h | 1 - drivers/media/platform/qcom/camss/camss.c | 10 +++++----- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c index c622efcc92ff..2de97f58f9ae 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c @@ -103,11 +103,6 @@ const struct csiphy_formats csiphy_formats_8x96 = { .formats = formats_8x96 }; -const struct csiphy_formats csiphy_formats_sc7280 = { - .nformats = ARRAY_SIZE(formats_sdm845), - .formats = formats_sdm845 -}; - const struct csiphy_formats csiphy_formats_sdm845 = { .nformats = ARRAY_SIZE(formats_sdm845), .formats = formats_sdm845 diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.h b/drivers/media/platform/qcom/camss/camss-csiphy.h index ab91273303b9..895f80003c44 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.h +++ b/drivers/media/platform/qcom/camss/camss-csiphy.h @@ -126,7 +126,6 @@ void msm_csiphy_unregister_entity(struct csiphy_device *csiphy); extern const struct csiphy_formats csiphy_formats_8x16; extern const struct csiphy_formats csiphy_formats_8x96; -extern const struct csiphy_formats csiphy_formats_sc7280; extern const struct csiphy_formats csiphy_formats_sdm845; extern const struct csiphy_hw_ops csiphy_ops_2ph_1_0; diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c index f76773dbd296..8c844ebf9cb6 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -1481,7 +1481,7 @@ static const struct camss_subdev_resources csiphy_res_7280[] = { .csiphy = { .id = 0, .hw_ops = &csiphy_ops_3ph_1_0, - .formats = &csiphy_formats_sc7280 + .formats = &csiphy_formats_sdm845, } }, /* CSIPHY1 */ @@ -1496,7 +1496,7 @@ static const struct camss_subdev_resources csiphy_res_7280[] = { .csiphy = { .id = 1, .hw_ops = &csiphy_ops_3ph_1_0, - .formats = &csiphy_formats_sc7280 + .formats = &csiphy_formats_sdm845, } }, /* CSIPHY2 */ @@ -1511,7 +1511,7 @@ static const struct camss_subdev_resources csiphy_res_7280[] = { .csiphy = { .id = 2, .hw_ops = &csiphy_ops_3ph_1_0, - .formats = &csiphy_formats_sc7280 + .formats = &csiphy_formats_sdm845, } }, /* CSIPHY3 */ @@ -1526,7 +1526,7 @@ static const struct camss_subdev_resources csiphy_res_7280[] = { .csiphy = { .id = 3, .hw_ops = &csiphy_ops_3ph_1_0, - .formats = &csiphy_formats_sc7280 + .formats = &csiphy_formats_sdm845, } }, /* CSIPHY4 */ @@ -1541,7 +1541,7 @@ static const struct camss_subdev_resources csiphy_res_7280[] = { .csiphy = { .id = 4, .hw_ops = &csiphy_ops_3ph_1_0, - .formats = &csiphy_formats_sc7280 + .formats = &csiphy_formats_sdm845, } }, };