Setting fixed MAC address for rockchip devices and upstream patch for Rockchip

patch/u-boot/u-boot-rockchip/i2c_eeprom_add_read_and_write_functions.patch

@@ -0,0 +1,97 @@
+From d593e8671d4a7150cb799ffcb17052bcf055047d Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sat, 22 Apr 2017 08:57:41 +0000
+Subject: [PATCH] i2c_eeprom: add read and write functions
+
+Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
+Reviewed-by: Simon Glass <sjg@chromium.org>
+---
+ drivers/misc/i2c_eeprom.c | 32 ++++++++++++++++++++++++++------
+ include/i2c_eeprom.h      | 24 ++++++++++++++++++++++++
+ 2 files changed, 50 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c
+index c9f4174..da6e2b0 100644
+--- a/drivers/misc/i2c_eeprom.c
++++ b/drivers/misc/i2c_eeprom.c
+@@ -10,21 +10,41 @@
+ #include <i2c.h>
+ #include <i2c_eeprom.h>
+ 
+-static int i2c_eeprom_read(struct udevice *dev, int offset, uint8_t *buf,
+-			   int size)
++int i2c_eeprom_read(struct udevice *dev, int offset, uint8_t *buf, int size)
++{
++	const struct i2c_eeprom_ops *ops = device_get_ops(dev);
++
++	if (!ops->read)
++		return -ENOSYS;
++
++	return ops->read(dev, offset, buf, size);
++}
++
++int i2c_eeprom_write(struct udevice *dev, int offset, uint8_t *buf, int size)
++{
++	const struct i2c_eeprom_ops *ops = device_get_ops(dev);
++
++	if (!ops->write)
++		return -ENOSYS;
++
++	return ops->write(dev, offset, buf, size);
++}
++
++static int i2c_eeprom_std_read(struct udevice *dev, int offset, uint8_t *buf,
++			       int size)
+ {
+ 	return dm_i2c_read(dev, offset, buf, size);
+ }
+ 
+-static int i2c_eeprom_write(struct udevice *dev, int offset,
+-			    const uint8_t *buf, int size)
++static int i2c_eeprom_std_write(struct udevice *dev, int offset,
++				const uint8_t *buf, int size)
+ {
+ 	return -ENODEV;
+ }
+ 
+ struct i2c_eeprom_ops i2c_eeprom_std_ops = {
+-	.read	= i2c_eeprom_read,
+-	.write	= i2c_eeprom_write,
++	.read	= i2c_eeprom_std_read,
++	.write	= i2c_eeprom_std_write,
+ };
+ 
+ static int i2c_eeprom_std_ofdata_to_platdata(struct udevice *dev)
+diff --git a/include/i2c_eeprom.h b/include/i2c_eeprom.h
+index 0452892..bb5c6b1 100644
+--- a/include/i2c_eeprom.h
++++ b/include/i2c_eeprom.h
+@@ -20,4 +20,28 @@ struct i2c_eeprom {
+ 	unsigned pagewidth;
+ };
+ 
++/*
++ * i2c_eeprom_read() - read bytes from an I2C EEPROM chip
++ *
++ * @dev:	Chip to read from
++ * @offset:	Offset within chip to start reading
++ * @buf:	Place to put data
++ * @size:	Number of bytes to read
++ *
++ * @return 0 on success, -ve on failure
++ */
++int i2c_eeprom_read(struct udevice *dev, int offset, uint8_t *buf, int size);
++
++/*
++ * i2c_eeprom_write() - write bytes to an I2C EEPROM chip
++ *
++ * @dev:	Chip to write to
++ * @offset:	Offset within chip to start writing
++ * @buf:	Buffer containing data to write
++ * @size:	Number of bytes to write
++ *
++ * @return 0 on success, -ve on failure
++ */
++int i2c_eeprom_write(struct udevice *dev, int offset, uint8_t *buf, int size);
++
+ #endif

patch/u-boot/u-boot-rockchip/set_ethaddr_in_late_init.patch

@@ -0,0 +1,91 @@
+From 244f8753744eefbd7cd1307c0bd8f7b297486211 Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sat, 22 Apr 2017 08:57:54 +0000
+Subject: [PATCH] rockchip: tinker: set ethaddr in late init
+
+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 <jonas@kwiboo.se>
+Reviewed-by: Simon Glass <sjg@chromium.org>
+---
+ 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 f1bef94..4efba50 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 79541a3..c2872e7 100644
+--- a/board/rockchip/tinker_rk3288/tinker-rk3288.c
++++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c
+@@ -5,3 +5,31 @@
+  */
+ 
+ #include <common.h>
++#include <dm.h>
++#include <i2c_eeprom.h>
++#include <netdev.h>
++
++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 6e98480..0530121 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