From patchwork Thu Apr 8 07:50:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 417407 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp316030jai; Thu, 8 Apr 2021 00:50:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwF1l+EsHc+PDdw63a5790xPcfhpZn0x1EZ49OpgTz2Yzur6pVgkQlQThpSkOS41jyczPmn X-Received: by 2002:a63:2507:: with SMTP id l7mr6994435pgl.198.1617868250791; Thu, 08 Apr 2021 00:50:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617868250; cv=none; d=google.com; s=arc-20160816; b=xHoDW6654+xP9Jw5GWPy4BbdI8fi1dN8+uTfNHmR1IuDOeXVgSP9HVKVkYxHvFRiqM YpR26VHaYMs/A7RoZyWV/xihcUhtG6EjOY0M/JQwzEOaaN5NogjIDjS39utZrEgonuZ8 3yxlJCm5t06YtmXmKzX4NGyENT0cbp7tpyZ8HzjnDsIkTfC84etsYZInqaPJKrx6F9wp a0IKXBRLYpM7SiW6dc9J+g5w+qt1JxPuEQNfGgvxSs9ErJCZcxob14pH5Ul8ZbteCdxB CKGJ1o5FBPj/YroErVT8nZT4NX3vPg2XgY31IeI8AGndhsdVRKwJjpx6U5QD8q6BKafo HhiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=6U45pNdM0qN4a1O10k6aqNmRvSwq7HC5E/CC+/6kbdY=; b=NN9NWV1ae2i7bLT3P08BN/7M4uX4DWKvkAXguzDCaty+dmY57FVckwc/sCvxGPm7oG dFa2FWX+h8lfpG166BnxiQoJqLBF/ZQ5Unn3jdjsqa5iag98AD2GvUC09d4scNGPlaMm uHwd2Df9zwLB+vPhE6RwJejHlnmgLpj440ZIFgrq81maZam5SQGaHVSksLX3ImJH9CSi OV0WZBOuSC7RPp/i9I2oTbOngwldvb70rmeinyJZL/zdFxP1dF+owg6pRM7GyWf9x/JT 6qNTKtUmASc2jnjfPgVlxqEFhkatXp76y2xAusW48q/yS/tmIH3V9zh3tkEx48FcpvML jSJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XRR7rBXe; spf=pass (google.com: domain of linux-spi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-spi-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q29si14756635pgb.153.2021.04.08.00.50.50; Thu, 08 Apr 2021 00:50:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-spi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XRR7rBXe; spf=pass (google.com: domain of linux-spi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-spi-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229552AbhDHHvA (ORCPT + 1 other); Thu, 8 Apr 2021 03:51:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229505AbhDHHvA (ORCPT ); Thu, 8 Apr 2021 03:51:00 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F1C7C061760 for ; Thu, 8 Apr 2021 00:50:49 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id w28so2425249lfn.2 for ; Thu, 08 Apr 2021 00:50:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6U45pNdM0qN4a1O10k6aqNmRvSwq7HC5E/CC+/6kbdY=; b=XRR7rBXeebmDkxmYIYN5rgebwUcGncYOZ/PtkC0j6YsuR86lapKeh9k4XFXaGaij0Q Mtg8Odet2Ylc4ejK8w+BGU5HatAvS9MHUSI3u7WeBzvWbCZ1rFUYMKzZ228J7+iAPdGE hxWZQ6/neNSpnTXs8BnkGCPJYEuP8ex/ksnjMmD2QP1mUEt/kuSsiLyHNLh9hT7Gcq2i 6qK6Q1t7b46s0onC+usETpAMoEvkmgCm5W/cM4GR7MjW2Wa03G4Oz0490Q+FWMIy/hoJ X4Krso3ijAvumBIbYB9FL53tp6lpfji0dhBaGETduQsqJ4ssQr3rL56z/NDDxwU39pQz rG3A== 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:mime-version :content-transfer-encoding; bh=6U45pNdM0qN4a1O10k6aqNmRvSwq7HC5E/CC+/6kbdY=; b=sS27P683Fm04IA9J769ifgMqdy3s8BHaMWRYoAmaSLC51ddeg1IVvlxj/j8Hp5EHRQ i33zzSNBnA/WC1+Gbqc8JtvLdzVcCVYqgr2tvP5kTLsax2YazGG2rUguaU1cfWKBO2xd NmC9V4UV1uHSk0sE+XFnNmipbUY4V6nLdR0GbanKNqcLnTiluEVHa04WcDcQHbeLB2ZD /6WggqdJLQhYwxgRCtEMpwvgNQtzEQ2B/jKdbI2MmOdr8QCpmF1DPjgkgYOyQqOwynCK UM2FTHLAPYswD+CaBlElW8pIDWBr2wFJsdDmbRFnKndH1xY0Br2PU5op2QtfLVW62RJk ITzA== X-Gm-Message-State: AOAM530bmMehRtZFskW/LmUW8gVgP/JIJg90YpP1QgR/UeVab/LVu9EZ Q7aJ+DT2kAHpVj9D8iXKHOGUTw== X-Received: by 2002:a05:6512:1102:: with SMTP id l2mr5243471lfg.501.1617868247771; Thu, 08 Apr 2021 00:50:47 -0700 (PDT) Received: from localhost.localdomain (c-14cb225c.014-348-6c756e10.bbcust.telenor.se. [92.34.203.20]) by smtp.gmail.com with ESMTPSA id x13sm2777709ljj.4.2021.04.08.00.50.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Apr 2021 00:50:47 -0700 (PDT) From: Linus Walleij To: Mark Brown , linux-spi@vger.kernel.org Cc: Linus Walleij , Viresh Kumar , Shiraz Hashim , linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM/spi: spear: Drop PL022 num_chipselect Date: Thu, 8 Apr 2021 09:50:45 +0200 Message-Id: <20210408075045.3435046-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org A previous refactoring moved the chip select number handling to the SPI core and we missed a leftover platform data user in the ST spear platform. The spear is not using this chipselect or PL022 for anything and should be using device tree like the rest of the platform so just delete the offending platform data. Cc: Viresh Kumar Cc: Shiraz Hashim Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Linus Walleij --- Mark: please apply this as a fix to the SPI tree unless there are protests. --- arch/arm/mach-spear/spear320.c | 2 -- arch/arm/mach-spear/spear3xx.c | 10 ---------- 2 files changed, 12 deletions(-) -- 2.29.2 Acked-by: Viresh Kumar diff --git a/arch/arm/mach-spear/spear320.c b/arch/arm/mach-spear/spear320.c index 0958f68a21e2..926d5a243238 100644 --- a/arch/arm/mach-spear/spear320.c +++ b/arch/arm/mach-spear/spear320.c @@ -195,14 +195,12 @@ static struct pl022_ssp_controller spear320_ssp_data[] = { .dma_filter = pl08x_filter_id, .dma_tx_param = "ssp1_tx", .dma_rx_param = "ssp1_rx", - .num_chipselect = 2, }, { .bus_id = 2, .enable_dma = 1, .dma_filter = pl08x_filter_id, .dma_tx_param = "ssp2_tx", .dma_rx_param = "ssp2_rx", - .num_chipselect = 2, } }; diff --git a/arch/arm/mach-spear/spear3xx.c b/arch/arm/mach-spear/spear3xx.c index 8537fcffe5a8..f83321d5e353 100644 --- a/arch/arm/mach-spear/spear3xx.c +++ b/arch/arm/mach-spear/spear3xx.c @@ -30,16 +30,6 @@ struct pl022_ssp_controller pl022_plat_data = { .dma_filter = pl08x_filter_id, .dma_tx_param = "ssp0_tx", .dma_rx_param = "ssp0_rx", - /* - * This is number of spi devices that can be connected to spi. There are - * two type of chipselects on which slave devices can work. One is chip - * select provided by spi masters other is controlled through external - * gpio's. We can't use chipselect provided from spi master (because as - * soon as FIFO becomes empty, CS is disabled and transfer ends). So - * this number now depends on number of gpios available for spi. each - * slave on each master requires a separate gpio pin. - */ - .num_chipselect = 2, }; /* dmac device registration */