From patchwork Thu Apr 20 18:23:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 752938 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 3w86gy0qqLz9s7g for ; Fri, 21 Apr 2017 04:23:40 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 2EE70C21BE6; Thu, 20 Apr 2017 18:23:35 +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_H4, 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 4561FC21C1F; Thu, 20 Apr 2017 18:23:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EE386C21C1F; Thu, 20 Apr 2017 18:23:31 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069070.outbound.protection.outlook.com [40.92.69.70]) by lists.denx.de (Postfix) with ESMTPS id A48B6C21BE6 for ; Thu, 20 Apr 2017 18:23:30 +0000 (UTC) Received: from VE1EUR02FT017.eop-EUR02.prod.protection.outlook.com (10.152.12.52) by VE1EUR02HT103.eop-EUR02.prod.protection.outlook.com (10.152.13.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1019.14; Thu, 20 Apr 2017 18:23:29 +0000 Received: from MMXP123MB1376.GBRP123.PROD.OUTLOOK.COM (10.152.12.55) by VE1EUR02FT017.mail.protection.outlook.com (10.152.12.98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.14 via Frontend Transport; Thu, 20 Apr 2017 18:23:29 +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.1034.015; Thu, 20 Apr 2017 18:23:29 +0000 From: Jonas Karlman To: "u-boot@lists.denx.de" Thread-Topic: [PATCH v2] rockchip: tinker: set ethaddr in late init Thread-Index: AQHSugM1HGMlwAdQuUe/5X42I628CA== Date: Thu, 20 Apr 2017 18:23:28 +0000 Message-ID: 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:9279ECBF2E1018172AEA95037D692948D65A423F0DF433DA9826DDED19942457; UpperCasedChecksum:348E8D861FDB137D144E8218637963EB37893C99599B8CEE9890D37D9889AE21; SizeAsReceived:8031; Count:38 x-ms-exchange-messagesentrepresentingtype: 1 x-microsoft-exchange-diagnostics: 1; VE1EUR02HT103; 5:b9KDcWZcDTfj1Aw+EN7SzQaqcAaPUpgFPUQ9uHnGpI5mv8/AVNXzXjODCfc7QVHQhElyAhBHj5hj5G42+bqpQcAxrgGzO5quheE5IzC+W1XSurLmOmqLf3gQ4+3DC/87w0iPAAWe1zCT6aVfA2CCoA==; 24:BKQOqQ0uXKMdYQEHNiQBRxYb6boGkWfa6U+o2nbsot5eoAIgJzBZda/usKfoN1loxiRV10m6sELEHihr2+I7hBxTFRWmpROYlLnOyuEQ9CE=; 7:N+PAeg8PMnicCOIeVKZEorSKjTJM5/SWpUPIiiUoI4nX92W5jnX3sDs0hl75oGqD+v123YtHRar6vyoRYP6gwSy8XsLQzEBcBFyR3dRvPv78j6n+Lu4HpiBsXjb6xFmwoz8Xb7Lud04tw7G85e1iIjW6WSdVhEvJ+qcIsxEjn8ObQxdfpZ9F0eRL2eMbAruvFHZpij855n0ZvBw9hUsvWyrH82T87PqGLPiUEMABf5RNLr0/rasK4fpStz8l7KlFQNewWGHZ6x9gXRkP1Gqna91loiHyYkjTFNyxGD3PSb4Ow3xi8ur+tT1/vC2weoIP x-incomingheadercount: 38 x-eopattributedmessage: 0 x-forefront-antispam-report: EFV:NLI; SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:VE1EUR02HT103; H:MMXP123MB1376.GBRP123.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; x-ms-office365-filtering-correlation-id: 780e8cde-8122-4e50-b8e1-08d4881a574d x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322274)(1601125374)(1603101448)(1701031045); SRVR:VE1EUR02HT103; x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:VE1EUR02HT103; BCL:0; PCL:0; RULEID:; SRVR:VE1EUR02HT103; x-forefront-prvs: 02830F0362 spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Apr 2017 18:23:28.9788 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR02HT103 Cc: Lin Huang Subject: [U-Boot] [PATCH v2] 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 --- Changes in v2: - Change to use i2c_eeprom device driver arch/arm/dts/rk3288-tinker.dts | 7 ++++++ board/rockchip/tinker_rk3288/tinker-rk3288.c | 33 ++++++++++++++++++++++++++++ configs/tinker-rk3288_defconfig | 3 +++ 3 files changed, 43 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..e0e8744599 100644 --- a/board/rockchip/tinker_rk3288/tinker-rk3288.c +++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c @@ -5,3 +5,36 @@ */ #include +#include +#include +#include + +static int get_ethaddr_from_eeprom(u8 *addr) +{ + int ret; + struct udevice *dev; + const struct i2c_eeprom_ops *ops; + + ret = uclass_get_device_by_name(UCLASS_I2C_EEPROM, "m24c08@50", &dev); + if (ret) + return ret; + + ops = device_get_ops(dev); + if (!ops->read) + return -ENOSYS; + + return ops->read(dev, 0x0, 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