From patchwork Mon Sep 2 13:11:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Shinde X-Patchwork-Id: 19688 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 61C6024869 for ; Mon, 2 Sep 2013 13:10:20 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id gf11sf5183683vcb.10 for ; Mon, 02 Sep 2013 06:10:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:dlp-filter:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=2u1rjVldF3Bsc610sbuFExPa9El9Rc4pARtEzAi1vSs=; b=Y21+Fcb6jBA7gnRLcBMKY95Ai8JlPG1rWY2ZLJI5UdUE1LzPv8V2YiLMjzNXqDxA/r 7mQLzv5BrdF5KY+aaGBuADsyJYjSbZx4fZN2cGQnBGMvndiStlqR7B2RHygD5THiKndg zoy4OGPdD7rwp4ipOFy13FLJvOg11iy6Um0adAssAc5wEiG6Fnk1r0GO328e64jGE5pF v0NNtydvGcbzNdWQYyIa2FvbIlXZyxBqyNC3UH7wcCqiI0Rwhcn8oiNADq90wvEz928A sJZ2m+ofNo2Zdoo42ME6n6VZKbgaOzp5nS1DjNSiHoVF5+7vtWPc2bH9OkVi7M/t3bFb M+kg== X-Received: by 10.236.51.9 with SMTP id a9mr8342326yhc.41.1378127420154; Mon, 02 Sep 2013 06:10:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.38.101 with SMTP id f5ls2273081qek.31.gmail; Mon, 02 Sep 2013 06:10:20 -0700 (PDT) X-Received: by 10.58.56.230 with SMTP id d6mr1234veq.45.1378127419984; Mon, 02 Sep 2013 06:10:19 -0700 (PDT) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id b6si3135405veo.22.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Sep 2013 06:10:19 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id m1so3037040ves.41 for ; Mon, 02 Sep 2013 06:10:19 -0700 (PDT) X-Gm-Message-State: ALoCoQnxq0iUrRPPZW3zrM4c1Hpd8i3dOi6f2GSyK4+UlvntISt0Ffw6OYrZjDeAvsGa+Lne7Z2o X-Received: by 10.220.164.202 with SMTP id f10mr1430137vcy.25.1378127419855; Mon, 02 Sep 2013 06:10:19 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp114573vcz; Mon, 2 Sep 2013 06:10:19 -0700 (PDT) X-Received: by 10.66.146.42 with SMTP id sz10mr26266628pab.78.1378127416580; Mon, 02 Sep 2013 06:10:16 -0700 (PDT) Received: from mailout3.samsung.com (mailout3.samsung.com. [203.254.224.33]) by mx.google.com with ESMTP id yl7si10899729pab.319.1969.12.31.16.00.00; Mon, 02 Sep 2013 06:10:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of rajeshwari.s@samsung.com designates 203.254.224.33 as permitted sender) client-ip=203.254.224.33; Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MSI000IF1WO6J00@mailout3.samsung.com>; Mon, 02 Sep 2013 22:10:14 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.123]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 4F.A9.31253.63E84225; Mon, 02 Sep 2013 22:10:14 +0900 (KST) X-AuditID: cbfee690-b7f3b6d000007a15-4c-52248e36045c Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id C2.AE.05832.63E84225; Mon, 02 Sep 2013 22:10:14 +0900 (KST) Received: from localhost.localdomain.com ([107.108.73.95]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MSI00IFJ1WNAS50@mmp1.samsung.com>; Mon, 02 Sep 2013 22:10:13 +0900 (KST) From: Rajeshwari S Shinde To: u-boot@lists.denx.de Cc: patches@linaro.org, sjg@chromium.org, mk7.kang@samsung.com, chander.kashyap@linaro.org, u-boot-review@google.com, Akshay Saraswat Subject: [PATCH 07/10 V2] Exynos5420: Add support for 5420 in pinmux and gpio Date: Mon, 02 Sep 2013 18:41:44 +0530 Message-id: <1378127507-17671-8-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.11.7 In-reply-to: <1378127507-17671-1-git-send-email-rajeshwari.s@samsung.com> References: <1378127507-17671-1-git-send-email-rajeshwari.s@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrCLMWRmVeSWpSXmKPExsWyRsSkWtesTyXIYNcxIYtTfx4zWjxcf5PF ouNIC6PFlMNfWCy+bdnGaLH89UZ2i7d7O9kd2D1mN1xk8ViwqdTjzrU9bB5n7+xg9Ojbsoox gDWKyyYlNSezLLVI3y6BK2PjuTa2gke2Ff/WL2ZuYPxv2MXIySEhYCKx7vZqJghbTOLCvfVs XYxcHEICSxkl1p2fwg5TdPdSAytEYhGjxIpll6GcLiaJ/7seAlVxcLABVW08kQDSICIgIfGr /yojiM0ssIBRYkI/2CBhAV+Jb9cWMIPYLAKqEqcengeL8wp4SKz/fxNqmaLEjCXPGEFGcgp4 SvRPFQIJCwGV7Nt5hgWiZB67xIfVvBBjBCS+TT7EAlIuISArsekAM0SJpMTBFTdYJjAKL2Bk WMUomlqQXFCclF5kolecmFtcmpeul5yfu4kRGOKn/z2bsIPx3gHrQ4zJQOMmMkuJJucDYySv JN7Q2MzIwtTE1NjI3NKMNGElcV71FutAIYH0xJLU7NTUgtSi+KLSnNTiQ4xMHJxSDYzKC458 dntpkLY5jlF1V+4by32xJ2tO3991acbr6MIfbnfrRSq3MFr9uGwa/b141WK2t8cctQVf1DPa TZ7nqN9nYmqeWLb04/UvvCHmOi+tnuoxqt+PYZTVnbzTeavCyQtMuse3WkTpPk6NDXR6aWUc HKNVapeS0fA6v6B//u2LOo4F96TExJVYijMSDbWYi4oTAa3t+buHAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrEIsWRmVeSWpSXmKPExsVy+t9jAV2zPpUgg0c32C1O/XnMaPFw/U0W i44jLYwWUw5/YbH4tmUbo8Xy1xvZLd7u7WR3YPeY3XCRxWPBplKPO9f2sHmcvbOD0aNvyyrG ANaoBkabjNTElNQihdS85PyUzLx0WyXv4HjneFMzA0NdQ0sLcyWFvMTcVFslF58AXbfMHKA7 lBTKEnNKgUIBicXFSvp2mCaEhrjpWsA0Ruj6hgTB9RgZoIGENYwZG8+1sRU8sq34t34xcwPj f8MuRk4OCQETibuXGlghbDGJC/fWs3UxcnEICSxilFix7DIrhNPFJPF/10P2LkYODjagjo0n EkAaRAQkJH71X2UEsZkFFjBKTOhnB7GFBXwlvl1bwAxiswioSpx6eB4szivgIbH+/012iGWK EjOWPGMEGckp4CnRP1UIJCwEVLJv5xmWCYy8CxgZVjGKphYkFxQnpeca6RUn5haX5qXrJefn bmIEx9Az6R2MqxosDjEKcDAq8fAqLFMOEmJNLCuuzD3EKMHBrCTCO6NVJUiINyWxsiq1KD++ qDQntfgQYzLQUROZpUST84HxnVcSb2hsYm5qbGppYmFiZkmasJI478FW60AhgfTEktTs1NSC 1CKYLUwcnFINjPO9us5Ub6hebyphLPOJ9cmPOSZPrWLrd9Y0V0lvfBgaZSgQ2nf8z5kAtj/T BVcrb5FokLzWIirYPHffI4Ovy0XCDSYd5WGf1Xz8s6+69pq3BRzvtjT9Vu3qOsDmc2XvtUMT +gWyOUNs/ft5dnKdjjcxXah9l+9s6eHa+f2xiSx7f+lu361mqMRSnJFoqMVcVJwIAN/Yhjrl AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: rajeshwari.s@samsung.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Akshay Saraswat Adds code in pinmux and gpio framework to support Exynos5420. Signed-off-by: Rajeshwari S Shinde Signed-off-by: Akshay Saraswat --- Changes in V2: - None arch/arm/cpu/armv7/exynos/pinmux.c | 171 +++++++++++++++++++++++++++++++- arch/arm/include/asm/arch-exynos/gpio.h | 52 ++++++++++ 2 files changed, 220 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c index 1b05ebf..0382176 100644 --- a/arch/arm/cpu/armv7/exynos/pinmux.c +++ b/arch/arm/cpu/armv7/exynos/pinmux.c @@ -46,6 +46,41 @@ static void exynos5_uart_config(int peripheral) } } +static void exynos5420_uart_config(int peripheral) +{ + struct exynos5420_gpio_part1 *gpio1 = + (struct exynos5420_gpio_part1 *)samsung_get_base_gpio_part1(); + struct s5p_gpio_bank *bank; + int i, start, count; + + switch (peripheral) { + case PERIPH_ID_UART0: + bank = &gpio1->a0; + start = 0; + count = 4; + break; + case PERIPH_ID_UART1: + bank = &gpio1->a0; + start = 4; + count = 4; + break; + case PERIPH_ID_UART2: + bank = &gpio1->a1; + start = 0; + count = 4; + break; + case PERIPH_ID_UART3: + bank = &gpio1->a1; + start = 4; + count = 2; + break; + } + for (i = start; i < start + count; i++) { + s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE); + s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2)); + } +} + static int exynos5_mmc_config(int peripheral, int flags) { struct exynos5_gpio_part1 *gpio1 = @@ -101,6 +136,62 @@ static int exynos5_mmc_config(int peripheral, int flags) return 0; } +static int exynos5420_mmc_config(int peripheral, int flags) +{ + struct exynos5420_gpio_part3 *gpio3 = + (struct exynos5420_gpio_part3 *)samsung_get_base_gpio_part3(); + struct s5p_gpio_bank *bank = NULL, *bank_ext = NULL; + int i, start = 0, gpio_func = 0; + + switch (peripheral) { + case PERIPH_ID_SDMMC0: + bank = &gpio3->c0; + bank_ext = &gpio3->c3; + start = 0; + gpio_func = GPIO_FUNC(0x2); + break; + case PERIPH_ID_SDMMC1: + bank = &gpio3->c1; + bank_ext = &gpio3->d1; + start = 4; + gpio_func = GPIO_FUNC(0x2); + break; + case PERIPH_ID_SDMMC2: + bank = &gpio3->c2; + bank_ext = NULL; + gpio_func = GPIO_FUNC(0x2); + break; + } + if ((flags & PINMUX_FLAG_8BIT_MODE) && !bank_ext) { + debug("SDMMC device %d does not support 8bit mode", + peripheral); + return -1; + } + if (flags & PINMUX_FLAG_8BIT_MODE) { + for (i = start; i <= (start + 3); i++) { + s5p_gpio_cfg_pin(bank_ext, i, gpio_func); + s5p_gpio_set_pull(bank_ext, i, GPIO_PULL_UP); + s5p_gpio_set_drv(bank_ext, i, GPIO_DRV_4X); + } + } + for (i = 0; i < 3; i++) { + s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2)); + s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE); + s5p_gpio_set_drv(bank, i, GPIO_DRV_4X); + } + + if (peripheral == PERIPH_ID_SDMMC0) + s5p_gpio_set_pull(bank, 2, GPIO_PULL_UP); + + for (i = 3; i <= 6; i++) { + s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2)); + s5p_gpio_set_pull(bank, i, GPIO_PULL_UP); + s5p_gpio_set_drv(bank, i, GPIO_DRV_4X); + } + + return 0; +} + static void exynos5_sromc_config(int flags) { struct exynos5_gpio_part1 *gpio1 = @@ -269,6 +360,49 @@ void exynos5_spi_config(int peripheral) } } +void exynos5420_spi_config(int peripheral) +{ + int cfg = 0, pin = 0, i; + struct s5p_gpio_bank *bank = NULL; + struct exynos5420_gpio_part1 *gpio1 = + (struct exynos5420_gpio_part1 *)samsung_get_base_gpio_part1(); + struct exynos5420_gpio_part4 *gpio4 = + (struct exynos5420_gpio_part4 *)samsung_get_base_gpio_part4(); + + switch (peripheral) { + case PERIPH_ID_SPI0: + bank = &gpio1->a2; + cfg = GPIO_FUNC(0x2); + pin = 0; + break; + case PERIPH_ID_SPI1: + bank = &gpio1->a2; + cfg = GPIO_FUNC(0x2); + pin = 4; + break; + case PERIPH_ID_SPI2: + bank = &gpio1->b1; + cfg = GPIO_FUNC(0x5); + pin = 1; + break; + case PERIPH_ID_SPI3: + bank = &gpio4->f1; + cfg = GPIO_FUNC(0x2); + pin = 0; + break; + case PERIPH_ID_SPI4: + for (i = 0; i < 2; i++) { + s5p_gpio_cfg_pin(&gpio4->f0, i + 2, GPIO_FUNC(0x4)); + s5p_gpio_cfg_pin(&gpio4->e0, i + 4, GPIO_FUNC(0x4)); + } + break; + } + if (peripheral != PERIPH_ID_SPI4) { + for (i = pin; i < pin + 4; i++) + s5p_gpio_cfg_pin(bank, i, cfg); + } +} + static int exynos5_pinmux_config(int peripheral, int flags) { switch (peripheral) { @@ -314,6 +448,35 @@ static int exynos5_pinmux_config(int peripheral, int flags) return 0; } +static int exynos5420_pinmux_config(int peripheral, int flags) +{ + switch (peripheral) { + case PERIPH_ID_UART0: + case PERIPH_ID_UART1: + case PERIPH_ID_UART2: + case PERIPH_ID_UART3: + exynos5420_uart_config(peripheral); + break; + case PERIPH_ID_SDMMC0: + case PERIPH_ID_SDMMC1: + case PERIPH_ID_SDMMC2: + case PERIPH_ID_SDMMC3: + return exynos5420_mmc_config(peripheral, flags); + case PERIPH_ID_SPI0: + case PERIPH_ID_SPI1: + case PERIPH_ID_SPI2: + case PERIPH_ID_SPI3: + case PERIPH_ID_SPI4: + exynos5420_spi_config(peripheral); + break; + default: + debug("%s: invalid peripheral %d", __func__, peripheral); + return -1; + } + + return 0; +} + static void exynos4_i2c_config(int peripheral, int flags) { struct exynos4_gpio_part1 *gpio1 = @@ -463,11 +626,13 @@ static int exynos4_pinmux_config(int peripheral, int flags) int exynos_pinmux_config(int peripheral, int flags) { - if (cpu_is_exynos5()) + if (cpu_is_exynos5()) { + if (proid_is_exynos5420()) + return exynos5420_pinmux_config(peripheral, flags); return exynos5_pinmux_config(peripheral, flags); - else if (cpu_is_exynos4()) + } else if (cpu_is_exynos4()) { return exynos4_pinmux_config(peripheral, flags); - else { + } else { debug("pinmux functionality not supported\n"); return -1; } diff --git a/arch/arm/include/asm/arch-exynos/gpio.h b/arch/arm/include/asm/arch-exynos/gpio.h index a1a7439..f892933 100644 --- a/arch/arm/include/asm/arch-exynos/gpio.h +++ b/arch/arm/include/asm/arch-exynos/gpio.h @@ -127,6 +127,58 @@ struct exynos4x12_gpio_part4 { struct s5p_gpio_bank v4; }; +struct exynos5420_gpio_part1 { + struct s5p_gpio_bank a0; + struct s5p_gpio_bank a1; + struct s5p_gpio_bank a2; + struct s5p_gpio_bank b0; + struct s5p_gpio_bank b1; + struct s5p_gpio_bank b2; + struct s5p_gpio_bank b3; + struct s5p_gpio_bank b4; + struct s5p_gpio_bank h0; +}; + +struct exynos5420_gpio_part2 { + struct s5p_gpio_bank y7; /* 0x1340_0000 */ + struct s5p_gpio_bank res[0x5f]; /* */ + struct s5p_gpio_bank x0; /* 0x1340_0C00 */ + struct s5p_gpio_bank x1; /* 0x1340_0C20 */ + struct s5p_gpio_bank x2; /* 0x1340_0C40 */ + struct s5p_gpio_bank x3; /* 0x1340_0C60 */ +}; + +struct exynos5420_gpio_part3 { + struct s5p_gpio_bank c0; + struct s5p_gpio_bank c1; + struct s5p_gpio_bank c2; + struct s5p_gpio_bank c3; + struct s5p_gpio_bank c4; + struct s5p_gpio_bank d1; + struct s5p_gpio_bank y0; + struct s5p_gpio_bank y1; + struct s5p_gpio_bank y2; + struct s5p_gpio_bank y3; + struct s5p_gpio_bank y4; + struct s5p_gpio_bank y5; + struct s5p_gpio_bank y6; +}; + +struct exynos5420_gpio_part4 { + struct s5p_gpio_bank e0; /* 0x1400_0000 */ + struct s5p_gpio_bank e1; /* 0x1400_0020 */ + struct s5p_gpio_bank f0; /* 0x1400_0040 */ + struct s5p_gpio_bank f1; /* 0x1400_0060 */ + struct s5p_gpio_bank g0; /* 0x1400_0080 */ + struct s5p_gpio_bank g1; /* 0x1400_00A0 */ + struct s5p_gpio_bank g2; /* 0x1400_00C0 */ + struct s5p_gpio_bank j4; /* 0x1400_00E0 */ +}; + +struct exynos5420_gpio_part5 { + struct s5p_gpio_bank z0; /* 0x0386_0000 */ +}; + struct exynos5_gpio_part1 { struct s5p_gpio_bank a0; struct s5p_gpio_bank a1;