Skip to contentSkip to conversation

dm: exynos: Driver model improvements leading to spring support

PATCH New Simon Glass 5 participants 139 messages Jul 3, 2015 – Aug 3, 2015

Subsystems (13)
lore
Share & tools
lore
#0 lore raw

cover dm: exynos: Driver model improvements leading to spring support

This series adds a number of fixes and improvements to driver model as well as two new uclasses (video bridges and I2c muxes).

The series is aimed at adding support for spring (HP 11 Chromebook). Since it is very similar to other ARM Chromebooks, some effory is made to use common code rather than duplicating functionality. In fact spring uses the same code as several other boards, just with a different device tree and a few configuration changes.

Audio works correctly on pit, pi, spring and snow with this series. A bug in the I2C driver broken this recently.

The exynos implementation still has a few rough areas - e.g. some hard-coded GPIOs and the old-style SPL. Also it does not yet support CPU frequency scaling and power management.

Spring has some oddities and they are hard to handle with U-Boot's old way of doing drivers. With driver model these can be implemented cleanly and this sort of problem was the original motivation for my interest in driver model.

This series is available at u-boot-dm in branch spring-working. It is based on the previous set of driver model changes in branch clk-working.

Simon Glass (55):
dm: core: Support finding a device by phandle
dm: i2c: Add a message debug function
dm: i2c: Correct comment nits in dm_i2c_reg_read/write()
dm: i2c: Move definitions to the top of the header file
dm: i2c: Add a function to transfer messages
dm: i2c: Add support for multiplexed I2C buses
exynos: i2c: Correct bug in pinmux selection
i2c: Add a mux for GPIO-based I2C bus arbitration
exynos: i2c: Fix code style with ReadWriteByte()
exynos: i2c: Tidy up the driver model code
exynos: dts: Sync up I2C ports with the kernel
exynos: dts: Add PMIC and regulator definitions
exynos: dts: Support EC tunnel and main TPS65090 regulator
dm: cros_ec: Convert the I2C tunnel code to use driver model
cros_ec: Support the LDO access method used by spring
exynos: serial: Refactor init code for debug UART
exynos: Add debug UART support for Samsung S5P serial
exynos: Enable the debug UART in SPL
dm: gpio: Add support for setting a GPIO's pull direction
dm: exynos: gpio: Support pull-up/down in GPIOs
dm: power: Add a new driver for the TPS65090 PMIC
dm: power: Add support for TPS65090 FETs
dm: power: Add support for the S5M8767 PMIC
dm: power: Add support for S5M8767 regulators
dm: pmic: max77686: Correct a few nits
dm: pmic: Correct the pmic_reg_write() implementation
dm: power: max77686: Correct BUCK register access
dm: pmic: max77686: Support all BUCK regulators
dm: power: Don't return an error when regulators are not autoset
dm: pmic: Display the regulator limits on error
dm: video: Add support for video bridges
dm: video: Add support for the Parade PS8622/625 bridge
dm: video: Add support for the NXP PTN3460 bridge
exynos: spi: Convert the timeout to debug()
exynos: Correct return value in exynos_mmc_init()
exynos: Add support for the DisplayPort hotplug detect
exynos: video: Correct debug output
exynos: Tidy up CPU frequency display
dm: gpio: Check a GPIO is valid before using it
dts: exynos: snow: Add memory layout description
dts: exynos: pit: Add a new node for the parade video bridge driver
dts: exynos: snow: Add a new node for the NXP video bridge driver
exynos: dts: Drop the old TPS65090 I2C node
exynos: Add common board code for exynos5 boards that use device tree
exynos: Enable new features for exynos5 boards
exynos: Remove unneeded device tree control #ifdefs
exynos: config: Move common options to the common headers and tidy up
exynos: Drop old exynos5420-specific board code
exynos: Drop old exynos5250-specific board code
power: Remove old TPS65090 drivers
cros_ec: Remove the old tunnel code
video: Remove the old parade driver
dts: Drop unused compatible ID for the NXP video bridge
exynos: video: Remove non-device-tree code
exynos: Add support for spring

 arch/arm/cpu/armv7/exynos/Kconfig                |   6 +
 arch/arm/cpu/armv7/exynos/lowlevel_init.c        |   5 +
 arch/arm/cpu/armv7/exynos/pinmux.c               |  10 +
 arch/arm/cpu/armv7/s5p-common/cpu_info.c         |   7 +-
 arch/arm/dts/Makefile                            |   1 +
 arch/arm/dts/exynos5.dtsi                        |  34 +-
 arch/arm/dts/exynos5250-arndale.dts              |  16 +-
 arch/arm/dts/exynos5250-smdk5250.dts             | 171 ++++++-
 arch/arm/dts/exynos5250-snow.dts                 | 371 ++++++++++++--
 arch/arm/dts/exynos5250-spring.dts               | 588 +++++++++++++++++++++++
 arch/arm/dts/exynos5250.dtsi                     |  24 +-
 arch/arm/dts/exynos5420-peach-pit.dts            | 260 ++++++++--
 arch/arm/dts/exynos5420-smdk5420.dts             |   4 +-
 arch/arm/dts/exynos54xx.dtsi                     |  36 +-
 arch/arm/dts/exynos5800-peach-pi.dts             | 131 +++--
 arch/arm/include/asm/arch-exynos/dp_info.h       |   2 -
 arch/arm/include/asm/arch-exynos/periph.h        |   1 +
 board/samsung/common/Makefile                    |   1 +
 board/samsung/common/board.c                     |  17 +-
 board/samsung/common/exynos5-dt.c                | 362 ++++++++++++++
 board/samsung/smdk5250/Kconfig                   |  13 +
 board/samsung/smdk5250/MAINTAINERS               |   6 +
 board/samsung/smdk5250/Makefile                  |   4 -
 board/samsung/smdk5250/exynos5-dt.c              | 306 ------------
 board/samsung/smdk5420/Makefile                  |   4 -
 board/samsung/smdk5420/smdk5420.c                | 143 ------
 common/cmd_regulator.c                           |   3 +-
 configs/arndale_defconfig                        |   2 +
 configs/odroid-xu3_defconfig                     |   5 +
 configs/peach-pi_defconfig                       |  19 +
 configs/peach-pit_defconfig                      |  19 +
 configs/smdk5250_defconfig                       |  10 +
 configs/smdk5420_defconfig                       |   5 +
 configs/snow_defconfig                           |  23 +
 configs/spring_defconfig                         |  38 ++
 doc/device-tree-bindings/i2c/i2c-mux.txt         |  60 +++
 doc/device-tree-bindings/video/bridge/ps8622.txt |  33 ++
 drivers/core/uclass.c                            |  42 ++
 drivers/gpio/gpio-uclass.c                       |  37 +-
 drivers/gpio/s5p_gpio.c                          |  15 +
 drivers/i2c/Kconfig                              |  26 +
 drivers/i2c/Makefile                             |   4 +
 drivers/i2c/cros_ec_ldo.c                        |  77 +++
 drivers/i2c/cros_ec_tunnel.c                     |  41 ++
 drivers/i2c/i2c-uclass.c                         |  27 ++
 drivers/i2c/muxes/Kconfig                        |  17 +
 drivers/i2c/muxes/Makefile                       |   7 +
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c       | 147 ++++++
 drivers/i2c/muxes/i2c-mux-uclass.c               | 198 ++++++++
 drivers/i2c/s3c24x0_i2c.c                        | 155 ++++--
 drivers/misc/cros_ec.c                           | 288 ++---------
 drivers/mmc/s5p_sdhci.c                          |   2 +-
 drivers/power/pmic/Kconfig                       |  18 +
 drivers/power/pmic/Makefile                      |   5 +-
 drivers/power/pmic/max77686.c                    |   6 +-
 drivers/power/pmic/pmic-uclass.c                 |   2 +-
 drivers/power/pmic/pmic_tps65090.c               | 310 ------------
 drivers/power/pmic/pmic_tps65090_ec.c            | 218 ---------
 drivers/power/pmic/s5m8767.c                     |  95 ++++
 drivers/power/pmic/tps65090.c                    |  94 ++++
 drivers/power/regulator/Kconfig                  |  19 +
 drivers/power/regulator/Makefile                 |   2 +
 drivers/power/regulator/max77686.c               |  20 +-
 drivers/power/regulator/regulator-uclass.c       |   4 +-
 drivers/power/regulator/s5m8767.c                | 269 +++++++++++
 drivers/power/regulator/tps65090_regulator.c     | 138 ++++++
 drivers/serial/Kconfig                           |   7 +
 drivers/serial/serial_s5p.c                      |  63 ++-
 drivers/spi/exynos_spi.c                         |   6 +-
 drivers/video/Kconfig                            |   2 +
 drivers/video/Makefile                           |   3 +-
 drivers/video/bridge/Kconfig                     |  27 ++
 drivers/video/bridge/Makefile                    |   9 +
 drivers/video/bridge/ps862x.c                    | 134 ++++++
 drivers/video/bridge/ptn3460.c                   |  38 ++
 drivers/video/bridge/video-bridge-uclass.c       | 111 +++++
 drivers/video/exynos_dp.c                        |  24 +-
 drivers/video/exynos_dp_lowlevel.c               |   2 +-
 drivers/video/parade.c                           | 231 ---------
 include/asm-generic/gpio.h                       |  46 ++
 include/configs/arndale.h                        |  18 +-
 include/configs/exynos5-common.h                 |  13 +-
 include/configs/exynos5-dt-common.h              |  22 +-
 include/configs/exynos5250-common.h              |  16 +-
 include/configs/exynos5420-common.h              |   9 +-
 include/configs/odroid_xu3.h                     |   2 +
 include/configs/peach-pi.h                       |  15 +-
 include/configs/peach-pit.h                      |  25 +-
 include/configs/smdk5250.h                       |  17 +-
 include/configs/smdk5420.h                       |  11 +-
 include/configs/snow.h                           |  16 +-
 include/configs/spring.h                         |  20 +
 include/cros_ec.h                                |  16 +-
 include/dm/uclass-id.h                           |   2 +
 include/dm/uclass.h                              |  17 +
 include/fdtdec.h                                 |   3 -
 include/i2c.h                                    | 143 ++++--
 include/parade.h                                 |  18 -
 include/power/s5m8767.h                          |  85 ++++
 include/power/tps65090.h                         |  56 +++
 include/power/tps65090_pmic.h                    |  73 ---
 include/video_bridge.h                           |  92 ++++
 lib/fdtdec.c                                     |   3 -
 103 files changed, 4411 insertions(+), 2007 deletions(-)
 create mode 100644 arch/arm/dts/exynos5250-spring.dts
 create mode 100644 board/samsung/common/exynos5-dt.c
 delete mode 100644 board/samsung/smdk5250/exynos5-dt.c
 delete mode 100644 board/samsung/smdk5420/smdk5420.c
 create mode 100644 configs/spring_defconfig
 create mode 100644 doc/device-tree-bindings/i2c/i2c-mux.txt
 create mode 100644 doc/device-tree-bindings/video/bridge/ps8622.txt
 create mode 100644 drivers/i2c/cros_ec_ldo.c
 create mode 100644 drivers/i2c/cros_ec_tunnel.c
 create mode 100644 drivers/i2c/muxes/Kconfig
 create mode 100644 drivers/i2c/muxes/Makefile
 create mode 100644 drivers/i2c/muxes/i2c-arb-gpio-challenge.c
 create mode 100644 drivers/i2c/muxes/i2c-mux-uclass.c
 delete mode 100644 drivers/power/pmic/pmic_tps65090.c
 delete mode 100644 drivers/power/pmic/pmic_tps65090_ec.c
 create mode 100644 drivers/power/pmic/s5m8767.c
 create mode 100644 drivers/power/pmic/tps65090.c
 create mode 100644 drivers/power/regulator/s5m8767.c
 create mode 100644 drivers/power/regulator/tps65090_regulator.c
 create mode 100644 drivers/video/bridge/Kconfig
 create mode 100644 drivers/video/bridge/Makefile
 create mode 100644 drivers/video/bridge/ps862x.c
 create mode 100644 drivers/video/bridge/ptn3460.c
 create mode 100644 drivers/video/bridge/video-bridge-uclass.c
 delete mode 100644 drivers/video/parade.c
 create mode 100644 include/configs/spring.h
 delete mode 100644 include/parade.h
 create mode 100644 include/power/s5m8767.h
 create mode 100644 include/power/tps65090.h
 delete mode 100644 include/power/tps65090_pmic.h
 create mode 100644 include/video_bridge.h
Signature · 1 line
2.4.3.573.g4eafbef
#1 lore raw

PATCH 1/55 dm: core: Support finding a device by phandle

It is common for one node to reference another via a phandle. Add support for obtaining an attached device by this method. As an example, a node may have a 'power-supply' property which references a regulator, allowing the driver to turn on its power.

---

 drivers/core/uclass.c | 42 ++++++++++++++++++++++++++++++++++++++++++
 include/dm/uclass.h   | 17 +++++++++++++++++
 2 files changed, 59 insertions(+)
drivers/core/uclass.c +42 -0
index 7de8173..89532db 100644
@@ -271,6 +271,37 @@ static int uclass_find_device_by_of_offset(enum uclass_id id, int node,
 	return -ENODEV;
 }
 
+static int uclass_find_device_by_phandle(enum uclass_id id,
+					 struct udevice *parent,
+					 const char *name,
+					 struct udevice **devp)
+{
+	struct udevice *dev;
+	struct uclass *uc;
+	int find_phandle;
+	int ret;
+
+	*devp = NULL;
+	find_phandle = fdtdec_get_int(gd->fdt_blob, parent->of_offset, name,
+				      -1);
+	if (find_phandle <= 0)
+		return -ENOENT;
+	ret = uclass_get(id, &uc);
+	if (ret)
+		return ret;
+
+	list_for_each_entry(dev, &uc->dev_head, uclass_node) {
+		uint phandle = fdt_get_phandle(gd->fdt_blob, dev->of_offset);
+
+		if (phandle == find_phandle) {
+			*devp = dev;
+			return 0;
+		}
+	}
+
+	return -ENODEV;
+}
+
 int uclass_get_device_tail(struct udevice *dev, int ret,
 				  struct udevice **devp)
 {
@@ -336,6 +367,17 @@ int uclass_get_device_by_of_offset(enum uclass_id id, int node,
 	return uclass_get_device_tail(dev, ret, devp);
 }
 
+int uclass_get_device_by_phandle(enum uclass_id id, struct udevice *parent,
+				 const char *name, struct udevice **devp)
+{
+	struct udevice *dev;
+	int ret;
+
+	*devp = NULL;
+	ret = uclass_find_device_by_phandle(id, parent, name, &dev);
+	return uclass_get_device_tail(dev, ret, devp);
+}
+
 int uclass_first_device(enum uclass_id id, struct udevice **devp)
 {
 	struct udevice *dev;
include/dm/uclass.h +17 -0
index 4cfc0df..3fe1739 100644
@@ -177,6 +177,23 @@ int uclass_get_device_by_of_offset(enum uclass_id id, int node,
 				   struct udevice **devp);
 
 /**
+ * uclass_get_device_by_phandle() - Get a uclass device by phandle
+ *
+ * This searches the devices in the uclass for one with the given phandle.
+ *
+ * The device is probed to activate it ready for use.
+ *
+ * @id: uclass ID to look up
+ * @parent: Parent device containing the phandle pointer
+ * @name: Name of property in the parent device node
+ * @devp: Returns pointer to device (there is only one for each node)
+ * @return 0 if OK, -ENOENT if there is no @name present in the node, other
+ *	-ve on error
+ */
+int uclass_get_device_by_phandle(enum uclass_id id, struct udevice *parent,
+				 const char *name, struct udevice **devp);
+
+/**
  * uclass_first_device() - Get the first device in a uclass
  *
  * The device returned is probed if necessary, and ready for use
Signature · 1 line
2.4.3.573.g4eafbef
#2 lore raw

PATCH 1/55 dm: core: Support finding a device by phandle

Quoted 11 lines · Simon Glass

It is common for one node to reference another via a phandle. Add support for obtaining an attached device by this method. As an example, a node may have a 'power-supply' property which references a regulator, allowing the driver to turn on its power.

---

 drivers/core/uclass.c | 42 ++++++++++++++++++++++++++++++++++++++++++
 include/dm/uclass.h   | 17 +++++++++++++++++
 2 files changed, 59 insertions(+)

Applied to u-boot-dm.

#3 lore raw

PATCH 2/55 dm: i2c: Add a message debug function

In reply to Simon Glass

Add a way to dump the contents of an I2C message for debugging purposes.

---

 drivers/i2c/i2c-uclass.c | 16 ++++++++++++++++
 include/i2c.h            | 10 ++++++++++
 2 files changed, 26 insertions(+)
drivers/i2c/i2c-uclass.c +16 -0
index eaba965..42d6e89 100644
@@ -18,6 +18,22 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define I2C_MAX_OFFSET_LEN	4
 
+/* Useful debugging function */
+void i2c_dump_msgs(struct i2c_msg *msg, int nmsgs)
+{
+	int i;
+
+	for (i = 0; i < nmsgs; i++) {
+		struct i2c_msg *m = &msg[i];
+
+		printf("   %s %x len=%x", m->flags & I2C_M_RD ? "R" : "W",
+		       msg->addr, msg->len);
+		if (!(m->flags & I2C_M_RD))
+			printf(": %x", m->buf[0]);
+		printf("\n");
+	}
+}
+
 /**
  * i2c_setup_offset() - Set up a new message with a chip offset
  *
include/i2c.h +10 -0
index 9300d97..a5498a3 100644
@@ -473,6 +473,16 @@ int i2c_get_chip_for_busnum(int busnum, int chip_addr, uint offset_len,
 int i2c_chip_ofdata_to_platdata(const void *blob, int node,
 				struct dm_i2c_chip *chip);
 
+/**
+ * i2c_dump_msgs() - Dump a list of I2C messages
+ *
+ * This may be useful for debugging.
+ *
+ * @msg:	Message list to dump
+ * @nmsgs:	Number of messages
+ */
+void i2c_dump_msgs(struct i2c_msg *msg, int nmsgs);
+
 #ifndef CONFIG_DM_I2C
 
 /*
Signature · 1 line
2.4.3.573.g4eafbef
#4 lore raw

PATCH 2/55 dm: i2c: Add a message debug function

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 8 lines

Add a way to dump the contents of an I2C message for debugging purposes.

---

  drivers/i2c/i2c-uclass.c | 16 ++++++++++++++++
  include/i2c.h            | 10 ++++++++++
  2 files changed, 26 insertions(+)

bye,
Heiko

Quoted 50 lines
drivers/i2c/i2c-uclass.c +16 -0
index eaba965..42d6e89 100644
@@ -18,6 +18,22 @@ DECLARE_GLOBAL_DATA_PTR;
 
  #define I2C_MAX_OFFSET_LEN	4
 
+/* Useful debugging function */
+void i2c_dump_msgs(struct i2c_msg *msg, int nmsgs)
+{
+	int i;
+
+	for (i = 0; i < nmsgs; i++) {
+		struct i2c_msg *m = &msg[i];
+
+		printf("   %s %x len=%x", m->flags & I2C_M_RD ? "R" : "W",
+		       msg->addr, msg->len);
+		if (!(m->flags & I2C_M_RD))
+			printf(": %x", m->buf[0]);
+		printf("\n");
+	}
+}
+
  /**
   * i2c_setup_offset() - Set up a new message with a chip offset
   *
include/i2c.h +10 -0
index 9300d97..a5498a3 100644
@@ -473,6 +473,16 @@ int i2c_get_chip_for_busnum(int busnum, int chip_addr, uint offset_len,
  int i2c_chip_ofdata_to_platdata(const void *blob, int node,
  				struct dm_i2c_chip *chip);
 
+/**
+ * i2c_dump_msgs() - Dump a list of I2C messages
+ *
+ * This may be useful for debugging.
+ *
+ * @msg:	Message list to dump
+ * @nmsgs:	Number of messages
+ */
+void i2c_dump_msgs(struct i2c_msg *msg, int nmsgs);
+
  #ifndef CONFIG_DM_I2C
 
  /*
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#5 lore raw

PATCH 2/55 dm: i2c: Add a message debug function

Quoted 9 lines · Heiko Schocher denx

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 6 lines

Add a way to dump the contents of an I2C message for debugging purposes.

---

Quoted 7 lines
Quoted 3 lines
  drivers/i2c/i2c-uclass.c | 16 ++++++++++++++++
  include/i2c.h            | 10 ++++++++++
  2 files changed, 26 insertions(+)

Applied to u-boot-dm.

#6 lore raw

PATCH 3/55 dm: i2c: Correct comment nits in dm_i2c_reg_read/write()

In reply to Simon Glass

Add documentation for the @dev parameter.

---

 include/i2c.h | 2 ++
 1 file changed, 2 insertions(+)
include/i2c.h +2 -0
index a5498a3..e1ad8d8 100644
@@ -129,6 +129,7 @@ int dm_i2c_probe(struct udevice *bus, uint chip_addr, uint chip_flags,
  *
  * This reads a single value from the given address in an I2C chip
  *
+ * @dev:	Device to use for transfer
  * @addr:	Address to read from
  * @return value read, or -ve on error
  */
@@ -139,6 +140,7 @@ int dm_i2c_reg_read(struct udevice *dev, uint offset);
  *
  * This writes a single value to the given address in an I2C chip
  *
+ * @dev:	Device to use for transfer
  * @addr:	Address to write to
  * @val:	Value to write (normally a byte)
  * @return 0 on success, -ve on error
Signature · 1 line
2.4.3.573.g4eafbef
#7 lore raw

PATCH 3/55 dm: i2c: Correct comment nits in dm_i2c_reg_read/write()

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 7 lines

Add documentation for the @dev parameter.

---

  include/i2c.h | 2 ++
  1 file changed, 2 insertions(+)

bye,
Heiko

Quoted 22 lines
include/i2c.h +2 -0
index a5498a3..e1ad8d8 100644
@@ -129,6 +129,7 @@ int dm_i2c_probe(struct udevice *bus, uint chip_addr, uint chip_flags,
   *
   * This reads a single value from the given address in an I2C chip
   *
+ * @dev:	Device to use for transfer
   * @addr:	Address to read from
   * @return value read, or -ve on error
   */
@@ -139,6 +140,7 @@ int dm_i2c_reg_read(struct udevice *dev, uint offset);
   *
   * This writes a single value to the given address in an I2C chip
   *
+ * @dev:	Device to use for transfer
   * @addr:	Address to write to
   * @val:	Value to write (normally a byte)
   * @return 0 on success, -ve on error
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#8 lore raw

PATCH 3/55 dm: i2c: Correct comment nits in dm_i2c_reg_read/write()

Quoted 6 lines · Heiko Schocher denx

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 3 lines

Add documentation for the @dev parameter.

Quoted 8 lines
Quoted 5 lines

---

  include/i2c.h | 2 ++
  1 file changed, 2 insertions(+)

Applied to u-boot-dm.

#9 lore raw

PATCH 4/55 dm: i2c: Move definitions to the top of the header file

In reply to Simon Glass

Move the flags and struct definitions higher in the file so that we can reference them with functions declared in the driver model section.

---

 include/i2c.h | 86 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 43 insertions(+), 43 deletions(-)
include/i2c.h +43 -43
index e1ad8d8..4c0e263 100644
@@ -74,6 +74,49 @@ struct dm_i2c_bus {
 	int speed_hz;
 };
 
+/*
+ * Not all of these flags are implemented in the U-Boot API
+ */
+enum dm_i2c_msg_flags {
+	I2C_M_TEN		= 0x0010, /* ten-bit chip address */
+	I2C_M_RD		= 0x0001, /* read data, from slave to master */
+	I2C_M_STOP		= 0x8000, /* send stop after this message */
+	I2C_M_NOSTART		= 0x4000, /* no start before this message */
+	I2C_M_REV_DIR_ADDR	= 0x2000, /* invert polarity of R/W bit */
+	I2C_M_IGNORE_NAK	= 0x1000, /* continue after NAK */
+	I2C_M_NO_RD_ACK		= 0x0800, /* skip the Ack bit on reads */
+	I2C_M_RECV_LEN		= 0x0400, /* length is first received byte */
+};
+
+/**
+ * struct i2c_msg - an I2C message
+ *
+ * @addr:	Slave address
+ * @flags:	Flags (see enum dm_i2c_msg_flags)
+ * @len:	Length of buffer in bytes, may be 0 for a probe
+ * @buf:	Buffer to send/receive, or NULL if no data
+ */
+struct i2c_msg {
+	uint addr;
+	uint flags;
+	uint len;
+	u8 *buf;
+};
+
+/**
+ * struct i2c_msg_list - a list of I2C messages
+ *
+ * This is called i2c_rdwr_ioctl_data in Linux but the name does not seem
+ * appropriate in U-Boot.
+ *
+ * @msg:	Pointer to i2c_msg array
+ * @nmsgs:	Number of elements in the array
+ */
+struct i2c_msg_list {
+	struct i2c_msg *msgs;
+	uint nmsgs;
+};
+
 /**
  * dm_i2c_read() - read bytes from an I2C chip
  *
@@ -294,49 +337,6 @@ void i2c_reg_write(uint8_t addr, uint8_t reg, uint8_t val);
 
 #endif
 
-/*
- * Not all of these flags are implemented in the U-Boot API
- */
-enum dm_i2c_msg_flags {
-	I2C_M_TEN		= 0x0010, /* ten-bit chip address */
-	I2C_M_RD		= 0x0001, /* read data, from slave to master */
-	I2C_M_STOP		= 0x8000, /* send stop after this message */
-	I2C_M_NOSTART		= 0x4000, /* no start before this message */
-	I2C_M_REV_DIR_ADDR	= 0x2000, /* invert polarity of R/W bit */
-	I2C_M_IGNORE_NAK	= 0x1000, /* continue after NAK */
-	I2C_M_NO_RD_ACK		= 0x0800, /* skip the Ack bit on reads */
-	I2C_M_RECV_LEN		= 0x0400, /* length is first received byte */
-};
-
-/**
- * struct i2c_msg - an I2C message
- *
- * @addr:	Slave address
- * @flags:	Flags (see enum dm_i2c_msg_flags)
- * @len:	Length of buffer in bytes, may be 0 for a probe
- * @buf:	Buffer to send/receive, or NULL if no data
- */
-struct i2c_msg {
-	uint addr;
-	uint flags;
-	uint len;
-	u8 *buf;
-};
-
-/**
- * struct i2c_msg_list - a list of I2C messages
- *
- * This is called i2c_rdwr_ioctl_data in Linux but the name does not seem
- * appropriate in U-Boot.
- *
- * @msg:	Pointer to i2c_msg array
- * @nmsgs:	Number of elements in the array
- */
-struct i2c_msg_list {
-	struct i2c_msg *msgs;
-	uint nmsgs;
-};
-
 /**
  * struct dm_i2c_ops - driver operations for I2C uclass
  *
Signature · 1 line
2.4.3.573.g4eafbef
#10 lore raw

PATCH 4/55 dm: i2c: Move definitions to the top of the header file

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 8 lines

Move the flags and struct definitions higher in the file so that we can reference them with functions declared in the driver model section.

---

  include/i2c.h | 86 +++++++++++++++++++++++++++++------------------------------
  1 file changed, 43 insertions(+), 43 deletions(-)

bye,
Heiko

Quoted 106 lines
include/i2c.h +43 -43
index e1ad8d8..4c0e263 100644
@@ -74,6 +74,49 @@ struct dm_i2c_bus {
  	int speed_hz;
  };
 
+/*
+ * Not all of these flags are implemented in the U-Boot API
+ */
+enum dm_i2c_msg_flags {
+	I2C_M_TEN		= 0x0010, /* ten-bit chip address */
+	I2C_M_RD		= 0x0001, /* read data, from slave to master */
+	I2C_M_STOP		= 0x8000, /* send stop after this message */
+	I2C_M_NOSTART		= 0x4000, /* no start before this message */
+	I2C_M_REV_DIR_ADDR	= 0x2000, /* invert polarity of R/W bit */
+	I2C_M_IGNORE_NAK	= 0x1000, /* continue after NAK */
+	I2C_M_NO_RD_ACK		= 0x0800, /* skip the Ack bit on reads */
+	I2C_M_RECV_LEN		= 0x0400, /* length is first received byte */
+};
+
+/**
+ * struct i2c_msg - an I2C message
+ *
+ * @addr:	Slave address
+ * @flags:	Flags (see enum dm_i2c_msg_flags)
+ * @len:	Length of buffer in bytes, may be 0 for a probe
+ * @buf:	Buffer to send/receive, or NULL if no data
+ */
+struct i2c_msg {
+	uint addr;
+	uint flags;
+	uint len;
+	u8 *buf;
+};
+
+/**
+ * struct i2c_msg_list - a list of I2C messages
+ *
+ * This is called i2c_rdwr_ioctl_data in Linux but the name does not seem
+ * appropriate in U-Boot.
+ *
+ * @msg:	Pointer to i2c_msg array
+ * @nmsgs:	Number of elements in the array
+ */
+struct i2c_msg_list {
+	struct i2c_msg *msgs;
+	uint nmsgs;
+};
+
  /**
   * dm_i2c_read() - read bytes from an I2C chip
   *
@@ -294,49 +337,6 @@ void i2c_reg_write(uint8_t addr, uint8_t reg, uint8_t val);
 
  #endif
 
-/*
- * Not all of these flags are implemented in the U-Boot API
- */
-enum dm_i2c_msg_flags {
-	I2C_M_TEN		= 0x0010, /* ten-bit chip address */
-	I2C_M_RD		= 0x0001, /* read data, from slave to master */
-	I2C_M_STOP		= 0x8000, /* send stop after this message */
-	I2C_M_NOSTART		= 0x4000, /* no start before this message */
-	I2C_M_REV_DIR_ADDR	= 0x2000, /* invert polarity of R/W bit */
-	I2C_M_IGNORE_NAK	= 0x1000, /* continue after NAK */
-	I2C_M_NO_RD_ACK		= 0x0800, /* skip the Ack bit on reads */
-	I2C_M_RECV_LEN		= 0x0400, /* length is first received byte */
-};
-
-/**
- * struct i2c_msg - an I2C message
- *
- * @addr:	Slave address
- * @flags:	Flags (see enum dm_i2c_msg_flags)
- * @len:	Length of buffer in bytes, may be 0 for a probe
- * @buf:	Buffer to send/receive, or NULL if no data
- */
-struct i2c_msg {
-	uint addr;
-	uint flags;
-	uint len;
-	u8 *buf;
-};
-
-/**
- * struct i2c_msg_list - a list of I2C messages
- *
- * This is called i2c_rdwr_ioctl_data in Linux but the name does not seem
- * appropriate in U-Boot.
- *
- * @msg:	Pointer to i2c_msg array
- * @nmsgs:	Number of elements in the array
- */
-struct i2c_msg_list {
-	struct i2c_msg *msgs;
-	uint nmsgs;
-};
-
  /**
   * struct dm_i2c_ops - driver operations for I2C uclass
   *
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#11 lore raw

PATCH 4/55 dm: i2c: Move definitions to the top of the header file

Quoted 10 lines · Heiko Schocher denx

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 7 lines

Move the flags and struct definitions higher in the file so that we can reference them with functions declared in the driver model section.

---

Quoted 8 lines
Quoted 3 lines
  include/i2c.h | 86
+++++++++++++++++++++++++++++------------------------------
  1 file changed, 43 insertions(+), 43 deletions(-)

Applied to u-boot-dm.

#12 lore raw

PATCH 5/55 dm: i2c: Add a function to transfer messages

In reply to Simon Glass

Sometimes it is useful to be able to transfer a raw I2C message. This happens when the chip address needs to be set manually, or when the data to be sent/received is in another buffer.

Add a function to provide access to this.

---

 drivers/i2c/i2c-uclass.c | 11 +++++++++++
 include/i2c.h            | 13 +++++++++++++
 2 files changed, 24 insertions(+)
drivers/i2c/i2c-uclass.c +11 -0
index 42d6e89..50b99ea 100644
@@ -202,6 +202,17 @@ int dm_i2c_write(struct udevice *dev, uint offset, const uint8_t *buffer,
 	}
 }
 
+int dm_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, int nmsgs)
+{
+	struct udevice *bus = dev_get_parent(dev);
+	struct dm_i2c_ops *ops = i2c_get_ops(bus);
+
+	if (!ops->xfer)
+		return -ENOSYS;
+
+	return ops->xfer(bus, msg, nmsgs);
+}
+
 int dm_i2c_reg_read(struct udevice *dev, uint offset)
 {
 	uint8_t val;
include/i2c.h +13 -0
index 4c0e263..d191829 100644
@@ -191,6 +191,19 @@ int dm_i2c_reg_read(struct udevice *dev, uint offset);
 int dm_i2c_reg_write(struct udevice *dev, uint offset, unsigned int val);
 
 /**
+ * dm_i2c_xfer() - Transfer messages over I2C
+ *
+ * This transfers a raw message. It is best to use dm_i2c_reg_read/write()
+ * instead.
+ *
+ * @dev:	Device to use for transfer
+ * @msg:	List of messages to transfer
+ * @nmsgs:	Number of messages to transfer
+ * @return 0 on success, -ve on error
+ */
+int dm_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, int nmsgs);
+
+/**
  * dm_i2c_set_bus_speed() - set the speed of a bus
  *
  * @bus:	Bus to adjust
Signature · 1 line
2.4.3.573.g4eafbef
#13 lore raw

PATCH 5/55 dm: i2c: Add a function to transfer messages

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 4 lines

Sometimes it is useful to be able to transfer a raw I2C message. This happens when the chip address needs to be set manually, or when the data to be sent/received is in another buffer.

Quoted 8 lines

Add a function to provide access to this.

---

  drivers/i2c/i2c-uclass.c | 11 +++++++++++
  include/i2c.h            | 13 +++++++++++++
  2 files changed, 24 insertions(+)

bye,
Heiko

Quoted 48 lines
drivers/i2c/i2c-uclass.c +11 -0
index 42d6e89..50b99ea 100644
@@ -202,6 +202,17 @@ int dm_i2c_write(struct udevice *dev, uint offset, const uint8_t *buffer,
  	}
  }
 
+int dm_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, int nmsgs)
+{
+	struct udevice *bus = dev_get_parent(dev);
+	struct dm_i2c_ops *ops = i2c_get_ops(bus);
+
+	if (!ops->xfer)
+		return -ENOSYS;
+
+	return ops->xfer(bus, msg, nmsgs);
+}
+
  int dm_i2c_reg_read(struct udevice *dev, uint offset)
  {
  	uint8_t val;
include/i2c.h +13 -0
index 4c0e263..d191829 100644
@@ -191,6 +191,19 @@ int dm_i2c_reg_read(struct udevice *dev, uint offset);
  int dm_i2c_reg_write(struct udevice *dev, uint offset, unsigned int val);
 
  /**
+ * dm_i2c_xfer() - Transfer messages over I2C
+ *
+ * This transfers a raw message. It is best to use dm_i2c_reg_read/write()
+ * instead.
+ *
+ * @dev:	Device to use for transfer
+ * @msg:	List of messages to transfer
+ * @nmsgs:	Number of messages to transfer
+ * @return 0 on success, -ve on error
+ */
+int dm_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, int nmsgs);
+
+/**
   * dm_i2c_set_bus_speed() - set the speed of a bus
   *
   * @bus:	Bus to adjust
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#14 lore raw

PATCH 5/55 dm: i2c: Add a function to transfer messages

Quoted 19 lines · Heiko Schocher denx

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 6 lines

Sometimes it is useful to be able to transfer a raw I2C message. This happens when the chip address needs to be set manually, or when the data to
be sent/received is in another buffer.

Quoted 8 lines

Add a function to provide access to this.

---

  drivers/i2c/i2c-uclass.c | 11 +++++++++++
  include/i2c.h            | 13 +++++++++++++
  2 files changed, 24 insertions(+)
Quoted 4 lines

bye,
Heiko

Applied to u-boot-dm.

#15 lore raw

PATCH 6/55 dm: i2c: Add support for multiplexed I2C buses

In reply to Simon Glass

Add a new I2C_MUX uclass. Devices in this class can multiplex between several I2C buses, selecting them one at a time for use by the system. The multiplexing mechanism is left to the driver to decide - it may be controlled by GPIOs, for example.

The uclass supports only two methods: select() and deselect().

---

 doc/device-tree-bindings/i2c/i2c-mux.txt |  60 ++++++++++
 drivers/i2c/Kconfig                      |   2 +
 drivers/i2c/Makefile                     |   2 +
 drivers/i2c/muxes/Kconfig                |   8 ++
 drivers/i2c/muxes/Makefile               |   6 +
 drivers/i2c/muxes/i2c-mux-uclass.c       | 198 +++++++++++++++++++++++++++++++
 include/dm/uclass-id.h                   |   1 +
 include/i2c.h                            |  32 +++++
 8 files changed, 309 insertions(+)
 create mode 100644 doc/device-tree-bindings/i2c/i2c-mux.txt
 create mode 100644 drivers/i2c/muxes/Kconfig
 create mode 100644 drivers/i2c/muxes/Makefile
 create mode 100644 drivers/i2c/muxes/i2c-mux-uclass.c
doc/device-tree-bindings/i2c/i2c-mux.txt new file +60 -0
new file mode 100644
index 0000000..af84cce
@@ -0,0 +1,60 @@
+Common i2c bus multiplexer/switch properties.
+
+An i2c bus multiplexer/switch will have several child busses that are
+numbered uniquely in a device dependent manner.  The nodes for an i2c bus
+multiplexer/switch will have one child node for each child
+bus.
+
+Required properties:
+- #address-cells = <1>;
+- #size-cells = <0>;
+
+Required properties for child nodes:
+- #address-cells = <1>;
+- #size-cells = <0>;
+- reg : The sub-bus number.
+
+Optional properties for child nodes:
+- Other properties specific to the multiplexer/switch hardware.
+- Child nodes conforming to i2c bus binding
+
+
+Example :
+
+	/*
+	   An NXP pca9548 8 channel I2C multiplexer at address 0x70
+	   with two NXP pca8574 GPIO expanders attached, one each to
+	   ports 3 and 4.
+	 */
+
+	mux at 70 {
+		compatible = "nxp,pca9548";
+		reg = <0x70>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		i2c at 3 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <3>;
+
+			gpio1: gpio at 38 {
+				compatible = "nxp,pca8574";
+				reg = <0x38>;
+				#gpio-cells = <2>;
+				gpio-controller;
+			};
+		};
+		i2c at 4 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <4>;
+
+			gpio2: gpio at 38 {
+				compatible = "nxp,pca8574";
+				reg = <0x38>;
+				#gpio-cells = <2>;
+				gpio-controller;
+			};
+		};
+	};
drivers/i2c/Kconfig +2 -0
index 86fb36b..caee3d8 100644
@@ -73,3 +73,5 @@ config SYS_I2C_UNIPHIER_F
 	help
 	  Support for UniPhier FIFO-builtin I2C controller driver.
 	  This I2C controller is used on PH1-Pro4 or newer UniPhier SoCs.
+
+source "drivers/i2c/muxes/Kconfig"
drivers/i2c/Makefile +2 -0
index d9e912f..dc9e81b 100644
@@ -37,3 +37,5 @@ obj-$(CONFIG_SYS_I2C_TEGRA) += tegra_i2c.o
 obj-$(CONFIG_SYS_I2C_UNIPHIER) += i2c-uniphier.o
 obj-$(CONFIG_SYS_I2C_UNIPHIER_F) += i2c-uniphier-f.o
 obj-$(CONFIG_SYS_I2C_ZYNQ) += zynq_i2c.o
+
+obj-y += muxes/
drivers/i2c/muxes/Kconfig new file +8 -0
new file mode 100644
index 0000000..a05b32d
@@ -0,0 +1,8 @@
+config I2C_MUX
+	bool "Suport I2C multiplexers"
+	depends on DM_I2C
+	help
+	  This enables I2C buses to be multiplexed, so that you can select
+	  one of several buses using some sort of control mechanism. The
+	  bus select is handled automatically when that bus is accessed,
+	  using a suitable I2C MUX driver.
drivers/i2c/muxes/Makefile new file +6 -0
new file mode 100644
index 0000000..7583e3a
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2015 Google, Inc
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+obj-$(CONFIG_I2C_MUX) += i2c-mux-uclass.o
drivers/i2c/muxes/i2c-mux-uclass.c new file +198 -0

198 lines not on this page · raw message

include/dm/uclass-id.h +1 -0
index 72512b5..e2c3480 100644
@@ -35,6 +35,7 @@ enum uclass_id {
 	UCLASS_I2C,		/* I2C bus */
 	UCLASS_I2C_EEPROM,	/* I2C EEPROM device */
 	UCLASS_I2C_GENERIC,	/* Generic I2C device */
+	UCLASS_I2C_MUX,		/* I2C multiplexer */
 	UCLASS_LED,		/* Light-emitting diode (LED) */
 	UCLASS_LPC,		/* x86 'low pin count' interface */
 	UCLASS_MASS_STORAGE,	/* Mass storage device */
include/i2c.h +32 -0
index d191829..a59a19a 100644
@@ -445,6 +445,38 @@ struct dm_i2c_ops {
 #define i2c_get_ops(dev)	((struct dm_i2c_ops *)(dev)->driver->ops)
 
 /**
+ * struct i2c_mux_ops - operations for an I2C mux
+ */
+struct i2c_mux_ops {
+	/**
+	 * select() - select one of of I2C buses attached to a mux
+	 *
+	 * This will be called when there is no bus currently selected by the
+	 * mux. This method does not need to deselect the old bus.
+	 *
+	 * @mux:	Mux device
+	 * @bus:	I2C bus to select
+	 * @channel:	Channel number correponding to the bus to select
+	 * @return 0 if OK, -ve on error
+	 */
+	int (*select)(struct udevice *mux, struct udevice *bus, uint channel);
+
+	/**
+	 * deselect() - select one of of I2C buses attached to a mux
+	 *
+	 * This is used to deselect the currently selected I2C bus.
+	 *
+	 * @mux:	Mux device
+	 * @bus:	I2C bus to deselect
+	 * @channel:	Channel number correponding to the bus to deselect
+	 * @return 0 if OK, -ve on error
+	 */
+	int (*deselect)(struct udevice *mux, struct udevice *bus, uint channel);
+};
+
+#define i2c_mux_get_ops(dev)	((struct i2c_mux_ops *)(dev)->driver->ops)
+
+/**
  * i2c_get_chip() - get a device to use to access a chip on a bus
  *
  * This returns the device for the given chip address. The device can then
Signature · 1 line
2.4.3.573.g4eafbef
#16 lore raw

PATCH 6/55 dm: i2c: Add support for multiplexed I2C buses

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 24 lines

Add a new I2C_MUX uclass. Devices in this class can multiplex between several I2C buses, selecting them one at a time for use by the system. The multiplexing mechanism is left to the driver to decide - it may be controlled by GPIOs, for example.

The uclass supports only two methods: select() and deselect().

---

  doc/device-tree-bindings/i2c/i2c-mux.txt |  60 ++++++++++
  drivers/i2c/Kconfig                      |   2 +
  drivers/i2c/Makefile                     |   2 +
  drivers/i2c/muxes/Kconfig                |   8 ++
  drivers/i2c/muxes/Makefile               |   6 +
  drivers/i2c/muxes/i2c-mux-uclass.c       | 198 +++++++++++++++++++++++++++++++
  include/dm/uclass-id.h                   |   1 +
  include/i2c.h                            |  32 +++++
  8 files changed, 309 insertions(+)

create mode 100644 doc/device-tree-bindings/i2c/i2c-mux.txt create mode 100644 drivers/i2c/muxes/Kconfig create mode 100644 drivers/i2c/muxes/Makefile create mode 100644 drivers/i2c/muxes/i2c-mux-uclass.c

[...]

Quoted 6 lines
drivers/i2c/muxes/i2c-mux-uclass.c new file +0 -0
new file mode 100644
index 0000000..3f52bff
@@ -0,0 +1,198 @@

[...]

Quoted 9 lines
drivers/i2c/muxes/i2c-mux-uclass.c new file +9 -0
+static int i2c_mux_bus_xfer(struct udevice *dev, struct i2c_msg *msg,
+			    int nmsgs)
+{
+	struct udevice *mux = dev->parent;
+	struct i2c_mux *priv = dev_get_uclass_priv(mux);
+	struct dm_i2c_ops *ops = i2c_get_ops(priv->i2c_bus);
+	int ret, ret2;
+
+	debug("%s: %s, bus %s\n", __func__, dev->name, priv->i2c_bus->name);

drivers/i2c/muxes/i2c-mux-uclass.c line 175

Quoted 10 lines
drivers/i2c/muxes/i2c-mux-uclass.c new file +10 -0
+	if (!ops->xfer)
+		return -ENOSYS;
+	ret = i2c_mux_select(dev);
+	if (ret)
+		return ret;
+	ret = ops->xfer(priv->i2c_bus, msg, nmsgs);
+	ret2 = i2c_mux_deselect(dev);
+
+	return ret ? ret : ret2;
+}

So we have for each transaction a select() and deselect() call. Is it possible to store the last accessed "way", and only switch with deselect(), select() if this is really needed?

Beside of this "nitpick", it looks good, thanks for the great work!

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#17 lore raw

PATCH 6/55 dm: i2c: Add support for multiplexed I2C buses

Hi Heiko,

Quoted 67 lines · Heiko Schocher

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 26 lines

Add a new I2C_MUX uclass. Devices in this class can multiplex between several I2C buses, selecting them one at a time for use by the system. The multiplexing mechanism is left to the driver to decide - it may be controlled by GPIOs, for example.

The uclass supports only two methods: select() and deselect().

---

  doc/device-tree-bindings/i2c/i2c-mux.txt |  60 ++++++++++
  drivers/i2c/Kconfig                      |   2 +
  drivers/i2c/Makefile                     |   2 +
  drivers/i2c/muxes/Kconfig                |   8 ++
  drivers/i2c/muxes/Makefile               |   6 +
  drivers/i2c/muxes/i2c-mux-uclass.c       | 198
+++++++++++++++++++++++++++++++
  include/dm/uclass-id.h                   |   1 +
  include/i2c.h                            |  32 +++++
  8 files changed, 309 insertions(+)

create mode 100644 doc/device-tree-bindings/i2c/i2c-mux.txt create mode 100644 drivers/i2c/muxes/Kconfig create mode 100644 drivers/i2c/muxes/Makefile create mode 100644 drivers/i2c/muxes/i2c-mux-uclass.c

[...]

Quoted 8 lines
drivers/i2c/muxes/i2c-mux-uclass.c new file +0 -0
new file mode 100644
index 0000000..3f52bff
@@ -0,0 +1,198 @@

[...]

Quoted 11 lines
drivers/i2c/muxes/i2c-mux-uclass.c new file +9 -0
+static int i2c_mux_bus_xfer(struct udevice *dev, struct i2c_msg *msg,
+                           int nmsgs)
+{
+       struct udevice *mux = dev->parent;
+       struct i2c_mux *priv = dev_get_uclass_priv(mux);
+       struct dm_i2c_ops *ops = i2c_get_ops(priv->i2c_bus);
+       int ret, ret2;
+
+       debug("%s: %s, bus %s\n", __func__, dev->name,

priv->i2c_bus->name);

drivers/i2c/muxes/i2c-mux-uclass.c line 175

Quoted 10 lines
drivers/i2c/muxes/i2c-mux-uclass.c new file +10 -0
+       if (!ops->xfer)
+               return -ENOSYS;
+       ret = i2c_mux_select(dev);
+       if (ret)
+               return ret;
+       ret = ops->xfer(priv->i2c_bus, msg, nmsgs);
+       ret2 = i2c_mux_deselect(dev);
+
+       return ret ? ret : ret2;
+}

So we have for each transaction a select() and deselect() call. Is it possible to store the last accessed "way", and only switch with deselect(), select() if this is really needed?

Quoted 1 line

Beside of this "nitpick", it looks good, thanks for the great work!

I think it is best to have that state in the mux since it is the only thing that knows how to make things work.

The mux can record the current state and then avoid switching unless it is necessary. It can make deselect a nop if required.

Also for the GPIO arbitrator, we must deselect and re-select each time. This is the same API used by Linux and I think it is more flexible.

Regards,
Simon

#18 lore raw

PATCH 7/55 exynos: i2c: Correct bug in pinmux selection

In reply to Simon Glass

When driver model is not used the current code does not correctly select the pinmux for the I2C bus. This bug was introduced by this commit:

8dfcbaa dm: i2c: s3c24x0: adjust to dm-i2c api

---

 drivers/i2c/s3c24x0_i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/s3c24x0_i2c.c +1 -1
index c053e84..9a04e48 100644
@@ -1035,7 +1035,7 @@ static void process_nodes(const void *blob, int node_list[], int count,
 						CONFIG_SYS_I2C_S3C24X0_SPEED);
 		bus->node = node;
 		bus->bus_num = i;
-		exynos_pinmux_config(PERIPH_ID_I2C0 + bus->id, flags);
+		exynos_pinmux_config(bus->id, flags);
 
 		/* Mark position as used */
 		node_list[i] = -1;
Signature · 1 line
2.4.3.573.g4eafbef
#19 lore raw

PATCH 7/55 exynos: i2c: Correct bug in pinmux selection

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 10 lines

When driver model is not used the current code does not correctly select the pinmux for the I2C bus. This bug was introduced by this commit:

8dfcbaa dm: i2c: s3c24x0: adjust to dm-i2c api

---

  drivers/i2c/s3c24x0_i2c.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

As it is a bugfix, this should go in the current release ... right?

bye,
Heiko

Quoted 15 lines
drivers/i2c/s3c24x0_i2c.c +1 -1
index c053e84..9a04e48 100644
@@ -1035,7 +1035,7 @@ static void process_nodes(const void *blob, int node_list[], int count,
  						CONFIG_SYS_I2C_S3C24X0_SPEED);
  		bus->node = node;
  		bus->bus_num = i;
-		exynos_pinmux_config(PERIPH_ID_I2C0 + bus->id, flags);
+		exynos_pinmux_config(bus->id, flags);
 
  		/* Mark position as used */
  		node_list[i] = -1;
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#20 lore raw

PATCH 7/55 exynos: i2c: Correct bug in pinmux selection

Hi Minkyu, Przemyslaw,

Quoted 12 lines · Heiko Schocher

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 9 lines

When driver model is not used the current code does not correctly select the pinmux for the I2C bus. This bug was introduced by this commit:

8dfcbaa dm: i2c: s3c24x0: adjust to dm-i2c api

---

Quoted 7 lines
Quoted 2 lines
  drivers/i2c/s3c24x0_i2c.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

As it is a bugfix, this should go in the current release ... right?

Minkyu, are you able to pick this up please? If not I can do it.

Przemyslaw can you please review this fix?

Regards,
Simon

Quoted 25 lines

bye,
Heiko

Quoted 15 lines
drivers/i2c/s3c24x0_i2c.c +1 -1
index c053e84..9a04e48 100644
@@ -1035,7 +1035,7 @@ static void process_nodes(const void *blob, int
 node_list[], int count,
 
 CONFIG_SYS_I2C_S3C24X0_SPEED);
                bus->node = node;
                bus->bus_num = i;
-               exynos_pinmux_config(PERIPH_ID_I2C0 + bus->id, flags);
+               exynos_pinmux_config(bus->id, flags);
 
Quoted 3 lines
                /* Mark position as used */
                node_list[i] = -1;

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

#21 lore raw

PATCH 7/55 exynos: i2c: Correct bug in pinmux selection

Dear Simon,

Quoted 19 lines · Simon Glass

Hi Minkyu, Przemyslaw,

Quoted 16 lines · Heiko Schocher

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 11 lines

When driver model is not used the current code does not correctly select the pinmux for the I2C bus. This bug was introduced by this commit:

8dfcbaa dm: i2c: s3c24x0: adjust to dm-i2c api

---

  drivers/i2c/s3c24x0_i2c.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 6 lines
Quoted 3 lines

As it is a bugfix, this should go in the current release ... right?

Minkyu, are you able to pick this up please? If not I can do it.

Only this patch? or all of samsung related patches?

Thanks,
Minkyu Kang.

#22 lore raw

PATCH 7/55 exynos: i2c: Correct bug in pinmux selection

Hi Minkyu,

Quoted 22 lines · Minkyu Kang

Dear Simon,

Quoted 19 lines · Simon Glass

Hi Minkyu, Przemyslaw,

Quoted 16 lines · Heiko Schocher

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 11 lines

When driver model is not used the current code does not correctly select the pinmux for the I2C bus. This bug was introduced by this commit:

8dfcbaa dm: i2c: s3c24x0: adjust to dm-i2c api

---

  drivers/i2c/s3c24x0_i2c.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

As it is a bugfix, this should go in the current release ... right?

Minkyu, are you able to pick this up please? If not I can do it.

Only this patch? or all of samsung related patches?

Yes only this patch. It has been confirmed my Przemyslaw now too.

Regards,
Simon

#23 lore raw

PATCH 7/55 exynos: i2c: Correct bug in pinmux selection

Hi Simon,

Quoted 27 lines · Simon Glass

Hi Minkyu,

Quoted 24 lines · Minkyu Kang

Dear Simon,

Quoted 21 lines · Simon Glass

Hi Minkyu, Przemyslaw,

Quoted 18 lines · Heiko Schocher

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 11 lines

When driver model is not used the current code does not correctly select the pinmux for the I2C bus. This bug was introduced by this commit:

8dfcbaa dm: i2c: s3c24x0: adjust to dm-i2c api

---

  drivers/i2c/s3c24x0_i2c.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 9 lines
Quoted 6 lines
Quoted 4 lines
Quoted 1 line

As it is a bugfix, this should go in the current release ... right?

Minkyu, are you able to pick this up please? If not I can do it.

Only this patch? or all of samsung related patches?

Yes only this patch. It has been confirmed my Przemyslaw now too.

OK.
then, do you want to take other patches to your tree?

Thanks,
Minkyu Kang.

#24 lore raw

PATCH 7/55 exynos: i2c: Correct bug in pinmux selection

Hi Minkyu,

Quoted 35 lines · Minkyu Kang

Hi Simon,

Quoted 32 lines · Simon Glass

Hi Minkyu,

Quoted 29 lines · Minkyu Kang

Dear Simon,

Quoted 25 lines · Simon Glass

Hi Minkyu, Przemyslaw,

Quoted 12 lines · Heiko Schocher

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 9 lines

When driver model is not used the current code does not correctly select the pinmux for the I2C bus. This bug was introduced by this commit:

8dfcbaa dm: i2c: s3c24x0: adjust to dm-i2c api

---

Quoted 7 lines
Quoted 2 lines
  drivers/i2c/s3c24x0_i2c.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

As it is a bugfix, this should go in the current release ... right?

Minkyu, are you able to pick this up please? If not I can do it.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Only this patch? or all of samsung related patches?

Yes only this patch. It has been confirmed my Przemyslaw now too.

OK.
then, do you want to take other patches to your tree?

There are still dependencies on u-boot-dm, so I cannot yet. But if you like I can do that later, after I have merged some more driver model support patches.

Regards,
Simon

#25 lore raw

PATCH 7/55 exynos: i2c: Correct bug in pinmux selection

Hello,

Quoted 46 lines · Simon Glass

Hi Minkyu,

Quoted 35 lines · Minkyu Kang

Hi Simon,

Quoted 32 lines · Simon Glass

Hi Minkyu,

Quoted 29 lines · Minkyu Kang

Dear Simon,

Quoted 25 lines · Simon Glass

Hi Minkyu, Przemyslaw,

Quoted 12 lines · Heiko Schocher

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 9 lines

When driver model is not used the current code does not correctly select the pinmux for the I2C bus. This bug was introduced by this commit:

8dfcbaa dm: i2c: s3c24x0: adjust to dm-i2c api

---

Quoted 7 lines
Quoted 2 lines
   drivers/i2c/s3c24x0_i2c.c | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)

As it is a bugfix, this should go in the current release ... right?

Minkyu, are you able to pick this up please? If not I can do it.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Only this patch? or all of samsung related patches?

Yes only this patch. It has been confirmed my Przemyslaw now too.

OK.
then, do you want to take other patches to your tree?

Quoted 7 lines

There are still dependencies on u-boot-dm, so I cannot yet. But if you like I can do that later, after I have merged some more driver model support patches.

Regards,
Simon

Simon, please wait a moment with merge the patchset. I will send a few comments today.

Regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#26 lore raw

PATCH 7/55 exynos: i2c: Correct bug in pinmux selection

In reply to Simon Glass
Quoted 46 lines · Simon Glass

Hi Minkyu,

Quoted 35 lines · Minkyu Kang

Hi Simon,

Quoted 32 lines · Simon Glass

Hi Minkyu,

Quoted 29 lines · Minkyu Kang

Dear Simon,

Quoted 25 lines · Simon Glass

Hi Minkyu, Przemyslaw,

Quoted 12 lines · Heiko Schocher

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 9 lines

When driver model is not used the current code does not correctly select the pinmux for the I2C bus. This bug was introduced by this commit:

8dfcbaa dm: i2c: s3c24x0: adjust to dm-i2c api

---

Quoted 7 lines
Quoted 2 lines
  drivers/i2c/s3c24x0_i2c.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

As it is a bugfix, this should go in the current release ... right?

Minkyu, are you able to pick this up please? If not I can do it.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Only this patch? or all of samsung related patches?

Yes only this patch. It has been confirmed my Przemyslaw now too.

OK.
then, do you want to take other patches to your tree?

Quoted 7 lines

There are still dependencies on u-boot-dm, so I cannot yet. But if you like I can do that later, after I have merged some more driver model support patches.

Regards,
Simon

applied to u-boot-samsung.

Thanks,
Minkyu Kang

#27 lore raw

PATCH 7/55 exynos: i2c: Correct bug in pinmux selection

In reply to Simon Glass

Hello Simon,

Quoted 4 lines · Simon Glass

When driver model is not used the current code does not correctly select the pinmux for the I2C bus. This bug was introduced by this commit:

8dfcbaa dm: i2c: s3c24x0: adjust to dm-i2c api

Ah that's right, thanks for fixing!

Quoted 13 lines

---

  drivers/i2c/s3c24x0_i2c.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/s3c24x0_i2c.c +0 -0
index c053e84..9a04e48 100644

drivers/i2c/s3c24x0_i2c.c static void process_nodes(const void *blob, int node_list[], int count, · line 1041

Quoted 8 lines
drivers/i2c/s3c24x0_i2c.c +1 -1
@@ -1035,7 +1035,7 @@ static void process_nodes(const void *blob, int node_list[], int count,
  						CONFIG_SYS_I2C_S3C24X0_SPEED);
  		bus->node = node;
  		bus->bus_num = i;
-		exynos_pinmux_config(PERIPH_ID_I2C0 + bus->id, flags);
+		exynos_pinmux_config(bus->id, flags);
 
  		/* Mark position as used */
  		node_list[i] = -1;

Best regards,

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#28 lore raw

PATCH 8/55 i2c: Add a mux for GPIO-based I2C bus arbitration

In reply to Simon Glass

While I2C supports multi-master buses this is difficult to get right. This driver provides a scheme based on two 'claim' GPIOs, one driven by the AP and one driver by the EC. With these they can communicate and reliably share the bus. This scheme has minimal overhead and involves very little code. It is used on snow to permit the EC and the AP to share access to the main system PMIC and battery. The scheme can survive reboots by either side without difficulty.

---

 drivers/i2c/muxes/Kconfig                  |   9 ++
 drivers/i2c/muxes/Makefile                 |   1 +
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 147 +++++++++++++++++++++++++++++
 3 files changed, 157 insertions(+)
 create mode 100644 drivers/i2c/muxes/i2c-arb-gpio-challenge.c
drivers/i2c/muxes/Kconfig +9 -0
index a05b32d..bd3e078 100644
@@ -6,3 +6,12 @@ config I2C_MUX
 	  one of several buses using some sort of control mechanism. The
 	  bus select is handled automatically when that bus is accessed,
 	  using a suitable I2C MUX driver.
+
+config I2C_ARB_GPIO_CHALLENGE
+        bool "GPIO-based I2C arbitration"
+        depends on I2C_MUX
+        help
+          If you say yes to this option, support will be included for an
+          I2C multimaster arbitration scheme using GPIOs and a challenge &
+          response mechanism where masters have to claim the bus by asserting
+          a GPIO.
drivers/i2c/muxes/Makefile +1 -0
index 7583e3a..612cc27 100644
@@ -3,4 +3,5 @@
 #
 # SPDX-License-Identifier:	GPL-2.0+
 #
+obj-$(CONFIG_I2C_ARB_GPIO_CHALLENGE) += i2c-arb-gpio-challenge.o
 obj-$(CONFIG_I2C_MUX) += i2c-mux-uclass.o
drivers/i2c/muxes/i2c-arb-gpio-challenge.c new file +147 -0

147 lines not on this page · raw message

Signature · 1 line
2.4.3.573.g4eafbef
#29 lore raw

PATCH 8/55 i2c: Add a mux for GPIO-based I2C bus arbitration

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 1 line

While I2C supports multi-master buses this is difficult to get right. This

What do you mean here? Where are the problems? You have an i2c mux, or?

Quoted 2 lines

driver provides a scheme based on two 'claim' GPIOs, one driven by the AP and one driver by the EC. With these they can communicate and reliably

What is AP and EC ?

Quoted 11 lines

share the bus. This scheme has minimal overhead and involves very little code. It is used on snow to permit the EC and the AP to share access to the main system PMIC and battery. The scheme can survive reboots by either side without difficulty.

---

  drivers/i2c/muxes/Kconfig                  |   9 ++
  drivers/i2c/muxes/Makefile                 |   1 +
  drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 147 +++++++++++++++++++++++++++++

Nice!

Could you add a readme, which explains this a little bit more?

Quoted 132 lines
  3 files changed, 157 insertions(+)

create mode 100644 drivers/i2c/muxes/i2c-arb-gpio-challenge.c

drivers/i2c/muxes/Kconfig +9 -0
index a05b32d..bd3e078 100644
@@ -6,3 +6,12 @@ config I2C_MUX
  	  one of several buses using some sort of control mechanism. The
  	  bus select is handled automatically when that bus is accessed,
  	  using a suitable I2C MUX driver.
+
+config I2C_ARB_GPIO_CHALLENGE
+        bool "GPIO-based I2C arbitration"
+        depends on I2C_MUX
+        help
+          If you say yes to this option, support will be included for an
+          I2C multimaster arbitration scheme using GPIOs and a challenge &
+          response mechanism where masters have to claim the bus by asserting
+          a GPIO.
drivers/i2c/muxes/Makefile +1 -0
index 7583e3a..612cc27 100644
@@ -3,4 +3,5 @@
  #
  # SPDX-License-Identifier:	GPL-2.0+
  #
+obj-$(CONFIG_I2C_ARB_GPIO_CHALLENGE) += i2c-arb-gpio-challenge.o
  obj-$(CONFIG_I2C_MUX) += i2c-mux-uclass.o
drivers/i2c/muxes/i2c-arb-gpio-challenge.c new file +96 -0
new file mode 100644
index 0000000..3f072c7
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2015 Google, Inc
+ * Written by Simon Glass <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <i2c.h>
+#include <asm/gpio.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct i2c_arbitrator_priv {
+	struct gpio_desc ap_claim;
+	struct gpio_desc ec_claim;
+	uint slew_delay_us;
+	uint wait_retry_ms;
+	uint wait_free_ms;
+};
+
+int i2c_arbitrator_deselect(struct udevice *mux, struct udevice *bus,
+			    uint channel)
+{
+	struct i2c_arbitrator_priv *priv = dev_get_priv(mux);
+	int ret;
+
+	debug("%s: %s\n", __func__, mux->name);
+	ret = dm_gpio_set_value(&priv->ap_claim, 0);
+	udelay(priv->slew_delay_us);
+
+	return ret;
+}
+
+int i2c_arbitrator_select(struct udevice *mux, struct udevice *bus,
+			  uint channel)
+{
+	struct i2c_arbitrator_priv *priv = dev_get_priv(mux);
+	unsigned start;
+	int ret;
+
+	debug("%s: %s\n", __func__, mux->name);
+	/* Start a round of trying to claim the bus */
+	start = get_timer(0);
+	do {
+		unsigned start_retry;
+		int waiting = 0;
+
+		/* Indicate that we want to claim the bus */
+		ret = dm_gpio_set_value(&priv->ap_claim, 1);
+		if (ret)
+			goto err;
+		udelay(priv->slew_delay_us);
+
+		/* Wait for the EC to release it */
+		start_retry = get_timer(0);
+		while (get_timer(start_retry) < priv->wait_retry_ms) {
+			ret = dm_gpio_get_value(&priv->ec_claim);
+			if (ret < 0) {
+				goto err;
+			} else if (!ret) {
+				/* We got it, so return */
+				return 0;
+			}
+
+			if (!waiting)
+				waiting = 1;
+		}
+
+		/* It didn't release, so give up, wait, and try again */
+		ret = dm_gpio_set_value(&priv->ap_claim, 0);
+		if (ret)
+			goto err;
+
+		mdelay(priv->wait_retry_ms);
+	} while (get_timer(start) < priv->wait_free_ms);
+
+	/* Give up, release our claim */
+	printf("I2C: Could not claim bus, timeout %lu\n", get_timer(start));
+	ret = -ETIMEDOUT;
+	ret = 0;
+err:
+	return ret;
+}
+
+static int i2c_arbitrator_probe(struct udevice *dev)
+{
+	struct i2c_arbitrator_priv *priv = dev_get_priv(dev);
+	const void *blob = gd->fdt_blob;
+	int node = dev->of_offset;
+	int ret;
+
+	debug("%s: %s\n", __func__, dev->name);
+	priv->slew_delay_us = fdtdec_get_int(blob, node, "slew-delay-us", 0);

drivers/i2c/muxes/i2c-arb-gpio-challenge.c line 106

Quoted 10 lines
drivers/i2c/muxes/i2c-arb-gpio-challenge.c new file +10 -0
+	priv->wait_retry_ms = fdtdec_get_int(blob, node, "wait-retry-us", 0) /
+		1000;
+	priv->wait_free_ms = fdtdec_get_int(blob, node, "wait-free-us", 0) /
+		1000;
+	ret = gpio_request_by_name(dev, "our-claim-gpio", 0, &priv->ap_claim,
+				   GPIOD_IS_OUT);
+	if (ret)
+		goto err;
+	ret = gpio_request_by_name(dev, "their-claim-gpios", 0, &priv->ec_claim,
+				   GPIOD_IS_IN);

What is "our" and "their"?

bye,
Heiko

Quoted 42 lines
drivers/i2c/muxes/i2c-arb-gpio-challenge.c new file +41 -0
+	if (ret)
+		goto err_ec_gpio;
+
+	return 0;
+
+err_ec_gpio:
+	dm_gpio_free(dev, &priv->ap_claim);
+err:
+	debug("%s: ret=%d\n", __func__, ret);
+	return ret;
+}
+
+static int i2c_arbitrator_remove(struct udevice *dev)
+{
+	struct i2c_arbitrator_priv *priv = dev_get_priv(dev);
+
+	dm_gpio_free(dev, &priv->ap_claim);
+	dm_gpio_free(dev, &priv->ec_claim);
+
+	return 0;
+}
+
+static const struct i2c_mux_ops i2c_arbitrator_ops = {
+	.select		= i2c_arbitrator_select,
+	.deselect	= i2c_arbitrator_deselect,
+};
+
+static const struct udevice_id i2c_arbitrator_ids[] = {
+	{ .compatible = "i2c-arb-gpio-challenge" },
+	{ }
+};
+
+U_BOOT_DRIVER(i2c_arbitrator) = {
+	.name = "i2c_arbitrator",
+	.id = UCLASS_I2C_MUX,
+	.of_match = i2c_arbitrator_ids,
+	.probe = i2c_arbitrator_probe,
+	.remove = i2c_arbitrator_remove,
+	.ops = &i2c_arbitrator_ops,
+	.priv_auto_alloc_size = sizeof(struct i2c_arbitrator_priv),
+};
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#30 lore raw

PATCH 8/55 i2c: Add a mux for GPIO-based I2C bus arbitration

Hi Heiko,

Quoted 7 lines · Heiko Schocher

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 2 lines

While I2C supports multi-master buses this is difficult to get right. This

Quoted 7 lines

What do you mean here? Where are the problems? You have an i2c mux, or?

Quoted 2 lines

driver provides a scheme based on two 'claim' GPIOs, one driven by the AP and one driver by the EC. With these they can communicate and reliably

What is AP and EC ?

Application Processor, i.e. the main CPU (e.,g. Cortex-A15 SoC) Embedded controller (e.g. Cortex-M3 microcontroller)

I'll update the commit message.

Quoted 15 lines
Quoted 6 lines

share the bus. This scheme has minimal overhead and involves very little code. It is used on snow to permit the EC and the AP to share access to the main system PMIC and battery. The scheme can survive reboots by either side without difficulty.

Quoted 7 lines

---

  drivers/i2c/muxes/Kconfig                  |   9 ++
  drivers/i2c/muxes/Makefile                 |   1 +
  drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 147

+++++++++++++++++++++++++++++

Quoted 3 lines

Nice!

Could you add a readme, which explains this a little bit more?

Will do.

Quoted 148 lines
Quoted 148 lines

  3 files changed, 157 insertions(+)

create mode 100644 drivers/i2c/muxes/i2c-arb-gpio-challenge.c

drivers/i2c/muxes/Kconfig +7 -0
index a05b32d..bd3e078 100644
@@ -6,3 +6,12 @@ config I2C_MUX
          one of several buses using some sort of control mechanism. The
          bus select is handled automatically when that bus is accessed,
          using a suitable I2C MUX driver.
+
+config I2C_ARB_GPIO_CHALLENGE
+        bool "GPIO-based I2C arbitration"
+        depends on I2C_MUX
+        help
+          If you say yes to this option, support will be included for an
+          I2C multimaster arbitration scheme using GPIOs and a challenge

&
+ response mechanism where masters have to claim the bus by
asserting

drivers/i2c/muxes/Kconfig +1 -0
+          a GPIO.
drivers/i2c/muxes/Makefile +1 -0
index 7583e3a..612cc27 100644
@@ -3,4 +3,5 @@
  #
  # SPDX-License-Identifier:    GPL-2.0+
  #
+obj-$(CONFIG_I2C_ARB_GPIO_CHALLENGE) += i2c-arb-gpio-challenge.o
  obj-$(CONFIG_I2C_MUX) += i2c-mux-uclass.o
drivers/i2c/muxes/i2c-arb-gpio-challenge.c new file +81 -0
new file mode 100644
index 0000000..3f072c7
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2015 Google, Inc
+ * Written by Simon Glass <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <i2c.h>
+#include <asm/gpio.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct i2c_arbitrator_priv {
+       struct gpio_desc ap_claim;
+       struct gpio_desc ec_claim;
+       uint slew_delay_us;
+       uint wait_retry_ms;
+       uint wait_free_ms;
+};
+
+int i2c_arbitrator_deselect(struct udevice *mux, struct udevice *bus,
+                           uint channel)
+{
+       struct i2c_arbitrator_priv *priv = dev_get_priv(mux);
+       int ret;
+
+       debug("%s: %s\n", __func__, mux->name);
+       ret = dm_gpio_set_value(&priv->ap_claim, 0);
+       udelay(priv->slew_delay_us);
+
+       return ret;
+}
+
+int i2c_arbitrator_select(struct udevice *mux, struct udevice *bus,
+                         uint channel)
+{
+       struct i2c_arbitrator_priv *priv = dev_get_priv(mux);
+       unsigned start;
+       int ret;
+
+       debug("%s: %s\n", __func__, mux->name);
+       /* Start a round of trying to claim the bus */
+       start = get_timer(0);
+       do {
+               unsigned start_retry;
+               int waiting = 0;
+
+               /* Indicate that we want to claim the bus */
+               ret = dm_gpio_set_value(&priv->ap_claim, 1);
+               if (ret)
+                       goto err;
+               udelay(priv->slew_delay_us);
+
+               /* Wait for the EC to release it */
+               start_retry = get_timer(0);
+               while (get_timer(start_retry) < priv->wait_retry_ms) {
+                       ret = dm_gpio_get_value(&priv->ec_claim);
+                       if (ret < 0) {
+                               goto err;
+                       } else if (!ret) {
+                               /* We got it, so return */
+                               return 0;
+                       }
+
+                       if (!waiting)
+                               waiting = 1;
+               }
+
+               /* It didn't release, so give up, wait, and try again */
+               ret = dm_gpio_set_value(&priv->ap_claim, 0);
+               if (ret)
+                       goto err;
+
+               mdelay(priv->wait_retry_ms);
+       } while (get_timer(start) < priv->wait_free_ms);
+
+       /* Give up, release our claim */
+       printf("I2C: Could not claim bus, timeout %lu\n",

get_timer(start));

drivers/i2c/muxes/i2c-arb-gpio-challenge.c new file +15 -0
+       ret = -ETIMEDOUT;
+       ret = 0;
+err:
+       return ret;
+}
+
+static int i2c_arbitrator_probe(struct udevice *dev)
+{
+       struct i2c_arbitrator_priv *priv = dev_get_priv(dev);
+       const void *blob = gd->fdt_blob;
+       int node = dev->of_offset;
+       int ret;
+
+       debug("%s: %s\n", __func__, dev->name);
+       priv->slew_delay_us = fdtdec_get_int(blob, node, "slew-delay-us",

0);
+ priv->wait_retry_ms = fdtdec_get_int(blob, node, "wait-retry-us",
0) /

drivers/i2c/muxes/i2c-arb-gpio-challenge.c new file +2 -0
+               1000;
+       priv->wait_free_ms = fdtdec_get_int(blob, node, "wait-free-us", 0)

/

drivers/i2c/muxes/i2c-arb-gpio-challenge.c new file +2 -0
+               1000;
+       ret = gpio_request_by_name(dev, "our-claim-gpio", 0,

&priv->ap_claim,
+ GPIOD_IS_OUT);

Quoted 8 lines
Quoted 5 lines
drivers/i2c/muxes/i2c-arb-gpio-challenge.c new file +3 -0
+       if (ret)
+               goto err;
+       ret = gpio_request_by_name(dev, "their-claim-gpios", 0,

&priv->ec_claim,
+ GPIOD_IS_IN);

What is "our" and "their"?

'our' means the one 'we' use, i.e. the AP. This is the binding used by the kernel so I have kept it the same.

Quoted 38 lines

bye,
Heiko

Quoted 34 lines
drivers/i2c/muxes/i2c-arb-gpio-challenge.c new file +34 -0
+       if (ret)
+               goto err_ec_gpio;
+
+       return 0;
+
+err_ec_gpio:
+       dm_gpio_free(dev, &priv->ap_claim);
+err:
+       debug("%s: ret=%d\n", __func__, ret);
+       return ret;
+}
+
+static int i2c_arbitrator_remove(struct udevice *dev)
+{
+       struct i2c_arbitrator_priv *priv = dev_get_priv(dev);
+
+       dm_gpio_free(dev, &priv->ap_claim);
+       dm_gpio_free(dev, &priv->ec_claim);
+
+       return 0;
+}
+
+static const struct i2c_mux_ops i2c_arbitrator_ops = {
+       .select         = i2c_arbitrator_select,
+       .deselect       = i2c_arbitrator_deselect,
+};
+
+static const struct udevice_id i2c_arbitrator_ids[] = {
+       { .compatible = "i2c-arb-gpio-challenge" },
+       { }
+};
+
+U_BOOT_DRIVER(i2c_arbitrator) = {
+       .name = "i2c_arbitrator",
Quoted 8 lines

drivers/i2c/muxes/i2c-arb-gpio-challenge.c line 147

Quoted 8 lines
drivers/i2c/muxes/i2c-arb-gpio-challenge.c new file +7 -0
+       .id = UCLASS_I2C_MUX,
+       .of_match = i2c_arbitrator_ids,
+       .probe = i2c_arbitrator_probe,
+       .remove = i2c_arbitrator_remove,
+       .ops = &i2c_arbitrator_ops,
+       .priv_auto_alloc_size = sizeof(struct i2c_arbitrator_priv),
+};

Regards,
Simon

#31 lore raw

PATCH 9/55 exynos: i2c: Fix code style with ReadWriteByte()

In reply to Simon Glass

This function should not use mixed case, and it is simpler to use clrbits_le32() when clearing bits. Fix it.

---

 drivers/i2c/s3c24x0_i2c.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/i2c/s3c24x0_i2c.c +7 -7
index 9a04e48..4bbd012 100644
@@ -258,9 +258,9 @@ static int hsi2c_wait_for_trx(struct exynos5_hsi2c *i2c)
 	return I2C_NOK_TOUT;
 }
 
-static void ReadWriteByte(struct s3c24x0_i2c *i2c)
+static void read_write_byte(struct s3c24x0_i2c *i2c)
 {
-	writel(readl(&i2c->iiccon) & ~I2CCON_IRPND, &i2c->iiccon);
+	clrbits_le32(&i2c->iiccon, I2CCON_IRPND);
 }
 
 #ifdef CONFIG_SYS_I2C
@@ -794,7 +794,7 @@ static int i2c_transfer(struct s3c24x0_i2c *i2c,
 	if (addr && addr_len) {
 		while ((i < addr_len) && (result == I2C_OK)) {
 			writel(addr[i++], &i2c->iicds);
-			ReadWriteByte(i2c);
+			read_write_byte(i2c);
 			result = WaitForXfer(i2c);
 		}
 		i = 0;
@@ -806,7 +806,7 @@ static int i2c_transfer(struct s3c24x0_i2c *i2c,
 	case I2C_WRITE:
 		while ((i < data_len) && (result == I2C_OK)) {
 			writel(data[i++], &i2c->iicds);
-			ReadWriteByte(i2c);
+			read_write_byte(i2c);
 			result = WaitForXfer(i2c);
 		}
 		break;
@@ -822,7 +822,7 @@ static int i2c_transfer(struct s3c24x0_i2c *i2c,
 			/* Generate a re-START. */
 			writel(I2C_MODE_MR | I2C_TXRX_ENA | I2C_START_STOP,
 				&i2c->iicstat);
-			ReadWriteByte(i2c);
+			read_write_byte(i2c);
 			result = WaitForXfer(i2c);
 
 			if (result != I2C_OK)
@@ -835,7 +835,7 @@ static int i2c_transfer(struct s3c24x0_i2c *i2c,
 				writel(readl(&i2c->iiccon)
 				       & ~I2CCON_ACKGEN,
 				       &i2c->iiccon);
-			ReadWriteByte(i2c);
+			read_write_byte(i2c);
 			result = WaitForXfer(i2c);
 			data[i++] = readl(&i2c->iicds);
 		}
@@ -852,7 +852,7 @@ static int i2c_transfer(struct s3c24x0_i2c *i2c,
 bailout:
 	/* Send STOP. */
 	writel(I2C_MODE_MR | I2C_TXRX_ENA, &i2c->iicstat);
-	ReadWriteByte(i2c);
+	read_write_byte(i2c);
 
 	return result;
 }
Signature · 1 line
2.4.3.573.g4eafbef
#32 lore raw

PATCH 9/55 exynos: i2c: Fix code style with ReadWriteByte()

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 8 lines

This function should not use mixed case, and it is simpler to use clrbits_le32() when clearing bits. Fix it.

---

  drivers/i2c/s3c24x0_i2c.c | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)

bye,
Heiko

Quoted 63 lines
drivers/i2c/s3c24x0_i2c.c +7 -7
index 9a04e48..4bbd012 100644
@@ -258,9 +258,9 @@ static int hsi2c_wait_for_trx(struct exynos5_hsi2c *i2c)
  	return I2C_NOK_TOUT;
  }
 
-static void ReadWriteByte(struct s3c24x0_i2c *i2c)
+static void read_write_byte(struct s3c24x0_i2c *i2c)
  {
-	writel(readl(&i2c->iiccon) & ~I2CCON_IRPND, &i2c->iiccon);
+	clrbits_le32(&i2c->iiccon, I2CCON_IRPND);
  }
 
  #ifdef CONFIG_SYS_I2C
@@ -794,7 +794,7 @@ static int i2c_transfer(struct s3c24x0_i2c *i2c,
  	if (addr && addr_len) {
  		while ((i < addr_len) && (result == I2C_OK)) {
  			writel(addr[i++], &i2c->iicds);
-			ReadWriteByte(i2c);
+			read_write_byte(i2c);
  			result = WaitForXfer(i2c);
  		}
  		i = 0;
@@ -806,7 +806,7 @@ static int i2c_transfer(struct s3c24x0_i2c *i2c,
  	case I2C_WRITE:
  		while ((i < data_len) && (result == I2C_OK)) {
  			writel(data[i++], &i2c->iicds);
-			ReadWriteByte(i2c);
+			read_write_byte(i2c);
  			result = WaitForXfer(i2c);
  		}
  		break;
@@ -822,7 +822,7 @@ static int i2c_transfer(struct s3c24x0_i2c *i2c,
  			/* Generate a re-START. */
  			writel(I2C_MODE_MR | I2C_TXRX_ENA | I2C_START_STOP,
  				&i2c->iicstat);
-			ReadWriteByte(i2c);
+			read_write_byte(i2c);
  			result = WaitForXfer(i2c);
 
  			if (result != I2C_OK)
@@ -835,7 +835,7 @@ static int i2c_transfer(struct s3c24x0_i2c *i2c,
  				writel(readl(&i2c->iiccon)
  				       & ~I2CCON_ACKGEN,
  				       &i2c->iiccon);
-			ReadWriteByte(i2c);
+			read_write_byte(i2c);
  			result = WaitForXfer(i2c);
  			data[i++] = readl(&i2c->iicds);
  		}
@@ -852,7 +852,7 @@ static int i2c_transfer(struct s3c24x0_i2c *i2c,
  bailout:
  	/* Send STOP. */
  	writel(I2C_MODE_MR | I2C_TXRX_ENA, &i2c->iicstat);
-	ReadWriteByte(i2c);
+	read_write_byte(i2c);
 
  	return result;
  }
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#33 lore raw

PATCH 9/55 exynos: i2c: Fix code style with ReadWriteByte()

Quoted 7 lines · Heiko Schocher

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 4 lines

This function should not use mixed case, and it is simpler to use clrbits_le32() when clearing bits. Fix it.

Quoted 9 lines
Quoted 5 lines

---

  drivers/i2c/s3c24x0_i2c.c | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)

Applied to u-boot-dm.

#34 lore raw

PATCH 10/55 exynos: i2c: Tidy up the driver model code

In reply to Simon Glass

The existing driver model implementation uses the old non-driver-model code to operate, but has become impossibly tangled as a result. The actual algorithm is quite simple.

Also the normal-speed and high-speed buses are quite different and it doesn't seem that useful to put them in the same driver.

Finally, there is a bug which breaks communication with the Maxim sound codec and may cause problems with other device.

Rewrite the driver model code for normal-speed operation so that it is easier to understand, and fix the bug. Add a TODO to split the drivers.

---

 drivers/i2c/s3c24x0_i2c.c | 139 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 103 insertions(+), 36 deletions(-)
drivers/i2c/s3c24x0_i2c.c +103 -36
index 4bbd012..c11a6be 100644
@@ -1284,62 +1284,106 @@ U_BOOT_I2C_ADAP_COMPLETE(s3c0, s3c24x0_i2c_init, s3c24x0_i2c_probe,
 #endif /* CONFIG_SYS_I2C */
 
 #ifdef CONFIG_DM_I2C
-static int i2c_write_data(struct s3c24x0_i2c_bus *i2c_bus, uchar chip,
-			  uchar *buffer, int len, bool end_with_repeated_start)
+static int exynos_hs_i2c_xfer(struct udevice *dev, struct i2c_msg *msg,
+			      int nmsgs)
 {
+	struct s3c24x0_i2c_bus *i2c_bus = dev_get_priv(dev);
+	struct exynos5_hsi2c *hsregs = i2c_bus->hsregs;
 	int ret;
 
-	if (i2c_bus->is_highspeed) {
-		ret = hsi2c_write(i2c_bus->hsregs, chip, 0, 0,
-				  buffer, len, true);
-		if (ret)
+	for (; nmsgs > 0; nmsgs--, msg++) {
+		if (msg->flags & I2C_M_RD) {
+			ret = hsi2c_read(hsregs, msg->addr, 0, 0, msg->buf,
+					 msg->len);
+		} else {
+			ret = hsi2c_write(hsregs, msg->addr, 0, 0, msg->buf,
+					  msg->len, true);
+		}
+		if (ret) {
 			exynos5_i2c_reset(i2c_bus);
-	} else {
-		ret = i2c_transfer(i2c_bus->regs, I2C_WRITE,
-				   chip << 1, 0, 0, buffer, len);
+			return -EREMOTEIO;
+		}
 	}
 
-	return ret != I2C_OK;
+	return 0;
 }
 
-static int i2c_read_data(struct s3c24x0_i2c_bus  *i2c_bus, uchar chip,
-			 uchar *buffer, int len)
+static int s3c24x0_do_msg(struct s3c24x0_i2c_bus *i2c_bus, struct i2c_msg *msg,
+			  int seq)
 {
-	int ret;
+	struct s3c24x0_i2c *i2c = i2c_bus->regs;
+	bool is_read = msg->flags & I2C_M_RD;
+	uint status;
+	uint addr;
+	int ret, i;
 
-	if (i2c_bus->is_highspeed) {
-		ret = hsi2c_read(i2c_bus->hsregs, chip, 0, 0, buffer, len);
-		if (ret)
-			exynos5_i2c_reset(i2c_bus);
+	if (!seq)
+		setbits_le32(&i2c->iiccon, I2CCON_ACKGEN);
+
+	/* Get the slave chip address going */
+	addr = msg->addr << 1;
+	writel(addr, &i2c->iicds);
+	status = I2C_TXRX_ENA | I2C_START_STOP;
+	if (is_read)
+		status |= I2C_MODE_MR;
+	else
+		status |= I2C_MODE_MT;
+	writel(status, &i2c->iicstat);
+	if (seq)
+		read_write_byte(i2c);
+
+	/* Wait for chip address to transmit */
+	ret = WaitForXfer(i2c);
+	if (ret)
+		goto err;
+
+	if (is_read) {
+		for (i = 0; !ret && i < msg->len; i++) {
+			/* disable ACK for final READ */
+			if (i == msg->len - 1)
+				clrbits_le32(&i2c->iiccon, I2CCON_ACKGEN);
+			read_write_byte(i2c);
+			ret = WaitForXfer(i2c);
+			msg->buf[i] = readl(&i2c->iicds);
+		}
+		if (ret == I2C_NACK)
+			ret = I2C_OK; /* Normal terminated read */
 	} else {
-		ret = i2c_transfer(i2c_bus->regs, I2C_READ,
-				   chip << 1, 0, 0, buffer, len);
+		for (i = 0; !ret && i < msg->len; i++) {
+			writel(msg->buf[i], &i2c->iicds);
+			read_write_byte(i2c);
+			ret = WaitForXfer(i2c);
+		}
 	}
 
-	return ret != I2C_OK;
+err:
+	return ret;
 }
 
 static int s3c24x0_i2c_xfer(struct udevice *dev, struct i2c_msg *msg,
 			    int nmsgs)
 {
 	struct s3c24x0_i2c_bus *i2c_bus = dev_get_priv(dev);
-	int ret;
+	struct s3c24x0_i2c *i2c = i2c_bus->regs;
+	ulong start_time;
+	int ret, i;
 
-	for (; nmsgs > 0; nmsgs--, msg++) {
-		bool next_is_read = nmsgs > 1 && (msg[1].flags & I2C_M_RD);
-
-		if (msg->flags & I2C_M_RD) {
-			ret = i2c_read_data(i2c_bus, msg->addr, msg->buf,
-					    msg->len);
-		} else {
-			ret = i2c_write_data(i2c_bus, msg->addr, msg->buf,
-					     msg->len, next_is_read);
+	start_time = get_timer(0);
+	while (readl(&i2c->iicstat) & I2CSTAT_BSY) {
+		if (get_timer(start_time) > I2C_TIMEOUT_MS) {
+			debug("Timeout\n");
+			return -ETIMEDOUT;
 		}
-		if (ret)
-			return -EREMOTEIO;
 	}
 
-	return 0;
+	for (ret = 0, i = 0; !ret && i < nmsgs; i++)
+		ret = s3c24x0_do_msg(i2c_bus, &msg[i], i);
+
+	/* Send STOP */
+	writel(I2C_MODE_MR | I2C_TXRX_ENA, &i2c->iicstat);
+	read_write_byte(i2c);
+
+	return ret ? -EREMOTEIO : 0;
 }
 
 static int s3c_i2c_ofdata_to_platdata(struct udevice *dev)
@@ -1364,8 +1408,7 @@ static int s3c_i2c_ofdata_to_platdata(struct udevice *dev)
 	i2c_bus->id = pinmux_decode_periph_id(blob, node);
 
 	i2c_bus->clock_frequency = fdtdec_get_int(blob, node,
-						"clock-frequency",
-						CONFIG_SYS_I2C_S3C24X0_SPEED);
+						  "clock-frequency", 100000);
 	i2c_bus->node = node;
 	i2c_bus->bus_num = dev->seq;
 
@@ -1384,7 +1427,6 @@ static const struct dm_i2c_ops s3c_i2c_ops = {
 
 static const struct udevice_id s3c_i2c_ids[] = {
 	{ .compatible = "samsung,s3c2440-i2c", .data = EXYNOS_I2C_STD },
-	{ .compatible = "samsung,exynos5-hsi2c", .data = EXYNOS_I2C_HS },
 	{ }
 };
 
@@ -1397,4 +1439,29 @@ U_BOOT_DRIVER(i2c_s3c) = {
 	.priv_auto_alloc_size = sizeof(struct s3c24x0_i2c_bus),
 	.ops	= &s3c_i2c_ops,
 };
+
+/*
+ * TODO(sjg at chromium.org): Move this to a separate file when everything uses
+ * driver model
+ */
+static const struct dm_i2c_ops exynos_hs_i2c_ops = {
+	.xfer		= exynos_hs_i2c_xfer,
+	.probe_chip	= s3c24x0_i2c_probe,
+	.set_bus_speed	= s3c24x0_i2c_set_bus_speed,
+};
+
+static const struct udevice_id exynos_hs_i2c_ids[] = {
+	{ .compatible = "samsung,exynos5-hsi2c", .data = EXYNOS_I2C_HS },
+	{ }
+};
+
+U_BOOT_DRIVER(hs_i2c) = {
+	.name	= "i2c_s3c_hs",
+	.id	= UCLASS_I2C,
+	.of_match = exynos_hs_i2c_ids,
+	.ofdata_to_platdata = s3c_i2c_ofdata_to_platdata,
+	.per_child_auto_alloc_size = sizeof(struct dm_i2c_chip),
+	.priv_auto_alloc_size = sizeof(struct s3c24x0_i2c_bus),
+	.ops	= &exynos_hs_i2c_ops,
+};
 #endif /* CONFIG_DM_I2C */
Signature · 1 line
2.4.3.573.g4eafbef
#35 lore raw

PATCH 10/55 exynos: i2c: Tidy up the driver model code

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 10 lines

The existing driver model implementation uses the old non-driver-model code to operate, but has become impossibly tangled as a result. The actual algorithm is quite simple.

Also the normal-speed and high-speed buses are quite different and it doesn't seem that useful to put them in the same driver.

Finally, there is a bug which breaks communication with the Maxim sound codec and may cause problems with other device.

Quoted 8 lines

Rewrite the driver model code for normal-speed operation so that it is easier to understand, and fix the bug. Add a TODO to split the drivers.

---

  drivers/i2c/s3c24x0_i2c.c | 139 ++++++++++++++++++++++++++++++++++------------
  1 file changed, 103 insertions(+), 36 deletions(-)

bye,
Heiko

Quoted 194 lines
drivers/i2c/s3c24x0_i2c.c +103 -36
index 4bbd012..c11a6be 100644
@@ -1284,62 +1284,106 @@ U_BOOT_I2C_ADAP_COMPLETE(s3c0, s3c24x0_i2c_init, s3c24x0_i2c_probe,
  #endif /* CONFIG_SYS_I2C */
 
  #ifdef CONFIG_DM_I2C
-static int i2c_write_data(struct s3c24x0_i2c_bus *i2c_bus, uchar chip,
-			  uchar *buffer, int len, bool end_with_repeated_start)
+static int exynos_hs_i2c_xfer(struct udevice *dev, struct i2c_msg *msg,
+			      int nmsgs)
  {
+	struct s3c24x0_i2c_bus *i2c_bus = dev_get_priv(dev);
+	struct exynos5_hsi2c *hsregs = i2c_bus->hsregs;
  	int ret;
 
-	if (i2c_bus->is_highspeed) {
-		ret = hsi2c_write(i2c_bus->hsregs, chip, 0, 0,
-				  buffer, len, true);
-		if (ret)
+	for (; nmsgs > 0; nmsgs--, msg++) {
+		if (msg->flags & I2C_M_RD) {
+			ret = hsi2c_read(hsregs, msg->addr, 0, 0, msg->buf,
+					 msg->len);
+		} else {
+			ret = hsi2c_write(hsregs, msg->addr, 0, 0, msg->buf,
+					  msg->len, true);
+		}
+		if (ret) {
  			exynos5_i2c_reset(i2c_bus);
-	} else {
-		ret = i2c_transfer(i2c_bus->regs, I2C_WRITE,
-				   chip << 1, 0, 0, buffer, len);
+			return -EREMOTEIO;
+		}
  	}
 
-	return ret != I2C_OK;
+	return 0;
  }
 
-static int i2c_read_data(struct s3c24x0_i2c_bus  *i2c_bus, uchar chip,
-			 uchar *buffer, int len)
+static int s3c24x0_do_msg(struct s3c24x0_i2c_bus *i2c_bus, struct i2c_msg *msg,
+			  int seq)
  {
-	int ret;
+	struct s3c24x0_i2c *i2c = i2c_bus->regs;
+	bool is_read = msg->flags & I2C_M_RD;
+	uint status;
+	uint addr;
+	int ret, i;
 
-	if (i2c_bus->is_highspeed) {
-		ret = hsi2c_read(i2c_bus->hsregs, chip, 0, 0, buffer, len);
-		if (ret)
-			exynos5_i2c_reset(i2c_bus);
+	if (!seq)
+		setbits_le32(&i2c->iiccon, I2CCON_ACKGEN);
+
+	/* Get the slave chip address going */
+	addr = msg->addr << 1;
+	writel(addr, &i2c->iicds);
+	status = I2C_TXRX_ENA | I2C_START_STOP;
+	if (is_read)
+		status |= I2C_MODE_MR;
+	else
+		status |= I2C_MODE_MT;
+	writel(status, &i2c->iicstat);
+	if (seq)
+		read_write_byte(i2c);
+
+	/* Wait for chip address to transmit */
+	ret = WaitForXfer(i2c);
+	if (ret)
+		goto err;
+
+	if (is_read) {
+		for (i = 0; !ret && i < msg->len; i++) {
+			/* disable ACK for final READ */
+			if (i == msg->len - 1)
+				clrbits_le32(&i2c->iiccon, I2CCON_ACKGEN);
+			read_write_byte(i2c);
+			ret = WaitForXfer(i2c);
+			msg->buf[i] = readl(&i2c->iicds);
+		}
+		if (ret == I2C_NACK)
+			ret = I2C_OK; /* Normal terminated read */
  	} else {
-		ret = i2c_transfer(i2c_bus->regs, I2C_READ,
-				   chip << 1, 0, 0, buffer, len);
+		for (i = 0; !ret && i < msg->len; i++) {
+			writel(msg->buf[i], &i2c->iicds);
+			read_write_byte(i2c);
+			ret = WaitForXfer(i2c);
+		}
  	}
 
-	return ret != I2C_OK;
+err:
+	return ret;
  }
 
  static int s3c24x0_i2c_xfer(struct udevice *dev, struct i2c_msg *msg,
  			    int nmsgs)
  {
  	struct s3c24x0_i2c_bus *i2c_bus = dev_get_priv(dev);
-	int ret;
+	struct s3c24x0_i2c *i2c = i2c_bus->regs;
+	ulong start_time;
+	int ret, i;
 
-	for (; nmsgs > 0; nmsgs--, msg++) {
-		bool next_is_read = nmsgs > 1 && (msg[1].flags & I2C_M_RD);
-
-		if (msg->flags & I2C_M_RD) {
-			ret = i2c_read_data(i2c_bus, msg->addr, msg->buf,
-					    msg->len);
-		} else {
-			ret = i2c_write_data(i2c_bus, msg->addr, msg->buf,
-					     msg->len, next_is_read);
+	start_time = get_timer(0);
+	while (readl(&i2c->iicstat) & I2CSTAT_BSY) {
+		if (get_timer(start_time) > I2C_TIMEOUT_MS) {
+			debug("Timeout\n");
+			return -ETIMEDOUT;
  		}
-		if (ret)
-			return -EREMOTEIO;
  	}
 
-	return 0;
+	for (ret = 0, i = 0; !ret && i < nmsgs; i++)
+		ret = s3c24x0_do_msg(i2c_bus, &msg[i], i);
+
+	/* Send STOP */
+	writel(I2C_MODE_MR | I2C_TXRX_ENA, &i2c->iicstat);
+	read_write_byte(i2c);
+
+	return ret ? -EREMOTEIO : 0;
  }
 
  static int s3c_i2c_ofdata_to_platdata(struct udevice *dev)
@@ -1364,8 +1408,7 @@ static int s3c_i2c_ofdata_to_platdata(struct udevice *dev)
  	i2c_bus->id = pinmux_decode_periph_id(blob, node);
 
  	i2c_bus->clock_frequency = fdtdec_get_int(blob, node,
-						"clock-frequency",
-						CONFIG_SYS_I2C_S3C24X0_SPEED);
+						  "clock-frequency", 100000);
  	i2c_bus->node = node;
  	i2c_bus->bus_num = dev->seq;
 
@@ -1384,7 +1427,6 @@ static const struct dm_i2c_ops s3c_i2c_ops = {
 
  static const struct udevice_id s3c_i2c_ids[] = {
  	{ .compatible = "samsung,s3c2440-i2c", .data = EXYNOS_I2C_STD },
-	{ .compatible = "samsung,exynos5-hsi2c", .data = EXYNOS_I2C_HS },
  	{ }
  };
 
@@ -1397,4 +1439,29 @@ U_BOOT_DRIVER(i2c_s3c) = {
  	.priv_auto_alloc_size = sizeof(struct s3c24x0_i2c_bus),
  	.ops	= &s3c_i2c_ops,
  };
+
+/*
+ * TODO(sjg at chromium.org): Move this to a separate file when everything uses
+ * driver model
+ */
+static const struct dm_i2c_ops exynos_hs_i2c_ops = {
+	.xfer		= exynos_hs_i2c_xfer,
+	.probe_chip	= s3c24x0_i2c_probe,
+	.set_bus_speed	= s3c24x0_i2c_set_bus_speed,
+};
+
+static const struct udevice_id exynos_hs_i2c_ids[] = {
+	{ .compatible = "samsung,exynos5-hsi2c", .data = EXYNOS_I2C_HS },
+	{ }
+};
+
+U_BOOT_DRIVER(hs_i2c) = {
+	.name	= "i2c_s3c_hs",
+	.id	= UCLASS_I2C,
+	.of_match = exynos_hs_i2c_ids,
+	.ofdata_to_platdata = s3c_i2c_ofdata_to_platdata,
+	.per_child_auto_alloc_size = sizeof(struct dm_i2c_chip),
+	.priv_auto_alloc_size = sizeof(struct s3c24x0_i2c_bus),
+	.ops	= &exynos_hs_i2c_ops,
+};
  #endif /* CONFIG_DM_I2C */
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#36 lore raw

PATCH 10/55 exynos: i2c: Tidy up the driver model code

Quoted 21 lines · Heiko Schocher

Hello Simon,

Am 03.07.2015 um 02:15 schrieb Simon Glass:

Quoted 18 lines

The existing driver model implementation uses the old non-driver-model code
to operate, but has become impossibly tangled as a result. The actual algorithm is quite simple.

Also the normal-speed and high-speed buses are quite different and it doesn't seem that useful to put them in the same driver.

Finally, there is a bug which breaks communication with the Maxim sound codec and may cause problems with other device.

Rewrite the driver model code for normal-speed operation so that it is easier to understand, and fix the bug. Add a TODO to split the drivers.

---

Quoted 6 lines
Quoted 3 lines
  drivers/i2c/s3c24x0_i2c.c | 139
++++++++++++++++++++++++++++++++++------------
  1 file changed, 103 insertions(+), 36 deletions(-)

Applied to u-boot-dm.

#37 lore raw

PATCH 11/55 exynos: dts: Sync up I2C ports with the kernel

In reply to Simon Glass

The kernel uses upper case for I2C unit addresses. Follow the same convention to reduce differences.

---

 arch/arm/dts/exynos5.dtsi             | 34 ++++++++++++++++-----------------
 arch/arm/dts/exynos5250-arndale.dts   | 16 ++++++++--------
 arch/arm/dts/exynos5250-smdk5250.dts  | 21 ++++++++++----------
 arch/arm/dts/exynos5250-snow.dts      | 32 +++++++++++++++++--------------
 arch/arm/dts/exynos5250.dtsi          | 24 +++++++++++------------
 arch/arm/dts/exynos5420-peach-pit.dts |  8 ++++----
 arch/arm/dts/exynos5420-smdk5420.dts  |  4 ++--
 arch/arm/dts/exynos54xx.dtsi          | 36 +++++++++++++++++------------------
 arch/arm/dts/exynos5800-peach-pi.dts  |  8 ++++----
 9 files changed, 94 insertions(+), 89 deletions(-)
arch/arm/dts/exynos5.dtsi +17 -17
index 238acb8..179584c 100644
@@ -72,39 +72,39 @@
 		interrupts = <1 9 0xf04>;
 	};
 
-	i2c at 12c60000 {
-		#address-cells = <1>;
-		#size-cells = <0>;
+	i2c_0: i2c at 12C60000 {
 		compatible = "samsung,s3c2440-i2c";
 		reg = <0x12C60000 0x100>;
 		interrupts = <0 56 0>;
-	};
-
-	i2c at 12c70000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
+	};
+
+	i2c_1: i2c at 12C70000 {
 		compatible = "samsung,s3c2440-i2c";
 		reg = <0x12C70000 0x100>;
 		interrupts = <0 57 0>;
-	};
-
-	i2c at 12c80000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
+	};
+
+	i2c_2: i2c at 12C80000 {
 		compatible = "samsung,s3c2440-i2c";
 		reg = <0x12C80000 0x100>;
 		interrupts = <0 58 0>;
-	};
-
-	i2c at 12c90000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
+	};
+
+	i2c_3: i2c at 12C90000 {
 		compatible = "samsung,s3c2440-i2c";
 		reg = <0x12C90000 0x100>;
 		interrupts = <0 59 0>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 
-	spi at 12d20000 {
+	spi_0: spi at 12d20000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "samsung,exynos-spi";
@@ -112,7 +112,7 @@
 		interrupts = <0 68 0>;
 	};
 
-	spi at 12d30000 {
+	spi_1: spi at 12d30000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "samsung,exynos-spi";
@@ -120,7 +120,7 @@
 		interrupts = <0 69 0>;
 	};
 
-	spi at 12d40000 {
+	spi_2: spi at 12d40000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "samsung,exynos-spi";
@@ -129,7 +129,7 @@
 		interrupts = <0 70 0>;
         };
 
-	spi at 131a0000 {
+	spi_3: spi at 131a0000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "samsung,exynos-spi";
@@ -137,7 +137,7 @@
 		interrupts = <0 129 0>;
 	};
 
-	spi at 131b0000 {
+	spi_4: spi at 131b0000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "samsung,exynos-spi";
arch/arm/dts/exynos5250-arndale.dts +8 -8
index 21c0a21..031c622 100644
@@ -15,14 +15,14 @@
 	compatible = "samsung,arndale", "samsung,exynos5250";
 
 	aliases {
-		i2c0 = "/i2c at 12c60000";
-		i2c1 = "/i2c at 12c70000";
-		i2c2 = "/i2c at 12c80000";
-		i2c3 = "/i2c at 12c90000";
-		i2c4 = "/i2c at 12ca0000";
-		i2c5 = "/i2c at 12cb0000";
-		i2c6 = "/i2c at 12cc0000";
-		i2c7 = "/i2c at 12cd0000";
+		i2c0 = "/i2c at 12C60000";
+		i2c1 = "/i2c at 12C70000";
+		i2c2 = "/i2c at 12C80000";
+		i2c3 = "/i2c at 12C90000";
+		i2c4 = "/i2c at 12CA0000";
+		i2c5 = "/i2c at 12CB0000";
+		i2c6 = "/i2c at 12CC0000";
+		i2c7 = "/i2c at 12CD0000";
 		serial0 = "/serial at 12C20000";
 		console = "/serial at 12C20000";
 	};
arch/arm/dts/exynos5250-smdk5250.dts +11 -10
index 3cebfc2..636fec9 100644
@@ -11,20 +11,21 @@
 
 /dts-v1/;
 #include "exynos5250.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
 	model = "SAMSUNG SMDK5250 board based on EXYNOS5250";
 	compatible = "samsung,smdk5250", "samsung,exynos5250";
 
 	aliases {
-		i2c0 = "/i2c at 12c60000";
-		i2c1 = "/i2c at 12c70000";
-		i2c2 = "/i2c at 12c80000";
-		i2c3 = "/i2c at 12c90000";
-		i2c4 = "/i2c at 12ca0000";
-		i2c5 = "/i2c at 12cb0000";
-		i2c6 = "/i2c at 12cc0000";
-		i2c7 = "/i2c at 12cd0000";
+		i2c0 = "/i2c at 12C60000";
+		i2c1 = "/i2c at 12C70000";
+		i2c2 = "/i2c at 12C80000";
+		i2c3 = "/i2c at 12C90000";
+		i2c4 = "/i2c at 12CA0000";
+		i2c5 = "/i2c at 12CB0000";
+		i2c6 = "/i2c at 12CC0000";
+		i2c7 = "/i2c at 12CD0000";
 		spi0 = "/spi at 12d20000";
 		spi1 = "/spi at 12d30000";
 		spi2 = "/spi at 12d40000";
@@ -58,14 +59,14 @@
 		status = "disabled";
 	};
 
-	i2c at 12c70000 {
+	i2c at 12C70000 {
 		soundcodec at 1a {
 			reg = <0x1a>;
 			compatible = "wolfson,wm8994-codec";
 		};
 	};
 
-	i2c at 12c60000 {
+	i2c at 12C60000 {
 		pmic at 9 {
 			reg = <0x9>;
 			compatible = "maxim,max77686";
arch/arm/dts/exynos5250-snow.dts +18 -14
index e4b3dc2..9abe0b7 100644
@@ -7,24 +7,27 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
-*/
+ */
 
 /dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/input/input.h>
 #include "exynos5250.dtsi"
 
 / {
 	model = "Google Snow";
-	compatible = "google,snow", "samsung,exynos5250";
+	compatible = "google,snow", "samsung,exynos5250", "samsung,exynos5";
 
 	aliases {
-		i2c0 = "/i2c at 12c60000";
-		i2c1 = "/i2c at 12c70000";
-		i2c2 = "/i2c at 12c80000";
-		i2c3 = "/i2c at 12c90000";
-		i2c4 = "/i2c at 12ca0000";
-		i2c5 = "/i2c at 12cb0000";
-		i2c6 = "/i2c at 12cc0000";
-		i2c7 = "/i2c at 12cd0000";
+		i2c0 = "/i2c at 12C60000";
+		i2c1 = "/i2c at 12C70000";
+		i2c2 = "/i2c at 12C80000";
+		i2c3 = "/i2c at 12C90000";
+		i2c4 = "/i2c at 12CA0000";
+		i2c5 = "/i2c at 12CB0000";
+		i2c6 = "/i2c at 12CC0000";
+		i2c7 = "/i2c at 12CD0000";
 		spi0 = "/spi at 12d20000";
 		spi1 = "/spi at 12d30000";
 		spi2 = "/spi at 12d40000";
@@ -39,7 +42,7 @@
 		i2s = "/sound at 3830000";
 	};
 
-	i2c4: i2c at 12ca0000 {
+	i2c4: i2c at 12CA0000 {
 		cros_ec: cros-ec at 1e {
 			reg = <0x1e>;
 			compatible = "google,cros-ec-i2c";
@@ -66,6 +69,7 @@
 		spi-max-frequency = <1000000>;
 		spi-deactivate-delay = <100>;
 
+		/* Snow did support SPI but the released version used I2C */
 		embedded-controller {
 			compatible = "google,cros-ec-i2c";
 			reg = <0x1e>;
@@ -85,7 +89,7 @@
 		status = "disabled";
 	};
 
-	i2c at 12cd0000 {
+	i2c at 12CD0000 {
 		soundcodec at 22 {
 			reg = <0x22>;
 			compatible = "maxim,max98095-codec";
@@ -105,8 +109,8 @@
 		};
 	};
 
-	i2c at 12c60000 {
-		pmic at 9 {
+	i2c at 12C60000 {
+		max77686 at 09 {
 			reg = <0x9>;
 			compatible = "maxim,max77686";
 		};
arch/arm/dts/exynos5250.dtsi +12 -12
index ccbafe9..7eef3e3 100644
@@ -47,36 +47,36 @@
 		interrupts = <0 47 0>;
 	};
 
-	i2c at 12ca0000 {
-		#address-cells = <1>;
-		#size-cells = <0>;
+	i2c_4: i2c at 12CA0000 {
 		compatible = "samsung,s3c2440-i2c";
 		reg = <0x12CA0000 0x100>;
 		interrupts = <0 60 0>;
-	};
-
-	i2c at 12cb0000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
+	};
+
+	i2c_5: i2c at 12CB0000 {
 		compatible = "samsung,s3c2440-i2c";
 		reg = <0x12CB0000 0x100>;
 		interrupts = <0 61 0>;
-	};
-
-	i2c at 12cc0000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
+	};
+
+	i2c_6: i2c at 12CC0000 {
 		compatible = "samsung,s3c2440-i2c";
 		reg = <0x12CC0000 0x100>;
 		interrupts = <0 62 0>;
-	};
-
-	i2c at 12cd0000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
+	};
+
+	i2c_7: i2c at 12CD0000 {
 		compatible = "samsung,s3c2440-i2c";
 		reg = <0x12CD0000 0x100>;
 		interrupts = <0 63 0>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 
 	sound at 3830000 {
arch/arm/dts/exynos5420-peach-pit.dts +4 -4
index 6fe762d..0f1002e 100644
@@ -25,7 +25,7 @@
 	aliases {
 		serial0 = "/serial at 12C30000";
 		console = "/serial at 12C30000";
-		pmic = "/i2c at 12ca0000";
+		pmic = "/i2c at 12CA0000";
 	};
 
 	dmc {
@@ -49,7 +49,7 @@
 	};
 
 	/* MAX77802 is on i2c bus 4 */
-	i2c at 12ca0000 {
+	i2c at 12CA0000 {
 		clock-frequency = <400000>;
 		power-regulator at 9 {
 			compatible = "maxim,max77802-pmic";
@@ -57,7 +57,7 @@
 		};
 	};
 
-	i2c at 12cd0000 { /* i2c7 */
+	i2c at 12CD0000 { /* i2c7 */
 		clock-frequency = <100000>;
 	       soundcodec at 20 {
 	              reg = <0x20>;
@@ -76,7 +76,7 @@
                 samsung,codec-type = "max98090";
         };
 
-	i2c at 12e10000 { /* i2c9 */
+	i2c at 12E10000 { /* i2c9 */
 		clock-frequency = <400000>;
                 tpm at 20 {
                         compatible = "infineon,slb9645tt";
arch/arm/dts/exynos5420-smdk5420.dts +2 -2
index 6855027..015ff15 100644
@@ -37,7 +37,7 @@
 	};
 
 	/* s2mps11 is on i2c bus 4 */
-	i2c at 12ca0000 {
+	i2c at 12CA0000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		pmic at 66 {
@@ -82,7 +82,7 @@
 		samsung,codec-type = "wm8994";
 	};
 
-	i2c at 12c70000 {
+	i2c at 12C70000 {
 		soundcodec at 1a {
 			reg = <0x1a>;
 			compatible = "wolfson,wm8994-codec";
arch/arm/dts/exynos54xx.dtsi +18 -18
index 31fabb1..bd3619d 100644
@@ -14,17 +14,17 @@
 	};
 
 	aliases {
-		i2c0 = "/i2c at 12c60000";
-		i2c1 = "/i2c at 12c70000";
-		i2c2 = "/i2c at 12c80000";
-		i2c3 = "/i2c at 12c90000";
-		i2c4 = "/i2c at 12ca0000";
-		i2c5 = "/i2c at 12cb0000";
-		i2c6 = "/i2c at 12cc0000";
-		i2c7 = "/i2c at 12cd0000";
-		i2c8 = "/i2c at 12e00000";
-		i2c9 = "/i2c at 12e10000";
-		i2c10 = "/i2c at 12e20000";
+		i2c0 = "/i2c at 12C60000";
+		i2c1 = "/i2c at 12C70000";
+		i2c2 = "/i2c at 12C80000";
+		i2c3 = "/i2c at 12C90000";
+		i2c4 = "/i2c at 12CA0000";
+		i2c5 = "/i2c at 12CB0000";
+		i2c6 = "/i2c at 12CC0000";
+		i2c7 = "/i2c at 12CD0000";
+		i2c8 = "/i2c at 12E00000";
+		i2c9 = "/i2c at 12E10000";
+		i2c10 = "/i2c at 12E20000";
 		pinctrl0 = &pinctrl_0;
 		pinctrl1 = &pinctrl_1;
 		pinctrl2 = &pinctrl_2;
@@ -42,7 +42,7 @@
 		xhci1 = "/xhci at 12400000";
 	};
 
-	i2c at 12ca0000 {
+	i2c at 12CA0000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "samsung,exynos5-hsi2c";
@@ -50,7 +50,7 @@
 		interrupts = <0 60 0>;
 	};
 
-	i2c at 12cb0000 {
+	i2c at 12CB0000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "samsung,exynos5-hsi2c";
@@ -58,7 +58,7 @@
 		interrupts = <0 61 0>;
 	};
 
-	i2c at 12cc0000 {
+	i2c at 12CC0000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "samsung,exynos5-hsi2c";
@@ -66,7 +66,7 @@
 		interrupts = <0 62 0>;
 	};
 
-	i2c at 12cd0000 {
+	i2c at 12CD0000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "samsung,exynos5-hsi2c";
@@ -74,7 +74,7 @@
 		interrupts = <0 63 0>;
 	};
 
-	i2c at 12e00000 {
+	i2c at 12E00000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "samsung,exynos5-hsi2c";
@@ -82,7 +82,7 @@
 		interrupts = <0 87 0>;
 	};
 
-	i2c at 12e10000 {
+	i2c at 12E10000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "samsung,exynos5-hsi2c";
@@ -90,7 +90,7 @@
 		interrupts = <0 88 0>;
 	};
 
-	i2c at 12e20000 {
+	i2c at 12E20000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "samsung,exynos5-hsi2c";
arch/arm/dts/exynos5800-peach-pi.dts +4 -4
index 176ce55..4e548f7 100644
@@ -25,7 +25,7 @@
 	aliases {
 		serial0 = "/serial at 12C30000";
 		console = "/serial at 12C30000";
-		pmic = "/i2c at 12ca0000";
+		pmic = "/i2c at 12CA0000";
 	};
 
 	dmc {
@@ -49,7 +49,7 @@
 	};
 
 	/* MAX77802 is on i2c bus 4 */
-	i2c at 12ca0000 {
+	i2c at 12CA0000 {
 		clock-frequency = <400000>;
 		power-regulator at 9 {
 			compatible = "maxim,max77802-pmic";
@@ -57,7 +57,7 @@
 		};
 	};
 
-	i2c at 12cd0000 { /* i2c7 */
+	i2c at 12CD0000 { /* i2c7 */
 		clock-frequency = <100000>;
 	       soundcodec at 20 {
 	              reg = <0x20>;
@@ -69,7 +69,7 @@
                 samsung,codec-type = "max98090";
         };
 
-	i2c at 12e10000 { /* i2c9 */
+	i2c at 12E10000 { /* i2c9 */
 		clock-frequency = <400000>;
                 tpm at 20 {
                         compatible = "infineon,slb9645tt";
Signature · 1 line
2.4.3.573.g4eafbef
#38 lore raw

PATCH 11/55 exynos: dts: Sync up I2C ports with the kernel

Hello Simon,

Quoted 511 lines · Simon Glass

The kernel uses upper case for I2C unit addresses. Follow the same convention to reduce differences.

---

  arch/arm/dts/exynos5.dtsi             | 34 ++++++++++++++++-----------------
  arch/arm/dts/exynos5250-arndale.dts   | 16 ++++++++--------
  arch/arm/dts/exynos5250-smdk5250.dts  | 21 ++++++++++----------
  arch/arm/dts/exynos5250-snow.dts      | 32 +++++++++++++++++--------------
  arch/arm/dts/exynos5250.dtsi          | 24 +++++++++++------------
  arch/arm/dts/exynos5420-peach-pit.dts |  8 ++++----
  arch/arm/dts/exynos5420-smdk5420.dts  |  4 ++--
  arch/arm/dts/exynos54xx.dtsi          | 36 +++++++++++++++++------------------
  arch/arm/dts/exynos5800-peach-pi.dts  |  8 ++++----
  9 files changed, 94 insertions(+), 89 deletions(-)
arch/arm/dts/exynos5.dtsi +17 -17
index 238acb8..179584c 100644
@@ -72,39 +72,39 @@
  		interrupts = <1 9 0xf04>;
  	};
 
-	i2c at 12c60000 {
-		#address-cells = <1>;
-		#size-cells = <0>;
+	i2c_0: i2c at 12C60000 {
  		compatible = "samsung,s3c2440-i2c";
  		reg = <0x12C60000 0x100>;
  		interrupts = <0 56 0>;
-	};
-
-	i2c at 12c70000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
+	};
+
+	i2c_1: i2c at 12C70000 {
  		compatible = "samsung,s3c2440-i2c";
  		reg = <0x12C70000 0x100>;
  		interrupts = <0 57 0>;
-	};
-
-	i2c at 12c80000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
+	};
+
+	i2c_2: i2c at 12C80000 {
  		compatible = "samsung,s3c2440-i2c";
  		reg = <0x12C80000 0x100>;
  		interrupts = <0 58 0>;
-	};
-
-	i2c at 12c90000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
+	};
+
+	i2c_3: i2c at 12C90000 {
  		compatible = "samsung,s3c2440-i2c";
  		reg = <0x12C90000 0x100>;
  		interrupts = <0 59 0>;
+		#address-cells = <1>;
+		#size-cells = <0>;
  	};
 
-	spi at 12d20000 {
+	spi_0: spi at 12d20000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		compatible = "samsung,exynos-spi";
@@ -112,7 +112,7 @@
  		interrupts = <0 68 0>;
  	};
 
-	spi at 12d30000 {
+	spi_1: spi at 12d30000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		compatible = "samsung,exynos-spi";
@@ -120,7 +120,7 @@
  		interrupts = <0 69 0>;
  	};
 
-	spi at 12d40000 {
+	spi_2: spi at 12d40000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		compatible = "samsung,exynos-spi";
@@ -129,7 +129,7 @@
  		interrupts = <0 70 0>;
          };
 
-	spi at 131a0000 {
+	spi_3: spi at 131a0000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		compatible = "samsung,exynos-spi";
@@ -137,7 +137,7 @@
  		interrupts = <0 129 0>;
  	};
 
-	spi at 131b0000 {
+	spi_4: spi at 131b0000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		compatible = "samsung,exynos-spi";
arch/arm/dts/exynos5250-arndale.dts +8 -8
index 21c0a21..031c622 100644
@@ -15,14 +15,14 @@
  	compatible = "samsung,arndale", "samsung,exynos5250";
 
  	aliases {
-		i2c0 = "/i2c at 12c60000";
-		i2c1 = "/i2c at 12c70000";
-		i2c2 = "/i2c at 12c80000";
-		i2c3 = "/i2c at 12c90000";
-		i2c4 = "/i2c at 12ca0000";
-		i2c5 = "/i2c at 12cb0000";
-		i2c6 = "/i2c at 12cc0000";
-		i2c7 = "/i2c at 12cd0000";
+		i2c0 = "/i2c at 12C60000";
+		i2c1 = "/i2c at 12C70000";
+		i2c2 = "/i2c at 12C80000";
+		i2c3 = "/i2c at 12C90000";
+		i2c4 = "/i2c at 12CA0000";
+		i2c5 = "/i2c at 12CB0000";
+		i2c6 = "/i2c at 12CC0000";
+		i2c7 = "/i2c at 12CD0000";
  		serial0 = "/serial at 12C20000";
  		console = "/serial at 12C20000";
  	};
arch/arm/dts/exynos5250-smdk5250.dts +11 -10
index 3cebfc2..636fec9 100644
@@ -11,20 +11,21 @@
 
  /dts-v1/;
  #include "exynos5250.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
 
  / {
  	model = "SAMSUNG SMDK5250 board based on EXYNOS5250";
  	compatible = "samsung,smdk5250", "samsung,exynos5250";
 
  	aliases {
-		i2c0 = "/i2c at 12c60000";
-		i2c1 = "/i2c at 12c70000";
-		i2c2 = "/i2c at 12c80000";
-		i2c3 = "/i2c at 12c90000";
-		i2c4 = "/i2c at 12ca0000";
-		i2c5 = "/i2c at 12cb0000";
-		i2c6 = "/i2c at 12cc0000";
-		i2c7 = "/i2c at 12cd0000";
+		i2c0 = "/i2c at 12C60000";
+		i2c1 = "/i2c at 12C70000";
+		i2c2 = "/i2c at 12C80000";
+		i2c3 = "/i2c at 12C90000";
+		i2c4 = "/i2c at 12CA0000";
+		i2c5 = "/i2c at 12CB0000";
+		i2c6 = "/i2c at 12CC0000";
+		i2c7 = "/i2c at 12CD0000";
  		spi0 = "/spi at 12d20000";
  		spi1 = "/spi at 12d30000";
  		spi2 = "/spi at 12d40000";
@@ -58,14 +59,14 @@
  		status = "disabled";
  	};
 
-	i2c at 12c70000 {
+	i2c at 12C70000 {
  		soundcodec at 1a {
  			reg = <0x1a>;
  			compatible = "wolfson,wm8994-codec";
  		};
  	};
 
-	i2c at 12c60000 {
+	i2c at 12C60000 {
  		pmic at 9 {
  			reg = <0x9>;
  			compatible = "maxim,max77686";
arch/arm/dts/exynos5250-snow.dts +18 -14
index e4b3dc2..9abe0b7 100644
@@ -7,24 +7,27 @@
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License version 2 as
   * published by the Free Software Foundation.
-*/
+ */
 
  /dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/input/input.h>
  #include "exynos5250.dtsi"
 
  / {
  	model = "Google Snow";
-	compatible = "google,snow", "samsung,exynos5250";
+	compatible = "google,snow", "samsung,exynos5250", "samsung,exynos5";
 
  	aliases {
-		i2c0 = "/i2c at 12c60000";
-		i2c1 = "/i2c at 12c70000";
-		i2c2 = "/i2c at 12c80000";
-		i2c3 = "/i2c at 12c90000";
-		i2c4 = "/i2c at 12ca0000";
-		i2c5 = "/i2c at 12cb0000";
-		i2c6 = "/i2c at 12cc0000";
-		i2c7 = "/i2c at 12cd0000";
+		i2c0 = "/i2c at 12C60000";
+		i2c1 = "/i2c at 12C70000";
+		i2c2 = "/i2c at 12C80000";
+		i2c3 = "/i2c at 12C90000";
+		i2c4 = "/i2c at 12CA0000";
+		i2c5 = "/i2c at 12CB0000";
+		i2c6 = "/i2c at 12CC0000";
+		i2c7 = "/i2c at 12CD0000";
  		spi0 = "/spi at 12d20000";
  		spi1 = "/spi at 12d30000";
  		spi2 = "/spi at 12d40000";
@@ -39,7 +42,7 @@
  		i2s = "/sound at 3830000";
  	};
 
-	i2c4: i2c at 12ca0000 {
+	i2c4: i2c at 12CA0000 {
  		cros_ec: cros-ec at 1e {
  			reg = <0x1e>;
  			compatible = "google,cros-ec-i2c";
@@ -66,6 +69,7 @@
  		spi-max-frequency = <1000000>;
  		spi-deactivate-delay = <100>;
 
+		/* Snow did support SPI but the released version used I2C */
  		embedded-controller {
  			compatible = "google,cros-ec-i2c";
  			reg = <0x1e>;
@@ -85,7 +89,7 @@
  		status = "disabled";
  	};
 
-	i2c at 12cd0000 {
+	i2c at 12CD0000 {
  		soundcodec at 22 {
  			reg = <0x22>;
  			compatible = "maxim,max98095-codec";
@@ -105,8 +109,8 @@
  		};
  	};
 
-	i2c at 12c60000 {
-		pmic at 9 {
+	i2c at 12C60000 {
+		max77686 at 09 {
  			reg = <0x9>;
  			compatible = "maxim,max77686";
  		};
arch/arm/dts/exynos5250.dtsi +12 -12
index ccbafe9..7eef3e3 100644
@@ -47,36 +47,36 @@
  		interrupts = <0 47 0>;
  	};
 
-	i2c at 12ca0000 {
-		#address-cells = <1>;
-		#size-cells = <0>;
+	i2c_4: i2c at 12CA0000 {
  		compatible = "samsung,s3c2440-i2c";
  		reg = <0x12CA0000 0x100>;
  		interrupts = <0 60 0>;
-	};
-
-	i2c at 12cb0000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
+	};
+
+	i2c_5: i2c at 12CB0000 {
  		compatible = "samsung,s3c2440-i2c";
  		reg = <0x12CB0000 0x100>;
  		interrupts = <0 61 0>;
-	};
-
-	i2c at 12cc0000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
+	};
+
+	i2c_6: i2c at 12CC0000 {
  		compatible = "samsung,s3c2440-i2c";
  		reg = <0x12CC0000 0x100>;
  		interrupts = <0 62 0>;
-	};
-
-	i2c at 12cd0000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
+	};
+
+	i2c_7: i2c at 12CD0000 {
  		compatible = "samsung,s3c2440-i2c";
  		reg = <0x12CD0000 0x100>;
  		interrupts = <0 63 0>;
+		#address-cells = <1>;
+		#size-cells = <0>;
  	};
 
  	sound at 3830000 {
arch/arm/dts/exynos5420-peach-pit.dts +4 -4
index 6fe762d..0f1002e 100644
@@ -25,7 +25,7 @@
  	aliases {
  		serial0 = "/serial at 12C30000";
  		console = "/serial at 12C30000";
-		pmic = "/i2c at 12ca0000";
+		pmic = "/i2c at 12CA0000";
  	};
 
  	dmc {
@@ -49,7 +49,7 @@
  	};
 
  	/* MAX77802 is on i2c bus 4 */
-	i2c at 12ca0000 {
+	i2c at 12CA0000 {
  		clock-frequency = <400000>;
  		power-regulator at 9 {
  			compatible = "maxim,max77802-pmic";
@@ -57,7 +57,7 @@
  		};
  	};
 
-	i2c at 12cd0000 { /* i2c7 */
+	i2c at 12CD0000 { /* i2c7 */
  		clock-frequency = <100000>;
  	       soundcodec at 20 {
  	              reg = <0x20>;
@@ -76,7 +76,7 @@
                  samsung,codec-type = "max98090";
          };
 
-	i2c at 12e10000 { /* i2c9 */
+	i2c at 12E10000 { /* i2c9 */
  		clock-frequency = <400000>;
                  tpm at 20 {
                          compatible = "infineon,slb9645tt";
arch/arm/dts/exynos5420-smdk5420.dts +2 -2
index 6855027..015ff15 100644
@@ -37,7 +37,7 @@
  	};
 
  	/* s2mps11 is on i2c bus 4 */
-	i2c at 12ca0000 {
+	i2c at 12CA0000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		pmic at 66 {
@@ -82,7 +82,7 @@
  		samsung,codec-type = "wm8994";
  	};
 
-	i2c at 12c70000 {
+	i2c at 12C70000 {
  		soundcodec at 1a {
  			reg = <0x1a>;
  			compatible = "wolfson,wm8994-codec";
arch/arm/dts/exynos54xx.dtsi +18 -18
index 31fabb1..bd3619d 100644
@@ -14,17 +14,17 @@
  	};
 
  	aliases {
-		i2c0 = "/i2c at 12c60000";
-		i2c1 = "/i2c at 12c70000";
-		i2c2 = "/i2c at 12c80000";
-		i2c3 = "/i2c at 12c90000";
-		i2c4 = "/i2c at 12ca0000";
-		i2c5 = "/i2c at 12cb0000";
-		i2c6 = "/i2c at 12cc0000";
-		i2c7 = "/i2c at 12cd0000";
-		i2c8 = "/i2c at 12e00000";
-		i2c9 = "/i2c at 12e10000";
-		i2c10 = "/i2c at 12e20000";
+		i2c0 = "/i2c at 12C60000";
+		i2c1 = "/i2c at 12C70000";
+		i2c2 = "/i2c at 12C80000";
+		i2c3 = "/i2c at 12C90000";
+		i2c4 = "/i2c at 12CA0000";
+		i2c5 = "/i2c at 12CB0000";
+		i2c6 = "/i2c at 12CC0000";
+		i2c7 = "/i2c at 12CD0000";
+		i2c8 = "/i2c at 12E00000";
+		i2c9 = "/i2c at 12E10000";
+		i2c10 = "/i2c at 12E20000";
  		pinctrl0 = &pinctrl_0;
  		pinctrl1 = &pinctrl_1;
  		pinctrl2 = &pinctrl_2;
@@ -42,7 +42,7 @@
  		xhci1 = "/xhci at 12400000";
  	};
 
-	i2c at 12ca0000 {
+	i2c at 12CA0000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		compatible = "samsung,exynos5-hsi2c";
@@ -50,7 +50,7 @@
  		interrupts = <0 60 0>;
  	};
 
-	i2c at 12cb0000 {
+	i2c at 12CB0000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		compatible = "samsung,exynos5-hsi2c";
@@ -58,7 +58,7 @@
  		interrupts = <0 61 0>;
  	};
 
-	i2c at 12cc0000 {
+	i2c at 12CC0000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		compatible = "samsung,exynos5-hsi2c";
@@ -66,7 +66,7 @@
  		interrupts = <0 62 0>;
  	};
 
-	i2c at 12cd0000 {
+	i2c at 12CD0000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		compatible = "samsung,exynos5-hsi2c";
@@ -74,7 +74,7 @@
  		interrupts = <0 63 0>;
  	};
 
-	i2c at 12e00000 {
+	i2c at 12E00000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		compatible = "samsung,exynos5-hsi2c";
@@ -82,7 +82,7 @@
  		interrupts = <0 87 0>;
  	};
 
-	i2c at 12e10000 {
+	i2c at 12E10000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		compatible = "samsung,exynos5-hsi2c";
@@ -90,7 +90,7 @@
  		interrupts = <0 88 0>;
  	};
 
-	i2c at 12e20000 {
+	i2c at 12E20000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		compatible = "samsung,exynos5-hsi2c";
arch/arm/dts/exynos5800-peach-pi.dts +3 -3
index 176ce55..4e548f7 100644
@@ -25,7 +25,7 @@
  	aliases {
  		serial0 = "/serial at 12C30000";
  		console = "/serial at 12C30000";
-		pmic = "/i2c at 12ca0000";
+		pmic = "/i2c at 12CA0000";
  	};
 
  	dmc {
@@ -49,7 +49,7 @@
  	};
 
  	/* MAX77802 is on i2c bus 4 */
-	i2c at 12ca0000 {
+	i2c at 12CA0000 {
  		clock-frequency = <400000>;
  		power-regulator at 9 {
  			compatible = "maxim,max77802-pmic";
@@ -57,7 +57,7 @@
  		};
  	};
 
-	i2c at 12cd0000 { /* i2c7 */
+	i2c at 12CD0000 { /* i2c7 */
  		clock-frequency = <100000>;
  	       soundcodec at 20 {
  	              reg = <0x20>;

arch/arm/dts/exynos5800-peach-pi.dts line 75

Quoted 8 lines
arch/arm/dts/exynos5800-peach-pi.dts +1 -1
@@ -69,7 +69,7 @@
                  samsung,codec-type = "max98090";
          };
 
-	i2c at 12e10000 { /* i2c9 */
+	i2c at 12E10000 { /* i2c9 */
  		clock-frequency = <400000>;
                  tpm at 20 {
                          compatible = "infineon,slb9645tt";

Best regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#39 lore raw

PATCH 11/55 exynos: dts: Sync up I2C ports with the kernel

Quoted 25 lines · Przemyslaw Marczak

Hello Simon,

Quoted 22 lines · Simon Glass

The kernel uses upper case for I2C unit addresses. Follow the same convention to reduce differences.

---

  arch/arm/dts/exynos5.dtsi             | 34
++++++++++++++++-----------------
  arch/arm/dts/exynos5250-arndale.dts   | 16 ++++++++--------
  arch/arm/dts/exynos5250-smdk5250.dts  | 21 ++++++++++----------
  arch/arm/dts/exynos5250-snow.dts      | 32
+++++++++++++++++--------------
  arch/arm/dts/exynos5250.dtsi          | 24 +++++++++++------------
  arch/arm/dts/exynos5420-peach-pit.dts |  8 ++++----
  arch/arm/dts/exynos5420-smdk5420.dts  |  4 ++--
  arch/arm/dts/exynos54xx.dtsi          | 36
+++++++++++++++++------------------
  arch/arm/dts/exynos5800-peach-pi.dts  |  8 ++++----
  9 files changed, 94 insertions(+), 89 deletions(-)

[snip]

Quoted 9 lines

Best regards
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Applied to u-boot-dm.

#40 lore raw

PATCH 12/55 exynos: dts: Add PMIC and regulator definitions

In reply to Simon Glass

Snow and smdk5250 use a max77686 PMIC. We have a driver for this, so add the relevant node to the device tree so it can be used.

---

 arch/arm/dts/exynos5250-smdk5250.dts | 150 ++++++++++++++++++++++++++++++++++
 arch/arm/dts/exynos5250-snow.dts     | 154 +++++++++++++++++++++++++++++++++++
 2 files changed, 304 insertions(+)
arch/arm/dts/exynos5250-smdk5250.dts +150 -0
index 636fec9..8b69544 100644
@@ -150,3 +150,153 @@
 		samsung,vbus-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
 	};
 };
+
+&i2c_0 {
+	status = "okay";
+	samsung,i2c-sda-delay = <100>;
+	samsung,i2c-max-bus-freq = <20000>;
+
+	max77686 at 09 {
+		compatible = "maxim,max77686";
+		reg = <0x09>;
+		interrupt-parent = <&gpx3>;
+		interrupts = <2 IRQ_TYPE_NONE>;
+
+		voltage-regulators {
+			ldo1_reg: LDO1 {
+				regulator-name = "P1.0V_LDO_OUT1";
+				regulator-min-microvolt = <1000000>;
+				regulator-max-microvolt = <1000000>;
+				regulator-always-on;
+			};
+
+			ldo2_reg: LDO2 {
+				regulator-name = "P1.2V_LDO_OUT2";
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <1200000>;
+				regulator-always-on;
+			};
+
+			ldo3_reg: LDO3 {
+				regulator-name = "P1.8V_LDO_OUT3";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-always-on;
+			};
+
+			ldo4_reg: LDO4 {
+				regulator-name = "P2.8V_LDO_OUT4";
+				regulator-min-microvolt = <2800000>;
+				regulator-max-microvolt = <2800000>;
+			};
+
+			ldo5_reg: LDO5 {
+				regulator-name = "P1.8V_LDO_OUT5";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+			};
+
+			ldo6_reg: LDO6 {
+				regulator-name = "P1.1V_LDO_OUT6";
+				regulator-min-microvolt = <1100000>;
+				regulator-max-microvolt = <1100000>;
+				regulator-always-on;
+			};
+
+			ldo7_reg: LDO7 {
+				regulator-name = "P1.1V_LDO_OUT7";
+				regulator-min-microvolt = <1100000>;
+				regulator-max-microvolt = <1100000>;
+				regulator-always-on;
+			};
+
+			ldo8_reg: LDO8 {
+				regulator-name = "P1.0V_LDO_OUT8";
+				regulator-min-microvolt = <1000000>;
+				regulator-max-microvolt = <1000000>;
+			};
+
+			ldo10_reg: LDO10 {
+				regulator-name = "P1.8V_LDO_OUT10";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+			};
+
+			ldo11_reg: LDO11 {
+				regulator-name = "P1.8V_LDO_OUT11";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+			};
+
+			ldo12_reg: LDO12 {
+				regulator-name = "P3.0V_LDO_OUT12";
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3000000>;
+			};
+
+			ldo13_reg: LDO13 {
+				regulator-name = "P1.8V_LDO_OUT13";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+			};
+
+			ldo14_reg: LDO14 {
+				regulator-name = "P1.8V_LDO_OUT14";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+			};
+
+			ldo15_reg: LDO15 {
+				regulator-name = "P1.0V_LDO_OUT15";
+				regulator-min-microvolt = <1000000>;
+				regulator-max-microvolt = <1000000>;
+			};
+
+			ldo16_reg: LDO16 {
+				regulator-name = "P1.8V_LDO_OUT16";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+			};
+
+			buck1_reg: BUCK1 {
+				regulator-name = "vdd_mif";
+				regulator-min-microvolt = <950000>;
+				regulator-max-microvolt = <1300000>;
+				regulator-always-on;
+				regulator-boot-on;
+			};
+
+			buck2_reg: BUCK2 {
+				regulator-name = "vdd_arm";
+				regulator-min-microvolt = <850000>;
+				regulator-max-microvolt = <1350000>;
+				regulator-always-on;
+				regulator-boot-on;
+			};
+
+			buck3_reg: BUCK3 {
+				regulator-name = "vdd_int";
+				regulator-min-microvolt = <900000>;
+				regulator-max-microvolt = <1200000>;
+				regulator-always-on;
+				regulator-boot-on;
+			};
+
+			buck4_reg: BUCK4 {
+				regulator-name = "vdd_g3d";
+				regulator-min-microvolt = <850000>;
+				regulator-max-microvolt = <1300000>;
+				regulator-always-on;
+				regulator-boot-on;
+			};
+
+			buck5_reg: BUCK5 {
+				regulator-name = "P1.8V_BUCK_OUT5";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-always-on;
+				regulator-boot-on;
+			};
+		};
+	};
+};
arch/arm/dts/exynos5250-snow.dts +154 -0

158 lines not on this page · raw message

Signature · 1 line
2.4.3.573.g4eafbef
#41 lore raw

PATCH 12/55 exynos: dts: Add PMIC and regulator definitions

Hello Simon,

Quoted 17 lines · Simon Glass

Snow and smdk5250 use a max77686 PMIC. We have a driver for this, so add the relevant node to the device tree so it can be used.

---

  arch/arm/dts/exynos5250-smdk5250.dts | 150 ++++++++++++++++++++++++++++++++++
  arch/arm/dts/exynos5250-snow.dts     | 154 +++++++++++++++++++++++++++++++++++
  2 files changed, 304 insertions(+)
arch/arm/dts/exynos5250-smdk5250.dts +0 -0
index 636fec9..8b69544 100644
@@ -150,3 +150,153 @@
  		samsung,vbus-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
  	};

arch/arm/dts/exynos5250-smdk5250.dts line 161

Quoted 10 lines
arch/arm/dts/exynos5250-smdk5250.dts +9 -0
  };
+
+&i2c_0 {
+	status = "okay";
+	samsung,i2c-sda-delay = <100>;
+	samsung,i2c-max-bus-freq = <20000>;
+
+	max77686 at 09 {
+		compatible = "maxim,max77686";
+		reg = <0x09>;

Are those two properties below, required? (The same for snow dts)

Quoted 10 lines
arch/arm/dts/exynos5250-smdk5250.dts +10 -0
+		interrupt-parent = <&gpx3>;
+		interrupts = <2 IRQ_TYPE_NONE>;
+
+		voltage-regulators {
+			ldo1_reg: LDO1 {
+				regulator-name = "P1.0V_LDO_OUT1";
+				regulator-min-microvolt = <1000000>;
+				regulator-max-microvolt = <1000000>;
+				regulator-always-on;
+			};

...snip...

Best regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#42 lore raw

PATCH 12/55 exynos: dts: Add PMIC and regulator definitions

Hi Przemyslaw,

Quoted 29 lines · Przemyslaw Marczak

Hello Simon,

Quoted 26 lines · Simon Glass

Snow and smdk5250 use a max77686 PMIC. We have a driver for this, so add the relevant node to the device tree so it can be used.

---

  arch/arm/dts/exynos5250-smdk5250.dts | 150
++++++++++++++++++++++++++++++++++
  arch/arm/dts/exynos5250-snow.dts     | 154
+++++++++++++++++++++++++++++++++++
  2 files changed, 304 insertions(+)
arch/arm/dts/exynos5250-smdk5250.dts +4 -0
index 636fec9..8b69544 100644
@@ -150,3 +150,153 @@
                samsung,vbus-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
        };
  };
+
+&i2c_0 {
+       status = "okay";
+       samsung,i2c-sda-delay = <100>;
Quoted 11 lines

arch/arm/dts/exynos5250-smdk5250.dts line 161

Quoted 5 lines
arch/arm/dts/exynos5250-smdk5250.dts +5 -0
+       samsung,i2c-max-bus-freq = <20000>;
+
+       max77686 at 09 {
+               compatible = "maxim,max77686";
+               reg = <0x09>;

Are those two properties below, required? (The same for snow dts)

Quoted 2 lines
arch/arm/dts/exynos5250-smdk5250.dts +2 -0
+               interrupt-parent = <&gpx3>;
+               interrupts = <2 IRQ_TYPE_NONE>;

No they are not used in U-Boot. I think it is reasonable to have them here to match the kernel. It doesn't add a lot of space.

Quoted 12 lines
Quoted 8 lines
arch/arm/dts/exynos5250-smdk5250.dts +8 -0
+
+               voltage-regulators {
+                       ldo1_reg: LDO1 {
+                               regulator-name = "P1.0V_LDO_OUT1";
+                               regulator-min-microvolt = <1000000>;
+                               regulator-max-microvolt = <1000000>;
+                               regulator-always-on;
+                       };

...snip...

Quoted 8 lines

Best regards
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Applied to u-boot-dm.

Regards,
Simon

#43 lore raw

PATCH 13/55 exynos: dts: Support EC tunnel and main TPS65090 regulator

In reply to Simon Glass

On pit and pi the TPS65090 regulator is connected only to the EC and we must use a tunnel to get to it. The existing U-Boot support relies on a special driver. Add a tunnel definition so that the new device-model TPS65090 driver can be used unmodified.

---

 arch/arm/dts/exynos5250-snow.dts      |  98 ++++++++++++++++++++++++++-
 arch/arm/dts/exynos5420-peach-pit.dts | 124 +++++++++++++++++++++++++++-------
 arch/arm/dts/exynos5800-peach-pi.dts  | 123 ++++++++++++++++++++++++++-------
 3 files changed, 297 insertions(+), 48 deletions(-)
arch/arm/dts/exynos5250-snow.dts +97 -1
index 06d675b..653efb4 100644
@@ -25,6 +25,7 @@
 		i2c2 = "/i2c at 12C80000";
 		i2c3 = "/i2c at 12C90000";
 		i2c4 = "/i2c at 12CA0000";
+		i2c104 = &i2c_104;
 		i2c5 = "/i2c at 12CB0000";
 		i2c6 = "/i2c at 12CC0000";
 		i2c7 = "/i2c at 12CD0000";
@@ -43,7 +44,7 @@
 	};
 
 	i2c4: i2c at 12CA0000 {
-		cros_ec: cros-ec at 1e {
+		cros_ec_old: cros-ec at 1e {
 			reg = <0x1e>;
 			compatible = "google,cros-ec-i2c";
 			i2c-max-frequency = <100000>;
@@ -57,6 +58,101 @@
 		};
 	};
 
+	i2c-arbitrator {
+		compatible = "i2c-arb-gpio-challenge";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		i2c-parent = <&{/i2c@12CA0000}>;
+
+		our-claim-gpio = <&gpf0 3 GPIO_ACTIVE_LOW>;
+		their-claim-gpios = <&gpe0 4 GPIO_ACTIVE_LOW>;
+		slew-delay-us = <10>;
+		wait-retry-us = <3000>;
+		wait-free-us = <50000>;
+
+		/* Use ID 104 as a hint that we're on physical bus 4 */
+		i2c_104: i2c at 0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			battery: sbs-battery at b {
+				compatible = "sbs,sbs-battery";
+				reg = <0xb>;
+				sbs,poll-retry-count = <1>;
+			};
+
+			cros_ec: embedded-controller {
+				compatible = "google,cros-ec-i2c";
+				reg = <0x1e>;
+				interrupts = <6 IRQ_TYPE_NONE>;
+				interrupt-parent = <&gpx1>;
+				wakeup-source;
+				i2c-max-frequency = <100000>;
+				u-boot,i2c-offset-len = <0>;
+				ec-interrupt = <&gpx1 6 GPIO_ACTIVE_LOW>;
+			};
+
+			power-regulator {
+				compatible = "ti,tps65090";
+				reg = <0x48>;
+
+				regulators {
+					dcdc1 {
+						ti,enable-ext-control;
+					};
+					dcdc2 {
+						ti,enable-ext-control;
+					};
+					dcdc3 {
+						ti,enable-ext-control;
+					};
+					fet1: fet1 {
+						regulator-name = "vcd_led";
+						ti,overcurrent-wait = <3>;
+					};
+					tps65090_fet2: fet2 {
+						regulator-name = "video_mid";
+						regulator-always-on;
+						ti,overcurrent-wait = <3>;
+					};
+					fet3 {
+						regulator-name = "wwan_r";
+						regulator-always-on;
+						ti,overcurrent-wait = <3>;
+					};
+					fet4 {
+						regulator-name = "sdcard";
+						ti,overcurrent-wait = <3>;
+					};
+					fet5 {
+						regulator-name = "camout";
+						regulator-always-on;
+						ti,overcurrent-wait = <3>;
+					};
+					fet6: fet6 {
+						regulator-name = "lcd_vdd";
+						ti,overcurrent-wait = <3>;
+					};
+					tps65090_fet7: fet7 {
+						regulator-name = "video_mid_1a";
+						regulator-always-on;
+						ti,overcurrent-wait = <3>;
+					};
+					ldo1 {
+					};
+					ldo2 {
+					};
+				};
+
+				charger {
+					compatible = "ti,tps65090-charger";
+				};
+			};
+		};
+	};
+
 	spi at 12d30000 {
 		spi-max-frequency = <50000000>;
 		firmware_storage_spi: flash at 0 {
arch/arm/dts/exynos5420-peach-pit.dts +100 -24

140 lines not on this page · raw message

arch/arm/dts/exynos5800-peach-pi.dts +100 -23

139 lines not on this page · raw message

Signature · 1 line
2.4.3.573.g4eafbef
#44 lore raw

PATCH 13/55 exynos: dts: Support EC tunnel and main TPS65090 regulator

Quoted 5 lines · Simon Glass

On pit and pi the TPS65090 regulator is connected only to the EC and we must use a tunnel to get to it. The existing U-Boot support relies on a special driver. Add a tunnel definition so that the new device-model TPS65090 driver can be used unmodified.

Quoted 7 lines

---

 arch/arm/dts/exynos5250-snow.dts      |  98 ++++++++++++++++++++++++++-
 arch/arm/dts/exynos5420-peach-pit.dts | 124 +++++++++++++++++++++++++++-------
 arch/arm/dts/exynos5800-peach-pi.dts  | 123 ++++++++++++++++++++++++++-------
 3 files changed, 297 insertions(+), 48 deletions(-)

Applied to u-boot-dm.

#45 lore raw

PATCH 14/55 dm: cros_ec: Convert the I2C tunnel code to use driver model

In reply to Simon Glass

The Chrome OS EC supports tunnelling through to an I2C bus on the EC. This currently uses a copy of the I2C command code and a special 'crosec' sub-command.

With driver model we can define an I2C bus which tunnels through to the EC, and use the normal 'i2c' command to access it. This simplifies the code and removes some duplication.

Add an I2C driver which tunnels through to the EC. Adjust the EC code to support binding child devices so that it can be set up. Adjust the existing I2C xfer function to fit driver model better.

For now the old code remains to allow things to still work. It will be removed in a later patch once the new flow is fully enabled.

---

 configs/peach-pi_defconfig            |  2 +
 configs/peach-pit_defconfig           |  2 +
 drivers/i2c/Kconfig                   | 11 +++++
 drivers/i2c/Makefile                  |  1 +
 drivers/i2c/cros_ec_tunnel.c          | 41 +++++++++++++++
 drivers/misc/cros_ec.c                | 93 +++++++++++++++++++++++++++++++++--
 drivers/power/pmic/pmic_tps65090_ec.c |  8 +--
 include/cros_ec.h                     | 14 +++++-
 8 files changed, 161 insertions(+), 11 deletions(-)
 create mode 100644 drivers/i2c/cros_ec_tunnel.c
configs/peach-pi_defconfig +2 -0
index 88f5e97..13295b5 100644
@@ -8,3 +8,5 @@ CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_CROS_EC_TUNNEL=y
configs/peach-pit_defconfig +2 -0
index e6b5bce..78ec49d 100644
@@ -8,3 +8,5 @@ CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_CROS_EC_TUNNEL=y
drivers/i2c/Kconfig +11 -0
index caee3d8..e861b53 100644
@@ -19,6 +19,17 @@ config DM_I2C_COMPAT
 	  to convert all code for a board in a single commit. It should not
 	  be enabled for any board in an official release.
 
+config I2C_CROS_EC_TUNNEL
+	tristate "Chrome OS EC tunnel I2C bus"
+	depends on CROS_EC
+	help
+	  This provides an I2C bus that will tunnel i2c commands through to
+	  the other side of the Chrome OS EC to the I2C bus connected there.
+	  This will work whatever the interface used to talk to the EC (SPI,
+	  I2C or LPC). Some Chromebooks use this when the hardware design
+	  does not allow direct access to the main PMIC from the AP.
+
+
 config DM_I2C_GPIO
 	bool "Enable Driver Model for software emulated I2C bus driver"
 	depends on DM_I2C && DM_GPIO
drivers/i2c/Makefile +1 -0
index dc9e81b..7f01fce 100644
@@ -7,6 +7,7 @@
 obj-$(CONFIG_DM_I2C) += i2c-uclass.o
 obj-$(CONFIG_DM_I2C_COMPAT) += i2c-uclass-compat.o
 obj-$(CONFIG_DM_I2C_GPIO) += i2c-gpio.o
+obj-$(CONFIG_I2C_CROS_EC_TUNNEL) += cros_ec_tunnel.o
 
 obj-$(CONFIG_SYS_I2C_ADI) += adi_i2c.o
 obj-$(CONFIG_I2C_MV) += mv_i2c.o
drivers/i2c/cros_ec_tunnel.c new file +41 -0

41 lines not on this page · raw message

drivers/misc/cros_ec.c +88 -5

133 lines not on this page · raw message

drivers/power/pmic/pmic_tps65090_ec.c +4 -4
index ac0d44f..f79a878 100644
@@ -56,8 +56,8 @@ enum {
  */
 static int tps65090_read(u32 reg, u8 *val)
 {
-	return cros_ec_i2c_xfer(config.dev, TPS65090_ADDR, reg, 1,
-				val, 1, true);
+	return cros_ec_i2c_xfer_old(config.dev, TPS65090_ADDR, reg, 1,
+				    val, 1, true);
 }
 
 /**
@@ -69,8 +69,8 @@ static int tps65090_read(u32 reg, u8 *val)
  */
 static int tps65090_write(u32 reg, u8 val)
 {
-	return cros_ec_i2c_xfer(config.dev, TPS65090_ADDR, reg, 1,
-				&val, 1, false);
+	return cros_ec_i2c_xfer_old(config.dev, TPS65090_ADDR, reg, 1,
+				    &val, 1, false);
 }
 
 /**
include/cros_ec.h +12 -2
index 3b2be2c..41951c3 100644
@@ -390,6 +390,16 @@ int cros_ec_decode_ec_flash(const void *blob, int node,
  */
 void cros_ec_check_keyboard(struct cros_ec_dev *dev);
 
+struct i2c_msg;
+/*
+ * Tunnel an I2C transfer to the EC
+ *
+ * @param dev		CROS-EC device
+ * @param msg		List of messages to transfer
+ * @param nmsgs		Number of messages to transfer
+ */
+int cros_ec_i2c_tunnel(struct udevice *dev, struct i2c_msg *msg, int nmsgs);
+
 /*
  * Tunnel an I2C transfer to the EC
  *
@@ -401,7 +411,7 @@ void cros_ec_check_keyboard(struct cros_ec_dev *dev);
  * @param len		Length of buffer
  * @param is_read	1 if this is a read, 0 if this is a write
  */
-int cros_ec_i2c_xfer(struct cros_ec_dev *dev, uchar chip, uint addr,
-		     int alen, uchar *buffer, int len, int is_read);
+int cros_ec_i2c_xfer_old(struct cros_ec_dev *dev, uchar chip, uint addr,
+			 int alen, uchar *buffer, int len, int is_read);
 
 #endif
Signature · 1 line
2.4.3.573.g4eafbef
#46 lore raw

PATCH 15/55 cros_ec: Support the LDO access method used by spring

In reply to Simon Glass

Add a driver to support the special LDO access used by spring. This is a custom method in the cros_ec protocol - it does not use an I2C pass-through.

There are two implementation choices:

1. Write a special LDO driver which can talk across the EC. Duplicate all the logic from TPS65090 for retrying when the LDO fails to come up.

2. Write a special I2C bus driver which pretends to be a TPS65090 and transfers reads and writes using the LDO message.

Either is distasteful. The latter method is chosen since it results in less code duplication and a fairly simple (30-line) implementation of the core logic.

The crosec 'ldo' subcommand could be removed (since i2c md/mw will work instead) but is retained as a convenience.

---

 drivers/i2c/Kconfig       | 13 ++++++++
 drivers/i2c/Makefile      |  1 +
 drivers/i2c/cros_ec_ldo.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++
 drivers/misc/cros_ec.c    | 21 +++++++------
 include/cros_ec.h         |  4 +--
 5 files changed, 104 insertions(+), 12 deletions(-)
 create mode 100644 drivers/i2c/cros_ec_ldo.c
drivers/i2c/Kconfig +13 -0
index e861b53..9a62ddd 100644
@@ -29,6 +29,19 @@ config I2C_CROS_EC_TUNNEL
 	  I2C or LPC). Some Chromebooks use this when the hardware design
 	  does not allow direct access to the main PMIC from the AP.
 
+config I2C_CROS_EC_LDO
+	bool "Provide access to LDOs on the Chrome OS EC"
+	depends on CROS_EC
+	---help---
+	On many Chromebooks the main PMIC is inaccessible to the AP. This is
+	often dealt with by using an I2C pass-through interface provided by
+	the EC. On some unfortunate models (e.g. Spring) the pass-through
+	is not available, and an LDO message is available instead. This
+	option enables a driver which provides very basic access to those
+	regulators, via the EC. We implement this as an I2C bus	which
+	emulates just the TPS65090 messages we know about. This is done to
+	avoid duplicating the logic in the TPS65090 regulator driver for
+	enabling/disabling an LDO.
 
 config DM_I2C_GPIO
 	bool "Enable Driver Model for software emulated I2C bus driver"
drivers/i2c/Makefile +1 -0
index 7f01fce..9b45248 100644
@@ -8,6 +8,7 @@ obj-$(CONFIG_DM_I2C) += i2c-uclass.o
 obj-$(CONFIG_DM_I2C_COMPAT) += i2c-uclass-compat.o
 obj-$(CONFIG_DM_I2C_GPIO) += i2c-gpio.o
 obj-$(CONFIG_I2C_CROS_EC_TUNNEL) += cros_ec_tunnel.o
+obj-$(CONFIG_I2C_CROS_EC_LDO) += cros_ec_ldo.o
 
 obj-$(CONFIG_SYS_I2C_ADI) += adi_i2c.o
 obj-$(CONFIG_I2C_MV) += mv_i2c.o
drivers/i2c/cros_ec_ldo.c new file +77 -0

77 lines not on this page · raw message

drivers/misc/cros_ec.c +11 -10
index ae52561..6027177 100644
@@ -931,31 +931,32 @@ int cros_ec_write_vbnvcontext(struct cros_ec_dev *dev, const uint8_t *block)
 	return 0;
 }
 
-int cros_ec_set_ldo(struct cros_ec_dev *dev, uint8_t index, uint8_t state)
+int cros_ec_set_ldo(struct udevice *dev, uint8_t index, uint8_t state)
 {
+	struct cros_ec_dev *cdev = dev_get_uclass_priv(dev);
 	struct ec_params_ldo_set params;
 
 	params.index = index;
 	params.state = state;
 
-	if (ec_command_inptr(dev, EC_CMD_LDO_SET, 0,
-		       &params, sizeof(params),
-		       NULL, 0))
+	if (ec_command_inptr(cdev, EC_CMD_LDO_SET, 0, &params, sizeof(params),
+			     NULL, 0))
 		return -1;
 
 	return 0;
 }
 
-int cros_ec_get_ldo(struct cros_ec_dev *dev, uint8_t index, uint8_t *state)
+int cros_ec_get_ldo(struct udevice *dev, uint8_t index, uint8_t *state)
 {
+	struct cros_ec_dev *cdev = dev_get_uclass_priv(dev);
 	struct ec_params_ldo_get params;
 	struct ec_response_ldo_get *resp;
 
 	params.index = index;
 
-	if (ec_command_inptr(dev, EC_CMD_LDO_GET, 0,
-		       &params, sizeof(params),
-		       (uint8_t **)&resp, sizeof(*resp)) != sizeof(*resp))
+	if (ec_command_inptr(cdev, EC_CMD_LDO_GET, 0, &params, sizeof(params),
+			     (uint8_t **)&resp, sizeof(*resp)) !=
+			     sizeof(*resp))
 		return -1;
 
 	*state = resp->state;
@@ -1681,9 +1682,9 @@ static int do_cros_ec(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 			state = simple_strtoul(argv[3], &endp, 10);
 			if (*argv[3] == 0 || *endp != 0)
 				return CMD_RET_USAGE;
-			ret = cros_ec_set_ldo(dev, index, state);
+			ret = cros_ec_set_ldo(udev, index, state);
 		} else {
-			ret = cros_ec_get_ldo(dev, index, &state);
+			ret = cros_ec_get_ldo(udev, index, &state);
 			if (!ret) {
 				printf("LDO%d: %s\n", index,
 					state == EC_LDO_STATE_ON ?
include/cros_ec.h +2 -2
index 41951c3..0ad9d81 100644
@@ -350,7 +350,7 @@ int cros_ec_read_build_info(struct cros_ec_dev *dev, char **strp);
  * @param state		new state of the LDO/FET : EC_LDO_STATE_ON|OFF
  * @return 0 if ok, -1 on error
  */
-int cros_ec_set_ldo(struct cros_ec_dev *dev, uint8_t index, uint8_t state);
+int cros_ec_set_ldo(struct udevice *dev, uint8_t index, uint8_t state);
 
 /**
  * Read back a LDO / FET current state.
@@ -360,7 +360,7 @@ int cros_ec_set_ldo(struct cros_ec_dev *dev, uint8_t index, uint8_t state);
  * @param state		current state of the LDO/FET : EC_LDO_STATE_ON|OFF
  * @return 0 if ok, -1 on error
  */
-int cros_ec_get_ldo(struct cros_ec_dev *dev, uint8_t index, uint8_t *state);
+int cros_ec_get_ldo(struct udevice *dev, uint8_t index, uint8_t *state);
 
 /**
  * Get access to the error reported when cros_ec_board_init() was called
Signature · 1 line
2.4.3.573.g4eafbef
#47 lore raw

PATCH 16/55 exynos: serial: Refactor init code for debug UART

In reply to Simon Glass

The debug UART code needs to perform the same init as the normal UART driver. In preparation for this, move the init code into two functions, one for the basic init and one for setting the baud rate. This will make adding debug UART support easier.

---

 drivers/serial/serial_s5p.c | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)
drivers/serial/serial_s5p.c +24 -12
index 8469afd..7abec53 100644
@@ -14,8 +14,8 @@
 #include <fdtdec.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
-#include <asm/arch/uart.h>
 #include <asm/arch/clk.h>
+#include <asm/arch/uart.h>
 #include <serial.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -59,11 +59,20 @@ static const int udivslot[] = {
 	0xffdf,
 };
 
-int s5p_serial_setbrg(struct udevice *dev, int baudrate)
+static void __maybe_unused s5p_serial_init(struct s5p_uart *uart)
+{
+	/* enable FIFOs, auto clear Rx FIFO */
+	writel(0x3, &uart->ufcon);
+	writel(0, &uart->umcon);
+	/* 8N1 */
+	writel(0x3, &uart->ulcon);
+	/* No interrupts, no DMA, pure polling */
+	writel(0x245, &uart->ucon);
+}
+
+static void __maybe_unused s5p_serial_baud(struct s5p_uart *uart, uint uclk,
+					   int baudrate)
 {
-	struct s5p_serial_platdata *plat = dev->platdata;
-	struct s5p_uart *const uart = plat->reg;
-	u32 uclk = get_uart_clk(plat->port_id);
 	u32 val;
 
 	val = uclk / baudrate;
@@ -74,6 +83,15 @@ int s5p_serial_setbrg(struct udevice *dev, int baudrate)
 		writew(udivslot[val % 16], &uart->rest.slot);
 	else
 		writeb(val % 16, &uart->rest.value);
+}
+
+int s5p_serial_setbrg(struct udevice *dev, int baudrate)
+{
+	struct s5p_serial_platdata *plat = dev->platdata;
+	struct s5p_uart *const uart = plat->reg;
+	u32 uclk = get_uart_clk(plat->port_id);
+
+	s5p_serial_baud(uart, uclk, baudrate);
 
 	return 0;
 }
@@ -83,13 +101,7 @@ static int s5p_serial_probe(struct udevice *dev)
 	struct s5p_serial_platdata *plat = dev->platdata;
 	struct s5p_uart *const uart = plat->reg;
 
-	/* enable FIFOs, auto clear Rx FIFO */
-	writel(0x3, &uart->ufcon);
-	writel(0, &uart->umcon);
-	/* 8N1 */
-	writel(0x3, &uart->ulcon);
-	/* No interrupts, no DMA, pure polling */
-	writel(0x245, &uart->ucon);
+	s5p_serial_init(uart);
 
 	return 0;
 }
Signature · 1 line
2.4.3.573.g4eafbef
#48 lore raw

PATCH 16/55 exynos: serial: Refactor init code for debug UART

Quoted 10 lines · Simon Glass

The debug UART code needs to perform the same init as the normal UART driver. In preparation for this, move the init code into two functions, one for the basic init and one for setting the baud rate. This will make adding debug UART support easier.

---

 drivers/serial/serial_s5p.c | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

Applied to u-boot-dm.

#49 lore raw

PATCH 17/55 exynos: Add debug UART support for Samsung S5P serial

In reply to Simon Glass

Add a debug UART implementation for this serial driver. It does not set up pinmux automatically - this must be done before calling debug_uart_init().

---

 drivers/serial/Kconfig      |  7 +++++++
 drivers/serial/serial_s5p.c | 25 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
drivers/serial/Kconfig +7 -0
index 4829284..e51f915 100644
@@ -44,6 +44,13 @@ config DEBUG_UART_NS16550
 	  will need to provide parameters to make this work. The driver will
 	  be available until the real driver model serial is running.
 
+config DEBUG_UART_S5P
+	bool "Samsung S5P"
+	help
+	  Select this to enable a debug UART using the serial_s5p driver. You
+	  will need to provide parameters to make this work. The driver will
+	  be available until the real driver-model serial is running.
+
 endchoice
 
 config DEBUG_UART_BASE
drivers/serial/serial_s5p.c +25 -0
index 7abec53..4a553a3 100644
@@ -200,3 +200,28 @@ U_BOOT_DRIVER(serial_s5p) = {
 	.ops	= &s5p_serial_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
+
+#ifdef CONFIG_DEBUG_UART_S5P
+
+#include <debug_uart.h>
+
+void debug_uart_init(void)
+{
+	struct s5p_uart *uart = (struct s5p_uart *)CONFIG_DEBUG_UART_BASE;
+
+	s5p_serial_init(uart);
+	s5p_serial_baud(uart, CONFIG_DEBUG_UART_CLOCK, CONFIG_BAUDRATE);
+}
+
+static inline void _debug_uart_putc(int ch)
+{
+	struct s5p_uart *uart = (struct s5p_uart *)CONFIG_DEBUG_UART_BASE;
+
+	while (readl(&uart->ufstat) & TX_FIFO_FULL);
+
+	writeb(ch, &uart->utxh);
+}
+
+DEBUG_UART_FUNCS
+
+#endif
Signature · 1 line
2.4.3.573.g4eafbef
#50 lore raw

PATCH 17/55 exynos: Add debug UART support for Samsung S5P serial

Quoted 9 lines · Simon Glass

Add a debug UART implementation for this serial driver. It does not set up pinmux automatically - this must be done before calling debug_uart_init().

---

 drivers/serial/Kconfig      |  7 +++++++
 drivers/serial/serial_s5p.c | 25 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

Applied to u-boot-dm.

#51 lore raw

PATCH 18/55 exynos: Enable the debug UART in SPL

In reply to Simon Glass

As a debugging aid, allow UART3 to be used as a debug UART in SPL. This is a precursor to proper UART support, which requires a substantial refactor.

---

 arch/arm/cpu/armv7/exynos/lowlevel_init.c | 5 +++++
 drivers/serial/serial_s5p.c               | 2 ++
 2 files changed, 7 insertions(+)
arch/arm/cpu/armv7/exynos/lowlevel_init.c +5 -0
index 120aaf8..3774607 100644
@@ -25,6 +25,7 @@
 
 #include <common.h>
 #include <config.h>
+#include <debug_uart.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/dmc.h>
 #include <asm/arch/power.h>
@@ -216,6 +217,10 @@ int do_lowlevel_init(void)
 
 	if (actions & DO_CLOCKS) {
 		system_clock_init();
+#ifdef CONFIG_DEBUG_UART
+		exynos_pinmux_config(PERIPH_ID_UART3, PINMUX_FLAG_NONE);
+		debug_uart_init();
+#endif
 		mem_ctrl_init(actions & DO_MEM_RESET);
 		tzpc_init();
 	}
drivers/serial/serial_s5p.c +2 -0
index 4a553a3..21cb566 100644
@@ -85,6 +85,7 @@ static void __maybe_unused s5p_serial_baud(struct s5p_uart *uart, uint uclk,
 		writeb(val % 16, &uart->rest.value);
 }
 
+#ifndef CONFIG_SPL_BUILD
 int s5p_serial_setbrg(struct udevice *dev, int baudrate)
 {
 	struct s5p_serial_platdata *plat = dev->platdata;
@@ -200,6 +201,7 @@ U_BOOT_DRIVER(serial_s5p) = {
 	.ops	= &s5p_serial_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
+#endif
 
 #ifdef CONFIG_DEBUG_UART_S5P
 
Signature · 1 line
2.4.3.573.g4eafbef
#52 lore raw

PATCH 18/55 exynos: Enable the debug UART in SPL

Quoted 10 lines · Simon Glass

As a debugging aid, allow UART3 to be used as a debug UART in SPL. This is a precursor to proper UART support, which requires a substantial refactor.

---

 arch/arm/cpu/armv7/exynos/lowlevel_init.c | 5 +++++
 drivers/serial/serial_s5p.c               | 2 ++
 2 files changed, 7 insertions(+)

Applied to u-boot-dm.

#53 lore raw

PATCH 19/55 dm: gpio: Add support for setting a GPIO's pull direction

In reply to Simon Glass

At present the driver model GPIO API does not support pull-up/pull-down on input GPIOs. This is required in some cases.

Add this feature to the API with two new methods that drivers can optionally implement.

---

 drivers/gpio/gpio-uclass.c | 31 +++++++++++++++++++++++++++++++
 include/asm-generic/gpio.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
drivers/gpio/gpio-uclass.c +31 -0
index 4efda31..c4ba580 100644
@@ -374,6 +374,37 @@ int dm_gpio_set_dir(struct gpio_desc *desc)
 	return dm_gpio_set_dir_flags(desc, desc->flags);
 }
 
+int dm_gpio_set_pull(struct gpio_desc *desc, enum gpio_pull pull)
+{
+	struct dm_gpio_ops *ops = gpio_get_ops(desc->dev);
+	int ret;
+
+	ret = check_reserved(desc, "set_pull");
+	if (ret)
+		return ret;
+
+	if (!ops->set_pull)
+		return -ENOSYS;
+
+	return ops->set_pull(desc->dev, desc->offset, pull);
+}
+
+int dm_gpio_get_pull(struct gpio_desc *desc, unsigned offset)
+{
+	struct dm_gpio_ops *ops = gpio_get_ops(desc->dev);
+	int ret;
+
+	ret = check_reserved(desc, "get_pull");
+	if (ret)
+		return ret;
+
+	if (!ops->get_pull)
+		return -ENOSYS;
+
+	return ops->get_pull(desc->dev, desc->offset);
+}
+
+
 /**
  * gpio_get_value() - [COMPAT] Sample GPIO pin and return it's value
  * gpio:	GPIO number
include/asm-generic/gpio.h +46 -0

64 lines not on this page · raw message

Signature · 1 line
2.4.3.573.g4eafbef
#54 lore raw

PATCH 19/55 dm: gpio: Add support for setting a GPIO's pull direction

Hi Simon,

2015-07-03 9:15 GMT+09:00 Simon Glass <[email protected]>:

Quoted 89 lines

At present the driver model GPIO API does not support pull-up/pull-down on input GPIOs. This is required in some cases.

Add this feature to the API with two new methods that drivers can optionally implement.

---

 drivers/gpio/gpio-uclass.c | 31 +++++++++++++++++++++++++++++++
 include/asm-generic/gpio.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
drivers/gpio/gpio-uclass.c +31 -0
index 4efda31..c4ba580 100644
@@ -374,6 +374,37 @@ int dm_gpio_set_dir(struct gpio_desc *desc)
        return dm_gpio_set_dir_flags(desc, desc->flags);
 }
 
+int dm_gpio_set_pull(struct gpio_desc *desc, enum gpio_pull pull)
+{
+       struct dm_gpio_ops *ops = gpio_get_ops(desc->dev);
+       int ret;
+
+       ret = check_reserved(desc, "set_pull");
+       if (ret)
+               return ret;
+
+       if (!ops->set_pull)
+               return -ENOSYS;
+
+       return ops->set_pull(desc->dev, desc->offset, pull);
+}
+
+int dm_gpio_get_pull(struct gpio_desc *desc, unsigned offset)
+{
+       struct dm_gpio_ops *ops = gpio_get_ops(desc->dev);
+       int ret;
+
+       ret = check_reserved(desc, "get_pull");
+       if (ret)
+               return ret;
+
+       if (!ops->get_pull)
+               return -ENOSYS;
+
+       return ops->get_pull(desc->dev, desc->offset);
+}
+
+
 /**
  * gpio_get_value() - [COMPAT] Sample GPIO pin and return it's value
  * gpio:       GPIO number
include/asm-generic/gpio.h +19 -0
index 0af599f..db5504f 100644
@@ -126,6 +126,13 @@ struct gpio_desc {
         */
 };
 
+/* GPIO pull directions (used for input lines) */
+enum gpio_pull {
+       GPIO_PULL_NONE,
+       GPIO_PULL_DOWN,
+       GPIO_PULL_UP,
+};
+
 /**
  * dm_gpio_is_valid() - Check if a GPIO is valid
  *
@@ -276,6 +283,26 @@ struct dm_gpio_ops {
         */
        int (*xlate)(struct udevice *dev, struct gpio_desc *desc,
                     struct fdtdec_phandle_args *args);
+
+       /**
+        * set_pull() - set pull direction
+        *
+        * @dev:        Device to adjust
+        * @offset:     GPIO offset within device
+        * @pull:       New pull direction
+        * @return 0 if OK, -ve on error
+        */
+       int (*set_pull)(struct udevice *dev, unsigned offset,
+                       enum gpio_pull pull);
+

include/asm-generic/gpio.h struct dm_gpio_ops { · line 307

Quoted 10 lines
include/asm-generic/gpio.h +8 -0
+       /**
+        * get_pull() - get pull direction
+        *
+        * @dev:        Device to check
+        * @offset:     GPIO offset within device
+        * @return current pull direction or -ve on error
+        */
+       int (*get_pull)(struct udevice *dev, unsigned offset);
 };
 

Do you want to control pull-up/down only for GPIOs? Pin-biasing makes sense for dedicated functions as well as GPIOs. At least, I am inclined to enable pull-up registers for SCL/SDA (I2C) pins on my boards.

As far as I know, in Linux, such stuff is handled in pinctrl drivers. I see no .set_pull() callback in struct gpio_chip in Linux.

As far as I see your pinctrl implementation,
(http://patchwork.ozlabs.org/patch/487801/)
it looks like "pinctrl = pinmuxing" in U-Boot, whereas "pinctrl = pinmuxing + pin-configuration" in Linux.

Signature · 2 lines
Best Regards
Masahiro Yamada
#55 lore raw

PATCH 19/55 dm: gpio: Add support for setting a GPIO's pull direction

Hi Masahiro,

Quoted 110 lines · Masahiro Yamada

Hi Simon,

2015-07-03 9:15 GMT+09:00 Simon Glass <[email protected]>:

Quoted 89 lines

At present the driver model GPIO API does not support pull-up/pull-down on input GPIOs. This is required in some cases.

Add this feature to the API with two new methods that drivers can optionally implement.

---

 drivers/gpio/gpio-uclass.c | 31 +++++++++++++++++++++++++++++++
 include/asm-generic/gpio.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
drivers/gpio/gpio-uclass.c +31 -0
index 4efda31..c4ba580 100644
@@ -374,6 +374,37 @@ int dm_gpio_set_dir(struct gpio_desc *desc)
        return dm_gpio_set_dir_flags(desc, desc->flags);
 }
 
+int dm_gpio_set_pull(struct gpio_desc *desc, enum gpio_pull pull)
+{
+       struct dm_gpio_ops *ops = gpio_get_ops(desc->dev);
+       int ret;
+
+       ret = check_reserved(desc, "set_pull");
+       if (ret)
+               return ret;
+
+       if (!ops->set_pull)
+               return -ENOSYS;
+
+       return ops->set_pull(desc->dev, desc->offset, pull);
+}
+
+int dm_gpio_get_pull(struct gpio_desc *desc, unsigned offset)
+{
+       struct dm_gpio_ops *ops = gpio_get_ops(desc->dev);
+       int ret;
+
+       ret = check_reserved(desc, "get_pull");
+       if (ret)
+               return ret;
+
+       if (!ops->get_pull)
+               return -ENOSYS;
+
+       return ops->get_pull(desc->dev, desc->offset);
+}
+
+
 /**
  * gpio_get_value() - [COMPAT] Sample GPIO pin and return it's value
  * gpio:       GPIO number
include/asm-generic/gpio.h +19 -0
index 0af599f..db5504f 100644
@@ -126,6 +126,13 @@ struct gpio_desc {
         */
 };
 
+/* GPIO pull directions (used for input lines) */
+enum gpio_pull {
+       GPIO_PULL_NONE,
+       GPIO_PULL_DOWN,
+       GPIO_PULL_UP,
+};
+
 /**
  * dm_gpio_is_valid() - Check if a GPIO is valid
  *
@@ -276,6 +283,26 @@ struct dm_gpio_ops {
         */
        int (*xlate)(struct udevice *dev, struct gpio_desc *desc,
                     struct fdtdec_phandle_args *args);
+
+       /**
+        * set_pull() - set pull direction
+        *
+        * @dev:        Device to adjust
+        * @offset:     GPIO offset within device
+        * @pull:       New pull direction
+        * @return 0 if OK, -ve on error
+        */
+       int (*set_pull)(struct udevice *dev, unsigned offset,
+                       enum gpio_pull pull);
+

include/asm-generic/gpio.h struct dm_gpio_ops { · line 307

Quoted 10 lines
include/asm-generic/gpio.h +8 -0
+       /**
+        * get_pull() - get pull direction
+        *
+        * @dev:        Device to check
+        * @offset:     GPIO offset within device
+        * @return current pull direction or -ve on error
+        */
+       int (*get_pull)(struct udevice *dev, unsigned offset);
 };
 

Do you want to control pull-up/down only for GPIOs? Pin-biasing makes sense for dedicated functions as well as GPIOs. At least, I am inclined to enable pull-up registers for SCL/SDA (I2C) pins on my boards.

Quoted 7 lines

As far as I know, in Linux, such stuff is handled in pinctrl drivers. I see no .set_pull() callback in struct gpio_chip in Linux.

As far as I see your pinctrl implementation,
(http://patchwork.ozlabs.org/patch/487801/)
it looks like "pinctrl = pinmuxing" in U-Boot, whereas "pinctrl = pinmuxing + pin-configuration" in Linux.

That's true, but still it is useful to be able to set pull direction for GPIOs. I did sent a pinctrl uclass patch recently. Perhaps we could add a new function there. But how would we identify which pin to change? The GPIO pin name is convenient but may not be available in the pinctrl driver, since this adds a lot of size to the device tree.

Regards,
Simon

#56 lore raw

PATCH 19/55 dm: gpio: Add support for setting a GPIO's pull direction

Hi Simon,

2015-07-07 1:39 GMT+09:00 Simon Glass <[email protected]>:

Quoted 121 lines

Hi Masahiro,

Quoted 110 lines · Masahiro Yamada

Hi Simon,

2015-07-03 9:15 GMT+09:00 Simon Glass <[email protected]>:

Quoted 89 lines

At present the driver model GPIO API does not support pull-up/pull-down on input GPIOs. This is required in some cases.

Add this feature to the API with two new methods that drivers can optionally implement.

---

 drivers/gpio/gpio-uclass.c | 31 +++++++++++++++++++++++++++++++
 include/asm-generic/gpio.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
drivers/gpio/gpio-uclass.c +31 -0
index 4efda31..c4ba580 100644
@@ -374,6 +374,37 @@ int dm_gpio_set_dir(struct gpio_desc *desc)
        return dm_gpio_set_dir_flags(desc, desc->flags);
 }
 
+int dm_gpio_set_pull(struct gpio_desc *desc, enum gpio_pull pull)
+{
+       struct dm_gpio_ops *ops = gpio_get_ops(desc->dev);
+       int ret;
+
+       ret = check_reserved(desc, "set_pull");
+       if (ret)
+               return ret;
+
+       if (!ops->set_pull)
+               return -ENOSYS;
+
+       return ops->set_pull(desc->dev, desc->offset, pull);
+}
+
+int dm_gpio_get_pull(struct gpio_desc *desc, unsigned offset)
+{
+       struct dm_gpio_ops *ops = gpio_get_ops(desc->dev);
+       int ret;
+
+       ret = check_reserved(desc, "get_pull");
+       if (ret)
+               return ret;
+
+       if (!ops->get_pull)
+               return -ENOSYS;
+
+       return ops->get_pull(desc->dev, desc->offset);
+}
+
+
 /**
  * gpio_get_value() - [COMPAT] Sample GPIO pin and return it's value
  * gpio:       GPIO number
include/asm-generic/gpio.h +19 -0
index 0af599f..db5504f 100644
@@ -126,6 +126,13 @@ struct gpio_desc {
         */
 };
 
+/* GPIO pull directions (used for input lines) */
+enum gpio_pull {
+       GPIO_PULL_NONE,
+       GPIO_PULL_DOWN,
+       GPIO_PULL_UP,
+};
+
 /**
  * dm_gpio_is_valid() - Check if a GPIO is valid
  *
@@ -276,6 +283,26 @@ struct dm_gpio_ops {
         */
        int (*xlate)(struct udevice *dev, struct gpio_desc *desc,
                     struct fdtdec_phandle_args *args);
+
+       /**
+        * set_pull() - set pull direction
+        *
+        * @dev:        Device to adjust
+        * @offset:     GPIO offset within device
+        * @pull:       New pull direction
+        * @return 0 if OK, -ve on error
+        */
+       int (*set_pull)(struct udevice *dev, unsigned offset,
+                       enum gpio_pull pull);
+

include/asm-generic/gpio.h struct dm_gpio_ops { · line 307

Quoted 10 lines
include/asm-generic/gpio.h +8 -0
+       /**
+        * get_pull() - get pull direction
+        *
+        * @dev:        Device to check
+        * @offset:     GPIO offset within device
+        * @return current pull direction or -ve on error
+        */
+       int (*get_pull)(struct udevice *dev, unsigned offset);
 };
 

Do you want to control pull-up/down only for GPIOs? Pin-biasing makes sense for dedicated functions as well as GPIOs. At least, I am inclined to enable pull-up registers for SCL/SDA (I2C) pins on my boards.

Quoted 7 lines

As far as I know, in Linux, such stuff is handled in pinctrl drivers. I see no .set_pull() callback in struct gpio_chip in Linux.

As far as I see your pinctrl implementation,
(http://patchwork.ozlabs.org/patch/487801/)
it looks like "pinctrl = pinmuxing" in U-Boot, whereas "pinctrl = pinmuxing + pin-configuration" in Linux.

Quoted 5 lines

That's true, but still it is useful to be able to set pull direction for GPIOs. I did sent a pinctrl uclass patch recently. Perhaps we could add a new function there. But how would we identify which pin to change? The GPIO pin name is convenient but may not be available in the pinctrl driver, since this adds a lot of size to the device tree.

As you may already know, in Linux, GPIO numbers are mapped into pin numbers via "gpio-ranges" property, but we need much effort
to implement the framework in U-Boot.

Do you think it would make sense to support full-spec pinctrl drivers
(much closer to Linux's one) in U-Boot? Or is it crazy?

I just skimmed over your pinctrl patches, but
I could not understand fully how it works. (especially, .get_periph_id).

I will leave some comments on your rockchip pinctrl patch.

Signature · 2 lines
Best Regards
Masahiro Yamada
#57 lore raw

PATCH 19/55 dm: gpio: Add support for setting a GPIO's pull direction

Hi Masahiro,

Quoted 133 lines · Masahiro Yamada

Hi Simon,

2015-07-07 1:39 GMT+09:00 Simon Glass <[email protected]>:

Quoted 121 lines

Hi Masahiro,

Quoted 110 lines · Masahiro Yamada

Hi Simon,

2015-07-03 9:15 GMT+09:00 Simon Glass <[email protected]>:

Quoted 89 lines

At present the driver model GPIO API does not support pull-up/pull-down on input GPIOs. This is required in some cases.

Add this feature to the API with two new methods that drivers can optionally implement.

---

 drivers/gpio/gpio-uclass.c | 31 +++++++++++++++++++++++++++++++
 include/asm-generic/gpio.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
drivers/gpio/gpio-uclass.c +31 -0
index 4efda31..c4ba580 100644
@@ -374,6 +374,37 @@ int dm_gpio_set_dir(struct gpio_desc *desc)
        return dm_gpio_set_dir_flags(desc, desc->flags);
 }
 
+int dm_gpio_set_pull(struct gpio_desc *desc, enum gpio_pull pull)
+{
+       struct dm_gpio_ops *ops = gpio_get_ops(desc->dev);
+       int ret;
+
+       ret = check_reserved(desc, "set_pull");
+       if (ret)
+               return ret;
+
+       if (!ops->set_pull)
+               return -ENOSYS;
+
+       return ops->set_pull(desc->dev, desc->offset, pull);
+}
+
+int dm_gpio_get_pull(struct gpio_desc *desc, unsigned offset)
+{
+       struct dm_gpio_ops *ops = gpio_get_ops(desc->dev);
+       int ret;
+
+       ret = check_reserved(desc, "get_pull");
+       if (ret)
+               return ret;
+
+       if (!ops->get_pull)
+               return -ENOSYS;
+
+       return ops->get_pull(desc->dev, desc->offset);
+}
+
+
 /**
  * gpio_get_value() - [COMPAT] Sample GPIO pin and return it's value
  * gpio:       GPIO number
include/asm-generic/gpio.h +19 -0
index 0af599f..db5504f 100644
@@ -126,6 +126,13 @@ struct gpio_desc {
         */
 };
 
+/* GPIO pull directions (used for input lines) */
+enum gpio_pull {
+       GPIO_PULL_NONE,
+       GPIO_PULL_DOWN,
+       GPIO_PULL_UP,
+};
+
 /**
  * dm_gpio_is_valid() - Check if a GPIO is valid
  *
@@ -276,6 +283,26 @@ struct dm_gpio_ops {
         */
        int (*xlate)(struct udevice *dev, struct gpio_desc *desc,
                     struct fdtdec_phandle_args *args);
+
+       /**
+        * set_pull() - set pull direction
+        *
+        * @dev:        Device to adjust
+        * @offset:     GPIO offset within device
+        * @pull:       New pull direction
+        * @return 0 if OK, -ve on error
+        */
+       int (*set_pull)(struct udevice *dev, unsigned offset,
+                       enum gpio_pull pull);
+

include/asm-generic/gpio.h struct dm_gpio_ops { · line 307

Quoted 10 lines
include/asm-generic/gpio.h +8 -0
+       /**
+        * get_pull() - get pull direction
+        *
+        * @dev:        Device to check
+        * @offset:     GPIO offset within device
+        * @return current pull direction or -ve on error
+        */
+       int (*get_pull)(struct udevice *dev, unsigned offset);
 };
 

Do you want to control pull-up/down only for GPIOs? Pin-biasing makes sense for dedicated functions as well as GPIOs. At least, I am inclined to enable pull-up registers for SCL/SDA (I2C) pins on my boards.

Quoted 7 lines

As far as I know, in Linux, such stuff is handled in pinctrl drivers. I see no .set_pull() callback in struct gpio_chip in Linux.

As far as I see your pinctrl implementation,
(http://patchwork.ozlabs.org/patch/487801/)
it looks like "pinctrl = pinmuxing" in U-Boot, whereas "pinctrl = pinmuxing + pin-configuration" in Linux.

Quoted 5 lines

That's true, but still it is useful to be able to set pull direction for GPIOs. I did sent a pinctrl uclass patch recently. Perhaps we could add a new function there. But how would we identify which pin to change? The GPIO pin name is convenient but may not be available in the pinctrl driver, since this adds a lot of size to the device tree.

Quoted 6 lines

As you may already know, in Linux, GPIO numbers are mapped into pin numbers via "gpio-ranges" property, but we need much effort
to implement the framework in U-Boot.

Do you think it would make sense to support full-spec pinctrl drivers
(much closer to Linux's one) in U-Boot? Or is it crazy?

We can do - it's not that hard. The pinctrl patch I sent is more low-spec. But we can expand it later.

Quoted 3 lines

I just skimmed over your pinctrl patches, but
I could not understand fully how it works. (especially, .get_periph_id).

The idea is that in U-Boot it is convenient to reference peripherals with an ID, which we can use to set up a clock, or pinmux. So we want to find out the ID for a device.

Quoted 3 lines

I will leave some comments on your rockchip pinctrl patch.

OK thanks.

Regards,
Simon

#58 lore raw

PATCH 20/55 dm: exynos: gpio: Support pull-up/down in GPIOs

In reply to Simon Glass

Add support for pull direction to the exynos GPIO driver.

---

 drivers/gpio/s5p_gpio.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
drivers/gpio/s5p_gpio.c +15 -0
index 49b1054..b516968 100644
@@ -261,6 +261,20 @@ void gpio_set_rate(int gpio, int mode)
 			  s5p_gpio_get_pin(gpio), mode);
 }
 
+int exynos_set_pull(struct udevice *dev, unsigned offset, enum gpio_pull pull)
+{
+	struct exynos_bank_info *state = dev_get_priv(dev);
+	int val = S5P_GPIO_PULL_NONE;
+
+	if (pull == GPIO_PULL_DOWN)
+		val = S5P_GPIO_PULL_DOWN;
+	else if (pull == GPIO_PULL_UP)
+		val = S5P_GPIO_PULL_UP;
+	s5p_gpio_set_pull(state->bank, offset, val);
+
+	return 0;
+}
+
 #ifndef CONFIG_SPL_BUILD
 static int exynos_gpio_get_function(struct udevice *dev, unsigned offset)
 {
@@ -290,6 +304,7 @@ static const struct dm_gpio_ops gpio_exynos_ops = {
 	.direction_output	= exynos_gpio_direction_output,
 	.get_value		= exynos_gpio_get_value,
 	.set_value		= exynos_gpio_set_value,
+	.set_pull		= exynos_set_pull,
 	.get_function		= exynos_gpio_get_function,
 	.xlate			= exynos_gpio_xlate,
 };
Signature · 1 line
2.4.3.573.g4eafbef
#59 lore raw

PATCH 21/55 dm: power: Add a new driver for the TPS65090 PMIC

In reply to Simon Glass

The existing TPS65090 driver does not support driver model. Add a new one that does. This can be used as a base for a regulator driver also. It uses the standard device tree binding.

---

 drivers/power/pmic/Kconfig    |  9 +++++
 drivers/power/pmic/Makefile   |  1 +
 drivers/power/pmic/tps65090.c | 94 +++++++++++++++++++++++++++++++++++++++++++
 include/power/tps65090.h      | 56 ++++++++++++++++++++++++++
 4 files changed, 160 insertions(+)
 create mode 100644 drivers/power/pmic/tps65090.c
 create mode 100644 include/power/tps65090.h
drivers/power/pmic/Kconfig +9 -0
index 164f421..fd8af81 100644
@@ -41,3 +41,12 @@ config DM_PMIC_SANDBOX
 	  - set by i2c emul driver's probe() (defaults in header)
 
 	Driver binding info: doc/device-tree-bindings/pmic/sandbox.txt
+
+config PMIC_TPS65090
+	bool "Enable driver for Texas Instruments TPS65090 PMIC"
+	depends on DM_PMIC
+	---help---
+	The TPS65090 is a PMIC containing several LDOs, DC to DC convertors,
+	FETs and a battery charger. This driver provides register access
+	only, and you can enable the regulator/charger drivers separately if
+	required.
drivers/power/pmic/Makefile +1 -0
index ae86f04..2316e3b 100644
@@ -8,6 +8,7 @@
 obj-$(CONFIG_DM_PMIC) += pmic-uclass.o
 obj-$(CONFIG_DM_PMIC_MAX77686) += max77686.o
 obj-$(CONFIG_DM_PMIC_SANDBOX) += sandbox.o i2c_pmic_emul.o
+obj-$(CONFIG_PMIC_TPS65090) += tps65090.o
 obj-$(CONFIG_POWER_LTC3676) += pmic_ltc3676.o
 obj-$(CONFIG_POWER_MAX8998) += pmic_max8998.o
 obj-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
drivers/power/pmic/tps65090.c new file +94 -0

94 lines not on this page · raw message

include/power/tps65090.h new file +56 -0

56 lines not on this page · raw message

Signature · 1 line
2.4.3.573.g4eafbef
#60 lore raw

PATCH 21/55 dm: power: Add a new driver for the TPS65090 PMIC

Hello Simon,

Quoted 197 lines · Simon Glass

The existing TPS65090 driver does not support driver model. Add a new one that does. This can be used as a base for a regulator driver also. It uses the standard device tree binding.

---

  drivers/power/pmic/Kconfig    |  9 +++++
  drivers/power/pmic/Makefile   |  1 +
  drivers/power/pmic/tps65090.c | 94 +++++++++++++++++++++++++++++++++++++++++++
  include/power/tps65090.h      | 56 ++++++++++++++++++++++++++
  4 files changed, 160 insertions(+)

create mode 100644 drivers/power/pmic/tps65090.c create mode 100644 include/power/tps65090.h

drivers/power/pmic/Kconfig +9 -0
index 164f421..fd8af81 100644
@@ -41,3 +41,12 @@ config DM_PMIC_SANDBOX
  	  - set by i2c emul driver's probe() (defaults in header)
 
  	Driver binding info: doc/device-tree-bindings/pmic/sandbox.txt
+
+config PMIC_TPS65090
+	bool "Enable driver for Texas Instruments TPS65090 PMIC"
+	depends on DM_PMIC
+	---help---
+	The TPS65090 is a PMIC containing several LDOs, DC to DC convertors,
+	FETs and a battery charger. This driver provides register access
+	only, and you can enable the regulator/charger drivers separately if
+	required.
drivers/power/pmic/Makefile +1 -0
index ae86f04..2316e3b 100644
@@ -8,6 +8,7 @@
  obj-$(CONFIG_DM_PMIC) += pmic-uclass.o
  obj-$(CONFIG_DM_PMIC_MAX77686) += max77686.o
  obj-$(CONFIG_DM_PMIC_SANDBOX) += sandbox.o i2c_pmic_emul.o
+obj-$(CONFIG_PMIC_TPS65090) += tps65090.o
  obj-$(CONFIG_POWER_LTC3676) += pmic_ltc3676.o
  obj-$(CONFIG_POWER_MAX8998) += pmic_max8998.o
  obj-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
drivers/power/pmic/tps65090.c new file +94 -0
new file mode 100644
index 0000000..4797f32
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2015 Google, Inc
+ * Written by Simon Glass <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <fdtdec.h>
+#include <i2c.h>
+#include <power/pmic.h>
+#include <power/tps65090.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static const struct pmic_child_info pmic_children_info[] = {
+	{ .prefix = "fet", .driver = TPS65090_FET_DRIVER },
+	{ },
+};
+
+static int tps65090_reg_count(struct udevice *dev)
+{
+	return TPS65090_NUM_REGS;
+}
+
+static int tps65090_write(struct udevice *dev, uint reg, const uint8_t *buff,
+			  int len)
+{
+	if (dm_i2c_write(dev, reg, buff, len)) {
+		error("write error to device: %p register: %#x!", dev, reg);
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int tps65090_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
+{
+	int ret;
+
+	ret = dm_i2c_read(dev, reg, buff, len);
+	if (ret) {
+		error("read error %d from device: %p register: %#x!", ret, dev,
+		      reg);
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int tps65090_bind(struct udevice *dev)
+{
+	int regulators_node;
+	const void *blob = gd->fdt_blob;
+	int children;
+
+	regulators_node = fdt_subnode_offset(blob, dev->of_offset,
+					     "regulators");
+	if (regulators_node <= 0) {
+		debug("%s: %s regulators subnode not found!", __func__,
+		      dev->name);
+		return -ENXIO;
+	}
+
+	debug("%s: '%s' - found regulators subnode\n", __func__, dev->name);
+
+	children = pmic_bind_children(dev, regulators_node, pmic_children_info);
+	if (!children)
+		debug("%s: %s - no child found\n", __func__, dev->name);
+
+	/* Always return success for this device */
+	return 0;
+}
+
+static struct dm_pmic_ops tps65090_ops = {
+	.reg_count = tps65090_reg_count,
+	.read = tps65090_read,
+	.write = tps65090_write,
+};
+
+static const struct udevice_id tps65090_ids[] = {
+	{ .compatible = "ti,tps65090" },
+	{ }
+};
+
+U_BOOT_DRIVER(pmic_tps65090) = {
+	.name = "tps65090 pmic",
+	.id = UCLASS_PMIC,
+	.of_match = tps65090_ids,
+	.bind = tps65090_bind,
+	.ops = &tps65090_ops,
+};
include/power/tps65090.h new file +46 -0
new file mode 100644
index 0000000..3a0690b
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2015 Google, Inc
+ * Written by Simon Glass <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __TPS65090_PMIC_H_
+#define __TPS65090_PMIC_H_
+
+/* I2C device address for TPS65090 PMU */
+#define TPS65090_I2C_ADDR	0x48
+
+/* TPS65090 register addresses */
+enum {
+	REG_IRQ1 = 0,
+	REG_CG_CTRL0 = 4,
+	REG_CG_STATUS1 = 0xa,
+	REG_FET_BASE = 0xe,	/* Not a real register, FETs count from here */
+	REG_FET1_CTRL,
+	REG_FET2_CTRL,
+	REG_FET3_CTRL,
+	REG_FET4_CTRL,
+	REG_FET5_CTRL,
+	REG_FET6_CTRL,
+	REG_FET7_CTRL,
+	TPS65090_NUM_REGS,
+};
+
+enum {
+	IRQ1_VBATG = 1 << 3,
+	CG_CTRL0_ENC_MASK	= 0x01,
+
+	MAX_FET_NUM	= 7,
+	MAX_CTRL_READ_TRIES = 5,
+
+	/* TPS65090 FET_CTRL register values */
+	FET_CTRL_TOFET		= 1 << 7,  /* Timeout, startup, overload */
+	FET_CTRL_PGFET		= 1 << 4,  /* Power good for FET status */
+	FET_CTRL_WAIT		= 3 << 2,  /* Overcurrent timeout max */
+	FET_CTRL_ADENFET	= 1 << 1,  /* Enable output auto discharge */
+	FET_CTRL_ENFET		= 1 << 0,  /* Enable FET */
+};
+
+enum {
+	/* Status register fields */

include/power/tps65090.h line 56

Quoted 10 lines
include/power/tps65090.h new file +10 -0
+	TPS65090_ST1_OTC	= 1 << 0,
+	TPS65090_ST1_OCC	= 1 << 1,
+	TPS65090_ST1_STATE_SHIFT = 4,
+	TPS65090_ST1_STATE_MASK	= 0xf << TPS65090_ST1_STATE_SHIFT,
+};
+
+/* Drivers name */
+#define TPS65090_FET_DRIVER	"tps65090_fet"
+
+#endif /* __TPS65090_PMIC_H_ */

Regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#61 lore raw

PATCH 21/55 dm: power: Add a new driver for the TPS65090 PMIC

Applied to u-boot-dm.

#62 lore raw

PATCH 22/55 dm: power: Add support for TPS65090 FETs

In reply to Simon Glass

The TPS65090 has 7 FETs which are modelled as regulators. This allows them to be controlled by drivers easier, accessed through the 'regulator' command and used by other drivers.

---

 drivers/power/regulator/Kconfig              |  10 ++
 drivers/power/regulator/Makefile             |   1 +
 drivers/power/regulator/tps65090_regulator.c | 138 +++++++++++++++++++++++++++
 3 files changed, 149 insertions(+)
 create mode 100644 drivers/power/regulator/tps65090_regulator.c
drivers/power/regulator/Kconfig +10 -0
index 6289b83..d090650 100644
@@ -61,3 +61,13 @@ config DM_REGULATOR_SANDBOX
 
 	A detailed information can be found in header: '<power/sandbox_pmic.h>'
 	Binding info: 'doc/device-tree-bindings/pmic/max77686.txt'
+
+config REGULATOR_TPS65090
+	bool "Enable driver for TPS65090 PMIC regulators"
+	depends on PMIC_TPS65090
+	---help---
+	The TPS65090 provides several FETs (Field-effect Transistors,
+	effectively switches) which are supported by this driver as
+	regulators, one for each FET. The standard regulator interface is
+	supported, but it is only possible to turn the regulators on or off.
+	There is no voltage/current control.
drivers/power/regulator/Makefile +1 -0
index 96aa624..43f4d2c 100644
@@ -9,3 +9,4 @@ obj-$(CONFIG_DM_REGULATOR) += regulator-uclass.o
 obj-$(CONFIG_DM_REGULATOR_MAX77686) += max77686.o
 obj-$(CONFIG_DM_REGULATOR_FIXED) += fixed.o
 obj-$(CONFIG_DM_REGULATOR_SANDBOX) += sandbox.o
+obj-$(CONFIG_REGULATOR_TPS65090) += tps65090_regulator.o
drivers/power/regulator/tps65090_regulator.c new file +138 -0

138 lines not on this page · raw message

Signature · 1 line
2.4.3.573.g4eafbef
#63 lore raw

PATCH 22/55 dm: power: Add support for TPS65090 FETs

Hello Simon,

Quoted 175 lines · Simon Glass

The TPS65090 has 7 FETs which are modelled as regulators. This allows them to be controlled by drivers easier, accessed through the 'regulator' command and used by other drivers.

---

  drivers/power/regulator/Kconfig              |  10 ++
  drivers/power/regulator/Makefile             |   1 +
  drivers/power/regulator/tps65090_regulator.c | 138 +++++++++++++++++++++++++++
  3 files changed, 149 insertions(+)

create mode 100644 drivers/power/regulator/tps65090_regulator.c

drivers/power/regulator/Kconfig +10 -0
index 6289b83..d090650 100644
@@ -61,3 +61,13 @@ config DM_REGULATOR_SANDBOX
 
  	A detailed information can be found in header: '<power/sandbox_pmic.h>'
  	Binding info: 'doc/device-tree-bindings/pmic/max77686.txt'
+
+config REGULATOR_TPS65090
+	bool "Enable driver for TPS65090 PMIC regulators"
+	depends on PMIC_TPS65090
+	---help---
+	The TPS65090 provides several FETs (Field-effect Transistors,
+	effectively switches) which are supported by this driver as
+	regulators, one for each FET. The standard regulator interface is
+	supported, but it is only possible to turn the regulators on or off.
+	There is no voltage/current control.
drivers/power/regulator/Makefile +1 -0
index 96aa624..43f4d2c 100644
@@ -9,3 +9,4 @@ obj-$(CONFIG_DM_REGULATOR) += regulator-uclass.o
  obj-$(CONFIG_DM_REGULATOR_MAX77686) += max77686.o
  obj-$(CONFIG_DM_REGULATOR_FIXED) += fixed.o
  obj-$(CONFIG_DM_REGULATOR_SANDBOX) += sandbox.o
+obj-$(CONFIG_REGULATOR_TPS65090) += tps65090_regulator.o
drivers/power/regulator/tps65090_regulator.c new file +128 -0
new file mode 100644
index 0000000..affc504
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <power/pmic.h>
+#include <power/regulator.h>
+#include <power/tps65090.h>
+
+static int tps65090_fet_probe(struct udevice *dev)
+{
+	struct dm_regulator_uclass_platdata *uc_pdata;
+
+	uc_pdata = dev_get_uclass_platdata(dev);
+
+	uc_pdata->type = REGULATOR_TYPE_OTHER;
+	uc_pdata->mode_count = 0;
+
+	return 0;
+}
+
+static bool tps65090_fet_get_enable(struct udevice *dev)
+{
+	struct udevice *pmic = dev_get_parent(dev);
+	int ret, fet_id;
+
+	fet_id = dev->driver_data;
+	debug("%s: fet_id=%d\n", __func__, fet_id);
+
+	ret = pmic_reg_read(pmic, REG_FET_BASE + fet_id);
+	if (ret < 0)
+		return ret;
+
+	return ret & FET_CTRL_ENFET;
+}
+
+/**
+ * Set the power state for a FET
+ *
+ * @param pmic		pmic structure for the tps65090
+ * @param fet_id	FET number to set (1..MAX_FET_NUM)
+ * @param set		1 to power on FET, 0 to power off
+ * @return -EIO if we got a comms error, -EAGAIN if the FET failed to
+ * change state. If all is ok, returns 0.
+ */
+static int tps65090_fet_set(struct udevice *pmic, int fet_id, bool set)
+{
+	int retry;
+	u32 value;
+	int ret;
+
+	value = FET_CTRL_ADENFET | FET_CTRL_WAIT;
+	if (set)
+		value |= FET_CTRL_ENFET;
+
+	if (pmic_reg_write(pmic, REG_FET_BASE + fet_id, value))
+		return -EIO;
+
+	/* Try reading until we get a result */
+	for (retry = 0; retry < MAX_CTRL_READ_TRIES; retry++) {
+		ret = pmic_reg_read(pmic, REG_FET_BASE + fet_id);
+		if (ret < 0)
+			return ret;
+
+		/* Check that the FET went into the expected state */
+		debug("%s: flags=%x\n", __func__, ret);
+		if (!!(ret & FET_CTRL_PGFET) == set)
+			return 0;
+
+		/* If we got a timeout, there is no point in waiting longer */
+		if (ret & FET_CTRL_TOFET)
+			break;
+
+		mdelay(1);
+	}
+
+	debug("FET %d: Power good should have set to %d but reg=%#02x\n",
+	      fet_id, set, ret);
+	return -EAGAIN;
+}
+
+static int tps65090_fet_set_enable(struct udevice *dev, bool enable)
+{
+	struct udevice *pmic = dev_get_parent(dev);
+	int ret, fet_id;
+	ulong start;
+	int loops;
+
+	fet_id = dev->driver_data;
+	debug("%s: fet_id=%d, enable=%d\n", __func__, fet_id, enable);
+
+	start = get_timer(0);
+	for (loops = 0;; loops++) {
+		ret = tps65090_fet_set(pmic, fet_id, enable);
+		if (!ret)
+			break;
+
+		if (get_timer(start) > 100)
+			break;
+
+		/* Turn it off and try again until we time out */
+		tps65090_fet_set(pmic, fet_id, false);
+	}
+
+	if (ret)
+		debug("%s: FET%d failed to power on: time=%lums, loops=%d\n",
+		      __func__, fet_id, get_timer(start), loops);
+	else if (loops)
+		debug("%s: FET%d powered on after %lums, loops=%d\n",
+		      __func__, fet_id, get_timer(start), loops);
+
+	/*
+	 * Unfortunately there are some conditions where the power-good bit
+	 * will be 0, but the FET still comes up. One such case occurs with
+	 * the LCD backlight on snow. We'll just return 0 here and assume
+	 * that the FET will eventually come up.
+	 */
+	if (ret == -EAGAIN)
+		ret = 0;
+
+	return ret;
+}
+
+static const struct dm_regulator_ops tps65090_fet_ops = {

drivers/power/regulator/tps65090_regulator.c line 138

Quoted 10 lines
drivers/power/regulator/tps65090_regulator.c new file +10 -0
+	.get_enable = tps65090_fet_get_enable,
+	.set_enable = tps65090_fet_set_enable,
+};
+
+U_BOOT_DRIVER(tps65090_fet) = {
+	.name = TPS65090_FET_DRIVER,
+	.id = UCLASS_REGULATOR,
+	.ops = &tps65090_fet_ops,
+	.probe = tps65090_fet_probe,
+};

Regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#64 lore raw

PATCH 22/55 dm: power: Add support for TPS65090 FETs

Applied to u-boot-dm.

#65 lore raw

PATCH 23/55 dm: power: Add support for the S5M8767 PMIC

In reply to Simon Glass

This PMIC is used with SoCs which need a combination of BUCKs and LDOs. The driver supports probing and basic register access. It supports the standard device tree binding and supports driver model. A regulator driver can be provided also.

---

 drivers/power/pmic/Kconfig   |  9 +++++
 drivers/power/pmic/Makefile  |  2 +
 drivers/power/pmic/s5m8767.c | 95 ++++++++++++++++++++++++++++++++++++++++++++
 include/power/s5m8767.h      | 85 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 191 insertions(+)
 create mode 100644 drivers/power/pmic/s5m8767.c
 create mode 100644 include/power/s5m8767.h
drivers/power/pmic/Kconfig +9 -0
index fd8af81..7b98189 100644
@@ -42,6 +42,15 @@ config DM_PMIC_SANDBOX
 
 	Driver binding info: doc/device-tree-bindings/pmic/sandbox.txt
 
+config PMIC_S5M8767
+	bool "Enable Driver Model for the Samsung S5M8767 PMIC"
+	depends on DM_PMIC
+	---help---
+	The S5M8767 PMIC provides a large array of LDOs and BUCKs for use
+	as a SoC power controller. It also provides 32KHz clock outputs. This
+	driver provides basic register access and sets up the attached
+	regulators if regulator support is enabled.
+
 config PMIC_TPS65090
 	bool "Enable driver for Texas Instruments TPS65090 PMIC"
 	depends on DM_PMIC
drivers/power/pmic/Makefile +2 -0
index 2316e3b..ee23c26 100644
@@ -9,6 +9,8 @@ obj-$(CONFIG_DM_PMIC) += pmic-uclass.o
 obj-$(CONFIG_DM_PMIC_MAX77686) += max77686.o
 obj-$(CONFIG_DM_PMIC_SANDBOX) += sandbox.o i2c_pmic_emul.o
 obj-$(CONFIG_PMIC_TPS65090) += tps65090.o
+obj-$(CONFIG_PMIC_S5M8767) += s5m8767.o
+
 obj-$(CONFIG_POWER_LTC3676) += pmic_ltc3676.o
 obj-$(CONFIG_POWER_MAX8998) += pmic_max8998.o
 obj-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
drivers/power/pmic/s5m8767.c new file +95 -0

95 lines not on this page · raw message

include/power/s5m8767.h new file +85 -0

85 lines not on this page · raw message

Signature · 1 line
2.4.3.573.g4eafbef
#66 lore raw

PATCH 23/55 dm: power: Add support for the S5M8767 PMIC

Hello Simon,

Quoted 232 lines · Simon Glass

This PMIC is used with SoCs which need a combination of BUCKs and LDOs. The driver supports probing and basic register access. It supports the standard device tree binding and supports driver model. A regulator driver can be provided also.

---

  drivers/power/pmic/Kconfig   |  9 +++++
  drivers/power/pmic/Makefile  |  2 +
  drivers/power/pmic/s5m8767.c | 95 ++++++++++++++++++++++++++++++++++++++++++++
  include/power/s5m8767.h      | 85 +++++++++++++++++++++++++++++++++++++++
  4 files changed, 191 insertions(+)

create mode 100644 drivers/power/pmic/s5m8767.c
create mode 100644 include/power/s5m8767.h

drivers/power/pmic/Kconfig +9 -0
index fd8af81..7b98189 100644
@@ -42,6 +42,15 @@ config DM_PMIC_SANDBOX
 
  	Driver binding info: doc/device-tree-bindings/pmic/sandbox.txt
 
+config PMIC_S5M8767
+	bool "Enable Driver Model for the Samsung S5M8767 PMIC"
+	depends on DM_PMIC
+	---help---
+	The S5M8767 PMIC provides a large array of LDOs and BUCKs for use
+	as a SoC power controller. It also provides 32KHz clock outputs. This
+	driver provides basic register access and sets up the attached
+	regulators if regulator support is enabled.
+
  config PMIC_TPS65090
  	bool "Enable driver for Texas Instruments TPS65090 PMIC"
  	depends on DM_PMIC
drivers/power/pmic/Makefile +2 -0
index 2316e3b..ee23c26 100644
@@ -9,6 +9,8 @@ obj-$(CONFIG_DM_PMIC) += pmic-uclass.o
  obj-$(CONFIG_DM_PMIC_MAX77686) += max77686.o
  obj-$(CONFIG_DM_PMIC_SANDBOX) += sandbox.o i2c_pmic_emul.o
  obj-$(CONFIG_PMIC_TPS65090) += tps65090.o
+obj-$(CONFIG_PMIC_S5M8767) += s5m8767.o
+
  obj-$(CONFIG_POWER_LTC3676) += pmic_ltc3676.o
  obj-$(CONFIG_POWER_MAX8998) += pmic_max8998.o
  obj-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
drivers/power/pmic/s5m8767.c new file +95 -0
new file mode 100644
index 0000000..075fe7e
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <fdtdec.h>
+#include <errno.h>
+#include <dm.h>
+#include <i2c.h>
+#include <power/pmic.h>
+#include <power/regulator.h>
+#include <power/s5m8767.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static const struct pmic_child_info pmic_children_info[] = {
+	{ .prefix = "LDO", .driver = S5M8767_LDO_DRIVER },
+	{ .prefix = "BUCK", .driver = S5M8767_BUCK_DRIVER },
+	{ },
+};
+
+static int s5m8767_reg_count(struct udevice *dev)
+{
+	return S5M8767_NUM_OF_REGS;
+}
+
+static int s5m8767_write(struct udevice *dev, uint reg, const uint8_t *buff,
+			  int len)
+{
+	if (dm_i2c_write(dev, reg, buff, len)) {
+		error("write error to device: %p register: %#x!", dev, reg);
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int s5m8767_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
+{
+	if (dm_i2c_read(dev, reg, buff, len)) {
+		error("read error from device: %p register: %#x!", dev, reg);
+		return -EIO;
+	}
+
+	return 0;
+}
+
+int s5m8767_enable_32khz_cp(struct udevice *dev)
+{
+	return pmic_clrsetbits(dev, S5M8767_EN32KHZ_CP, 0, 1 << 1);
+}
+
+static int s5m8767_bind(struct udevice *dev)
+{
+	int node;
+	const void *blob = gd->fdt_blob;
+	int children;
+
+	node = fdt_subnode_offset(blob, dev->of_offset, "regulators");
+	if (node <= 0) {
+		debug("%s: %s regulators subnode not found!", __func__,
+		      dev->name);
+		return -ENXIO;
+	}
+
+	debug("%s: '%s' - found regulators subnode\n", __func__, dev->name);
+
+	children = pmic_bind_children(dev, node, pmic_children_info);
+	if (!children)
+		debug("%s: %s - no child found\n", __func__, dev->name);
+
+	/* Always return success for this device */
+	return 0;
+}
+
+static struct dm_pmic_ops s5m8767_ops = {
+	.reg_count = s5m8767_reg_count,
+	.read = s5m8767_read,
+	.write = s5m8767_write,
+};
+
+static const struct udevice_id s5m8767_ids[] = {
+	{ .compatible = "samsung,s5m8767-pmic" },
+	{ }
+};
+
+U_BOOT_DRIVER(pmic_s5m8767) = {
+	.name = "s5m8767_pmic",
+	.id = UCLASS_PMIC,
+	.of_match = s5m8767_ids,
+	.bind = s5m8767_bind,
+	.ops = &s5m8767_ops,
+};
include/power/s5m8767.h new file +75 -0
new file mode 100644
index 0000000..ba88ff7
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __S5M8767_H_
+#define __S5M8767_H_
+
+enum s5m8767_regnum {
+	S5M8767_BUCK1 = 0,
+	S5M8767_BUCK2,
+	S5M8767_BUCK3,
+	S5M8767_BUCK4,
+	S5M8767_BUCK5,
+	S5M8767_BUCK6,
+	S5M8767_BUCK7,
+	S5M8767_BUCK8,
+	S5M8767_BUCK9,
+	S5M8767_LDO1,
+	S5M8767_LDO2,
+	S5M8767_LDO3,
+	S5M8767_LDO4,
+	S5M8767_LDO5,
+	S5M8767_LDO6,
+	S5M8767_LDO7,
+	S5M8767_LDO8,
+	S5M8767_LDO9,
+	S5M8767_LDO10,
+	S5M8767_LDO11,
+	S5M8767_LDO12,
+	S5M8767_LDO13,
+	S5M8767_LDO14,
+	S5M8767_LDO15,
+	S5M8767_LDO16,
+	S5M8767_LDO17,
+	S5M8767_LDO18,
+	S5M8767_LDO19,
+	S5M8767_LDO20,
+	S5M8767_LDO21,
+	S5M8767_LDO22,
+	S5M8767_LDO23,
+	S5M8767_LDO24,
+	S5M8767_LDO25,
+	S5M8767_LDO26,
+	S5M8767_LDO27,
+	S5M8767_LDO28,
+	S5M8767_EN32KHZ_CP,
+
+	S5M8767_NUM_OF_REGS,
+};
+
+struct sec_voltage_desc {
+	int max;
+	int min;
+	int step;
+};
+
+/**
+ * struct s5m8767_para - s5m8767 register parameters
+ * @param vol_addr	i2c address of the given buck/ldo register
+ * @param vol_bitpos	bit position to be set or clear within register
+ * @param vol_bitmask	bit mask value
+ * @param reg_enaddr	control register address, which enable the given
+ *			given buck/ldo.
+ * @param reg_enbiton	value to be written to buck/ldo to make it ON
+ * @param vol		Voltage information
+ */
+struct s5m8767_para {
+	enum s5m8767_regnum regnum;
+	u8	vol_addr;
+	u8	vol_bitpos;
+	u8	vol_bitmask;
+	u8	reg_enaddr;
+	u8	reg_enbiton;

include/power/s5m8767.h line 85

Quoted 10 lines
include/power/s5m8767.h new file +10 -0
+	const struct sec_voltage_desc *vol;
+};
+
+/* Drivers name */
+#define S5M8767_LDO_DRIVER	"s5m8767_ldo"
+#define S5M8767_BUCK_DRIVER	"s5m8767_buck"
+
+int s5m8767_enable_32khz_cp(struct udevice *dev);
+
+#endif /* __S5M8767_PMIC_H_ */

Regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#67 lore raw

PATCH 23/55 dm: power: Add support for the S5M8767 PMIC

Applied to u-boot-dm.

#68 lore raw

PATCH 24/55 dm: power: Add support for S5M8767 regulators

In reply to Simon Glass

This PMIC is used with SoCs which need a combination of BUCKs and LDOs. The driver supports changing voltage and enabling/disabling each regulator. It supports the standard device tree binding and supports driver model.

---

 drivers/power/regulator/Kconfig   |   9 ++
 drivers/power/regulator/Makefile  |   1 +
 drivers/power/regulator/s5m8767.c | 269 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 279 insertions(+)
 create mode 100644 drivers/power/regulator/s5m8767.c
drivers/power/regulator/Kconfig +9 -0
index d090650..e85c692 100644
@@ -32,6 +32,15 @@ config DM_REGULATOR_FIXED
 	features for fixed value regulators. The driver implements get/set api
 	for enable and get only for voltage value.
 
+config REGULATOR_S5M8767
+	bool "Enable support for S5M8767 regulator"
+	depends on DM_REGULATOR && PMIC_S5M8767
+	---help---
+	This enables the regulator features of the S5M8767, allowing voltages
+	to be set, etc. The driver is not fully complete but supports most
+	common requirements, including all LDOs and BUCKs. This allows many
+	supplies to be set automatically using the device tree values.
+
 config DM_REGULATOR_SANDBOX
 	bool "Enable Driver Model for Sandbox PMIC regulator"
 	depends on DM_REGULATOR && DM_PMIC_SANDBOX
drivers/power/regulator/Makefile +1 -0
index 43f4d2c..08d7b0d 100644
@@ -8,5 +8,6 @@
 obj-$(CONFIG_DM_REGULATOR) += regulator-uclass.o
 obj-$(CONFIG_DM_REGULATOR_MAX77686) += max77686.o
 obj-$(CONFIG_DM_REGULATOR_FIXED) += fixed.o
+obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
 obj-$(CONFIG_DM_REGULATOR_SANDBOX) += sandbox.o
 obj-$(CONFIG_REGULATOR_TPS65090) += tps65090_regulator.o
drivers/power/regulator/s5m8767.c new file +269 -0

269 lines not on this page · raw message

Signature · 1 line
2.4.3.573.g4eafbef
#69 lore raw

PATCH 24/55 dm: power: Add support for S5M8767 regulators

Hello Simon,

Quoted 310 lines · Simon Glass

This PMIC is used with SoCs which need a combination of BUCKs and LDOs. The driver supports changing voltage and enabling/disabling each regulator. It supports the standard device tree binding and supports driver model.

---

  drivers/power/regulator/Kconfig   |   9 ++
  drivers/power/regulator/Makefile  |   1 +
  drivers/power/regulator/s5m8767.c | 269 ++++++++++++++++++++++++++++++++++++++
  3 files changed, 279 insertions(+)

create mode 100644 drivers/power/regulator/s5m8767.c

drivers/power/regulator/Kconfig +9 -0
index d090650..e85c692 100644
@@ -32,6 +32,15 @@ config DM_REGULATOR_FIXED
  	features for fixed value regulators. The driver implements get/set api
  	for enable and get only for voltage value.
 
+config REGULATOR_S5M8767
+	bool "Enable support for S5M8767 regulator"
+	depends on DM_REGULATOR && PMIC_S5M8767
+	---help---
+	This enables the regulator features of the S5M8767, allowing voltages
+	to be set, etc. The driver is not fully complete but supports most
+	common requirements, including all LDOs and BUCKs. This allows many
+	supplies to be set automatically using the device tree values.
+
  config DM_REGULATOR_SANDBOX
  	bool "Enable Driver Model for Sandbox PMIC regulator"
  	depends on DM_REGULATOR && DM_PMIC_SANDBOX
drivers/power/regulator/Makefile +1 -0
index 43f4d2c..08d7b0d 100644
@@ -8,5 +8,6 @@
  obj-$(CONFIG_DM_REGULATOR) += regulator-uclass.o
  obj-$(CONFIG_DM_REGULATOR_MAX77686) += max77686.o
  obj-$(CONFIG_DM_REGULATOR_FIXED) += fixed.o
+obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
  obj-$(CONFIG_DM_REGULATOR_SANDBOX) += sandbox.o
  obj-$(CONFIG_REGULATOR_TPS65090) += tps65090_regulator.o
drivers/power/regulator/s5m8767.c new file +259 -0
new file mode 100644
index 0000000..93a3c94
@@ -0,0 +1,269 @@
+/*
+ * Copyright (C) 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <fdtdec.h>
+#include <errno.h>
+#include <dm.h>
+#include <i2c.h>
+#include <power/pmic.h>
+#include <power/regulator.h>
+#include <power/s5m8767.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static const struct sec_voltage_desc buck_v1 = {
+	.max = 2225000,
+	.min =  650000,
+	.step =   6250,
+};
+
+static const struct sec_voltage_desc buck_v2 = {
+	.max = 1600000,
+	.min =  600000,
+	.step =   6250,
+};
+
+static const struct sec_voltage_desc buck_v3 = {
+	.max = 3000000,
+	.min =  750000,
+	.step =  12500,
+};
+
+static const struct sec_voltage_desc ldo_v1 = {
+	.max = 3950000,
+	.min =  800000,
+	.step =  50000,
+};
+
+static const struct sec_voltage_desc ldo_v2 = {
+	.max = 2375000,
+	.min =  800000,
+	.step =  25000,
+};
+
+static const struct s5m8767_para buck_param[] = {
+	/*
+	 *            | voltage ----|  | enable -|   voltage
+	 * regnum       addr  bpos mask  addr  on     desc
+	 */
+	{S5M8767_BUCK1, 0x33, 0x0, 0xff, 0x32, 0x3, &buck_v1},
+	{S5M8767_BUCK2, 0x35, 0x0, 0xff, 0x34, 0x1, &buck_v2},
+	{S5M8767_BUCK3, 0x3e, 0x0, 0xff, 0x3d, 0x1, &buck_v2},
+	{S5M8767_BUCK4, 0x47, 0x0, 0xff, 0x46, 0x1, &buck_v2},
+	{S5M8767_BUCK5, 0x50, 0x0, 0xff, 0x4f, 0x3, &buck_v1},
+	{S5M8767_BUCK6, 0x55, 0x0, 0xff, 0x54, 0x3, &buck_v1},
+	{S5M8767_BUCK7, 0x57, 0x0, 0xff, 0x56, 0x3, &buck_v3},
+	{S5M8767_BUCK8, 0x59, 0x0, 0xff, 0x58, 0x3, &buck_v3},
+	{S5M8767_BUCK9, 0x5b, 0x0, 0xff, 0x5a, 0x3, &buck_v3},
+};
+
+static const struct s5m8767_para ldo_param[] = {
+	{S5M8767_LDO1,  0x5c, 0x0, 0x3f, 0x5c, 0x3, &ldo_v2},
+	{S5M8767_LDO2,  0x5d, 0x0, 0x3f, 0x5d, 0x1, &ldo_v2},
+	{S5M8767_LDO3,  0x61, 0x0, 0x3f, 0x61, 0x3, &ldo_v1},
+	{S5M8767_LDO4,  0x62, 0x0, 0x3f, 0x62, 0x3, &ldo_v1},
+	{S5M8767_LDO5,  0x63, 0x0, 0x3f, 0x63, 0x3, &ldo_v1},
+	{S5M8767_LDO6,  0x64, 0x0, 0x3f, 0x64, 0x1, &ldo_v2},
+	{S5M8767_LDO7,  0x65, 0x0, 0x3f, 0x65, 0x1, &ldo_v2},
+	{S5M8767_LDO8,  0x66, 0x0, 0x3f, 0x66, 0x1, &ldo_v2},
+	{S5M8767_LDO9,  0x67, 0x0, 0x3f, 0x67, 0x3, &ldo_v1},
+	{S5M8767_LDO10, 0x68, 0x0, 0x3f, 0x68, 0x1, &ldo_v1},
+	{S5M8767_LDO11, 0x69, 0x0, 0x3f, 0x69, 0x1, &ldo_v1},
+	{S5M8767_LDO12, 0x6a, 0x0, 0x3f, 0x6a, 0x1, &ldo_v1},
+	{S5M8767_LDO13, 0x6b, 0x0, 0x3f, 0x6b, 0x3, &ldo_v1},
+	{S5M8767_LDO14, 0x6c, 0x0, 0x3f, 0x6c, 0x1, &ldo_v1},
+	{S5M8767_LDO15, 0x6d, 0x0, 0x3f, 0x6d, 0x1, &ldo_v2},
+	{S5M8767_LDO16, 0x6e, 0x0, 0x3f, 0x6e, 0x1, &ldo_v1},
+	{S5M8767_LDO17, 0x6f, 0x0, 0x3f, 0x6f, 0x3, &ldo_v1},
+	{S5M8767_LDO18, 0x70, 0x0, 0x3f, 0x70, 0x3, &ldo_v1},
+	{S5M8767_LDO19, 0x71, 0x0, 0x3f, 0x71, 0x3, &ldo_v1},
+	{S5M8767_LDO20, 0x72, 0x0, 0x3f, 0x72, 0x3, &ldo_v1},
+	{S5M8767_LDO21, 0x73, 0x0, 0x3f, 0x73, 0x3, &ldo_v1},
+	{S5M8767_LDO22, 0x74, 0x0, 0x3f, 0x74, 0x3, &ldo_v1},
+	{S5M8767_LDO23, 0x75, 0x0, 0x3f, 0x75, 0x3, &ldo_v1},
+	{S5M8767_LDO24, 0x76, 0x0, 0x3f, 0x76, 0x3, &ldo_v1},
+	{S5M8767_LDO25, 0x77, 0x0, 0x3f, 0x77, 0x3, &ldo_v1},
+	{S5M8767_LDO26, 0x78, 0x0, 0x3f, 0x78, 0x3, &ldo_v1},
+	{S5M8767_LDO27, 0x79, 0x0, 0x3f, 0x79, 0x3, &ldo_v1},
+	{S5M8767_LDO28, 0x7a, 0x0, 0x3f, 0x7a, 0x3, &ldo_v1},
+};
+
+enum {
+	ENABLE_SHIFT	= 6,
+	ENABLE_MASK	= 3,
+};
+
+static int reg_get_value(struct udevice *dev, const struct s5m8767_para *param)
+{
+	const struct sec_voltage_desc *desc;
+	int ret, uv, val;
+
+	ret = pmic_reg_read(dev->parent, param->vol_addr);
+	if (ret < 0)
+		return ret;
+
+	desc = param->vol;
+	val = (ret >> param->vol_bitpos) & param->vol_bitmask;
+	uv = desc->min + val * desc->step;
+
+	return uv;
+}
+
+static int reg_set_value(struct udevice *dev, const struct s5m8767_para *param,
+			 int uv)
+{
+	const struct sec_voltage_desc *desc;
+	int ret, val;
+
+	desc = param->vol;
+	if (uv < desc->min || uv > desc->max)
+		return -EINVAL;
+	val = (uv - desc->min) / desc->step;
+	val = (val & param->vol_bitmask) << param->vol_bitpos;
+	ret = pmic_clrsetbits(dev->parent, param->vol_addr,
+			      param->vol_bitmask << param->vol_bitpos,
+			      val);
+
+	return ret;
+}
+
+static int s5m8767_ldo_probe(struct udevice *dev)
+{
+	struct dm_regulator_uclass_platdata *uc_pdata;
+
+	uc_pdata = dev_get_uclass_platdata(dev);
+
+	uc_pdata->type = REGULATOR_TYPE_LDO;
+	uc_pdata->mode_count = 0;
+
+	return 0;
+}
+static int ldo_get_value(struct udevice *dev)
+{
+	int ldo = dev->driver_data;
+
+	return reg_get_value(dev, &ldo_param[ldo]);
+}
+
+static int ldo_set_value(struct udevice *dev, int uv)
+{
+	int ldo = dev->driver_data;
+
+	return reg_set_value(dev, &ldo_param[ldo], uv);
+}
+
+static int reg_get_enable(struct udevice *dev, const struct s5m8767_para *param)
+{
+	bool enable;
+	int ret;
+
+	ret = pmic_reg_read(dev->parent, param->reg_enaddr);
+	if (ret < 0)
+		return ret;
+
+	enable = (ret >> ENABLE_SHIFT) & ENABLE_MASK;
+
+	return enable;
+}
+
+static int reg_set_enable(struct udevice *dev, const struct s5m8767_para *param,
+			  bool enable)
+{
+	int ret;
+
+	ret = pmic_reg_read(dev->parent, param->reg_enaddr);
+	if (ret < 0)
+		return ret;
+
+	ret = pmic_clrsetbits(dev->parent, param->reg_enaddr,
+			      ENABLE_MASK << ENABLE_SHIFT,
+			      enable ? param->reg_enbiton << ENABLE_SHIFT : 0);
+
+	return ret;
+}
+
+static bool ldo_get_enable(struct udevice *dev)
+{
+	int ldo = dev->driver_data;
+
+	return reg_get_enable(dev, &ldo_param[ldo]);
+}
+
+static int ldo_set_enable(struct udevice *dev, bool enable)
+{
+	int ldo = dev->driver_data;
+
+	return reg_set_enable(dev, &ldo_param[ldo], enable);
+}
+
+static int s5m8767_buck_probe(struct udevice *dev)
+{
+	struct dm_regulator_uclass_platdata *uc_pdata;
+
+	uc_pdata = dev_get_uclass_platdata(dev);
+
+	uc_pdata->type = REGULATOR_TYPE_BUCK;
+	uc_pdata->mode_count = 0;
+
+	return 0;
+}
+
+static int buck_get_value(struct udevice *dev)
+{
+	int buck = dev->driver_data;
+
+	return reg_get_value(dev, &buck_param[buck]);
+}
+
+static int buck_set_value(struct udevice *dev, int uv)
+{
+	int buck = dev->driver_data;
+
+	return reg_set_value(dev, &buck_param[buck], uv);
+}
+
+static bool buck_get_enable(struct udevice *dev)
+{
+	int buck = dev->driver_data;
+
+	return reg_get_enable(dev, &buck_param[buck]);
+}
+
+static int buck_set_enable(struct udevice *dev, bool enable)
+{
+	int buck = dev->driver_data;
+
+	return reg_set_enable(dev, &buck_param[buck], enable);
+}
+
+static const struct dm_regulator_ops s5m8767_ldo_ops = {
+	.get_value  = ldo_get_value,
+	.set_value  = ldo_set_value,
+	.get_enable = ldo_get_enable,
+	.set_enable = ldo_set_enable,
+};
+
+U_BOOT_DRIVER(s5m8767_ldo) = {
+	.name = S5M8767_LDO_DRIVER,
+	.id = UCLASS_REGULATOR,
+	.ops = &s5m8767_ldo_ops,
+	.probe = s5m8767_ldo_probe,
+};
+
+static const struct dm_regulator_ops s5m8767_buck_ops = {
+	.get_value  = buck_get_value,
+	.set_value  = buck_set_value,

drivers/power/regulator/s5m8767.c line 269

Quoted 10 lines
drivers/power/regulator/s5m8767.c new file +10 -0
+	.get_enable = buck_get_enable,
+	.set_enable = buck_set_enable,
+};
+
+U_BOOT_DRIVER(s5m8767_buck) = {
+	.name = S5M8767_BUCK_DRIVER,
+	.id = UCLASS_REGULATOR,
+	.ops = &s5m8767_buck_ops,
+	.probe = s5m8767_buck_probe,
+};

Regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#70 lore raw

PATCH 24/55 dm: power: Add support for S5M8767 regulators

Applied to u-boot-dm.

#71 lore raw

PATCH 25/55 dm: pmic: max77686: Correct a few nits

In reply to Simon Glass

The driver name should not have a space in it. Also the regulator names should match the case of the device tree. Fix these problems.

---

 drivers/power/pmic/max77686.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/power/pmic/max77686.c +3 -3
index 3523b4a..dc5a54a 100644
@@ -17,8 +17,8 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 static const struct pmic_child_info pmic_children_info[] = {
-	{ .prefix = "ldo", .driver = MAX77686_LDO_DRIVER },
-	{ .prefix = "buck", .driver = MAX77686_BUCK_DRIVER },
+	{ .prefix = "LDO", .driver = MAX77686_LDO_DRIVER },
+	{ .prefix = "BUCK", .driver = MAX77686_BUCK_DRIVER },
 	{ },
 };
 
@@ -84,7 +84,7 @@ static const struct udevice_id max77686_ids[] = {
 };
 
 U_BOOT_DRIVER(pmic_max77686) = {
-	.name = "max77686 pmic",
+	.name = "max77686_pmic",
 	.id = UCLASS_PMIC,
 	.of_match = max77686_ids,
 	.bind = max77686_bind,
Signature · 1 line
2.4.3.573.g4eafbef
#72 lore raw

PATCH 25/55 dm: pmic: max77686: Correct a few nits

Hello Simon,

Quoted 26 lines · Simon Glass

The driver name should not have a space in it. Also the regulator names should match the case of the device tree. Fix these problems.

---

  drivers/power/pmic/max77686.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
drivers/power/pmic/max77686.c +2 -2
index 3523b4a..dc5a54a 100644
@@ -17,8 +17,8 @@
  DECLARE_GLOBAL_DATA_PTR;
 
  static const struct pmic_child_info pmic_children_info[] = {
-	{ .prefix = "ldo", .driver = MAX77686_LDO_DRIVER },
-	{ .prefix = "buck", .driver = MAX77686_BUCK_DRIVER },
+	{ .prefix = "LDO", .driver = MAX77686_LDO_DRIVER },
+	{ .prefix = "BUCK", .driver = MAX77686_BUCK_DRIVER },
  	{ },
  };
 

drivers/power/pmic/max77686.c static const struct udevice_id max77686_ids[] = { · line 90

Quoted 8 lines
drivers/power/pmic/max77686.c +1 -1
@@ -84,7 +84,7 @@ static const struct udevice_id max77686_ids[] = {
  };
 
  U_BOOT_DRIVER(pmic_max77686) = {
-	.name = "max77686 pmic",
+	.name = "max77686_pmic",
  	.id = UCLASS_PMIC,
  	.of_match = max77686_ids,
  	.bind = max77686_bind,

This change is ok, but could you please consider Odroid U3 (exynos4412-odroid.dts) within this patch set?

Regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#73 lore raw

PATCH 25/55 dm: pmic: max77686: Correct a few nits

Hi Przemyslaw,

Quoted 41 lines · Przemyslaw Marczak

Hello Simon,

Quoted 27 lines · Simon Glass

The driver name should not have a space in it. Also the regulator names should match the case of the device tree. Fix these problems.

---

  drivers/power/pmic/max77686.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
drivers/power/pmic/max77686.c +2 -2
index 3523b4a..dc5a54a 100644
@@ -17,8 +17,8 @@
  DECLARE_GLOBAL_DATA_PTR;
 
  static const struct pmic_child_info pmic_children_info[] = {
-       { .prefix = "ldo", .driver = MAX77686_LDO_DRIVER },
-       { .prefix = "buck", .driver = MAX77686_BUCK_DRIVER },
+       { .prefix = "LDO", .driver = MAX77686_LDO_DRIVER },
+       { .prefix = "BUCK", .driver = MAX77686_BUCK_DRIVER },
        { },
  };
 

drivers/power/pmic/max77686.c static const struct udevice_id max77686_ids[] = { · line 90

Quoted 8 lines
drivers/power/pmic/max77686.c +1 -1
@@ -84,7 +84,7 @@ static const struct udevice_id max77686_ids[] = {
  };
 
  U_BOOT_DRIVER(pmic_max77686) = {
-       .name = "max77686 pmic",
+       .name = "max77686_pmic",
        .id = UCLASS_PMIC,
        .of_match = max77686_ids,
        .bind = max77686_bind,
Quoted 2 lines

This change is ok, but could you please consider Odroid U3 (exynos4412-odroid.dts) within this patch set?

Ah, does that mean that these need to change to upper case to match the driver?

Applied to u-boot-dm.

Quoted 7 lines

Regards
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Regards,
Simon

#74 lore raw

PATCH 25/55 dm: pmic: max77686: Correct a few nits

Hello Simon,

Quoted 44 lines · Simon Glass

Hi Przemyslaw,

Quoted 41 lines · Przemyslaw Marczak

Hello Simon,

Quoted 27 lines · Simon Glass

The driver name should not have a space in it. Also the regulator names should match the case of the device tree. Fix these problems.

---

   drivers/power/pmic/max77686.c | 6 +++---
   1 file changed, 3 insertions(+), 3 deletions(-)
drivers/power/pmic/max77686.c +2 -2
index 3523b4a..dc5a54a 100644
@@ -17,8 +17,8 @@
   DECLARE_GLOBAL_DATA_PTR;
 
   static const struct pmic_child_info pmic_children_info[] = {
-       { .prefix = "ldo", .driver = MAX77686_LDO_DRIVER },
-       { .prefix = "buck", .driver = MAX77686_BUCK_DRIVER },
+       { .prefix = "LDO", .driver = MAX77686_LDO_DRIVER },
+       { .prefix = "BUCK", .driver = MAX77686_BUCK_DRIVER },
         { },
   };
 

drivers/power/pmic/max77686.c static const struct udevice_id max77686_ids[] = { · line 90

Quoted 8 lines
drivers/power/pmic/max77686.c +1 -1
@@ -84,7 +84,7 @@ static const struct udevice_id max77686_ids[] = {
   };
 
   U_BOOT_DRIVER(pmic_max77686) = {
-       .name = "max77686 pmic",
+       .name = "max77686_pmic",
         .id = UCLASS_PMIC,
         .of_match = max77686_ids,
         .bind = max77686_bind,
Quoted 7 lines
Quoted 2 lines

This change is ok, but could you please consider Odroid U3 (exynos4412-odroid.dts) within this patch set?

Ah, does that mean that these need to change to upper case to match the driver?

Applied to u-boot-dm.

Right, since pmic_bind_children() is using strncmp() to bind regulators by prefix, this change breaks the Odroid U3.

Quoted 11 lines
Quoted 7 lines

Regards
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Regards,
Simon

Best Regards,

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#75 lore raw

PATCH 25/55 dm: pmic: max77686: Correct a few nits

Hi Przemyslaw,

Quoted 57 lines · Przemyslaw Marczak

Hello Simon,

Quoted 53 lines · Simon Glass

Hi Przemyslaw,

Quoted 46 lines · Przemyslaw Marczak

Hello Simon,

Quoted 29 lines · Simon Glass

The driver name should not have a space in it. Also the regulator names should match the case of the device tree. Fix these problems.

---

   drivers/power/pmic/max77686.c | 6 +++---
   1 file changed, 3 insertions(+), 3 deletions(-)
drivers/power/pmic/max77686.c +2 -2
index 3523b4a..dc5a54a 100644
@@ -17,8 +17,8 @@
   DECLARE_GLOBAL_DATA_PTR;
 
   static const struct pmic_child_info pmic_children_info[] = {
-       { .prefix = "ldo", .driver = MAX77686_LDO_DRIVER },
-       { .prefix = "buck", .driver = MAX77686_BUCK_DRIVER },
+       { .prefix = "LDO", .driver = MAX77686_LDO_DRIVER },
+       { .prefix = "BUCK", .driver = MAX77686_BUCK_DRIVER },
         { },
   };
 

drivers/power/pmic/max77686.c static const struct udevice_id max77686_ids[] = { · line 90

Quoted 8 lines
drivers/power/pmic/max77686.c +1 -1
@@ -84,7 +84,7 @@ static const struct udevice_id max77686_ids[] = {
   };
 
   U_BOOT_DRIVER(pmic_max77686) = {
-       .name = "max77686 pmic",
+       .name = "max77686_pmic",
         .id = UCLASS_PMIC,
         .of_match = max77686_ids,
         .bind = max77686_bind,

This change is ok, but could you please consider Odroid U3 (exynos4412-odroid.dts) within this patch set?

Quoted 9 lines
Quoted 5 lines

Ah, does that mean that these need to change to upper case to match the driver?

Applied to u-boot-dm.

Right, since pmic_bind_children() is using strncmp() to bind regulators by prefix, this change breaks the Odroid U3.

OK. I'll address this with a separate patch which can be placed before the one that breaks it.

Regards,
Simon

#76 lore raw

PATCH 26/55 dm: pmic: Correct the pmic_reg_write() implementation

In reply to Simon Glass

This should write the register, not read it. Fix this bug.

---

 drivers/power/pmic/pmic-uclass.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/pmic/pmic-uclass.c +1 -1
index d99cb9a..49709f3 100644
@@ -142,7 +142,7 @@ int pmic_reg_write(struct udevice *dev, uint reg, uint value)
 	u8 byte = value;
 
 	debug("%s: reg=%x, value=%x\n", __func__, reg, value);
-	return pmic_read(dev, reg, &byte, 1);
+	return pmic_write(dev, reg, &byte, 1);
 }
 
 int pmic_clrsetbits(struct udevice *dev, uint reg, uint clr, uint set)
Signature · 1 line
2.4.3.573.g4eafbef
#77 lore raw

PATCH 26/55 dm: pmic: Correct the pmic_reg_write() implementation

Hello Simon,

Quoted 14 lines · Simon Glass

This should write the register, not read it. Fix this bug.

---

  drivers/power/pmic/pmic-uclass.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/pmic/pmic-uclass.c +0 -0
index d99cb9a..49709f3 100644

drivers/power/pmic/pmic-uclass.c int pmic_reg_write(struct udevice *dev, uint reg, uint value) · line 148

Quoted 8 lines
drivers/power/pmic/pmic-uclass.c +1 -1
@@ -142,7 +142,7 @@ int pmic_reg_write(struct udevice *dev, uint reg, uint value)
  	u8 byte = value;
 
  	debug("%s: reg=%x, value=%x\n", __func__, reg, value);
-	return pmic_read(dev, reg, &byte, 1);
+	return pmic_write(dev, reg, &byte, 1);
  }
 
  int pmic_clrsetbits(struct udevice *dev, uint reg, uint clr, uint set)

Regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#78 lore raw

PATCH 26/55 dm: pmic: Correct the pmic_reg_write() implementation

Applied to u-boot-dm.

#79 lore raw

PATCH 27/55 dm: power: max77686: Correct BUCK register access

In reply to Simon Glass

Some regulators use the wrong voltage register and thus it is not possible to control them. Fix this.

---

 drivers/power/regulator/max77686.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/power/regulator/max77686.c +7 -3
index 37ebe94..21173fc 100644
@@ -61,10 +61,14 @@ static struct dm_regulator_mode max77686_buck_mode_onoff[] = {
 	MODE(OPMODE_ON, MAX77686_BUCK_MODE_ON, "ON"),
 };
 
-static const char max77686_buck_addr[] = {
+static const char max77686_buck_ctrl[] = {
 	0xff, 0x10, 0x12, 0x1c, 0x26, 0x30, 0x32, 0x34, 0x36, 0x38
 };
 
+static const char max77686_buck_out[] = {
+	0xff, 0x11, 0x14, 0x1e, 0x28, 0x31, 0x33, 0x35, 0x37, 0x39
+};
+
 static int max77686_buck_volt2hex(int buck, int uV)
 {
 	unsigned int hex = 0;
@@ -368,7 +372,7 @@ static int max77686_buck_val(struct udevice *dev, int op, int *uV)
 		*uV = 0;
 
 	/* &buck_out = ctrl + 1 */
-	adr = max77686_buck_addr[buck] + 1;
+	adr = max77686_buck_out[buck];
 
 	/* mask */
 	switch (buck) {
@@ -549,7 +553,7 @@ static int max77686_buck_mode(struct udevice *dev, int op, int *opmode)
 		return -EINVAL;
 	}
 
-	adr = max77686_buck_addr[buck];
+	adr = max77686_buck_ctrl[buck];
 
 	/* mask */
 	switch (buck) {
Signature · 1 line
2.4.3.573.g4eafbef
#80 lore raw

PATCH 27/55 dm: power: max77686: Correct BUCK register access

Hello Simon,

Quoted 40 lines · Simon Glass

Some regulators use the wrong voltage register and thus it is not possible to control them. Fix this.

---

  drivers/power/regulator/max77686.c | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
drivers/power/regulator/max77686.c +6 -2
index 37ebe94..21173fc 100644
@@ -61,10 +61,14 @@ static struct dm_regulator_mode max77686_buck_mode_onoff[] = {
  	MODE(OPMODE_ON, MAX77686_BUCK_MODE_ON, "ON"),
  };
 
-static const char max77686_buck_addr[] = {
+static const char max77686_buck_ctrl[] = {
  	0xff, 0x10, 0x12, 0x1c, 0x26, 0x30, 0x32, 0x34, 0x36, 0x38
  };
 
+static const char max77686_buck_out[] = {
+	0xff, 0x11, 0x14, 0x1e, 0x28, 0x31, 0x33, 0x35, 0x37, 0x39
+};
+
  static int max77686_buck_volt2hex(int buck, int uV)
  {
  	unsigned int hex = 0;
@@ -368,7 +372,7 @@ static int max77686_buck_val(struct udevice *dev, int op, int *uV)
  		*uV = 0;
 
  	/* &buck_out = ctrl + 1 */
-	adr = max77686_buck_addr[buck] + 1;
+	adr = max77686_buck_out[buck];
 
  	/* mask */
  	switch (buck) {

drivers/power/regulator/max77686.c static int max77686_buck_mode(struct udevice *dev, int op, int *opmode) · line 559

Quoted 8 lines
drivers/power/regulator/max77686.c +1 -1
@@ -549,7 +553,7 @@ static int max77686_buck_mode(struct udevice *dev, int op, int *opmode)
  		return -EINVAL;
  	}
 
-	adr = max77686_buck_addr[buck];
+	adr = max77686_buck_ctrl[buck];
 
  	/* mask */
  	switch (buck) {

Regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#81 lore raw

PATCH 27/55 dm: power: max77686: Correct BUCK register access

Applied to u-boot-dm.

#82 lore raw

PATCH 28/55 dm: pmic: max77686: Support all BUCK regulators

In reply to Simon Glass

Add support for all BUCK regulators, now that the correct register is accessed for each.

---

 drivers/power/regulator/max77686.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/power/regulator/max77686.c +3 -7
index 21173fc..427b717 100644
@@ -81,11 +81,7 @@ static int max77686_buck_volt2hex(int buck, int uV)
 		/* hex = (uV - 600000) / 12500; */
 		hex = (uV - MAX77686_BUCK_UV_LMIN) / MAX77686_BUCK_UV_LSTEP;
 		hex_max = MAX77686_BUCK234_VOLT_MAX_HEX;
-		/**
-		 * Those use voltage scaller - temporary not implemented
-		 * so return just 0
-		 */
-		return -ENOSYS;
+		break;
 	default:
 		/* hex = (uV - 750000) / 50000; */
 		hex = (uV - MAX77686_BUCK_UV_HMIN) / MAX77686_BUCK_UV_HSTEP;
@@ -379,11 +375,11 @@ static int max77686_buck_val(struct udevice *dev, int op, int *uV)
 	case 2:
 	case 3:
 	case 4:
-		/* Those use voltage scallers - will support in the future */
 		mask = MAX77686_BUCK234_VOLT_MASK;
-		return -ENOSYS;
+		break;
 	default:
 		mask = MAX77686_BUCK_VOLT_MASK;
+		break;
 	}
 
 	ret = pmic_read(dev->parent, adr, &val, 1);
Signature · 1 line
2.4.3.573.g4eafbef
#83 lore raw

PATCH 28/55 dm: pmic: max77686: Support all BUCK regulators

Hello Simon,

Quoted 31 lines · Simon Glass

Add support for all BUCK regulators, now that the correct register is accessed for each.

---

  drivers/power/regulator/max77686.c | 10 +++-------
  1 file changed, 3 insertions(+), 7 deletions(-)
drivers/power/regulator/max77686.c +1 -5
index 21173fc..427b717 100644
@@ -81,11 +81,7 @@ static int max77686_buck_volt2hex(int buck, int uV)
  		/* hex = (uV - 600000) / 12500; */
  		hex = (uV - MAX77686_BUCK_UV_LMIN) / MAX77686_BUCK_UV_LSTEP;
  		hex_max = MAX77686_BUCK234_VOLT_MAX_HEX;
-		/**
-		 * Those use voltage scaller - temporary not implemented
-		 * so return just 0
-		 */
-		return -ENOSYS;
+		break;
  	default:
  		/* hex = (uV - 750000) / 50000; */
  		hex = (uV - MAX77686_BUCK_UV_HMIN) / MAX77686_BUCK_UV_HSTEP;
@@ -379,11 +375,11 @@ static int max77686_buck_val(struct udevice *dev, int op, int *uV)
  	case 2:
  	case 3:
  	case 4:

drivers/power/regulator/max77686.c static int max77686_buck_val(struct udevice *dev, int op, int *uV) · line 385

Quoted 10 lines
drivers/power/regulator/max77686.c +2 -2
-		/* Those use voltage scallers - will support in the future */
  		mask = MAX77686_BUCK234_VOLT_MASK;
-		return -ENOSYS;
+		break;
  	default:
  		mask = MAX77686_BUCK_VOLT_MASK;
+		break;
  	}
 
  	ret = pmic_read(dev->parent, adr, &val, 1);

The bucks 2,3,4 can work in DVS mode, which allows select one of eight DVS regulators for each output. The default selection at power-on is DVS1 for each output, and it corresponds to the currently defined output register addresses.

The selection can be done by six PMIC's GPIOs:
- DVS1/2/3 - output selection: 0x0=DVS1...0x7=DVS8
- SELB2/3/4 - mode switch: 'DVS' or 'no DVS'

Reading or writing the default registers is proper only in case:
- for the default PMIC's power-up setting - may conflict with bl1/bl2
- when DVS1/2/3 GPIOs are set to LOW - DVS1 selected
- SELB2/3/4 - are set to LOW - no DVS mode

The documentation is poor, but if I good understand, the SELB is used as "latch" for the DVS selection.

So the driver, could be unreliable for these outputs if it doesn't check the PMIC's GPIOs.

It's quite confusing, since the PMIC, doesn't provide registers to check those GPIOs. It should be checked by the driver and can be delivered by device-tree.

This is also confusing, since it depends on board design, because the PMIC's GPIOs can be connected to the SoCs GPIOs and also just pulled to POWER/GND signals.

The documentation says, that those GPIOs should be set accordingly, and for example Odroid U3 has connected the SELB to VDD_IO(LDO3) power line, so actually this state can not be changed or can be changed by accident when changing the VDD_IO - which is HIGH at PMIC's power-up.

The switching is impossible, since the VDD_IO line is shared with few other peripherals.

In this case, maybe you should add config to allow use of the BUCK234 only for case in which DVS mode is disabled by board design (SELB2/3/4 set to LOW). This may also work, when the GPIOs of Exynos stays in the reset state.

Then, using the default 'buck_out' registers: 0x14, 0x1e, 0x28 is reasonable.

Did you tried measure the output voltage, after its change?

Regards,

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#84 lore raw

PATCH 28/55 dm: pmic: max77686: Support all BUCK regulators

Hi Przemyslaw,

Quoted 67 lines · Przemyslaw Marczak

Hello Simon,

Quoted 33 lines · Simon Glass

Add support for all BUCK regulators, now that the correct register is accessed for each.

---

  drivers/power/regulator/max77686.c | 10 +++-------
  1 file changed, 3 insertions(+), 7 deletions(-)
drivers/power/regulator/max77686.c +1 -5
index 21173fc..427b717 100644
@@ -81,11 +81,7 @@ static int max77686_buck_volt2hex(int buck, int uV)
                /* hex = (uV - 600000) / 12500; */
                hex = (uV - MAX77686_BUCK_UV_LMIN) / MAX77686_BUCK_UV_LSTEP;
                hex_max = MAX77686_BUCK234_VOLT_MAX_HEX;
-               /**
-                * Those use voltage scaller - temporary not implemented
-                * so return just 0
-                */
-               return -ENOSYS;
+               break;
        default:
                /* hex = (uV - 750000) / 50000; */
                hex = (uV - MAX77686_BUCK_UV_HMIN) / MAX77686_BUCK_UV_HSTEP;
@@ -379,11 +375,11 @@ static int max77686_buck_val(struct udevice *dev, int op, int *uV)
        case 2:
        case 3:
        case 4:

drivers/power/regulator/max77686.c static int max77686_buck_val(struct udevice *dev, int op, int *uV) · line 385

Quoted 10 lines
drivers/power/regulator/max77686.c +2 -2
-               /* Those use voltage scallers - will support in the future */
                mask = MAX77686_BUCK234_VOLT_MASK;
-               return -ENOSYS;
+               break;
        default:
                mask = MAX77686_BUCK_VOLT_MASK;
+               break;
        }
 
        ret = pmic_read(dev->parent, adr, &val, 1);

The bucks 2,3,4 can work in DVS mode, which allows select one of eight DVS regulators for each output. The default selection at power-on is DVS1 for each output, and it corresponds to the currently defined output register addresses.

The selection can be done by six PMIC's GPIOs:
- DVS1/2/3 - output selection: 0x0=DVS1...0x7=DVS8
- SELB2/3/4 - mode switch: 'DVS' or 'no DVS'

Reading or writing the default registers is proper only in case:
- for the default PMIC's power-up setting - may conflict with bl1/bl2
- when DVS1/2/3 GPIOs are set to LOW - DVS1 selected
- SELB2/3/4 - are set to LOW - no DVS mode

The documentation is poor, but if I good understand, the SELB is used as "latch" for the DVS selection.

So the driver, could be unreliable for these outputs if it doesn't check the PMIC's GPIOs.

It's quite confusing, since the PMIC, doesn't provide registers to check those GPIOs. It should be checked by the driver and can be delivered by device-tree.

This is also confusing, since it depends on board design, because the PMIC's GPIOs can be connected to the SoCs GPIOs and also just pulled to POWER/GND signals.

Quoted 7 lines

The documentation says, that those GPIOs should be set accordingly, and for example Odroid U3 has connected the SELB to VDD_IO(LDO3) power line, so actually this state can not be changed or can be changed by accident when changing the VDD_IO - which is HIGH at PMIC's power-up.

The switching is impossible, since the VDD_IO line is shared with few other peripherals.

In this case, maybe you should add config to allow use of the BUCK234 only for case in which DVS mode is disabled by board design (SELB2/3/4 set to LOW). This may also work, when the GPIOs of Exynos stays in the reset state.

Then, using the default 'buck_out' registers: 0x14, 0x1e, 0x28 is reasonable.

I don't see anything in the binding. I have added a comment in the driver to explain this limitation. However I haven't actually seen hardware that makes use of it. Are you saying that Odroid U3 does use it, or just that it has the lines connected up incorrectly?

Quoted 2 lines

Did you tried measure the output voltage, after its change?

No I have not measured it, only verified that the code looks correct. If you are able to do that I think it would be a good test.

Quoted 7 lines

Regards,
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Regards,
Simon

#85 lore raw

PATCH 28/55 dm: pmic: max77686: Support all BUCK regulators

Hello Simon,

Quoted 74 lines · Simon Glass

Hi Przemyslaw,

Quoted 71 lines · Przemyslaw Marczak

Hello Simon,

Quoted 33 lines · Simon Glass

Add support for all BUCK regulators, now that the correct register is accessed for each.

---

   drivers/power/regulator/max77686.c | 10 +++-------
   1 file changed, 3 insertions(+), 7 deletions(-)
drivers/power/regulator/max77686.c +1 -5
index 21173fc..427b717 100644
@@ -81,11 +81,7 @@ static int max77686_buck_volt2hex(int buck, int uV)
                 /* hex = (uV - 600000) / 12500; */
                 hex = (uV - MAX77686_BUCK_UV_LMIN) / MAX77686_BUCK_UV_LSTEP;
                 hex_max = MAX77686_BUCK234_VOLT_MAX_HEX;
-               /**
-                * Those use voltage scaller - temporary not implemented
-                * so return just 0
-                */
-               return -ENOSYS;
+               break;
         default:
                 /* hex = (uV - 750000) / 50000; */
                 hex = (uV - MAX77686_BUCK_UV_HMIN) / MAX77686_BUCK_UV_HSTEP;
@@ -379,11 +375,11 @@ static int max77686_buck_val(struct udevice *dev, int op, int *uV)
         case 2:
         case 3:
         case 4:

drivers/power/regulator/max77686.c static int max77686_buck_val(struct udevice *dev, int op, int *uV) · line 385

Quoted 10 lines
drivers/power/regulator/max77686.c +2 -2
-               /* Those use voltage scallers - will support in the future */
                 mask = MAX77686_BUCK234_VOLT_MASK;
-               return -ENOSYS;
+               break;
         default:
                 mask = MAX77686_BUCK_VOLT_MASK;
+               break;
         }
 
         ret = pmic_read(dev->parent, adr, &val, 1);

The bucks 2,3,4 can work in DVS mode, which allows select one of eight DVS regulators for each output. The default selection at power-on is DVS1 for each output, and it corresponds to the currently defined output register addresses.

The selection can be done by six PMIC's GPIOs:
- DVS1/2/3 - output selection: 0x0=DVS1...0x7=DVS8
- SELB2/3/4 - mode switch: 'DVS' or 'no DVS'

Reading or writing the default registers is proper only in case:
- for the default PMIC's power-up setting - may conflict with bl1/bl2
- when DVS1/2/3 GPIOs are set to LOW - DVS1 selected
- SELB2/3/4 - are set to LOW - no DVS mode

The documentation is poor, but if I good understand, the SELB is used as "latch" for the DVS selection.

So the driver, could be unreliable for these outputs if it doesn't check the PMIC's GPIOs.

It's quite confusing, since the PMIC, doesn't provide registers to check those GPIOs. It should be checked by the driver and can be delivered by device-tree.

This is also confusing, since it depends on board design, because the PMIC's GPIOs can be connected to the SoCs GPIOs and also just pulled to POWER/GND signals.

The documentation says, that those GPIOs should be set accordingly, and for example Odroid U3 has connected the SELB to VDD_IO(LDO3) power line, so actually this state can not be changed or can be changed by accident when changing the VDD_IO - which is HIGH at PMIC's power-up.

The switching is impossible, since the VDD_IO line is shared with few other peripherals.

Quoted 9 lines
Quoted 3 lines

In this case, maybe you should add config to allow use of the BUCK234 only for case in which DVS mode is disabled by board design (SELB2/3/4 set to LOW). This may also work, when the GPIOs of Exynos stays in the reset state.

Then, using the default 'buck_out' registers: 0x14, 0x1e, 0x28 is reasonable.

I don't see anything in the binding. I have added a comment in the driver to explain this limitation. However I haven't actually seen hardware that makes use of it. Are you saying that Odroid U3 does use it, or just that it has the lines connected up incorrectly?

Right, the binding for those GPIOs don't exists, since change of those registers values was not supported by the driver before.

I looked into the bl2 code from the Hardkernel's U-Boot (we are using it's signed bl2 binary for U3). There is a code for smdk4212/smdk4412, which is reused for Odroid U3 and the bl2 MAX77686 driver configures the DVS/SELB gpios. Unfortunately the GPIO is invalid, probably it is valid for smdk.

Code:
https://github.com/hardkernel/u-boot/blob/odroid-v2010.12/board/samsung/smdk4212/pmic.c#L707

In the hardkernel's code we can also see the MAX77686 driver for smdk5250, which also sets the DVS/SELB by GPD/GPX pins in a proper way.

Code:
https://github.com/hardkernel/u-boot/blob/odroid-v2010.12/board/samsung/smdk5250/pmic.c#L546

Quoted 6 lines
Quoted 2 lines

Did you tried measure the output voltage, after its change?

No I have not measured it, only verified that the code looks correct. If you are able to do that I think it would be a good test.

At present I can't measure it, but it should be verified in the future. But if you can notice a stability change after setting those registers, then we can assume, that it works.

Quoted 11 lines
Quoted 7 lines

Regards,
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Regards,
Simon

Best regards,

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#86 lore raw

PATCH 28/55 dm: pmic: max77686: Support all BUCK regulators

Hi Przemyslaw,

Quoted 127 lines · Przemyslaw Marczak

Hello Simon,

Quoted 101 lines · Simon Glass

Hi Przemyslaw,

Quoted 96 lines · Przemyslaw Marczak

Hello Simon,

Quoted 41 lines · Simon Glass

Add support for all BUCK regulators, now that the correct register is accessed for each.

---

   drivers/power/regulator/max77686.c | 10 +++-------
   1 file changed, 3 insertions(+), 7 deletions(-)
drivers/power/regulator/max77686.c +1 -5
index 21173fc..427b717 100644
@@ -81,11 +81,7 @@ static int max77686_buck_volt2hex(int buck, int uV)
                 /* hex = (uV - 600000) / 12500; */
                 hex = (uV - MAX77686_BUCK_UV_LMIN) /
 MAX77686_BUCK_UV_LSTEP;
                 hex_max = MAX77686_BUCK234_VOLT_MAX_HEX;
-               /**
-                * Those use voltage scaller - temporary not implemented
-                * so return just 0
-                */
-               return -ENOSYS;
+               break;
         default:
                 /* hex = (uV - 750000) / 50000; */
                 hex = (uV - MAX77686_BUCK_UV_HMIN) /

MAX77686_BUCK_UV_HSTEP;

drivers/power/regulator/max77686.c +0 -1
@@ -379,11 +375,11 @@ static int max77686_buck_val(struct udevice *dev,
 int op, int *uV)
         case 2:
         case 3:
         case 4:
-               /* Those use voltage scallers - will support in the

future */

                 mask = MAX77686_BUCK234_VOLT_MASK;

drivers/power/regulator/max77686.c static int max77686_buck_val(struct udevice *dev, int op, int *uV) · line 385

Quoted 8 lines
drivers/power/regulator/max77686.c +2 -1
-               return -ENOSYS;
+               break;
         default:
                 mask = MAX77686_BUCK_VOLT_MASK;
+               break;
         }
 
         ret = pmic_read(dev->parent, adr, &val, 1);

The bucks 2,3,4 can work in DVS mode, which allows select one of eight DVS regulators for each output. The default selection at power-on is DVS1 for each output, and it corresponds to the currently defined output register addresses.

The selection can be done by six PMIC's GPIOs:
- DVS1/2/3 - output selection: 0x0=DVS1...0x7=DVS8
- SELB2/3/4 - mode switch: 'DVS' or 'no DVS'

Reading or writing the default registers is proper only in case:
- for the default PMIC's power-up setting - may conflict with bl1/bl2
- when DVS1/2/3 GPIOs are set to LOW - DVS1 selected
- SELB2/3/4 - are set to LOW - no DVS mode

The documentation is poor, but if I good understand, the SELB is used as "latch" for the DVS selection.

So the driver, could be unreliable for these outputs if it doesn't check the PMIC's GPIOs.

It's quite confusing, since the PMIC, doesn't provide registers to check those GPIOs. It should be checked by the driver and can be delivered by device-tree.

This is also confusing, since it depends on board design, because the PMIC's GPIOs can be connected to the SoCs GPIOs and also just pulled to POWER/GND signals.

The documentation says, that those GPIOs should be set accordingly, and for example Odroid U3 has connected the SELB to VDD_IO(LDO3) power line, so actually this state can not be changed or can be changed by accident when changing the VDD_IO - which is HIGH at PMIC's power-up.

The switching is impossible, since the VDD_IO line is shared with few other peripherals.

In this case, maybe you should add config to allow use of the BUCK234 only for case in which DVS mode is disabled by board design (SELB2/3/4 set to LOW). This may also work, when the GPIOs of Exynos stays in the reset state.

Quoted 9 lines
Quoted 2 lines

Then, using the default 'buck_out' registers: 0x14, 0x1e, 0x28 is reasonable.

I don't see anything in the binding. I have added a comment in the driver to explain this limitation. However I haven't actually seen hardware that makes use of it. Are you saying that Odroid U3 does use it, or just that it has the lines connected up incorrectly?

Right, the binding for those GPIOs don't exists, since change of those registers values was not supported by the driver before.

I looked into the bl2 code from the Hardkernel's U-Boot (we are using it's signed bl2 binary for U3). There is a code for smdk4212/smdk4412, which is reused for Odroid U3 and the bl2 MAX77686 driver configures the DVS/SELB gpios. Unfortunately the GPIO is invalid, probably it is valid for smdk.

Code:
https://github.com/hardkernel/u-boot/blob/odroid-v2010.12/board/samsung/smdk4212/pmic.c#L707

Quoted 6 lines

In the hardkernel's code we can also see the MAX77686 driver for smdk5250, which also sets the DVS/SELB by GPD/GPX pins in a proper way.

Code:
https://github.com/hardkernel/u-boot/blob/odroid-v2010.12/board/samsung/smdk5250/pmic.c#L546

That is a good collection of hackery!

The question is, should I do anything here? Things seem to work OK in my testing with the patch as it is.

Quoted 5 lines
Quoted 5 lines
Quoted 3 lines

Did you tried measure the output voltage, after its change?

Quoted 7 lines
Quoted 3 lines

No I have not measured it, only verified that the code looks correct. If you are able to do that I think it would be a good test.

At present I can't measure it, but it should be verified in the future. But if you can notice a stability change after setting those registers, then we can assume, that it works.

OK, sounds good. I can read the values back at least. I definitely had it die before I added the voltage stuff so it seems to be having an effect.

Regards,
Simon

#87 lore raw

PATCH 29/55 dm: power: Don't return an error when regulators are not autoset

In reply to Simon Glass

Not all regulators can be set up automatically. Adjust the code so that regulators_enable_boot_on() will return success when some are skipped. Only genuine errors are reported.

---

 drivers/power/regulator/regulator-uclass.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/power/regulator/regulator-uclass.c +3 -1
index 12e141b..f3fe7a5 100644
@@ -319,8 +319,10 @@ int regulators_enable_boot_on(bool verbose)
 	     dev && !ret;
 	     uclass_next_device(&dev)) {
 		ret = regulator_autoset(dev);
-		if (ret == -EMEDIUMTYPE)
+		if (ret == -EMEDIUMTYPE) {
+			ret = 0;
 			continue;
+		}
 		if (verbose)
 			regulator_show(dev, ret);
 	}
Signature · 1 line
2.4.3.573.g4eafbef
#88 lore raw

PATCH 29/55 dm: power: Don't return an error when regulators are not autoset

Hello Simon,

Quoted 17 lines · Simon Glass

Not all regulators can be set up automatically. Adjust the code so that regulators_enable_boot_on() will return success when some are skipped. Only genuine errors are reported.

---

  drivers/power/regulator/regulator-uclass.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/power/regulator/regulator-uclass.c +0 -0
index 12e141b..f3fe7a5 100644
@@ -319,8 +319,10 @@ int regulators_enable_boot_on(bool verbose)
  	     dev && !ret;

drivers/power/regulator/regulator-uclass.c int regulators_enable_boot_on(bool verbose) · line 328

Quoted 10 lines
drivers/power/regulator/regulator-uclass.c +3 -1
  	     uclass_next_device(&dev)) {
  		ret = regulator_autoset(dev);
-		if (ret == -EMEDIUMTYPE)
+		if (ret == -EMEDIUMTYPE) {
+			ret = 0;
  			continue;
+		}
  		if (verbose)
  			regulator_show(dev, ret);
  	}

Regards.

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#89 lore raw

PATCH 29/55 dm: power: Don't return an error when regulators are not autoset

Applied to u-boot-dm.

#90 lore raw

PATCH 30/55 dm: pmic: Display the regulator limits on error

In reply to Simon Glass

When a regulator command cannot honour the requested voltage, display the limits to try to be helpful.

---

 common/cmd_regulator.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
common/cmd_regulator.c +2 -1
index 6149d1e..2d8579b 100644
@@ -241,7 +241,8 @@ static int do_value(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	value = simple_strtoul(argv[1], NULL, 0);
 	if ((value < uc_pdata->min_uV || value > uc_pdata->max_uV) && !force) {
-		printf("Value exceeds regulator constraint limits\n");
+		printf("Value exceeds regulator constraint limits %d..%d\n",
+		       uc_pdata->min_uV, uc_pdata->max_uV);
 		return CMD_RET_FAILURE;
 	}
 
Signature · 1 line
2.4.3.573.g4eafbef
#91 lore raw

PATCH 30/55 dm: pmic: Display the regulator limits on error

Hello Simon,

Quoted 14 lines · Simon Glass

When a regulator command cannot honour the requested voltage, display the limits to try to be helpful.

---

  common/cmd_regulator.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
common/cmd_regulator.c +0 -0
index 6149d1e..2d8579b 100644

common/cmd_regulator.c static int do_value(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 244

Quoted 4 lines
common/cmd_regulator.c +0 -1
@@ -241,7 +241,8 @@ static int do_value(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
  	value = simple_strtoul(argv[1], NULL, 0);
  	if ((value < uc_pdata->min_uV || value > uc_pdata->max_uV) && !force) {
-		printf("Value exceeds regulator constraint limits\n");

Could you please also add printing the 'uV' unit?

common/cmd_regulator.c static int do_value(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 248

Quoted 6 lines
common/cmd_regulator.c +2 -0
+		printf("Value exceeds regulator constraint limits %d..%d\n",
+		       uc_pdata->min_uV, uc_pdata->max_uV);
  		return CMD_RET_FAILURE;
  	}
 

Regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#92 lore raw

PATCH 30/55 dm: pmic: Display the regulator limits on error

Quoted 20 lines · Przemyslaw Marczak

Hello Simon,

Quoted 17 lines · Simon Glass

When a regulator command cannot honour the requested voltage, display the limits to try to be helpful.

---

  common/cmd_regulator.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
common/cmd_regulator.c +0 -0
index 6149d1e..2d8579b 100644
@@ -241,7 +241,8 @@ static int do_value(cmd_tbl_t *cmdtp, int flag, int
 argc, char * const argv[])
 
Quoted 7 lines

common/cmd_regulator.c static int do_value(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 244

Quoted 4 lines
common/cmd_regulator.c +0 -1
        value = simple_strtoul(argv[1], NULL, 0);
        if ((value < uc_pdata->min_uV || value > uc_pdata->max_uV) &&
 !force) {
-               printf("Value exceeds regulator constraint limits\n");

Could you please also add printing the 'uV' unit?

I added uV to the end.

Quoted 9 lines
Quoted 8 lines
common/cmd_regulator.c +2 -0
+               printf("Value exceeds regulator constraint limits
 %d..%d\n",
+                      uc_pdata->min_uV, uc_pdata->max_uV);
                return CMD_RET_FAILURE;
        }
Quoted 8 lines

Regards
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Applied to u-boot-dm.

#93 lore raw

PATCH 31/55 dm: video: Add support for video bridges

In reply to Simon Glass

A video bridge typically converts video from one format to another, e.g. DisplayPort to LVDS. Add driver model support for these with a simple interface to control activation and backlight. The uclass supports GPIO control of power and reset lines.

---

 drivers/video/Kconfig                      |   2 +
 drivers/video/Makefile                     |   2 +
 drivers/video/bridge/Kconfig               |   8 +++
 drivers/video/bridge/Makefile              |   7 ++
 drivers/video/bridge/video-bridge-uclass.c | 111 +++++++++++++++++++++++++++++
 include/dm/uclass-id.h                     |   1 +
 include/video_bridge.h                     |  92 ++++++++++++++++++++++++
 7 files changed, 223 insertions(+)
 create mode 100644 drivers/video/bridge/Kconfig
 create mode 100644 drivers/video/bridge/Makefile
 create mode 100644 drivers/video/bridge/video-bridge-uclass.c
 create mode 100644 include/video_bridge.h
drivers/video/Kconfig +2 -0
index 9ae23e8..3244cd7 100644
@@ -240,3 +240,5 @@ config VIDEO_TEGRA124
 	   HDMI. At present only eDP is supported by U-Boot. This option
 	   enables this support which can be used on devices which
 	   have an eDP display connected.
+
+source "drivers/video/bridge/Kconfig"
drivers/video/Makefile +2 -0
index 2ead7f1..599fe83 100644
@@ -54,3 +54,5 @@ obj-$(CONFIG_AM335X_LCD) += am335x-fb.o
 obj-$(CONFIG_VIDEO_PARADE) += parade.o
 
 obj-${CONFIG_VIDEO_TEGRA124} += tegra124/
+
+obj-y += bridge/
drivers/video/bridge/Kconfig new file +8 -0
new file mode 100644
index 0000000..7ba6b17
@@ -0,0 +1,8 @@
+config VIDEO_BRIDGE
+	bool "Support video bridges"
+	depends on DM
+	help
+	  Some platforms use video bridges to convert from one output to
+	  another. For example, where the SoC only supports eDP and the LCD
+	  requires LVDS, an eDP->LVDS bridge chip can be used to provide the
+	  necessary conversion. This option enables support for these devices.
drivers/video/bridge/Makefile new file +7 -0
new file mode 100644
index 0000000..f4bf087
@@ -0,0 +1,7 @@
+#
+#  Copyright (C) 2015 Google, Inc
+#  Written by Simon Glass <[email protected]>
+#
+#  SPDX-License-Identifier:	GPL-2.0+
+
+obj-$(CONFIG_VIDEO_BRIDGE) += video-bridge-uclass.o
drivers/video/bridge/video-bridge-uclass.c new file +111 -0

111 lines not on this page · raw message

include/dm/uclass-id.h +1 -0
index e2c3480..c1a6594 100644
@@ -58,6 +58,7 @@ enum uclass_id {
 	UCLASS_USB,		/* USB bus */
 	UCLASS_USB_DEV_GENERIC,	/* USB generic device */
 	UCLASS_USB_HUB,		/* USB hub */
+	UCLASS_VIDEO_BRIDGE,	/* Video bridge, e.g. DisplayPort to LVDS */
 
 	UCLASS_COUNT,
 	UCLASS_INVALID = -1,
include/video_bridge.h new file +92 -0

92 lines not on this page · raw message

Signature · 1 line
2.4.3.573.g4eafbef
#94 lore raw

PATCH 31/55 dm: video: Add support for video bridges

Quoted 8 lines · Simon Glass

A video bridge typically converts video from one format to another, e.g. DisplayPort to LVDS. Add driver model support for these with a simple interface to control activation and backlight. The uclass supports GPIO control of power and reset lines.

---

Quoted 12 lines
 drivers/video/Kconfig                      |   2 +
 drivers/video/Makefile                     |   2 +
 drivers/video/bridge/Kconfig               |   8 +++
 drivers/video/bridge/Makefile              |   7 ++
 drivers/video/bridge/video-bridge-uclass.c | 111 +++++++++++++++++++++++++++++
 include/dm/uclass-id.h                     |   1 +
 include/video_bridge.h                     |  92 ++++++++++++++++++++++++
 7 files changed, 223 insertions(+)
 create mode 100644 drivers/video/bridge/Kconfig
 create mode 100644 drivers/video/bridge/Makefile
 create mode 100644 drivers/video/bridge/video-bridge-uclass.c
 create mode 100644 include/video_bridge.h

Applied to u-boot-dm.

#95 lore raw

PATCH 32/55 dm: video: Add support for the Parade PS8622/625 bridge

In reply to Simon Glass

This chip provides an eDP to LVDS bridge which is useful for SoCs that don't support LVDS displays (or it would waste scarce pins). The setup is included in the device tree.

---

 doc/device-tree-bindings/video/bridge/ps8622.txt |  33 ++++++
 drivers/video/bridge/Kconfig                     |  10 ++
 drivers/video/bridge/Makefile                    |   1 +
 drivers/video/bridge/ps862x.c                    | 134 +++++++++++++++++++++++
 4 files changed, 178 insertions(+)
 create mode 100644 doc/device-tree-bindings/video/bridge/ps8622.txt
 create mode 100644 drivers/video/bridge/ps862x.c
doc/device-tree-bindings/video/bridge/ps8622.txt new file +33 -0
new file mode 100644
index 0000000..66d5d07
@@ -0,0 +1,33 @@
+ps8622-bridge bindings
+
+Required properties:
+	- compatible: "parade,ps8622" or "parade,ps8625"
+	- reg: first i2c address of the bridge
+	- sleep-gpios: OF device-tree gpio specification for PD_ pin.
+	- reset-gpios: OF device-tree gpio specification for RST_ pin.
+	- parade,regs: List of 3-byte registers tuples to write:
+		<I2C chip address offset> <register> <value>
+
+Optional properties:
+	- lane-count: number of DP lanes to use
+	- use-external-pwm: backlight will be controlled by an external PWM
+	- video interfaces: Device node can contain video interface port
+			    nodes for panel according to [1].
+
+[1]: Documentation/devicetree/bindings/media/video-interfaces.txt
+
+Example:
+	lvds-bridge at 48 {
+		compatible = "parade,ps8622";
+		reg = <0x48>;
+		sleep-gpios = <&gpc3 6 1 0 0>;
+		reset-gpios = <&gpc3 1 1 0 0>;
+		lane-count = <1>;
+		ports {
+			port at 0 {
+				bridge_out: endpoint {
+					remote-endpoint = <&panel_in>;
+				};
+			};
+		};
+	};
drivers/video/bridge/Kconfig +10 -0
index 7ba6b17..589795d 100644
@@ -6,3 +6,13 @@ config VIDEO_BRIDGE
 	  another. For example, where the SoC only supports eDP and the LCD
 	  requires LVDS, an eDP->LVDS bridge chip can be used to provide the
 	  necessary conversion. This option enables support for these devices.
+
+config VIDEO_BRIDGE_PARADE_PS862X
+	bool "Support Parade PS862X DP->LVDS bridge"
+	depends on VIDEO_BRIDGE
+	help
+	  The Parade PS8622 and PS8625 are DisplayPort-to-LVDS (Low voltage
+	  differential signalling) converters. They enable an LVDS LCD panel
+	  to be connected to an eDP output device such as an SoC that lacks
+	  LVDS capability, or where LVDS requires too many signals to route
+	  on the PCB. Setup parameters are provided in the device tree.
drivers/video/bridge/Makefile +1 -0
index f4bf087..c7cc563 100644
@@ -5,3 +5,4 @@
 #  SPDX-License-Identifier:	GPL-2.0+
 
 obj-$(CONFIG_VIDEO_BRIDGE) += video-bridge-uclass.o
+obj-$(CONFIG_VIDEO_BRIDGE_PARADE_PS862X) += ps862x.o
drivers/video/bridge/ps862x.c new file +134 -0

134 lines not on this page · raw message

Signature · 1 line
2.4.3.573.g4eafbef
#96 lore raw

PATCH 32/55 dm: video: Add support for the Parade PS8622/625 bridge

Quoted 7 lines · Simon Glass

This chip provides an eDP to LVDS bridge which is useful for SoCs that don't support LVDS displays (or it would waste scarce pins). The setup is included in the device tree.

---

Quoted 7 lines
 doc/device-tree-bindings/video/bridge/ps8622.txt |  33 ++++++
 drivers/video/bridge/Kconfig                     |  10 ++
 drivers/video/bridge/Makefile                    |   1 +
 drivers/video/bridge/ps862x.c                    | 134 +++++++++++++++++++++++
 4 files changed, 178 insertions(+)
 create mode 100644 doc/device-tree-bindings/video/bridge/ps8622.txt
 create mode 100644 drivers/video/bridge/ps862x.c

Applied to u-boot-dm.

#97 lore raw

PATCH 33/55 dm: video: Add support for the NXP PTN3460 bridge

In reply to Simon Glass

This chip provides an eDP to LVDS bridge which is useful for SoCs that don't support LVDS displays (or it would waste scarce pins). There is no setup required by this chip, other than to adjust power-down and reset pins, and those are managed by the uclass.

---

 drivers/video/bridge/Kconfig   |  9 +++++++++
 drivers/video/bridge/Makefile  |  1 +
 drivers/video/bridge/ptn3460.c | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 drivers/video/bridge/ptn3460.c
drivers/video/bridge/Kconfig +9 -0
index 589795d..2a3b6c4 100644
@@ -16,3 +16,12 @@ config VIDEO_BRIDGE_PARADE_PS862X
 	  to be connected to an eDP output device such as an SoC that lacks
 	  LVDS capability, or where LVDS requires too many signals to route
 	  on the PCB. Setup parameters are provided in the device tree.
+
+config VIDEO_BRIDGE_NXP_PTN3460
+	bool "Support NXP PTN3460 DP->LVDS bridge"
+	depends on VIDEO_BRIDGE
+	help
+	  The NXP PTN3460 is a DisplayPort-to-LVDS (Low voltage differential
+	  signalling) converter. It enables an LVDS LCD panel to be connected
+	  to an eDP output device such as an SoC that lacks LVDS capability,
+	  or where LVDS requires too many signals to route on the PCB.
drivers/video/bridge/Makefile +1 -0
index c7cc563..ce731fa 100644
@@ -6,3 +6,4 @@
 
 obj-$(CONFIG_VIDEO_BRIDGE) += video-bridge-uclass.o
 obj-$(CONFIG_VIDEO_BRIDGE_PARADE_PS862X) += ps862x.o
+obj-$(CONFIG_VIDEO_BRIDGE_NXP_PTN3460) += ptn3460.o
drivers/video/bridge/ptn3460.c new file +38 -0
new file mode 100644
index 0000000..2e2ae7c
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2015 Google, Inc
+ * Written by Simon Glass <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <video_bridge.h>
+
+static int ptn3460_attach(struct udevice *dev)
+{
+	int ret;
+
+	debug("%s: %s\n", __func__, dev->name);
+	ret = video_bridge_set_active(dev, true);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+struct video_bridge_ops ptn3460_ops = {
+	.attach = ptn3460_attach,
+};
+
+static const struct udevice_id ptn3460_ids[] = {
+	{ .compatible = "nxp,ptn3460", },
+	{ }
+};
+
+U_BOOT_DRIVER(parade_ptn3460) = {
+	.name	= "nmp_ptn3460",
+	.id	= UCLASS_VIDEO_BRIDGE,
+	.of_match = ptn3460_ids,
+	.ops	= &ptn3460_ops,
+};
Signature · 1 line
2.4.3.573.g4eafbef
#98 lore raw

PATCH 33/55 dm: video: Add support for the NXP PTN3460 bridge

Quoted 5 lines · Simon Glass

This chip provides an eDP to LVDS bridge which is useful for SoCs that don't support LVDS displays (or it would waste scarce pins). There is no setup required by this chip, other than to adjust power-down and reset pins, and those are managed by the uclass.

Quoted 8 lines

---

 drivers/video/bridge/Kconfig   |  9 +++++++++
 drivers/video/bridge/Makefile  |  1 +
 drivers/video/bridge/ptn3460.c | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 drivers/video/bridge/ptn3460.c

Applied to u-boot-dm.

#99 lore raw

PATCH 34/55 exynos: spi: Convert the timeout to debug()

In reply to Simon Glass

Since the timeout is reported through normal channels, and is sometimes expected (e.g. if the bus is being probed for a non-existent device), don't display the message in the driver.

In general, drivers should not write to the console as this limits their usefulness in error conditions.

---

 drivers/spi/exynos_spi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/spi/exynos_spi.c +3 -3
index 67f6b2d..6d77c31 100644
@@ -190,9 +190,9 @@ static int spi_rx_tx(struct exynos_spi_priv *priv, int todo,
 			spi_request_bytes(regs, toread, step);
 		}
 		if (priv->skip_preamble && get_timer(start) > 100) {
-			printf("SPI timeout: in_bytes=%d, out_bytes=%d, ",
-			       in_bytes, out_bytes);
-			return -1;
+			debug("SPI timeout: in_bytes=%d, out_bytes=%d, ",
+			      in_bytes, out_bytes);
+			return -ETIMEDOUT;
 		}
 	}
 
Signature · 1 line
2.4.3.573.g4eafbef
#100 lore raw

PATCH 34/55 exynos: spi: Convert the timeout to debug()

Quoted 4 lines · Simon Glass

Since the timeout is reported through normal channels, and is sometimes expected (e.g. if the bus is being probed for a non-existent device), don't display the message in the driver.

Quoted 8 lines

In general, drivers should not write to the console as this limits their usefulness in error conditions.

---

 drivers/spi/exynos_spi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Applied to u-boot-dm.

#101 lore raw

PATCH 35/55 exynos: Correct return value in exynos_mmc_init()

In reply to Simon Glass

This function should return 0 on success, not 1. Fix it.

---

 drivers/mmc/s5p_sdhci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/s5p_sdhci.c +1 -1
index 8e1968a..522eab9 100644
@@ -202,6 +202,6 @@ int exynos_mmc_init(const void *blob)
 
 	process_nodes(blob, node_list, count);
 
-	return 1;
+	return 0;
 }
 #endif
Signature · 1 line
2.4.3.573.g4eafbef
#102 lore raw

PATCH 35/55 exynos: Correct return value in exynos_mmc_init()

Quoted 21 lines · Simon Glass

This function should return 0 on success, not 1. Fix it.

---

 drivers/mmc/s5p_sdhci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/s5p_sdhci.c +1 -2
index 8e1968a..522eab9 100644
@@ -202,6 +202,6 @@ int exynos_mmc_init(const void *blob)
 
        process_nodes(blob, node_list, count);
 
-       return 1;
+       return 0;
 }
 #endif
--
Quoted 2 lines

2.4.3.573.g4eafbef

Applied to u-boot-dm.

#103 lore raw

PATCH 36/55 exynos: Add support for the DisplayPort hotplug detect

In reply to Simon Glass

Allow this function to be selected using the pinmux API.

---

 arch/arm/cpu/armv7/exynos/pinmux.c        | 10 ++++++++++
 arch/arm/include/asm/arch-exynos/periph.h |  1 +
 2 files changed, 11 insertions(+)
arch/arm/cpu/armv7/exynos/pinmux.c +10 -0
index be43e22..e97cb37 100644
@@ -496,6 +496,16 @@ static int exynos5_pinmux_config(int peripheral, int flags)
 	case PERIPH_ID_SPI4:
 		exynos5_spi_config(peripheral);
 		break;
+	case PERIPH_ID_DPHPD:
+		/* Set Hotplug detect for DP */
+		gpio_cfg_pin(EXYNOS5_GPIO_X07, S5P_GPIO_FUNC(0x3));
+
+		/*
+		 * Hotplug detect should have an external pullup; disable the
+		 * internal pulldown so they don't fight.
+		 */
+		gpio_set_pull(EXYNOS5_GPIO_X07, S5P_GPIO_PULL_NONE);
+		break;
 	default:
 		debug("%s: invalid peripheral %d", __func__, peripheral);
 		return -1;
arch/arm/include/asm/arch-exynos/periph.h +1 -0
index 5c1c3d4..fdc9e87 100644
@@ -53,6 +53,7 @@ enum periph_id {
 	PERIPH_ID_PWM2,
 	PERIPH_ID_PWM3,
 	PERIPH_ID_PWM4,
+	PERIPH_ID_DPHPD,
 	PERIPH_ID_I2C10 = 203,
 
 	PERIPH_ID_NONE = -1,
Signature · 1 line
2.4.3.573.g4eafbef
#104 lore raw

PATCH 36/55 exynos: Add support for the DisplayPort hotplug detect

Quoted 8 lines · Simon Glass

Allow this function to be selected using the pinmux API.

---

 arch/arm/cpu/armv7/exynos/pinmux.c        | 10 ++++++++++
 arch/arm/include/asm/arch-exynos/periph.h |  1 +
 2 files changed, 11 insertions(+)

Applied to u-boot-dm.

#105 lore raw

PATCH 37/55 exynos: video: Correct debug output

In reply to Simon Glass

We should not print a message from the driver when the display is set up. This is normal behaviour. Change this message to use debug().

Also remove the double newline on another debug message.

---

 drivers/video/exynos_dp.c          | 2 +-
 drivers/video/exynos_dp_lowlevel.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/video/exynos_dp.c +1 -1
index f60b060..c3f7a3a 100644
@@ -967,7 +967,7 @@ unsigned int exynos_init_dp(void)
 		return ret;
 	}
 
-	printf("Exynos DP init done\n");
+	debug("Exynos DP init done\n");
 
 	return ret;
 }
drivers/video/exynos_dp_lowlevel.c +1 -1
index bf0ea10..05118f8 100644
@@ -823,7 +823,7 @@ int exynos_dp_read_bytes_from_i2c(unsigned int device_addr,
 			reg = readl(&dp_regs->aux_rx_comm);
 			if (reg == AUX_RX_COMM_AUX_DEFER ||
 				reg == AUX_RX_COMM_I2C_DEFER) {
-				printf("DP Defer: %d\n\n", reg);
+				printf("DP Defer: %d\n", reg);
 				defer = 1;
 			}
 		}
Signature · 1 line
2.4.3.573.g4eafbef
#106 lore raw

PATCH 37/55 exynos: video: Correct debug output

Quoted 11 lines · Simon Glass

We should not print a message from the driver when the display is set up. This is normal behaviour. Change this message to use debug().

Also remove the double newline on another debug message.

---

 drivers/video/exynos_dp.c          | 2 +-
 drivers/video/exynos_dp_lowlevel.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Applied to u-boot-dm.

#107 lore raw

PATCH 38/55 exynos: Tidy up CPU frequency display

In reply to Simon Glass

Line up the display with the line below, e.g.:

CPU: Exynos5250 @ 1.7 GHz
Model: Google Spring
DRAM: 2 GiB
MMC: EXYNOS DWMMC: 0

Also show the speed as GHz where appropriate.

---

 arch/arm/cpu/armv7/s5p-common/cpu_info.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
arch/arm/cpu/armv7/s5p-common/cpu_info.c +2 -5
index a8d91e7..154d674 100644
@@ -30,11 +30,8 @@ u32 get_device_type(void)
 #ifdef CONFIG_DISPLAY_CPUINFO
 int print_cpuinfo(void)
 {
-	char buf[32];
-
-	printf("CPU:\t%s%X@%sMHz\n",
-			s5p_get_cpu_name(), s5p_cpu_id,
-			strmhz(buf, get_arm_clk()));
+	printf("CPU:   %s%X @ ", s5p_get_cpu_name(), s5p_cpu_id);
+	print_freq(get_arm_clk(), "\n");
 
 	return 0;
 }
Signature · 1 line
2.4.3.573.g4eafbef
#108 lore raw

PATCH 38/55 exynos: Tidy up CPU frequency display

Quoted 7 lines · Simon Glass

Line up the display with the line below, e.g.:

CPU: Exynos5250 @ 1.7 GHz
Model: Google Spring
DRAM: 2 GiB
MMC: EXYNOS DWMMC: 0

Quoted 7 lines

Also show the speed as GHz where appropriate.

---

 arch/arm/cpu/armv7/s5p-common/cpu_info.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Applied to u-boot-dm.

#109 lore raw

PATCH 39/55 dm: gpio: Check a GPIO is valid before using it

In reply to Simon Glass

Since a gpio_desc is allowed to be invalid we should return an error indicating that the operation cannot be completed. This can happen if the GPIO is optional - e.g. some devices may have a reset line and some may not.

---

 drivers/gpio/gpio-uclass.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpio/gpio-uclass.c +5 -1
index c4ba580..b951662 100644
@@ -250,8 +250,12 @@ int gpio_free(unsigned gpio)
 
 static int check_reserved(struct gpio_desc *desc, const char *func)
 {
-	struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(desc->dev);
+	struct gpio_dev_priv *uc_priv;
+
+	if (!dm_gpio_is_valid(desc))
+		return -ENOENT;
 
+	uc_priv = dev_get_uclass_priv(desc->dev);
 	if (!uc_priv->name[desc->offset]) {
 		printf("%s: %s: error: gpio %s%d not reserved\n",
 		       desc->dev->name, func,
Signature · 1 line
2.4.3.573.g4eafbef
#110 lore raw

PATCH 39/55 dm: gpio: Check a GPIO is valid before using it

Quoted 10 lines · Simon Glass

Since a gpio_desc is allowed to be invalid we should return an error indicating that the operation cannot be completed. This can happen if the GPIO is optional - e.g. some devices may have a reset line and some may not.

---

 drivers/gpio/gpio-uclass.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Applied to u-boot-dm.

#111 lore raw

PATCH 40/55 dts: exynos: snow: Add memory layout description

In reply to Simon Glass

Add a description of the snow memory layer to assist flashing tools which want to be able to deal with any exynos image.

---

 arch/arm/dts/exynos5250-snow.dts | 53 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
arch/arm/dts/exynos5250-snow.dts +53 -0
index 653efb4..3591252 100644
@@ -43,6 +43,59 @@
 		i2s = "/sound at 3830000";
 	};
 
+        memory {
+		reg = <0x40000000 0x80000000>;
+	};
+
+	chosen {
+		bootargs = "console=tty1";
+		stdout-path = "serial3:115200n8";
+	};
+
+	iram {
+		reg = <0x02020000 0x60000>;
+	};
+
+	config {
+		samsung,bl1-offset = <0x1400>;
+		samsung,bl2-offset = <0x3400>;
+		u-boot-memory = "/memory";
+		u-boot-offset = <0x3e00000 0x100000>;
+	};
+
+	flash {
+		reg = <0 0x100000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		pre-boot {
+			label = "bl1 pre-boot";
+			reg = <0 0x2000>;
+			read-only;
+			filename = "e5250.nbl1.bin";
+			type = "blob exynos-bl1";
+			required;
+		};
+
+		spl {
+			label = "bl2 spl";
+			reg = <0x2000 0x4000>;
+			read-only;
+			filename = "bl2.bin";
+			type = "blob exynos-bl2 boot,dtb";
+			payload = "/flash/ro-boot";
+			required;
+		};
+
+		ro-boot {
+			label = "u-boot";
+			reg = <0x6000 0x9a000>;
+			read-only;
+			type = "blob boot,dtb";
+			required;
+		};
+	};
+
+
 	i2c4: i2c at 12CA0000 {
 		cros_ec_old: cros-ec at 1e {
 			reg = <0x1e>;
Signature · 1 line
2.4.3.573.g4eafbef
#112 lore raw

PATCH 40/55 dts: exynos: snow: Add memory layout description

Quoted 8 lines · Simon Glass

Add a description of the snow memory layer to assist flashing tools which want to be able to deal with any exynos image.

---

 arch/arm/dts/exynos5250-snow.dts | 53 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

Applied to u-boot-dm.

#113 lore raw

PATCH 41/55 dts: exynos: pit: Add a new node for the parade video bridge driver

In reply to Simon Glass

The new driver supports driver model and configuration via device tree. Add a node for pit, which needs this driver.

---

 arch/arm/dts/exynos5420-peach-pit.dts | 128 ++++++++++++++++++++++++++++++++--
 1 file changed, 123 insertions(+), 5 deletions(-)
arch/arm/dts/exynos5420-peach-pit.dts +123 -5
index 5182b2b..2d2b7c9 100644
@@ -65,11 +65,129 @@
 	              compatible = "maxim,max98090-codec";
 	       };
 
-	        edp-lvds-bridge at 48 {
-	                compatible = "parade,ps8625";
-	                reg = <0x48>;
-			sleep-gpio = <&gpx3 5 GPIO_ACTIVE_HIGH>;
-			reset-gpio = <&gpy7 7 GPIO_ACTIVE_HIGH>;
+		edp-lvds-bridge at 48 {
+			compatible = "parade,ps8625";
+			reg = <0x48>;
+			sleep-gpios = <&gpx3 5 GPIO_ACTIVE_LOW>;
+			reset-gpios = <&gpy7 7 GPIO_ACTIVE_LOW>;
+			parade,regs = /bits/ 8 <
+				0x02 0xa1 0x01  /* HPD low */
+				/*
+				* SW setting
+				* [1:0] SW output 1.2V voltage is lower to 96%
+				*/
+				0x04 0x14 0x01
+				/*
+				* RCO SS setting
+				* [5:4] = b01 0.5%, b10 1%, b11 1.5%
+				*/
+				0x04 0xe3 0x20
+				0x04 0xe2 0x80 /* [7] RCO SS enable */
+				/*
+				*  RPHY Setting
+				* [3:2] CDR tune wait cycle before
+				* measure for fine tune b00: 1us,
+				* 01: 0.5us, 10:2us, 11:4us.
+				*/
+				0x04 0x8a 0x0c
+				0x04 0x89 0x08 /* [3] RFD always on */
+				/*
+				* CTN lock in/out:
+				* 20000ppm/80000ppm. Lock out 2
+				* times.
+				*/
+				0x04 0x71 0x2d
+				/*
+				* 2.7G CDR settings
+				* NOF=40LSB for HBR CDR setting
+				*/
+				0x04 0x7d 0x07
+				0x04 0x7b 0x00  /* [1:0] Fmin=+4bands */
+				0x04 0x7a 0xfd  /* [7:5] DCO_FTRNG=+-40% */
+				/*
+				* 1.62G CDR settings
+				* [5:2]NOF=64LSB [1:0]DCO scale is 2/5
+				*/
+				0x04 0xc0 0x12
+				0x04 0xc1 0x92  /* Gitune=-37% */
+				0x04 0xc2 0x1c  /* Fbstep=100% */
+				0x04 0x32 0x80  /* [7]LOS signal disable */
+				/*
+				* RPIO Setting
+				* [7:4] LVDS driver bias current :
+				* 75% (250mV swing)
+				*/
+				0x04 0x00 0xb0
+				/*
+				* [7:6] Right-bar GPIO output strength is 8mA
+				*/
+				0x04 0x15 0x40
+				/* EQ Training State Machine Setting */
+				0x04 0x54 0x10  /* RCO calibration start */
+				/* [4:0] MAX_LANE_COUNT set to one lane */
+				0x01 0x02 0x81
+				/* [4:0] LANE_COUNT_SET set to one lane */
+				0x01 0x21 0x81
+				0x00 0x52 0x20
+				0x00 0xf1 0x03  /* HPD CP toggle enable */
+				0x00 0x62 0x41
+				/* Counter number add 1ms counter delay */
+				0x00 0xf6 0x01
+				/*
+				* [6]PWM function control by
+				* DPCD0040f[7], default is PWM
+				* block always works.
+				*/
+				0x00 0x77 0x06
+				/*
+				* 04h Adjust VTotal tolerance to
+				* fix the 30Hz no display issue
+				*/
+				0x00 0x4c 0x04
+				/* DPCD00400='h00, Parade OUI = 'h001cf8 */
+				0x01 0xc0 0x00
+				0x01 0xc1 0x1c  /* DPCD00401='h1c */
+				0x01 0xc2 0xf8  /* DPCD00402='hf8 */
+				/*
+				* DPCD403~408 = ASCII code
+				* D2SLV5='h4432534c5635
+				*/
+				0x01 0xc3 0x44
+				0x01 0xc4 0x32  /* DPCD404 */
+				0x01 0xc5 0x53  /* DPCD405 */
+				0x01 0xc6 0x4c  /* DPCD406 */
+				0x01 0xc7 0x56  /* DPCD407 */
+				0x01 0xc8 0x35  /* DPCD408 */
+				/*
+				* DPCD40A, Initial Code major  revision
+				* '01'
+				*/
+				0x01 0xca 0x01
+				/* DPCD40B Initial Code minor revision '05' */
+				0x01 0xcb 0x05
+				/* DPCD720 Select internal PWM */
+				0x01 0xa5 0xa0
+				/*
+				* FFh for 100% PWM of brightness, 0h for 0%
+				* brightness
+				*/
+				0x01 0xa7 0xff
+				/*
+				* Set LVDS output as 6bit-VESA mapping,
+				* single LVDS channel
+				*/
+				0x01 0xcc 0x13
+				/* Enable SSC set by register */
+				0x02 0xb1 0x20
+				/*
+				* Set SSC enabled and +/-1% central
+				* spreading
+				*/
+				0x04 0x10 0x16
+				/* MPU Clock source: LC => RCO */
+				0x04 0x59 0x60
+				0x04 0x54 0x14  /* LC -> RCO */
+				0x02 0xa1 0x91>;  /* HPD high */
 	        };
 	};
 
Signature · 1 line
2.4.3.573.g4eafbef
#114 lore raw

PATCH 41/55 dts: exynos: pit: Add a new node for the parade video bridge driver

Quoted 8 lines · Simon Glass

The new driver supports driver model and configuration via device tree. Add a node for pit, which needs this driver.

---

 arch/arm/dts/exynos5420-peach-pit.dts | 128 ++++++++++++++++++++++++++++++++--
 1 file changed, 123 insertions(+), 5 deletions(-)

Applied to u-boot-dm.

#115 lore raw

PATCH 42/55 dts: exynos: snow: Add a new node for the NXP video bridge driver

In reply to Simon Glass

The driver supports driver model. Add a node for snow, which needs it.

---

 arch/arm/dts/exynos5250-snow.dts | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)
arch/arm/dts/exynos5250-snow.dts +16 -20
index 3591252..334a5af 100644
@@ -206,6 +206,22 @@
 		};
 	};
 
+	i2c at 12CD0000 {
+		ptn3460: lvds-bridge at 20 {
+			compatible = "nxp,ptn3460";
+			reg = <0x20>;
+			sleep-gpios = <&gpy2 5 GPIO_ACTIVE_LOW>;
+			reset-gpios = <&gpx1 5 GPIO_ACTIVE_LOW>;
+			hotplug-gpios = <&gpx0 7 GPIO_ACTIVE_HIGH>;
+			edid-emulation = <5>;
+		};
+
+		soundcodec at 22 {
+			reg = <0x22>;
+			compatible = "maxim,max98095-codec";
+		};
+	};
+
 	spi at 12d30000 {
 		spi-max-frequency = <50000000>;
 		firmware_storage_spi: flash at 0 {
@@ -238,26 +254,6 @@
 		status = "disabled";
 	};
 
-	i2c at 12CD0000 {
-		soundcodec at 22 {
-			reg = <0x22>;
-			compatible = "maxim,max98095-codec";
-		};
-
-		ptn3460-bridge at 20 {
-			compatible = "nxp,ptn3460";
-			reg = <0x20>;
-			/*
-			 * TODO(sjg at chromium.org): Use GPIOs here
-			 * powerdown-gpio = <&gpy2 5 0>;
-			 * reset-gpio = <&gpx1 5 0>;
-			 * edid-emulation = <5>;
-			 * pinctrl-names = "default";
-			 * pinctrl-0 = <&ptn3460_gpios>;
-			 */
-		};
-	};
-
 	i2c at 12C60000 {
 		max77686 at 09 {
 			reg = <0x9>;
Signature · 1 line
2.4.3.573.g4eafbef
#116 lore raw

PATCH 42/55 dts: exynos: snow: Add a new node for the NXP video bridge driver

Quoted 7 lines · Simon Glass

The driver supports driver model. Add a node for snow, which needs it.

---

 arch/arm/dts/exynos5250-snow.dts | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

Applied to u-boot-dm.

#117 lore raw

PATCH 43/55 exynos: dts: Drop the old TPS65090 I2C node

In reply to Simon Glass

While the AP can access the main PMIC on snow, it must coordinate with the EC which also wants access. Drop the old definition, which can in principle generate collision errors. We will use the new arbitration driver instead.

---

 arch/arm/dts/exynos5250-snow.dts | 16 ----------------
 1 file changed, 16 deletions(-)
arch/arm/dts/exynos5250-snow.dts +0 -16
index 334a5af..32c0098 100644
@@ -95,22 +95,6 @@
 		};
 	};
 
-
-	i2c4: i2c at 12CA0000 {
-		cros_ec_old: cros-ec at 1e {
-			reg = <0x1e>;
-			compatible = "google,cros-ec-i2c";
-			i2c-max-frequency = <100000>;
-			u-boot,i2c-offset-len = <0>;
-			ec-interrupt = <&gpx1 6 GPIO_ACTIVE_LOW>;
-		};
-
-		power-regulator at 48 {
-			compatible = "ti,tps65090";
-			reg = <0x48>;
-		};
-	};
-
 	i2c-arbitrator {
 		compatible = "i2c-arb-gpio-challenge";
 		#address-cells = <1>;
Signature · 1 line
2.4.3.573.g4eafbef
#118 lore raw

PATCH 44/55 exynos: Add common board code for exynos5 boards that use device tree

In reply to Simon Glass

Some boards use device tree for almost all board-specific configuration. They therefore do not need their own separate board code, but can all use the same version. Add a common version of the board code. It uses the PMIC, regulator and video bridge uclasses. This will support smdk5250, smdk5420, snow, spring, pit and pi.

---

 board/samsung/common/Makefile     |   1 +
 board/samsung/common/exynos5-dt.c | 362 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 363 insertions(+)
 create mode 100644 board/samsung/common/exynos5-dt.c
board/samsung/common/Makefile +1 -0
index 93347ef..847f953 100644
@@ -11,4 +11,5 @@ obj-$(CONFIG_MISC_COMMON) += misc.o
 
 ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_BOARD_COMMON)	+= board.o
+obj-$(CONFIG_EXYNOS5_DT)	+= exynos5-dt.o
 endif
board/samsung/common/exynos5-dt.c new file +362 -0

362 lines not on this page · raw message

Signature · 1 line
2.4.3.573.g4eafbef
#119 lore raw

PATCH 45/55 exynos: Enable new features for exynos5 boards

In reply to Simon Glass

Enable PMICs, regulators and the like so that new drivers will be made available.

---

 board/samsung/smdk5420/smdk5420.c   |  2 +-
 configs/arndale_defconfig           |  2 ++
 configs/odroid-xu3_defconfig        |  5 +++++
 configs/peach-pi_defconfig          | 17 +++++++++++++++++
 configs/peach-pit_defconfig         | 17 +++++++++++++++++
 configs/smdk5250_defconfig          | 10 ++++++++++
 configs/smdk5420_defconfig          |  5 +++++
 configs/snow_defconfig              | 23 +++++++++++++++++++++++
 include/configs/arndale.h           |  4 ++++
 include/configs/exynos5-common.h    | 10 ++--------
 include/configs/exynos5-dt-common.h |  5 -----
 include/configs/smdk5250.h          |  3 ---
 include/configs/snow.h              |  3 ---
 13 files changed, 86 insertions(+), 20 deletions(-)
board/samsung/smdk5420/smdk5420.c +1 -1
index 88f4044..57cc92c 100644
@@ -50,9 +50,9 @@ static int has_edp_bridge(void)
 
 void exynos_lcd_power_on(void)
 {
+#ifdef CONFIG_POWER_TPS65090
 	int ret;
 
-#ifdef CONFIG_POWER_TPS65090
 	ret = tps65090_init();
 	if (ret < 0) {
 		printf("%s: tps65090_init() failed\n", __func__);
configs/arndale_defconfig +2 -0
index 43f39f2..10e9d03 100644
@@ -10,3 +10,5 @@ CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
configs/odroid-xu3_defconfig +5 -0
index c9c4849..9760808 100644
@@ -4,3 +4,8 @@ CONFIG_TARGET_ODROID_XU3=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
 CONFIG_CMD_NET=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_REGULATOR=y
+CONFIG_VIDEO_BRIDGE=y
configs/peach-pi_defconfig +17 -0
index 13295b5..8cfc5dd 100644
@@ -10,3 +10,20 @@ CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
+CONFIG_SOUND=y
+CONFIG_I2S=y
+CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
+CONFIG_SOUND_WM8994=y
+CONFIG_DM_I2C=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_REGULATOR=y
+CONFIG_PMIC_TPS65090=y
+CONFIG_REGULATOR_TPS65090=y
+CONFIG_DM_I2C_COMPAT=y
+CONFIG_I2C_ARB_GPIO_CHALLENGE=y
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
+CONFIG_ERRNO_STR=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
configs/peach-pit_defconfig +17 -0
index 78ec49d..9f0eee2 100644
@@ -10,3 +10,20 @@ CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
+CONFIG_SOUND=y
+CONFIG_I2S=y
+CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
+CONFIG_SOUND_WM8994=y
+CONFIG_DM_I2C=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_REGULATOR=y
+CONFIG_PMIC_TPS65090=y
+CONFIG_REGULATOR_TPS65090=y
+CONFIG_DM_I2C_COMPAT=y
+CONFIG_I2C_ARB_GPIO_CHALLENGE=y
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
+CONFIG_ERRNO_STR=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
configs/smdk5250_defconfig +10 -0
index 0602fde..58a510d 100644
@@ -10,3 +10,13 @@ CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_REGULATOR=y
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
+CONFIG_ERRNO_STR=y
+CONFIG_DM_PMIC_MAX77686=y
+CONFIG_DM_REGULATOR_MAX77686=y
+CONFIG_VIDEO_BRIDGE=y
configs/smdk5420_defconfig +5 -0
index 8900525..0eb1962 100644
@@ -4,3 +4,8 @@ CONFIG_TARGET_SMDK5420=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
 CONFIG_SPL=y
 CONFIG_CMD_NET=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_REGULATOR=y
+CONFIG_VIDEO_BRIDGE=y
configs/snow_defconfig +23 -0
index 6f838a9..a77643f 100644
@@ -14,3 +14,26 @@ CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
+CONFIG_DM_I2C=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_REGULATOR=y
+CONFIG_PMIC_TPS65090=y
+CONFIG_REGULATOR_TPS65090=y
+CONFIG_DM_I2C_COMPAT=y
+CONFIG_I2C_ARB_GPIO_CHALLENGE=y
+CONFIG_I2C_MUX=y
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
+CONFIG_ERRNO_STR=y
+CONFIG_DM_PMIC_MAX77686=y
+CONFIG_DM_REGULATOR_MAX77686=y
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_S5P=y
+CONFIG_DEBUG_UART_CLOCK=100000000
+CONFIG_DEBUG_UART_BASE=0x12c30000
+CONFIG_I2C_CROS_EC_LDO=y
+CONFIG_PMIC_S5M8767=y
+CONFIG_REGULATOR_S5M8767=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
+CONFIG_VIDEO_BRIDGE_NXP_PTN3460=y
include/configs/arndale.h +4 -0
index 3ad4a9b..91e32df 100644
@@ -60,4 +60,8 @@
 /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
 #define CONFIG_ARM_GIC_BASE_ADDRESS	0x10480000
 
+/* Power */
+#define CONFIG_POWER
+#define CONFIG_POWER_I2C
+
 #endif	/* __CONFIG_H */
include/configs/exynos5-common.h +2 -8
index 5476248..749663a 100644
@@ -67,6 +67,8 @@
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_GPIO_SUPPORT
+#define CONFIG_SPL_SERIAL_SUPPORT
+#define CONFIG_SPL_LIBGENERIC_SUPPORT
 
 /* specific .lds file */
 #define CONFIG_SPL_LDSCRIPT	"board/samsung/common/exynos-uboot-spl.lds"
@@ -126,10 +128,6 @@
 #define SPI_FLASH_UBOOT_POS	(CONFIG_SEC_FW_SIZE + CONFIG_BL1_SIZE)
 
 /* I2C */
-
-/* TODO([email protected]): Move these two options to Kconfig */
-#define CONFIG_DM_I2C
-#define CONFIG_DM_I2C_COMPAT
 #define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C_S3C24X0
 #define CONFIG_SYS_I2C_S3C24X0_SPEED	100000		/* 100 Kbps */
@@ -149,10 +147,6 @@
 #define CONFIG_OF_SPI
 #endif
 
-/* Power */
-#define CONFIG_POWER
-#define CONFIG_POWER_I2C
-
 #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_MODE	SPI_MODE_0
 #define CONFIG_ENV_SECT_SIZE	CONFIG_ENV_SIZE
include/configs/exynos5-dt-common.h +0 -5
index b1b8e1a..098734b 100644
@@ -18,11 +18,6 @@
 
 #include "exynos5-common.h"
 
-/* PMIC */
-#define CONFIG_POWER
-#define CONFIG_POWER_I2C
-#define CONFIG_POWER_TPS65090
-
 /* Enable keyboard */
 #define CONFIG_KEYBOARD
 
include/configs/smdk5250.h +0 -3
index 08381e3..909a9c3 100644
@@ -18,9 +18,6 @@
 
 #include <configs/exynos5250-common.h>
 
-/* PMIC */
-#define CONFIG_POWER_MAX77686
-
 #define CONFIG_BOARD_COMMON
 
 #define CONFIG_USB_XHCI
include/configs/snow.h +0 -3
index a2fb3f9..fe8a31b 100644
@@ -19,9 +19,6 @@
 #include <configs/exynos5250-common.h>
 #include <configs/exynos5-dt-common.h>
 
-
-#define CONFIG_POWER_TPS65090_I2C
-
 #define CONFIG_BOARD_COMMON
 
 #define CONFIG_USB_XHCI
Signature · 1 line
2.4.3.573.g4eafbef
#120 lore raw

PATCH 45/55 exynos: Enable new features for exynos5 boards

Hello,

Quoted 51 lines · Simon Glass

Enable PMICs, regulators and the like so that new drivers will be made available.

---

  board/samsung/smdk5420/smdk5420.c   |  2 +-
  configs/arndale_defconfig           |  2 ++
  configs/odroid-xu3_defconfig        |  5 +++++
  configs/peach-pi_defconfig          | 17 +++++++++++++++++
  configs/peach-pit_defconfig         | 17 +++++++++++++++++
  configs/smdk5250_defconfig          | 10 ++++++++++
  configs/smdk5420_defconfig          |  5 +++++
  configs/snow_defconfig              | 23 +++++++++++++++++++++++
  include/configs/arndale.h           |  4 ++++
  include/configs/exynos5-common.h    | 10 ++--------
  include/configs/exynos5-dt-common.h |  5 -----
  include/configs/smdk5250.h          |  3 ---
  include/configs/snow.h              |  3 ---
  13 files changed, 86 insertions(+), 20 deletions(-)
board/samsung/smdk5420/smdk5420.c +1 -1
index 88f4044..57cc92c 100644
@@ -50,9 +50,9 @@ static int has_edp_bridge(void)
 
  void exynos_lcd_power_on(void)
  {
+#ifdef CONFIG_POWER_TPS65090
  	int ret;
 
-#ifdef CONFIG_POWER_TPS65090
  	ret = tps65090_init();
  	if (ret < 0) {
  		printf("%s: tps65090_init() failed\n", __func__);
configs/arndale_defconfig +2 -0
index 43f39f2..10e9d03 100644
@@ -10,3 +10,5 @@ CONFIG_I2S=y
  CONFIG_I2S_SAMSUNG=y
  CONFIG_SOUND_MAX98095=y
  CONFIG_SOUND_WM8994=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
configs/odroid-xu3_defconfig +0 -0
index c9c4849..9760808 100644

configs/odroid-xu3_defconfig CONFIG_TARGET_ODROID_XU3=y · line 10

Quoted 7 lines
configs/odroid-xu3_defconfig +4 -0
@@ -4,3 +4,8 @@ CONFIG_TARGET_ODROID_XU3=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
  CONFIG_CMD_NET=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_REGULATOR=y

At present we don't have pmic/regulator driver for XU3, but probably will have soon, so it can be enabled.

But there is no video bridge on XU3.

I assume that you enable this, because of using the single board file, but should go this way?

Regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#121 lore raw

PATCH 45/55 exynos: Enable new features for exynos5 boards

Hi Prrzemyslaw,

Quoted 69 lines · Przemyslaw Marczak

Hello,

Quoted 54 lines · Simon Glass

Enable PMICs, regulators and the like so that new drivers will be made available.

---

  board/samsung/smdk5420/smdk5420.c   |  2 +-
  configs/arndale_defconfig           |  2 ++
  configs/odroid-xu3_defconfig        |  5 +++++
  configs/peach-pi_defconfig          | 17 +++++++++++++++++
  configs/peach-pit_defconfig         | 17 +++++++++++++++++
  configs/smdk5250_defconfig          | 10 ++++++++++
  configs/smdk5420_defconfig          |  5 +++++
  configs/snow_defconfig              | 23 +++++++++++++++++++++++
  include/configs/arndale.h           |  4 ++++
  include/configs/exynos5-common.h    | 10 ++--------
  include/configs/exynos5-dt-common.h |  5 -----
  include/configs/smdk5250.h          |  3 ---
  include/configs/snow.h              |  3 ---
  13 files changed, 86 insertions(+), 20 deletions(-)
board/samsung/smdk5420/smdk5420.c +1 -1
index 88f4044..57cc92c 100644
@@ -50,9 +50,9 @@ static int has_edp_bridge(void)
 
  void exynos_lcd_power_on(void)
  {
+#ifdef CONFIG_POWER_TPS65090
        int ret;
 
-#ifdef CONFIG_POWER_TPS65090
        ret = tps65090_init();
        if (ret < 0) {
                printf("%s: tps65090_init() failed\n", __func__);
configs/arndale_defconfig +2 -0
index 43f39f2..10e9d03 100644
@@ -10,3 +10,5 @@ CONFIG_I2S=y
  CONFIG_I2S_SAMSUNG=y
  CONFIG_SOUND_MAX98095=y
  CONFIG_SOUND_WM8994=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
configs/odroid-xu3_defconfig +0 -0
index c9c4849..9760808 100644

configs/odroid-xu3_defconfig CONFIG_TARGET_ODROID_XU3=y · line 10

Quoted 7 lines
configs/odroid-xu3_defconfig +4 -0
@@ -4,3 +4,8 @@ CONFIG_TARGET_ODROID_XU3=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
  CONFIG_CMD_NET=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_REGULATOR=y

At present we don't have pmic/regulator driver for XU3, but probably will have soon, so it can be enabled.

Quoted 4 lines

But there is no video bridge on XU3.

I assume that you enable this, because of using the single board file, but should go this way?

That's my intent, yes. After all, downstream boards can always fiddle with the config if needed.

Regards,
Simon

#122 lore raw

PATCH 46/55 exynos: Remove unneeded device tree control #ifdefs

In reply to Simon Glass

Since device tree is used for all exynos5 boards, we can remove the #ifdef and reduce confusion.

---

 board/samsung/common/board.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
board/samsung/common/board.c +8 -9
index 1a4e8c9..d32c75d 100644
@@ -152,13 +152,14 @@ int board_early_init_f(void)
 	board_i2c_init(gd->fdt_blob);
 #endif
 
-#if defined(CONFIG_OF_CONTROL) && defined(CONFIG_EXYNOS_FB)
-/*
- * board_init_f(arch/arm/lib/board.c) calls lcd_setmem() which needs
- * panel_info.vl_col, panel_info.vl_row and panel_info.vl_bpix, to reserve
- * FB memory at a very early stage. So, we need to fill panel_info.vl_col,
- * panel_info.vl_row and panel_info.vl_bpix before lcd_setmem() is called.
- */
+#if defined(CONFIG_EXYNOS_FB)
+	/*
+	 * board_init_f(arch/arm/lib/board.c) calls lcd_setmem() which needs
+	 * panel_info.vl_col, panel_info.vl_row and panel_info.vl_bpix,
+	 * to reserve frame-buffer memory at a very early stage. So, we need
+	 * to fill panel_info.vl_col, panel_info.vl_row and panel_info.vl_bpix
+	 * before lcd_setmem() is called.
+	 */
 	err = exynos_lcd_early_init(gd->fdt_blob);
 	if (err) {
 		debug("LCD early init failed\n");
@@ -179,7 +180,6 @@ int power_init_board(void)
 }
 #endif
 
-#ifdef CONFIG_OF_CONTROL
 #ifdef CONFIG_SMC911X
 static int decode_sromc(const void *blob, struct fdt_sromc *config)
 {
@@ -310,7 +310,6 @@ int checkboard(void)
 	return 0;
 }
 #endif
-#endif /* CONFIG_OF_CONTROL */
 
 #ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)
Signature · 1 line
2.4.3.573.g4eafbef
#123 lore raw

PATCH 46/55 exynos: Remove unneeded device tree control #ifdefs

Quoted 8 lines · Simon Glass

Since device tree is used for all exynos5 boards, we can remove the #ifdef and reduce confusion.

---

 board/samsung/common/board.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Applied to u-boot-dm.

#124 lore raw

PATCH 47/55 exynos: config: Move common options to the common headers and tidy up

In reply to Simon Glass

Many options are duplicated on the exynos5 boards. Move these to the common files. Also some options are not used so can be removed.

Tidy this up to make the files easier to maintain.

---

 include/configs/arndale.h           | 14 ++------------
 include/configs/exynos5-common.h    |  3 ---
 include/configs/exynos5-dt-common.h | 17 ++++++++++++++++-
 include/configs/exynos5250-common.h | 16 ++++++----------
 include/configs/exynos5420-common.h |  9 +++------
 include/configs/odroid_xu3.h        |  2 ++
 include/configs/peach-pi.h          | 13 +------------
 include/configs/peach-pit.h         | 21 +--------------------
 include/configs/smdk5250.h          | 16 ++++------------
 include/configs/smdk5420.h          | 11 ++++-------
 include/configs/snow.h              | 13 +------------
 11 files changed, 40 insertions(+), 95 deletions(-)
include/configs/arndale.h +2 -12
index 91e32df..8784c4e 100644
@@ -13,6 +13,7 @@
 	"fdtfile=exynos5250-arndale.dtb\0"
 
 #include "exynos5250-common.h"
+#include <configs/exynos5-common.h>
 
 /* SD/MMC configuration */
 #define CONFIG_SUPPORT_EMMC_BOOT
@@ -20,15 +21,6 @@
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
-/* USB */
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_EXYNOS
-
-#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	3
-#define CONFIG_USB_HOST_ETHER
-#define CONFIG_USB_ETHER_ASIX
-#define CONFIG_USB_ETHER_ASIX88179
-
 /* MMC SPL */
 #define CONFIG_EXYNOS_SPL
 
@@ -36,9 +28,6 @@
 #define CONFIG_SYS_PROMPT		"ARNDALE # "
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC2,115200n8\0"
 
-#define CONFIG_NR_DRAM_BANKS	8
-#define SDRAM_BANK_SIZE		(256UL << 20UL)	/* 256 MB */
-
 #define CONFIG_IDENT_STRING		" for ARNDALE"
 
 #define CONFIG_ENV_IS_IN_MMC
@@ -49,6 +38,7 @@
 #define CONFIG_SYS_INIT_SP_ADDR	CONFIG_IRAM_STACK
 
 /* PMIC */
+#define CONFIG_POWER
 #define CONFIG_PMIC
 #define CONFIG_POWER_I2C
 
include/configs/exynos5-common.h +0 -3
index 749663a..0bfb898 100644
@@ -143,8 +143,6 @@
 #define CONFIG_SPI_FLASH_GIGADEVICE
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED		50000000
-#define EXYNOS5_SPI_NUM_CONTROLLERS	5
-#define CONFIG_OF_SPI
 #endif
 
 #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
@@ -193,7 +191,6 @@
 #define CONFIG_FIT
 #define CONFIG_FIT_BEST_MATCH
 
-
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 1) \
 	func(MMC, mmc, 0) \
include/configs/exynos5-dt-common.h +16 -1
index 098734b..c0ce7ed 100644
@@ -16,7 +16,22 @@
 		"stdout=serial,lcd\0" \
 		"stderr=serial,lcd\0"
 
-#include "exynos5-common.h"
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_SPI_FLASH
+#define CONFIG_ENV_SPI_BASE	0x12D30000
+#define FLASH_SIZE		(4 << 20)
+#define CONFIG_ENV_OFFSET	(FLASH_SIZE - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_SPI_BOOTING
+
+#define CONFIG_BOARD_COMMON
+
+/* Display */
+#define CONFIG_LCD
+#ifdef CONFIG_LCD
+#define CONFIG_EXYNOS_FB
+#define CONFIG_EXYNOS_DP
+#define LCD_BPP			LCD_COLOR16
+#endif
 
 /* Enable keyboard */
 #define CONFIG_KEYBOARD
include/configs/exynos5250-common.h +6 -10
index 95e96ec..7d8921f 100644
@@ -10,7 +10,6 @@
 #ifndef __CONFIG_5250_H
 #define __CONFIG_5250_H
 
-#include <configs/exynos5-common.h>
 #define CONFIG_EXYNOS5250
 
 #define CONFIG_SYS_SDRAM_BASE		0x40000000
@@ -28,16 +27,13 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR	CONFIG_IRAM_STACK
 
-/* I2C */
-#define CONFIG_MAX_I2C_NUM	8
+/* USB */
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_EXYNOS
 
-/* Display */
-#define CONFIG_LCD
-#ifdef CONFIG_LCD
-#define CONFIG_EXYNOS_FB
-#define CONFIG_EXYNOS_DP
-#define LCD_BPP			LCD_COLOR16
-#endif
+#define CONFIG_USB_HOST_ETHER
+#define CONFIG_USB_ETHER_ASIX
+#define CONFIG_USB_ETHER_ASIX88179
 
 /* DRAM Memory Banks */
 #define CONFIG_NR_DRAM_BANKS	8
include/configs/exynos5420-common.h +3 -6
index 3b1ac2c..3cdec51 100644
@@ -13,8 +13,6 @@
 /* A variant of Exynos5420 (Exynos5 Family) */
 #define CONFIG_EXYNOS5800
 
-#include <configs/exynos5-common.h>
-
 #define MACH_TYPE_SMDK5420	8002
 #define CONFIG_MACH_TYPE	MACH_TYPE_SMDK5420
 
@@ -32,10 +30,6 @@
 #define CONFIG_DEVICE_TREE_LIST "exynos5800-peach-pi"	\
 				"exynos5420-peach-pit exynos5420-smdk5420"
 
-#define CONFIG_MAX_I2C_NUM	11
-
-#define CONFIG_BOARD_REV_GPIO_COUNT	2
-
 #define CONFIG_PHY_IRAM_BASE		0x02020000
 
 /* Address for relocating helper code (Last 4 KB of IRAM) */
@@ -52,4 +46,7 @@
  */
 #define CONFIG_CORE_COUNT		0x8
 
+#define CONFIG_USB_XHCI
+#define CONFIG_USB_XHCI_EXYNOS
+
 #endif	/* __CONFIG_EXYNOS5420_H */
include/configs/odroid_xu3.h +2 -0
index cf17f3d..b8218ea 100644
@@ -9,7 +9,9 @@
 #define __CONFIG_ODROID_XU3_H
 
 #include "exynos5420-common.h"
+#include <configs/exynos5-common.h>
 
+#undef CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SYS_PROMPT		"ODROID-XU3 # "
 #define CONFIG_IDENT_STRING		" for ODROID-XU3"
 
include/configs/peach-pi.h +1 -12
index e3cb09e..b97faf2 100644
@@ -9,13 +9,6 @@
 #ifndef __CONFIG_PEACH_PI_H
 #define __CONFIG_PEACH_PI_H
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SPI_FLASH
-#define CONFIG_ENV_SPI_BASE	0x12D30000
-#define FLASH_SIZE		(0x4 << 20)
-#define CONFIG_ENV_OFFSET	(FLASH_SIZE - CONFIG_BL2_SIZE)
-#define CONFIG_SPI_BOOTING
-
 #define MEM_LAYOUT_ENV_SETTINGS \
 	"bootm_size=0x10000000\0" \
 	"kernel_addr_r=0x22000000\0" \
@@ -26,8 +19,7 @@
 
 #include <configs/exynos5420-common.h>
 #include <configs/exynos5-dt-common.h>
-
-#define CONFIG_BOARD_COMMON
+#include <configs/exynos5-common.h>
 
 #define CONFIG_SYS_SDRAM_BASE	0x20000000
 #define CONFIG_SYS_TEXT_BASE	0x23E00000
@@ -52,9 +44,6 @@
 
 #define CONFIG_POWER_TPS65090_EC
 
-#define CONFIG_USB_XHCI
-#define CONFIG_USB_XHCI_EXYNOS
-
 /* DRAM Memory Banks */
 #define CONFIG_NR_DRAM_BANKS	7
 #define SDRAM_BANK_SIZE		(512UL << 20UL)	/* 512 MB */
include/configs/peach-pit.h +1 -20
index 3ee42ef..18be42c 100644
@@ -9,13 +9,6 @@
 #ifndef __CONFIG_PEACH_PIT_H
 #define __CONFIG_PEACH_PIT_H
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SPI_FLASH
-#define CONFIG_ENV_SPI_BASE	0x12D30000
-#define FLASH_SIZE		(0x4 << 20)
-#define CONFIG_ENV_OFFSET	(FLASH_SIZE - CONFIG_BL2_SIZE)
-#define CONFIG_SPI_BOOTING
-
 #define MEM_LAYOUT_ENV_SETTINGS \
 	"bootm_size=0x10000000\0" \
 	"kernel_addr_r=0x22000000\0" \
@@ -26,8 +19,7 @@
 
 #include <configs/exynos5420-common.h>
 #include <configs/exynos5-dt-common.h>
-
-#define CONFIG_BOARD_COMMON
+#include <configs/exynos5-common.h>
 
 #define CONFIG_SYS_SDRAM_BASE	0x20000000
 #define CONFIG_SYS_TEXT_BASE	0x23E00000
@@ -42,19 +34,8 @@
 
 #define CONFIG_VIDEO_PARADE
 
-/* Display */
-#define CONFIG_LCD
-#ifdef CONFIG_LCD
-#define CONFIG_EXYNOS_FB
-#define CONFIG_EXYNOS_DP
-#define LCD_BPP			LCD_COLOR16
-#endif
-
 #define CONFIG_POWER_TPS65090_EC
 
-#define CONFIG_USB_XHCI
-#define CONFIG_USB_XHCI_EXYNOS
-
 /* DRAM Memory Banks */
 #define CONFIG_NR_DRAM_BANKS	4
 #define SDRAM_BANK_SIZE		(512UL << 20UL)	/* 512 MB */
include/configs/smdk5250.h +4 -12
index 909a9c3..82d41cc 100644
@@ -9,24 +9,16 @@
 #ifndef __CONFIG_SMDK_H
 #define __CONFIG_SMDK_H
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SPI_FLASH
-#define CONFIG_ENV_SPI_BASE	0x12D30000
-#define FLASH_SIZE		(0x4 << 20)
-#define CONFIG_ENV_OFFSET	(FLASH_SIZE - CONFIG_BL2_SIZE)
-#define CONFIG_SPI_BOOTING
-
 #include <configs/exynos5250-common.h>
+#include <configs/exynos5-dt-common.h>
+#include <configs/exynos5-common.h>
 
-#define CONFIG_BOARD_COMMON
+#undef CONFIG_KEYBOARD
 
-#define CONFIG_USB_XHCI
-#define CONFIG_USB_XHCI_EXYNOS
+#define CONFIG_BOARD_COMMON
 
 #define CONFIG_SYS_PROMPT		"SMDK5250 # "
 #define CONFIG_IDENT_STRING		" for SMDK5250"
-
-/* Miscellaneous configurable options */
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC1,115200n8\0"
 
 #endif	/* __CONFIG_SMDK_H */
include/configs/smdk5420.h +4 -7
index 61f582f..623efa8 100644
@@ -9,14 +9,11 @@
 #ifndef __CONFIG_SMDK5420_H
 #define __CONFIG_SMDK5420_H
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SPI_FLASH
-#define CONFIG_ENV_SPI_BASE	0x12D30000
-#define FLASH_SIZE		(0x4 << 20)
-#define CONFIG_ENV_OFFSET	(FLASH_SIZE - CONFIG_BL2_SIZE)
-#define CONFIG_SPI_BOOTING
-
 #include <configs/exynos5420-common.h>
+#include <configs/exynos5-dt-common.h>
+#include <configs/exynos5-common.h>
+
+#undef CONFIG_KEYBOARD
 
 #define CONFIG_BOARD_COMMON
 
include/configs/snow.h +1 -12
index fe8a31b..bf3377c 100644
@@ -9,23 +9,12 @@
 #ifndef __CONFIG_SNOW_H
 #define __CONFIG_SNOW_H
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SPI_FLASH
-#define CONFIG_ENV_SPI_BASE	0x12D30000
-#define FLASH_SIZE		(0x4 << 20)
-#define CONFIG_ENV_OFFSET	(FLASH_SIZE - CONFIG_BL2_SIZE)
-#define CONFIG_SPI_BOOTING
-
 #include <configs/exynos5250-common.h>
 #include <configs/exynos5-dt-common.h>
+#include <configs/exynos5-common.h>
 
 #define CONFIG_BOARD_COMMON
 
-#define CONFIG_USB_XHCI
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_XHCI_EXYNOS
-#define CONFIG_USB_EHCI_EXYNOS
-
 #define CONFIG_SYS_PROMPT		"snow # "
 #define CONFIG_IDENT_STRING		" for snow"
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC1,115200n8\0"
Signature · 1 line
2.4.3.573.g4eafbef
#125 lore raw

PATCH 47/55 exynos: config: Move common options to the common headers and tidy up

Hello Simon,

Quoted 20 lines · Simon Glass

Many options are duplicated on the exynos5 boards. Move these to the common files. Also some options are not used so can be removed.

Tidy this up to make the files easier to maintain.

---

  include/configs/arndale.h           | 14 ++------------
  include/configs/exynos5-common.h    |  3 ---
  include/configs/exynos5-dt-common.h | 17 ++++++++++++++++-
  include/configs/exynos5250-common.h | 16 ++++++----------
  include/configs/exynos5420-common.h |  9 +++------
  include/configs/odroid_xu3.h        |  2 ++
  include/configs/peach-pi.h          | 13 +------------
  include/configs/peach-pit.h         | 21 +--------------------
  include/configs/smdk5250.h          | 16 ++++------------
  include/configs/smdk5420.h          | 11 ++++-------
  include/configs/snow.h              | 13 +------------
  11 files changed, 40 insertions(+), 95 deletions(-)

...

Regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#126 lore raw

PATCH 48/55 exynos: Drop old exynos5420-specific board code

In reply to Simon Glass

Now that exynos5420 boards can use the generic exynos5 code, switch over to it and remove the old code.

---

 board/samsung/smdk5420/Makefile     |   4 -
 board/samsung/smdk5420/smdk5420.c   | 143 ------------------------------------
 include/configs/exynos5420-common.h |   2 +
 3 files changed, 2 insertions(+), 147 deletions(-)
 delete mode 100644 board/samsung/smdk5420/smdk5420.c
board/samsung/smdk5420/Makefile +0 -4
index c2f8886..96a400a 100644
@@ -5,7 +5,3 @@
 #
 
 obj-y	+= smdk5420_spl.o
-
-ifndef CONFIG_SPL_BUILD
-obj-y	+= smdk5420.o
-endif
board/samsung/smdk5420/smdk5420.c deleted +0 -143

143 lines not on this page · raw message

include/configs/exynos5420-common.h +2 -0
index 3cdec51..cd86e06 100644
@@ -13,6 +13,8 @@
 /* A variant of Exynos5420 (Exynos5 Family) */
 #define CONFIG_EXYNOS5800
 
+#define CONFIG_EXYNOS5_DT
+
 #define MACH_TYPE_SMDK5420	8002
 #define CONFIG_MACH_TYPE	MACH_TYPE_SMDK5420
 
Signature · 1 line
2.4.3.573.g4eafbef
#127 lore raw

PATCH 48/55 exynos: Drop old exynos5420-specific board code

Hello Simon,

Quoted 179 lines · Simon Glass

Now that exynos5420 boards can use the generic exynos5 code, switch over to it and remove the old code.

---

  board/samsung/smdk5420/Makefile     |   4 -
  board/samsung/smdk5420/smdk5420.c   | 143 ------------------------------------
  include/configs/exynos5420-common.h |   2 +
  3 files changed, 2 insertions(+), 147 deletions(-)

delete mode 100644 board/samsung/smdk5420/smdk5420.c

board/samsung/smdk5420/Makefile +0 -4
index c2f8886..96a400a 100644
@@ -5,7 +5,3 @@
  #
 
  obj-y	+= smdk5420_spl.o
-
-ifndef CONFIG_SPL_BUILD
-obj-y	+= smdk5420.o
-endif
board/samsung/smdk5420/smdk5420.c deleted +0 -143
deleted file mode 100644
index 57cc92c..0000000
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2013 Samsung Electronics
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <common.h>
-#include <fdtdec.h>
-#include <errno.h>
-#include <asm/io.h>
-#include <asm/gpio.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/board.h>
-#include <asm/arch/power.h>
-#include <asm/arch/system.h>
-#include <asm/arch/pinmux.h>
-#include <asm/arch/dp_info.h>
-#include <asm/arch/xhci-exynos.h>
-#include <power/tps65090_pmic.h>
-#include <i2c.h>
-#include <lcd.h>
-#include <mmc.h>
-#include <parade.h>
-#include <spi.h>
-#include <usb.h>
-#include <dwc3-uboot.h>
-#include <samsung-usb-phy-uboot.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int exynos_init(void)
-{
-	return 0;
-}
-
-#ifdef CONFIG_LCD
-static int has_edp_bridge(void)
-{
-	int node;
-
-	node = fdtdec_next_compatible(gd->fdt_blob, 0, COMPAT_PARADE_PS8625);
-
-	/* No node for bridge in device tree. */
-	if (node <= 0)
-		return 0;
-
-	/* Default is with bridge ic */
-	return 1;
-}
-
-void exynos_lcd_power_on(void)
-{
-#ifdef CONFIG_POWER_TPS65090
-	int ret;
-
-	ret = tps65090_init();
-	if (ret < 0) {
-		printf("%s: tps65090_init() failed\n", __func__);
-		return;
-	}
-
-	tps65090_fet_enable(6);
-#endif
-
-	mdelay(5);
-
-	if (has_edp_bridge())
-		if (parade_init(gd->fdt_blob))
-			printf("%s: ps8625_init() failed\n", __func__);
-}
-
-void exynos_backlight_on(unsigned int onoff)
-{
-#ifdef CONFIG_POWER_TPS65090
-	tps65090_fet_enable(1);
-#endif
-}
-#endif
-
-int board_get_revision(void)
-{
-	return 0;
-}
-
-#ifdef CONFIG_USB_DWC3
-static struct dwc3_device dwc3_device_data = {
-	.maximum_speed = USB_SPEED_SUPER,
-	.base = 0x12400000,
-	.dr_mode = USB_DR_MODE_PERIPHERAL,
-	.index = 0,
-};
-
-int usb_gadget_handle_interrupts(void)
-{
-	dwc3_uboot_handle_interrupt(0);
-	return 0;
-}
-
-int board_usb_init(int index, enum usb_init_type init)
-{
-	struct exynos_usb3_phy *phy = (struct exynos_usb3_phy *)
-		samsung_get_base_usb3_phy();
-
-	if (!phy) {
-		error("usb3 phy not supported");
-		return -ENODEV;
-	}
-
-	set_usbdrd_phy_ctrl(POWER_USB_DRD_PHY_CTRL_EN);
-	exynos5_usb3_phy_init(phy);
-
-	return dwc3_uboot_init(&dwc3_device_data);
-}
-#endif
-#ifdef CONFIG_SET_DFU_ALT_INFO
-char *get_dfu_alt_system(char *interface, char *devstr)
-{
-	return getenv("dfu_alt_system");
-}
-
-char *get_dfu_alt_boot(char *interface, char *devstr)
-{
-	struct mmc *mmc;
-	char *alt_boot;
-	int dev_num;
-
-	dev_num = simple_strtoul(devstr, NULL, 10);
-
-	mmc = find_mmc_device(dev_num);
-	if (!mmc)
-		return NULL;
-
-	if (mmc_init(mmc))
-		return NULL;
-
-	if (IS_SD(mmc))
-		alt_boot = CONFIG_DFU_ALT_BOOT_SD;
-	else
-		alt_boot = CONFIG_DFU_ALT_BOOT_EMMC;
-
-	return alt_boot;
-}
-#endif
include/configs/exynos5420-common.h +0 -0
index 3cdec51..cd86e06 100644

include/configs/exynos5420-common.h line 20

Quoted 8 lines
include/configs/exynos5420-common.h +2 -0
@@ -13,6 +13,8 @@
  /* A variant of Exynos5420 (Exynos5 Family) */
  #define CONFIG_EXYNOS5800
 
+#define CONFIG_EXYNOS5_DT
+
  #define MACH_TYPE_SMDK5420	8002
  #define CONFIG_MACH_TYPE	MACH_TYPE_SMDK5420
 

Regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#128 lore raw

PATCH 49/55 exynos: Drop old exynos5250-specific board code

In reply to Simon Glass

Now that most exynos5250 boards can use the generic exynos5 code, switch over to it and remove the old code.

---

 board/samsung/smdk5250/Makefile     |   4 -
 board/samsung/smdk5250/exynos5-dt.c | 306 ------------------------------------
 include/configs/exynos5-dt-common.h |   2 +
 3 files changed, 2 insertions(+), 310 deletions(-)
 delete mode 100644 board/samsung/smdk5250/exynos5-dt.c
board/samsung/smdk5250/Makefile +0 -4
index 3d96b07..501cab6 100644
@@ -5,7 +5,3 @@
 #
 
 obj-y	+= smdk5250_spl.o
-
-ifndef CONFIG_SPL_BUILD
-obj-y	+= exynos5-dt.o
-endif
board/samsung/smdk5250/exynos5-dt.c deleted +0 -306

306 lines not on this page · raw message

include/configs/exynos5-dt-common.h +2 -0
index c0ce7ed..6a83c5c 100644
@@ -16,6 +16,8 @@
 		"stdout=serial,lcd\0" \
 		"stderr=serial,lcd\0"
 
+#define CONFIG_EXYNOS5_DT
+
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SPI_FLASH
 #define CONFIG_ENV_SPI_BASE	0x12D30000
Signature · 1 line
2.4.3.573.g4eafbef
#129 lore raw

PATCH 50/55 power: Remove old TPS65090 drivers

In reply to Simon Glass

Remove the old drivers (both the normal one and the cros_ec one) now that we have new drivers that use driver model.

---

 drivers/power/pmic/Makefile           |   2 -
 drivers/power/pmic/pmic_tps65090.c    | 310 ----------------------------------
 drivers/power/pmic/pmic_tps65090_ec.c | 218 ------------------------
 include/configs/peach-pit.h           |   2 -
 include/fdtdec.h                      |   1 -
 include/power/tps65090_pmic.h         |  73 --------
 lib/fdtdec.c                          |   1 -
 7 files changed, 607 deletions(-)
 delete mode 100644 drivers/power/pmic/pmic_tps65090.c
 delete mode 100644 drivers/power/pmic/pmic_tps65090_ec.c
 delete mode 100644 include/power/tps65090_pmic.h
drivers/power/pmic/Makefile +0 -2
index ee23c26..c8c4364 100644
@@ -17,8 +17,6 @@ obj-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
 obj-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
 obj-$(CONFIG_POWER_MAX77686) += pmic_max77686.o
 obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o
-obj-$(CONFIG_POWER_TPS65090_I2C) += pmic_tps65090.o
-obj-$(CONFIG_POWER_TPS65090_EC) += pmic_tps65090_ec.o
 obj-$(CONFIG_POWER_TPS65217) += pmic_tps65217.o
 obj-$(CONFIG_POWER_TPS65218) += pmic_tps62362.o
 obj-$(CONFIG_POWER_TPS65218) += pmic_tps65218.o
drivers/power/pmic/pmic_tps65090.c deleted +0 -310

310 lines not on this page · raw message

drivers/power/pmic/pmic_tps65090_ec.c deleted +0 -218

218 lines not on this page · raw message

include/configs/peach-pit.h +0 -2
index 18be42c..beb65b0 100644
@@ -34,8 +34,6 @@
 
 #define CONFIG_VIDEO_PARADE
 
-#define CONFIG_POWER_TPS65090_EC
-
 /* DRAM Memory Banks */
 #define CONFIG_NR_DRAM_BANKS	4
 #define SDRAM_BANK_SIZE		(512UL << 20UL)	/* 512 MB */
include/fdtdec.h +0 -1
index 2323603..c48e9f8 100644
@@ -167,7 +167,6 @@ enum fdt_compat_id {
 	COMPAT_INFINEON_SLB9645_TPM,	/* Infineon SLB9645 TPM */
 	COMPAT_SAMSUNG_EXYNOS5_I2C,	/* Exynos5 High Speed I2C Controller */
 	COMPAT_SANDBOX_LCD_SDL,		/* Sandbox LCD emulation with SDL */
-	COMPAT_TI_TPS65090,		/* Texas Instrument TPS65090 */
 	COMPAT_NXP_PTN3460,		/* NXP PTN3460 DP/LVDS bridge */
 	COMPAT_SAMSUNG_EXYNOS_SYSMMU,	/* Exynos sysmmu */
 	COMPAT_PARADE_PS8625,		/* Parade PS8622 EDP->LVDS bridge */
include/power/tps65090_pmic.h deleted +0 -73

73 lines not on this page · raw message

lib/fdtdec.c +0 -1
index a78d577..5ede10c 100644
@@ -60,7 +60,6 @@ static const char * const compat_names[COMPAT_COUNT] = {
 	COMPAT(INFINEON_SLB9645_TPM, "infineon,slb9645tt"),
 	COMPAT(SAMSUNG_EXYNOS5_I2C, "samsung,exynos5-hsi2c"),
 	COMPAT(SANDBOX_LCD_SDL, "sandbox,lcd-sdl"),
-	COMPAT(TI_TPS65090, "ti,tps65090"),
 	COMPAT(COMPAT_NXP_PTN3460, "nxp,ptn3460"),
 	COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"),
 	COMPAT(PARADE_PS8625, "parade,ps8625"),
Signature · 1 line
2.4.3.573.g4eafbef
#130 lore raw

PATCH 50/55 power: Remove old TPS65090 drivers

Hello Simon,

Quoted 681 lines · Simon Glass

Remove the old drivers (both the normal one and the cros_ec one) now that we have new drivers that use driver model.

---

  drivers/power/pmic/Makefile           |   2 -
  drivers/power/pmic/pmic_tps65090.c    | 310 ----------------------------------
  drivers/power/pmic/pmic_tps65090_ec.c | 218 ------------------------
  include/configs/peach-pit.h           |   2 -
  include/fdtdec.h                      |   1 -
  include/power/tps65090_pmic.h         |  73 --------
  lib/fdtdec.c                          |   1 -
  7 files changed, 607 deletions(-)

delete mode 100644 drivers/power/pmic/pmic_tps65090.c delete mode 100644 drivers/power/pmic/pmic_tps65090_ec.c delete mode 100644 include/power/tps65090_pmic.h

drivers/power/pmic/Makefile +0 -2
index ee23c26..c8c4364 100644
@@ -17,8 +17,6 @@ obj-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
  obj-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
  obj-$(CONFIG_POWER_MAX77686) += pmic_max77686.o
  obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o
-obj-$(CONFIG_POWER_TPS65090_I2C) += pmic_tps65090.o
-obj-$(CONFIG_POWER_TPS65090_EC) += pmic_tps65090_ec.o
  obj-$(CONFIG_POWER_TPS65217) += pmic_tps65217.o
  obj-$(CONFIG_POWER_TPS65218) += pmic_tps62362.o
  obj-$(CONFIG_POWER_TPS65218) += pmic_tps65218.o
drivers/power/pmic/pmic_tps65090.c deleted +0 -310
deleted file mode 100644
index 337903a..0000000
@@ -1,310 +0,0 @@
-/*
- * Copyright (c) 2012 The Chromium OS Authors.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <common.h>
-#include <errno.h>
-#include <fdtdec.h>
-#include <i2c.h>
-#include <power/pmic.h>
-#include <power/tps65090_pmic.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define TPS65090_NAME "TPS65090_PMIC"
-
-/* TPS65090 register addresses */
-enum {
-	REG_IRQ1 = 0,
-	REG_CG_CTRL0 = 4,
-	REG_CG_STATUS1 = 0xa,
-	REG_FET1_CTRL = 0x0f,
-	REG_FET2_CTRL,
-	REG_FET3_CTRL,
-	REG_FET4_CTRL,
-	REG_FET5_CTRL,
-	REG_FET6_CTRL,
-	REG_FET7_CTRL,
-	TPS65090_NUM_REGS,
-};
-
-enum {
-	IRQ1_VBATG = 1 << 3,
-	CG_CTRL0_ENC_MASK	= 0x01,
-
-	MAX_FET_NUM	= 7,
-	MAX_CTRL_READ_TRIES = 5,
-
-	/* TPS65090 FET_CTRL register values */
-	FET_CTRL_TOFET		= 1 << 7,  /* Timeout, startup, overload */
-	FET_CTRL_PGFET		= 1 << 4,  /* Power good for FET status */
-	FET_CTRL_WAIT		= 3 << 2,  /* Overcurrent timeout max */
-	FET_CTRL_ADENFET	= 1 << 1,  /* Enable output auto discharge */
-	FET_CTRL_ENFET		= 1 << 0,  /* Enable FET */
-};
-
-/**
- * Checks for a valid FET number
- *
- * @param fet_id	FET number to check
- * @return 0 if ok, -EINVAL if FET value is out of range
- */
-static int tps65090_check_fet(unsigned int fet_id)
-{
-	if (fet_id == 0 || fet_id > MAX_FET_NUM) {
-		debug("parameter fet_id is out of range, %u not in 1 ~ %u\n",
-		      fet_id, MAX_FET_NUM);
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-/**
- * Set the power state for a FET
- *
- * @param pmic		pmic structure for the tps65090
- * @param fet_id	Fet number to set (1..MAX_FET_NUM)
- * @param set		1 to power on FET, 0 to power off
- * @return -EIO if we got a comms error, -EAGAIN if the FET failed to
- * change state. If all is ok, returns 0.
- */
-static int tps65090_fet_set(struct pmic *pmic, int fet_id, bool set)
-{
-	int retry;
-	u32 reg, value;
-
-	value = FET_CTRL_ADENFET | FET_CTRL_WAIT;
-	if (set)
-		value |= FET_CTRL_ENFET;
-
-	if (pmic_reg_write(pmic, REG_FET1_CTRL + fet_id - 1, value))
-		return -EIO;
-
-	/* Try reading until we get a result */
-	for (retry = 0; retry < MAX_CTRL_READ_TRIES; retry++) {
-		if (pmic_reg_read(pmic, REG_FET1_CTRL + fet_id - 1, &reg))
-			return -EIO;
-
-		/* Check that the fet went into the expected state */
-		if (!!(reg & FET_CTRL_PGFET) == set)
-			return 0;
-
-		/* If we got a timeout, there is no point in waiting longer */
-		if (reg & FET_CTRL_TOFET)
-			break;
-
-		mdelay(1);
-	}
-
-	debug("FET %d: Power good should have set to %d but reg=%#02x\n",
-	      fet_id, set, reg);
-	return -EAGAIN;
-}
-
-int tps65090_fet_enable(unsigned int fet_id)
-{
-	struct pmic *pmic;
-	ulong start;
-	int loops;
-	int ret;
-
-	ret = tps65090_check_fet(fet_id);
-	if (ret)
-		return ret;
-
-	pmic = pmic_get(TPS65090_NAME);
-	if (!pmic)
-		return -EACCES;
-
-	start = get_timer(0);
-	for (loops = 0;; loops++) {
-		ret = tps65090_fet_set(pmic, fet_id, true);
-		if (!ret)
-			break;
-
-		if (get_timer(start) > 100)
-			break;
-
-		/* Turn it off and try again until we time out */
-		tps65090_fet_set(pmic, fet_id, false);
-	}
-
-	if (ret)
-		debug("%s: FET%d failed to power on: time=%lums, loops=%d\n",
-		      __func__, fet_id, get_timer(start), loops);
-	else if (loops)
-		debug("%s: FET%d powered on after %lums, loops=%d\n",
-		      __func__, fet_id, get_timer(start), loops);
-
-	/*
-	 * Unfortunately, there are some conditions where the power
-	 * good bit will be 0, but the fet still comes up. One such
-	 * case occurs with the lcd backlight. We'll just return 0 here
-	 * and assume that the fet will eventually come up.
-	 */
-	if (ret == -EAGAIN)
-		ret = 0;
-
-	return ret;
-}
-
-int tps65090_fet_disable(unsigned int fet_id)
-{
-	struct pmic *pmic;
-	int ret;
-
-	ret = tps65090_check_fet(fet_id);
-	if (ret)
-		return ret;
-
-	pmic = pmic_get(TPS65090_NAME);
-	if (!pmic)
-		return -EACCES;
-	ret = tps65090_fet_set(pmic, fet_id, false);
-
-	return ret;
-}
-
-int tps65090_fet_is_enabled(unsigned int fet_id)
-{
-	struct pmic *pmic;
-	u32 reg;
-	int ret;
-
-	ret = tps65090_check_fet(fet_id);
-	if (ret)
-		return ret;
-
-	pmic = pmic_get(TPS65090_NAME);
-	if (!pmic)
-		return -ENODEV;
-	ret = pmic_reg_read(pmic, REG_FET1_CTRL + fet_id - 1, &reg);
-	if (ret) {
-		debug("fail to read FET%u_CTRL register over I2C", fet_id);
-		return -EIO;
-	}
-
-	return reg & FET_CTRL_ENFET;
-}
-
-int tps65090_get_charging(void)
-{
-	struct pmic *pmic;
-	u32 val;
-	int ret;
-
-	pmic = pmic_get(TPS65090_NAME);
-	if (!pmic)
-		return -EACCES;
-
-	ret = pmic_reg_read(pmic, REG_CG_CTRL0, &val);
-	if (ret)
-		return ret;
-
-	return !!(val & CG_CTRL0_ENC_MASK);
-}
-
-static int tps65090_charger_state(struct pmic *pmic, int state,
-				  int current)
-{
-	u32 val;
-	int ret;
-
-	ret = pmic_reg_read(pmic, REG_CG_CTRL0, &val);
-	if (!ret) {
-		if (state == PMIC_CHARGER_ENABLE)
-			val |= CG_CTRL0_ENC_MASK;
-		else
-			val &= ~CG_CTRL0_ENC_MASK;
-		ret = pmic_reg_write(pmic, REG_CG_CTRL0, val);
-	}
-	if (ret) {
-		debug("%s: Failed to read/write register\n", __func__);
-		return ret;
-	}
-
-	return 0;
-}
-
-int tps65090_get_status(void)
-{
-	struct pmic *pmic;
-	u32 val;
-	int ret;
-
-	pmic = pmic_get(TPS65090_NAME);
-	if (!pmic)
-		return -EACCES;
-
-	ret = pmic_reg_read(pmic, REG_CG_STATUS1, &val);
-	if (ret)
-		return ret;
-
-	return val;
-}
-
-static int tps65090_charger_bat_present(struct pmic *pmic)
-{
-	u32 val;
-	int ret;
-
-	ret = pmic_reg_read(pmic, REG_IRQ1, &val);
-	if (ret)
-		return ret;
-
-	return !!(val & IRQ1_VBATG);
-}
-
-static struct power_chrg power_chrg_pmic_ops = {
-	.chrg_bat_present = tps65090_charger_bat_present,
-	.chrg_state = tps65090_charger_state,
-};
-
-int tps65090_init(void)
-{
-	struct pmic *p;
-	int bus;
-	int addr;
-	const void *blob = gd->fdt_blob;
-	int node, parent;
-
-	node = fdtdec_next_compatible(blob, 0, COMPAT_TI_TPS65090);
-	if (node < 0) {
-		debug("PMIC: No node for PMIC Chip in device tree\n");
-		debug("node = %d\n", node);
-		return -ENODEV;
-	}
-
-	parent = fdt_parent_offset(blob, node);
-	if (parent < 0) {
-		debug("%s: Cannot find node parent\n", __func__);
-		return -EINVAL;
-	}
-
-	bus = i2c_get_bus_num_fdt(parent);
-	if (bus < 0) {
-		debug("%s: Cannot find I2C bus\n", __func__);
-		return -ENOENT;
-	}
-	addr = fdtdec_get_int(blob, node, "reg", TPS65090_I2C_ADDR);
-	p = pmic_alloc();
-	if (!p) {
-		printf("%s: POWER allocation error!\n", __func__);
-		return -ENOMEM;
-	}
-
-	p->name = TPS65090_NAME;
-	p->bus = bus;
-	p->interface = PMIC_I2C;
-	p->number_of_regs = TPS65090_NUM_REGS;
-	p->hw.i2c.addr = addr;
-	p->hw.i2c.tx_num = 1;
-	p->chrg = &power_chrg_pmic_ops;
-
-	puts("TPS65090 PMIC init\n");
-
-	return 0;
-}
drivers/power/pmic/pmic_tps65090_ec.c deleted +0 -218
deleted file mode 100644
index f79a878..0000000
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2013 The Chromium OS Authors.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <common.h>
-#include <cros_ec.h>
-#include <errno.h>
-#include <power/tps65090_pmic.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define TPS65090_ADDR		0x48
-
-static struct tps65090 {
-	struct cros_ec_dev *dev;		/* The CROS_EC device */
-} config;
-
-/* TPS65090 register addresses */
-enum {
-	REG_IRQ1 = 0,
-	REG_CG_CTRL0 = 4,
-	REG_CG_STATUS1 = 0xa,
-	REG_FET1_CTRL = 0x0f,
-	REG_FET2_CTRL,
-	REG_FET3_CTRL,
-	REG_FET4_CTRL,
-	REG_FET5_CTRL,
-	REG_FET6_CTRL,
-	REG_FET7_CTRL,
-	TPS65090_NUM_REGS,
-};
-
-enum {
-	IRQ1_VBATG = 1 << 3,
-	CG_CTRL0_ENC_MASK	= 0x01,
-
-	MAX_FET_NUM	= 7,
-	MAX_CTRL_READ_TRIES = 5,
-
-	/* TPS65090 FET_CTRL register values */
-	FET_CTRL_TOFET		= 1 << 7,  /* Timeout, startup, overload */
-	FET_CTRL_PGFET		= 1 << 4,  /* Power good for FET status */
-	FET_CTRL_WAIT		= 3 << 2,  /* Overcurrent timeout max */
-	FET_CTRL_ADENFET	= 1 << 1,  /* Enable output auto discharge */
-	FET_CTRL_ENFET		= 1 << 0,  /* Enable FET */
-};
-
-/**
- * tps65090_read - read a byte from tps6090
- *
- * @param reg		The register address to read from.
- * @param val		We'll return value value read here.
- * @return 0 if ok; error if EC returns failure.
- */
-static int tps65090_read(u32 reg, u8 *val)
-{
-	return cros_ec_i2c_xfer_old(config.dev, TPS65090_ADDR, reg, 1,
-				    val, 1, true);
-}
-
-/**
- * tps65090_write - write a byte to tps6090
- *
- * @param reg		The register address to write to.
- * @param val		The value to write.
- * @return 0 if ok; error if EC returns failure.
- */
-static int tps65090_write(u32 reg, u8 val)
-{
-	return cros_ec_i2c_xfer_old(config.dev, TPS65090_ADDR, reg, 1,
-				    &val, 1, false);
-}
-
-/**
- * Checks for a valid FET number
- *
- * @param fet_id	FET number to check
- * @return 0 if ok, -EINVAL if FET value is out of range
- */
-static int tps65090_check_fet(unsigned int fet_id)
-{
-	if (fet_id == 0 || fet_id > MAX_FET_NUM) {
-		debug("parameter fet_id is out of range, %u not in 1 ~ %u\n",
-		      fet_id, MAX_FET_NUM);
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-/**
- * Set the power state for a FET
- *
- * @param fet_id	Fet number to set (1..MAX_FET_NUM)
- * @param set		1 to power on FET, 0 to power off
- * @return -EIO if we got a comms error, -EAGAIN if the FET failed to
- * change state. If all is ok, returns 0.
- */
-static int tps65090_fet_set(int fet_id, bool set)
-{
-	int retry;
-	u8 reg, value;
-
-	value = FET_CTRL_ADENFET | FET_CTRL_WAIT;
-	if (set)
-		value |= FET_CTRL_ENFET;
-
-	if (tps65090_write(REG_FET1_CTRL + fet_id - 1, value))
-		return -EIO;
-
-	/* Try reading until we get a result */
-	for (retry = 0; retry < MAX_CTRL_READ_TRIES; retry++) {
-		if (tps65090_read(REG_FET1_CTRL + fet_id - 1, &reg))
-			return -EIO;
-
-		/* Check that the fet went into the expected state */
-		if (!!(reg & FET_CTRL_PGFET) == set)
-			return 0;
-
-		/* If we got a timeout, there is no point in waiting longer */
-		if (reg & FET_CTRL_TOFET)
-			break;
-
-		mdelay(1);
-	}
-
-	debug("FET %d: Power good should have set to %d but reg=%#02x\n",
-	      fet_id, set, reg);
-	return -EAGAIN;
-}
-
-int tps65090_fet_enable(unsigned int fet_id)
-{
-	ulong start;
-	int loops;
-	int ret;
-
-	ret = tps65090_check_fet(fet_id);
-	if (ret)
-		return ret;
-
-	start = get_timer(0);
-	for (loops = 0;; loops++) {
-		ret = tps65090_fet_set(fet_id, true);
-		if (!ret)
-			break;
-
-		if (get_timer(start) > 100)
-			break;
-
-		/* Turn it off and try again until we time out */
-		tps65090_fet_set(fet_id, false);
-	}
-
-	if (ret) {
-		debug("%s: FET%d failed to power on: time=%lums, loops=%d\n",
-		      __func__, fet_id, get_timer(start), loops);
-	} else if (loops) {
-		debug("%s: FET%d powered on after %lums, loops=%d\n",
-		      __func__, fet_id, get_timer(start), loops);
-	}
-	/*
-	 * Unfortunately, there are some conditions where the power
-	 * good bit will be 0, but the fet still comes up. One such
-	 * case occurs with the lcd backlight. We'll just return 0 here
-	 * and assume that the fet will eventually come up.
-	 */
-	if (ret == -EAGAIN)
-		ret = 0;
-
-	return ret;
-}
-
-int tps65090_fet_disable(unsigned int fet_id)
-{
-	int ret;
-
-	ret = tps65090_check_fet(fet_id);
-	if (ret)
-		return ret;
-
-	ret = tps65090_fet_set(fet_id, false);
-
-	return ret;
-}
-
-int tps65090_fet_is_enabled(unsigned int fet_id)
-{
-	u8 reg = 0;
-	int ret;
-
-	ret = tps65090_check_fet(fet_id);
-	if (ret)
-		return ret;
-	ret = tps65090_read(REG_FET1_CTRL + fet_id - 1, &reg);
-	if (ret) {
-		debug("fail to read FET%u_CTRL register over I2C", fet_id);
-		return -EIO;
-	}
-
-	return reg & FET_CTRL_ENFET;
-}
-
-int tps65090_init(void)
-{
-	puts("TPS65090 PMIC EC init\n");
-
-	config.dev = board_get_cros_ec_dev();
-	if (!config.dev) {
-		debug("%s: no cros_ec device: cannot init tps65090\n",
-		      __func__);
-		return -ENODEV;
-	}
-
-	return 0;
-}
include/configs/peach-pit.h +0 -2
index 18be42c..beb65b0 100644
@@ -34,8 +34,6 @@
 
  #define CONFIG_VIDEO_PARADE
 
-#define CONFIG_POWER_TPS65090_EC
-
  /* DRAM Memory Banks */
  #define CONFIG_NR_DRAM_BANKS	4
  #define SDRAM_BANK_SIZE		(512UL << 20UL)	/* 512 MB */
include/fdtdec.h +0 -1
index 2323603..c48e9f8 100644
@@ -167,7 +167,6 @@ enum fdt_compat_id {
  	COMPAT_INFINEON_SLB9645_TPM,	/* Infineon SLB9645 TPM */
  	COMPAT_SAMSUNG_EXYNOS5_I2C,	/* Exynos5 High Speed I2C Controller */
  	COMPAT_SANDBOX_LCD_SDL,		/* Sandbox LCD emulation with SDL */
-	COMPAT_TI_TPS65090,		/* Texas Instrument TPS65090 */
  	COMPAT_NXP_PTN3460,		/* NXP PTN3460 DP/LVDS bridge */
  	COMPAT_SAMSUNG_EXYNOS_SYSMMU,	/* Exynos sysmmu */
  	COMPAT_PARADE_PS8625,		/* Parade PS8622 EDP->LVDS bridge */
include/power/tps65090_pmic.h deleted +0 -73
deleted file mode 100644
index dcf99c9..0000000
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2012 The Chromium OS Authors.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef __TPS65090_PMIC_H_
-#define __TPS65090_PMIC_H_
-
-/* I2C device address for TPS65090 PMU */
-#define TPS65090_I2C_ADDR	0x48
-
-enum {
-	/* Status register fields */
-	TPS65090_ST1_OTC	= 1 << 0,
-	TPS65090_ST1_OCC	= 1 << 1,
-	TPS65090_ST1_STATE_SHIFT = 4,
-	TPS65090_ST1_STATE_MASK	= 0xf << TPS65090_ST1_STATE_SHIFT,
-};
-
-/**
- * Enable FET
- *
- * @param	fet_id	FET ID, value between 1 and 7
- * @return	0 on success, non-0 on failure
- */
-int tps65090_fet_enable(unsigned int fet_id);
-
-/**
- * Disable FET
- *
- * @param	fet_id	FET ID, value between 1 and 7
- * @return	0 on success, non-0 on failure
- */
-int tps65090_fet_disable(unsigned int fet_id);
-
-/**
- * Is FET enabled?
- *
- * @param	fet_id	FET ID, value between 1 and 7
- * @return	1 enabled, 0 disabled, negative value on failure
- */
-int tps65090_fet_is_enabled(unsigned int fet_id);
-
-/**
- * Enable / disable the battery charger
- *
- * @param enable	0 to disable charging, non-zero to enable
- */
-int tps65090_set_charge_enable(int enable);
-
-/**
- * Check whether we have enabled battery charging
- *
- * @return 1 if enabled, 0 if disabled
- */
-int tps65090_get_charging(void);
-
-/**
- * Return the value of the status register
- *
- * @return status register value, or -1 on error
- */
-int tps65090_get_status(void);
-
-/**
- * Initialize the TPS65090 PMU.
- *
- * @return	0 on success, non-0 on failure
- */
-int tps65090_init(void);
-
-#endif /* __TPS65090_PMIC_H_ */
lib/fdtdec.c +0 -0
index a78d577..5ede10c 100644

lib/fdtdec.c static const char * const compat_names[COMPAT_COUNT] = { · line 65

Quoted 7 lines
lib/fdtdec.c +0 -1
@@ -60,7 +60,6 @@ static const char * const compat_names[COMPAT_COUNT] = {
  	COMPAT(INFINEON_SLB9645_TPM, "infineon,slb9645tt"),
  	COMPAT(SAMSUNG_EXYNOS5_I2C, "samsung,exynos5-hsi2c"),
  	COMPAT(SANDBOX_LCD_SDL, "sandbox,lcd-sdl"),
-	COMPAT(TI_TPS65090, "ti,tps65090"),
  	COMPAT(COMPAT_NXP_PTN3460, "nxp,ptn3460"),
  	COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"),
  	COMPAT(PARADE_PS8625, "parade,ps8625"),

Regards

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#131 lore raw

PATCH 51/55 cros_ec: Remove the old tunnel code

In reply to Simon Glass

This is not needed with driver mode. Remove it.

---

 drivers/misc/cros_ec.c | 268 +------------------------------------------------
 include/cros_ec.h      |  14 ---
 2 files changed, 1 insertion(+), 281 deletions(-)
drivers/misc/cros_ec.c +1 -267
index 6027177..ba36795 100644
@@ -1055,87 +1055,6 @@ int cros_ec_decode_ec_flash(const void *blob, int node,
 	return 0;
 }
 
-int cros_ec_i2c_xfer_old(struct cros_ec_dev *dev, uchar chip, uint addr,
-			 int alen, uchar *buffer, int len, int is_read)
-{
-	union {
-		struct ec_params_i2c_passthru p;
-		uint8_t outbuf[EC_PROTO2_MAX_PARAM_SIZE];
-	} params;
-	union {
-		struct ec_response_i2c_passthru r;
-		uint8_t inbuf[EC_PROTO2_MAX_PARAM_SIZE];
-	} response;
-	struct ec_params_i2c_passthru *p = &params.p;
-	struct ec_response_i2c_passthru *r = &response.r;
-	struct ec_params_i2c_passthru_msg *msg = p->msg;
-	uint8_t *pdata;
-	int read_len, write_len;
-	int size;
-	int rv;
-
-	p->port = 0;
-
-	if (alen != 1) {
-		printf("Unsupported address length %d\n", alen);
-		return -1;
-	}
-	if (is_read) {
-		read_len = len;
-		write_len = alen;
-		p->num_msgs = 2;
-	} else {
-		read_len = 0;
-		write_len = alen + len;
-		p->num_msgs = 1;
-	}
-
-	size = sizeof(*p) + p->num_msgs * sizeof(*msg);
-	if (size + write_len > sizeof(params)) {
-		puts("Params too large for buffer\n");
-		return -1;
-	}
-	if (sizeof(*r) + read_len > sizeof(response)) {
-		puts("Read length too big for buffer\n");
-		return -1;
-	}
-
-	/* Create a message to write the register address and optional data */
-	pdata = (uint8_t *)p + size;
-	msg->addr_flags = chip;
-	msg->len = write_len;
-	pdata[0] = addr;
-	if (!is_read)
-		memcpy(pdata + 1, buffer, len);
-	msg++;
-
-	if (read_len) {
-		msg->addr_flags = chip | EC_I2C_FLAG_READ;
-		msg->len = read_len;
-	}
-
-	rv = ec_command(dev, EC_CMD_I2C_PASSTHRU, 0, p, size + write_len,
-			r, sizeof(*r) + read_len);
-	if (rv < 0)
-		return rv;
-
-	/* Parse response */
-	if (r->i2c_status & EC_I2C_STATUS_ERROR) {
-		printf("Transfer failed with status=0x%x\n", r->i2c_status);
-		return -1;
-	}
-
-	if (rv < sizeof(*r) + read_len) {
-		puts("Truncated read response\n");
-		return -1;
-	}
-
-	if (read_len)
-		memcpy(buffer, r->data, read_len);
-
-	return 0;
-}
-
 int cros_ec_i2c_tunnel(struct udevice *dev, struct i2c_msg *in, int nmsgs)
 {
 	struct cros_ec_dev *cdev = dev_get_uclass_priv(dev);
@@ -1266,187 +1185,6 @@ static int do_read_write(struct cros_ec_dev *dev, int is_write, int argc,
 	return 0;
 }
 
-/**
- * get_alen() - Small parser helper function to get address length
- *
- * Returns the address length.
- */
-static uint get_alen(char *arg)
-{
-	int	j;
-	int	alen;
-
-	alen = 1;
-	for (j = 0; j < 8; j++) {
-		if (arg[j] == '.') {
-			alen = arg[j+1] - '0';
-			break;
-		} else if (arg[j] == '\0') {
-			break;
-		}
-	}
-	return alen;
-}
-
-#define DISP_LINE_LEN	16
-
-/*
- * TODO([email protected]): This code copied almost verbatim from cmd_i2c.c
- * so we can remove it later.
- */
-static int cros_ec_i2c_md(struct cros_ec_dev *dev, int flag, int argc,
-			  char * const argv[])
-{
-	u_char	chip;
-	uint	addr, alen, length = 0x10;
-	int	j, nbytes, linebytes;
-
-	if (argc < 2)
-		return CMD_RET_USAGE;
-
-	if (1 || (flag & CMD_FLAG_REPEAT) == 0) {
-		/*
-		 * New command specified.
-		 */
-
-		/*
-		 * I2C chip address
-		 */
-		chip = simple_strtoul(argv[0], NULL, 16);
-
-		/*
-		 * I2C data address within the chip.  This can be 1 or
-		 * 2 bytes long.  Some day it might be 3 bytes long :-).
-		 */
-		addr = simple_strtoul(argv[1], NULL, 16);
-		alen = get_alen(argv[1]);
-		if (alen > 3)
-			return CMD_RET_USAGE;
-
-		/*
-		 * If another parameter, it is the length to display.
-		 * Length is the number of objects, not number of bytes.
-		 */
-		if (argc > 2)
-			length = simple_strtoul(argv[2], NULL, 16);
-	}
-
-	/*
-	 * Print the lines.
-	 *
-	 * We buffer all read data, so we can make sure data is read only
-	 * once.
-	 */
-	nbytes = length;
-	do {
-		unsigned char	linebuf[DISP_LINE_LEN];
-		unsigned char	*cp;
-
-		linebytes = (nbytes > DISP_LINE_LEN) ? DISP_LINE_LEN : nbytes;
-
-		if (cros_ec_i2c_xfer_old(dev, chip, addr, alen, linebuf,
-					 linebytes, 1))
-			puts("Error reading the chip.\n");
-		else {
-			printf("%04x:", addr);
-			cp = linebuf;
-			for (j = 0; j < linebytes; j++) {
-				printf(" %02x", *cp++);
-				addr++;
-			}
-			puts("    ");
-			cp = linebuf;
-			for (j = 0; j < linebytes; j++) {
-				if ((*cp < 0x20) || (*cp > 0x7e))
-					puts(".");
-				else
-					printf("%c", *cp);
-				cp++;
-			}
-			putc('\n');
-		}
-		nbytes -= linebytes;
-	} while (nbytes > 0);
-
-	return 0;
-}
-
-static int cros_ec_i2c_mw(struct cros_ec_dev *dev, int flag, int argc,
-			  char * const argv[])
-{
-	uchar	chip;
-	ulong	addr;
-	uint	alen;
-	uchar	byte;
-	int	count;
-
-	if ((argc < 3) || (argc > 4))
-		return CMD_RET_USAGE;
-
-	/*
-	 * Chip is always specified.
-	 */
-	chip = simple_strtoul(argv[0], NULL, 16);
-
-	/*
-	 * Address is always specified.
-	 */
-	addr = simple_strtoul(argv[1], NULL, 16);
-	alen = get_alen(argv[1]);
-	if (alen > 3)
-		return CMD_RET_USAGE;
-
-	/*
-	 * Value to write is always specified.
-	 */
-	byte = simple_strtoul(argv[2], NULL, 16);
-
-	/*
-	 * Optional count
-	 */
-	if (argc == 4)
-		count = simple_strtoul(argv[3], NULL, 16);
-	else
-		count = 1;
-
-	while (count-- > 0) {
-		if (cros_ec_i2c_xfer_old(dev, chip, addr++, alen, &byte, 1, 0))
-			puts("Error writing the chip.\n");
-		/*
-		 * Wait for the write to complete.  The write can take
-		 * up to 10mSec (we allow a little more time).
-		 */
-/*
- * No write delay with FRAM devices.
- */
-#if !defined(CONFIG_SYS_I2C_FRAM)
-		udelay(11000);
-#endif
-	}
-
-	return 0;
-}
-
-/* Temporary code until we have driver model and can use the i2c command */
-static int cros_ec_i2c_passthrough(struct cros_ec_dev *dev, int flag,
-				   int argc, char * const argv[])
-{
-	const char *cmd;
-
-	if (argc < 1)
-		return CMD_RET_USAGE;
-	cmd = *argv++;
-	argc--;
-	if (0 == strcmp("md", cmd))
-		cros_ec_i2c_md(dev, flag, argc, argv);
-	else if (0 == strcmp("mw", cmd))
-		cros_ec_i2c_mw(dev, flag, argc, argv);
-	else
-		return CMD_RET_USAGE;
-
-	return 0;
-}
-
 static int do_cros_ec(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	struct cros_ec_dev *dev;
@@ -1696,8 +1434,6 @@ static int do_cros_ec(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 			debug("%s: Could not access LDO%d\n", __func__, index);
 			return ret;
 		}
-	} else if (0 == strcmp("i2c", cmd)) {
-		ret = cros_ec_i2c_passthrough(dev, flag, argc - 2, argv + 2);
 	} else {
 		return CMD_RET_USAGE;
 	}
@@ -1734,9 +1470,7 @@ U_BOOT_CMD(
 	"crosec vbnvcontext [hexstring]        Read [write] VbNvContext from EC\n"
 	"crosec ldo <idx> [<state>] Switch/Read LDO state\n"
 	"crosec test                run tests on cros_ec\n"
-	"crosec version             Read CROS-EC version\n"
-	"crosec i2c md chip address[.0, .1, .2] [# of objects] - read from I2C passthru\n"
-	"crosec i2c mw chip address[.0, .1, .2] value [count] - write to I2C passthru (fill)"
+	"crosec version             Read CROS-EC version"
 );
 #endif
 
include/cros_ec.h +0 -14
index 0ad9d81..b926934 100644
@@ -400,18 +400,4 @@ struct i2c_msg;
  */
 int cros_ec_i2c_tunnel(struct udevice *dev, struct i2c_msg *msg, int nmsgs);
 
-/*
- * Tunnel an I2C transfer to the EC
- *
- * @param dev		CROS-EC device
- * @param chip		Chip address (7-bit I2C address)
- * @param addr		Register address to read/write
- * @param alen		Length of register address in bytes
- * @param buffer	Buffer containing data to read/write
- * @param len		Length of buffer
- * @param is_read	1 if this is a read, 0 if this is a write
- */
-int cros_ec_i2c_xfer_old(struct cros_ec_dev *dev, uchar chip, uint addr,
-			 int alen, uchar *buffer, int len, int is_read);
-
 #endif
Signature · 1 line
2.4.3.573.g4eafbef
#132 lore raw

PATCH 52/55 video: Remove the old parade driver

In reply to Simon Glass

We have a new one which uses driver model and device tree configuration. Remove the old one.

---

 drivers/video/Makefile      |   1 -
 drivers/video/parade.c      | 231 --------------------------------------------
 include/configs/peach-pi.h  |   2 -
 include/configs/peach-pit.h |   2 -
 include/fdtdec.h            |   1 -
 include/parade.h            |  18 ----
 lib/fdtdec.c                |   1 -
 7 files changed, 256 deletions(-)
 delete mode 100644 drivers/video/parade.c
 delete mode 100644 include/parade.h
drivers/video/Makefile +0 -1
index 599fe83..c2c4dfc 100644
@@ -51,7 +51,6 @@ obj-$(CONFIG_VIDEO_VESA) += vesa_fb.o
 obj-$(CONFIG_FORMIKE) += formike.o
 obj-$(CONFIG_LG4573) += lg4573.o
 obj-$(CONFIG_AM335X_LCD) += am335x-fb.o
-obj-$(CONFIG_VIDEO_PARADE) += parade.o
 
 obj-${CONFIG_VIDEO_TEGRA124} += tegra124/
 
drivers/video/parade.c deleted +0 -231

231 lines not on this page · raw message

include/configs/peach-pi.h +0 -2
index b97faf2..0f5e9fe 100644
@@ -32,8 +32,6 @@
 #define CONFIG_SYS_PROMPT	"Peach-Pi # "
 #define CONFIG_IDENT_STRING	" for Peach-Pi"
 
-#define CONFIG_VIDEO_PARADE
-
 /* Display */
 #define CONFIG_LCD
 #ifdef CONFIG_LCD
include/configs/peach-pit.h +0 -2
index beb65b0..f259434 100644
@@ -32,8 +32,6 @@
 #define CONFIG_SYS_PROMPT	"Peach-Pit # "
 #define CONFIG_IDENT_STRING	" for Peach-Pit"
 
-#define CONFIG_VIDEO_PARADE
-
 /* DRAM Memory Banks */
 #define CONFIG_NR_DRAM_BANKS	4
 #define SDRAM_BANK_SIZE		(512UL << 20UL)	/* 512 MB */
include/fdtdec.h +0 -1
index c48e9f8..0d85d6d 100644
@@ -169,7 +169,6 @@ enum fdt_compat_id {
 	COMPAT_SANDBOX_LCD_SDL,		/* Sandbox LCD emulation with SDL */
 	COMPAT_NXP_PTN3460,		/* NXP PTN3460 DP/LVDS bridge */
 	COMPAT_SAMSUNG_EXYNOS_SYSMMU,	/* Exynos sysmmu */
-	COMPAT_PARADE_PS8625,		/* Parade PS8622 EDP->LVDS bridge */
 	COMPAT_INTEL_MICROCODE,		/* Intel microcode update */
 	COMPAT_MEMORY_SPD,		/* Memory SPD information */
 	COMPAT_INTEL_PANTHERPOINT_AHCI,	/* Intel Pantherpoint AHCI */
include/parade.h deleted +0 -18
deleted file mode 100644
index 887f56d..0000000
@@ -1,18 +0,0 @@
-/*
- * (C) Copyright 2012 Samsung Electronics
- * Donghwa Lee <[email protected]>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef __PARADE_H__
-#define __PARADE_H__
-
-/* Initialize the Parade dP<->LVDS bridge if present */
-#ifdef CONFIG_VIDEO_PARADE
-int parade_init(const void *blob);
-#else
-static inline int parade_init(const void *blob) { return -1; }
-#endif
-
-#endif	/* __PARADE_H__ */
lib/fdtdec.c +0 -1
index 5ede10c..636b84d 100644
@@ -62,7 +62,6 @@ static const char * const compat_names[COMPAT_COUNT] = {
 	COMPAT(SANDBOX_LCD_SDL, "sandbox,lcd-sdl"),
 	COMPAT(COMPAT_NXP_PTN3460, "nxp,ptn3460"),
 	COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"),
-	COMPAT(PARADE_PS8625, "parade,ps8625"),
 	COMPAT(INTEL_MICROCODE, "intel,microcode"),
 	COMPAT(MEMORY_SPD, "memory-spd"),
 	COMPAT(INTEL_PANTHERPOINT_AHCI, "intel,pantherpoint-ahci"),
Signature · 1 line
2.4.3.573.g4eafbef
#133 lore raw

PATCH 53/55 dts: Drop unused compatible ID for the NXP video bridge

In reply to Simon Glass

This has moved to driver model so we can drop the fdtdec support.

---

 include/fdtdec.h | 1 -
 lib/fdtdec.c     | 1 -
 2 files changed, 2 deletions(-)
include/fdtdec.h +0 -1
index 0d85d6d..95fbede 100644
@@ -167,7 +167,6 @@ enum fdt_compat_id {
 	COMPAT_INFINEON_SLB9645_TPM,	/* Infineon SLB9645 TPM */
 	COMPAT_SAMSUNG_EXYNOS5_I2C,	/* Exynos5 High Speed I2C Controller */
 	COMPAT_SANDBOX_LCD_SDL,		/* Sandbox LCD emulation with SDL */
-	COMPAT_NXP_PTN3460,		/* NXP PTN3460 DP/LVDS bridge */
 	COMPAT_SAMSUNG_EXYNOS_SYSMMU,	/* Exynos sysmmu */
 	COMPAT_INTEL_MICROCODE,		/* Intel microcode update */
 	COMPAT_MEMORY_SPD,		/* Memory SPD information */
lib/fdtdec.c +0 -1
index 636b84d..f422534 100644
@@ -60,7 +60,6 @@ static const char * const compat_names[COMPAT_COUNT] = {
 	COMPAT(INFINEON_SLB9645_TPM, "infineon,slb9645tt"),
 	COMPAT(SAMSUNG_EXYNOS5_I2C, "samsung,exynos5-hsi2c"),
 	COMPAT(SANDBOX_LCD_SDL, "sandbox,lcd-sdl"),
-	COMPAT(COMPAT_NXP_PTN3460, "nxp,ptn3460"),
 	COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"),
 	COMPAT(INTEL_MICROCODE, "intel,microcode"),
 	COMPAT(MEMORY_SPD, "memory-spd"),
Signature · 1 line
2.4.3.573.g4eafbef
#134 lore raw

PATCH 54/55 exynos: video: Remove non-device-tree code

In reply to Simon Glass

We always use device tree on exynos, so remove the unused code.

---

 arch/arm/include/asm/arch-exynos/dp_info.h |  2 --
 drivers/video/exynos_dp.c                  | 22 ----------------------
 2 files changed, 24 deletions(-)
arch/arm/include/asm/arch-exynos/dp_info.h +0 -2
index 3f6750a..17e8f56 100644
@@ -197,6 +197,4 @@ unsigned int exynos_init_dp(void)
 }
 #endif
 
-void exynos_set_dp_platform_data(struct exynos_dp_platform_data *pd);
-
 #endif /* _DP_INFO_H */
drivers/video/exynos_dp.c +0 -22
index c3f7a3a..5b6fc14 100644
@@ -22,8 +22,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static struct exynos_dp_platform_data *dp_pd;
-
 void __exynos_set_dp_phy(unsigned int onoff)
 {
 }
@@ -851,7 +849,6 @@ static unsigned int exynos_dp_config_video(struct edp_device_info *edp_info)
 	return ret;
 }
 
-#ifdef CONFIG_OF_CONTROL
 int exynos_dp_parse_dt(const void *blob, struct edp_device_info *edp_info)
 {
 	unsigned int node = fdtdec_next_compatible(blob, 0,
@@ -905,7 +902,6 @@ int exynos_dp_parse_dt(const void *blob, struct edp_device_info *edp_info)
 						"samsung,color-depth", 0);
 	return 0;
 }
-#endif
 
 unsigned int exynos_init_dp(void)
 {
@@ -918,16 +914,8 @@ unsigned int exynos_init_dp(void)
 		return -EFAULT;
 	}
 
-#ifdef CONFIG_OF_CONTROL
 	if (exynos_dp_parse_dt(gd->fdt_blob, edp_info))
 		debug("unable to parse DP DT node\n");
-#else
-	edp_info = dp_pd->edp_dev_info;
-	if (edp_info == NULL) {
-		debug("failed to get edp_info data.\n");
-		return -EFAULT;
-	}
-#endif
 
 	exynos_dp_set_base_addr();
 
@@ -971,13 +959,3 @@ unsigned int exynos_init_dp(void)
 
 	return ret;
 }
-
-void exynos_set_dp_platform_data(struct exynos_dp_platform_data *pd)
-{
-	if (pd == NULL) {
-		debug("pd is NULL\n");
-		return;
-	}
-
-	dp_pd = pd;
-}
Signature · 1 line
2.4.3.573.g4eafbef
#135 lore raw

PATCH 55/55 exynos: Add support for spring

In reply to Simon Glass

Spring is the first ARM-based HP Chromebook 11. It is similar to snow and it uses the same Samsung Exynos5250 chip. But has some unusual features. Mainline support for it has lagged snow (both in kernel and U-Boot). Now that the exynos5 code is common we can support spring just by adding a device tree and a few lines of configuration.

---

 arch/arm/cpu/armv7/exynos/Kconfig  |   6 +
 arch/arm/dts/Makefile              |   1 +
 arch/arm/dts/exynos5250-spring.dts | 588 +++++++++++++++++++++++++++++++++++++
 board/samsung/smdk5250/Kconfig     |  13 +
 board/samsung/smdk5250/MAINTAINERS |   6 +
 configs/spring_defconfig           |  38 +++
 include/configs/spring.h           |  20 ++
 7 files changed, 672 insertions(+)
 create mode 100644 arch/arm/dts/exynos5250-spring.dts
 create mode 100644 configs/spring_defconfig
 create mode 100644 include/configs/spring.h
arch/arm/cpu/armv7/exynos/Kconfig +6 -0
index 3ca7128..9f810f3 100644
@@ -51,6 +51,12 @@ config TARGET_SNOW
 	select OF_CONTROL
 	select SPL_DISABLE_OF_CONTROL
 
+config TARGET_SPRING
+	bool "Spring board"
+	select SUPPORT_SPL
+	select OF_CONTROL
+	select SPL_DISABLE_OF_CONTROL
+
 config TARGET_SMDK5420
 	bool "SMDK5420 board"
 	select SUPPORT_SPL
arch/arm/dts/Makefile +1 -0
index 9c735c6..b7b3f13 100644
@@ -9,6 +9,7 @@ dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \
 
 dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \
 	exynos5250-snow.dtb \
+	exynos5250-spring.dtb \
 	exynos5250-smdk5250.dtb \
 	exynos5420-smdk5420.dtb \
 	exynos5420-peach-pit.dtb \
arch/arm/dts/exynos5250-spring.dts new file +588 -0

588 lines not on this page · raw message

board/samsung/smdk5250/Kconfig +13 -0
index 698ee91..11ffaee 100644
@@ -23,3 +23,16 @@ config SYS_CONFIG_NAME
 	default "snow"
 
 endif
+
+if TARGET_SPRING
+
+config SYS_BOARD
+	default "smdk5250"
+
+config SYS_VENDOR
+	default "samsung"
+
+config SYS_CONFIG_NAME
+	default "spring"
+
+endif
board/samsung/smdk5250/MAINTAINERS +6 -0
index 070593e..cde966f 100644
@@ -10,3 +10,9 @@ M:	Akshay Saraswat <[email protected]>
 S:	Maintained
 F:	include/configs/snow.h
 F:	configs/snow_defconfig
+
+SPRING BOARD
+M:	Simon Glass <[email protected]>
+S:	Maintained
+F:	include/configs/spring.h
+F:	configs/spring_defconfig
configs/spring_defconfig new file +38 -0
new file mode 100644
index 0000000..00163e8
@@ -0,0 +1,38 @@
+CONFIG_ARM=y
+CONFIG_ARCH_EXYNOS=y
+CONFIG_TARGET_SPRING=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos5250-spring"
+CONFIG_SPL=y
+CONFIG_CMD_NET=y
+CONFIG_CMD_SOUND=y
+CONFIG_CMD_CROS_EC=y
+CONFIG_CROS_EC=y
+CONFIG_CROS_EC_I2C=y
+CONFIG_CROS_EC_KEYB=y
+CONFIG_SOUND=y
+CONFIG_I2S=y
+CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
+CONFIG_SOUND_WM8994=y
+CONFIG_DM_I2C=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_REGULATOR=y
+CONFIG_PMIC_TPS65090=y
+CONFIG_REGULATOR_TPS65090=y
+CONFIG_DM_I2C_COMPAT=y
+CONFIG_I2C_ARB_GPIO_CHALLENGE=y
+CONFIG_I2C_MUX=y
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
+CONFIG_ERRNO_STR=y
+CONFIG_DM_PMIC_MAX77686=y
+CONFIG_DM_REGULATOR_MAX77686=y
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_S5P=y
+CONFIG_DEBUG_UART_CLOCK=100000000
+CONFIG_DEBUG_UART_BASE=0x12c30000
+CONFIG_I2C_CROS_EC_LDO=y
+CONFIG_PMIC_S5M8767=y
+CONFIG_REGULATOR_S5M8767=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
include/configs/spring.h new file +20 -0
new file mode 100644
index 0000000..a692dfd
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#ifndef __CONFIG_SPRING_H
+#define __CONFIG_SPRING_H
+
+#include <configs/exynos5250-common.h>
+#include <configs/exynos5-dt-common.h>
+#include <configs/exynos5-common.h>
+
+#define CONFIG_BOARD_COMMON
+
+#define CONFIG_SYS_PROMPT		"spring # "
+#define CONFIG_IDENT_STRING		" for spring"
+#define CONFIG_DEFAULT_CONSOLE		"console=ttySAC1,115200n8\0"
+
+#endif	/* __CONFIG_SPRING_H */
Signature · 1 line
2.4.3.573.g4eafbef
#136 lore raw

cover dm: exynos: Driver model improvements leading to spring support

In reply to Simon Glass

Hi Minkyu,

Quoted 16 lines · Simon Glass

This series adds a number of fixes and improvements to driver model as well as two new uclasses (video bridges and I2c muxes).

The series is aimed at adding support for spring (HP 11 Chromebook). Since it is very similar to other ARM Chromebooks, some effory is made to use common code rather than duplicating functionality. In fact spring uses the same code as several other boards, just with a different device tree and a few configuration changes.

Audio works correctly on pit, pi, spring and snow with this series. A bug in the I2C driver broken this recently.

The exynos implementation still has a few rough areas - e.g. some hard-coded GPIOs and the old-style SPL. Also it does not yet support CPU frequency scaling and power management.

Quoted 7 lines

Spring has some oddities and they are hard to handle with U-Boot's old way of doing drivers. With driver model these can be implemented cleanly and this sort of problem was the original motivation for my interest in driver model.

This series is available at u-boot-dm in branch spring-working. It is based on the previous set of driver model changes in branch clk-working.

Are you planning to pick this up or should I? It is still dependent on some driver model changes which I am working to apply.

Regards,
Simon

#137 lore raw

cover dm: exynos: Driver model improvements leading to spring support

Quoted 24 lines · Simon Glass

Hi Minkyu,

Quoted 21 lines · Simon Glass

This series adds a number of fixes and improvements to driver model as well as two new uclasses (video bridges and I2c muxes).

The series is aimed at adding support for spring (HP 11 Chromebook). Since it is very similar to other ARM Chromebooks, some effory is made to use common code rather than duplicating functionality. In fact spring uses the same code as several other boards, just with a different device tree and a few configuration changes.

Audio works correctly on pit, pi, spring and snow with this series. A bug in the I2C driver broken this recently.

The exynos implementation still has a few rough areas - e.g. some hard-coded GPIOs and the old-style SPL. Also it does not yet support CPU frequency scaling and power management.

Spring has some oddities and they are hard to handle with U-Boot's old way of doing drivers. With driver model these can be implemented cleanly and this sort of problem was the original motivation for my interest in driver model.

Quoted 6 lines
Quoted 2 lines

This series is available at u-boot-dm in branch spring-working. It is based on the previous set of driver model changes in branch clk-working.

Are you planning to pick this up or should I? It is still dependent on some driver model changes which I am working to apply.

If you want, please take patches to dm tree.

Thanks,
Minkyu Kang.

#138 lore raw

cover dm: exynos: Driver model improvements leading to spring support

Hi Minkyu,,

Quoted 25 lines · Minkyu Kang
Quoted 24 lines · Simon Glass

Hi Minkyu,

Quoted 21 lines · Simon Glass

This series adds a number of fixes and improvements to driver model as well as two new uclasses (video bridges and I2c muxes).

The series is aimed at adding support for spring (HP 11 Chromebook). Since it is very similar to other ARM Chromebooks, some effory is made to use common code rather than duplicating functionality. In fact spring uses the same code as several other boards, just with a different device tree and a few configuration changes.

Audio works correctly on pit, pi, spring and snow with this series. A bug in the I2C driver broken this recently.

The exynos implementation still has a few rough areas - e.g. some hard-coded GPIOs and the old-style SPL. Also it does not yet support CPU frequency scaling and power management.

Spring has some oddities and they are hard to handle with U-Boot's old way of doing drivers. With driver model these can be implemented cleanly and this sort of problem was the original motivation for my interest in driver model.

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

This series is available at u-boot-dm in branch spring-working. It is based on the previous set of driver model changes in branch clk-working.

Are you planning to pick this up or should I? It is still dependent on some driver model changes which I am working to apply.

If you want, please take patches to dm tree.

OK I'll do that once I have the prerequisites in.

Regards,
Simon