From patchwork Sat Apr 22 08:57:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 753750 X-Patchwork-Delegate: sjg@chromium.org 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 3w963F3fnVz9s2x for ; Sat, 22 Apr 2017 18:58:49 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 26414C21C6C; Sat, 22 Apr 2017 08:58:18 +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=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 34174C21C3B; Sat, 22 Apr 2017 08:58:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C39F2C21C29; Sat, 22 Apr 2017 08:57:56 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065048.outbound.protection.outlook.com [40.92.65.48]) by lists.denx.de (Postfix) with ESMTPS id 976D7C21C50 for ; Sat, 22 Apr 2017 08:57:56 +0000 (UTC) Received: from HE1EUR01FT061.eop-EUR01.prod.protection.outlook.com (10.152.0.59) by HE1EUR01HT150.eop-EUR01.prod.protection.outlook.com (10.152.1.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1019.14; Sat, 22 Apr 2017 08:57:55 +0000 Received: from MMXP123MB1376.GBRP123.PROD.OUTLOOK.COM (10.152.0.54) by HE1EUR01FT061.mail.protection.outlook.com (10.152.1.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.9 via Frontend Transport; Sat, 22 Apr 2017 08:57:55 +0000 Received: from MMXP123MB1376.GBRP123.PROD.OUTLOOK.COM ([10.166.242.136]) by MMXP123MB1376.GBRP123.PROD.OUTLOOK.COM ([10.166.242.136]) with mapi id 15.01.1047.018; Sat, 22 Apr 2017 08:57:54 +0000 From: Jonas Karlman To: "u-boot@lists.denx.de" Thread-Topic: [PATCH v3 2/2] rockchip: tinker: set ethaddr in late init Thread-Index: AQHSu0aHU2wk05wY6UGYHc5+skoBLw== Date: Sat, 22 Apr 2017 08:57:54 +0000 Message-ID: References: <20170422085711.26783-1-jonas@kwiboo.se> In-Reply-To: <20170422085711.26783-1-jonas@kwiboo.se> Accept-Language: sv-SE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: lists.denx.de; dkim=none (message not signed) header.d=none; lists.denx.de; dmarc=none action=none header.from=kwiboo.se; x-incomingtopheadermarker: OriginalChecksum:F0828E6509487F8ACAA85F91D7618FC1CFF6B9B3CC7EAD2FB4494931C6CEF288; UpperCasedChecksum:996EEE4D23DCE6B658058297BB1EFCBEBBA0448BD80191A3C15F26D33D3203DF; SizeAsReceived:8214; Count:40 x-ms-exchange-messagesentrepresentingtype: 1 x-microsoft-exchange-diagnostics: 1; HE1EUR01HT150; 5:l6DhIYfDh+rs5BLsCFswOP53KOlPEDHegKH8QeSi7mCwQOgoE/HV4ZyUqmSgBvELBJftpvKYfeJv4nZBAqM04j89uNWHMPPVNDTb2H8Fpuon/coyRO2YKWaZJMmB568dYMuuGbmhvXvmC0RDM/zefy6E+9PqIJFIqOwGoJ26FOs=; 24:G79HNgUoXRSWbR6ZLM3xDqzup+UJOZegXe2KPpgIfYtyFGMT11npKAt9J1+y44p5g+toy+/tSpDH2bKjqD2iy6osWu4HT/ja24HKU9afI3w=; 7:RNSME8/Mo/WCUfYSrEkJKa5jxPMJ6XO77TW3BvEQcF19gdzWxbrht6NIGE0EChnxQNlIrCyvV66uSrkoFD9txjIITnM0XOu8tV9xOBKUZRZ9PpuuxhoA98wgrhn3SIneZ4tj/0xdllSyx1XLS4wPhs6WvZt0HosEoCjPQZ6LrSMVosKgaIpjvl7iXYZ5GUHF0a5ZeqkJrRynu9+5a6GLZLECxrFnlS8WQaNyMzeDVyAvqu/2TgtfEqB6uT9ZzVoqM6Z0vpLbWK7WAt7p11Rss0LbDAY+rJpVa5nDL+D554UO/ywHeDoT6wVfL+69pJNz x-incomingheadercount: 40 x-eopattributedmessage: 0 x-forefront-antispam-report: EFV:NLI; SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:HE1EUR01HT150; H:MMXP123MB1376.GBRP123.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; x-ms-office365-filtering-correlation-id: 7e528161-1f4f-4f0b-c55b-08d4895da9c2 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322274)(1603101448)(1601125374)(1701031045); SRVR:HE1EUR01HT150; x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:HE1EUR01HT150; BCL:0; PCL:0; RULEID:; SRVR:HE1EUR01HT150; x-forefront-prvs: 0285201563 spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Apr 2017 08:57:54.6660 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR01HT150 Cc: Lin Huang , Jacob Chen Subject: [U-Boot] [PATCH v3 2/2] rockchip: tinker: set ethaddr in late init 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Set ethernet mac address in late init for Tinker Board, prevents getting a random mac address each boot. Read mac address from eeprom, first 6 bytes from m24c08@50. Same as /etc/init.d/rockchip.sh on Tinker OS. Signed-off-by: Jonas Karlman Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- Changes in v3: - Use uclass_first_device_err() to find eeprom - Use i2c_eeprom_read() to read eeprom Changes in v2: - Change to use i2c_eeprom device driver arch/arm/dts/rk3288-tinker.dts | 7 +++++++ board/rockchip/tinker_rk3288/tinker-rk3288.c | 28 ++++++++++++++++++++++++++++ configs/tinker-rk3288_defconfig | 3 +++ 3 files changed, 38 insertions(+) diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts index 22881cb785..ea2f715922 100644 --- a/arch/arm/dts/rk3288-tinker.dts +++ b/arch/arm/dts/rk3288-tinker.dts @@ -67,3 +67,10 @@ &gpio8 { u-boot,dm-pre-reloc; }; + +&i2c2 { + m24c08@50 { + compatible = "at,24c08", "i2c-eeprom"; + reg = <0x50>; + }; +}; diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c index 79541a3939..c2872e7330 100644 --- a/board/rockchip/tinker_rk3288/tinker-rk3288.c +++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c @@ -5,3 +5,31 @@ */ #include +#include +#include +#include + +static int get_ethaddr_from_eeprom(u8 *addr) +{ + int ret; + struct udevice *dev; + + ret = uclass_first_device_err(UCLASS_I2C_EEPROM, &dev); + if (ret) + return ret; + + return i2c_eeprom_read(dev, 0, addr, 6); +} + +int rk_board_late_init(void) +{ + u8 ethaddr[6]; + + if (get_ethaddr_from_eeprom(ethaddr)) + return 0; + + if (is_valid_ethaddr(ethaddr)) + eth_setenv_enetaddr("ethaddr", ethaddr); + + return 0; +} diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig index cec39384b3..dc3699d5c4 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -11,6 +11,7 @@ CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 +CONFIG_SPL_I2C_SUPPORT=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y @@ -39,6 +40,8 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y +CONFIG_I2C_EEPROM=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_DM_ETH=y