* [U-Boot] [RESEND PATCH 1/5] dm: video: bridge: add operation to read EDID
@ 2017-09-19 5:04 Vasily Khoruzhick
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 2/5] video: anx9804: split out registers definitions into a separate header Vasily Khoruzhick
` (3 more replies)
0 siblings, 4 replies; 18+ messages in thread
From: Vasily Khoruzhick @ 2017-09-19 5:04 UTC (permalink / raw)
To: u-boot
Bridge may have ability to read EDID from panel that is connected to it,
so add an operation to read EDID.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
drivers/video/bridge/video-bridge-uclass.c | 10 ++++++++++
include/video_bridge.h | 20 ++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c
index 07270bac9e..79facd02a6 100644
--- a/drivers/video/bridge/video-bridge-uclass.c
+++ b/drivers/video/bridge/video-bridge-uclass.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <dm.h>
#include <errno.h>
+#include <edid.h>
#include <video_bridge.h>
int video_bridge_set_backlight(struct udevice *dev, int percent)
@@ -45,6 +46,15 @@ int video_bridge_check_attached(struct udevice *dev)
return ops->check_attached(dev);
}
+int video_bridge_read_edid(struct udevice *dev, u8 *buf, int buf_size)
+{
+ struct video_bridge_ops *ops = video_bridge_get_ops(dev);
+
+ if (!ops || !ops->read_edid)
+ return -ENOSYS;
+ return ops->read_edid(dev, buf, buf_size);
+}
+
static int video_bridge_pre_probe(struct udevice *dev)
{
struct video_bridge_priv *uc_priv = dev_get_uclass_priv(dev);
diff --git a/include/video_bridge.h b/include/video_bridge.h
index c7b8681849..0699a8dda8 100644
--- a/include/video_bridge.h
+++ b/include/video_bridge.h
@@ -53,6 +53,16 @@ struct video_bridge_ops {
* @return 0 if OK, -ve on error
*/
int (*set_backlight)(struct udevice *dev, int percent);
+
+ /**
+ * read_edid() - Read information from EDID
+ *
+ * @dev: Device to read from
+ * @buf: Buffer to read into
+ * @buf_size: Buffer size
+ * @return number of bytes read, <=0 for error
+ */
+ int (*read_edid)(struct udevice *dev, u8 *buf, int buf_size);
};
#define video_bridge_get_ops(dev) \
@@ -89,4 +99,14 @@ int video_bridge_set_active(struct udevice *dev, bool active);
*/
int video_bridge_check_attached(struct udevice *dev);
+/**
+ * video_bridge_read_edid() - Read information from EDID
+ *
+ * @dev: Device to read from
+ * @buf: Buffer to read into
+ * @buf_size: Buffer size
+ * @return number of bytes read, <=0 for error
+ */
+int video_bridge_read_edid(struct udevice *dev, u8 *buf, int buf_size);
+
#endif
--
2.14.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 2/5] video: anx9804: split out registers definitions into a separate header
2017-09-19 5:04 [U-Boot] [RESEND PATCH 1/5] dm: video: bridge: add operation to read EDID Vasily Khoruzhick
@ 2017-09-19 5:04 ` Vasily Khoruzhick
2017-10-05 18:44 ` André Przywara
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 3/5] video: add anx6345 DM driver Vasily Khoruzhick
` (2 subsequent siblings)
3 siblings, 1 reply; 18+ messages in thread
From: Vasily Khoruzhick @ 2017-09-19 5:04 UTC (permalink / raw)
To: u-boot
This header will be used in anx6345 driver
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
drivers/video/anx9804.c | 54 +--------------------------
include/anx98xx-edp.h | 98 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 99 insertions(+), 53 deletions(-)
create mode 100644 include/anx98xx-edp.h
diff --git a/drivers/video/anx9804.c b/drivers/video/anx9804.c
index 37ad69a039..67f7da7d18 100755
--- a/drivers/video/anx9804.c
+++ b/drivers/video/anx9804.c
@@ -12,61 +12,9 @@
#include <common.h>
#include <i2c.h>
+#include <anx98xx-edp.h>
#include "anx9804.h"
-/* Registers at i2c address 0x38 */
-
-#define ANX9804_HDCP_CONTROL_0_REG 0x01
-
-#define ANX9804_SYS_CTRL2_REG 0x81
-#define ANX9804_SYS_CTRL2_CHA_STA 0x04
-
-#define ANX9804_SYS_CTRL3_REG 0x82
-#define ANX9804_SYS_CTRL3_VALID_CTRL BIT(0)
-#define ANX9804_SYS_CTRL3_F_VALID BIT(1)
-#define ANX9804_SYS_CTRL3_HPD_CTRL BIT(4)
-#define ANX9804_SYS_CTRL3_F_HPD BIT(5)
-
-#define ANX9804_LINK_BW_SET_REG 0xa0
-#define ANX9804_LANE_COUNT_SET_REG 0xa1
-#define ANX9804_TRAINING_PTN_SET_REG 0xa2
-#define ANX9804_TRAINING_LANE0_SET_REG 0xa3
-#define ANX9804_TRAINING_LANE1_SET_REG 0xa4
-#define ANX9804_TRAINING_LANE2_SET_REG 0xa5
-#define ANX9804_TRAINING_LANE3_SET_REG 0xa6
-
-#define ANX9804_LINK_TRAINING_CTRL_REG 0xa8
-#define ANX9804_LINK_TRAINING_CTRL_EN BIT(0)
-
-#define ANX9804_LINK_DEBUG_REG 0xb8
-#define ANX9804_PLL_CTRL_REG 0xc7
-#define ANX9804_ANALOG_POWER_DOWN_REG 0xc8
-
-/* Registers at i2c address 0x39 */
-
-#define ANX9804_DEV_IDH_REG 0x03
-
-#define ANX9804_POWERD_CTRL_REG 0x05
-#define ANX9804_POWERD_AUDIO BIT(4)
-
-#define ANX9804_RST_CTRL_REG 0x06
-
-#define ANX9804_RST_CTRL2_REG 0x07
-#define ANX9804_RST_CTRL2_AUX BIT(2)
-#define ANX9804_RST_CTRL2_AC_MODE BIT(6)
-
-#define ANX9804_VID_CTRL1_REG 0x08
-#define ANX9804_VID_CTRL1_VID_EN BIT(7)
-#define ANX9804_VID_CTRL1_EDGE BIT(0)
-
-#define ANX9804_VID_CTRL2_REG 0x09
-#define ANX9804_ANALOG_DEBUG_REG1 0xdc
-#define ANX9804_ANALOG_DEBUG_REG3 0xde
-#define ANX9804_PLL_FILTER_CTRL1 0xdf
-#define ANX9804_PLL_FILTER_CTRL3 0xe1
-#define ANX9804_PLL_FILTER_CTRL 0xe2
-#define ANX9804_PLL_CTRL3 0xe6
-
/**
* anx9804_init() - Init anx9804 parallel lcd to edp bridge chip
*
diff --git a/include/anx98xx-edp.h b/include/anx98xx-edp.h
new file mode 100644
index 0000000000..f7e8baa167
--- /dev/null
+++ b/include/anx98xx-edp.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2015 Hans de Goede <hdegoede@redhat.com>
+ * Copyright (C) 2017 Vasily Khoruzhick <anarsoul@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+/* Registers at i2c address 0x38 */
+
+#define ANX9804_HDCP_CONTROL_0_REG 0x01
+
+#define ANX9804_SYS_CTRL1_REG 0x80
+#define ANX9804_SYS_CTRL1_PD_IO 0x80
+#define ANX9804_SYS_CTRL1_PD_VID 0x40
+#define ANX9804_SYS_CTRL1_PD_LINK 0x20
+#define ANX9804_SYS_CTRL1_PD_TOTAL 0x10
+#define ANX9804_SYS_CTRL1_MODE_SEL 0x08
+#define ANX9804_SYS_CTRL1_DET_STA 0x04
+#define ANX9804_SYS_CTRL1_FORCE_DET 0x02
+#define ANX9804_SYS_CTRL1_DET_CTRL 0x01
+
+#define ANX9804_SYS_CTRL2_REG 0x81
+#define ANX9804_SYS_CTRL2_CHA_STA 0x04
+
+#define ANX9804_SYS_CTRL3_REG 0x82
+#define ANX9804_SYS_CTRL3_VALID_CTRL BIT(0)
+#define ANX9804_SYS_CTRL3_F_VALID BIT(1)
+#define ANX9804_SYS_CTRL3_HPD_CTRL BIT(4)
+#define ANX9804_SYS_CTRL3_F_HPD BIT(5)
+
+#define ANX9804_LINK_BW_SET_REG 0xa0
+#define ANX9804_LANE_COUNT_SET_REG 0xa1
+#define ANX9804_TRAINING_PTN_SET_REG 0xa2
+#define ANX9804_TRAINING_LANE0_SET_REG 0xa3
+#define ANX9804_TRAINING_LANE1_SET_REG 0xa4
+#define ANX9804_TRAINING_LANE2_SET_REG 0xa5
+#define ANX9804_TRAINING_LANE3_SET_REG 0xa6
+
+#define ANX9804_LINK_TRAINING_CTRL_REG 0xa8
+#define ANX9804_LINK_TRAINING_CTRL_EN BIT(0)
+
+#define ANX9804_LINK_DEBUG_REG 0xb8
+#define ANX9804_PLL_CTRL_REG 0xc7
+#define ANX9804_ANALOG_POWER_DOWN_REG 0xc8
+
+#define ANX9804_AUX_CH_STA 0xe0
+#define ANX9804_AUX_BUSY BIT(4)
+#define ANX9804_AUX_STATUS_MASK 0x0f
+
+#define ANX9804_DP_AUX_RX_COMM 0xe3
+#define ANX9804_AUX_RX_COMM_I2C_DEFER BIT(3)
+#define ANX9804_AUX_RX_COMM_AUX_DEFER BIT(1)
+
+#define ANX9804_DP_AUX_CH_CTL_1 0xe5
+#define ANX9804_AUX_LENGTH(x) (((x - 1) & 0x0f) << 4)
+#define ANX9804_AUX_TX_COMM_MASK 0x0f
+#define ANX9804_AUX_TX_COMM_DP_TRANSACTION BIT(3)
+#define ANX9804_AUX_TX_COMM_MOT BIT(2)
+#define ANX9804_AUX_TX_COMM_READ BIT(0)
+
+#define ANX9804_DP_AUX_ADDR_7_0 0xe6
+#define ANX9804_DP_AUX_ADDR_15_8 0xe7
+#define ANX9804_DP_AUX_ADDR_19_16 0xe8
+
+#define ANX9804_DP_AUX_CH_CTL_2 0xe9
+#define ANX9804_ADDR_ONLY BIT(1)
+#define ANX9804_AUX_EN BIT(0)
+
+#define ANX9804_BUF_DATA_0 0xf0
+
+/* Registers@i2c address 0x39 */
+
+#define ANX9804_DEV_IDH_REG 0x03
+
+#define ANX9804_POWERD_CTRL_REG 0x05
+#define ANX9804_POWERD_AUDIO BIT(4)
+
+#define ANX9804_RST_CTRL_REG 0x06
+
+#define ANX9804_RST_CTRL2_REG 0x07
+#define ANX9804_RST_CTRL2_AUX BIT(2)
+#define ANX9804_RST_CTRL2_AC_MODE BIT(6)
+
+#define ANX9804_VID_CTRL1_REG 0x08
+#define ANX9804_VID_CTRL1_VID_EN BIT(7)
+#define ANX9804_VID_CTRL1_EDGE BIT(0)
+
+#define ANX9804_VID_CTRL2_REG 0x09
+#define ANX9804_ANALOG_DEBUG_REG1 0xdc
+#define ANX9804_ANALOG_DEBUG_REG3 0xde
+#define ANX9804_PLL_FILTER_CTRL1 0xdf
+#define ANX9804_PLL_FILTER_CTRL3 0xe1
+#define ANX9804_PLL_FILTER_CTRL 0xe2
+#define ANX9804_PLL_CTRL3 0xe6
+
+#define ANX9804_DP_INT_STA 0xf7
+#define ANX9804_RPLY_RECEIV BIT(1)
+#define ANX9804_AUX_ERR BIT(0)
--
2.14.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 3/5] video: add anx6345 DM driver
2017-09-19 5:04 [U-Boot] [RESEND PATCH 1/5] dm: video: bridge: add operation to read EDID Vasily Khoruzhick
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 2/5] video: anx9804: split out registers definitions into a separate header Vasily Khoruzhick
@ 2017-09-19 5:04 ` Vasily Khoruzhick
2017-10-05 18:44 ` André Przywara
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 4/5] sunxi: video: split out PLL code Vasily Khoruzhick
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver Vasily Khoruzhick
3 siblings, 1 reply; 18+ messages in thread
From: Vasily Khoruzhick @ 2017-09-19 5:04 UTC (permalink / raw)
To: u-boot
This is a eDP bridge similar to ANX9804, it allows to connect eDP panels
to the chips that can output only parallel signal
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
drivers/video/bridge/Kconfig | 8 +
drivers/video/bridge/Makefile | 1 +
drivers/video/bridge/anx6345.c | 419 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 428 insertions(+)
create mode 100644 drivers/video/bridge/anx6345.c
diff --git a/drivers/video/bridge/Kconfig b/drivers/video/bridge/Kconfig
index 2a3b6c4bee..765f7380b8 100644
--- a/drivers/video/bridge/Kconfig
+++ b/drivers/video/bridge/Kconfig
@@ -25,3 +25,11 @@ config VIDEO_BRIDGE_NXP_PTN3460
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.
+
+config VIDEO_BRIDGE_ANALOGIX_ANX6345
+ bool "Support Analogix ANX6345 RGB->DP bridge"
+ depends on VIDEO_BRIDGE
+ select DM_I2C
+ help
+ The Analogix ANX6345 is RGB-to-DP converter. It enables an eDP LCD
+ panel to be connected to an parallel LCD interface.
diff --git a/drivers/video/bridge/Makefile b/drivers/video/bridge/Makefile
index ce731fa4ca..2a746c6f8b 100644
--- a/drivers/video/bridge/Makefile
+++ b/drivers/video/bridge/Makefile
@@ -7,3 +7,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
+obj-$(CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345) += anx6345.o
diff --git a/drivers/video/bridge/anx6345.c b/drivers/video/bridge/anx6345.c
new file mode 100644
index 0000000000..6bac9a51a9
--- /dev/null
+++ b/drivers/video/bridge/anx6345.c
@@ -0,0 +1,419 @@
+/*
+ * Copyright (C) 2017 Vasily Khoruzhick <anarsoul@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <i2c.h>
+#include <edid.h>
+#include <video_bridge.h>
+#include <anx98xx-edp.h>
+
+#define DP_MAX_LINK_RATE 0x001
+#define DP_MAX_LANE_COUNT 0x002
+#define DP_MAX_LANE_COUNT_MASK 0x1f
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct anx6345_priv {
+ u8 edid[EDID_SIZE];
+};
+
+static int anx6345_write(struct udevice *dev, unsigned addr_off,
+ unsigned char reg_addr, unsigned char value)
+{
+ uint8_t buf[2];
+ struct i2c_msg msg;
+ int ret;
+
+ msg.addr = addr_off;
+ msg.flags = 0;
+ buf[0] = reg_addr;
+ buf[1] = value;
+ msg.buf = buf;
+ msg.len = 2;
+ ret = dm_i2c_xfer(dev, &msg, 1);
+ if (ret) {
+ debug("%s: write failed, reg=%#x, value=%#x, ret=%d\n",
+ __func__, reg_addr, value, ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int anx6345_read(struct udevice *dev, unsigned addr_off,
+ unsigned char reg_addr, unsigned char *value)
+{
+ uint8_t addr, val;
+ struct i2c_msg msg[2];
+ int ret;
+
+ msg[0].addr = addr_off;
+ msg[0].flags = 0;
+ addr = reg_addr;
+ msg[0].buf = &addr;
+ msg[0].len = 1;
+ msg[1].addr = addr_off;
+ msg[1].flags = I2C_M_RD;
+ msg[1].buf = &val;
+ msg[1].len = 1;
+ ret = dm_i2c_xfer(dev, msg, 2);
+ if (ret) {
+ debug("%s: read failed, reg=%.2x, value=%p, ret=%d\n",
+ __func__, (int)reg_addr, value, ret);
+ return ret;
+ }
+ *value = val;
+
+ return 0;
+}
+
+static int anx6345_write_r0(struct udevice *dev, unsigned char reg_addr,
+ unsigned char value)
+{
+ struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
+ return anx6345_write(dev, chip->chip_addr, reg_addr, value);
+}
+
+static int anx6345_read_r0(struct udevice *dev, unsigned char reg_addr,
+ unsigned char *value)
+{
+ struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
+ return anx6345_read(dev, chip->chip_addr, reg_addr, value);
+}
+
+static int anx6345_write_r1(struct udevice *dev, unsigned char reg_addr,
+ unsigned char value)
+{
+ struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
+ return anx6345_write(dev, chip->chip_addr + 1, reg_addr, value);
+}
+
+static int anx6345_read_r1(struct udevice *dev, unsigned char reg_addr,
+ unsigned char *value)
+{
+ struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
+ return anx6345_read(dev, chip->chip_addr + 1, reg_addr, value);
+}
+
+static int anx6345_set_backlight(struct udevice *dev, int percent)
+{
+ return -ENOSYS;
+}
+
+static int anx6345_aux_wait(struct udevice *dev)
+{
+ int ret = -ETIMEDOUT;
+ u8 v;
+ int retries = 1000;
+ do {
+ anx6345_read_r0(dev, ANX9804_DP_AUX_CH_CTL_2, &v);
+ if (!(v & ANX9804_AUX_EN)) {
+ ret = 0;
+ break;
+ }
+ udelay(100);
+ } while (retries--);
+
+ if (ret) {
+ debug("%s: timed out waiting for AUX_EN to clear\n", __func__);
+ return ret;
+ }
+
+ ret = -ETIMEDOUT;
+ retries = 1000;
+ do {
+ anx6345_read_r1(dev, ANX9804_DP_INT_STA, &v);
+ if (v & ANX9804_RPLY_RECEIV) {
+ ret = 0;
+ break;
+ }
+ udelay(100);
+ } while (retries--);
+
+ if (ret) {
+ debug("%s: timed out waiting to receive reply\n", __func__);
+ return ret;
+ }
+
+ /* Clear RPLY_RECEIV bit */
+ anx6345_write_r1(dev, ANX9804_DP_INT_STA, v);
+
+ anx6345_read_r0(dev, ANX9804_AUX_CH_STA, &v);
+ if ((v & ANX9804_AUX_STATUS_MASK) != 0) {
+ debug("AUX status: %d\n", v & ANX9804_AUX_STATUS_MASK);
+ ret = -EIO;
+ }
+
+ return ret;
+}
+
+static void anx6345_aux_addr(struct udevice *dev, u32 addr)
+{
+ u8 val;
+
+ val = addr & 0xff;
+ anx6345_write_r0(dev, ANX9804_DP_AUX_ADDR_7_0, val);
+ val = (addr >> 8) & 0xff;
+ anx6345_write_r0(dev, ANX9804_DP_AUX_ADDR_15_8, val);
+ val = (addr >> 16) & 0x0f;
+ anx6345_write_r0(dev, ANX9804_DP_AUX_ADDR_19_16, val);
+}
+
+static int anx6345_aux_transfer(struct udevice *dev, u8 req, u32 addr, u8 *buf, size_t len)
+{
+ int i, ret;
+ u8 ctrl1 = req;
+ u8 ctrl2 = ANX9804_AUX_EN;
+
+ if (len > 16)
+ return -E2BIG;
+
+ if (len)
+ ctrl1 |= ANX9804_AUX_LENGTH(len);
+ else
+ ctrl2 |= ANX9804_ADDR_ONLY;
+
+ if (len && !(req & ANX9804_AUX_TX_COMM_READ)) {
+ for (i = 0; i < len; i++)
+ anx6345_write_r0(dev, ANX9804_BUF_DATA_0 + i, buf[i]);
+ }
+
+ anx6345_aux_addr(dev, addr);
+ anx6345_write_r0(dev, ANX9804_DP_AUX_CH_CTL_1, ctrl1);
+ anx6345_write_r0(dev, ANX9804_DP_AUX_CH_CTL_2, ctrl2);
+ ret = anx6345_aux_wait(dev);
+ if (ret) {
+ debug("AUX transaction timed out\n");
+ return ret;
+ }
+
+ if (len && (req & ANX9804_AUX_TX_COMM_READ)) {
+ for (i = 0; i < len; i++)
+ anx6345_read_r0(dev, ANX9804_BUF_DATA_0 + i, &buf[i]);
+ }
+
+ return 0;
+
+}
+
+static int anx6345_read_aux_i2c(struct udevice *dev, u8 chip_addr,
+ u8 offset,
+ size_t count,
+ u8 *buf)
+{
+ int i, ret;
+ size_t cur_cnt;
+ u8 cur_offset;
+ for (i = 0; i < count; i += 16) {
+ cur_cnt = (count - i) > 16 ? 16 : count - i;
+ cur_offset = offset + i;
+ ret = anx6345_aux_transfer(dev, ANX9804_AUX_TX_COMM_MOT,
+ chip_addr, &cur_offset, 1);
+ if (ret) {
+ debug("%s: failed to set i2c offset: %d\n", __func__, ret);
+ return ret;
+ }
+ ret = anx6345_aux_transfer(dev, ANX9804_AUX_TX_COMM_READ,
+ chip_addr, buf + i, cur_cnt);
+ if (ret) {
+ debug("%s: failed to read from i2c device: %d\n", __func__, ret);
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
+static int anx6345_read_dpcd(struct udevice *dev, u32 reg, u8 *val)
+{
+ int ret;
+
+ ret = anx6345_aux_transfer(dev,
+ ANX9804_AUX_TX_COMM_READ |
+ ANX9804_AUX_TX_COMM_DP_TRANSACTION,
+ reg, val, 1);
+ if (ret) {
+ debug ("Failed to read DPCD\n");
+ return ret;
+ }
+
+ return 0;
+}
+
+static int anx6345_read_edid(struct udevice *dev, u8 *buf, int size)
+{
+ struct anx6345_priv *priv = dev_get_priv(dev);
+
+ if (size > EDID_SIZE)
+ size = EDID_SIZE;
+ memcpy(buf, priv->edid, size);
+
+ return size;
+}
+
+static int anx6345_attach(struct udevice *dev)
+{
+ /* No-op */
+ return 0;
+}
+
+static int anx6345_enable(struct udevice *dev)
+{
+ u8 chipid, colordepth, lanes, data_rate, c;
+ int ret, i, bpp;
+ struct display_timing timing;
+ struct anx6345_priv *priv = dev_get_priv(dev);
+
+ /* Deassert reset and enable power */
+ ret = video_bridge_set_active(dev, true);
+ if (ret)
+ return ret;
+
+ /* Reset */
+ anx6345_write_r1(dev, ANX9804_RST_CTRL_REG, 1);
+ mdelay(100);
+ anx6345_write_r1(dev, ANX9804_RST_CTRL_REG, 0);
+
+ /* Write 0 to the powerdown reg (powerup everything) */
+ anx6345_write_r1(dev, ANX9804_POWERD_CTRL_REG, 0);
+
+ ret = anx6345_read_r1(dev, ANX9804_DEV_IDH_REG, &chipid);
+ if (ret)
+ debug("%s: read id failed: %d\n", __func__, ret);
+
+ switch (chipid) {
+ case 0x63:
+ debug("ANX63xx detected.\n");
+ break;
+ default:
+ debug("Error anx6345 chipid mismatch: %.2x\n", (int)chipid);
+ return -ENODEV;
+ }
+
+ for (i = 0; i < 100; i++) {
+ anx6345_read_r0(dev, ANX9804_SYS_CTRL2_REG, &c);
+ anx6345_write_r0(dev, ANX9804_SYS_CTRL2_REG, c);
+ anx6345_read_r0(dev, ANX9804_SYS_CTRL2_REG, &c);
+ if ((c & ANX9804_SYS_CTRL2_CHA_STA) == 0)
+ break;
+
+ mdelay(5);
+ }
+ if (i == 100)
+ debug("Error anx6345 clock is not stable\n");
+
+ /* Set a bunch of analog related register values */
+ anx6345_write_r0(dev, ANX9804_PLL_CTRL_REG, 0x00);
+ anx6345_write_r1(dev, ANX9804_ANALOG_DEBUG_REG1, 0x70);
+ anx6345_write_r0(dev, ANX9804_LINK_DEBUG_REG, 0x30);
+
+ /* Force HPD */
+ anx6345_write_r0(dev, ANX9804_SYS_CTRL3_REG,
+ ANX9804_SYS_CTRL3_F_HPD | ANX9804_SYS_CTRL3_HPD_CTRL);
+
+ /* Power up and configure lanes */
+ anx6345_write_r0(dev, ANX9804_ANALOG_POWER_DOWN_REG, 0x00);
+ anx6345_write_r0(dev, ANX9804_TRAINING_LANE0_SET_REG, 0x00);
+ anx6345_write_r0(dev, ANX9804_TRAINING_LANE1_SET_REG, 0x00);
+ anx6345_write_r0(dev, ANX9804_TRAINING_LANE2_SET_REG, 0x00);
+ anx6345_write_r0(dev, ANX9804_TRAINING_LANE3_SET_REG, 0x00);
+
+ /* Reset AUX CH */
+ anx6345_write_r1(dev, ANX9804_RST_CTRL2_REG,
+ ANX9804_RST_CTRL2_AUX);
+ anx6345_write_r1(dev, ANX9804_RST_CTRL2_REG, 0);
+
+ /* Powerdown audio and some other unused bits */
+ anx6345_write_r1(dev, ANX9804_POWERD_CTRL_REG, ANX9804_POWERD_AUDIO);
+ anx6345_write_r0(dev, ANX9804_HDCP_CONTROL_0_REG, 0x00);
+ anx6345_write_r0(dev, 0xa7, 0x00);
+
+ anx6345_read_aux_i2c(dev, 0x50, 0x0, EDID_SIZE, priv->edid);
+ if (edid_get_timing(priv->edid, EDID_SIZE, &timing, &bpp) != 0) {
+ debug("Failed to parse EDID\n");
+ return -EIO;
+ }
+ debug("%s: panel found: %dx%d, bpp %d\n", __func__,
+ timing.hactive.typ, timing.vactive.typ,
+ bpp);
+ if (bpp == 6)
+ colordepth = 0x00; /* 6 bit */
+ else
+ colordepth = 0x10; /* 8 bit */
+ anx6345_write_r1(dev, ANX9804_VID_CTRL2_REG, colordepth);
+
+ if (anx6345_read_dpcd(dev, DP_MAX_LINK_RATE, &data_rate)) {
+ debug("%s: Failed to DP_MAX_LINK_RATE\n", __func__);
+ return -EIO;
+ }
+ debug("%s: data_rate: %d\n", __func__, (int)data_rate);
+ if (anx6345_read_dpcd(dev, DP_MAX_LANE_COUNT, &lanes)) {
+ debug("%s: Failed to read DP_MAX_LANE_COUNT\n", __func__);
+ return -EIO;
+ }
+ lanes &= DP_MAX_LANE_COUNT_MASK;
+ debug("%s: lanes: %d\n", __func__, (int)lanes);
+
+ /* Set data-rate / lanes */
+ anx6345_write_r0(dev, ANX9804_LINK_BW_SET_REG, data_rate);
+ anx6345_write_r0(dev, ANX9804_LANE_COUNT_SET_REG, lanes);
+
+ /* Link training */
+ anx6345_write_r0(dev, ANX9804_LINK_TRAINING_CTRL_REG,
+ ANX9804_LINK_TRAINING_CTRL_EN);
+ mdelay(5);
+ for (i = 0; i < 100; i++) {
+ anx6345_read_r0(dev, ANX9804_LINK_TRAINING_CTRL_REG, &c);
+ if ((chipid == 0x63) && (c & 0x80) == 0)
+ break;
+
+ mdelay(5);
+ }
+ if(i == 100) {
+ debug("Error anx6345 link training timeout\n");
+ return -ENODEV;
+ }
+
+ /* Enable */
+ anx6345_write_r1(dev, ANX9804_VID_CTRL1_REG,
+ ANX9804_VID_CTRL1_VID_EN | ANX9804_VID_CTRL1_EDGE);
+ /* Force stream valid */
+ anx6345_write_r0(dev, ANX9804_SYS_CTRL3_REG,
+ ANX9804_SYS_CTRL3_F_HPD | ANX9804_SYS_CTRL3_HPD_CTRL |
+ ANX9804_SYS_CTRL3_F_VALID | ANX9804_SYS_CTRL3_VALID_CTRL);
+
+ return 0;
+}
+
+static int anx6345_probe(struct udevice *dev)
+{
+ if (device_get_uclass_id(dev->parent) != UCLASS_I2C)
+ return -EPROTONOSUPPORT;
+
+ return anx6345_enable(dev);
+}
+
+struct video_bridge_ops anx6345_ops = {
+ .attach = anx6345_attach,
+ .set_backlight = anx6345_set_backlight,
+ .read_edid = anx6345_read_edid,
+};
+
+static const struct udevice_id anx6345_ids[] = {
+ { .compatible = "analogix,anx6345", },
+ { }
+};
+
+U_BOOT_DRIVER(analogix_anx6345) = {
+ .name = "analogix_anx6345",
+ .id = UCLASS_VIDEO_BRIDGE,
+ .of_match = anx6345_ids,
+ .probe = anx6345_probe,
+ .ops = &anx6345_ops,
+ .priv_auto_alloc_size = sizeof(struct anx6345_priv),
+};
--
2.14.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 4/5] sunxi: video: split out PLL code
2017-09-19 5:04 [U-Boot] [RESEND PATCH 1/5] dm: video: bridge: add operation to read EDID Vasily Khoruzhick
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 2/5] video: anx9804: split out registers definitions into a separate header Vasily Khoruzhick
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 3/5] video: add anx6345 DM driver Vasily Khoruzhick
@ 2017-09-19 5:04 ` Vasily Khoruzhick
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver Vasily Khoruzhick
3 siblings, 0 replies; 18+ messages in thread
From: Vasily Khoruzhick @ 2017-09-19 5:04 UTC (permalink / raw)
To: u-boot
It will be reused in new DM LCD driver.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
arch/arm/include/asm/arch-sunxi/lcdc.h | 2 +
drivers/video/sunxi/lcdc.c | 117 ++++++++++++++++++++++++++++++-
drivers/video/sunxi/sunxi_display.c | 121 ++-------------------------------
3 files changed, 124 insertions(+), 116 deletions(-)
diff --git a/arch/arm/include/asm/arch-sunxi/lcdc.h b/arch/arm/include/asm/arch-sunxi/lcdc.h
index a751698b4f..5d9253aaa5 100644
--- a/arch/arm/include/asm/arch-sunxi/lcdc.h
+++ b/arch/arm/include/asm/arch-sunxi/lcdc.h
@@ -124,5 +124,7 @@ void lcdc_tcon0_mode_set(struct sunxi_lcdc_reg * const lcdc,
void lcdc_tcon1_mode_set(struct sunxi_lcdc_reg * const lcdc,
const struct display_timing *mode,
bool ext_hvsync, bool is_composite);
+void lcdc_pll_set(struct sunxi_ccm_reg * const ccm, int tcon,
+ int dotclock, int *clk_div, int *clk_double);
#endif /* _LCDC_H */
diff --git a/drivers/video/sunxi/lcdc.c b/drivers/video/sunxi/lcdc.c
index 7d215b713e..023a30cb1e 100644
--- a/drivers/video/sunxi/lcdc.c
+++ b/drivers/video/sunxi/lcdc.c
@@ -10,6 +10,7 @@
#include <common.h>
+#include <asm/arch/clock.h>
#include <asm/arch/lcdc.h>
#include <asm/io.h>
@@ -100,7 +101,7 @@ void lcdc_tcon0_mode_set(struct sunxi_lcdc_reg * const lcdc,
writel(SUNXI_LCDC_TCON0_TIMING_V_TOTAL(total) |
SUNXI_LCDC_TCON0_TIMING_V_BP(bp), &lcdc->tcon0_timing_v);
-#ifdef CONFIG_VIDEO_LCD_IF_PARALLEL
+#if defined(CONFIG_VIDEO_LCD_IF_PARALLEL) || defined(CONFIG_VIDEO_DE2)
writel(SUNXI_LCDC_X(mode->hsync_len.typ) |
SUNXI_LCDC_Y(mode->vsync_len.typ), &lcdc->tcon0_timing_sync);
@@ -207,3 +208,117 @@ void lcdc_tcon1_mode_set(struct sunxi_lcdc_reg * const lcdc,
SUNXI_LCDC_MUX_CTRL_SRC0(1));
#endif
}
+
+void lcdc_pll_set(struct sunxi_ccm_reg *ccm, int tcon, int dotclock,
+ int *clk_div, int *clk_double)
+{
+ int value, n, m, min_m, max_m, diff;
+ int best_n = 0, best_m = 0, best_diff = 0x0FFFFFFF;
+ int best_double = 0;
+ bool use_mipi_pll = false;
+
+ if (tcon == 0) {
+#if defined(CONFIG_VIDEO_LCD_IF_PARALLEL) || defined(CONFIG_SUNXI_DE2)
+ min_m = 6;
+ max_m = 127;
+#endif
+#ifdef CONFIG_VIDEO_LCD_IF_LVDS
+ min_m = max_m = 7;
+#endif
+ } else {
+ min_m = 1;
+ max_m = 15;
+ }
+
+ /*
+ * Find the lowest divider resulting in a matching clock, if there
+ * is no match, pick the closest lower clock, as monitors tend to
+ * not sync to higher frequencies.
+ */
+ for (m = min_m; m <= max_m; m++) {
+#ifndef CONFIG_SUNXI_DE2
+ n = (m * dotclock) / 3000;
+
+ if ((n >= 9) && (n <= 127)) {
+ value = (3000 * n) / m;
+ diff = dotclock - value;
+ if (diff < best_diff) {
+ best_diff = diff;
+ best_m = m;
+ best_n = n;
+ best_double = 0;
+ }
+ }
+
+ /* These are just duplicates */
+ if (!(m & 1))
+ continue;
+#endif
+
+ /* No double clock on DE2 */
+ n = (m * dotclock) / 6000;
+ if ((n >= 9) && (n <= 127)) {
+ value = (6000 * n) / m;
+ diff = dotclock - value;
+ if (diff < best_diff) {
+ best_diff = diff;
+ best_m = m;
+ best_n = n;
+ best_double = 1;
+ }
+ }
+ }
+
+#ifdef CONFIG_MACH_SUN6I
+ /*
+ * Use the MIPI pll if we've been unable to find any matching setting
+ * for PLL3, this happens with high dotclocks because of min_m = 6.
+ */
+ if (tcon == 0 && best_n == 0) {
+ use_mipi_pll = true;
+ best_m = 6; /* Minimum m for tcon0 */
+ }
+
+ if (use_mipi_pll) {
+ clock_set_pll3(297000000); /* Fix the video pll@297 MHz */
+ clock_set_mipi_pll(best_m * dotclock * 1000);
+ debug("dotclock: %dkHz = %dkHz via mipi pll\n",
+ dotclock, clock_get_mipi_pll() / best_m / 1000);
+ } else
+#endif
+ {
+ clock_set_pll3(best_n * 3000000);
+ debug("dotclock: %dkHz = %dkHz: (%d * 3MHz * %d) / %d\n",
+ dotclock,
+ (best_double + 1) * clock_get_pll3() / best_m / 1000,
+ best_double + 1, best_n, best_m);
+ }
+
+ if (tcon == 0) {
+ u32 pll;
+
+ if (use_mipi_pll)
+ pll = CCM_LCD_CH0_CTRL_MIPI_PLL;
+ else if (best_double)
+ pll = CCM_LCD_CH0_CTRL_PLL3_2X;
+ else
+ pll = CCM_LCD_CH0_CTRL_PLL3;
+
+ writel(CCM_LCD_CH0_CTRL_GATE | CCM_LCD_CH0_CTRL_RST | pll,
+ &ccm->lcd0_clk_cfg);
+ }
+#ifndef CONFIG_SUNXI_DE2
+ else {
+ writel(CCM_LCD_CH1_CTRL_GATE |
+ (best_double ? CCM_LCD_CH1_CTRL_PLL3_2X :
+ CCM_LCD_CH1_CTRL_PLL3) |
+ CCM_LCD_CH1_CTRL_M(best_m), &ccm->lcd0_ch1_clk_cfg);
+ if (sunxi_is_composite())
+ setbits_le32(&ccm->lcd0_ch1_clk_cfg,
+ CCM_LCD_CH1_CTRL_HALF_SCLK1);
+ }
+#endif
+
+ *clk_div = best_m;
+ *clk_double = best_double;
+}
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
index de768ba94a..f3db125305 100644
--- a/drivers/video/sunxi/sunxi_display.c
+++ b/drivers/video/sunxi/sunxi_display.c
@@ -515,119 +515,6 @@ static void sunxi_composer_enable(void)
setbits_le32(&de_be->mode, SUNXI_DE_BE_MODE_START);
}
-/*
- * LCDC, what allwinner calls a CRTC, so timing controller and serializer.
- */
-static void sunxi_lcdc_pll_set(int tcon, int dotclock,
- int *clk_div, int *clk_double)
-{
- struct sunxi_ccm_reg * const ccm =
- (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
- int value, n, m, min_m, max_m, diff;
- int best_n = 0, best_m = 0, best_diff = 0x0FFFFFFF;
- int best_double = 0;
- bool use_mipi_pll = false;
-
- if (tcon == 0) {
-#ifdef CONFIG_VIDEO_LCD_IF_PARALLEL
- min_m = 6;
- max_m = 127;
-#endif
-#ifdef CONFIG_VIDEO_LCD_IF_LVDS
- min_m = max_m = 7;
-#endif
- } else {
- min_m = 1;
- max_m = 15;
- }
-
- /*
- * Find the lowest divider resulting in a matching clock, if there
- * is no match, pick the closest lower clock, as monitors tend to
- * not sync to higher frequencies.
- */
- for (m = min_m; m <= max_m; m++) {
- n = (m * dotclock) / 3000;
-
- if ((n >= 9) && (n <= 127)) {
- value = (3000 * n) / m;
- diff = dotclock - value;
- if (diff < best_diff) {
- best_diff = diff;
- best_m = m;
- best_n = n;
- best_double = 0;
- }
- }
-
- /* These are just duplicates */
- if (!(m & 1))
- continue;
-
- n = (m * dotclock) / 6000;
- if ((n >= 9) && (n <= 127)) {
- value = (6000 * n) / m;
- diff = dotclock - value;
- if (diff < best_diff) {
- best_diff = diff;
- best_m = m;
- best_n = n;
- best_double = 1;
- }
- }
- }
-
-#ifdef CONFIG_MACH_SUN6I
- /*
- * Use the MIPI pll if we've been unable to find any matching setting
- * for PLL3, this happens with high dotclocks because of min_m = 6.
- */
- if (tcon == 0 && best_n == 0) {
- use_mipi_pll = true;
- best_m = 6; /* Minimum m for tcon0 */
- }
-
- if (use_mipi_pll) {
- clock_set_pll3(297000000); /* Fix the video pll@297 MHz */
- clock_set_mipi_pll(best_m * dotclock * 1000);
- debug("dotclock: %dkHz = %dkHz via mipi pll\n",
- dotclock, clock_get_mipi_pll() / best_m / 1000);
- } else
-#endif
- {
- clock_set_pll3(best_n * 3000000);
- debug("dotclock: %dkHz = %dkHz: (%d * 3MHz * %d) / %d\n",
- dotclock,
- (best_double + 1) * clock_get_pll3() / best_m / 1000,
- best_double + 1, best_n, best_m);
- }
-
- if (tcon == 0) {
- u32 pll;
-
- if (use_mipi_pll)
- pll = CCM_LCD_CH0_CTRL_MIPI_PLL;
- else if (best_double)
- pll = CCM_LCD_CH0_CTRL_PLL3_2X;
- else
- pll = CCM_LCD_CH0_CTRL_PLL3;
-
- writel(CCM_LCD_CH0_CTRL_GATE | CCM_LCD_CH0_CTRL_RST | pll,
- &ccm->lcd0_ch0_clk_cfg);
- } else {
- writel(CCM_LCD_CH1_CTRL_GATE |
- (best_double ? CCM_LCD_CH1_CTRL_PLL3_2X :
- CCM_LCD_CH1_CTRL_PLL3) |
- CCM_LCD_CH1_CTRL_M(best_m), &ccm->lcd0_ch1_clk_cfg);
- if (sunxi_is_composite())
- setbits_le32(&ccm->lcd0_ch1_clk_cfg,
- CCM_LCD_CH1_CTRL_HALF_SCLK1);
- }
-
- *clk_div = best_m;
- *clk_double = best_double;
-}
-
static void sunxi_lcdc_init(void)
{
struct sunxi_ccm_reg * const ccm =
@@ -754,6 +641,8 @@ static void sunxi_lcdc_tcon0_mode_set(const struct ctfb_res_modes *mode,
{
struct sunxi_lcdc_reg * const lcdc =
(struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE;
+ struct sunxi_ccm_reg * const ccm =
+ (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
int clk_div, clk_double, pin;
struct display_timing timing;
@@ -773,7 +662,7 @@ static void sunxi_lcdc_tcon0_mode_set(const struct ctfb_res_modes *mode,
#endif
}
- sunxi_lcdc_pll_set(0, mode->pixclock_khz, &clk_div, &clk_double);
+ lcdc_pll_set(ccm, 0, mode->pixclock_khz, &clk_div, &clk_double);
sunxi_ctfb_mode_to_display_timing(mode, &timing);
lcdc_tcon0_mode_set(lcdc, &timing, clk_div, for_ext_vga_dac,
@@ -787,6 +676,8 @@ static void sunxi_lcdc_tcon1_mode_set(const struct ctfb_res_modes *mode,
{
struct sunxi_lcdc_reg * const lcdc =
(struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE;
+ struct sunxi_ccm_reg * const ccm =
+ (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
struct display_timing timing;
sunxi_ctfb_mode_to_display_timing(mode, &timing);
@@ -798,7 +689,7 @@ static void sunxi_lcdc_tcon1_mode_set(const struct ctfb_res_modes *mode,
sunxi_gpio_set_cfgpin(SUNXI_GPD(27), SUNXI_GPD_LCD0);
}
- sunxi_lcdc_pll_set(1, mode->pixclock_khz, clk_div, clk_double);
+ lcdc_pll_set(ccm, 1, mode->pixclock_khz, clk_div, clk_double);
}
#endif /* CONFIG_VIDEO_HDMI || defined CONFIG_VIDEO_VGA || CONFIG_VIDEO_COMPOSITE */
--
2.14.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver
2017-09-19 5:04 [U-Boot] [RESEND PATCH 1/5] dm: video: bridge: add operation to read EDID Vasily Khoruzhick
` (2 preceding siblings ...)
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 4/5] sunxi: video: split out PLL code Vasily Khoruzhick
@ 2017-09-19 5:04 ` Vasily Khoruzhick
2017-09-19 8:33 ` Maxime Ripard
3 siblings, 1 reply; 18+ messages in thread
From: Vasily Khoruzhick @ 2017-09-19 5:04 UTC (permalink / raw)
To: u-boot
Extend DE2 driver with LCD support
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
arch/arm/mach-sunxi/Kconfig | 2 +-
drivers/video/sunxi/Makefile | 2 +-
drivers/video/sunxi/sunxi_de2.c | 17 +++++
drivers/video/sunxi/sunxi_lcd.c | 142 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 161 insertions(+), 2 deletions(-)
create mode 100644 drivers/video/sunxi/sunxi_lcd.c
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 2309f59999..06d697e3a7 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -680,7 +680,7 @@ config VIDEO_LCD_MODE
config VIDEO_LCD_DCLK_PHASE
int "LCD panel display clock phase"
- depends on VIDEO
+ depends on VIDEO || DM_VIDEO
default 1
---help---
Select LCD panel display clock phase shift, range 0-3.
diff --git a/drivers/video/sunxi/Makefile b/drivers/video/sunxi/Makefile
index 0d64c2021f..8c91766c24 100644
--- a/drivers/video/sunxi/Makefile
+++ b/drivers/video/sunxi/Makefile
@@ -6,4 +6,4 @@
#
obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o lcdc.o tve_common.o ../videomodes.o
-obj-$(CONFIG_VIDEO_DE2) += sunxi_de2.o sunxi_dw_hdmi.o lcdc.o ../dw_hdmi.o
+obj-$(CONFIG_VIDEO_DE2) += sunxi_de2.o sunxi_dw_hdmi.o lcdc.o ../dw_hdmi.o sunxi_lcd.o
diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
index ee67764ac5..a838bbacd1 100644
--- a/drivers/video/sunxi/sunxi_de2.c
+++ b/drivers/video/sunxi/sunxi_de2.c
@@ -232,6 +232,23 @@ static int sunxi_de2_probe(struct udevice *dev)
if (!(gd->flags & GD_FLG_RELOC))
return 0;
+ ret = uclass_find_device_by_name(UCLASS_DISPLAY,
+ "sunxi_lcd", &disp);
+ if (!ret) {
+ int mux;
+
+ mux = 0;
+
+ ret = sunxi_de2_init(dev, plat->base, VIDEO_BPP32, disp, mux,
+ false);
+ if (!ret) {
+ video_set_flush_dcache(dev, 1);
+ return 0;
+ }
+ }
+
+ debug("%s: lcd display not found (ret=%d)\n", __func__, ret);
+
ret = uclass_find_device_by_name(UCLASS_DISPLAY,
"sunxi_dw_hdmi", &disp);
if (!ret) {
diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c
new file mode 100644
index 0000000000..154eb5835e
--- /dev/null
+++ b/drivers/video/sunxi/sunxi_lcd.c
@@ -0,0 +1,142 @@
+/*
+ * Allwinner LCD driver
+ *
+ * (C) Copyright 2017 Vasily Khoruzhick <anarsoul@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
+#include <display.h>
+#include <video_bridge.h>
+#include <backlight.h>
+#include <dm.h>
+#include <edid.h>
+#include <asm/io.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/lcdc.h>
+#include <asm/arch/gpio.h>
+#include <asm/gpio.h>
+
+struct sunxi_lcd_priv {
+ struct display_timing timing;
+ int panel_bpp;
+};
+
+static void sunxi_lcdc_config_pinmux(void)
+{
+ int pin;
+ for (pin = SUNXI_GPD(0); pin <= SUNXI_GPD(21); pin++) {
+ sunxi_gpio_set_cfgpin(pin, SUNXI_GPD_LCD0);
+ sunxi_gpio_set_drv(pin, 3);
+ }
+}
+
+static int sunxi_lcd_enable(struct udevice *dev, int bpp,
+ const struct display_timing *edid)
+{
+ struct sunxi_ccm_reg * const ccm =
+ (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
+ struct sunxi_lcdc_reg * const lcdc =
+ (struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE;
+ struct sunxi_lcd_priv *priv = dev_get_priv(dev);
+ struct udevice *backlight;
+ int clk_div, clk_double, ret;
+
+ /* Reset off */
+ setbits_le32(&ccm->ahb_reset1_cfg, 1 << AHB_RESET_OFFSET_LCD0);
+
+ /* Clock on */
+ setbits_le32(&ccm->ahb_gate1, 1 << AHB_GATE_OFFSET_LCD0);
+
+ lcdc_init(lcdc);
+ sunxi_lcdc_config_pinmux();
+ lcdc_pll_set(ccm, 0, edid->pixelclock.typ / 1000,
+ &clk_div, &clk_double);
+ lcdc_tcon0_mode_set(lcdc, edid, clk_div, false,
+ priv->panel_bpp, CONFIG_VIDEO_LCD_DCLK_PHASE);
+ lcdc_enable(lcdc, priv->panel_bpp);
+
+ ret = uclass_get_device(UCLASS_PANEL_BACKLIGHT, 0, &backlight);
+ if (!ret)
+ backlight_enable(backlight);
+
+ return 0;
+}
+
+static int sunxi_lcd_read_timing(struct udevice *dev,
+ struct display_timing *timing)
+{
+ struct sunxi_lcd_priv *priv = dev_get_priv(dev);
+ memcpy(timing, &priv->timing, sizeof(struct display_timing));
+
+ return 0;
+}
+
+static int sunxi_lcd_probe(struct udevice *dev)
+{
+ struct udevice *cdev;
+ struct sunxi_lcd_priv *priv = dev_get_priv(dev);
+ int ret;
+
+ /* make sure that clock is active */
+ clock_set_pll10(432000000);
+
+#ifdef CONFIG_VIDEO_BRIDGE
+ /* Try to get timings from bridge first */
+ ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &cdev);
+ if (!ret) {
+ u8 edid[EDID_SIZE];
+ int channel_bpp;
+
+ ret = video_bridge_attach(cdev);
+ if (ret) {
+ debug("video bridge attach failed: %d\n", ret);
+ return ret;
+ }
+ ret = video_bridge_read_edid(cdev, edid, EDID_SIZE);
+ if (ret <= 0) {
+ debug("video bridge failed to read edid: %d\n", ret);
+ return ret ? ret : -EIO;
+ }
+ ret = edid_get_timing(edid, ret, &priv->timing, &channel_bpp);
+ priv->panel_bpp = channel_bpp * 3;
+ return ret;
+ }
+ debug("video bridge not found: %d\n", ret);
+#endif
+ /* Fallback to timings from DT if there's no bridge */
+ ret = uclass_get_device(UCLASS_PANEL, 0, &cdev);
+ if (ret) {
+ debug("video panel not found: %d\n", ret);
+ return ret;
+ }
+
+ if (fdtdec_decode_display_timing(gd->fdt_blob, dev_of_offset(cdev),
+ 0, &priv->timing)) {
+ debug("%s: Failed to decode display timing\n", __func__);
+ return -EINVAL;
+ }
+ priv->panel_bpp = 16;
+
+ return 0;
+}
+
+static const struct dm_display_ops sunxi_lcd_ops = {
+ .read_timing = sunxi_lcd_read_timing,
+ .enable = sunxi_lcd_enable,
+};
+
+U_BOOT_DRIVER(sunxi_lcd) = {
+ .name = "sunxi_lcd",
+ .id = UCLASS_DISPLAY,
+ .ops = &sunxi_lcd_ops,
+ .probe = sunxi_lcd_probe,
+ .priv_auto_alloc_size = sizeof(struct sunxi_lcd_priv),
+};
+
+#ifdef CONFIG_MACH_SUN50I
+U_BOOT_DEVICE(sunxi_lcd) = {
+ .name = "sunxi_lcd"
+};
+#endif
--
2.14.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver Vasily Khoruzhick
@ 2017-09-19 8:33 ` Maxime Ripard
2017-09-19 19:00 ` Vasily Khoruzhick
0 siblings, 1 reply; 18+ messages in thread
From: Maxime Ripard @ 2017-09-19 8:33 UTC (permalink / raw)
To: u-boot
On Mon, Sep 18, 2017 at 10:04:21PM -0700, Vasily Khoruzhick wrote:
> Extend DE2 driver with LCD support
(All) your commit messages could use a bit more details.
Here, for example, explaining the following things would help:
- Why are you creating yet another file
- What is the situation with old Allwinner SoCs that should share
the same code
- What are the expected users
- Which SoC / board have you tested it on
etc...
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
> ---
> arch/arm/mach-sunxi/Kconfig | 2 +-
> drivers/video/sunxi/Makefile | 2 +-
> drivers/video/sunxi/sunxi_de2.c | 17 +++++
> drivers/video/sunxi/sunxi_lcd.c | 142 ++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 161 insertions(+), 2 deletions(-)
> create mode 100644 drivers/video/sunxi/sunxi_lcd.c
>
> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
> index 2309f59999..06d697e3a7 100644
> --- a/arch/arm/mach-sunxi/Kconfig
> +++ b/arch/arm/mach-sunxi/Kconfig
> @@ -680,7 +680,7 @@ config VIDEO_LCD_MODE
>
> config VIDEO_LCD_DCLK_PHASE
> int "LCD panel display clock phase"
> - depends on VIDEO
> + depends on VIDEO || DM_VIDEO
> default 1
> ---help---
> Select LCD panel display clock phase shift, range 0-3.
> diff --git a/drivers/video/sunxi/Makefile b/drivers/video/sunxi/Makefile
> index 0d64c2021f..8c91766c24 100644
> --- a/drivers/video/sunxi/Makefile
> +++ b/drivers/video/sunxi/Makefile
> @@ -6,4 +6,4 @@
> #
>
> obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o lcdc.o tve_common.o ../videomodes.o
> -obj-$(CONFIG_VIDEO_DE2) += sunxi_de2.o sunxi_dw_hdmi.o lcdc.o ../dw_hdmi.o
> +obj-$(CONFIG_VIDEO_DE2) += sunxi_de2.o sunxi_dw_hdmi.o lcdc.o ../dw_hdmi.o sunxi_lcd.o
> diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
> index ee67764ac5..a838bbacd1 100644
> --- a/drivers/video/sunxi/sunxi_de2.c
> +++ b/drivers/video/sunxi/sunxi_de2.c
> @@ -232,6 +232,23 @@ static int sunxi_de2_probe(struct udevice *dev)
> if (!(gd->flags & GD_FLG_RELOC))
> return 0;
>
> + ret = uclass_find_device_by_name(UCLASS_DISPLAY,
> + "sunxi_lcd", &disp);
> + if (!ret) {
> + int mux;
> +
> + mux = 0;
> +
> + ret = sunxi_de2_init(dev, plat->base, VIDEO_BPP32, disp, mux,
> + false);
> + if (!ret) {
> + video_set_flush_dcache(dev, 1);
Why do you need to flush the dcache here?
> + return 0;
> + }
> + }
> +
> + debug("%s: lcd display not found (ret=%d)\n", __func__, ret);
> +
> ret = uclass_find_device_by_name(UCLASS_DISPLAY,
> "sunxi_dw_hdmi", &disp);
> if (!ret) {
> diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c
> new file mode 100644
> index 0000000000..154eb5835e
> --- /dev/null
> +++ b/drivers/video/sunxi/sunxi_lcd.c
> @@ -0,0 +1,142 @@
> +/*
> + * Allwinner LCD driver
> + *
> + * (C) Copyright 2017 Vasily Khoruzhick <anarsoul@gmail.com>
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +#include <common.h>
> +#include <display.h>
> +#include <video_bridge.h>
> +#include <backlight.h>
> +#include <dm.h>
> +#include <edid.h>
> +#include <asm/io.h>
> +#include <asm/arch/clock.h>
> +#include <asm/arch/lcdc.h>
> +#include <asm/arch/gpio.h>
> +#include <asm/gpio.h>
> +
> +struct sunxi_lcd_priv {
> + struct display_timing timing;
> + int panel_bpp;
> +};
> +
> +static void sunxi_lcdc_config_pinmux(void)
> +{
> + int pin;
> + for (pin = SUNXI_GPD(0); pin <= SUNXI_GPD(21); pin++) {
> + sunxi_gpio_set_cfgpin(pin, SUNXI_GPD_LCD0);
> + sunxi_gpio_set_drv(pin, 3);
> + }
> +}
> +
> +static int sunxi_lcd_enable(struct udevice *dev, int bpp,
> + const struct display_timing *edid)
> +{
> + struct sunxi_ccm_reg * const ccm =
> + (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
> + struct sunxi_lcdc_reg * const lcdc =
> + (struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE;
> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
> + struct udevice *backlight;
> + int clk_div, clk_double, ret;
> +
> + /* Reset off */
> + setbits_le32(&ccm->ahb_reset1_cfg, 1 << AHB_RESET_OFFSET_LCD0);
> +
> + /* Clock on */
> + setbits_le32(&ccm->ahb_gate1, 1 << AHB_GATE_OFFSET_LCD0);
This has nothing to do with using a panel or not, it should be in
lcdc_init().
> + lcdc_init(lcdc);
> + sunxi_lcdc_config_pinmux();
This is already handled in sunxi_lcdc_tcon0_mode_set, why duplicate
it?
> + lcdc_pll_set(ccm, 0, edid->pixelclock.typ / 1000,
> + &clk_div, &clk_double);
> + lcdc_tcon0_mode_set(lcdc, edid, clk_div, false,
> + priv->panel_bpp, CONFIG_VIDEO_LCD_DCLK_PHASE);
> + lcdc_enable(lcdc, priv->panel_bpp);
> +
> + ret = uclass_get_device(UCLASS_PANEL_BACKLIGHT, 0, &backlight);
> + if (!ret)
> + backlight_enable(backlight);
> +
> + return 0;
> +}
> +
> +static int sunxi_lcd_read_timing(struct udevice *dev,
> + struct display_timing *timing)
> +{
> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
> + memcpy(timing, &priv->timing, sizeof(struct display_timing));
> +
> + return 0;
> +}
> +
> +static int sunxi_lcd_probe(struct udevice *dev)
> +{
> + struct udevice *cdev;
> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
> + int ret;
> +
> + /* make sure that clock is active */
> + clock_set_pll10(432000000);
Why do you need it active, and why at that rate?
> +
> +#ifdef CONFIG_VIDEO_BRIDGE
> + /* Try to get timings from bridge first */
> + ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &cdev);
> + if (!ret) {
> + u8 edid[EDID_SIZE];
> + int channel_bpp;
> +
> + ret = video_bridge_attach(cdev);
> + if (ret) {
> + debug("video bridge attach failed: %d\n", ret);
> + return ret;
> + }
> + ret = video_bridge_read_edid(cdev, edid, EDID_SIZE);
> + if (ret <= 0) {
> + debug("video bridge failed to read edid: %d\n", ret);
> + return ret ? ret : -EIO;
> + }
> + ret = edid_get_timing(edid, ret, &priv->timing, &channel_bpp);
> + priv->panel_bpp = channel_bpp * 3;
> + return ret;
> + }
> + debug("video bridge not found: %d\n", ret);
> +#endif
> + /* Fallback to timings from DT if there's no bridge */
> + ret = uclass_get_device(UCLASS_PANEL, 0, &cdev);
> + if (ret) {
> + debug("video panel not found: %d\n", ret);
> + return ret;
> + }
> +
> + if (fdtdec_decode_display_timing(gd->fdt_blob, dev_of_offset(cdev),
> + 0, &priv->timing)) {
> + debug("%s: Failed to decode display timing\n", __func__);
> + return -EINVAL;
> + }
How does that work with simple-panel style bindings that are most of
the panels merged these days?
> + priv->panel_bpp = 16;
> +
> + return 0;
> +}
> +
> +static const struct dm_display_ops sunxi_lcd_ops = {
> + .read_timing = sunxi_lcd_read_timing,
> + .enable = sunxi_lcd_enable,
> +};
> +
> +U_BOOT_DRIVER(sunxi_lcd) = {
> + .name = "sunxi_lcd",
> + .id = UCLASS_DISPLAY,
> + .ops = &sunxi_lcd_ops,
> + .probe = sunxi_lcd_probe,
> + .priv_auto_alloc_size = sizeof(struct sunxi_lcd_priv),
> +};
> +
> +#ifdef CONFIG_MACH_SUN50I
Why do you restrict it to the A64 here?
Thanks,
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170919/48f31b41/attachment.sig>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver
2017-09-19 8:33 ` Maxime Ripard
@ 2017-09-19 19:00 ` Vasily Khoruzhick
2017-09-19 20:06 ` Jernej Škrabec
` (2 more replies)
0 siblings, 3 replies; 18+ messages in thread
From: Vasily Khoruzhick @ 2017-09-19 19:00 UTC (permalink / raw)
To: u-boot
On Tue, Sep 19, 2017 at 1:33 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> On Mon, Sep 18, 2017 at 10:04:21PM -0700, Vasily Khoruzhick wrote:
>> Extend DE2 driver with LCD support
>
> (All) your commit messages could use a bit more details.
OK, will add in v2.
> Here, for example, explaining the following things would help:
> - Why are you creating yet another file
Are you talking about any specific file? I guess adding another driver
justifies creation of another file.
> - What is the situation with old Allwinner SoCs that should share
> the same code
As far as I can tell, DE2 is present in H3, V3s, A64 and newer. LCD is
supported in A64 only. I.e. hardware is not present
in H3 or V3s
> - What are the expected users
Pinebook
> - Which SoC / board have you tested it on
A64 / Pinebook
>
> etc...
>
>> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
>> ---
>> arch/arm/mach-sunxi/Kconfig | 2 +-
>> drivers/video/sunxi/Makefile | 2 +-
>> drivers/video/sunxi/sunxi_de2.c | 17 +++++
>> drivers/video/sunxi/sunxi_lcd.c | 142 ++++++++++++++++++++++++++++++++++++++++
>> 4 files changed, 161 insertions(+), 2 deletions(-)
>> create mode 100644 drivers/video/sunxi/sunxi_lcd.c
>>
>> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
>> index 2309f59999..06d697e3a7 100644
>> --- a/arch/arm/mach-sunxi/Kconfig
>> +++ b/arch/arm/mach-sunxi/Kconfig
>> @@ -680,7 +680,7 @@ config VIDEO_LCD_MODE
>>
>> config VIDEO_LCD_DCLK_PHASE
>> int "LCD panel display clock phase"
>> - depends on VIDEO
>> + depends on VIDEO || DM_VIDEO
>> default 1
>> ---help---
>> Select LCD panel display clock phase shift, range 0-3.
>> diff --git a/drivers/video/sunxi/Makefile b/drivers/video/sunxi/Makefile
>> index 0d64c2021f..8c91766c24 100644
>> --- a/drivers/video/sunxi/Makefile
>> +++ b/drivers/video/sunxi/Makefile
>> @@ -6,4 +6,4 @@
>> #
>>
>> obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o lcdc.o tve_common.o ../videomodes.o
>> -obj-$(CONFIG_VIDEO_DE2) += sunxi_de2.o sunxi_dw_hdmi.o lcdc.o ../dw_hdmi.o
>> +obj-$(CONFIG_VIDEO_DE2) += sunxi_de2.o sunxi_dw_hdmi.o lcdc.o ../dw_hdmi.o sunxi_lcd.o
>> diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
>> index ee67764ac5..a838bbacd1 100644
>> --- a/drivers/video/sunxi/sunxi_de2.c
>> +++ b/drivers/video/sunxi/sunxi_de2.c
>> @@ -232,6 +232,23 @@ static int sunxi_de2_probe(struct udevice *dev)
>> if (!(gd->flags & GD_FLG_RELOC))
>> return 0;
>>
>> + ret = uclass_find_device_by_name(UCLASS_DISPLAY,
>> + "sunxi_lcd", &disp);
>> + if (!ret) {
>> + int mux;
>> +
>> + mux = 0;
>> +
>> + ret = sunxi_de2_init(dev, plat->base, VIDEO_BPP32, disp, mux,
>> + false);
>> + if (!ret) {
>> + video_set_flush_dcache(dev, 1);
>
> Why do you need to flush the dcache here?
Copied from HDMI driver init. If it's not necessary why it's here for HDMI?
>
>> + return 0;
>> + }
>> + }
>> +
>> + debug("%s: lcd display not found (ret=%d)\n", __func__, ret);
>> +
>> ret = uclass_find_device_by_name(UCLASS_DISPLAY,
>> "sunxi_dw_hdmi", &disp);
>> if (!ret) {
>> diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c
>> new file mode 100644
>> index 0000000000..154eb5835e
>> --- /dev/null
>> +++ b/drivers/video/sunxi/sunxi_lcd.c
>> @@ -0,0 +1,142 @@
>> +/*
>> + * Allwinner LCD driver
>> + *
>> + * (C) Copyright 2017 Vasily Khoruzhick <anarsoul@gmail.com>
>> + *
>> + * SPDX-License-Identifier: GPL-2.0+
>> + */
>> +
>> +#include <common.h>
>> +#include <display.h>
>> +#include <video_bridge.h>
>> +#include <backlight.h>
>> +#include <dm.h>
>> +#include <edid.h>
>> +#include <asm/io.h>
>> +#include <asm/arch/clock.h>
>> +#include <asm/arch/lcdc.h>
>> +#include <asm/arch/gpio.h>
>> +#include <asm/gpio.h>
>> +
>> +struct sunxi_lcd_priv {
>> + struct display_timing timing;
>> + int panel_bpp;
>> +};
>> +
>> +static void sunxi_lcdc_config_pinmux(void)
>> +{
>> + int pin;
>> + for (pin = SUNXI_GPD(0); pin <= SUNXI_GPD(21); pin++) {
>> + sunxi_gpio_set_cfgpin(pin, SUNXI_GPD_LCD0);
>> + sunxi_gpio_set_drv(pin, 3);
>> + }
>> +}
>> +
>> +static int sunxi_lcd_enable(struct udevice *dev, int bpp,
>> + const struct display_timing *edid)
>> +{
>> + struct sunxi_ccm_reg * const ccm =
>> + (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
>> + struct sunxi_lcdc_reg * const lcdc =
>> + (struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE;
>> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
>> + struct udevice *backlight;
>> + int clk_div, clk_double, ret;
>> +
>> + /* Reset off */
>> + setbits_le32(&ccm->ahb_reset1_cfg, 1 << AHB_RESET_OFFSET_LCD0);
>> +
>> + /* Clock on */
>> + setbits_le32(&ccm->ahb_gate1, 1 << AHB_GATE_OFFSET_LCD0);
>
> This has nothing to do with using a panel or not, it should be in
> lcdc_init().
Why? We don't need neither take it out of reset nor turn the clock on
it if LCD is not used (e.g. HDMI-only case).
>> + lcdc_init(lcdc);
>> + sunxi_lcdc_config_pinmux();
>
> This is already handled in sunxi_lcdc_tcon0_mode_set, why duplicate
> it?
Because the one that sunxi_lcdc_tcon0_mode_set() calls is
DE1-specific. I don't want to split out that code that won't be used
by DE2 driver.
>> + lcdc_pll_set(ccm, 0, edid->pixelclock.typ / 1000,
>> + &clk_div, &clk_double);
>> + lcdc_tcon0_mode_set(lcdc, edid, clk_div, false,
>> + priv->panel_bpp, CONFIG_VIDEO_LCD_DCLK_PHASE);
>> + lcdc_enable(lcdc, priv->panel_bpp);
>> +
>> + ret = uclass_get_device(UCLASS_PANEL_BACKLIGHT, 0, &backlight);
>> + if (!ret)
>> + backlight_enable(backlight);
>> +
>> + return 0;
>> +}
>> +
>> +static int sunxi_lcd_read_timing(struct udevice *dev,
>> + struct display_timing *timing)
>> +{
>> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
>> + memcpy(timing, &priv->timing, sizeof(struct display_timing));
>> +
>> + return 0;
>> +}
>> +
>> +static int sunxi_lcd_probe(struct udevice *dev)
>> +{
>> + struct udevice *cdev;
>> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
>> + int ret;
>> +
>> + /* make sure that clock is active */
>> + clock_set_pll10(432000000);
>
> Why do you need it active, and why at that rate?
Will check.
>> +
>> +#ifdef CONFIG_VIDEO_BRIDGE
>> + /* Try to get timings from bridge first */
>> + ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &cdev);
>> + if (!ret) {
>> + u8 edid[EDID_SIZE];
>> + int channel_bpp;
>> +
>> + ret = video_bridge_attach(cdev);
>> + if (ret) {
>> + debug("video bridge attach failed: %d\n", ret);
>> + return ret;
>> + }
>> + ret = video_bridge_read_edid(cdev, edid, EDID_SIZE);
>> + if (ret <= 0) {
>> + debug("video bridge failed to read edid: %d\n", ret);
>> + return ret ? ret : -EIO;
>> + }
>> + ret = edid_get_timing(edid, ret, &priv->timing, &channel_bpp);
>> + priv->panel_bpp = channel_bpp * 3;
>> + return ret;
>> + }
>> + debug("video bridge not found: %d\n", ret);
>> +#endif
>> + /* Fallback to timings from DT if there's no bridge */
>> + ret = uclass_get_device(UCLASS_PANEL, 0, &cdev);
>> + if (ret) {
>> + debug("video panel not found: %d\n", ret);
>> + return ret;
>> + }
>> +
>> + if (fdtdec_decode_display_timing(gd->fdt_blob, dev_of_offset(cdev),
>> + 0, &priv->timing)) {
>> + debug("%s: Failed to decode display timing\n", __func__);
>> + return -EINVAL;
>> + }
>
> How does that work with simple-panel style bindings that are most of
> the panels merged these days?
It should just work, but I haven't even tested this part of the code -
I don't have a panel with parallel interface nor A64 board to connect
it to.
Do you want me to drop it and make this driver dependent on CONFIG_VIDEO_BRIDGE
>
>> + priv->panel_bpp = 16;
>> +
>> + return 0;
>> +}
>> +
>> +static const struct dm_display_ops sunxi_lcd_ops = {
>> + .read_timing = sunxi_lcd_read_timing,
>> + .enable = sunxi_lcd_enable,
>> +};
>> +
>> +U_BOOT_DRIVER(sunxi_lcd) = {
>> + .name = "sunxi_lcd",
>> + .id = UCLASS_DISPLAY,
>> + .ops = &sunxi_lcd_ops,
>> + .probe = sunxi_lcd_probe,
>> + .priv_auto_alloc_size = sizeof(struct sunxi_lcd_priv),
>> +};
>> +
>> +#ifdef CONFIG_MACH_SUN50I
>
> Why do you restrict it to the A64 here?
Because the hardware is present in A64 only.
> Thanks,
> Maxime
>
> --
> Maxime Ripard, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver
2017-09-19 19:00 ` Vasily Khoruzhick
@ 2017-09-19 20:06 ` Jernej Škrabec
2017-09-19 23:26 ` Icenowy Zheng
2017-09-21 5:33 ` Vasily Khoruzhick
2 siblings, 0 replies; 18+ messages in thread
From: Jernej Škrabec @ 2017-09-19 20:06 UTC (permalink / raw)
To: u-boot
Hi,
Dne torek, 19. september 2017 ob 21:00:30 CEST je Vasily Khoruzhick
napisal(a):
> On Tue, Sep 19, 2017 at 1:33 AM, Maxime Ripard
>
> <maxime.ripard@free-electrons.com> wrote:
> > On Mon, Sep 18, 2017 at 10:04:21PM -0700, Vasily Khoruzhick wrote:
> >> Extend DE2 driver with LCD support
> >
> > (All) your commit messages could use a bit more details.
>
> OK, will add in v2.
>
> > Here, for example, explaining the following things would help:
> > - Why are you creating yet another file
>
> Are you talking about any specific file? I guess adding another driver
> justifies creation of another file.
>
> > - What is the situation with old Allwinner SoCs that should share
> >
> > the same code
>
> As far as I can tell, DE2 is present in H3, V3s, A64 and newer. LCD is
> supported in A64 only. I.e. hardware is not present
> in H3 or V3s
>
> > - What are the expected users
>
> Pinebook
>
> > - Which SoC / board have you tested it on
>
> A64 / Pinebook
>
> > etc...
> >
> >> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
> >> ---
> >>
> >> arch/arm/mach-sunxi/Kconfig | 2 +-
> >> drivers/video/sunxi/Makefile | 2 +-
> >> drivers/video/sunxi/sunxi_de2.c | 17 +++++
> >> drivers/video/sunxi/sunxi_lcd.c | 142
> >> ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 161
> >> insertions(+), 2 deletions(-)
> >> create mode 100644 drivers/video/sunxi/sunxi_lcd.c
> >>
> >> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
> >> index 2309f59999..06d697e3a7 100644
> >> --- a/arch/arm/mach-sunxi/Kconfig
> >> +++ b/arch/arm/mach-sunxi/Kconfig
> >> @@ -680,7 +680,7 @@ config VIDEO_LCD_MODE
> >>
> >> config VIDEO_LCD_DCLK_PHASE
> >>
> >> int "LCD panel display clock phase"
> >>
> >> - depends on VIDEO
> >> + depends on VIDEO || DM_VIDEO
> >>
> >> default 1
> >> ---help---
> >> Select LCD panel display clock phase shift, range 0-3.
> >>
> >> diff --git a/drivers/video/sunxi/Makefile b/drivers/video/sunxi/Makefile
> >> index 0d64c2021f..8c91766c24 100644
> >> --- a/drivers/video/sunxi/Makefile
> >> +++ b/drivers/video/sunxi/Makefile
> >> @@ -6,4 +6,4 @@
> >>
> >> #
> >>
> >> obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o lcdc.o tve_common.o
> >> ../videomodes.o>>
> >> -obj-$(CONFIG_VIDEO_DE2) += sunxi_de2.o sunxi_dw_hdmi.o lcdc.o
> >> ../dw_hdmi.o
> >> +obj-$(CONFIG_VIDEO_DE2) += sunxi_de2.o sunxi_dw_hdmi.o lcdc.o
> >> ../dw_hdmi.o sunxi_lcd.o diff --git a/drivers/video/sunxi/sunxi_de2.c
> >> b/drivers/video/sunxi/sunxi_de2.c index ee67764ac5..a838bbacd1 100644
> >> --- a/drivers/video/sunxi/sunxi_de2.c
> >> +++ b/drivers/video/sunxi/sunxi_de2.c
> >> @@ -232,6 +232,23 @@ static int sunxi_de2_probe(struct udevice *dev)
> >>
> >> if (!(gd->flags & GD_FLG_RELOC))
> >>
> >> return 0;
> >>
> >> + ret = uclass_find_device_by_name(UCLASS_DISPLAY,
> >> + "sunxi_lcd", &disp);
> >> + if (!ret) {
> >> + int mux;
> >> +
> >> + mux = 0;
> >> +
> >> + ret = sunxi_de2_init(dev, plat->base, VIDEO_BPP32, disp,
> >> mux,
> >> + false);
> >> + if (!ret) {
> >> + video_set_flush_dcache(dev, 1);
> >
> > Why do you need to flush the dcache here?
>
> Copied from HDMI driver init. If it's not necessary why it's here for HDMI?
>
When I was developing HDMI driver, it proved necessary, since screen was not
rendered correctly otherwise. I guess simple test without this line would show
if it is really necessary or not.
> >> + return 0;
> >> + }
> >> + }
> >> +
> >> + debug("%s: lcd display not found (ret=%d)\n", __func__, ret);
> >> +
> >>
> >> ret = uclass_find_device_by_name(UCLASS_DISPLAY,
> >>
> >> "sunxi_dw_hdmi", &disp);
> >>
> >> if (!ret) {
> >>
> >> diff --git a/drivers/video/sunxi/sunxi_lcd.c
> >> b/drivers/video/sunxi/sunxi_lcd.c new file mode 100644
> >> index 0000000000..154eb5835e
> >> --- /dev/null
> >> +++ b/drivers/video/sunxi/sunxi_lcd.c
> >> @@ -0,0 +1,142 @@
> >> +/*
> >> + * Allwinner LCD driver
> >> + *
> >> + * (C) Copyright 2017 Vasily Khoruzhick <anarsoul@gmail.com>
> >> + *
> >> + * SPDX-License-Identifier: GPL-2.0+
> >> + */
> >> +
> >> +#include <common.h>
> >> +#include <display.h>
> >> +#include <video_bridge.h>
> >> +#include <backlight.h>
> >> +#include <dm.h>
> >> +#include <edid.h>
> >> +#include <asm/io.h>
> >> +#include <asm/arch/clock.h>
> >> +#include <asm/arch/lcdc.h>
> >> +#include <asm/arch/gpio.h>
> >> +#include <asm/gpio.h>
> >> +
> >> +struct sunxi_lcd_priv {
> >> + struct display_timing timing;
> >> + int panel_bpp;
> >> +};
> >> +
> >> +static void sunxi_lcdc_config_pinmux(void)
> >> +{
> >> + int pin;
> >> + for (pin = SUNXI_GPD(0); pin <= SUNXI_GPD(21); pin++) {
> >> + sunxi_gpio_set_cfgpin(pin, SUNXI_GPD_LCD0);
> >> + sunxi_gpio_set_drv(pin, 3);
> >> + }
> >> +}
> >> +
> >> +static int sunxi_lcd_enable(struct udevice *dev, int bpp,
> >> + const struct display_timing *edid)
> >> +{
> >> + struct sunxi_ccm_reg * const ccm =
> >> + (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
> >> + struct sunxi_lcdc_reg * const lcdc =
> >> + (struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE;
> >> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
> >> + struct udevice *backlight;
> >> + int clk_div, clk_double, ret;
> >> +
> >> + /* Reset off */
> >> + setbits_le32(&ccm->ahb_reset1_cfg, 1 << AHB_RESET_OFFSET_LCD0);
> >> +
> >> + /* Clock on */
> >> + setbits_le32(&ccm->ahb_gate1, 1 << AHB_GATE_OFFSET_LCD0);
> >
> > This has nothing to do with using a panel or not, it should be in
> > lcdc_init().
>
> Why? We don't need neither take it out of reset nor turn the clock on
> it if LCD is not used (e.g. HDMI-only case).
>
> >> + lcdc_init(lcdc);
> >> + sunxi_lcdc_config_pinmux();
> >
> > This is already handled in sunxi_lcdc_tcon0_mode_set, why duplicate
> > it?
>
> Because the one that sunxi_lcdc_tcon0_mode_set() calls is
> DE1-specific. I don't want to split out that code that won't be used
> by DE2 driver.
>
> >> + lcdc_pll_set(ccm, 0, edid->pixelclock.typ / 1000,
> >> + &clk_div, &clk_double);
> >> + lcdc_tcon0_mode_set(lcdc, edid, clk_div, false,
> >> + priv->panel_bpp, CONFIG_VIDEO_LCD_DCLK_PHASE);
> >> + lcdc_enable(lcdc, priv->panel_bpp);
> >> +
> >> + ret = uclass_get_device(UCLASS_PANEL_BACKLIGHT, 0, &backlight);
> >> + if (!ret)
> >> + backlight_enable(backlight);
> >> +
> >> + return 0;
> >> +}
> >> +
> >> +static int sunxi_lcd_read_timing(struct udevice *dev,
> >> + struct display_timing *timing)
> >> +{
> >> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
> >> + memcpy(timing, &priv->timing, sizeof(struct display_timing));
> >> +
> >> + return 0;
> >> +}
> >> +
> >> +static int sunxi_lcd_probe(struct udevice *dev)
> >> +{
> >> + struct udevice *cdev;
> >> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
> >> + int ret;
> >> +
> >> + /* make sure that clock is active */
> >> + clock_set_pll10(432000000);
> >
> > Why do you need it active, and why at that rate?
>
> Will check.
>
Is this taken from my not yet mainline TVE driver? There it was needed since
TVE unit clock has same parent as DE2 clock and since DE2 was not yet set up
at that time, TVE plug in detection didn't work.
If I'm not mistaken, there is no special encoder for LCD interface after TCON,
so this line should not be needed. Again, simple test can be performed.
> >> +
> >> +#ifdef CONFIG_VIDEO_BRIDGE
> >> + /* Try to get timings from bridge first */
> >> + ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &cdev);
> >> + if (!ret) {
> >> + u8 edid[EDID_SIZE];
> >> + int channel_bpp;
> >> +
> >> + ret = video_bridge_attach(cdev);
> >> + if (ret) {
> >> + debug("video bridge attach failed: %d\n", ret);
> >> + return ret;
> >> + }
> >> + ret = video_bridge_read_edid(cdev, edid, EDID_SIZE);
> >> + if (ret <= 0) {
> >> + debug("video bridge failed to read edid: %d\n",
> >> ret);
> >> + return ret ? ret : -EIO;
> >> + }
> >> + ret = edid_get_timing(edid, ret, &priv->timing,
> >> &channel_bpp); + priv->panel_bpp = channel_bpp * 3;
> >> + return ret;
> >> + }
> >> + debug("video bridge not found: %d\n", ret);
> >> +#endif
> >> + /* Fallback to timings from DT if there's no bridge */
> >> + ret = uclass_get_device(UCLASS_PANEL, 0, &cdev);
> >> + if (ret) {
> >> + debug("video panel not found: %d\n", ret);
> >> + return ret;
> >> + }
> >> +
> >> + if (fdtdec_decode_display_timing(gd->fdt_blob, dev_of_offset(cdev),
> >> + 0, &priv->timing)) {
> >> + debug("%s: Failed to decode display timing\n", __func__);
> >> + return -EINVAL;
> >> + }
> >
> > How does that work with simple-panel style bindings that are most of
> > the panels merged these days?
>
> It should just work, but I haven't even tested this part of the code -
> I don't have a panel with parallel interface nor A64 board to connect
> it to.
> Do you want me to drop it and make this driver dependent on
> CONFIG_VIDEO_BRIDGE
You don't need separate setup. Just add simple panel to DT which describes
current panel and instead of edid_get_timing() use
fdtdec_decode_display_timing()...
> >> + priv->panel_bpp = 16;
> >> +
> >> + return 0;
> >> +}
> >> +
> >> +static const struct dm_display_ops sunxi_lcd_ops = {
> >> + .read_timing = sunxi_lcd_read_timing,
> >> + .enable = sunxi_lcd_enable,
> >> +};
> >> +
> >> +U_BOOT_DRIVER(sunxi_lcd) = {
> >> + .name = "sunxi_lcd",
> >> + .id = UCLASS_DISPLAY,
> >> + .ops = &sunxi_lcd_ops,
> >> + .probe = sunxi_lcd_probe,
> >> + .priv_auto_alloc_size = sizeof(struct sunxi_lcd_priv),
> >> +};
> >> +
> >> +#ifdef CONFIG_MACH_SUN50I
> >
> > Why do you restrict it to the A64 here?
>
> Because the hardware is present in A64 only.
The only other device with DE2 and LCD interface is R40 (not counting
rebranded SoCs), which is not yet supported with this driver. It would be bad
to probe it on H3 and H5, since they have slightly different clock registers.
Best regards,
Jernej
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver
2017-09-19 19:00 ` Vasily Khoruzhick
2017-09-19 20:06 ` Jernej Škrabec
@ 2017-09-19 23:26 ` Icenowy Zheng
2017-09-21 5:33 ` Vasily Khoruzhick
2 siblings, 0 replies; 18+ messages in thread
From: Icenowy Zheng @ 2017-09-19 23:26 UTC (permalink / raw)
To: u-boot
于 2017年9月20日 GMT+08:00 上午3:00:30, Vasily Khoruzhick <anarsoul@gmail.com> 写到:
>On Tue, Sep 19, 2017 at 1:33 AM, Maxime Ripard
><maxime.ripard@free-electrons.com> wrote:
>> On Mon, Sep 18, 2017 at 10:04:21PM -0700, Vasily Khoruzhick wrote:
>>> Extend DE2 driver with LCD support
>>
>> (All) your commit messages could use a bit more details.
>
>OK, will add in v2.
>
>> Here, for example, explaining the following things would help:
>> - Why are you creating yet another file
>
>Are you talking about any specific file? I guess adding another driver
>justifies creation of another file.
>
>> - What is the situation with old Allwinner SoCs that should share
>> the same code
>
>As far as I can tell, DE2 is present in H3, V3s, A64 and newer. LCD is
>supported in A64 only. I.e. hardware is not present
>in H3 or V3s
The only display output of V3s is LCD.
>
>> - What are the expected users
>
>Pinebook
>
>> - Which SoC / board have you tested it on
>
>A64 / Pinebook
>
>>
>> etc...
>>
>>> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
>>> ---
>>> arch/arm/mach-sunxi/Kconfig | 2 +-
>>> drivers/video/sunxi/Makefile | 2 +-
>>> drivers/video/sunxi/sunxi_de2.c | 17 +++++
>>> drivers/video/sunxi/sunxi_lcd.c | 142
>++++++++++++++++++++++++++++++++++++++++
>>> 4 files changed, 161 insertions(+), 2 deletions(-)
>>> create mode 100644 drivers/video/sunxi/sunxi_lcd.c
>>>
>>> diff --git a/arch/arm/mach-sunxi/Kconfig
>b/arch/arm/mach-sunxi/Kconfig
>>> index 2309f59999..06d697e3a7 100644
>>> --- a/arch/arm/mach-sunxi/Kconfig
>>> +++ b/arch/arm/mach-sunxi/Kconfig
>>> @@ -680,7 +680,7 @@ config VIDEO_LCD_MODE
>>>
>>> config VIDEO_LCD_DCLK_PHASE
>>> int "LCD panel display clock phase"
>>> - depends on VIDEO
>>> + depends on VIDEO || DM_VIDEO
>>> default 1
>>> ---help---
>>> Select LCD panel display clock phase shift, range 0-3.
>>> diff --git a/drivers/video/sunxi/Makefile
>b/drivers/video/sunxi/Makefile
>>> index 0d64c2021f..8c91766c24 100644
>>> --- a/drivers/video/sunxi/Makefile
>>> +++ b/drivers/video/sunxi/Makefile
>>> @@ -6,4 +6,4 @@
>>> #
>>>
>>> obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o lcdc.o tve_common.o
>../videomodes.o
>>> -obj-$(CONFIG_VIDEO_DE2) += sunxi_de2.o sunxi_dw_hdmi.o lcdc.o
>../dw_hdmi.o
>>> +obj-$(CONFIG_VIDEO_DE2) += sunxi_de2.o sunxi_dw_hdmi.o lcdc.o
>../dw_hdmi.o sunxi_lcd.o
>>> diff --git a/drivers/video/sunxi/sunxi_de2.c
>b/drivers/video/sunxi/sunxi_de2.c
>>> index ee67764ac5..a838bbacd1 100644
>>> --- a/drivers/video/sunxi/sunxi_de2.c
>>> +++ b/drivers/video/sunxi/sunxi_de2.c
>>> @@ -232,6 +232,23 @@ static int sunxi_de2_probe(struct udevice *dev)
>>> if (!(gd->flags & GD_FLG_RELOC))
>>> return 0;
>>>
>>> + ret = uclass_find_device_by_name(UCLASS_DISPLAY,
>>> + "sunxi_lcd", &disp);
>>> + if (!ret) {
>>> + int mux;
>>> +
>>> + mux = 0;
>>> +
>>> + ret = sunxi_de2_init(dev, plat->base, VIDEO_BPP32,
>disp, mux,
>>> + false);
>>> + if (!ret) {
>>> + video_set_flush_dcache(dev, 1);
>>
>> Why do you need to flush the dcache here?
>
>Copied from HDMI driver init. If it's not necessary why it's here for
>HDMI?
>
>>
>>> + return 0;
>>> + }
>>> + }
>>> +
>>> + debug("%s: lcd display not found (ret=%d)\n", __func__, ret);
>>> +
>>> ret = uclass_find_device_by_name(UCLASS_DISPLAY,
>>> "sunxi_dw_hdmi", &disp);
>>> if (!ret) {
>>> diff --git a/drivers/video/sunxi/sunxi_lcd.c
>b/drivers/video/sunxi/sunxi_lcd.c
>>> new file mode 100644
>>> index 0000000000..154eb5835e
>>> --- /dev/null
>>> +++ b/drivers/video/sunxi/sunxi_lcd.c
>>> @@ -0,0 +1,142 @@
>>> +/*
>>> + * Allwinner LCD driver
>>> + *
>>> + * (C) Copyright 2017 Vasily Khoruzhick <anarsoul@gmail.com>
>>> + *
>>> + * SPDX-License-Identifier: GPL-2.0+
>>> + */
>>> +
>>> +#include <common.h>
>>> +#include <display.h>
>>> +#include <video_bridge.h>
>>> +#include <backlight.h>
>>> +#include <dm.h>
>>> +#include <edid.h>
>>> +#include <asm/io.h>
>>> +#include <asm/arch/clock.h>
>>> +#include <asm/arch/lcdc.h>
>>> +#include <asm/arch/gpio.h>
>>> +#include <asm/gpio.h>
>>> +
>>> +struct sunxi_lcd_priv {
>>> + struct display_timing timing;
>>> + int panel_bpp;
>>> +};
>>> +
>>> +static void sunxi_lcdc_config_pinmux(void)
>>> +{
>>> + int pin;
>>> + for (pin = SUNXI_GPD(0); pin <= SUNXI_GPD(21); pin++) {
>>> + sunxi_gpio_set_cfgpin(pin, SUNXI_GPD_LCD0);
>>> + sunxi_gpio_set_drv(pin, 3);
>>> + }
>>> +}
>>> +
>>> +static int sunxi_lcd_enable(struct udevice *dev, int bpp,
>>> + const struct display_timing *edid)
>>> +{
>>> + struct sunxi_ccm_reg * const ccm =
>>> + (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
>>> + struct sunxi_lcdc_reg * const lcdc =
>>> + (struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE;
>>> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
>>> + struct udevice *backlight;
>>> + int clk_div, clk_double, ret;
>>> +
>>> + /* Reset off */
>>> + setbits_le32(&ccm->ahb_reset1_cfg, 1 <<
>AHB_RESET_OFFSET_LCD0);
>>> +
>>> + /* Clock on */
>>> + setbits_le32(&ccm->ahb_gate1, 1 << AHB_GATE_OFFSET_LCD0);
>>
>> This has nothing to do with using a panel or not, it should be in
>> lcdc_init().
>
>Why? We don't need neither take it out of reset nor turn the clock on
>it if LCD is not used (e.g. HDMI-only case).
>
>>> + lcdc_init(lcdc);
>>> + sunxi_lcdc_config_pinmux();
>>
>> This is already handled in sunxi_lcdc_tcon0_mode_set, why duplicate
>> it?
>
>Because the one that sunxi_lcdc_tcon0_mode_set() calls is
>DE1-specific. I don't want to split out that code that won't be used
>by DE2 driver.
>
>>> + lcdc_pll_set(ccm, 0, edid->pixelclock.typ / 1000,
>>> + &clk_div, &clk_double);
>>> + lcdc_tcon0_mode_set(lcdc, edid, clk_div, false,
>>> + priv->panel_bpp,
>CONFIG_VIDEO_LCD_DCLK_PHASE);
>>> + lcdc_enable(lcdc, priv->panel_bpp);
>>> +
>>> + ret = uclass_get_device(UCLASS_PANEL_BACKLIGHT, 0,
>&backlight);
>>> + if (!ret)
>>> + backlight_enable(backlight);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static int sunxi_lcd_read_timing(struct udevice *dev,
>>> + struct display_timing *timing)
>>> +{
>>> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
>>> + memcpy(timing, &priv->timing, sizeof(struct display_timing));
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static int sunxi_lcd_probe(struct udevice *dev)
>>> +{
>>> + struct udevice *cdev;
>>> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
>>> + int ret;
>>> +
>>> + /* make sure that clock is active */
>>> + clock_set_pll10(432000000);
>>
>> Why do you need it active, and why at that rate?
>
>Will check.
>
>>> +
>>> +#ifdef CONFIG_VIDEO_BRIDGE
>>> + /* Try to get timings from bridge first */
>>> + ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &cdev);
>>> + if (!ret) {
>>> + u8 edid[EDID_SIZE];
>>> + int channel_bpp;
>>> +
>>> + ret = video_bridge_attach(cdev);
>>> + if (ret) {
>>> + debug("video bridge attach failed: %d\n",
>ret);
>>> + return ret;
>>> + }
>>> + ret = video_bridge_read_edid(cdev, edid, EDID_SIZE);
>>> + if (ret <= 0) {
>>> + debug("video bridge failed to read edid:
>%d\n", ret);
>>> + return ret ? ret : -EIO;
>>> + }
>>> + ret = edid_get_timing(edid, ret, &priv->timing,
>&channel_bpp);
>>> + priv->panel_bpp = channel_bpp * 3;
>>> + return ret;
>>> + }
>>> + debug("video bridge not found: %d\n", ret);
>>> +#endif
>>> + /* Fallback to timings from DT if there's no bridge */
>>> + ret = uclass_get_device(UCLASS_PANEL, 0, &cdev);
>>> + if (ret) {
>>> + debug("video panel not found: %d\n", ret);
>>> + return ret;
>>> + }
>>> +
>>> + if (fdtdec_decode_display_timing(gd->fdt_blob,
>dev_of_offset(cdev),
>>> + 0, &priv->timing)) {
>>> + debug("%s: Failed to decode display timing\n",
>__func__);
>>> + return -EINVAL;
>>> + }
>>
>> How does that work with simple-panel style bindings that are most of
>> the panels merged these days?
>
>It should just work, but I haven't even tested this part of the code -
>I don't have a panel with parallel interface nor A64 board to connect
>it to.
>Do you want me to drop it and make this driver dependent on
>CONFIG_VIDEO_BRIDGE
>
>>
>>> + priv->panel_bpp = 16;
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static const struct dm_display_ops sunxi_lcd_ops = {
>>> + .read_timing = sunxi_lcd_read_timing,
>>> + .enable = sunxi_lcd_enable,
>>> +};
>>> +
>>> +U_BOOT_DRIVER(sunxi_lcd) = {
>>> + .name = "sunxi_lcd",
>>> + .id = UCLASS_DISPLAY,
>>> + .ops = &sunxi_lcd_ops,
>>> + .probe = sunxi_lcd_probe,
>>> + .priv_auto_alloc_size = sizeof(struct sunxi_lcd_priv),
>>> +};
>>> +
>>> +#ifdef CONFIG_MACH_SUN50I
>>
>> Why do you restrict it to the A64 here?
>
>Because the hardware is present in A64 only.
>
>> Thanks,
>> Maxime
>>
>> --
>> Maxime Ripard, Free Electrons
>> Embedded Linux and Kernel engineering
>> http://free-electrons.com
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver
2017-09-19 19:00 ` Vasily Khoruzhick
2017-09-19 20:06 ` Jernej Škrabec
2017-09-19 23:26 ` Icenowy Zheng
@ 2017-09-21 5:33 ` Vasily Khoruzhick
2017-09-21 6:51 ` Maxime Ripard
2 siblings, 1 reply; 18+ messages in thread
From: Vasily Khoruzhick @ 2017-09-21 5:33 UTC (permalink / raw)
To: u-boot
Hi,
I did few tests, see results inline.
On Tue, Sep 19, 2017 at 12:00 PM, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> On Tue, Sep 19, 2017 at 1:33 AM, Maxime Ripard
> <maxime.ripard@free-electrons.com> wrote:
>> On Mon, Sep 18, 2017 at 10:04:21PM -0700, Vasily Khoruzhick wrote:
>>> Extend DE2 driver with LCD support
>>
>> (All) your commit messages could use a bit more details.
>
> OK, will add in v2.
>
>> Here, for example, explaining the following things would help:
>> - Why are you creating yet another file
>
> Are you talking about any specific file? I guess adding another driver
> justifies creation of another file.
>
>> - What is the situation with old Allwinner SoCs that should share
>> the same code
>
> As far as I can tell, DE2 is present in H3, V3s, A64 and newer. LCD is
> supported in A64 only. I.e. hardware is not present
> in H3 or V3s
>
>> - What are the expected users
>
> Pinebook
>
>> - Which SoC / board have you tested it on
>
> A64 / Pinebook
>
>>
>> etc...
>>
>>> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
>>> ---
>>> arch/arm/mach-sunxi/Kconfig | 2 +-
>>> drivers/video/sunxi/Makefile | 2 +-
>>> drivers/video/sunxi/sunxi_de2.c | 17 +++++
>>> drivers/video/sunxi/sunxi_lcd.c | 142 ++++++++++++++++++++++++++++++++++++++++
>>> 4 files changed, 161 insertions(+), 2 deletions(-)
>>> create mode 100644 drivers/video/sunxi/sunxi_lcd.c
>>>
>>> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
>>> index 2309f59999..06d697e3a7 100644
>>> --- a/arch/arm/mach-sunxi/Kconfig
>>> +++ b/arch/arm/mach-sunxi/Kconfig
>>> @@ -680,7 +680,7 @@ config VIDEO_LCD_MODE
>>>
>>> config VIDEO_LCD_DCLK_PHASE
>>> int "LCD panel display clock phase"
>>> - depends on VIDEO
>>> + depends on VIDEO || DM_VIDEO
>>> default 1
>>> ---help---
>>> Select LCD panel display clock phase shift, range 0-3.
>>> diff --git a/drivers/video/sunxi/Makefile b/drivers/video/sunxi/Makefile
>>> index 0d64c2021f..8c91766c24 100644
>>> --- a/drivers/video/sunxi/Makefile
>>> +++ b/drivers/video/sunxi/Makefile
>>> @@ -6,4 +6,4 @@
>>> #
>>>
>>> obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o lcdc.o tve_common.o ../videomodes.o
>>> -obj-$(CONFIG_VIDEO_DE2) += sunxi_de2.o sunxi_dw_hdmi.o lcdc.o ../dw_hdmi.o
>>> +obj-$(CONFIG_VIDEO_DE2) += sunxi_de2.o sunxi_dw_hdmi.o lcdc.o ../dw_hdmi.o sunxi_lcd.o
>>> diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
>>> index ee67764ac5..a838bbacd1 100644
>>> --- a/drivers/video/sunxi/sunxi_de2.c
>>> +++ b/drivers/video/sunxi/sunxi_de2.c
>>> @@ -232,6 +232,23 @@ static int sunxi_de2_probe(struct udevice *dev)
>>> if (!(gd->flags & GD_FLG_RELOC))
>>> return 0;
>>>
>>> + ret = uclass_find_device_by_name(UCLASS_DISPLAY,
>>> + "sunxi_lcd", &disp);
>>> + if (!ret) {
>>> + int mux;
>>> +
>>> + mux = 0;
>>> +
>>> + ret = sunxi_de2_init(dev, plat->base, VIDEO_BPP32, disp, mux,
>>> + false);
>>> + if (!ret) {
>>> + video_set_flush_dcache(dev, 1);
>>
>> Why do you need to flush the dcache here?
>
> Copied from HDMI driver init. If it's not necessary why it's here for HDMI?
DE2 is not cache aware, so CPU should flush dcache after updating
framebuffer. If I remove this line,
dcache isn't flushed when framebuffer is updated, and thus picture is
a total mess (black background with some white stripes).
>>> + return 0;
>>> + }
>>> + }
>>> +
>>> + debug("%s: lcd display not found (ret=%d)\n", __func__, ret);
>>> +
>>> ret = uclass_find_device_by_name(UCLASS_DISPLAY,
>>> "sunxi_dw_hdmi", &disp);
>>> if (!ret) {
>>> diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c
>>> new file mode 100644
>>> index 0000000000..154eb5835e
>>> --- /dev/null
>>> +++ b/drivers/video/sunxi/sunxi_lcd.c
>>> @@ -0,0 +1,142 @@
>>> +/*
>>> + * Allwinner LCD driver
>>> + *
>>> + * (C) Copyright 2017 Vasily Khoruzhick <anarsoul@gmail.com>
>>> + *
>>> + * SPDX-License-Identifier: GPL-2.0+
>>> + */
>>> +
>>> +#include <common.h>
>>> +#include <display.h>
>>> +#include <video_bridge.h>
>>> +#include <backlight.h>
>>> +#include <dm.h>
>>> +#include <edid.h>
>>> +#include <asm/io.h>
>>> +#include <asm/arch/clock.h>
>>> +#include <asm/arch/lcdc.h>
>>> +#include <asm/arch/gpio.h>
>>> +#include <asm/gpio.h>
>>> +
>>> +struct sunxi_lcd_priv {
>>> + struct display_timing timing;
>>> + int panel_bpp;
>>> +};
>>> +
>>> +static void sunxi_lcdc_config_pinmux(void)
>>> +{
>>> + int pin;
>>> + for (pin = SUNXI_GPD(0); pin <= SUNXI_GPD(21); pin++) {
>>> + sunxi_gpio_set_cfgpin(pin, SUNXI_GPD_LCD0);
>>> + sunxi_gpio_set_drv(pin, 3);
>>> + }
>>> +}
>>> +
>>> +static int sunxi_lcd_enable(struct udevice *dev, int bpp,
>>> + const struct display_timing *edid)
>>> +{
>>> + struct sunxi_ccm_reg * const ccm =
>>> + (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
>>> + struct sunxi_lcdc_reg * const lcdc =
>>> + (struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE;
>>> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
>>> + struct udevice *backlight;
>>> + int clk_div, clk_double, ret;
>>> +
>>> + /* Reset off */
>>> + setbits_le32(&ccm->ahb_reset1_cfg, 1 << AHB_RESET_OFFSET_LCD0);
>>> +
>>> + /* Clock on */
>>> + setbits_le32(&ccm->ahb_gate1, 1 << AHB_GATE_OFFSET_LCD0);
>>
>> This has nothing to do with using a panel or not, it should be in
>> lcdc_init().
>
> Why? We don't need neither take it out of reset nor turn the clock on
> it if LCD is not used (e.g. HDMI-only case).
I'm leaving it here. It's not necessary for HDMI, and it doesn't work
without it for LCD.
>
>>> + lcdc_init(lcdc);
>>> + sunxi_lcdc_config_pinmux();
>>
>> This is already handled in sunxi_lcdc_tcon0_mode_set, why duplicate
>> it?
>
> Because the one that sunxi_lcdc_tcon0_mode_set() calls is
> DE1-specific. I don't want to split out that code that won't be used
> by DE2 driver.
>
>>> + lcdc_pll_set(ccm, 0, edid->pixelclock.typ / 1000,
>>> + &clk_div, &clk_double);
>>> + lcdc_tcon0_mode_set(lcdc, edid, clk_div, false,
>>> + priv->panel_bpp, CONFIG_VIDEO_LCD_DCLK_PHASE);
>>> + lcdc_enable(lcdc, priv->panel_bpp);
>>> +
>>> + ret = uclass_get_device(UCLASS_PANEL_BACKLIGHT, 0, &backlight);
>>> + if (!ret)
>>> + backlight_enable(backlight);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static int sunxi_lcd_read_timing(struct udevice *dev,
>>> + struct display_timing *timing)
>>> +{
>>> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
>>> + memcpy(timing, &priv->timing, sizeof(struct display_timing));
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static int sunxi_lcd_probe(struct udevice *dev)
>>> +{
>>> + struct udevice *cdev;
>>> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
>>> + int ret;
>>> +
>>> + /* make sure that clock is active */
>>> + clock_set_pll10(432000000);
>>
>> Why do you need it active, and why at that rate?
>
> Will check.
Not necessary, will drop in v2.
>>> +
>>> +#ifdef CONFIG_VIDEO_BRIDGE
>>> + /* Try to get timings from bridge first */
>>> + ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &cdev);
>>> + if (!ret) {
>>> + u8 edid[EDID_SIZE];
>>> + int channel_bpp;
>>> +
>>> + ret = video_bridge_attach(cdev);
>>> + if (ret) {
>>> + debug("video bridge attach failed: %d\n", ret);
>>> + return ret;
>>> + }
>>> + ret = video_bridge_read_edid(cdev, edid, EDID_SIZE);
>>> + if (ret <= 0) {
>>> + debug("video bridge failed to read edid: %d\n", ret);
>>> + return ret ? ret : -EIO;
>>> + }
>>> + ret = edid_get_timing(edid, ret, &priv->timing, &channel_bpp);
>>> + priv->panel_bpp = channel_bpp * 3;
>>> + return ret;
>>> + }
>>> + debug("video bridge not found: %d\n", ret);
>>> +#endif
>>> + /* Fallback to timings from DT if there's no bridge */
>>> + ret = uclass_get_device(UCLASS_PANEL, 0, &cdev);
>>> + if (ret) {
>>> + debug("video panel not found: %d\n", ret);
>>> + return ret;
>>> + }
>>> +
>>> + if (fdtdec_decode_display_timing(gd->fdt_blob, dev_of_offset(cdev),
>>> + 0, &priv->timing)) {
>>> + debug("%s: Failed to decode display timing\n", __func__);
>>> + return -EINVAL;
>>> + }
>>
>> How does that work with simple-panel style bindings that are most of
>> the panels merged these days?
>
> It should just work, but I haven't even tested this part of the code -
> I don't have a panel with parallel interface nor A64 board to connect
> it to.
> Do you want me to drop it and make this driver dependent on CONFIG_VIDEO_BRIDGE
I tested missing bridge codepath as Jerjej suggested and it works
fine. I extended it with reading panel bpp from fdt to make it even
better.
>>> + priv->panel_bpp = 16;
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static const struct dm_display_ops sunxi_lcd_ops = {
>>> + .read_timing = sunxi_lcd_read_timing,
>>> + .enable = sunxi_lcd_enable,
>>> +};
>>> +
>>> +U_BOOT_DRIVER(sunxi_lcd) = {
>>> + .name = "sunxi_lcd",
>>> + .id = UCLASS_DISPLAY,
>>> + .ops = &sunxi_lcd_ops,
>>> + .probe = sunxi_lcd_probe,
>>> + .priv_auto_alloc_size = sizeof(struct sunxi_lcd_priv),
>>> +};
>>> +
>>> +#ifdef CONFIG_MACH_SUN50I
>>
>> Why do you restrict it to the A64 here?
>
> Because the hardware is present in A64 only.
>
>> Thanks,
>> Maxime
>>
>> --
>> Maxime Ripard, Free Electrons
>> Embedded Linux and Kernel engineering
>> http://free-electrons.com
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver
2017-09-21 5:33 ` Vasily Khoruzhick
@ 2017-09-21 6:51 ` Maxime Ripard
2017-09-21 7:01 ` icenowy at aosc.io
2017-09-22 4:42 ` Vasily Khoruzhick
0 siblings, 2 replies; 18+ messages in thread
From: Maxime Ripard @ 2017-09-21 6:51 UTC (permalink / raw)
To: u-boot
On Thu, Sep 21, 2017 at 05:33:36AM +0000, Vasily Khoruzhick wrote:
> >>> + ret = uclass_find_device_by_name(UCLASS_DISPLAY,
> >>> + "sunxi_lcd", &disp);
> >>> + if (!ret) {
> >>> + int mux;
> >>> +
> >>> + mux = 0;
> >>> +
> >>> + ret = sunxi_de2_init(dev, plat->base, VIDEO_BPP32, disp, mux,
> >>> + false);
> >>> + if (!ret) {
> >>> + video_set_flush_dcache(dev, 1);
> >>
> >> Why do you need to flush the dcache here?
> >
> > Copied from HDMI driver init. If it's not necessary why it's here for HDMI?
>
> DE2 is not cache aware, so CPU should flush dcache after updating
> framebuffer. If I remove this line, dcache isn't flushed when
> framebuffer is updated, and thus picture is a total mess (black
> background with some white stripes).
Ah, so the framebuffer is mapped cacheable. Ok, that's unusual, but
that works. Can you put that in a comment?
> >>> +static int sunxi_lcd_enable(struct udevice *dev, int bpp,
> >>> + const struct display_timing *edid)
> >>> +{
> >>> + struct sunxi_ccm_reg * const ccm =
> >>> + (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
> >>> + struct sunxi_lcdc_reg * const lcdc =
> >>> + (struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE;
> >>> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
> >>> + struct udevice *backlight;
> >>> + int clk_div, clk_double, ret;
> >>> +
> >>> + /* Reset off */
> >>> + setbits_le32(&ccm->ahb_reset1_cfg, 1 << AHB_RESET_OFFSET_LCD0);
> >>> +
> >>> + /* Clock on */
> >>> + setbits_le32(&ccm->ahb_gate1, 1 << AHB_GATE_OFFSET_LCD0);
> >>
> >> This has nothing to do with using a panel or not, it should be in
> >> lcdc_init().
> >
> > Why? We don't need neither take it out of reset nor turn the clock on
> > it if LCD is not used (e.g. HDMI-only case).
>
> I'm leaving it here. It's not necessary for HDMI, and it doesn't work
> without it for LCD.
I'm pretty sure it still needs to be done for HDMI. LCD0 is the TCON,
and the TCON is used for HDMI too.
> >>> + lcdc_init(lcdc);
> >>> + sunxi_lcdc_config_pinmux();
> >>
> >> This is already handled in sunxi_lcdc_tcon0_mode_set, why duplicate
> >> it?
> >
> > Because the one that sunxi_lcdc_tcon0_mode_set() calls is
> > DE1-specific. I don't want to split out that code that won't be used
> > by DE2 driver.
Then move out the common code. It's kind of weird though, since the
DE1 vs DE2 stuff is basically only for the layers part. The TCON is
always there, and is mostly the same. So you should be able to re-use
that with minor modifications.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170921/5ec0a32a/attachment.sig>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver
2017-09-21 6:51 ` Maxime Ripard
@ 2017-09-21 7:01 ` icenowy at aosc.io
2017-09-22 4:42 ` Vasily Khoruzhick
1 sibling, 0 replies; 18+ messages in thread
From: icenowy at aosc.io @ 2017-09-21 7:01 UTC (permalink / raw)
To: u-boot
在 2017-09-21 14:51，Maxime Ripard 写道：
> On Thu, Sep 21, 2017 at 05:33:36AM +0000, Vasily Khoruzhick wrote:
>> >>> + ret = uclass_find_device_by_name(UCLASS_DISPLAY,
>> >>> + "sunxi_lcd", &disp);
>> >>> + if (!ret) {
>> >>> + int mux;
>> >>> +
>> >>> + mux = 0;
>> >>> +
>> >>> + ret = sunxi_de2_init(dev, plat->base, VIDEO_BPP32, disp, mux,
>> >>> + false);
>> >>> + if (!ret) {
>> >>> + video_set_flush_dcache(dev, 1);
>> >>
>> >> Why do you need to flush the dcache here?
>> >
>> > Copied from HDMI driver init. If it's not necessary why it's here for HDMI?
>>
>> DE2 is not cache aware, so CPU should flush dcache after updating
>> framebuffer. If I remove this line, dcache isn't flushed when
>> framebuffer is updated, and thus picture is a total mess (black
>> background with some white stripes).
>
> Ah, so the framebuffer is mapped cacheable. Ok, that's unusual, but
> that works. Can you put that in a comment?
I think currently in U-Boot all DRAM is mapped cacheable.
>
>> >>> +static int sunxi_lcd_enable(struct udevice *dev, int bpp,
>> >>> + const struct display_timing *edid)
>> >>> +{
>> >>> + struct sunxi_ccm_reg * const ccm =
>> >>> + (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
>> >>> + struct sunxi_lcdc_reg * const lcdc =
>> >>> + (struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE;
>> >>> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
>> >>> + struct udevice *backlight;
>> >>> + int clk_div, clk_double, ret;
>> >>> +
>> >>> + /* Reset off */
>> >>> + setbits_le32(&ccm->ahb_reset1_cfg, 1 << AHB_RESET_OFFSET_LCD0);
>> >>> +
>> >>> + /* Clock on */
>> >>> + setbits_le32(&ccm->ahb_gate1, 1 << AHB_GATE_OFFSET_LCD0);
>> >>
>> >> This has nothing to do with using a panel or not, it should be in
>> >> lcdc_init().
>> >
>> > Why? We don't need neither take it out of reset nor turn the clock on
>> > it if LCD is not used (e.g. HDMI-only case).
>>
>> I'm leaving it here. It's not necessary for HDMI, and it doesn't work
>> without it for LCD.
>
> I'm pretty sure it still needs to be done for HDMI. LCD0 is the TCON,
> and the TCON is used for HDMI too.
All TCONs come with DE2 are single-channel, either channel0 or channel1.
On A64 TCON0 has channel0 and TCON1 has channel1.
>
>> >>> + lcdc_init(lcdc);
>> >>> + sunxi_lcdc_config_pinmux();
>> >>
>> >> This is already handled in sunxi_lcdc_tcon0_mode_set, why duplicate
>> >> it?
>> >
>> > Because the one that sunxi_lcdc_tcon0_mode_set() calls is
>> > DE1-specific. I don't want to split out that code that won't be used
>> > by DE2 driver.
>
> Then move out the common code. It's kind of weird though, since the
> DE1 vs DE2 stuff is basically only for the layers part. The TCON is
> always there, and is mostly the same. So you should be able to re-use
> that with minor modifications.
>
> Maxime
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver
2017-09-21 6:51 ` Maxime Ripard
2017-09-21 7:01 ` icenowy at aosc.io
@ 2017-09-22 4:42 ` Vasily Khoruzhick
2017-09-22 14:44 ` Maxime Ripard
1 sibling, 1 reply; 18+ messages in thread
From: Vasily Khoruzhick @ 2017-09-22 4:42 UTC (permalink / raw)
To: u-boot
Hi Maxime,
On Wed, Sep 20, 2017 at 11:51 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> On Thu, Sep 21, 2017 at 05:33:36AM +0000, Vasily Khoruzhick wrote:
>> >>> + ret = uclass_find_device_by_name(UCLASS_DISPLAY,
>> >>> + "sunxi_lcd", &disp);
>> >>> + if (!ret) {
>> >>> + int mux;
>> >>> +
>> >>> + mux = 0;
>> >>> +
>> >>> + ret = sunxi_de2_init(dev, plat->base, VIDEO_BPP32, disp, mux,
>> >>> + false);
>> >>> + if (!ret) {
>> >>> + video_set_flush_dcache(dev, 1);
>> >>
>> >> Why do you need to flush the dcache here?
>> >
>> > Copied from HDMI driver init. If it's not necessary why it's here for HDMI?
>>
>> DE2 is not cache aware, so CPU should flush dcache after updating
>> framebuffer. If I remove this line, dcache isn't flushed when
>> framebuffer is updated, and thus picture is a total mess (black
>> background with some white stripes).
>
> Ah, so the framebuffer is mapped cacheable. Ok, that's unusual, but
> that works. Can you put that in a comment?
OK.
>> >>> +static int sunxi_lcd_enable(struct udevice *dev, int bpp,
>> >>> + const struct display_timing *edid)
>> >>> +{
>> >>> + struct sunxi_ccm_reg * const ccm =
>> >>> + (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
>> >>> + struct sunxi_lcdc_reg * const lcdc =
>> >>> + (struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE;
>> >>> + struct sunxi_lcd_priv *priv = dev_get_priv(dev);
>> >>> + struct udevice *backlight;
>> >>> + int clk_div, clk_double, ret;
>> >>> +
>> >>> + /* Reset off */
>> >>> + setbits_le32(&ccm->ahb_reset1_cfg, 1 << AHB_RESET_OFFSET_LCD0);
>> >>> +
>> >>> + /* Clock on */
>> >>> + setbits_le32(&ccm->ahb_gate1, 1 << AHB_GATE_OFFSET_LCD0);
>> >>
>> >> This has nothing to do with using a panel or not, it should be in
>> >> lcdc_init().
>> >
>> > Why? We don't need neither take it out of reset nor turn the clock on
>> > it if LCD is not used (e.g. HDMI-only case).
>>
>> I'm leaving it here. It's not necessary for HDMI, and it doesn't work
>> without it for LCD.
>
> I'm pretty sure it still needs to be done for HDMI. LCD0 is the TCON,
> and the TCON is used for HDMI too.
I've already told you that I tried, and HDMI works fine without it,
but LCD doesn't.
Feel free to play with the code yourself if you don't believe me:
https://github.com/anarsoul/u-boot-pine64
>> >>> + lcdc_init(lcdc);
>> >>> + sunxi_lcdc_config_pinmux();
>> >>
>> >> This is already handled in sunxi_lcdc_tcon0_mode_set, why duplicate
>> >> it?
>> >
>> > Because the one that sunxi_lcdc_tcon0_mode_set() calls is
>> > DE1-specific. I don't want to split out that code that won't be used
>> > by DE2 driver.
>
> Then move out the common code. It's kind of weird though, since the
> DE1 vs DE2 stuff is basically only for the layers part. The TCON is
> always there, and is mostly the same. So you should be able to re-use
> that with minor modifications.
I'm not sure what common code you're talking about. I've already moved
out lcdc_pll_set(). Moving pinmux
configuration out into common code doesn't look reasonable. It's
different for A64 -- for A64 it configures
GPD(0)-GPD(21) as function, while for other SoCs it's GPD(18)-GPD(27)
or GPD(0)-GPD(27) depending
on SoC model. Anyway, pinmux configuration code for DE1 contains a
number of ifdef-s that are not necessary
for DE2 -- these SoCs don't have DE2 and thus won't be supported.
Do you have any other comments before I send v3?
Regards,
Vasily
>
> Maxime
>
> --
> Maxime Ripard, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver
2017-09-22 4:42 ` Vasily Khoruzhick
@ 2017-09-22 14:44 ` Maxime Ripard
2017-09-22 15:45 ` Vasily Khoruzhick
0 siblings, 1 reply; 18+ messages in thread
From: Maxime Ripard @ 2017-09-22 14:44 UTC (permalink / raw)
To: u-boot
On Fri, Sep 22, 2017 at 04:42:24AM +0000, Vasily Khoruzhick wrote:
> >> >>> + lcdc_init(lcdc);
> >> >>> + sunxi_lcdc_config_pinmux();
> >> >>
> >> >> This is already handled in sunxi_lcdc_tcon0_mode_set, why duplicate
> >> >> it?
> >> >
> >> > Because the one that sunxi_lcdc_tcon0_mode_set() calls is
> >> > DE1-specific. I don't want to split out that code that won't be used
> >> > by DE2 driver.
> >
> > Then move out the common code. It's kind of weird though, since the
> > DE1 vs DE2 stuff is basically only for the layers part. The TCON is
> > always there, and is mostly the same. So you should be able to re-use
> > that with minor modifications.
>
> I'm not sure what common code you're talking about. I've already moved
> out lcdc_pll_set(). Moving pinmux
> configuration out into common code doesn't look reasonable. It's
> different for A64 -- for A64 it configures
> GPD(0)-GPD(21) as function, while for other SoCs it's GPD(18)-GPD(27)
> or GPD(0)-GPD(27) depending
> on SoC model. Anyway, pinmux configuration code for DE1 contains a
> number of ifdef-s that are not necessary
> for DE2 -- these SoCs don't have DE2 and thus won't be supported.
Again, DE1 vs DE2 has nothing to do in the discussion
DE1 devices will look like this:
DE1 -> TCON -> HDMI / LCD / whatever -> pins
DE2 will be:
DE2 -> TCON -> HDMI / LCD / whatever -> pins
The only thing not in common between these two cases is the display
engine used. Everything else should be common (except for special
cases, like the HDMI controller itself that changed as well).
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170922/afe9ef2c/attachment.sig>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver
2017-09-22 14:44 ` Maxime Ripard
@ 2017-09-22 15:45 ` Vasily Khoruzhick
0 siblings, 0 replies; 18+ messages in thread
From: Vasily Khoruzhick @ 2017-09-22 15:45 UTC (permalink / raw)
To: u-boot
After discussing it with Maxime in IRC I decided to wait till pinctrl
driver for sunxi is ready.
Please kindly disregard this series.
Regards,
Vasily
On Fri, Sep 22, 2017 at 7:44 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> On Fri, Sep 22, 2017 at 04:42:24AM +0000, Vasily Khoruzhick wrote:
>> >> >>> + lcdc_init(lcdc);
>> >> >>> + sunxi_lcdc_config_pinmux();
>> >> >>
>> >> >> This is already handled in sunxi_lcdc_tcon0_mode_set, why duplicate
>> >> >> it?
>> >> >
>> >> > Because the one that sunxi_lcdc_tcon0_mode_set() calls is
>> >> > DE1-specific. I don't want to split out that code that won't be used
>> >> > by DE2 driver.
>> >
>> > Then move out the common code. It's kind of weird though, since the
>> > DE1 vs DE2 stuff is basically only for the layers part. The TCON is
>> > always there, and is mostly the same. So you should be able to re-use
>> > that with minor modifications.
>>
>> I'm not sure what common code you're talking about. I've already moved
>> out lcdc_pll_set(). Moving pinmux
>> configuration out into common code doesn't look reasonable. It's
>> different for A64 -- for A64 it configures
>> GPD(0)-GPD(21) as function, while for other SoCs it's GPD(18)-GPD(27)
>> or GPD(0)-GPD(27) depending
>> on SoC model. Anyway, pinmux configuration code for DE1 contains a
>> number of ifdef-s that are not necessary
>> for DE2 -- these SoCs don't have DE2 and thus won't be supported.
>
> Again, DE1 vs DE2 has nothing to do in the discussion
>
> DE1 devices will look like this:
> DE1 -> TCON -> HDMI / LCD / whatever -> pins
>
> DE2 will be:
> DE2 -> TCON -> HDMI / LCD / whatever -> pins
>
> The only thing not in common between these two cases is the display
> engine used. Everything else should be common (except for special
> cases, like the HDMI controller itself that changed as well).
>
> Maxime
>
> --
> Maxime Ripard, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 2/5] video: anx9804: split out registers definitions into a separate header
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 2/5] video: anx9804: split out registers definitions into a separate header Vasily Khoruzhick
@ 2017-10-05 18:44 ` André Przywara
0 siblings, 0 replies; 18+ messages in thread
From: André Przywara @ 2017-10-05 18:44 UTC (permalink / raw)
To: u-boot
Hi Vasily,
On 19/09/17 06:04, Vasily Khoruzhick wrote:
> This header will be used in anx6345 driver
In this case it shouldn't live in a generic include directory, as it
only contains private driver internals which are of no further use for
the rest of U-Boot. So you should move it into drivers/video at least
and include it with quotation marks.
But actually you can get rid of this whole patch, check my answer on the
next patch ...
Cheers,
Andre.
>
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
> ---
> drivers/video/anx9804.c | 54 +--------------------------
> include/anx98xx-edp.h | 98 +++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 99 insertions(+), 53 deletions(-)
> create mode 100644 include/anx98xx-edp.h
>
> diff --git a/drivers/video/anx9804.c b/drivers/video/anx9804.c
> index 37ad69a039..67f7da7d18 100755
> --- a/drivers/video/anx9804.c
> +++ b/drivers/video/anx9804.c
> @@ -12,61 +12,9 @@
>
> #include <common.h>
> #include <i2c.h>
> +#include <anx98xx-edp.h>
> #include "anx9804.h"
>
> -/* Registers at i2c address 0x38 */
> -
> -#define ANX9804_HDCP_CONTROL_0_REG 0x01
> -
> -#define ANX9804_SYS_CTRL2_REG 0x81
> -#define ANX9804_SYS_CTRL2_CHA_STA 0x04
> -
> -#define ANX9804_SYS_CTRL3_REG 0x82
> -#define ANX9804_SYS_CTRL3_VALID_CTRL BIT(0)
> -#define ANX9804_SYS_CTRL3_F_VALID BIT(1)
> -#define ANX9804_SYS_CTRL3_HPD_CTRL BIT(4)
> -#define ANX9804_SYS_CTRL3_F_HPD BIT(5)
> -
> -#define ANX9804_LINK_BW_SET_REG 0xa0
> -#define ANX9804_LANE_COUNT_SET_REG 0xa1
> -#define ANX9804_TRAINING_PTN_SET_REG 0xa2
> -#define ANX9804_TRAINING_LANE0_SET_REG 0xa3
> -#define ANX9804_TRAINING_LANE1_SET_REG 0xa4
> -#define ANX9804_TRAINING_LANE2_SET_REG 0xa5
> -#define ANX9804_TRAINING_LANE3_SET_REG 0xa6
> -
> -#define ANX9804_LINK_TRAINING_CTRL_REG 0xa8
> -#define ANX9804_LINK_TRAINING_CTRL_EN BIT(0)
> -
> -#define ANX9804_LINK_DEBUG_REG 0xb8
> -#define ANX9804_PLL_CTRL_REG 0xc7
> -#define ANX9804_ANALOG_POWER_DOWN_REG 0xc8
> -
> -/* Registers at i2c address 0x39 */
> -
> -#define ANX9804_DEV_IDH_REG 0x03
> -
> -#define ANX9804_POWERD_CTRL_REG 0x05
> -#define ANX9804_POWERD_AUDIO BIT(4)
> -
> -#define ANX9804_RST_CTRL_REG 0x06
> -
> -#define ANX9804_RST_CTRL2_REG 0x07
> -#define ANX9804_RST_CTRL2_AUX BIT(2)
> -#define ANX9804_RST_CTRL2_AC_MODE BIT(6)
> -
> -#define ANX9804_VID_CTRL1_REG 0x08
> -#define ANX9804_VID_CTRL1_VID_EN BIT(7)
> -#define ANX9804_VID_CTRL1_EDGE BIT(0)
> -
> -#define ANX9804_VID_CTRL2_REG 0x09
> -#define ANX9804_ANALOG_DEBUG_REG1 0xdc
> -#define ANX9804_ANALOG_DEBUG_REG3 0xde
> -#define ANX9804_PLL_FILTER_CTRL1 0xdf
> -#define ANX9804_PLL_FILTER_CTRL3 0xe1
> -#define ANX9804_PLL_FILTER_CTRL 0xe2
> -#define ANX9804_PLL_CTRL3 0xe6
> -
> /**
> * anx9804_init() - Init anx9804 parallel lcd to edp bridge chip
> *
> diff --git a/include/anx98xx-edp.h b/include/anx98xx-edp.h
> new file mode 100644
> index 0000000000..f7e8baa167
> --- /dev/null
> +++ b/include/anx98xx-edp.h
> @@ -0,0 +1,98 @@
> +/*
> + * Copyright (C) 2015 Hans de Goede <hdegoede@redhat.com>
> + * Copyright (C) 2017 Vasily Khoruzhick <anarsoul@gmail.com>
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +/* Registers at i2c address 0x38 */
> +
> +#define ANX9804_HDCP_CONTROL_0_REG 0x01
> +
> +#define ANX9804_SYS_CTRL1_REG 0x80
> +#define ANX9804_SYS_CTRL1_PD_IO 0x80
> +#define ANX9804_SYS_CTRL1_PD_VID 0x40
> +#define ANX9804_SYS_CTRL1_PD_LINK 0x20
> +#define ANX9804_SYS_CTRL1_PD_TOTAL 0x10
> +#define ANX9804_SYS_CTRL1_MODE_SEL 0x08
> +#define ANX9804_SYS_CTRL1_DET_STA 0x04
> +#define ANX9804_SYS_CTRL1_FORCE_DET 0x02
> +#define ANX9804_SYS_CTRL1_DET_CTRL 0x01
> +
> +#define ANX9804_SYS_CTRL2_REG 0x81
> +#define ANX9804_SYS_CTRL2_CHA_STA 0x04
> +
> +#define ANX9804_SYS_CTRL3_REG 0x82
> +#define ANX9804_SYS_CTRL3_VALID_CTRL BIT(0)
> +#define ANX9804_SYS_CTRL3_F_VALID BIT(1)
> +#define ANX9804_SYS_CTRL3_HPD_CTRL BIT(4)
> +#define ANX9804_SYS_CTRL3_F_HPD BIT(5)
> +
> +#define ANX9804_LINK_BW_SET_REG 0xa0
> +#define ANX9804_LANE_COUNT_SET_REG 0xa1
> +#define ANX9804_TRAINING_PTN_SET_REG 0xa2
> +#define ANX9804_TRAINING_LANE0_SET_REG 0xa3
> +#define ANX9804_TRAINING_LANE1_SET_REG 0xa4
> +#define ANX9804_TRAINING_LANE2_SET_REG 0xa5
> +#define ANX9804_TRAINING_LANE3_SET_REG 0xa6
> +
> +#define ANX9804_LINK_TRAINING_CTRL_REG 0xa8
> +#define ANX9804_LINK_TRAINING_CTRL_EN BIT(0)
> +
> +#define ANX9804_LINK_DEBUG_REG 0xb8
> +#define ANX9804_PLL_CTRL_REG 0xc7
> +#define ANX9804_ANALOG_POWER_DOWN_REG 0xc8
> +
> +#define ANX9804_AUX_CH_STA 0xe0
> +#define ANX9804_AUX_BUSY BIT(4)
> +#define ANX9804_AUX_STATUS_MASK 0x0f
> +
> +#define ANX9804_DP_AUX_RX_COMM 0xe3
> +#define ANX9804_AUX_RX_COMM_I2C_DEFER BIT(3)
> +#define ANX9804_AUX_RX_COMM_AUX_DEFER BIT(1)
> +
> +#define ANX9804_DP_AUX_CH_CTL_1 0xe5
> +#define ANX9804_AUX_LENGTH(x) (((x - 1) & 0x0f) << 4)
> +#define ANX9804_AUX_TX_COMM_MASK 0x0f
> +#define ANX9804_AUX_TX_COMM_DP_TRANSACTION BIT(3)
> +#define ANX9804_AUX_TX_COMM_MOT BIT(2)
> +#define ANX9804_AUX_TX_COMM_READ BIT(0)
> +
> +#define ANX9804_DP_AUX_ADDR_7_0 0xe6
> +#define ANX9804_DP_AUX_ADDR_15_8 0xe7
> +#define ANX9804_DP_AUX_ADDR_19_16 0xe8
> +
> +#define ANX9804_DP_AUX_CH_CTL_2 0xe9
> +#define ANX9804_ADDR_ONLY BIT(1)
> +#define ANX9804_AUX_EN BIT(0)
> +
> +#define ANX9804_BUF_DATA_0 0xf0
> +
> +/* Registers at i2c address 0x39 */
> +
> +#define ANX9804_DEV_IDH_REG 0x03
> +
> +#define ANX9804_POWERD_CTRL_REG 0x05
> +#define ANX9804_POWERD_AUDIO BIT(4)
> +
> +#define ANX9804_RST_CTRL_REG 0x06
> +
> +#define ANX9804_RST_CTRL2_REG 0x07
> +#define ANX9804_RST_CTRL2_AUX BIT(2)
> +#define ANX9804_RST_CTRL2_AC_MODE BIT(6)
> +
> +#define ANX9804_VID_CTRL1_REG 0x08
> +#define ANX9804_VID_CTRL1_VID_EN BIT(7)
> +#define ANX9804_VID_CTRL1_EDGE BIT(0)
> +
> +#define ANX9804_VID_CTRL2_REG 0x09
> +#define ANX9804_ANALOG_DEBUG_REG1 0xdc
> +#define ANX9804_ANALOG_DEBUG_REG3 0xde
> +#define ANX9804_PLL_FILTER_CTRL1 0xdf
> +#define ANX9804_PLL_FILTER_CTRL3 0xe1
> +#define ANX9804_PLL_FILTER_CTRL 0xe2
> +#define ANX9804_PLL_CTRL3 0xe6
> +
> +#define ANX9804_DP_INT_STA 0xf7
> +#define ANX9804_RPLY_RECEIV BIT(1)
> +#define ANX9804_AUX_ERR BIT(0)
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 3/5] video: add anx6345 DM driver
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 3/5] video: add anx6345 DM driver Vasily Khoruzhick
@ 2017-10-05 18:44 ` André Przywara
2017-10-05 19:08 ` Vasily Khoruzhick
0 siblings, 1 reply; 18+ messages in thread
From: André Przywara @ 2017-10-05 18:44 UTC (permalink / raw)
To: u-boot
On 19/09/17 06:04, Vasily Khoruzhick wrote:
> This is a eDP bridge similar to ANX9804, it allows to connect eDP panels
> to the chips that can output only parallel signal
Have you tried using the existing driver?
Icenowy did this some months ago[1], and she got away with quite a small
patch to support the ANX6345 as well:
https://github.com/Icenowy/u-boot/commit/354b24c2064ab4f1b13568f61ab24ea97294a16d
Cheers,
Andre.
[1] https://github.com/Icenowy/u-boot/commits/a64-pb-lcd
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
> ---
> drivers/video/bridge/Kconfig | 8 +
> drivers/video/bridge/Makefile | 1 +
> drivers/video/bridge/anx6345.c | 419 +++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 428 insertions(+)
> create mode 100644 drivers/video/bridge/anx6345.c
>
> diff --git a/drivers/video/bridge/Kconfig b/drivers/video/bridge/Kconfig
> index 2a3b6c4bee..765f7380b8 100644
> --- a/drivers/video/bridge/Kconfig
> +++ b/drivers/video/bridge/Kconfig
> @@ -25,3 +25,11 @@ config VIDEO_BRIDGE_NXP_PTN3460
> 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.
> +
> +config VIDEO_BRIDGE_ANALOGIX_ANX6345
> + bool "Support Analogix ANX6345 RGB->DP bridge"
> + depends on VIDEO_BRIDGE
> + select DM_I2C
> + help
> + The Analogix ANX6345 is RGB-to-DP converter. It enables an eDP LCD
> + panel to be connected to an parallel LCD interface.
> diff --git a/drivers/video/bridge/Makefile b/drivers/video/bridge/Makefile
> index ce731fa4ca..2a746c6f8b 100644
> --- a/drivers/video/bridge/Makefile
> +++ b/drivers/video/bridge/Makefile
> @@ -7,3 +7,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
> +obj-$(CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345) += anx6345.o
> diff --git a/drivers/video/bridge/anx6345.c b/drivers/video/bridge/anx6345.c
> new file mode 100644
> index 0000000000..6bac9a51a9
> --- /dev/null
> +++ b/drivers/video/bridge/anx6345.c
> @@ -0,0 +1,419 @@
> +/*
> + * Copyright (C) 2017 Vasily Khoruzhick <anarsoul@gmail.com>
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +#include <common.h>
> +#include <dm.h>
> +#include <errno.h>
> +#include <i2c.h>
> +#include <edid.h>
> +#include <video_bridge.h>
> +#include <anx98xx-edp.h>
> +
> +#define DP_MAX_LINK_RATE 0x001
> +#define DP_MAX_LANE_COUNT 0x002
> +#define DP_MAX_LANE_COUNT_MASK 0x1f
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +struct anx6345_priv {
> + u8 edid[EDID_SIZE];
> +};
> +
> +static int anx6345_write(struct udevice *dev, unsigned addr_off,
> + unsigned char reg_addr, unsigned char value)
> +{
> + uint8_t buf[2];
> + struct i2c_msg msg;
> + int ret;
> +
> + msg.addr = addr_off;
> + msg.flags = 0;
> + buf[0] = reg_addr;
> + buf[1] = value;
> + msg.buf = buf;
> + msg.len = 2;
> + ret = dm_i2c_xfer(dev, &msg, 1);
> + if (ret) {
> + debug("%s: write failed, reg=%#x, value=%#x, ret=%d\n",
> + __func__, reg_addr, value, ret);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +static int anx6345_read(struct udevice *dev, unsigned addr_off,
> + unsigned char reg_addr, unsigned char *value)
> +{
> + uint8_t addr, val;
> + struct i2c_msg msg[2];
> + int ret;
> +
> + msg[0].addr = addr_off;
> + msg[0].flags = 0;
> + addr = reg_addr;
> + msg[0].buf = &addr;
> + msg[0].len = 1;
> + msg[1].addr = addr_off;
> + msg[1].flags = I2C_M_RD;
> + msg[1].buf = &val;
> + msg[1].len = 1;
> + ret = dm_i2c_xfer(dev, msg, 2);
> + if (ret) {
> + debug("%s: read failed, reg=%.2x, value=%p, ret=%d\n",
> + __func__, (int)reg_addr, value, ret);
> + return ret;
> + }
> + *value = val;
> +
> + return 0;
> +}
> +
> +static int anx6345_write_r0(struct udevice *dev, unsigned char reg_addr,
> + unsigned char value)
> +{
> + struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
> + return anx6345_write(dev, chip->chip_addr, reg_addr, value);
> +}
> +
> +static int anx6345_read_r0(struct udevice *dev, unsigned char reg_addr,
> + unsigned char *value)
> +{
> + struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
> + return anx6345_read(dev, chip->chip_addr, reg_addr, value);
> +}
> +
> +static int anx6345_write_r1(struct udevice *dev, unsigned char reg_addr,
> + unsigned char value)
> +{
> + struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
> + return anx6345_write(dev, chip->chip_addr + 1, reg_addr, value);
> +}
> +
> +static int anx6345_read_r1(struct udevice *dev, unsigned char reg_addr,
> + unsigned char *value)
> +{
> + struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
> + return anx6345_read(dev, chip->chip_addr + 1, reg_addr, value);
> +}
> +
> +static int anx6345_set_backlight(struct udevice *dev, int percent)
> +{
> + return -ENOSYS;
> +}
> +
> +static int anx6345_aux_wait(struct udevice *dev)
> +{
> + int ret = -ETIMEDOUT;
> + u8 v;
> + int retries = 1000;
> + do {
> + anx6345_read_r0(dev, ANX9804_DP_AUX_CH_CTL_2, &v);
> + if (!(v & ANX9804_AUX_EN)) {
> + ret = 0;
> + break;
> + }
> + udelay(100);
> + } while (retries--);
> +
> + if (ret) {
> + debug("%s: timed out waiting for AUX_EN to clear\n", __func__);
> + return ret;
> + }
> +
> + ret = -ETIMEDOUT;
> + retries = 1000;
> + do {
> + anx6345_read_r1(dev, ANX9804_DP_INT_STA, &v);
> + if (v & ANX9804_RPLY_RECEIV) {
> + ret = 0;
> + break;
> + }
> + udelay(100);
> + } while (retries--);
> +
> + if (ret) {
> + debug("%s: timed out waiting to receive reply\n", __func__);
> + return ret;
> + }
> +
> + /* Clear RPLY_RECEIV bit */
> + anx6345_write_r1(dev, ANX9804_DP_INT_STA, v);
> +
> + anx6345_read_r0(dev, ANX9804_AUX_CH_STA, &v);
> + if ((v & ANX9804_AUX_STATUS_MASK) != 0) {
> + debug("AUX status: %d\n", v & ANX9804_AUX_STATUS_MASK);
> + ret = -EIO;
> + }
> +
> + return ret;
> +}
> +
> +static void anx6345_aux_addr(struct udevice *dev, u32 addr)
> +{
> + u8 val;
> +
> + val = addr & 0xff;
> + anx6345_write_r0(dev, ANX9804_DP_AUX_ADDR_7_0, val);
> + val = (addr >> 8) & 0xff;
> + anx6345_write_r0(dev, ANX9804_DP_AUX_ADDR_15_8, val);
> + val = (addr >> 16) & 0x0f;
> + anx6345_write_r0(dev, ANX9804_DP_AUX_ADDR_19_16, val);
> +}
> +
> +static int anx6345_aux_transfer(struct udevice *dev, u8 req, u32 addr, u8 *buf, size_t len)
> +{
> + int i, ret;
> + u8 ctrl1 = req;
> + u8 ctrl2 = ANX9804_AUX_EN;
> +
> + if (len > 16)
> + return -E2BIG;
> +
> + if (len)
> + ctrl1 |= ANX9804_AUX_LENGTH(len);
> + else
> + ctrl2 |= ANX9804_ADDR_ONLY;
> +
> + if (len && !(req & ANX9804_AUX_TX_COMM_READ)) {
> + for (i = 0; i < len; i++)
> + anx6345_write_r0(dev, ANX9804_BUF_DATA_0 + i, buf[i]);
> + }
> +
> + anx6345_aux_addr(dev, addr);
> + anx6345_write_r0(dev, ANX9804_DP_AUX_CH_CTL_1, ctrl1);
> + anx6345_write_r0(dev, ANX9804_DP_AUX_CH_CTL_2, ctrl2);
> + ret = anx6345_aux_wait(dev);
> + if (ret) {
> + debug("AUX transaction timed out\n");
> + return ret;
> + }
> +
> + if (len && (req & ANX9804_AUX_TX_COMM_READ)) {
> + for (i = 0; i < len; i++)
> + anx6345_read_r0(dev, ANX9804_BUF_DATA_0 + i, &buf[i]);
> + }
> +
> + return 0;
> +
> +}
> +
> +static int anx6345_read_aux_i2c(struct udevice *dev, u8 chip_addr,
> + u8 offset,
> + size_t count,
> + u8 *buf)
> +{
> + int i, ret;
> + size_t cur_cnt;
> + u8 cur_offset;
> + for (i = 0; i < count; i += 16) {
> + cur_cnt = (count - i) > 16 ? 16 : count - i;
> + cur_offset = offset + i;
> + ret = anx6345_aux_transfer(dev, ANX9804_AUX_TX_COMM_MOT,
> + chip_addr, &cur_offset, 1);
> + if (ret) {
> + debug("%s: failed to set i2c offset: %d\n", __func__, ret);
> + return ret;
> + }
> + ret = anx6345_aux_transfer(dev, ANX9804_AUX_TX_COMM_READ,
> + chip_addr, buf + i, cur_cnt);
> + if (ret) {
> + debug("%s: failed to read from i2c device: %d\n", __func__, ret);
> + return ret;
> + }
> + }
> +
> + return 0;
> +}
> +
> +static int anx6345_read_dpcd(struct udevice *dev, u32 reg, u8 *val)
> +{
> + int ret;
> +
> + ret = anx6345_aux_transfer(dev,
> + ANX9804_AUX_TX_COMM_READ |
> + ANX9804_AUX_TX_COMM_DP_TRANSACTION,
> + reg, val, 1);
> + if (ret) {
> + debug ("Failed to read DPCD\n");
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +static int anx6345_read_edid(struct udevice *dev, u8 *buf, int size)
> +{
> + struct anx6345_priv *priv = dev_get_priv(dev);
> +
> + if (size > EDID_SIZE)
> + size = EDID_SIZE;
> + memcpy(buf, priv->edid, size);
> +
> + return size;
> +}
> +
> +static int anx6345_attach(struct udevice *dev)
> +{
> + /* No-op */
> + return 0;
> +}
> +
> +static int anx6345_enable(struct udevice *dev)
> +{
> + u8 chipid, colordepth, lanes, data_rate, c;
> + int ret, i, bpp;
> + struct display_timing timing;
> + struct anx6345_priv *priv = dev_get_priv(dev);
> +
> + /* Deassert reset and enable power */
> + ret = video_bridge_set_active(dev, true);
> + if (ret)
> + return ret;
> +
> + /* Reset */
> + anx6345_write_r1(dev, ANX9804_RST_CTRL_REG, 1);
> + mdelay(100);
> + anx6345_write_r1(dev, ANX9804_RST_CTRL_REG, 0);
> +
> + /* Write 0 to the powerdown reg (powerup everything) */
> + anx6345_write_r1(dev, ANX9804_POWERD_CTRL_REG, 0);
> +
> + ret = anx6345_read_r1(dev, ANX9804_DEV_IDH_REG, &chipid);
> + if (ret)
> + debug("%s: read id failed: %d\n", __func__, ret);
> +
> + switch (chipid) {
> + case 0x63:
> + debug("ANX63xx detected.\n");
> + break;
> + default:
> + debug("Error anx6345 chipid mismatch: %.2x\n", (int)chipid);
> + return -ENODEV;
> + }
> +
> + for (i = 0; i < 100; i++) {
> + anx6345_read_r0(dev, ANX9804_SYS_CTRL2_REG, &c);
> + anx6345_write_r0(dev, ANX9804_SYS_CTRL2_REG, c);
> + anx6345_read_r0(dev, ANX9804_SYS_CTRL2_REG, &c);
> + if ((c & ANX9804_SYS_CTRL2_CHA_STA) == 0)
> + break;
> +
> + mdelay(5);
> + }
> + if (i == 100)
> + debug("Error anx6345 clock is not stable\n");
> +
> + /* Set a bunch of analog related register values */
> + anx6345_write_r0(dev, ANX9804_PLL_CTRL_REG, 0x00);
> + anx6345_write_r1(dev, ANX9804_ANALOG_DEBUG_REG1, 0x70);
> + anx6345_write_r0(dev, ANX9804_LINK_DEBUG_REG, 0x30);
> +
> + /* Force HPD */
> + anx6345_write_r0(dev, ANX9804_SYS_CTRL3_REG,
> + ANX9804_SYS_CTRL3_F_HPD | ANX9804_SYS_CTRL3_HPD_CTRL);
> +
> + /* Power up and configure lanes */
> + anx6345_write_r0(dev, ANX9804_ANALOG_POWER_DOWN_REG, 0x00);
> + anx6345_write_r0(dev, ANX9804_TRAINING_LANE0_SET_REG, 0x00);
> + anx6345_write_r0(dev, ANX9804_TRAINING_LANE1_SET_REG, 0x00);
> + anx6345_write_r0(dev, ANX9804_TRAINING_LANE2_SET_REG, 0x00);
> + anx6345_write_r0(dev, ANX9804_TRAINING_LANE3_SET_REG, 0x00);
> +
> + /* Reset AUX CH */
> + anx6345_write_r1(dev, ANX9804_RST_CTRL2_REG,
> + ANX9804_RST_CTRL2_AUX);
> + anx6345_write_r1(dev, ANX9804_RST_CTRL2_REG, 0);
> +
> + /* Powerdown audio and some other unused bits */
> + anx6345_write_r1(dev, ANX9804_POWERD_CTRL_REG, ANX9804_POWERD_AUDIO);
> + anx6345_write_r0(dev, ANX9804_HDCP_CONTROL_0_REG, 0x00);
> + anx6345_write_r0(dev, 0xa7, 0x00);
> +
> + anx6345_read_aux_i2c(dev, 0x50, 0x0, EDID_SIZE, priv->edid);
> + if (edid_get_timing(priv->edid, EDID_SIZE, &timing, &bpp) != 0) {
> + debug("Failed to parse EDID\n");
> + return -EIO;
> + }
> + debug("%s: panel found: %dx%d, bpp %d\n", __func__,
> + timing.hactive.typ, timing.vactive.typ,
> + bpp);
> + if (bpp == 6)
> + colordepth = 0x00; /* 6 bit */
> + else
> + colordepth = 0x10; /* 8 bit */
> + anx6345_write_r1(dev, ANX9804_VID_CTRL2_REG, colordepth);
> +
> + if (anx6345_read_dpcd(dev, DP_MAX_LINK_RATE, &data_rate)) {
> + debug("%s: Failed to DP_MAX_LINK_RATE\n", __func__);
> + return -EIO;
> + }
> + debug("%s: data_rate: %d\n", __func__, (int)data_rate);
> + if (anx6345_read_dpcd(dev, DP_MAX_LANE_COUNT, &lanes)) {
> + debug("%s: Failed to read DP_MAX_LANE_COUNT\n", __func__);
> + return -EIO;
> + }
> + lanes &= DP_MAX_LANE_COUNT_MASK;
> + debug("%s: lanes: %d\n", __func__, (int)lanes);
> +
> + /* Set data-rate / lanes */
> + anx6345_write_r0(dev, ANX9804_LINK_BW_SET_REG, data_rate);
> + anx6345_write_r0(dev, ANX9804_LANE_COUNT_SET_REG, lanes);
> +
> + /* Link training */
> + anx6345_write_r0(dev, ANX9804_LINK_TRAINING_CTRL_REG,
> + ANX9804_LINK_TRAINING_CTRL_EN);
> + mdelay(5);
> + for (i = 0; i < 100; i++) {
> + anx6345_read_r0(dev, ANX9804_LINK_TRAINING_CTRL_REG, &c);
> + if ((chipid == 0x63) && (c & 0x80) == 0)
> + break;
> +
> + mdelay(5);
> + }
> + if(i == 100) {
> + debug("Error anx6345 link training timeout\n");
> + return -ENODEV;
> + }
> +
> + /* Enable */
> + anx6345_write_r1(dev, ANX9804_VID_CTRL1_REG,
> + ANX9804_VID_CTRL1_VID_EN | ANX9804_VID_CTRL1_EDGE);
> + /* Force stream valid */
> + anx6345_write_r0(dev, ANX9804_SYS_CTRL3_REG,
> + ANX9804_SYS_CTRL3_F_HPD | ANX9804_SYS_CTRL3_HPD_CTRL |
> + ANX9804_SYS_CTRL3_F_VALID | ANX9804_SYS_CTRL3_VALID_CTRL);
> +
> + return 0;
> +}
> +
> +static int anx6345_probe(struct udevice *dev)
> +{
> + if (device_get_uclass_id(dev->parent) != UCLASS_I2C)
> + return -EPROTONOSUPPORT;
> +
> + return anx6345_enable(dev);
> +}
> +
> +struct video_bridge_ops anx6345_ops = {
> + .attach = anx6345_attach,
> + .set_backlight = anx6345_set_backlight,
> + .read_edid = anx6345_read_edid,
> +};
> +
> +static const struct udevice_id anx6345_ids[] = {
> + { .compatible = "analogix,anx6345", },
> + { }
> +};
> +
> +U_BOOT_DRIVER(analogix_anx6345) = {
> + .name = "analogix_anx6345",
> + .id = UCLASS_VIDEO_BRIDGE,
> + .of_match = anx6345_ids,
> + .probe = anx6345_probe,
> + .ops = &anx6345_ops,
> + .priv_auto_alloc_size = sizeof(struct anx6345_priv),
> +};
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [RESEND PATCH 3/5] video: add anx6345 DM driver
2017-10-05 18:44 ` André Przywara
@ 2017-10-05 19:08 ` Vasily Khoruzhick
0 siblings, 0 replies; 18+ messages in thread
From: Vasily Khoruzhick @ 2017-10-05 19:08 UTC (permalink / raw)
To: u-boot
Hi André,
On Thu, Oct 5, 2017 at 11:44 AM, André Przywara <andre.przywara@arm.com> wrote:
> On 19/09/17 06:04, Vasily Khoruzhick wrote:
>> This is a eDP bridge similar to ANX9804, it allows to connect eDP panels
>> to the chips that can output only parallel signal
>
> Have you tried using the existing driver?
> Icenowy did this some months ago[1], and she got away with quite a small
> patch to support the ANX6345 as well:
>
> https://github.com/Icenowy/u-boot/commit/354b24c2064ab4f1b13568f61ab24ea97294a16d
Existing ANX9804 driver is very primitive and moreover it doesn't
support DM. Please note that
my driver can read EDID and DPCD and thus is more flexible if you
compare it to the old
driver -- no hardcoded modes, lane configuration, etc. Unfortunately I
don't have anything with
ANX9804, so I can't make my ANX6345 driver compatible with ANX9804.
Regards,
Vasily
> Cheers,
> Andre.
>
> [1] https://github.com/Icenowy/u-boot/commits/a64-pb-lcd
>
>> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
>> ---
>> drivers/video/bridge/Kconfig | 8 +
>> drivers/video/bridge/Makefile | 1 +
>> drivers/video/bridge/anx6345.c | 419 +++++++++++++++++++++++++++++++++++++++++
>> 3 files changed, 428 insertions(+)
>> create mode 100644 drivers/video/bridge/anx6345.c
>>
>> diff --git a/drivers/video/bridge/Kconfig b/drivers/video/bridge/Kconfig
>> index 2a3b6c4bee..765f7380b8 100644
>> --- a/drivers/video/bridge/Kconfig
>> +++ b/drivers/video/bridge/Kconfig
>> @@ -25,3 +25,11 @@ config VIDEO_BRIDGE_NXP_PTN3460
>> 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.
>> +
>> +config VIDEO_BRIDGE_ANALOGIX_ANX6345
>> + bool "Support Analogix ANX6345 RGB->DP bridge"
>> + depends on VIDEO_BRIDGE
>> + select DM_I2C
>> + help
>> + The Analogix ANX6345 is RGB-to-DP converter. It enables an eDP LCD
>> + panel to be connected to an parallel LCD interface.
>> diff --git a/drivers/video/bridge/Makefile b/drivers/video/bridge/Makefile
>> index ce731fa4ca..2a746c6f8b 100644
>> --- a/drivers/video/bridge/Makefile
>> +++ b/drivers/video/bridge/Makefile
>> @@ -7,3 +7,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
>> +obj-$(CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345) += anx6345.o
>> diff --git a/drivers/video/bridge/anx6345.c b/drivers/video/bridge/anx6345.c
>> new file mode 100644
>> index 0000000000..6bac9a51a9
>> --- /dev/null
>> +++ b/drivers/video/bridge/anx6345.c
>> @@ -0,0 +1,419 @@
>> +/*
>> + * Copyright (C) 2017 Vasily Khoruzhick <anarsoul@gmail.com>
>> + *
>> + * SPDX-License-Identifier: GPL-2.0+
>> + */
>> +
>> +#include <common.h>
>> +#include <dm.h>
>> +#include <errno.h>
>> +#include <i2c.h>
>> +#include <edid.h>
>> +#include <video_bridge.h>
>> +#include <anx98xx-edp.h>
>> +
>> +#define DP_MAX_LINK_RATE 0x001
>> +#define DP_MAX_LANE_COUNT 0x002
>> +#define DP_MAX_LANE_COUNT_MASK 0x1f
>> +
>> +DECLARE_GLOBAL_DATA_PTR;
>> +
>> +struct anx6345_priv {
>> + u8 edid[EDID_SIZE];
>> +};
>> +
>> +static int anx6345_write(struct udevice *dev, unsigned addr_off,
>> + unsigned char reg_addr, unsigned char value)
>> +{
>> + uint8_t buf[2];
>> + struct i2c_msg msg;
>> + int ret;
>> +
>> + msg.addr = addr_off;
>> + msg.flags = 0;
>> + buf[0] = reg_addr;
>> + buf[1] = value;
>> + msg.buf = buf;
>> + msg.len = 2;
>> + ret = dm_i2c_xfer(dev, &msg, 1);
>> + if (ret) {
>> + debug("%s: write failed, reg=%#x, value=%#x, ret=%d\n",
>> + __func__, reg_addr, value, ret);
>> + return ret;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int anx6345_read(struct udevice *dev, unsigned addr_off,
>> + unsigned char reg_addr, unsigned char *value)
>> +{
>> + uint8_t addr, val;
>> + struct i2c_msg msg[2];
>> + int ret;
>> +
>> + msg[0].addr = addr_off;
>> + msg[0].flags = 0;
>> + addr = reg_addr;
>> + msg[0].buf = &addr;
>> + msg[0].len = 1;
>> + msg[1].addr = addr_off;
>> + msg[1].flags = I2C_M_RD;
>> + msg[1].buf = &val;
>> + msg[1].len = 1;
>> + ret = dm_i2c_xfer(dev, msg, 2);
>> + if (ret) {
>> + debug("%s: read failed, reg=%.2x, value=%p, ret=%d\n",
>> + __func__, (int)reg_addr, value, ret);
>> + return ret;
>> + }
>> + *value = val;
>> +
>> + return 0;
>> +}
>> +
>> +static int anx6345_write_r0(struct udevice *dev, unsigned char reg_addr,
>> + unsigned char value)
>> +{
>> + struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
>> + return anx6345_write(dev, chip->chip_addr, reg_addr, value);
>> +}
>> +
>> +static int anx6345_read_r0(struct udevice *dev, unsigned char reg_addr,
>> + unsigned char *value)
>> +{
>> + struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
>> + return anx6345_read(dev, chip->chip_addr, reg_addr, value);
>> +}
>> +
>> +static int anx6345_write_r1(struct udevice *dev, unsigned char reg_addr,
>> + unsigned char value)
>> +{
>> + struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
>> + return anx6345_write(dev, chip->chip_addr + 1, reg_addr, value);
>> +}
>> +
>> +static int anx6345_read_r1(struct udevice *dev, unsigned char reg_addr,
>> + unsigned char *value)
>> +{
>> + struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
>> + return anx6345_read(dev, chip->chip_addr + 1, reg_addr, value);
>> +}
>> +
>> +static int anx6345_set_backlight(struct udevice *dev, int percent)
>> +{
>> + return -ENOSYS;
>> +}
>> +
>> +static int anx6345_aux_wait(struct udevice *dev)
>> +{
>> + int ret = -ETIMEDOUT;
>> + u8 v;
>> + int retries = 1000;
>> + do {
>> + anx6345_read_r0(dev, ANX9804_DP_AUX_CH_CTL_2, &v);
>> + if (!(v & ANX9804_AUX_EN)) {
>> + ret = 0;
>> + break;
>> + }
>> + udelay(100);
>> + } while (retries--);
>> +
>> + if (ret) {
>> + debug("%s: timed out waiting for AUX_EN to clear\n", __func__);
>> + return ret;
>> + }
>> +
>> + ret = -ETIMEDOUT;
>> + retries = 1000;
>> + do {
>> + anx6345_read_r1(dev, ANX9804_DP_INT_STA, &v);
>> + if (v & ANX9804_RPLY_RECEIV) {
>> + ret = 0;
>> + break;
>> + }
>> + udelay(100);
>> + } while (retries--);
>> +
>> + if (ret) {
>> + debug("%s: timed out waiting to receive reply\n", __func__);
>> + return ret;
>> + }
>> +
>> + /* Clear RPLY_RECEIV bit */
>> + anx6345_write_r1(dev, ANX9804_DP_INT_STA, v);
>> +
>> + anx6345_read_r0(dev, ANX9804_AUX_CH_STA, &v);
>> + if ((v & ANX9804_AUX_STATUS_MASK) != 0) {
>> + debug("AUX status: %d\n", v & ANX9804_AUX_STATUS_MASK);
>> + ret = -EIO;
>> + }
>> +
>> + return ret;
>> +}
>> +
>> +static void anx6345_aux_addr(struct udevice *dev, u32 addr)
>> +{
>> + u8 val;
>> +
>> + val = addr & 0xff;
>> + anx6345_write_r0(dev, ANX9804_DP_AUX_ADDR_7_0, val);
>> + val = (addr >> 8) & 0xff;
>> + anx6345_write_r0(dev, ANX9804_DP_AUX_ADDR_15_8, val);
>> + val = (addr >> 16) & 0x0f;
>> + anx6345_write_r0(dev, ANX9804_DP_AUX_ADDR_19_16, val);
>> +}
>> +
>> +static int anx6345_aux_transfer(struct udevice *dev, u8 req, u32 addr, u8 *buf, size_t len)
>> +{
>> + int i, ret;
>> + u8 ctrl1 = req;
>> + u8 ctrl2 = ANX9804_AUX_EN;
>> +
>> + if (len > 16)
>> + return -E2BIG;
>> +
>> + if (len)
>> + ctrl1 |= ANX9804_AUX_LENGTH(len);
>> + else
>> + ctrl2 |= ANX9804_ADDR_ONLY;
>> +
>> + if (len && !(req & ANX9804_AUX_TX_COMM_READ)) {
>> + for (i = 0; i < len; i++)
>> + anx6345_write_r0(dev, ANX9804_BUF_DATA_0 + i, buf[i]);
>> + }
>> +
>> + anx6345_aux_addr(dev, addr);
>> + anx6345_write_r0(dev, ANX9804_DP_AUX_CH_CTL_1, ctrl1);
>> + anx6345_write_r0(dev, ANX9804_DP_AUX_CH_CTL_2, ctrl2);
>> + ret = anx6345_aux_wait(dev);
>> + if (ret) {
>> + debug("AUX transaction timed out\n");
>> + return ret;
>> + }
>> +
>> + if (len && (req & ANX9804_AUX_TX_COMM_READ)) {
>> + for (i = 0; i < len; i++)
>> + anx6345_read_r0(dev, ANX9804_BUF_DATA_0 + i, &buf[i]);
>> + }
>> +
>> + return 0;
>> +
>> +}
>> +
>> +static int anx6345_read_aux_i2c(struct udevice *dev, u8 chip_addr,
>> + u8 offset,
>> + size_t count,
>> + u8 *buf)
>> +{
>> + int i, ret;
>> + size_t cur_cnt;
>> + u8 cur_offset;
>> + for (i = 0; i < count; i += 16) {
>> + cur_cnt = (count - i) > 16 ? 16 : count - i;
>> + cur_offset = offset + i;
>> + ret = anx6345_aux_transfer(dev, ANX9804_AUX_TX_COMM_MOT,
>> + chip_addr, &cur_offset, 1);
>> + if (ret) {
>> + debug("%s: failed to set i2c offset: %d\n", __func__, ret);
>> + return ret;
>> + }
>> + ret = anx6345_aux_transfer(dev, ANX9804_AUX_TX_COMM_READ,
>> + chip_addr, buf + i, cur_cnt);
>> + if (ret) {
>> + debug("%s: failed to read from i2c device: %d\n", __func__, ret);
>> + return ret;
>> + }
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int anx6345_read_dpcd(struct udevice *dev, u32 reg, u8 *val)
>> +{
>> + int ret;
>> +
>> + ret = anx6345_aux_transfer(dev,
>> + ANX9804_AUX_TX_COMM_READ |
>> + ANX9804_AUX_TX_COMM_DP_TRANSACTION,
>> + reg, val, 1);
>> + if (ret) {
>> + debug ("Failed to read DPCD\n");
>> + return ret;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int anx6345_read_edid(struct udevice *dev, u8 *buf, int size)
>> +{
>> + struct anx6345_priv *priv = dev_get_priv(dev);
>> +
>> + if (size > EDID_SIZE)
>> + size = EDID_SIZE;
>> + memcpy(buf, priv->edid, size);
>> +
>> + return size;
>> +}
>> +
>> +static int anx6345_attach(struct udevice *dev)
>> +{
>> + /* No-op */
>> + return 0;
>> +}
>> +
>> +static int anx6345_enable(struct udevice *dev)
>> +{
>> + u8 chipid, colordepth, lanes, data_rate, c;
>> + int ret, i, bpp;
>> + struct display_timing timing;
>> + struct anx6345_priv *priv = dev_get_priv(dev);
>> +
>> + /* Deassert reset and enable power */
>> + ret = video_bridge_set_active(dev, true);
>> + if (ret)
>> + return ret;
>> +
>> + /* Reset */
>> + anx6345_write_r1(dev, ANX9804_RST_CTRL_REG, 1);
>> + mdelay(100);
>> + anx6345_write_r1(dev, ANX9804_RST_CTRL_REG, 0);
>> +
>> + /* Write 0 to the powerdown reg (powerup everything) */
>> + anx6345_write_r1(dev, ANX9804_POWERD_CTRL_REG, 0);
>> +
>> + ret = anx6345_read_r1(dev, ANX9804_DEV_IDH_REG, &chipid);
>> + if (ret)
>> + debug("%s: read id failed: %d\n", __func__, ret);
>> +
>> + switch (chipid) {
>> + case 0x63:
>> + debug("ANX63xx detected.\n");
>> + break;
>> + default:
>> + debug("Error anx6345 chipid mismatch: %.2x\n", (int)chipid);
>> + return -ENODEV;
>> + }
>> +
>> + for (i = 0; i < 100; i++) {
>> + anx6345_read_r0(dev, ANX9804_SYS_CTRL2_REG, &c);
>> + anx6345_write_r0(dev, ANX9804_SYS_CTRL2_REG, c);
>> + anx6345_read_r0(dev, ANX9804_SYS_CTRL2_REG, &c);
>> + if ((c & ANX9804_SYS_CTRL2_CHA_STA) == 0)
>> + break;
>> +
>> + mdelay(5);
>> + }
>> + if (i == 100)
>> + debug("Error anx6345 clock is not stable\n");
>> +
>> + /* Set a bunch of analog related register values */
>> + anx6345_write_r0(dev, ANX9804_PLL_CTRL_REG, 0x00);
>> + anx6345_write_r1(dev, ANX9804_ANALOG_DEBUG_REG1, 0x70);
>> + anx6345_write_r0(dev, ANX9804_LINK_DEBUG_REG, 0x30);
>> +
>> + /* Force HPD */
>> + anx6345_write_r0(dev, ANX9804_SYS_CTRL3_REG,
>> + ANX9804_SYS_CTRL3_F_HPD | ANX9804_SYS_CTRL3_HPD_CTRL);
>> +
>> + /* Power up and configure lanes */
>> + anx6345_write_r0(dev, ANX9804_ANALOG_POWER_DOWN_REG, 0x00);
>> + anx6345_write_r0(dev, ANX9804_TRAINING_LANE0_SET_REG, 0x00);
>> + anx6345_write_r0(dev, ANX9804_TRAINING_LANE1_SET_REG, 0x00);
>> + anx6345_write_r0(dev, ANX9804_TRAINING_LANE2_SET_REG, 0x00);
>> + anx6345_write_r0(dev, ANX9804_TRAINING_LANE3_SET_REG, 0x00);
>> +
>> + /* Reset AUX CH */
>> + anx6345_write_r1(dev, ANX9804_RST_CTRL2_REG,
>> + ANX9804_RST_CTRL2_AUX);
>> + anx6345_write_r1(dev, ANX9804_RST_CTRL2_REG, 0);
>> +
>> + /* Powerdown audio and some other unused bits */
>> + anx6345_write_r1(dev, ANX9804_POWERD_CTRL_REG, ANX9804_POWERD_AUDIO);
>> + anx6345_write_r0(dev, ANX9804_HDCP_CONTROL_0_REG, 0x00);
>> + anx6345_write_r0(dev, 0xa7, 0x00);
>> +
>> + anx6345_read_aux_i2c(dev, 0x50, 0x0, EDID_SIZE, priv->edid);
>> + if (edid_get_timing(priv->edid, EDID_SIZE, &timing, &bpp) != 0) {
>> + debug("Failed to parse EDID\n");
>> + return -EIO;
>> + }
>> + debug("%s: panel found: %dx%d, bpp %d\n", __func__,
>> + timing.hactive.typ, timing.vactive.typ,
>> + bpp);
>> + if (bpp == 6)
>> + colordepth = 0x00; /* 6 bit */
>> + else
>> + colordepth = 0x10; /* 8 bit */
>> + anx6345_write_r1(dev, ANX9804_VID_CTRL2_REG, colordepth);
>> +
>> + if (anx6345_read_dpcd(dev, DP_MAX_LINK_RATE, &data_rate)) {
>> + debug("%s: Failed to DP_MAX_LINK_RATE\n", __func__);
>> + return -EIO;
>> + }
>> + debug("%s: data_rate: %d\n", __func__, (int)data_rate);
>> + if (anx6345_read_dpcd(dev, DP_MAX_LANE_COUNT, &lanes)) {
>> + debug("%s: Failed to read DP_MAX_LANE_COUNT\n", __func__);
>> + return -EIO;
>> + }
>> + lanes &= DP_MAX_LANE_COUNT_MASK;
>> + debug("%s: lanes: %d\n", __func__, (int)lanes);
>> +
>> + /* Set data-rate / lanes */
>> + anx6345_write_r0(dev, ANX9804_LINK_BW_SET_REG, data_rate);
>> + anx6345_write_r0(dev, ANX9804_LANE_COUNT_SET_REG, lanes);
>> +
>> + /* Link training */
>> + anx6345_write_r0(dev, ANX9804_LINK_TRAINING_CTRL_REG,
>> + ANX9804_LINK_TRAINING_CTRL_EN);
>> + mdelay(5);
>> + for (i = 0; i < 100; i++) {
>> + anx6345_read_r0(dev, ANX9804_LINK_TRAINING_CTRL_REG, &c);
>> + if ((chipid == 0x63) && (c & 0x80) == 0)
>> + break;
>> +
>> + mdelay(5);
>> + }
>> + if(i == 100) {
>> + debug("Error anx6345 link training timeout\n");
>> + return -ENODEV;
>> + }
>> +
>> + /* Enable */
>> + anx6345_write_r1(dev, ANX9804_VID_CTRL1_REG,
>> + ANX9804_VID_CTRL1_VID_EN | ANX9804_VID_CTRL1_EDGE);
>> + /* Force stream valid */
>> + anx6345_write_r0(dev, ANX9804_SYS_CTRL3_REG,
>> + ANX9804_SYS_CTRL3_F_HPD | ANX9804_SYS_CTRL3_HPD_CTRL |
>> + ANX9804_SYS_CTRL3_F_VALID | ANX9804_SYS_CTRL3_VALID_CTRL);
>> +
>> + return 0;
>> +}
>> +
>> +static int anx6345_probe(struct udevice *dev)
>> +{
>> + if (device_get_uclass_id(dev->parent) != UCLASS_I2C)
>> + return -EPROTONOSUPPORT;
>> +
>> + return anx6345_enable(dev);
>> +}
>> +
>> +struct video_bridge_ops anx6345_ops = {
>> + .attach = anx6345_attach,
>> + .set_backlight = anx6345_set_backlight,
>> + .read_edid = anx6345_read_edid,
>> +};
>> +
>> +static const struct udevice_id anx6345_ids[] = {
>> + { .compatible = "analogix,anx6345", },
>> + { }
>> +};
>> +
>> +U_BOOT_DRIVER(analogix_anx6345) = {
>> + .name = "analogix_anx6345",
>> + .id = UCLASS_VIDEO_BRIDGE,
>> + .of_match = anx6345_ids,
>> + .probe = anx6345_probe,
>> + .ops = &anx6345_ops,
>> + .priv_auto_alloc_size = sizeof(struct anx6345_priv),
>> +};
>>
>
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2017-10-05 19:08 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-19 5:04 [U-Boot] [RESEND PATCH 1/5] dm: video: bridge: add operation to read EDID Vasily Khoruzhick
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 2/5] video: anx9804: split out registers definitions into a separate header Vasily Khoruzhick
2017-10-05 18:44 ` André Przywara
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 3/5] video: add anx6345 DM driver Vasily Khoruzhick
2017-10-05 18:44 ` André Przywara
2017-10-05 19:08 ` Vasily Khoruzhick
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 4/5] sunxi: video: split out PLL code Vasily Khoruzhick
2017-09-19 5:04 ` [U-Boot] [RESEND PATCH 5/5] sunxi: video: add LCD support to DE2 driver Vasily Khoruzhick
2017-09-19 8:33 ` Maxime Ripard
2017-09-19 19:00 ` Vasily Khoruzhick
2017-09-19 20:06 ` Jernej Škrabec
2017-09-19 23:26 ` Icenowy Zheng
2017-09-21 5:33 ` Vasily Khoruzhick
2017-09-21 6:51 ` Maxime Ripard
2017-09-21 7:01 ` icenowy at aosc.io
2017-09-22 4:42 ` Vasily Khoruzhick
2017-09-22 14:44 ` Maxime Ripard
2017-09-22 15:45 ` Vasily Khoruzhick
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.