From patchwork Tue Jun 11 14:50:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 491 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id C3CE73F08F for ; Tue, 11 Jun 2019 16:54:33 +0200 (CEST) Received: by mail-pl1-f197.google.com with SMTP id e7sf2056523plt.13 for ; Tue, 11 Jun 2019 07:54:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1560264872; cv=pass; d=google.com; s=arc-20160816; b=eCACVtTcznXI207OqMqebm4vxp3AppZkWLvzreZ8OnWb4Oe5zClMNWMq7S/ChKl3R9 j5Z+dNe7RPU56UEvC/Ox1xT+pQZTGN1iE1LAl2CxPkzJ0H1Aic7YtsXGG1fDhqwFQEnV qotwhVOsZAkqQZivzpMLDiI7IfYkNZA9yhvg/DoCOSQGGr/yk61x91CsomCwfTfY5HpW 3MzlxBCXufJj5vrpWsWZQhGu1k+gPDFQAixs4PINInDPnUs/M37wscR2lYORttRgGXND KIdOjOF+Z6iBuIKqe2LW+YWsFd4bfkHhWdPp8JYAT5XqjmbZiuXtJVJV3jIrW7prfzGk B3tg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=l1LqbtOAF8VpvuCBGqFBfYuWeAoTX5yjU7w/V70bbrY=; b=djCtmxvMM5sJQunucVrSxCab9xTboi3SVskyRYFSEfTDQbNQ5eVvDvDYu6y6RY8Vet AbdY5+3UiE1JyCBBCFZV4jqvVOcRgD7/aJBquK/UkzyN2j45E0RlXQ+3/SHWT798bbrC 2Bb4f0Bf5TV+pDJsrIDX83KVLTqAaPN+/IzCYa+LEY6IjBQyMz5wreHhmcLt4H5OLiai mKbUPgzPTTC5yVbxvJ8Wx9sQOC4lv88lps6GDE3RCplo8g/x8k3PUZDNgBmKCtSYmRwZ KcS5V92R8mzJ64RCQogFk6I2C4SlKVV0eImVNzP4zbyGvxrQwsQt1kNE1THjKEyF2dh6 T8nA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=GgWaehYI; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=l1LqbtOAF8VpvuCBGqFBfYuWeAoTX5yjU7w/V70bbrY=; b=PTFgH2hERuqi31ub62RQglJFb22NLo0vQH0CiGdsWcb6NDIXl6FF5hnXCfyZXu94Vg a88j+CVTdvzrlSa9uVHXAhDTztGL86xWS5WlEooLmLAStPtBX+78n+vSNXVUZsUU7+3y bBQ2qJ7QlXvJG9eoNiw+6PMTL8Rht2zjttq3o= 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:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=l1LqbtOAF8VpvuCBGqFBfYuWeAoTX5yjU7w/V70bbrY=; b=Xoju6A4WrqfS5EAVgiNviyF7c5R+oUoWeolx1mXSK8c3Y2A/8COn3W7/p7FWrGEB75 nUQldL5J/MOjleGY+Z9uObMWtkGKHlNIaOcl2bFMU6n4nMalrDJ5nMBCFhbW56x8HKZQ wgpVxo8GYUuc7rBITABAvfcrK9wOedanj6NBNueWkSebyzEDKYMA62JfT8DVvEnG9Hdb k+sEXDcgPVFcC03EuoZYlxoxNsqx4zhbc9+3ASlLf+zykcdptYD1V433MocC4TzXS/S4 W5AGRX5RsY4l5G7B4DIsuQBz5R9hIVHf6MYhYSYfz+jO1v37lDZrKiEPGv5uQQtuRzud A/Kg== X-Gm-Message-State: APjAAAXIioTx1wImQpxNfNKx39cDPwZ6XJOhm5ZXdXFM+d5Hmob+8b9Q NKs0vNXICK9i2yAtrMUr4GLfFIri X-Google-Smtp-Source: APXvYqzxQraJBDuIODOrsAvuCg27jI69wexXWLWAO+7Mzj3pMOjiPfBKRyJcisCHMOqBL/oTb9DGyw== X-Received: by 2002:a65:638a:: with SMTP id h10mr21215136pgv.64.1560264872514; Tue, 11 Jun 2019 07:54:32 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:4e81:: with SMTP id c123ls4501494pfb.0.gmail; Tue, 11 Jun 2019 07:54:32 -0700 (PDT) X-Received: by 2002:aa7:86c6:: with SMTP id h6mr43831343pfo.51.1560264872154; Tue, 11 Jun 2019 07:54:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560264872; cv=none; d=google.com; s=arc-20160816; b=wiAb7Mxq97dY+93GN0kFjR0UcwetYWAYILlB8PAqgm7WqwBKODKpI+5oj9Xvvwcewr Gg0+LzaR4Lc/6ismdWHGnm1tK8M+5ozDS6yNZKLcnw4JZ5w/bSZkvFmF8eQ1kwPPhuZf IlRSaVacxI1mblWVfdkv8ZF39qhHhn8cEMIZtP1C9F1Nswi2HiUfXFzCF78/89BMAbMY Q/vseUSWhboYtOs3DxR8+hWHUGkH2iiyJkCm28xRryBUZ9ww4PdfNywfAeCb9/6O69lE CCYd8BmGjsSDFnVevgCyY5iVHLPX6tuQCxuhnJo37GdtK+Z5GEFfO/NwLrxUvhPcwlJP MCYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=zGqlfcSM+PyMIHvCMZaov9KVZepmoklQxHnfRiiVIM4=; b=kBHWkn5OduvBuLEbMvdHlsR3lSUgIjB0HA4WaeMxjk0AJNOYHijStdxXJCuiFnL8Rt 2EFYngcDBHW1TlTdmwziY9lEOeWbJMxlp5rL9QYh1zv9BmyUs5vljprhcbpCv7iOpU6l gVjBnF8pi19UwQrmr03iY4n5Am+41mki6lMQKkYPo7/uA3S3MN/fGJ+mVLwQVRkIzNDv zd78CryuGE8isYsq7AXCq5440zONEGi9fboXLPGi6YT80bwDNFBc35dkZBJe4sO0nNRi uARefLnTBNpsbiZfeZ+hs5Uj17vlZzz0cf6vioY9w8osy9lEMSRc2ruskLIZvTOEn7fu 9CQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=GgWaehYI; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j19sor12854709pfr.25.2019.06.11.07.54.32 for (Google Transport Security); Tue, 11 Jun 2019 07:54:32 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a62:fb0a:: with SMTP id x10mr58141116pfm.224.1560264871798; Tue, 11 Jun 2019 07:54:31 -0700 (PDT) Received: from localhost.localdomain ([115.97.180.18]) by smtp.gmail.com with ESMTPSA id e9sm16206208pfn.154.2019.06.11.07.54.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jun 2019 07:54:31 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , YouMin Chen , u-boot@lists.denx.de Cc: gajjar04akash@gmail.com, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH 40/92] arm: include: rockchip: Move dramtypes to common header Date: Tue, 11 Jun 2019 20:20:43 +0530 Message-Id: <20190611145135.21399-41-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190611145135.21399-1-jagan@amarulasolutions.com> References: <20190611145135.21399-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=GgWaehYI; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , dramtype enum numbers as common across all dram controllers in rockchip, so move the eneum values in common header. Signed-off-by: Jagan Teki --- arch/arm/include/asm/arch-rockchip/sdram.h | 6 ------ arch/arm/include/asm/arch-rockchip/sdram_common.h | 8 ++++++++ arch/arm/include/asm/arch-rockchip/sdram_rk322x.h | 7 ------- arch/arm/include/asm/arch-rockchip/sdram_rk3399.h | 8 -------- 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/sdram.h b/arch/arm/include/asm/arch-rockchip/sdram.h index bbe425deb9..9220763fa7 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram.h +++ b/arch/arm/include/asm/arch-rockchip/sdram.h @@ -8,12 +8,6 @@ #ifndef _ASM_ARCH_RK3288_SDRAM_H__ #define _ASM_ARCH_RK3288_SDRAM_H__ -enum { - DDR3 = 3, - LPDDR3 = 6, - UNUSED = 0xFF, -}; - struct rk3288_sdram_channel { /* * bit width in address, eg: diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h index 200551fac5..e0a94f81a4 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -6,6 +6,14 @@ #ifndef _ASM_ARCH_SDRAM_COMMON_H #define _ASM_ARCH_SDRAM_COMMON_H +enum { + DDR3 = 0x3, + LPDDR2 = 0x5, + LPDDR3 = 0x6, + LPDDR4 = 0x7, + UNUSED = 0xFF +}; + struct sdram_cap_info { unsigned int rank; /* dram column number, 0 means this channel is invalid */ diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h index d0091a7aaf..336c5d7e8c 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h @@ -7,13 +7,6 @@ #include -enum { - DDR3 = 3, - LPDDR2 = 5, - LPDDR3 = 6, - UNUSED = 0xFF, -}; - struct rk322x_sdram_channel { /* * bit width in address, eg: diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h index 6258c811f5..dc65ae7924 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h @@ -6,14 +6,6 @@ #ifndef _ASM_ARCH_SDRAM_RK3399_H #define _ASM_ARCH_SDRAM_RK3399_H -enum { - DDR3 = 0x3, - LPDDR2 = 0x5, - LPDDR3 = 0x6, - LPDDR4 = 0x7, - UNUSED = 0xFF -}; - struct rk3399_ddr_pctl_regs { u32 denali_ctl[332]; };