Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3137064pxk; Mon, 5 Oct 2020 01:54:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUAyUArcFm5NrBehxytpnJ2CeHY5o3GTrtb9UL4En9h6k+B9O6FpU6CXSMj6pOTIZA6yam X-Received: by 2002:a50:d2d3:: with SMTP id q19mr5779769edg.22.1601888058956; Mon, 05 Oct 2020 01:54:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601888058; cv=none; d=google.com; s=arc-20160816; b=KJjEPt2MpAsRU0t+pXDcHMkYphEpN+nFg0Z3IBcAfUgBnM+0hEK/tfCfo/1QrilBeU EywJfd8bzJ6PukcrCqPBtusyjXIW/W0LloP4mGCbgzEpO5OoZe01rgFTPThu1ug5tE0V Kp77oQg1BIIW1/qKlXIUS9tabfCXDMxmPaPRF+t0tX4b0Gzlaoh6Oz59Lxzur+stiElt jKCQmlVlRgOZoT0DluSRvzboH/OMBOEs1UKdqP1W39zzoZ2nKoo17Hi70LlwEcvY9fT8 M/w9NAuQIKmF/AY+cQnSrXnS5HqHfRj27svCKeVPARzK1Z9PUfRFRV9bpVG7shnHnlMT kIDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=IGU75hPbtAPKKLpXDkEcbj0jlLIdIvhFG6Hqgr0zTM4=; b=W4ZMR4oi6ul2P5kPkxSeBxu3/NyfruTQW05ylb8kuvrZrmIawgzpcw3Q7eFCL/FrcB 17PwiuCZkgwvHlLhoD3hxQCkiko5Q4yChpuXWSR+C8o6Llz9rhL33IhuuvVghmopzoif mp8gBH+60zI52Z5YOKLxIF3td3YCWyG3NhWKd9BxWI5sRvRTM6fTdYwViA8rbDNA4cjQ IY3gJa0jjT8ASsCuUhDZYqW+9WyRU8uAx2vez/R4X9hmhgzBSo6ofPY9Cy5oojqtzFC8 g6htuBtFAM0Jozg71/9SyeEokyMGplIxPLdsw41h1IbNIQsfrPeY1yF5aGuRaMu341BC O0bQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e15si6036485ejm.98.2020.10.05.01.53.56; Mon, 05 Oct 2020 01:54:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726160AbgJEIuZ (ORCPT + 99 others); Mon, 5 Oct 2020 04:50:25 -0400 Received: from twspam01.aspeedtech.com ([211.20.114.71]:46845 "EHLO twspam01.aspeedtech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726060AbgJEIuY (ORCPT ); Mon, 5 Oct 2020 04:50:24 -0400 Received: from twspam01.aspeedtech.com (localhost [127.0.0.2] (may be forged)) by twspam01.aspeedtech.com with ESMTP id 09589RRL047791 for ; Mon, 5 Oct 2020 16:09:27 +0800 (GMT-8) (envelope-from chiawei_wang@aspeedtech.com) Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 09588T6I047498; Mon, 5 Oct 2020 16:08:29 +0800 (GMT-8) (envelope-from chiawei_wang@aspeedtech.com) Received: from ChiaWeiWang-PC.aspeed.com (192.168.2.66) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 5 Oct 2020 16:28:10 +0800 From: "Chia-Wei, Wang" To: , , , , , , , , , , , , , , , CC: Subject: [PATCH v2 2/5] soc: aspeed: Fix LPC register offsets Date: Mon, 5 Oct 2020 16:28:03 +0800 Message-ID: <20201005082806.28899-3-chiawei_wang@aspeedtech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201005082806.28899-1-chiawei_wang@aspeedtech.com> References: <20201005082806.28899-1-chiawei_wang@aspeedtech.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.2.66] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 09588T6I047498 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The LPC register offsets are fixed to adapt to the LPC DTS change, where the LPC partitioning is removed. Signed-off-by: Chia-Wei, Wang --- drivers/soc/aspeed/aspeed-lpc-ctrl.c | 6 +++--- drivers/soc/aspeed/aspeed-lpc-snoop.c | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c index 01ed21e8bfee..36faa0618ada 100644 --- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c +++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c @@ -17,12 +17,12 @@ #define DEVICE_NAME "aspeed-lpc-ctrl" -#define HICR5 0x0 +#define HICR5 0x80 #define HICR5_ENL2H BIT(8) #define HICR5_ENFWH BIT(10) -#define HICR7 0x8 -#define HICR8 0xc +#define HICR7 0x88 +#define HICR8 0x8c struct aspeed_lpc_ctrl { struct miscdevice miscdev; diff --git a/drivers/soc/aspeed/aspeed-lpc-snoop.c b/drivers/soc/aspeed/aspeed-lpc-snoop.c index f3d8d53ab84d..7ce5c9fcc73c 100644 --- a/drivers/soc/aspeed/aspeed-lpc-snoop.c +++ b/drivers/soc/aspeed/aspeed-lpc-snoop.c @@ -28,26 +28,25 @@ #define NUM_SNOOP_CHANNELS 2 #define SNOOP_FIFO_SIZE 2048 -#define HICR5 0x0 +#define HICR5 0x80 #define HICR5_EN_SNP0W BIT(0) #define HICR5_ENINT_SNP0W BIT(1) #define HICR5_EN_SNP1W BIT(2) #define HICR5_ENINT_SNP1W BIT(3) - -#define HICR6 0x4 +#define HICR6 0x84 #define HICR6_STR_SNP0W BIT(0) #define HICR6_STR_SNP1W BIT(1) -#define SNPWADR 0x10 +#define SNPWADR 0x90 #define SNPWADR_CH0_MASK GENMASK(15, 0) #define SNPWADR_CH0_SHIFT 0 #define SNPWADR_CH1_MASK GENMASK(31, 16) #define SNPWADR_CH1_SHIFT 16 -#define SNPWDR 0x14 +#define SNPWDR 0x94 #define SNPWDR_CH0_MASK GENMASK(7, 0) #define SNPWDR_CH0_SHIFT 0 #define SNPWDR_CH1_MASK GENMASK(15, 8) #define SNPWDR_CH1_SHIFT 8 -#define HICRB 0x80 +#define HICRB 0x100 #define HICRB_ENSNP0D BIT(14) #define HICRB_ENSNP1D BIT(15) -- 2.17.1