* [U-Boot] [PATCH 01/20] w1: Add 1-Wire uclass
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
@ 2018-07-19 9:57 ` Eugen Hristev
2018-07-19 9:57 ` [U-Boot] [PATCH 02/20] w1: Add 1-Wire gpio driver Eugen Hristev
` (18 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:57 UTC (permalink / raw)
To: u-boot
From: Maxime Ripard <maxime.ripard@free-electrons.com>
We might want to use 1-Wire devices connected on boards such as EEPROMs in
U-Boot.
Provide a framework to be able to do that.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
[eugen.hristev at microchip.com: fixed small issues and rebased]
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
drivers/Kconfig | 2 +
drivers/Makefile | 1 +
drivers/w1/Kconfig | 18 ++++
drivers/w1/Makefile | 1 +
drivers/w1/w1-uclass.c | 268 +++++++++++++++++++++++++++++++++++++++++++++++++
include/dm/uclass-id.h | 1 +
include/w1.h | 48 +++++++++
7 files changed, 339 insertions(+)
create mode 040000 drivers/w1
create mode 100644 drivers/w1/Kconfig
create mode 100644 drivers/w1/Makefile
create mode 100644 drivers/w1/w1-uclass.c
create mode 100644 include/w1.h
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 9e21b28..2cae829 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -102,6 +102,8 @@ source "drivers/usb/Kconfig"
source "drivers/video/Kconfig"
+source "drivers/w1/Kconfig"
+
source "drivers/watchdog/Kconfig"
config PHYS_TO_BUS
diff --git a/drivers/Makefile b/drivers/Makefile
index a213ea9..728380b 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -101,6 +101,7 @@ obj-y += input/
obj-y += soc/
obj-$(CONFIG_REMOTEPROC) += remoteproc/
obj-y += thermal/
+obj-$(CONFIG_W1) += w1/
obj-$(CONFIG_MACH_PIC32) += ddr/microchip/
endif
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
new file mode 100644
index 0000000..64b27c6
--- /dev/null
+++ b/drivers/w1/Kconfig
@@ -0,0 +1,18 @@
+#
+# W1 subsystem configuration
+#
+
+menu "1-Wire support"
+
+config W1
+ bool "Enable 1-wire controllers support"
+ default no
+ depends on DM
+ help
+ Support for the Dallas 1-Wire bus.
+
+if W1
+
+endif
+
+endmenu
diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile
new file mode 100644
index 0000000..f81693b
--- /dev/null
+++ b/drivers/w1/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_W1) += w1-uclass.o
diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
new file mode 100644
index 0000000..cfddda3
--- /dev/null
+++ b/drivers/w1/w1-uclass.c
@@ -0,0 +1,268 @@
+/* SPDX-License-Identifier: GPL-2.0+
+ *
+ * Copyright (c) 2015 Free Electrons
+ * Copyright (c) 2015 NextThing Co.
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <w1.h>
+
+#include <dm/device-internal.h>
+
+#define W1_MATCH_ROM 0x55
+#define W1_SKIP_ROM 0xcc
+#define W1_SEARCH 0xf0
+
+int w1_init(void);
+
+struct w1_bus {
+ u64 search_id;
+};
+
+struct w1_device {
+ u64 id;
+};
+
+static int w1_new_device(struct udevice *bus, u64 id)
+{
+ struct w1_driver_entry *start, *entry;
+ int n_ents, ret = -ENODEV;
+ u8 family = id & 0xff;
+
+ debug("%s: Detected new device 0x%llx (family 0x%x)\n",
+ bus->name, id, family);
+
+ start = ll_entry_start(struct w1_driver_entry, w1_driver_entry);
+ n_ents = ll_entry_count(struct w1_driver_entry, w1_driver_entry);
+
+ for (entry = start; entry != start + n_ents; entry++) {
+ const struct driver *drv;
+ struct w1_device *w1;
+ struct udevice *dev;
+
+ if (entry->family != family)
+ continue;
+
+ drv = entry->driver;
+ ret = device_bind(bus, drv, drv->name, NULL, -1,
+ &dev);
+ if (ret)
+ goto error;
+
+ debug("%s: Match found: %s\n", __func__, drv->name);
+
+ w1 = dev_get_parent_platdata(dev);
+ w1->id = id;
+
+ return 0;
+ }
+
+error:
+ debug("%s: No matches found: error %d\n", __func__, ret);
+ return ret;
+}
+
+static int w1_enumerate(struct udevice *bus)
+{
+ const struct w1_ops *ops = device_get_ops(bus);
+ struct w1_bus *w1 = dev_get_uclass_priv(bus);
+ u64 last_rn, rn = w1->search_id, tmp64;
+ bool last_device = false;
+ int search_bit, desc_bit = 64;
+ int last_zero = -1;
+ u8 triplet_ret = 0;
+ int i;
+
+ if (!ops->reset || !ops->write_byte || !ops->triplet)
+ return -ENOSYS;
+
+ while (!last_device) {
+ last_rn = rn;
+ rn = 0;
+
+ /*
+ * Reset bus and all 1-wire device state machines
+ * so they can respond to our requests.
+ *
+ * Return 0 - device(s) present, 1 - no devices present.
+ */
+ if (ops->reset(bus)) {
+ debug("%s: No devices present on the wire.\n",
+ __func__);
+ break;
+ }
+
+ /* Start the search */
+ ops->write_byte(bus, W1_SEARCH);
+ for (i = 0; i < 64; ++i) {
+ /* Determine the direction/search bit */
+ if (i == desc_bit)
+ /* took the 0 path last time, so take the 1 path */
+ search_bit = 1;
+ else if (i > desc_bit)
+ /* take the 0 path on the next branch */
+ search_bit = 0;
+ else
+ search_bit = ((last_rn >> i) & 0x1);
+
+ /* Read two bits and write one bit */
+ triplet_ret = ops->triplet(bus, search_bit);
+
+ /* quit if no device responded */
+ if ((triplet_ret & 0x03) == 0x03)
+ break;
+
+ /* If both directions were valid, and we took the 0 path... */
+ if (triplet_ret == 0)
+ last_zero = i;
+
+ /* extract the direction taken & update the device number */
+ tmp64 = (triplet_ret >> 2);
+ rn |= (tmp64 << i);
+ }
+
+ /* last device or error, aborting here */
+ if ((triplet_ret & 0x03) == 0x03)
+ last_device = true;
+
+ if ((triplet_ret & 0x03) != 0x03) {
+ if (desc_bit == last_zero || last_zero < 0) {
+ last_device = 1;
+ w1->search_id = 0;
+ } else {
+ w1->search_id = rn;
+ }
+ desc_bit = last_zero;
+
+ w1_new_device(bus, rn);
+ }
+ }
+
+ return 0;
+}
+
+int w1_get_bus(int busnum, struct udevice **busp)
+{
+ int ret;
+
+ w1_init();
+
+ ret = uclass_get_device_by_seq(UCLASS_W1, busnum, busp);
+ if (ret) {
+ debug("Cannot find w1 bus %d\n", busnum);
+ return ret;
+ }
+
+ return 0;
+}
+
+u8 w1_get_device_family(struct udevice *dev)
+{
+ struct w1_device *w1 = dev_get_parent_platdata(dev);
+
+ return w1->id & 0xff;
+}
+
+int w1_reset_select(struct udevice *dev)
+{
+ struct w1_device *w1 = dev_get_parent_platdata(dev);
+ struct udevice *bus = dev_get_parent(dev);
+ const struct w1_ops *ops = device_get_ops(bus);
+ int i;
+
+ if (!ops->reset || !ops->write_byte)
+ return -ENOSYS;
+
+ ops->reset(bus);
+
+ ops->write_byte(bus, W1_MATCH_ROM);
+
+ for (i = 0; i < sizeof(w1->id); i++)
+ ops->write_byte(bus, (w1->id >> (i * 8)) & 0xff);
+
+ return 0;
+}
+
+int w1_read_byte(struct udevice *dev)
+{
+ struct udevice *bus = dev_get_parent(dev);
+ const struct w1_ops *ops = device_get_ops(bus);
+
+ if (!ops->read_byte)
+ return -ENOSYS;
+
+ return ops->read_byte(bus);
+}
+
+int w1_read_buf(struct udevice *dev, u8 *buf, unsigned int count)
+{
+ int i, ret;
+
+ for (i = 0; i < count; i++) {
+ ret = w1_read_byte(dev);
+ if (ret < 0)
+ return ret;
+
+ buf[i] = ret & 0xff;
+ }
+
+ return 0;
+}
+
+int w1_write_byte(struct udevice *dev, u8 byte)
+{
+ struct udevice *bus = dev_get_parent(dev);
+ const struct w1_ops *ops = device_get_ops(bus);
+
+ if (!ops->write_byte)
+ return -ENOSYS;
+
+ ops->write_byte(bus, byte);
+
+ return 0;
+}
+
+static int w1_post_probe(struct udevice *bus)
+{
+ w1_enumerate(bus);
+
+ return 0;
+}
+
+int w1_init(void)
+{
+ struct udevice *bus;
+ struct uclass *uc;
+ int ret;
+
+ ret = uclass_get(UCLASS_W1, &uc);
+ if (ret)
+ return ret;
+
+ uclass_foreach_dev(bus, uc) {
+ ret = device_probe(bus);
+ if (ret == -ENODEV) { /* No such device. */
+ printf("W1 controller not available.\n");
+ continue;
+ }
+
+ if (ret) { /* Other error. */
+ printf("W1 controller probe failed, error %d\n", ret);
+ continue;
+ }
+ }
+ return 0;
+}
+
+UCLASS_DRIVER(w1) = {
+ .name = "w1",
+ .id = UCLASS_W1,
+ .flags = DM_UC_FLAG_SEQ_ALIAS,
+ .per_device_auto_alloc_size = sizeof(struct w1_bus),
+ .per_child_platdata_auto_alloc_size = sizeof(struct w1_device),
+ .post_probe = w1_post_probe,
+};
diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h
index d7f9df3..8eca9dc 100644
--- a/include/dm/uclass-id.h
+++ b/include/dm/uclass-id.h
@@ -89,6 +89,7 @@ enum uclass_id {
UCLASS_VIDEO, /* Video or LCD device */
UCLASS_VIDEO_BRIDGE, /* Video bridge, e.g. DisplayPort to LVDS */
UCLASS_VIDEO_CONSOLE, /* Text console driver for video device */
+ UCLASS_W1, /* Dallas 1-Wire bus */
UCLASS_WDT, /* Watchdot Timer driver */
UCLASS_COUNT,
diff --git a/include/w1.h b/include/w1.h
new file mode 100644
index 0000000..1ca1740
--- /dev/null
+++ b/include/w1.h
@@ -0,0 +1,48 @@
+/* SPDX-License-Identifier: GPL-2.0+
+ *
+ * Copyright (c) 2015 Free Electrons
+ * Copyright (c) 2015 NextThing Co
+ *
+ */
+
+#ifndef __W1_H
+#define __W1_H
+
+#include <dm.h>
+
+#define W1_FAMILY_DS24B33 0x23
+#define W1_FAMILY_DS2431 0x2d
+
+/**
+ * struct w1_driver_entry - Matches a driver to its w1 family
+ * @driver: Driver to use
+ * @family: W1 family handled by this driver
+ */
+struct w1_driver_entry {
+ struct driver *driver;
+ u8 family;
+};
+
+#define U_BOOT_W1_DEVICE(__name, __family) \
+ ll_entry_declare(struct w1_driver_entry, __name, w1_driver_entry) = { \
+ .driver = llsym(struct driver, __name, driver), \
+ .family = __family, \
+ }
+
+struct w1_ops {
+ u8 (*read_byte)(struct udevice *dev);
+ bool (*reset)(struct udevice *dev);
+ u8 (*triplet)(struct udevice *dev, bool bdir);
+ void (*write_byte)(struct udevice *dev, u8 byte);
+};
+
+int w1_get_bus(int busnum, struct udevice **busp);
+u8 w1_get_device_family(struct udevice *dev);
+
+int w1_read_buf(struct udevice *dev, u8 *buf, unsigned int count);
+int w1_read_byte(struct udevice *dev);
+int w1_reset_select(struct udevice *dev);
+int w1_write_buf(struct udevice *dev, u8 *buf, unsigned int count);
+int w1_write_byte(struct udevice *dev, u8 byte);
+
+#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 02/20] w1: Add 1-Wire gpio driver
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
2018-07-19 9:57 ` [U-Boot] [PATCH 01/20] w1: Add 1-Wire uclass Eugen Hristev
@ 2018-07-19 9:57 ` Eugen Hristev
2018-07-19 9:57 ` [U-Boot] [PATCH 03/20] dt-bindings: W1: w1-gpio: added bindings for w1-gpio Eugen Hristev
` (17 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:57 UTC (permalink / raw)
To: u-boot
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Add a bus driver for bitbanging a 1-Wire bus over a GPIO.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
[eugen.hristev at microchip.com: addressed review comments]
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
drivers/w1/Kconfig | 7 +++
drivers/w1/Makefile | 2 +
drivers/w1/w1-gpio.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 167 insertions(+)
create mode 100644 drivers/w1/w1-gpio.c
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 64b27c6..d6e0457 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -13,6 +13,13 @@ config W1
if W1
+config W1_GPIO
+ bool "Enable 1-wire GPIO bitbanging"
+ default no
+ depends on DM_GPIO
+ help
+ Emulate a 1-wire bus using a GPIO.
+
endif
endmenu
diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile
index f81693b..7fd8697 100644
--- a/drivers/w1/Makefile
+++ b/drivers/w1/Makefile
@@ -1 +1,3 @@
obj-$(CONFIG_W1) += w1-uclass.o
+
+obj-$(CONFIG_W1_GPIO) += w1-gpio.o
diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c
new file mode 100644
index 0000000..941ab2c
--- /dev/null
+++ b/drivers/w1/w1-gpio.c
@@ -0,0 +1,158 @@
+/* SPDX-License-Identifier: GPL-2.0+
+ *
+ * Copyright (c) 2015 Free Electrons
+ * Copyright (c) 2015 NextThing Co
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <w1.h>
+
+#include <asm/gpio.h>
+
+#define W1_TIMING_A 6
+#define W1_TIMING_B 64
+#define W1_TIMING_C 60
+#define W1_TIMING_D 10
+#define W1_TIMING_E 9
+#define W1_TIMING_F 55
+#define W1_TIMING_G 0
+#define W1_TIMING_H 480
+#define W1_TIMING_I 70
+#define W1_TIMING_J 410
+
+struct w1_gpio_pdata {
+ struct gpio_desc gpio;
+ u64 search_id;
+};
+
+static bool w1_gpio_read_bit(struct udevice *dev)
+{
+ struct w1_gpio_pdata *pdata = dev_get_platdata(dev);
+ int val;
+
+ dm_gpio_set_dir_flags(&pdata->gpio, GPIOD_IS_OUT);
+ udelay(W1_TIMING_A);
+
+ dm_gpio_set_dir_flags(&pdata->gpio, GPIOD_IS_IN);
+ udelay(W1_TIMING_E);
+
+ val = dm_gpio_get_value(&pdata->gpio);
+ if (val < 0)
+ debug("error in retrieving GPIO value");
+ udelay(W1_TIMING_F);
+
+ return val;
+}
+
+static u8 w1_gpio_read_byte(struct udevice *dev)
+{
+ int i;
+ u8 ret = 0;
+
+ for (i = 0; i < 8; ++i)
+ ret |= (w1_gpio_read_bit(dev) ? 1 : 0) << i;
+
+ return ret;
+}
+
+static void w1_gpio_write_bit(struct udevice *dev, bool bit)
+{
+ struct w1_gpio_pdata *pdata = dev_get_platdata(dev);
+
+ dm_gpio_set_dir_flags(&pdata->gpio, GPIOD_IS_OUT);
+
+ bit ? udelay(W1_TIMING_A) : udelay(W1_TIMING_C);
+
+ dm_gpio_set_value(&pdata->gpio, 1);
+
+ bit ? udelay(W1_TIMING_B) : udelay(W1_TIMING_D);
+}
+
+static void w1_gpio_write_byte(struct udevice *dev, u8 byte)
+{
+ int i;
+
+ for (i = 0; i < 8; ++i)
+ w1_gpio_write_bit(dev, (byte >> i) & 0x1);
+}
+
+static bool w1_gpio_reset(struct udevice *dev)
+{
+ struct w1_gpio_pdata *pdata = dev_get_platdata(dev);
+ int val;
+
+ dm_gpio_set_dir_flags(&pdata->gpio, GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
+ udelay(W1_TIMING_G);
+
+ dm_gpio_set_value(&pdata->gpio, 0);
+ udelay(W1_TIMING_H);
+
+ dm_gpio_set_dir_flags(&pdata->gpio, GPIOD_IS_IN);
+ udelay(W1_TIMING_I);
+
+ val = dm_gpio_get_value(&pdata->gpio);
+ if (val < 0)
+ debug("error in retrieving GPIO value");
+ udelay(W1_TIMING_J);
+
+ return val;
+}
+
+static u8 w1_gpio_triplet(struct udevice *dev, bool bdir)
+{
+ u8 id_bit = w1_gpio_read_bit(dev);
+ u8 comp_bit = w1_gpio_read_bit(dev);
+ u8 retval;
+
+ if (id_bit && comp_bit)
+ return 0x03; /* error */
+
+ if (!id_bit && !comp_bit) {
+ /* Both bits are valid, take the direction given */
+ retval = bdir ? 0x04 : 0;
+ } else {
+ /* Only one bit is valid, take that direction */
+ bdir = id_bit;
+ retval = id_bit ? 0x05 : 0x02;
+ }
+
+ w1_gpio_write_bit(dev, bdir);
+ return retval;
+}
+
+static const struct w1_ops w1_gpio_ops = {
+ .read_byte = w1_gpio_read_byte,
+ .reset = w1_gpio_reset,
+ .triplet = w1_gpio_triplet,
+ .write_byte = w1_gpio_write_byte,
+};
+
+static int w1_gpio_ofdata_to_platdata(struct udevice *dev)
+{
+ struct w1_gpio_pdata *pdata = dev_get_platdata(dev);
+ int ret;
+
+ ret = gpio_request_by_name(dev, "gpios", 0, &pdata->gpio, 0);
+ if (ret < 0)
+ printf("Error claiming GPIO %d\n", ret);
+
+ return ret;
+};
+
+static const struct udevice_id w1_gpio_id[] = {
+ { "w1-gpio", 0 },
+ { },
+};
+
+U_BOOT_DRIVER(w1_gpio_drv) = {
+ .id = UCLASS_W1,
+ .name = "w1_gpio_drv",
+ .of_match = w1_gpio_id,
+ .ofdata_to_platdata = w1_gpio_ofdata_to_platdata,
+ .ops = &w1_gpio_ops,
+ .platdata_auto_alloc_size = sizeof(struct w1_gpio_pdata),
+};
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 03/20] dt-bindings: W1: w1-gpio: added bindings for w1-gpio
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
2018-07-19 9:57 ` [U-Boot] [PATCH 01/20] w1: Add 1-Wire uclass Eugen Hristev
2018-07-19 9:57 ` [U-Boot] [PATCH 02/20] w1: Add 1-Wire gpio driver Eugen Hristev
@ 2018-07-19 9:57 ` Eugen Hristev
2018-07-19 9:57 ` [U-Boot] [PATCH 04/20] W1-EEPROM: Add an W1-EEPROM uclass for 1 wire EEPROMs Eugen Hristev
` (16 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:57 UTC (permalink / raw)
To: u-boot
Added bindings specification for bitbanged gpio driver for Dallas
one wire protocol
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
doc/device-tree-bindings/w1/w1-gpio.txt | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 040000 doc/device-tree-bindings/w1
create mode 100644 doc/device-tree-bindings/w1/w1-gpio.txt
diff --git a/doc/device-tree-bindings/w1/w1-gpio.txt b/doc/device-tree-bindings/w1/w1-gpio.txt
new file mode 100644
index 0000000..b976d8c
--- /dev/null
+++ b/doc/device-tree-bindings/w1/w1-gpio.txt
@@ -0,0 +1,26 @@
+W1 gpio device binding - one wire protocol over bitbanged gpio
+=======================
+
+
+No child nodes are required in device tree. The driver will autodetect
+the devices and instantiate the driver for the child according to the detected
+family. This is done according to the discovery protocol in 1wire standard.
+
+Driver:
+- drivers/w1/w1-gpio.c
+
+Software w1 device-tree node properties:
+Required:
+* compatible = "w1-gpio";
+* gpios = <...>;
+ This is the gpio used for one wire protocol, using bitbanging
+
+Optional:
+* none
+
+Example:
+
+onewire_tm: onewire {
+ compatible = "w1-gpio";
+ gpios = <&pioA 32 0>;
+};
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 04/20] W1-EEPROM: Add an W1-EEPROM uclass for 1 wire EEPROMs
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (2 preceding siblings ...)
2018-07-19 9:57 ` [U-Boot] [PATCH 03/20] dt-bindings: W1: w1-gpio: added bindings for w1-gpio Eugen Hristev
@ 2018-07-19 9:57 ` Eugen Hristev
2018-07-20 14:28 ` Maxime Ripard
2018-07-19 9:57 ` [U-Boot] [PATCH 05/20] W1-EEPROM: add support for Maxim DS24 eeprom families Eugen Hristev
` (15 subsequent siblings)
19 siblings, 1 reply; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:57 UTC (permalink / raw)
To: u-boot
From: Maxime Ripard <maxime.ripard@free-electrons.com>
We might want to access data stored onto one wire EEPROMs.
Create a framework to provide a consistent API.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
[eugen.hristev at microchip.com: reworked patch]
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
drivers/Kconfig | 2 ++
drivers/Makefile | 1 +
drivers/w1-eeprom/Kconfig | 17 +++++++++++
drivers/w1-eeprom/Makefile | 2 ++
drivers/w1-eeprom/w1-eeprom-uclass.c | 56 ++++++++++++++++++++++++++++++++++++
include/dm/uclass-id.h | 1 +
include/w1-eeprom.h | 28 ++++++++++++++++++
7 files changed, 107 insertions(+)
create mode 040000 drivers/w1-eeprom
create mode 100644 drivers/w1-eeprom/Kconfig
create mode 100644 drivers/w1-eeprom/Makefile
create mode 100644 drivers/w1-eeprom/w1-eeprom-uclass.c
create mode 100644 include/w1-eeprom.h
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 2cae829..386af75 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -104,6 +104,8 @@ source "drivers/video/Kconfig"
source "drivers/w1/Kconfig"
+source "drivers/w1-eeprom/Kconfig"
+
source "drivers/watchdog/Kconfig"
config PHYS_TO_BUS
diff --git a/drivers/Makefile b/drivers/Makefile
index 728380b..de67a17 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -102,6 +102,7 @@ obj-y += soc/
obj-$(CONFIG_REMOTEPROC) += remoteproc/
obj-y += thermal/
obj-$(CONFIG_W1) += w1/
+obj-$(CONFIG_W1_EEPROM) += w1-eeprom/
obj-$(CONFIG_MACH_PIC32) += ddr/microchip/
endif
diff --git a/drivers/w1-eeprom/Kconfig b/drivers/w1-eeprom/Kconfig
new file mode 100644
index 0000000..d5ddc80
--- /dev/null
+++ b/drivers/w1-eeprom/Kconfig
@@ -0,0 +1,17 @@
+#
+# EEPROM subsystem configuration
+#
+
+menu "1-wire EEPROM support"
+
+config W1_EEPROM
+ bool "Enable support for EEPROMs on 1wire interface"
+ depends on DM
+ help
+ Support for the EEPROMs connected on 1-wire Dallas protocol interface
+
+if W1_EEPROM
+
+endif
+
+endmenu
diff --git a/drivers/w1-eeprom/Makefile b/drivers/w1-eeprom/Makefile
new file mode 100644
index 0000000..b72950e
--- /dev/null
+++ b/drivers/w1-eeprom/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_W1_EEPROM) += w1-eeprom-uclass.o
+
diff --git a/drivers/w1-eeprom/w1-eeprom-uclass.c b/drivers/w1-eeprom/w1-eeprom-uclass.c
new file mode 100644
index 0000000..4176baf
--- /dev/null
+++ b/drivers/w1-eeprom/w1-eeprom-uclass.c
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: GPL-2.0+
+ *
+ * Copyright (c) 2015 Free Electrons
+ * Copyright (c) 2015 NextThing Co.
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <w1-eeprom.h>
+
+#include <dm/device-internal.h>
+
+int w1_eeprom_read_buf(struct udevice *dev, unsigned int offset,
+ u8 *buf, unsigned int count)
+{
+ const struct w1_eeprom_ops *ops = device_get_ops(dev);
+
+ if (!ops->read_buf)
+ return -ENOSYS;
+
+ return ops->read_buf(dev, offset, buf, count);
+}
+
+UCLASS_DRIVER(w1_eeprom) = {
+ .name = "w1_eeprom",
+ .id = UCLASS_W1_EEPROM,
+};
+
+int w1_eeprom_dm_init(void)
+{
+ struct udevice *bus;
+ struct uclass *uc;
+ int ret;
+
+ ret = uclass_get(UCLASS_W1_EEPROM, &uc);
+ if (ret)
+ return ret;
+
+ uclass_foreach_dev(bus, uc) {
+ ret = device_probe(bus);
+ if (ret == -ENODEV) { /* No such device. */
+ debug("W1_EEPROM not available.\n");
+ continue;
+ }
+
+ if (ret) { /* Other error. */
+ printf("W1_EEPROM probe failed, error %d\n", ret);
+ continue;
+ }
+ }
+
+ return 0;
+}
diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h
index 8eca9dc..06ff339 100644
--- a/include/dm/uclass-id.h
+++ b/include/dm/uclass-id.h
@@ -90,6 +90,7 @@ enum uclass_id {
UCLASS_VIDEO_BRIDGE, /* Video bridge, e.g. DisplayPort to LVDS */
UCLASS_VIDEO_CONSOLE, /* Text console driver for video device */
UCLASS_W1, /* Dallas 1-Wire bus */
+ UCLASS_W1_EEPROM, /* one-wire EEPROMs */
UCLASS_WDT, /* Watchdot Timer driver */
UCLASS_COUNT,
diff --git a/include/w1-eeprom.h b/include/w1-eeprom.h
new file mode 100644
index 0000000..7c9dd96
--- /dev/null
+++ b/include/w1-eeprom.h
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: GPL-2.0+
+ *
+ * Copyright (c) 2015 Free Electrons
+ * Copyright (c) 2015 NextThing Co
+ * Copyright (c) 2018 Microchip Technology, Inc.
+ *
+ */
+
+#ifndef __W1_EEPROM_H
+#define __W1_EEPROM_H
+
+struct udevice;
+
+struct w1_eeprom_ops {
+ /*
+ * Reads a buff from the given EEPROM memory, starting at
+ * given offset and place the results into the given buffer.
+ * Should read given count of bytes.
+ * Should return 0 on success, and normal error.h on error
+ */
+ int (*read_buf)(struct udevice *dev, unsigned int offset,
+ u8 *buf, unsigned int count);
+};
+
+int w1_eeprom_read_buf(struct udevice *dev, unsigned int offset,
+ u8 *buf, unsigned int count);
+
+#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 04/20] W1-EEPROM: Add an W1-EEPROM uclass for 1 wire EEPROMs
2018-07-19 9:57 ` [U-Boot] [PATCH 04/20] W1-EEPROM: Add an W1-EEPROM uclass for 1 wire EEPROMs Eugen Hristev
@ 2018-07-20 14:28 ` Maxime Ripard
2018-07-30 8:54 ` Eugen Hristev
0 siblings, 1 reply; 30+ messages in thread
From: Maxime Ripard @ 2018-07-20 14:28 UTC (permalink / raw)
To: u-boot
Hi Eugen,
Thanks for giving those patches another shot.
On Thu, Jul 19, 2018 at 12:57:52PM +0300, Eugen Hristev wrote:
> From: Maxime Ripard <maxime.ripard@free-electrons.com>
>
> We might want to access data stored onto one wire EEPROMs.
> Create a framework to provide a consistent API.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> [eugen.hristev at microchip.com: reworked patch]
> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
> ---
> drivers/Kconfig | 2 ++
> drivers/Makefile | 1 +
> drivers/w1-eeprom/Kconfig | 17 +++++++++++
> drivers/w1-eeprom/Makefile | 2 ++
> drivers/w1-eeprom/w1-eeprom-uclass.c | 56 ++++++++++++++++++++++++++++++++++++
> include/dm/uclass-id.h | 1 +
> include/w1-eeprom.h | 28 ++++++++++++++++++
> 7 files changed, 107 insertions(+)
> create mode 040000 drivers/w1-eeprom
> create mode 100644 drivers/w1-eeprom/Kconfig
> create mode 100644 drivers/w1-eeprom/Makefile
> create mode 100644 drivers/w1-eeprom/w1-eeprom-uclass.c
> create mode 100644 include/w1-eeprom.h
I believe that we shouldn't have a framework solely for 1-wire
EEPROMs, but for EEPROMs, connected to any bus.
The 1-Wire EEPROMs all behave pretty much the same, so we'll probably
only see a single driver within that framework. And at the same time,
we'll want to have a consistent interface to access all the EEPROMs,
no matter on which bus they sit on.
Maxime
--
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180720/eac6287a/attachment.sig>
^ permalink raw reply [flat|nested] 30+ messages in thread
* [U-Boot] [PATCH 04/20] W1-EEPROM: Add an W1-EEPROM uclass for 1 wire EEPROMs
2018-07-20 14:28 ` Maxime Ripard
@ 2018-07-30 8:54 ` Eugen Hristev
2018-07-31 2:06 ` Tom Rini
0 siblings, 1 reply; 30+ messages in thread
From: Eugen Hristev @ 2018-07-30 8:54 UTC (permalink / raw)
To: u-boot
On 20.07.2018 17:28, Maxime Ripard wrote:
> Hi Eugen,
>
> Thanks for giving those patches another shot.
>
> On Thu, Jul 19, 2018 at 12:57:52PM +0300, Eugen Hristev wrote:
>> From: Maxime Ripard <maxime.ripard@free-electrons.com>
>>
>> We might want to access data stored onto one wire EEPROMs.
>> Create a framework to provide a consistent API.
>>
>> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>> [eugen.hristev at microchip.com: reworked patch]
>> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
>> ---
>> drivers/Kconfig | 2 ++
>> drivers/Makefile | 1 +
>> drivers/w1-eeprom/Kconfig | 17 +++++++++++
>> drivers/w1-eeprom/Makefile | 2 ++
>> drivers/w1-eeprom/w1-eeprom-uclass.c | 56 ++++++++++++++++++++++++++++++++++++
>> include/dm/uclass-id.h | 1 +
>> include/w1-eeprom.h | 28 ++++++++++++++++++
>> 7 files changed, 107 insertions(+)
>> create mode 040000 drivers/w1-eeprom
>> create mode 100644 drivers/w1-eeprom/Kconfig
>> create mode 100644 drivers/w1-eeprom/Makefile
>> create mode 100644 drivers/w1-eeprom/w1-eeprom-uclass.c
>> create mode 100644 include/w1-eeprom.h
>
> I believe that we shouldn't have a framework solely for 1-wire
> EEPROMs, but for EEPROMs, connected to any bus.
>
> The 1-Wire EEPROMs all behave pretty much the same, so we'll probably
> only see a single driver within that framework. And at the same time,
> we'll want to have a consistent interface to access all the EEPROMs,
> no matter on which bus they sit on.
Hello,
I worked this series using the original implementation as a starting
point: having the eeproms on different subsystems (i2c and onewire).
The different types of eeproms have only the name in common as I see it,
and the way to access them is totally different: two different type of
buses, so uniting them is just for the namesake ?
One option is to have them separately, as we have spi, i2c memories , etc;
Or, unite them under a single subsystem for eeproms, and have one driver
for i2c eeproms and one for w1 eeproms, trying to make the same API to
access them, and hide the bus specific differences.
Question for maintainers: which is the best direction to go, so I can
rework the series accordingly ?
Thanks,
Eugen
>
> Maxime
>
^ permalink raw reply [flat|nested] 30+ messages in thread
* [U-Boot] [PATCH 04/20] W1-EEPROM: Add an W1-EEPROM uclass for 1 wire EEPROMs
2018-07-30 8:54 ` Eugen Hristev
@ 2018-07-31 2:06 ` Tom Rini
2018-08-02 16:56 ` Simon Glass
0 siblings, 1 reply; 30+ messages in thread
From: Tom Rini @ 2018-07-31 2:06 UTC (permalink / raw)
To: u-boot
On Mon, Jul 30, 2018 at 11:54:51AM +0300, Eugen Hristev wrote:
>
>
> On 20.07.2018 17:28, Maxime Ripard wrote:
> >Hi Eugen,
> >
> >Thanks for giving those patches another shot.
> >
> >On Thu, Jul 19, 2018 at 12:57:52PM +0300, Eugen Hristev wrote:
> >>From: Maxime Ripard <maxime.ripard@free-electrons.com>
> >>
> >>We might want to access data stored onto one wire EEPROMs.
> >>Create a framework to provide a consistent API.
> >>
> >>Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> >>[eugen.hristev at microchip.com: reworked patch]
> >>Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
> >>---
> >> drivers/Kconfig | 2 ++
> >> drivers/Makefile | 1 +
> >> drivers/w1-eeprom/Kconfig | 17 +++++++++++
> >> drivers/w1-eeprom/Makefile | 2 ++
> >> drivers/w1-eeprom/w1-eeprom-uclass.c | 56 ++++++++++++++++++++++++++++++++++++
> >> include/dm/uclass-id.h | 1 +
> >> include/w1-eeprom.h | 28 ++++++++++++++++++
> >> 7 files changed, 107 insertions(+)
> >> create mode 040000 drivers/w1-eeprom
> >> create mode 100644 drivers/w1-eeprom/Kconfig
> >> create mode 100644 drivers/w1-eeprom/Makefile
> >> create mode 100644 drivers/w1-eeprom/w1-eeprom-uclass.c
> >> create mode 100644 include/w1-eeprom.h
> >
> >I believe that we shouldn't have a framework solely for 1-wire
> >EEPROMs, but for EEPROMs, connected to any bus.
> >
> >The 1-Wire EEPROMs all behave pretty much the same, so we'll probably
> >only see a single driver within that framework. And at the same time,
> >we'll want to have a consistent interface to access all the EEPROMs,
> >no matter on which bus they sit on.
>
> Hello,
>
> I worked this series using the original implementation as a starting point:
> having the eeproms on different subsystems (i2c and onewire).
>
> The different types of eeproms have only the name in common as I see it, and
> the way to access them is totally different: two different type of buses, so
> uniting them is just for the namesake ?
>
> One option is to have them separately, as we have spi, i2c memories , etc;
> Or, unite them under a single subsystem for eeproms, and have one driver for
> i2c eeproms and one for w1 eeproms, trying to make the same API to access
> them, and hide the bus specific differences.
>
> Question for maintainers: which is the best direction to go, so I can rework
> the series accordingly ?
It would be nice if we had a generic eeprom command that wasn't
bus-centric. Unfortunately we have an eeprom command that IS bus
centric and not easily extended to working on all appropriate buses. So
to me, starting out by handing w1 eeproms under w1 seems OK. And we can
put it on the TODO list to make cmd/eeprom.c parse <bus> as perhaps
"BUSTYPE:number" so we could do eeprom w1:0 ... or eeprom i2c:0 ... and
so forth.
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180730/07b96662/attachment.sig>
^ permalink raw reply [flat|nested] 30+ messages in thread
* [U-Boot] [PATCH 04/20] W1-EEPROM: Add an W1-EEPROM uclass for 1 wire EEPROMs
2018-07-31 2:06 ` Tom Rini
@ 2018-08-02 16:56 ` Simon Glass
0 siblings, 0 replies; 30+ messages in thread
From: Simon Glass @ 2018-08-02 16:56 UTC (permalink / raw)
To: u-boot
Hi,
On 30 July 2018 at 20:06, Tom Rini <trini@konsulko.com> wrote:
> On Mon, Jul 30, 2018 at 11:54:51AM +0300, Eugen Hristev wrote:
>>
>>
>> On 20.07.2018 17:28, Maxime Ripard wrote:
>> >Hi Eugen,
>> >
>> >Thanks for giving those patches another shot.
>> >
>> >On Thu, Jul 19, 2018 at 12:57:52PM +0300, Eugen Hristev wrote:
>> >>From: Maxime Ripard <maxime.ripard@free-electrons.com>
>> >>
>> >>We might want to access data stored onto one wire EEPROMs.
>> >>Create a framework to provide a consistent API.
>> >>
>> >>Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>> >>[eugen.hristev at microchip.com: reworked patch]
>> >>Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
>> >>---
>> >> drivers/Kconfig | 2 ++
>> >> drivers/Makefile | 1 +
>> >> drivers/w1-eeprom/Kconfig | 17 +++++++++++
>> >> drivers/w1-eeprom/Makefile | 2 ++
>> >> drivers/w1-eeprom/w1-eeprom-uclass.c | 56 ++++++++++++++++++++++++++++++++++++
>> >> include/dm/uclass-id.h | 1 +
>> >> include/w1-eeprom.h | 28 ++++++++++++++++++
>> >> 7 files changed, 107 insertions(+)
>> >> create mode 040000 drivers/w1-eeprom
>> >> create mode 100644 drivers/w1-eeprom/Kconfig
>> >> create mode 100644 drivers/w1-eeprom/Makefile
>> >> create mode 100644 drivers/w1-eeprom/w1-eeprom-uclass.c
>> >> create mode 100644 include/w1-eeprom.h
>> >
>> >I believe that we shouldn't have a framework solely for 1-wire
>> >EEPROMs, but for EEPROMs, connected to any bus.
>> >
>> >The 1-Wire EEPROMs all behave pretty much the same, so we'll probably
>> >only see a single driver within that framework. And at the same time,
>> >we'll want to have a consistent interface to access all the EEPROMs,
>> >no matter on which bus they sit on.
>>
>> Hello,
>>
>> I worked this series using the original implementation as a starting point:
>> having the eeproms on different subsystems (i2c and onewire).
>>
>> The different types of eeproms have only the name in common as I see it, and
>> the way to access them is totally different: two different type of buses, so
>> uniting them is just for the namesake ?
>>
>> One option is to have them separately, as we have spi, i2c memories , etc;
>> Or, unite them under a single subsystem for eeproms, and have one driver for
>> i2c eeproms and one for w1 eeproms, trying to make the same API to access
>> them, and hide the bus specific differences.
>>
>> Question for maintainers: which is the best direction to go, so I can rework
>> the series accordingly ?
>
> It would be nice if we had a generic eeprom command that wasn't
> bus-centric. Unfortunately we have an eeprom command that IS bus
> centric and not easily extended to working on all appropriate buses. So
> to me, starting out by handing w1 eeproms under w1 seems OK. And we can
> put it on the TODO list to make cmd/eeprom.c parse <bus> as perhaps
> "BUSTYPE:number" so we could do eeprom w1:0 ... or eeprom i2c:0 ... and
> so forth.
That makes sense to me.
We could provide some sort of read/write device supported by SPI, I2C,
1wire, etc. in principle. I don't think anyone has attempted it yet.
Regards,
Simon
^ permalink raw reply [flat|nested] 30+ messages in thread
* [U-Boot] [PATCH 05/20] W1-EEPROM: add support for Maxim DS24 eeprom families
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (3 preceding siblings ...)
2018-07-19 9:57 ` [U-Boot] [PATCH 04/20] W1-EEPROM: Add an W1-EEPROM uclass for 1 wire EEPROMs Eugen Hristev
@ 2018-07-19 9:57 ` Eugen Hristev
2018-07-19 9:57 ` [U-Boot] [PATCH 06/20] W1-EEPROM: add sandbox driver Eugen Hristev
` (14 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:57 UTC (permalink / raw)
To: u-boot
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Add a driver that supports Maxim 1 wire EEPROMs families
DS24B33 and DS2431.
Can be extended for other families as well.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
[eugen.hristev at microchip.com: reworked driver]
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
drivers/w1-eeprom/Kconfig | 6 ++++++
drivers/w1-eeprom/Makefile | 2 ++
drivers/w1-eeprom/ds24xxx.c | 46 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+)
create mode 100644 drivers/w1-eeprom/ds24xxx.c
diff --git a/drivers/w1-eeprom/Kconfig b/drivers/w1-eeprom/Kconfig
index d5ddc80..20ec549 100644
--- a/drivers/w1-eeprom/Kconfig
+++ b/drivers/w1-eeprom/Kconfig
@@ -12,6 +12,12 @@ config W1_EEPROM
if W1_EEPROM
+config W1_EEPROM_DS24XXX
+ bool "Enable Maxim DS24 families EEPROM support"
+ depends on W1
+ help
+ Maxim DS24 EEPROMs 1-Wire EEPROM support
+
endif
endmenu
diff --git a/drivers/w1-eeprom/Makefile b/drivers/w1-eeprom/Makefile
index b72950e..3f4aa13 100644
--- a/drivers/w1-eeprom/Makefile
+++ b/drivers/w1-eeprom/Makefile
@@ -1,2 +1,4 @@
obj-$(CONFIG_W1_EEPROM) += w1-eeprom-uclass.o
+obj-$(CONFIG_W1_EEPROM_DS24XXX) += ds24xxx.o
+
diff --git a/drivers/w1-eeprom/ds24xxx.c b/drivers/w1-eeprom/ds24xxx.c
new file mode 100644
index 0000000..423aa99
--- /dev/null
+++ b/drivers/w1-eeprom/ds24xxx.c
@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: GPL-2.0+
+ *
+ * Copyright (c) 2015 Free Electrons
+ * Copyright (c) 2015 NextThing Co
+ * Copyright (c) 2018 Microchip Technology, Inc.
+ *
+ */
+
+#include <common.h>
+#include <linux/err.h>
+#include <dm.h>
+#include <w1-eeprom.h>
+#include <w1.h>
+
+#define W1_F2D_READ_EEPROM 0xf0
+
+static int ds24xxx_read_buf(struct udevice *dev, unsigned int offset,
+ u8 *buf, unsigned int count)
+{
+ w1_reset_select(dev);
+
+ w1_write_byte(dev, W1_F2D_READ_EEPROM);
+ w1_write_byte(dev, offset & 0xff);
+ w1_write_byte(dev, offset >> 8);
+
+ return w1_read_buf(dev, buf, count);
+}
+
+static const struct w1_eeprom_ops ds24xxx_ops = {
+ .read_buf = ds24xxx_read_buf,
+};
+
+U_BOOT_DRIVER(ds24b33) = {
+ .name = "ds24b33",
+ .id = UCLASS_W1_EEPROM,
+ .ops = &ds24xxx_ops,
+};
+
+U_BOOT_DRIVER(ds2431) = {
+ .name = "ds2431",
+ .id = UCLASS_W1_EEPROM,
+ .ops = &ds24xxx_ops,
+};
+
+U_BOOT_W1_DEVICE(ds24b33, W1_FAMILY_DS24B33);
+U_BOOT_W1_DEVICE(ds2431, W1_FAMILY_DS2431);
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 06/20] W1-EEPROM: add sandbox driver
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (4 preceding siblings ...)
2018-07-19 9:57 ` [U-Boot] [PATCH 05/20] W1-EEPROM: add support for Maxim DS24 eeprom families Eugen Hristev
@ 2018-07-19 9:57 ` Eugen Hristev
2018-07-19 9:57 ` [U-Boot] [PATCH 07/20] w1: add command for onewire protocol Eugen Hristev
` (13 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:57 UTC (permalink / raw)
To: u-boot
Add a sandbox driver for a one wire EEPROM memory
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
drivers/w1-eeprom/Kconfig | 6 +++++
drivers/w1-eeprom/Makefile | 1 +
drivers/w1-eeprom/eep_sandbox.c | 57 +++++++++++++++++++++++++++++++++++++++++
include/w1.h | 1 +
4 files changed, 65 insertions(+)
create mode 100644 drivers/w1-eeprom/eep_sandbox.c
diff --git a/drivers/w1-eeprom/Kconfig b/drivers/w1-eeprom/Kconfig
index 20ec549..4b7f3c4 100644
--- a/drivers/w1-eeprom/Kconfig
+++ b/drivers/w1-eeprom/Kconfig
@@ -18,6 +18,12 @@ config W1_EEPROM_DS24XXX
help
Maxim DS24 EEPROMs 1-Wire EEPROM support
+config W1_EEPROM_SANDBOX
+ bool "Enable sandbox onewire EEPROM driver"
+ depends on W1
+ help
+ Sandbox driver for a onewire EEPROM memory
+
endif
endmenu
diff --git a/drivers/w1-eeprom/Makefile b/drivers/w1-eeprom/Makefile
index 3f4aa13..03cc4c8 100644
--- a/drivers/w1-eeprom/Makefile
+++ b/drivers/w1-eeprom/Makefile
@@ -2,3 +2,4 @@ obj-$(CONFIG_W1_EEPROM) += w1-eeprom-uclass.o
obj-$(CONFIG_W1_EEPROM_DS24XXX) += ds24xxx.o
+obj-$(CONFIG_W1_EEPROM_SANDBOX) += eep_sandbox.o
diff --git a/drivers/w1-eeprom/eep_sandbox.c b/drivers/w1-eeprom/eep_sandbox.c
new file mode 100644
index 0000000..46910dd
--- /dev/null
+++ b/drivers/w1-eeprom/eep_sandbox.c
@@ -0,0 +1,57 @@
+/* SPDX-License-Identifier: GPL-2.0+
+ *
+ * Copyright (c) 2018 Microchip Technology, Inc.
+ *
+ */
+
+#include <common.h>
+#include <linux/err.h>
+#include <dm.h>
+#include <w1-eeprom.h>
+#include <w1.h>
+
+#define W1_F2D_READ_EEPROM 0xf0
+
+#define EEP_SANDBOX_SAMPLE_MEM "this is a sample EEPROM memory string."
+
+static int eep_sandbox_read_buf(struct udevice *dev, unsigned int offset,
+ u8 *buf, unsigned int count)
+{
+ /* do not allow to copy more than our maximum sample string */
+ if (offset + count < strlen(EEP_SANDBOX_SAMPLE_MEM)) {
+ offset = 0;
+ count = strlen(EEP_SANDBOX_SAMPLE_MEM);
+ }
+ strncpy((char *)buf, EEP_SANDBOX_SAMPLE_MEM, count);
+
+ /*
+ * in case the w1 subsystem uses some different kind of sandbox testing,
+ * like randomized gpio values , we take the buffer from there
+ */
+
+ w1_reset_select(dev);
+
+ w1_write_byte(dev, W1_F2D_READ_EEPROM);
+ w1_write_byte(dev, offset & 0xff);
+ w1_write_byte(dev, offset >> 8);
+
+ w1_read_buf(dev, buf, count);
+
+ /*
+ * even if read buf from w1 fails, return success as we hardcoded
+ * the buffer.
+ */
+ return 0;
+}
+
+static const struct w1_eeprom_ops eep_sandbox_ops = {
+ .read_buf = eep_sandbox_read_buf,
+};
+
+U_BOOT_DRIVER(eep_sandbox) = {
+ .name = "eep_sandbox",
+ .id = UCLASS_W1_EEPROM,
+ .ops = &eep_sandbox_ops,
+};
+
+U_BOOT_W1_DEVICE(eep_sandbox, W1_FAMILY_EEP_SANDBOX);
diff --git a/include/w1.h b/include/w1.h
index 1ca1740..c2ed51c 100644
--- a/include/w1.h
+++ b/include/w1.h
@@ -12,6 +12,7 @@
#define W1_FAMILY_DS24B33 0x23
#define W1_FAMILY_DS2431 0x2d
+#define W1_FAMILY_EEP_SANDBOX 0xfe
/**
* struct w1_driver_entry - Matches a driver to its w1 family
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 07/20] w1: add command for onewire protocol
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (5 preceding siblings ...)
2018-07-19 9:57 ` [U-Boot] [PATCH 06/20] W1-EEPROM: add sandbox driver Eugen Hristev
@ 2018-07-19 9:57 ` Eugen Hristev
2018-07-19 9:57 ` [U-Boot] [PATCH 08/20] pinctrl: sandbox: add gpio onewire w1 group Eugen Hristev
` (12 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:57 UTC (permalink / raw)
To: u-boot
Add basic command for bus information and read for onewire
bus using Dallas 1-Wire protocol.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
cmd/Kconfig | 7 ++++
cmd/Makefile | 1 +
cmd/w1.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 129 insertions(+)
create mode 100644 cmd/w1.c
diff --git a/cmd/Kconfig b/cmd/Kconfig
index aec2090..1a68b1f 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -816,6 +816,13 @@ config CMD_I2C
help
I2C support.
+config CMD_W1
+ depends on W1
+ default y if W1
+ bool "w1 - Support for Dallas 1-Wire protocol"
+ help
+ Dallas 1-wire protocol support
+
config CMD_LOADB
bool "loadb"
default y
diff --git a/cmd/Makefile b/cmd/Makefile
index 323f1fd..51ad1d8 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -143,6 +143,7 @@ obj-$(CONFIG_CMD_THOR_DOWNLOAD) += thordown.o
obj-$(CONFIG_CMD_XIMG) += ximg.o
obj-$(CONFIG_CMD_YAFFS2) += yaffs2.o
obj-$(CONFIG_CMD_SPL) += spl.o
+obj-$(CONFIG_CMD_W1) += w1.o
obj-$(CONFIG_CMD_ZIP) += zip.o
obj-$(CONFIG_CMD_ZFS) += zfs.o
diff --git a/cmd/w1.c b/cmd/w1.c
new file mode 100644
index 0000000..6255bc2
--- /dev/null
+++ b/cmd/w1.c
@@ -0,0 +1,121 @@
+/* SPDX-License-Identifier: GPL-2.0+
+ *
+ * (C) Copyright 2018
+ * Microchip Technology, Inc.
+ * Eugen Hristev <eugen.hristev@microchip.com>
+ */
+#include <common.h>
+#include <command.h>
+#include <w1.h>
+#include <w1-eeprom.h>
+#include <dm/device-internal.h>
+
+static int w1_bus(void)
+{
+ struct udevice *bus, *dev;
+ int ret;
+
+ ret = w1_get_bus(0, &bus);
+ if (ret) {
+ printf("one wire interface not found\n");
+ return CMD_RET_FAILURE;
+ }
+ printf("Bus %d:\t%s", bus->seq, bus->name);
+ if (device_active(bus))
+ printf(" (active)");
+ printf("\n");
+
+ for (device_find_first_child(bus, &dev);
+ dev;
+ device_find_next_child(&dev)) {
+ ret = device_probe(dev);
+
+ printf("\t%s (%d) uclass %s : ", dev->name, dev->seq,
+ dev->uclass->uc_drv->name);
+
+ if (ret)
+ printf("device error\n");
+ else
+ printf("family 0x%x\n", w1_get_device_family(dev));
+ }
+ return CMD_RET_SUCCESS;
+}
+
+static int w1_read(int argc, char *const argv[])
+{
+ int bus_n = 0, dev_n = 0, offset = 0, len = 512;
+ int i;
+ struct udevice *bus, *dev;
+ int ret;
+ u8 buf[512];
+
+ if (argc > 2)
+ bus_n = simple_strtoul(argv[2], NULL, 10);
+
+ if (argc > 3)
+ dev_n = simple_strtoul(argv[3], NULL, 10);
+
+ if (argc > 4)
+ offset = simple_strtoul(argv[4], NULL, 10);
+
+ if (argc > 5)
+ len = simple_strtoul(argv[5], NULL, 10);
+
+ if (len > 512) {
+ printf("len needs to be <= 512\n");
+ return CMD_RET_FAILURE;
+ }
+
+ ret = w1_get_bus(bus_n, &bus);
+ if (ret) {
+ printf("one wire interface not found\n");
+ return CMD_RET_FAILURE;
+ }
+
+ for (device_find_first_child(bus, &dev), i = 0;
+ dev && i <= dev_n;
+ device_find_next_child(&dev), i++) {
+ ret = device_probe(dev);
+ if (!ret && i == dev_n)
+ break;
+ }
+
+ if (i != dev_n || ret || !dev) {
+ printf("invalid dev\n");
+ return CMD_RET_FAILURE;
+ }
+
+ if (strcmp(dev->uclass->uc_drv->name, "w1_eeprom")) {
+ printf("the device present on the interface is of unknown device class\n");
+ return CMD_RET_FAILURE;
+ }
+
+ w1_eeprom_read_buf(dev, offset, (u8 *)buf, len);
+ for (i = 0; i < len; i++)
+ printf("%x", buf[i]);
+ printf("\n");
+
+ return CMD_RET_SUCCESS;
+}
+
+int do_w1(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+{
+ if (argc < 2)
+ return CMD_RET_USAGE;
+
+ if (!strcmp(argv[1], "bus"))
+ return w1_bus();
+
+ if (!strcmp(argv[1], "read"))
+ return w1_read(argc, argv);
+
+ return CMD_RET_SUCCESS;
+}
+
+U_BOOT_CMD(w1, 6, 0, do_w1,
+ "onewire interface utility commands",
+ "bus - show onewire bus info (all)\n"
+ "w1 read [<bus> [<dev> [offset [length]]]]"
+ " - read from onewire device 'dev' on onewire bus 'bus'"
+ " starting from offset 'offset' and length 'length'\n"
+ " defaults: bus 0, dev 0, offset 0, length 512 bytes.");
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 08/20] pinctrl: sandbox: add gpio onewire w1 group
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (6 preceding siblings ...)
2018-07-19 9:57 ` [U-Boot] [PATCH 07/20] w1: add command for onewire protocol Eugen Hristev
@ 2018-07-19 9:57 ` Eugen Hristev
2018-07-19 9:57 ` [U-Boot] [PATCH 09/20] sandbox: DTS: w1: add node for one wire interface on GPIO Eugen Hristev
` (11 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:57 UTC (permalink / raw)
To: u-boot
Add onewire "w1" groups and pin function for onewire GPIOs in sandbox.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
drivers/pinctrl/pinctrl-sandbox.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/pinctrl/pinctrl-sandbox.c b/drivers/pinctrl/pinctrl-sandbox.c
index 468fa2a..755ac08 100644
--- a/drivers/pinctrl/pinctrl-sandbox.c
+++ b/drivers/pinctrl/pinctrl-sandbox.c
@@ -14,6 +14,7 @@ static const char * const sandbox_pins[] = {
"SDA",
"TX",
"RX",
+ "W1"
};
static const char * const sandbox_groups[] = {
@@ -21,12 +22,14 @@ static const char * const sandbox_groups[] = {
"serial_a",
"serial_b",
"spi",
+ "w1",
};
static const char * const sandbox_functions[] = {
"i2c",
"serial",
"spi",
+ "w1",
};
static const struct pinconf_param sandbox_conf_params[] = {
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 09/20] sandbox: DTS: w1: add node for one wire interface on GPIO
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (7 preceding siblings ...)
2018-07-19 9:57 ` [U-Boot] [PATCH 08/20] pinctrl: sandbox: add gpio onewire w1 group Eugen Hristev
@ 2018-07-19 9:57 ` Eugen Hristev
2018-07-19 9:57 ` [U-Boot] [PATCH 10/20] configs: sandbox: add onewire w1 and sandbox eeprom Eugen Hristev
` (10 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:57 UTC (permalink / raw)
To: u-boot
Add a node for the one wire uclass and one wire gpio driver
in sandbox.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
arch/sandbox/dts/sandbox.dts | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
index 0ea2452..70bc244 100644
--- a/arch/sandbox/dts/sandbox.dts
+++ b/arch/sandbox/dts/sandbox.dts
@@ -160,6 +160,7 @@
pinctrl {
compatible = "sandbox,pinctrl";
+ status = "okay";
pinctrl_i2c0: i2c0 {
groups = "i2c";
@@ -171,6 +172,12 @@
groups = "serial_a";
function = "serial";
};
+
+ pinctrl_onewire0: onewire0 {
+ groups = "w1";
+ function = "w1";
+ bias-pull-up;
+ };
};
reset at 1 {
@@ -319,6 +326,14 @@
};
};
};
+
+ onewire0: onewire {
+ compatible = "w1-gpio";
+ gpios = <&gpio_a 8>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_onewire0>;
+ status = "okay";
+ };
};
#include "cros-ec-keyboard.dtsi"
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 10/20] configs: sandbox: add onewire w1 and sandbox eeprom
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (8 preceding siblings ...)
2018-07-19 9:57 ` [U-Boot] [PATCH 09/20] sandbox: DTS: w1: add node for one wire interface on GPIO Eugen Hristev
@ 2018-07-19 9:57 ` Eugen Hristev
2018-07-19 9:57 ` [U-Boot] [PATCH 11/20] w1: enumerate sandbox driver if configured Eugen Hristev
` (9 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:57 UTC (permalink / raw)
To: u-boot
To be able to test Dallas onewire protocol and one wire eeproms driver
and subsystem, add in sandbox defconfig the drivers' config.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
configs/sandbox_defconfig | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 2fc84a1..2a86bf3 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -186,6 +186,10 @@ CONFIG_CONSOLE_ROTATION=y
CONFIG_CONSOLE_TRUETYPE=y
CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y
CONFIG_VIDEO_SANDBOX_SDL=y
+CONFIG_W1=y
+CONFIG_W1_GPIO=y
+CONFIG_W1_EEPROM=y
+CONFIG_W1_EEPROM_SANDBOX=y
CONFIG_WDT=y
CONFIG_WDT_SANDBOX=y
CONFIG_FS_CBFS=y
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 11/20] w1: enumerate sandbox driver if configured
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (9 preceding siblings ...)
2018-07-19 9:57 ` [U-Boot] [PATCH 10/20] configs: sandbox: add onewire w1 and sandbox eeprom Eugen Hristev
@ 2018-07-19 9:57 ` Eugen Hristev
2018-07-20 14:01 ` Lukasz Majewski
2018-07-19 9:58 ` [U-Boot] [PATCH 12/20] configs: sama5d2_xplained: add onewire and eeprom drivers Eugen Hristev
` (8 subsequent siblings)
19 siblings, 1 reply; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:57 UTC (permalink / raw)
To: u-boot
Add a sandbox eeprom on the bus as a device, if sandbox driver is configured.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
drivers/w1/w1-uclass.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
index cfddda3..e58c1ca 100644
--- a/drivers/w1/w1-uclass.c
+++ b/drivers/w1/w1-uclass.c
@@ -142,6 +142,11 @@ static int w1_enumerate(struct udevice *bus)
}
}
+#ifdef CONFIG_W1_EEPROM_SANDBOX
+ /* before we are finished, add a sandbox device if we can */
+ w1_new_device(bus, W1_FAMILY_EEP_SANDBOX);
+#endif
+
return 0;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 11/20] w1: enumerate sandbox driver if configured
2018-07-19 9:57 ` [U-Boot] [PATCH 11/20] w1: enumerate sandbox driver if configured Eugen Hristev
@ 2018-07-20 14:01 ` Lukasz Majewski
2018-07-23 23:48 ` Simon Glass
0 siblings, 1 reply; 30+ messages in thread
From: Lukasz Majewski @ 2018-07-20 14:01 UTC (permalink / raw)
To: u-boot
Hi Eugen,
Thanks for (re-)bringing the One wire support to u-boot.
> Add a sandbox eeprom on the bus as a device, if sandbox driver is
> configured.
>
> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
> ---
> drivers/w1/w1-uclass.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
> index cfddda3..e58c1ca 100644
> --- a/drivers/w1/w1-uclass.c
> +++ b/drivers/w1/w1-uclass.c
> @@ -142,6 +142,11 @@ static int w1_enumerate(struct udevice *bus)
> }
> }
>
> +#ifdef CONFIG_W1_EEPROM_SANDBOX
> + /* before we are finished, add a sandbox device if we can */
> + w1_new_device(bus, W1_FAMILY_EEP_SANDBOX);
> +#endif
IMHO we shouldn't mix the sandbox code with production (on boards) code.
Maybe Simon (+CCed) could provide some more input here?
> +
> return 0;
> }
>
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180720/e2748551/attachment.sig>
^ permalink raw reply [flat|nested] 30+ messages in thread
* [U-Boot] [PATCH 11/20] w1: enumerate sandbox driver if configured
2018-07-20 14:01 ` Lukasz Majewski
@ 2018-07-23 23:48 ` Simon Glass
2018-07-24 6:58 ` Maxime Ripard
0 siblings, 1 reply; 30+ messages in thread
From: Simon Glass @ 2018-07-23 23:48 UTC (permalink / raw)
To: u-boot
Hi,
On 20 July 2018 at 08:01, Lukasz Majewski <lukma@denx.de> wrote:
> Hi Eugen,
>
> Thanks for (re-)bringing the One wire support to u-boot.
>
>> Add a sandbox eeprom on the bus as a device, if sandbox driver is
>> configured.
>>
>> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
>> ---
>> drivers/w1/w1-uclass.c | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
>> index cfddda3..e58c1ca 100644
>> --- a/drivers/w1/w1-uclass.c
>> +++ b/drivers/w1/w1-uclass.c
>> @@ -142,6 +142,11 @@ static int w1_enumerate(struct udevice *bus)
>> }
>> }
>>
>> +#ifdef CONFIG_W1_EEPROM_SANDBOX
>> + /* before we are finished, add a sandbox device if we can */
>> + w1_new_device(bus, W1_FAMILY_EEP_SANDBOX);
>> +#endif
>
> IMHO we shouldn't mix the sandbox code with production (on boards) code.
>
> Maybe Simon (+CCed) could provide some more input here?
I have not seen this series. But new devices should be created
automatically based on them being in the device tree. So you should
just be able to add them there.
I don't understand what w1_new_device() does. Also, it should return an error.
Regards,
Simon
^ permalink raw reply [flat|nested] 30+ messages in thread
* [U-Boot] [PATCH 11/20] w1: enumerate sandbox driver if configured
2018-07-23 23:48 ` Simon Glass
@ 2018-07-24 6:58 ` Maxime Ripard
2018-07-24 15:28 ` Simon Glass
0 siblings, 1 reply; 30+ messages in thread
From: Maxime Ripard @ 2018-07-24 6:58 UTC (permalink / raw)
To: u-boot
On Mon, Jul 23, 2018 at 05:48:25PM -0600, Simon Glass wrote:
> Hi,
>
> On 20 July 2018 at 08:01, Lukasz Majewski <lukma@denx.de> wrote:
> > Hi Eugen,
> >
> > Thanks for (re-)bringing the One wire support to u-boot.
> >
> >> Add a sandbox eeprom on the bus as a device, if sandbox driver is
> >> configured.
> >>
> >> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
> >> ---
> >> drivers/w1/w1-uclass.c | 5 +++++
> >> 1 file changed, 5 insertions(+)
> >>
> >> diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
> >> index cfddda3..e58c1ca 100644
> >> --- a/drivers/w1/w1-uclass.c
> >> +++ b/drivers/w1/w1-uclass.c
> >> @@ -142,6 +142,11 @@ static int w1_enumerate(struct udevice *bus)
> >> }
> >> }
> >>
> >> +#ifdef CONFIG_W1_EEPROM_SANDBOX
> >> + /* before we are finished, add a sandbox device if we can */
> >> + w1_new_device(bus, W1_FAMILY_EEP_SANDBOX);
> >> +#endif
> >
> > IMHO we shouldn't mix the sandbox code with production (on boards) code.
> >
> > Maybe Simon (+CCed) could provide some more input here?
>
> I have not seen this series. But new devices should be created
> automatically based on them being in the device tree. So you should
> just be able to add them there.
1-Wire is discoverable, so there's no device nodes in the DT.
Maxime
--
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180724/33f3bc6c/attachment.sig>
^ permalink raw reply [flat|nested] 30+ messages in thread
* [U-Boot] [PATCH 11/20] w1: enumerate sandbox driver if configured
2018-07-24 6:58 ` Maxime Ripard
@ 2018-07-24 15:28 ` Simon Glass
2018-07-25 9:15 ` Maxime Ripard
0 siblings, 1 reply; 30+ messages in thread
From: Simon Glass @ 2018-07-24 15:28 UTC (permalink / raw)
To: u-boot
Hi Maxime,
On 24 July 2018 at 00:58, Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> On Mon, Jul 23, 2018 at 05:48:25PM -0600, Simon Glass wrote:
>> Hi,
>>
>> On 20 July 2018 at 08:01, Lukasz Majewski <lukma@denx.de> wrote:
>> > Hi Eugen,
>> >
>> > Thanks for (re-)bringing the One wire support to u-boot.
>> >
>> >> Add a sandbox eeprom on the bus as a device, if sandbox driver is
>> >> configured.
>> >>
>> >> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
>> >> ---
>> >> drivers/w1/w1-uclass.c | 5 +++++
>> >> 1 file changed, 5 insertions(+)
>> >>
>> >> diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
>> >> index cfddda3..e58c1ca 100644
>> >> --- a/drivers/w1/w1-uclass.c
>> >> +++ b/drivers/w1/w1-uclass.c
>> >> @@ -142,6 +142,11 @@ static int w1_enumerate(struct udevice *bus)
>> >> }
>> >> }
>> >>
>> >> +#ifdef CONFIG_W1_EEPROM_SANDBOX
>> >> + /* before we are finished, add a sandbox device if we can */
>> >> + w1_new_device(bus, W1_FAMILY_EEP_SANDBOX);
>> >> +#endif
>> >
>> > IMHO we shouldn't mix the sandbox code with production (on boards) code.
>> >
>> > Maybe Simon (+CCed) could provide some more input here?
>>
>> I have not seen this series. But new devices should be created
>> automatically based on them being in the device tree. So you should
>> just be able to add them there.
>
> 1-Wire is discoverable, so there's no device nodes in the DT.
Well there should be. See for example PCI, USB, I2C and SPI :-)
Regards,
Simon
^ permalink raw reply [flat|nested] 30+ messages in thread
* [U-Boot] [PATCH 11/20] w1: enumerate sandbox driver if configured
2018-07-24 15:28 ` Simon Glass
@ 2018-07-25 9:15 ` Maxime Ripard
0 siblings, 0 replies; 30+ messages in thread
From: Maxime Ripard @ 2018-07-25 9:15 UTC (permalink / raw)
To: u-boot
On Tue, Jul 24, 2018 at 09:28:30AM -0600, Simon Glass wrote:
> Hi Maxime,
>
> On 24 July 2018 at 00:58, Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> > On Mon, Jul 23, 2018 at 05:48:25PM -0600, Simon Glass wrote:
> >> Hi,
> >>
> >> On 20 July 2018 at 08:01, Lukasz Majewski <lukma@denx.de> wrote:
> >> > Hi Eugen,
> >> >
> >> > Thanks for (re-)bringing the One wire support to u-boot.
> >> >
> >> >> Add a sandbox eeprom on the bus as a device, if sandbox driver is
> >> >> configured.
> >> >>
> >> >> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
> >> >> ---
> >> >> drivers/w1/w1-uclass.c | 5 +++++
> >> >> 1 file changed, 5 insertions(+)
> >> >>
> >> >> diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
> >> >> index cfddda3..e58c1ca 100644
> >> >> --- a/drivers/w1/w1-uclass.c
> >> >> +++ b/drivers/w1/w1-uclass.c
> >> >> @@ -142,6 +142,11 @@ static int w1_enumerate(struct udevice *bus)
> >> >> }
> >> >> }
> >> >>
> >> >> +#ifdef CONFIG_W1_EEPROM_SANDBOX
> >> >> + /* before we are finished, add a sandbox device if we can */
> >> >> + w1_new_device(bus, W1_FAMILY_EEP_SANDBOX);
> >> >> +#endif
> >> >
> >> > IMHO we shouldn't mix the sandbox code with production (on boards) code.
> >> >
> >> > Maybe Simon (+CCed) could provide some more input here?
> >>
> >> I have not seen this series. But new devices should be created
> >> automatically based on them being in the device tree. So you should
> >> just be able to add them there.
> >
> > 1-Wire is discoverable, so there's no device nodes in the DT.
>
> Well there should be. See for example PCI, USB, I2C and SPI :-)
I didn't know u-boot's sandbox had binding for USB and PCI devices. My
bad :)
Maxime
--
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180725/f6b288be/attachment.sig>
^ permalink raw reply [flat|nested] 30+ messages in thread
* [U-Boot] [PATCH 12/20] configs: sama5d2_xplained: add onewire and eeprom drivers
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (10 preceding siblings ...)
2018-07-19 9:57 ` [U-Boot] [PATCH 11/20] w1: enumerate sandbox driver if configured Eugen Hristev
@ 2018-07-19 9:58 ` Eugen Hristev
2018-07-19 9:58 ` [U-Boot] [PATCH 13/20] configs: sama5d3_xplained: " Eugen Hristev
` (7 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:58 UTC (permalink / raw)
To: u-boot
SAMA5D2 SoC can have extra clip boards (PDAs) connected, which have
an EEPROM memory for identification. A special GPIO can be used to read
this memory over 1wire protocol.
Enabling one wire and eeprom drivers for this memory.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
configs/sama5d2_xplained_mmc_defconfig | 4 ++++
configs/sama5d2_xplained_spiflash_defconfig | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig
index 4182e84..7e62d9f 100644
--- a/configs/sama5d2_xplained_mmc_defconfig
+++ b/configs/sama5d2_xplained_mmc_defconfig
@@ -86,3 +86,7 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_ATMEL_USBA=y
CONFIG_DM_VIDEO=y
CONFIG_ATMEL_HLCD=y
+CONFIG_W1=y
+CONFIG_W1_GPIO=y
+CONFIG_W1_EEPROM=y
+CONFIG_W1_EEPROM_DS24XXX=y
diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig
index 18d1cb5..b5a95c5 100644
--- a/configs/sama5d2_xplained_spiflash_defconfig
+++ b/configs/sama5d2_xplained_spiflash_defconfig
@@ -83,3 +83,7 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_ATMEL_USBA=y
CONFIG_DM_VIDEO=y
CONFIG_ATMEL_HLCD=y
+CONFIG_W1=y
+CONFIG_W1_GPIO=y
+CONFIG_W1_EEPROM=y
+CONFIG_W1_EEPROM_DS24XXX=y
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 13/20] configs: sama5d3_xplained: add onewire and eeprom drivers
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (11 preceding siblings ...)
2018-07-19 9:58 ` [U-Boot] [PATCH 12/20] configs: sama5d2_xplained: add onewire and eeprom drivers Eugen Hristev
@ 2018-07-19 9:58 ` Eugen Hristev
2018-07-19 9:58 ` [U-Boot] [PATCH 14/20] board: atmel: add support for pda detection Eugen Hristev
` (6 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:58 UTC (permalink / raw)
To: u-boot
SAMA5D3 SoC can have extra clip boards (PDAs) connected, which have
an EEPROM memory for identification. A special GPIO can be used to read
this memory over 1wire protocol.
Enabling one wire and eeprom drivers for this memory.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
configs/sama5d3_xplained_mmc_defconfig | 4 ++++
configs/sama5d3_xplained_nandflash_defconfig | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig
index 861a851..771264e 100644
--- a/configs/sama5d3_xplained_mmc_defconfig
+++ b/configs/sama5d3_xplained_mmc_defconfig
@@ -73,3 +73,7 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
+CONFIG_W1=y
+CONFIG_W1_GPIO=y
+CONFIG_W1_EEPROM=y
+CONFIG_W1_EEPROM_DS24XXX=y
diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig
index b72462d..a35beff 100644
--- a/configs/sama5d3_xplained_nandflash_defconfig
+++ b/configs/sama5d3_xplained_nandflash_defconfig
@@ -70,4 +70,8 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
+CONFIG_W1=y
+CONFIG_W1_GPIO=y
+CONFIG_W1_EEPROM=y
+CONFIG_W1_EEPROM_DS24XXX=y
CONFIG_FAT_WRITE=y
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 14/20] board: atmel: add support for pda detection
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (12 preceding siblings ...)
2018-07-19 9:58 ` [U-Boot] [PATCH 13/20] configs: sama5d3_xplained: " Eugen Hristev
@ 2018-07-19 9:58 ` Eugen Hristev
2018-07-19 9:58 ` [U-Boot] [PATCH 15/20] board: sama5d2_xplained: add pda detect call at init time Eugen Hristev
` (5 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:58 UTC (permalink / raw)
To: u-boot
This adds the support for PDA detection as common code for
Atmel boards.
Using the one wire interface over GPIO , an EEPROM memory is read
and compared to preprogrammed values for PDA screens TM4300, TM7000
and TM7000B.
Once the PDA is detected, an environment variable is set accordingly.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
board/atmel/common/board.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c
index 650eb22..b9cf54c 100644
--- a/board/atmel/common/board.c
+++ b/board/atmel/common/board.c
@@ -5,7 +5,62 @@
*/
#include <common.h>
+#include <w1.h>
+#include <w1-eeprom.h>
+#include <dm/device-internal.h>
+
+#define AT91_PDA_EEPROM_ID_OFFSET 15
+#define AT91_PDA_EEPROM_ID_LENGTH 5
+#define AT91_PDA_EEPROM_DEFAULT_BUS 0
void dummy(void)
{
}
+
+#if defined CONFIG_W1
+void at91_pda_detect(void)
+{
+ struct udevice *bus, *dev;
+ u8 buf[AT91_PDA_EEPROM_ID_LENGTH + 1] = {0};
+ int ret;
+ int pda = 0;
+
+ ret = w1_get_bus(AT91_PDA_EEPROM_DEFAULT_BUS, &bus);
+ if (ret)
+ return;
+
+ for (device_find_first_child(bus, &dev);
+ dev;
+ device_find_next_child(&dev)) {
+ ret = device_probe(dev);
+ if (ret) {
+ continue;
+ } else {
+ w1_eeprom_read_buf(dev, AT91_PDA_EEPROM_ID_OFFSET,
+ (u8 *)buf, AT91_PDA_EEPROM_ID_LENGTH);
+ break;
+ }
+ }
+ pda = simple_strtoul((const char *)buf, NULL, 10);
+
+ switch (pda) {
+ case 7000:
+ if (buf[4] == 'B')
+ printf("PDA TM7000B detected\n");
+ else
+ printf("PDA TM7000 detected\n");
+ break;
+ case 4300:
+ printf("PDA TM4300 detected\n");
+ break;
+ case 5000:
+ printf("PDA TM5000 detected\n");
+ break;
+ }
+ env_set("pda", (const char *)buf);
+}
+#else
+void at91_pda_detect(void)
+{
+}
+#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 15/20] board: sama5d2_xplained: add pda detect call at init time
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (13 preceding siblings ...)
2018-07-19 9:58 ` [U-Boot] [PATCH 14/20] board: atmel: add support for pda detection Eugen Hristev
@ 2018-07-19 9:58 ` Eugen Hristev
2018-07-19 9:58 ` [U-Boot] [PATCH 16/20] board: sama5d3_xplained: " Eugen Hristev
` (4 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:58 UTC (permalink / raw)
To: u-boot
Call the PDA detection mechanism at boot time so we can have
the pda environment variable ready for use.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
board/atmel/sama5d2_xplained/sama5d2_xplained.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
index 592b4d8..fccd80e 100644
--- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c
+++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
@@ -15,6 +15,8 @@
#include <asm/arch/gpio.h>
#include <asm/arch/sama5d2.h>
+extern void at91_pda_detect(void);
+
DECLARE_GLOBAL_DATA_PTR;
static void board_usb_hw_init(void)
@@ -28,6 +30,7 @@ int board_late_init(void)
#ifdef CONFIG_DM_VIDEO
at91_video_show_board_info();
#endif
+ at91_pda_detect();
return 0;
}
#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 16/20] board: sama5d3_xplained: add pda detect call at init time
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (14 preceding siblings ...)
2018-07-19 9:58 ` [U-Boot] [PATCH 15/20] board: sama5d2_xplained: add pda detect call at init time Eugen Hristev
@ 2018-07-19 9:58 ` Eugen Hristev
2018-07-19 9:58 ` [U-Boot] [PATCH 17/20] configs: sama5d2_xplained: add fdt overlay support Eugen Hristev
` (3 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:58 UTC (permalink / raw)
To: u-boot
Call the PDA detection mechanism at boot time so we can have
the pda environment variable ready for use.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
arch/arm/mach-at91/Kconfig | 1 +
board/atmel/sama5d3_xplained/sama5d3_xplained.c | 10 ++++++++++
2 files changed, 11 insertions(+)
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index ce6be38..6fe701a 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -175,6 +175,7 @@ config TARGET_SAMA5D3_XPLAINED
select SAMA5D3
select SUPPORT_SPL
select BOARD_EARLY_INIT_F
+ select BOARD_LATE_INIT
config TARGET_SAMA5D3XEK
bool "SAMA5D3X-EK board"
diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
index c47f638..289f8d8 100644
--- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c
+++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
@@ -18,6 +18,8 @@
DECLARE_GLOBAL_DATA_PTR;
+extern void at91_pda_detect(void);
+
#ifdef CONFIG_NAND_ATMEL
void sama5d3_xplained_nand_hw_init(void)
{
@@ -72,6 +74,14 @@ void board_debug_uart_init(void)
}
#endif
+#ifdef CONFIG_BOARD_LATE_INIT
+int board_late_init(void)
+{
+ at91_pda_detect();
+ return 0;
+}
+#endif
+
#ifdef CONFIG_BOARD_EARLY_INIT_F
int board_early_init_f(void)
{
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 17/20] configs: sama5d2_xplained: add fdt overlay support
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (15 preceding siblings ...)
2018-07-19 9:58 ` [U-Boot] [PATCH 16/20] board: sama5d3_xplained: " Eugen Hristev
@ 2018-07-19 9:58 ` Eugen Hristev
2018-07-19 9:58 ` [U-Boot] [PATCH 18/20] configs: sama5d3_xplained: " Eugen Hristev
` (2 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:58 UTC (permalink / raw)
To: u-boot
Add commands for fdt overlay merging. This is required for the boot scripts
that detect PDAs and apply specific overlays to the DTB passed on to kernel.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
configs/sama5d2_xplained_mmc_defconfig | 1 +
configs/sama5d2_xplained_spiflash_defconfig | 1 +
2 files changed, 2 insertions(+)
diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig
index 7e62d9f..4b2b5f0 100644
--- a/configs/sama5d2_xplained_mmc_defconfig
+++ b/configs/sama5d2_xplained_mmc_defconfig
@@ -90,3 +90,4 @@ CONFIG_W1=y
CONFIG_W1_GPIO=y
CONFIG_W1_EEPROM=y
CONFIG_W1_EEPROM_DS24XXX=y
+CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig
index b5a95c5..d2c264d 100644
--- a/configs/sama5d2_xplained_spiflash_defconfig
+++ b/configs/sama5d2_xplained_spiflash_defconfig
@@ -87,3 +87,4 @@ CONFIG_W1=y
CONFIG_W1_GPIO=y
CONFIG_W1_EEPROM=y
CONFIG_W1_EEPROM_DS24XXX=y
+CONFIG_OF_LIBFDT_OVERLAY=y
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 18/20] configs: sama5d3_xplained: add fdt overlay support
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (16 preceding siblings ...)
2018-07-19 9:58 ` [U-Boot] [PATCH 17/20] configs: sama5d2_xplained: add fdt overlay support Eugen Hristev
@ 2018-07-19 9:58 ` Eugen Hristev
2018-07-19 9:58 ` [U-Boot] [PATCH 19/20] ARM: dts: at91: sama5d2_xplained: add onewire connector for LCD eeprom Eugen Hristev
2018-07-19 9:58 ` [U-Boot] [PATCH 20/20] ARM: dts: at91: sama5d3_xplained: " Eugen Hristev
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:58 UTC (permalink / raw)
To: u-boot
Add commands for fdt overlay merging. This is required for the boot scripts
that detect PDAs and apply specific overlays to the DTB passed on to kernel.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
configs/sama5d3_xplained_mmc_defconfig | 1 +
configs/sama5d3_xplained_nandflash_defconfig | 1 +
2 files changed, 2 insertions(+)
diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig
index 771264e..c6dddbf 100644
--- a/configs/sama5d3_xplained_mmc_defconfig
+++ b/configs/sama5d3_xplained_mmc_defconfig
@@ -77,3 +77,4 @@ CONFIG_W1=y
CONFIG_W1_GPIO=y
CONFIG_W1_EEPROM=y
CONFIG_W1_EEPROM_DS24XXX=y
+CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig
index a35beff..6fbbde0 100644
--- a/configs/sama5d3_xplained_nandflash_defconfig
+++ b/configs/sama5d3_xplained_nandflash_defconfig
@@ -75,3 +75,4 @@ CONFIG_W1_GPIO=y
CONFIG_W1_EEPROM=y
CONFIG_W1_EEPROM_DS24XXX=y
CONFIG_FAT_WRITE=y
+CONFIG_OF_LIBFDT_OVERLAY=y
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 19/20] ARM: dts: at91: sama5d2_xplained: add onewire connector for LCD eeprom
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (17 preceding siblings ...)
2018-07-19 9:58 ` [U-Boot] [PATCH 18/20] configs: sama5d3_xplained: " Eugen Hristev
@ 2018-07-19 9:58 ` Eugen Hristev
2018-07-19 9:58 ` [U-Boot] [PATCH 20/20] ARM: dts: at91: sama5d3_xplained: " Eugen Hristev
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:58 UTC (permalink / raw)
To: u-boot
Add onewire node in device tree for TM series LCDs
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
arch/arm/dts/at91-sama5d2_xplained.dts | 12 ++++++++++++
arch/arm/dts/sama5d2.dtsi | 6 ++++++
2 files changed, 18 insertions(+)
diff --git a/arch/arm/dts/at91-sama5d2_xplained.dts b/arch/arm/dts/at91-sama5d2_xplained.dts
index 01326a1..9fada4a 100644
--- a/arch/arm/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/dts/at91-sama5d2_xplained.dts
@@ -11,6 +11,13 @@
stdout-path = &uart1;
};
+ onewire_tm: onewire {
+ gpios = <&pioA 32 0>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_onewire_tm_default>;
+ status = "okay";
+ };
+
ahb {
usb1: ohci at 00400000 {
num-ports = <3>;
@@ -270,6 +277,11 @@
pinmux = <PIN_PA31__GPIO>;
bias-disable;
};
+
+ pinctrl_onewire_tm_default: onewire_tm_default {
+ pinmux = <PIN_PB0__GPIO>;
+ bias-pull-up;
+ };
};
};
};
diff --git a/arch/arm/dts/sama5d2.dtsi b/arch/arm/dts/sama5d2.dtsi
index 6645a55..6f49842 100644
--- a/arch/arm/dts/sama5d2.dtsi
+++ b/arch/arm/dts/sama5d2.dtsi
@@ -9,6 +9,7 @@
spi1 = &qspi0;
i2c0 = &i2c0;
i2c1 = &i2c1;
+ w1 = &onewire_tm;
};
clocks {
@@ -769,4 +770,9 @@
};
};
};
+
+ onewire_tm: onewire {
+ compatible = "w1-gpio";
+ status = "disabled";
+ };
};
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [U-Boot] [PATCH 20/20] ARM: dts: at91: sama5d3_xplained: add onewire connector for LCD eeprom
2018-07-19 9:57 [U-Boot] [PATCH 00/20] Add support for 1wire protocol and 1wire eeproms Eugen Hristev
` (18 preceding siblings ...)
2018-07-19 9:58 ` [U-Boot] [PATCH 19/20] ARM: dts: at91: sama5d2_xplained: add onewire connector for LCD eeprom Eugen Hristev
@ 2018-07-19 9:58 ` Eugen Hristev
19 siblings, 0 replies; 30+ messages in thread
From: Eugen Hristev @ 2018-07-19 9:58 UTC (permalink / raw)
To: u-boot
Add onewire node in device tree for TM series LCDs
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
arch/arm/dts/at91-sama5d3_xplained.dts | 12 ++++++++++++
arch/arm/dts/sama5d3.dtsi | 6 ++++++
2 files changed, 18 insertions(+)
diff --git a/arch/arm/dts/at91-sama5d3_xplained.dts b/arch/arm/dts/at91-sama5d3_xplained.dts
index 6959710..c71e069 100644
--- a/arch/arm/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/dts/at91-sama5d3_xplained.dts
@@ -36,6 +36,13 @@
};
};
+ onewire_tm: onewire {
+ gpios = <&pioE 23 GPIO_ACTIVE_LOW>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_onewire_tm_default>;
+ status = "okay";
+ };
+
ahb {
apb {
mmc0: mmc at f0000000 {
@@ -243,6 +250,11 @@
atmel,pins =
<AT91_PIOE 9 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PE9, conflicts with A9 */
};
+
+ pinctrl_onewire_tm_default: onewire_tm_default {
+ atmel,pins =
+ <AT91_PIOE 23 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+ };
};
};
};
diff --git a/arch/arm/dts/sama5d3.dtsi b/arch/arm/dts/sama5d3.dtsi
index ee0e14e..66417a9 100644
--- a/arch/arm/dts/sama5d3.dtsi
+++ b/arch/arm/dts/sama5d3.dtsi
@@ -39,6 +39,7 @@
ssc0 = &ssc0;
ssc1 = &ssc1;
pwm0 = &pwm0;
+ w1 = &onewire_tm;
};
cpus {
#address-cells = <1>;
@@ -1538,4 +1539,9 @@
};
};
};
+
+ onewire_tm: onewire {
+ compatible = "w1-gpio";
+ status = "disabled";
+ };
};
--
2.7.4
^ permalink raw reply related [flat|nested] 30+ messages in thread