From patchwork Tue May 30 00:03:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 768379 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wcDNn1vm9z9s2P for ; Tue, 30 May 2017 10:04:08 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XL1OG5Jw"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 79996C21C65; Tue, 30 May 2017 00:04:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id EB642C21C3D; Tue, 30 May 2017 00:03:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D8274C21C3D; Tue, 30 May 2017 00:03:56 +0000 (UTC) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by lists.denx.de (Postfix) with ESMTPS id 35CDEC21C3C for ; Tue, 30 May 2017 00:03:56 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id n23so13963431pfb.3 for ; Mon, 29 May 2017 17:03:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=67da+SZjG23mYP719Jnr0mVAIDy5W58DHFQdRRo6ULU=; b=XL1OG5Jwt4yQ+JBD1fiPaXH2Q9k2UdiPDockRKmGirJctaDEFZmfpFAAEuu/MXZEq/ 46XAKeRqReS8Zdazai18J2JKJ9QW7jvH7ToK20KVY4h0G3ERx0g5gqLu6FPE2dB3o6kd q88TzyQQvmfFTED0M07m6sO8+V6yByaWPgRDKbMQU4m1V1o1sZOFD2DqrERBk8xrlBZ0 ra7QEN7h6ywslxpCGe0qlZg9/vyMkRnSFSGuiK8/5is80AqYbpYXS/mpa5dgXKDWKNLY S3kGZN3pPHysZ8Uf/1gKfwAJDuQxS5toXvoTOVVfTeG+fmNJTqRPwK4FfPpGSOQvhvmT 5sHg== 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; bh=67da+SZjG23mYP719Jnr0mVAIDy5W58DHFQdRRo6ULU=; b=sYV7tIjqZ/eFSh98TFm+pOr0u3PWnXZ9fhsHdeUAr4/ftuPpHc3OvJwJX9EF6cH6o1 QBMJlUG5hU1u99wHv/aHSFi7fxyoVwUW8kQsEsYDv/MWv9gpWcrbv4g5MZW0l1OYCE6Z HtxGV3+l5aXprjYUnL69nAjAbNsvrqODOtmOL/vM0JUbNy8hl/Lbb9DoyY6X3iV0O1+v Qy/GfY6ky9cKCvs/lgXmkRRCNMHcZbA4zjo6589p87kYdpnu8/cJ+UAPg7JWP41BNm0K yCJhjAVQOCdn20KtNq5pmghoG2XCrTuZQMC+eNgg6ydlV3EAJrEAp2xYM4ZatV4vaky4 z6qQ== X-Gm-Message-State: AODbwcDa2DxtA53D5wEb1U8ATHjzfZ5gKAEU78VzzlX9uZ22NrC0wIVO fRVmB6OOJ4L4gw== X-Received: by 10.84.214.23 with SMTP id h23mr80861097pli.127.1496102634321; Mon, 29 May 2017 17:03:54 -0700 (PDT) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:9c43:38f3:1cb:e0a5]) by smtp.gmail.com with ESMTPSA id g63sm19132285pgc.59.2017.05.29.17.03.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 May 2017 17:03:53 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Tue, 30 May 2017 12:03:33 +1200 Message-Id: <20170530000335.7270-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.13.0 Cc: Jagan Teki , Oleksandr Zhadan and Michael Durrant , Chris Packham Subject: [U-Boot] [PATCH] rtc: ds1337: drop "SYS" from config variables X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" There is some inconsistency between uses of CONFIG_RTC_DS13xx and CONFIG_SYS_RTC_DS13xx. Address this by dropping the "SYS" from these variables. Signed-off-by: Chris Packham Reviewed-by: Simon Glass --- README | 2 +- drivers/rtc/ds1337.c | 16 ++++++++-------- include/configs/UCP1020.h | 2 +- include/configs/tqma6_wru4.h | 2 +- scripts/config_whitelist.txt | 8 +++----- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/README b/README index 9d351ec5ad8c..d2a98e11ace2 100644 --- a/README +++ b/README @@ -1019,7 +1019,7 @@ The following options need to be configured: CONFIG_RTC_DS164x - use Dallas DS164x RTC CONFIG_RTC_ISL1208 - use Intersil ISL1208 RTC CONFIG_RTC_MAX6900 - use Maxim, Inc. MAX6900 RTC - CONFIG_SYS_RTC_DS1337_NOOSC - Turn off the OSC output for DS1337 + CONFIG_RTC_DS1337_NOOSC - Turn off the OSC output for DS1337 CONFIG_SYS_RV3029_TCR - enable trickle charger on RV3029 RTC. diff --git a/drivers/rtc/ds1337.c b/drivers/rtc/ds1337.c index dae1b3c5cf04..4b73d1718c24 100644 --- a/drivers/rtc/ds1337.c +++ b/drivers/rtc/ds1337.c @@ -150,11 +150,11 @@ int rtc_set (struct rtc_time *tmp) * SQW/INTB* pin and program it for 32,768 Hz output. Note that * according to the datasheet, turning on the square wave output * increases the current drain on the backup battery from about - * 600 nA to 2uA. Define CONFIG_SYS_RTC_DS1337_NOOSC if you wish to turn + * 600 nA to 2uA. Define CONFIG_RTC_DS1337_NOOSC if you wish to turn * off the OSC output. */ -#ifdef CONFIG_SYS_RTC_DS1337_NOOSC +#ifdef CONFIG_RTC_DS1337_NOOSC #define RTC_DS1337_RESET_VAL \ (RTC_CTL_BIT_INTCN | RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS2) #else @@ -162,16 +162,16 @@ int rtc_set (struct rtc_time *tmp) #endif void rtc_reset (void) { -#ifdef CONFIG_SYS_RTC_DS1337 +#ifdef CONFIG_RTC_DS1337 rtc_write (RTC_CTL_REG_ADDR, RTC_DS1337_RESET_VAL); -#elif defined CONFIG_SYS_RTC_DS1388 +#elif defined CONFIG_RTC_DS1388 rtc_write(RTC_CTL_REG_ADDR, 0x0); /* hw default */ #endif -#ifdef CONFIG_SYS_DS1339_TCR_VAL - rtc_write (RTC_TC_REG_ADDR, CONFIG_SYS_DS1339_TCR_VAL); +#ifdef CONFIG_RTC_DS1339_TCR_VAL + rtc_write (RTC_TC_REG_ADDR, CONFIG_RTC_DS1339_TCR_VAL); #endif -#ifdef CONFIG_SYS_DS1388_TCR_VAL - rtc_write(RTC_TC_REG_ADDR, CONFIG_SYS_DS1388_TCR_VAL); +#ifdef CONFIG_RTC_DS1388_TCR_VAL + rtc_write(RTC_TC_REG_ADDR, CONFIG_RTC_DS1388_TCR_VAL); #endif } diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index b2feccfd39b9..8579290e81d3 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -311,7 +311,7 @@ #define CONFIG_SYS_SPD_BUS_NUM 1 /* For rom_loc and flash bank */ #define CONFIG_RTC_DS1337 -#define CONFIG_SYS_RTC_DS1337_NOOSC +#define CONFIG_RTC_DS1337_NOOSC #define CONFIG_SYS_I2C_RTC_ADDR 0x68 #define CONFIG_SYS_I2C_PCA9557_ADDR 0x18 #define CONFIG_SYS_I2C_NCT72_ADDR 0x4C diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index 4ab4c6559d87..4e99cdbb59ee 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -29,7 +29,7 @@ #define CONFIG_SYS_RTC_BUS_NUM 2 #define CONFIG_SYS_I2C_RTC_ADDR 0x68 /* Turn off RTC square-wave output to save battery */ -#define CONFIG_SYS_RTC_DS1337_NOOSC +#define CONFIG_RTC_DS1337_NOOSC /* LED */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e8f49ebe5df7..02153c35513f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2269,9 +2269,12 @@ CONFIG_RSK7264 CONFIG_RSK7269 CONFIG_RTC_DS1307 CONFIG_RTC_DS1337 +CONFIG_RTC_DS1337_NOOSC CONFIG_RTC_DS1338 +CONFIG_RTC_DS1339_TCR_VAL CONFIG_RTC_DS1374 CONFIG_RTC_DS1388 +CONFIG_RTC_DS1388_TCR_VAL CONFIG_RTC_DS1556 CONFIG_RTC_DS174x CONFIG_RTC_DS3231 @@ -3383,8 +3386,6 @@ CONFIG_SYS_DRAMSZ1 CONFIG_SYS_DRAM_BASE CONFIG_SYS_DRAM_SIZE CONFIG_SYS_DRAM_TEST -CONFIG_SYS_DS1339_TCR_VAL -CONFIG_SYS_DS1388_TCR_VAL CONFIG_SYS_DSPIC_TEST_ADDR CONFIG_SYS_DSPIC_TEST_MASK CONFIG_SYS_DSPI_CS0 @@ -5515,9 +5516,6 @@ CONFIG_SYS_RSTC_RMR_VAL CONFIG_SYS_RTCSC CONFIG_SYS_RTC_BUS_NUM CONFIG_SYS_RTC_CNT -CONFIG_SYS_RTC_DS1337 -CONFIG_SYS_RTC_DS1337_NOOSC -CONFIG_SYS_RTC_DS1388 CONFIG_SYS_RTC_OSCILLATOR CONFIG_SYS_RTC_PL031_BASE CONFIG_SYS_RTC_REG_BASE_ADDR