* [PATCH v3 1/7] drm/bridge: move ANA78xx driver to analogix subdirectory [not found] <<20190722150414.9F97668B20@verein.lst.de> @ 2019-07-22 15:11 ` Torsten Duwe 2019-07-22 15:11 ` Torsten Duwe ` (5 subsequent siblings) 6 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-22 15:11 UTC (permalink / raw) To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Vasily Khoruzhick, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner Cc: dri-devel, devicetree, linux-arm-kernel, linux-kernel From: Icenowy Zheng <icenowy@aosc.io> As ANA78xx chips are designed and produced by Analogix Semiconductor, Inc, move their driver codes into analogix subdirectory. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Torsten Duwe <duwe@suse.de> Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> --- drivers/gpu/drm/bridge/Kconfig | 10 ---------- drivers/gpu/drm/bridge/Makefile | 4 ++-- drivers/gpu/drm/bridge/analogix/Kconfig | 10 ++++++++++ drivers/gpu/drm/bridge/analogix/Makefile | 1 + drivers/gpu/drm/bridge/{ => analogix}/analogix-anx78xx.c | 0 drivers/gpu/drm/bridge/{ => analogix}/analogix-anx78xx.h | 0 6 files changed, 13 insertions(+), 12 deletions(-) rename drivers/gpu/drm/bridge/{ => analogix}/analogix-anx78xx.c (100%) rename drivers/gpu/drm/bridge/{ => analogix}/analogix-anx78xx.h (100%) diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index ee777469293a..862789bf64a0 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -16,16 +16,6 @@ config DRM_PANEL_BRIDGE menu "Display Interface Bridges" depends on DRM && DRM_BRIDGE -config DRM_ANALOGIX_ANX78XX - tristate "Analogix ANX78XX bridge" - select DRM_KMS_HELPER - select REGMAP_I2C - ---help--- - ANX78XX is an ultra-low Full-HD SlimPort transmitter - designed for portable devices. The ANX78XX transforms - the HDMI output of an application processor to MyDP - or DisplayPort. - config DRM_CDNS_DSI tristate "Cadence DPI/DSI bridge" select DRM_KMS_HELPER diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile index 4934fcf5a6f8..a6c7dd7727ea 100644 --- a/drivers/gpu/drm/bridge/Makefile +++ b/drivers/gpu/drm/bridge/Makefile @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o obj-$(CONFIG_DRM_CDNS_DSI) += cdns-dsi.o obj-$(CONFIG_DRM_DUMB_VGA_DAC) += dumb-vga-dac.o obj-$(CONFIG_DRM_LVDS_ENCODER) += lvds-encoder.o @@ -12,8 +11,9 @@ obj-$(CONFIG_DRM_SII9234) += sii9234.o obj-$(CONFIG_DRM_THINE_THC63LVD1024) += thc63lvd1024.o obj-$(CONFIG_DRM_TOSHIBA_TC358764) += tc358764.o obj-$(CONFIG_DRM_TOSHIBA_TC358767) += tc358767.o -obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix/ obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511/ obj-$(CONFIG_DRM_TI_SN65DSI86) += ti-sn65dsi86.o obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o + +obj-y += analogix/ obj-y += synopsys/ diff --git a/drivers/gpu/drm/bridge/analogix/Kconfig b/drivers/gpu/drm/bridge/analogix/Kconfig index e930ff9b5cd4..704fb0f41dc3 100644 --- a/drivers/gpu/drm/bridge/analogix/Kconfig +++ b/drivers/gpu/drm/bridge/analogix/Kconfig @@ -1,4 +1,14 @@ # SPDX-License-Identifier: GPL-2.0-only +config DRM_ANALOGIX_ANX78XX + tristate "Analogix ANX78XX bridge" + select DRM_KMS_HELPER + select REGMAP_I2C + help + ANX78XX is an ultra-low Full-HD SlimPort transmitter + designed for portable devices. The ANX78XX transforms + the HDMI output of an application processor to MyDP + or DisplayPort. + config DRM_ANALOGIX_DP tristate depends on DRM diff --git a/drivers/gpu/drm/bridge/analogix/Makefile b/drivers/gpu/drm/bridge/analogix/Makefile index fdbf3fd2f087..6fcbfd3ee560 100644 --- a/drivers/gpu/drm/bridge/analogix/Makefile +++ b/drivers/gpu/drm/bridge/analogix/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o +obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c similarity index 100% rename from drivers/gpu/drm/bridge/analogix-anx78xx.c rename to drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.h b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h similarity index 100% rename from drivers/gpu/drm/bridge/analogix-anx78xx.h rename to drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h -- 2.16.4 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 1/7] drm/bridge: move ANA78xx driver to analogix subdirectory @ 2019-07-22 15:11 ` Torsten Duwe 0 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-22 15:11 UTC (permalink / raw) To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Vasily Khoruzhick, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner Cc: devicetree, linux-arm-kernel, dri-devel, linux-kernel From: Icenowy Zheng <icenowy@aosc.io> As ANA78xx chips are designed and produced by Analogix Semiconductor, Inc, move their driver codes into analogix subdirectory. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Torsten Duwe <duwe@suse.de> Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> --- drivers/gpu/drm/bridge/Kconfig | 10 ---------- drivers/gpu/drm/bridge/Makefile | 4 ++-- drivers/gpu/drm/bridge/analogix/Kconfig | 10 ++++++++++ drivers/gpu/drm/bridge/analogix/Makefile | 1 + drivers/gpu/drm/bridge/{ => analogix}/analogix-anx78xx.c | 0 drivers/gpu/drm/bridge/{ => analogix}/analogix-anx78xx.h | 0 6 files changed, 13 insertions(+), 12 deletions(-) rename drivers/gpu/drm/bridge/{ => analogix}/analogix-anx78xx.c (100%) rename drivers/gpu/drm/bridge/{ => analogix}/analogix-anx78xx.h (100%) diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index ee777469293a..862789bf64a0 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -16,16 +16,6 @@ config DRM_PANEL_BRIDGE menu "Display Interface Bridges" depends on DRM && DRM_BRIDGE -config DRM_ANALOGIX_ANX78XX - tristate "Analogix ANX78XX bridge" - select DRM_KMS_HELPER - select REGMAP_I2C - ---help--- - ANX78XX is an ultra-low Full-HD SlimPort transmitter - designed for portable devices. The ANX78XX transforms - the HDMI output of an application processor to MyDP - or DisplayPort. - config DRM_CDNS_DSI tristate "Cadence DPI/DSI bridge" select DRM_KMS_HELPER diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile index 4934fcf5a6f8..a6c7dd7727ea 100644 --- a/drivers/gpu/drm/bridge/Makefile +++ b/drivers/gpu/drm/bridge/Makefile @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o obj-$(CONFIG_DRM_CDNS_DSI) += cdns-dsi.o obj-$(CONFIG_DRM_DUMB_VGA_DAC) += dumb-vga-dac.o obj-$(CONFIG_DRM_LVDS_ENCODER) += lvds-encoder.o @@ -12,8 +11,9 @@ obj-$(CONFIG_DRM_SII9234) += sii9234.o obj-$(CONFIG_DRM_THINE_THC63LVD1024) += thc63lvd1024.o obj-$(CONFIG_DRM_TOSHIBA_TC358764) += tc358764.o obj-$(CONFIG_DRM_TOSHIBA_TC358767) += tc358767.o -obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix/ obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511/ obj-$(CONFIG_DRM_TI_SN65DSI86) += ti-sn65dsi86.o obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o + +obj-y += analogix/ obj-y += synopsys/ diff --git a/drivers/gpu/drm/bridge/analogix/Kconfig b/drivers/gpu/drm/bridge/analogix/Kconfig index e930ff9b5cd4..704fb0f41dc3 100644 --- a/drivers/gpu/drm/bridge/analogix/Kconfig +++ b/drivers/gpu/drm/bridge/analogix/Kconfig @@ -1,4 +1,14 @@ # SPDX-License-Identifier: GPL-2.0-only +config DRM_ANALOGIX_ANX78XX + tristate "Analogix ANX78XX bridge" + select DRM_KMS_HELPER + select REGMAP_I2C + help + ANX78XX is an ultra-low Full-HD SlimPort transmitter + designed for portable devices. The ANX78XX transforms + the HDMI output of an application processor to MyDP + or DisplayPort. + config DRM_ANALOGIX_DP tristate depends on DRM diff --git a/drivers/gpu/drm/bridge/analogix/Makefile b/drivers/gpu/drm/bridge/analogix/Makefile index fdbf3fd2f087..6fcbfd3ee560 100644 --- a/drivers/gpu/drm/bridge/analogix/Makefile +++ b/drivers/gpu/drm/bridge/analogix/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o +obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c similarity index 100% rename from drivers/gpu/drm/bridge/analogix-anx78xx.c rename to drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.h b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h similarity index 100% rename from drivers/gpu/drm/bridge/analogix-anx78xx.h rename to drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h -- 2.16.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 2/7] drm/bridge: split some definitions of ANX78xx to dedicated headers [not found] <<20190722150414.9F97668B20@verein.lst.de> @ 2019-07-22 15:11 ` Torsten Duwe 2019-07-22 15:11 ` Torsten Duwe ` (5 subsequent siblings) 6 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-22 15:11 UTC (permalink / raw) To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Vasily Khoruzhick, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner Cc: dri-devel, devicetree, linux-arm-kernel, linux-kernel From: Icenowy Zheng <icenowy@aosc.io> Some definitions currently in analogix-anx78xx.h are not restricted to the ANX78xx series, but also applicable to other DisplayPort transmitters by Analogix. Split out them to dedicated headers, and make analogix-anx78xx.h include them. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Torsten Duwe <duwe@suse.de> Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> --- drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h | 465 +-------------------- .../gpu/drm/bridge/analogix/analogix-i2c-dptx.h | 247 +++++++++++ .../drm/bridge/analogix/analogix-i2c-txcommon.h | 233 +++++++++++ 3 files changed, 485 insertions(+), 460 deletions(-) create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h index 25e063bcecbc..be68afc955c9 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h @@ -2,13 +2,15 @@ /* * Copyright(c) 2016, Analogix Semiconductor. All rights reserved. */ - #ifndef __ANX78xx_H #define __ANX78xx_H -#define TX_P0 0x70 +#include "analogix-i2c-dptx.h" +#include "analogix-i2c-txcommon.h" + +#define TX_P0 ANALOGIX_I2C_DPTX #define TX_P1 0x7a -#define TX_P2 0x72 +#define TX_P2 ANALOGIX_I2C_TXCOMMON #define RX_P0 0x7e #define RX_P1 0x80 @@ -216,463 +218,6 @@ #define SP_CLEAR_AVMUTE BIT(4) #define SP_SET_AVMUTE BIT(0) -/***************************************************************/ -/* Register definition of device address 0x70 */ -/***************************************************************/ - -/* HDCP Status Register */ -#define SP_TX_HDCP_STATUS_REG 0x00 -#define SP_AUTH_FAIL BIT(5) -#define SP_AUTHEN_PASS BIT(1) - -/* HDCP Control Register 0 */ -#define SP_HDCP_CTRL0_REG 0x01 -#define SP_RX_REPEATER BIT(6) -#define SP_RE_AUTH BIT(5) -#define SP_SW_AUTH_OK BIT(4) -#define SP_HARD_AUTH_EN BIT(3) -#define SP_HDCP_ENC_EN BIT(2) -#define SP_BKSV_SRM_PASS BIT(1) -#define SP_KSVLIST_VLD BIT(0) -/* HDCP Function Enabled */ -#define SP_HDCP_FUNCTION_ENABLED (BIT(0) | BIT(1) | BIT(2) | BIT(3)) - -/* HDCP Receiver BSTATUS Register 0 */ -#define SP_HDCP_RX_BSTATUS0_REG 0x1b -/* HDCP Receiver BSTATUS Register 1 */ -#define SP_HDCP_RX_BSTATUS1_REG 0x1c - -/* HDCP Embedded "Blue Screen" Content Registers */ -#define SP_HDCP_VID0_BLUE_SCREEN_REG 0x2c -#define SP_HDCP_VID1_BLUE_SCREEN_REG 0x2d -#define SP_HDCP_VID2_BLUE_SCREEN_REG 0x2e - -/* HDCP Wait R0 Timing Register */ -#define SP_HDCP_WAIT_R0_TIME_REG 0x40 - -/* HDCP Link Integrity Check Timer Register */ -#define SP_HDCP_LINK_CHECK_TIMER_REG 0x41 - -/* HDCP Repeater Ready Wait Timer Register */ -#define SP_HDCP_RPTR_RDY_WAIT_TIME_REG 0x42 - -/* HDCP Auto Timer Register */ -#define SP_HDCP_AUTO_TIMER_REG 0x51 - -/* HDCP Key Status Register */ -#define SP_HDCP_KEY_STATUS_REG 0x5e - -/* HDCP Key Command Register */ -#define SP_HDCP_KEY_COMMAND_REG 0x5f -#define SP_DISABLE_SYNC_HDCP BIT(2) - -/* OTP Memory Key Protection Registers */ -#define SP_OTP_KEY_PROTECT1_REG 0x60 -#define SP_OTP_KEY_PROTECT2_REG 0x61 -#define SP_OTP_KEY_PROTECT3_REG 0x62 -#define SP_OTP_PSW1 0xa2 -#define SP_OTP_PSW2 0x7e -#define SP_OTP_PSW3 0xc6 - -/* DP System Control Registers */ -#define SP_DP_SYSTEM_CTRL_BASE (0x80 - 1) -/* Bits for DP System Control Register 2 */ -#define SP_CHA_STA BIT(2) -/* Bits for DP System Control Register 3 */ -#define SP_HPD_STATUS BIT(6) -#define SP_STRM_VALID BIT(2) -/* Bits for DP System Control Register 4 */ -#define SP_ENHANCED_MODE BIT(3) - -/* DP Video Control Register */ -#define SP_DP_VIDEO_CTRL_REG 0x84 -#define SP_COLOR_F_MASK 0x06 -#define SP_COLOR_F_SHIFT 1 -#define SP_BPC_MASK 0xe0 -#define SP_BPC_SHIFT 5 -# define SP_BPC_6BITS 0x00 -# define SP_BPC_8BITS 0x01 -# define SP_BPC_10BITS 0x02 -# define SP_BPC_12BITS 0x03 - -/* DP Audio Control Register */ -#define SP_DP_AUDIO_CTRL_REG 0x87 -#define SP_AUD_EN BIT(0) - -/* 10us Pulse Generate Timer Registers */ -#define SP_I2C_GEN_10US_TIMER0_REG 0x88 -#define SP_I2C_GEN_10US_TIMER1_REG 0x89 - -/* Packet Send Control Register */ -#define SP_PACKET_SEND_CTRL_REG 0x90 -#define SP_AUD_IF_UP BIT(7) -#define SP_AVI_IF_UD BIT(6) -#define SP_MPEG_IF_UD BIT(5) -#define SP_SPD_IF_UD BIT(4) -#define SP_AUD_IF_EN BIT(3) -#define SP_AVI_IF_EN BIT(2) -#define SP_MPEG_IF_EN BIT(1) -#define SP_SPD_IF_EN BIT(0) - -/* DP HDCP Control Register */ -#define SP_DP_HDCP_CTRL_REG 0x92 -#define SP_AUTO_EN BIT(7) -#define SP_AUTO_START BIT(5) -#define SP_LINK_POLLING BIT(1) - -/* DP Main Link Bandwidth Setting Register */ -#define SP_DP_MAIN_LINK_BW_SET_REG 0xa0 -#define SP_LINK_BW_SET_MASK 0x1f -#define SP_INITIAL_SLIM_M_AUD_SEL BIT(5) - -/* DP Training Pattern Set Register */ -#define SP_DP_TRAINING_PATTERN_SET_REG 0xa2 - -/* DP Lane 0 Link Training Control Register */ -#define SP_DP_LANE0_LT_CTRL_REG 0xa3 -#define SP_TX_SW_SET_MASK 0x1b -#define SP_MAX_PRE_REACH BIT(5) -#define SP_MAX_DRIVE_REACH BIT(4) -#define SP_PRE_EMP_LEVEL1 BIT(3) -#define SP_DRVIE_CURRENT_LEVEL1 BIT(0) - -/* DP Link Training Control Register */ -#define SP_DP_LT_CTRL_REG 0xa8 -#define SP_LT_ERROR_TYPE_MASK 0x70 -# define SP_LT_NO_ERROR 0x00 -# define SP_LT_AUX_WRITE_ERROR 0x01 -# define SP_LT_MAX_DRIVE_REACHED 0x02 -# define SP_LT_WRONG_LANE_COUNT_SET 0x03 -# define SP_LT_LOOP_SAME_5_TIME 0x04 -# define SP_LT_CR_FAIL_IN_EQ 0x05 -# define SP_LT_EQ_LOOP_5_TIME 0x06 -#define SP_LT_EN BIT(0) - -/* DP CEP Training Control Registers */ -#define SP_DP_CEP_TRAINING_CTRL0_REG 0xa9 -#define SP_DP_CEP_TRAINING_CTRL1_REG 0xaa - -/* DP Debug Register 1 */ -#define SP_DP_DEBUG1_REG 0xb0 -#define SP_DEBUG_PLL_LOCK BIT(4) -#define SP_POLLING_EN BIT(1) - -/* DP Polling Control Register */ -#define SP_DP_POLLING_CTRL_REG 0xb4 -#define SP_AUTO_POLLING_DISABLE BIT(0) - -/* DP Link Debug Control Register */ -#define SP_DP_LINK_DEBUG_CTRL_REG 0xb8 -#define SP_M_VID_DEBUG BIT(5) -#define SP_NEW_PRBS7 BIT(4) -#define SP_INSERT_ER BIT(1) -#define SP_PRBS31_EN BIT(0) - -/* AUX Misc control Register */ -#define SP_AUX_MISC_CTRL_REG 0xbf - -/* DP PLL control Register */ -#define SP_DP_PLL_CTRL_REG 0xc7 -#define SP_PLL_RST BIT(6) - -/* DP Analog Power Down Register */ -#define SP_DP_ANALOG_POWER_DOWN_REG 0xc8 -#define SP_CH0_PD BIT(0) - -/* DP Misc Control Register */ -#define SP_DP_MISC_CTRL_REG 0xcd -#define SP_EQ_TRAINING_LOOP BIT(6) - -/* DP Extra I2C Device Address Register */ -#define SP_DP_EXTRA_I2C_DEV_ADDR_REG 0xce -#define SP_I2C_STRETCH_DISABLE BIT(7) - -#define SP_I2C_EXTRA_ADDR 0x50 - -/* DP Downspread Control Register 1 */ -#define SP_DP_DOWNSPREAD_CTRL1_REG 0xd0 - -/* DP M Value Calculation Control Register */ -#define SP_DP_M_CALCULATION_CTRL_REG 0xd9 -#define SP_M_GEN_CLK_SEL BIT(0) - -/* AUX Channel Access Status Register */ -#define SP_AUX_CH_STATUS_REG 0xe0 -#define SP_AUX_STATUS 0x0f - -/* AUX Channel DEFER Control Register */ -#define SP_AUX_DEFER_CTRL_REG 0xe2 -#define SP_DEFER_CTRL_EN BIT(7) - -/* DP Buffer Data Count Register */ -#define SP_BUF_DATA_COUNT_REG 0xe4 -#define SP_BUF_DATA_COUNT_MASK 0x1f -#define SP_BUF_CLR BIT(7) - -/* DP AUX Channel Control Register 1 */ -#define SP_DP_AUX_CH_CTRL1_REG 0xe5 -#define SP_AUX_TX_COMM_MASK 0x0f -#define SP_AUX_LENGTH_MASK 0xf0 -#define SP_AUX_LENGTH_SHIFT 4 - -/* DP AUX CH Address Register 0 */ -#define SP_AUX_ADDR_7_0_REG 0xe6 - -/* DP AUX CH Address Register 1 */ -#define SP_AUX_ADDR_15_8_REG 0xe7 - -/* DP AUX CH Address Register 2 */ -#define SP_AUX_ADDR_19_16_REG 0xe8 -#define SP_AUX_ADDR_19_16_MASK 0x0f - -/* DP AUX Channel Control Register 2 */ -#define SP_DP_AUX_CH_CTRL2_REG 0xe9 -#define SP_AUX_SEL_RXCM BIT(6) -#define SP_AUX_CHSEL BIT(3) -#define SP_AUX_PN_INV BIT(2) -#define SP_ADDR_ONLY BIT(1) -#define SP_AUX_EN BIT(0) - -/* DP Video Stream Control InfoFrame Register */ -#define SP_DP_3D_VSC_CTRL_REG 0xea -#define SP_INFO_FRAME_VSC_EN BIT(0) - -/* DP Video Stream Data Byte 1 Register */ -#define SP_DP_VSC_DB1_REG 0xeb - -/* DP AUX Channel Control Register 3 */ -#define SP_DP_AUX_CH_CTRL3_REG 0xec -#define SP_WAIT_COUNTER_7_0_MASK 0xff - -/* DP AUX Channel Control Register 4 */ -#define SP_DP_AUX_CH_CTRL4_REG 0xed - -/* DP AUX Buffer Data Registers */ -#define SP_DP_BUF_DATA0_REG 0xf0 - -/***************************************************************/ -/* Register definition of device address 0x72 */ -/***************************************************************/ - -/* - * Core Register Definitions - */ - -/* Device ID Low Byte Register */ -#define SP_DEVICE_IDL_REG 0x02 - -/* Device ID High Byte Register */ -#define SP_DEVICE_IDH_REG 0x03 - -/* Device version register */ -#define SP_DEVICE_VERSION_REG 0x04 - -/* Power Down Control Register */ -#define SP_POWERDOWN_CTRL_REG 0x05 -#define SP_REGISTER_PD BIT(7) -#define SP_HDCP_PD BIT(5) -#define SP_AUDIO_PD BIT(4) -#define SP_VIDEO_PD BIT(3) -#define SP_LINK_PD BIT(2) -#define SP_TOTAL_PD BIT(1) - -/* Reset Control Register 1 */ -#define SP_RESET_CTRL1_REG 0x06 -#define SP_MISC_RST BIT(7) -#define SP_VIDCAP_RST BIT(6) -#define SP_VIDFIF_RST BIT(5) -#define SP_AUDFIF_RST BIT(4) -#define SP_AUDCAP_RST BIT(3) -#define SP_HDCP_RST BIT(2) -#define SP_SW_RST BIT(1) -#define SP_HW_RST BIT(0) - -/* Reset Control Register 2 */ -#define SP_RESET_CTRL2_REG 0x07 -#define SP_AUX_RST BIT(2) -#define SP_SERDES_FIFO_RST BIT(1) -#define SP_I2C_REG_RST BIT(0) - -/* Video Control Register 1 */ -#define SP_VID_CTRL1_REG 0x08 -#define SP_VIDEO_EN BIT(7) -#define SP_VIDEO_MUTE BIT(2) -#define SP_DE_GEN BIT(1) -#define SP_DEMUX BIT(0) - -/* Video Control Register 2 */ -#define SP_VID_CTRL2_REG 0x09 -#define SP_IN_COLOR_F_MASK 0x03 -#define SP_IN_YC_BIT_SEL BIT(2) -#define SP_IN_BPC_MASK 0x70 -#define SP_IN_BPC_SHIFT 4 -# define SP_IN_BPC_12BIT 0x03 -# define SP_IN_BPC_10BIT 0x02 -# define SP_IN_BPC_8BIT 0x01 -# define SP_IN_BPC_6BIT 0x00 -#define SP_IN_D_RANGE BIT(7) - -/* Video Control Register 3 */ -#define SP_VID_CTRL3_REG 0x0a -#define SP_HPD_OUT BIT(6) - -/* Video Control Register 5 */ -#define SP_VID_CTRL5_REG 0x0c -#define SP_CSC_STD_SEL BIT(7) -#define SP_XVYCC_RNG_LMT BIT(6) -#define SP_RANGE_Y2R BIT(5) -#define SP_CSPACE_Y2R BIT(4) -#define SP_RGB_RNG_LMT BIT(3) -#define SP_Y_RNG_LMT BIT(2) -#define SP_RANGE_R2Y BIT(1) -#define SP_CSPACE_R2Y BIT(0) - -/* Video Control Register 6 */ -#define SP_VID_CTRL6_REG 0x0d -#define SP_TEST_PATTERN_EN BIT(7) -#define SP_VIDEO_PROCESS_EN BIT(6) -#define SP_VID_US_MODE BIT(3) -#define SP_VID_DS_MODE BIT(2) -#define SP_UP_SAMPLE BIT(1) -#define SP_DOWN_SAMPLE BIT(0) - -/* Video Control Register 8 */ -#define SP_VID_CTRL8_REG 0x0f -#define SP_VID_VRES_TH BIT(0) - -/* Total Line Status Low Byte Register */ -#define SP_TOTAL_LINE_STAL_REG 0x24 - -/* Total Line Status High Byte Register */ -#define SP_TOTAL_LINE_STAH_REG 0x25 - -/* Active Line Status Low Byte Register */ -#define SP_ACT_LINE_STAL_REG 0x26 - -/* Active Line Status High Byte Register */ -#define SP_ACT_LINE_STAH_REG 0x27 - -/* Vertical Front Porch Status Register */ -#define SP_V_F_PORCH_STA_REG 0x28 - -/* Vertical SYNC Width Status Register */ -#define SP_V_SYNC_STA_REG 0x29 - -/* Vertical Back Porch Status Register */ -#define SP_V_B_PORCH_STA_REG 0x2a - -/* Total Pixel Status Low Byte Register */ -#define SP_TOTAL_PIXEL_STAL_REG 0x2b - -/* Total Pixel Status High Byte Register */ -#define SP_TOTAL_PIXEL_STAH_REG 0x2c - -/* Active Pixel Status Low Byte Register */ -#define SP_ACT_PIXEL_STAL_REG 0x2d - -/* Active Pixel Status High Byte Register */ -#define SP_ACT_PIXEL_STAH_REG 0x2e - -/* Horizontal Front Porch Status Low Byte Register */ -#define SP_H_F_PORCH_STAL_REG 0x2f - -/* Horizontal Front Porch Statys High Byte Register */ -#define SP_H_F_PORCH_STAH_REG 0x30 - -/* Horizontal SYNC Width Status Low Byte Register */ -#define SP_H_SYNC_STAL_REG 0x31 - -/* Horizontal SYNC Width Status High Byte Register */ -#define SP_H_SYNC_STAH_REG 0x32 - -/* Horizontal Back Porch Status Low Byte Register */ -#define SP_H_B_PORCH_STAL_REG 0x33 - -/* Horizontal Back Porch Status High Byte Register */ -#define SP_H_B_PORCH_STAH_REG 0x34 - -/* InfoFrame AVI Packet DB1 Register */ -#define SP_INFOFRAME_AVI_DB1_REG 0x70 - -/* Bit Control Specific Register */ -#define SP_BIT_CTRL_SPECIFIC_REG 0x80 -#define SP_BIT_CTRL_SELECT_SHIFT 1 -#define SP_ENABLE_BIT_CTRL BIT(0) - -/* InfoFrame Audio Packet DB1 Register */ -#define SP_INFOFRAME_AUD_DB1_REG 0x83 - -/* InfoFrame MPEG Packet DB1 Register */ -#define SP_INFOFRAME_MPEG_DB1_REG 0xb0 - -/* Audio Channel Status Registers */ -#define SP_AUD_CH_STATUS_BASE 0xd0 - -/* Audio Channel Num Register 5 */ -#define SP_I2S_CHANNEL_NUM_MASK 0xe0 -# define SP_I2S_CH_NUM_1 (0x00 << 5) -# define SP_I2S_CH_NUM_2 (0x01 << 5) -# define SP_I2S_CH_NUM_3 (0x02 << 5) -# define SP_I2S_CH_NUM_4 (0x03 << 5) -# define SP_I2S_CH_NUM_5 (0x04 << 5) -# define SP_I2S_CH_NUM_6 (0x05 << 5) -# define SP_I2S_CH_NUM_7 (0x06 << 5) -# define SP_I2S_CH_NUM_8 (0x07 << 5) -#define SP_EXT_VUCP BIT(2) -#define SP_VBIT BIT(1) -#define SP_AUDIO_LAYOUT BIT(0) - -/* Analog Debug Register 2 */ -#define SP_ANALOG_DEBUG2_REG 0xdd -#define SP_FORCE_SW_OFF_BYPASS 0x20 -#define SP_XTAL_FRQ 0x1c -# define SP_XTAL_FRQ_19M2 (0x00 << 2) -# define SP_XTAL_FRQ_24M (0x01 << 2) -# define SP_XTAL_FRQ_25M (0x02 << 2) -# define SP_XTAL_FRQ_26M (0x03 << 2) -# define SP_XTAL_FRQ_27M (0x04 << 2) -# define SP_XTAL_FRQ_38M4 (0x05 << 2) -# define SP_XTAL_FRQ_52M (0x06 << 2) -#define SP_POWERON_TIME_1P5MS 0x03 - -/* Analog Control 0 Register */ -#define SP_ANALOG_CTRL0_REG 0xe1 - -/* Common Interrupt Status Register 1 */ -#define SP_COMMON_INT_STATUS_BASE (0xf1 - 1) -#define SP_PLL_LOCK_CHG 0x40 - -/* Common Interrupt Status Register 2 */ -#define SP_COMMON_INT_STATUS2 0xf2 -#define SP_HDCP_AUTH_CHG BIT(1) -#define SP_HDCP_AUTH_DONE BIT(0) - -#define SP_HDCP_LINK_CHECK_FAIL BIT(0) - -/* Common Interrupt Status Register 4 */ -#define SP_COMMON_INT_STATUS4_REG 0xf4 -#define SP_HPD_IRQ BIT(6) -#define SP_HPD_ESYNC_ERR BIT(4) -#define SP_HPD_CHG BIT(2) -#define SP_HPD_LOST BIT(1) -#define SP_HPD_PLUG BIT(0) - -/* DP Interrupt Status Register */ -#define SP_DP_INT_STATUS1_REG 0xf7 -#define SP_TRAINING_FINISH BIT(5) -#define SP_POLLING_ERR BIT(4) - -/* Common Interrupt Mask Register */ -#define SP_COMMON_INT_MASK_BASE (0xf8 - 1) - -#define SP_COMMON_INT_MASK4_REG 0xfb - -/* DP Interrupts Mask Register */ -#define SP_DP_INT_MASK1_REG 0xfe - -/* Interrupt Control Register */ -#define SP_INT_CTRL_REG 0xff - /***************************************************************/ /* Register definition of device address 0x7a */ /***************************************************************/ diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h new file mode 100644 index 000000000000..6295be668cae --- /dev/null +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h @@ -0,0 +1,247 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright(c) 2016, Analogix Semiconductor. + * + * Based on anx7808 driver obtained from chromeos with copyright: + * Copyright(c) 2013, Google Inc. + */ +#ifndef _ANALOGIX_I2C_DPTX_H_ +#define _ANALOGIX_I2C_DPTX_H_ + +#define ANALOGIX_I2C_DPTX 0x70 + +/***************************************************************/ +/* Register definition of device address 0x70 */ +/***************************************************************/ + +/* HDCP Status Register */ +#define SP_TX_HDCP_STATUS_REG 0x00 +#define SP_AUTH_FAIL BIT(5) +#define SP_AUTHEN_PASS BIT(1) + +/* HDCP Control Register 0 */ +#define SP_HDCP_CTRL0_REG 0x01 +#define SP_RX_REPEATER BIT(6) +#define SP_RE_AUTH BIT(5) +#define SP_SW_AUTH_OK BIT(4) +#define SP_HARD_AUTH_EN BIT(3) +#define SP_HDCP_ENC_EN BIT(2) +#define SP_BKSV_SRM_PASS BIT(1) +#define SP_KSVLIST_VLD BIT(0) +/* HDCP Function Enabled */ +#define SP_HDCP_FUNCTION_ENABLED (BIT(0) | BIT(1) | BIT(2) | BIT(3)) + +/* HDCP Receiver BSTATUS Register 0 */ +#define SP_HDCP_RX_BSTATUS0_REG 0x1b +/* HDCP Receiver BSTATUS Register 1 */ +#define SP_HDCP_RX_BSTATUS1_REG 0x1c + +/* HDCP Embedded "Blue Screen" Content Registers */ +#define SP_HDCP_VID0_BLUE_SCREEN_REG 0x2c +#define SP_HDCP_VID1_BLUE_SCREEN_REG 0x2d +#define SP_HDCP_VID2_BLUE_SCREEN_REG 0x2e + +/* HDCP Wait R0 Timing Register */ +#define SP_HDCP_WAIT_R0_TIME_REG 0x40 + +/* HDCP Link Integrity Check Timer Register */ +#define SP_HDCP_LINK_CHECK_TIMER_REG 0x41 + +/* HDCP Repeater Ready Wait Timer Register */ +#define SP_HDCP_RPTR_RDY_WAIT_TIME_REG 0x42 + +/* HDCP Auto Timer Register */ +#define SP_HDCP_AUTO_TIMER_REG 0x51 + +/* HDCP Key Status Register */ +#define SP_HDCP_KEY_STATUS_REG 0x5e + +/* HDCP Key Command Register */ +#define SP_HDCP_KEY_COMMAND_REG 0x5f +#define SP_DISABLE_SYNC_HDCP BIT(2) + +/* OTP Memory Key Protection Registers */ +#define SP_OTP_KEY_PROTECT1_REG 0x60 +#define SP_OTP_KEY_PROTECT2_REG 0x61 +#define SP_OTP_KEY_PROTECT3_REG 0x62 +#define SP_OTP_PSW1 0xa2 +#define SP_OTP_PSW2 0x7e +#define SP_OTP_PSW3 0xc6 + +/* DP System Control Registers */ +#define SP_DP_SYSTEM_CTRL_BASE (0x80 - 1) +/* Bits for DP System Control Register 2 */ +#define SP_CHA_STA BIT(2) +/* Bits for DP System Control Register 3 */ +#define SP_HPD_STATUS BIT(6) +#define SP_STRM_VALID BIT(2) +/* Bits for DP System Control Register 4 */ +#define SP_ENHANCED_MODE BIT(3) + +/* DP Video Control Register */ +#define SP_DP_VIDEO_CTRL_REG 0x84 +#define SP_COLOR_F_MASK 0x06 +#define SP_COLOR_F_SHIFT 1 +#define SP_BPC_MASK 0xe0 +#define SP_BPC_SHIFT 5 +# define SP_BPC_6BITS 0x00 +# define SP_BPC_8BITS 0x01 +# define SP_BPC_10BITS 0x02 +# define SP_BPC_12BITS 0x03 + +/* DP Audio Control Register */ +#define SP_DP_AUDIO_CTRL_REG 0x87 +#define SP_AUD_EN BIT(0) + +/* 10us Pulse Generate Timer Registers */ +#define SP_I2C_GEN_10US_TIMER0_REG 0x88 +#define SP_I2C_GEN_10US_TIMER1_REG 0x89 + +/* Packet Send Control Register */ +#define SP_PACKET_SEND_CTRL_REG 0x90 +#define SP_AUD_IF_UP BIT(7) +#define SP_AVI_IF_UD BIT(6) +#define SP_MPEG_IF_UD BIT(5) +#define SP_SPD_IF_UD BIT(4) +#define SP_AUD_IF_EN BIT(3) +#define SP_AVI_IF_EN BIT(2) +#define SP_MPEG_IF_EN BIT(1) +#define SP_SPD_IF_EN BIT(0) + +/* DP HDCP Control Register */ +#define SP_DP_HDCP_CTRL_REG 0x92 +#define SP_AUTO_EN BIT(7) +#define SP_AUTO_START BIT(5) +#define SP_LINK_POLLING BIT(1) + +/* DP Main Link Bandwidth Setting Register */ +#define SP_DP_MAIN_LINK_BW_SET_REG 0xa0 +#define SP_LINK_BW_SET_MASK 0x1f +#define SP_INITIAL_SLIM_M_AUD_SEL BIT(5) + +/* DP Training Pattern Set Register */ +#define SP_DP_TRAINING_PATTERN_SET_REG 0xa2 + +/* DP Lane 0 Link Training Control Register */ +#define SP_DP_LANE0_LT_CTRL_REG 0xa3 +#define SP_TX_SW_SET_MASK 0x1b +#define SP_MAX_PRE_REACH BIT(5) +#define SP_MAX_DRIVE_REACH BIT(4) +#define SP_PRE_EMP_LEVEL1 BIT(3) +#define SP_DRVIE_CURRENT_LEVEL1 BIT(0) + +/* DP Link Training Control Register */ +#define SP_DP_LT_CTRL_REG 0xa8 +#define SP_LT_ERROR_TYPE_MASK 0x70 +# define SP_LT_NO_ERROR 0x00 +# define SP_LT_AUX_WRITE_ERROR 0x01 +# define SP_LT_MAX_DRIVE_REACHED 0x02 +# define SP_LT_WRONG_LANE_COUNT_SET 0x03 +# define SP_LT_LOOP_SAME_5_TIME 0x04 +# define SP_LT_CR_FAIL_IN_EQ 0x05 +# define SP_LT_EQ_LOOP_5_TIME 0x06 +#define SP_LT_EN BIT(0) + +/* DP CEP Training Control Registers */ +#define SP_DP_CEP_TRAINING_CTRL0_REG 0xa9 +#define SP_DP_CEP_TRAINING_CTRL1_REG 0xaa + +/* DP Debug Register 1 */ +#define SP_DP_DEBUG1_REG 0xb0 +#define SP_DEBUG_PLL_LOCK BIT(4) +#define SP_POLLING_EN BIT(1) + +/* DP Polling Control Register */ +#define SP_DP_POLLING_CTRL_REG 0xb4 +#define SP_AUTO_POLLING_DISABLE BIT(0) + +/* DP Link Debug Control Register */ +#define SP_DP_LINK_DEBUG_CTRL_REG 0xb8 +#define SP_M_VID_DEBUG BIT(5) +#define SP_NEW_PRBS7 BIT(4) +#define SP_INSERT_ER BIT(1) +#define SP_PRBS31_EN BIT(0) + +/* AUX Misc control Register */ +#define SP_AUX_MISC_CTRL_REG 0xbf + +/* DP PLL control Register */ +#define SP_DP_PLL_CTRL_REG 0xc7 +#define SP_PLL_RST BIT(6) + +/* DP Analog Power Down Register */ +#define SP_DP_ANALOG_POWER_DOWN_REG 0xc8 +#define SP_CH0_PD BIT(0) + +/* DP Misc Control Register */ +#define SP_DP_MISC_CTRL_REG 0xcd +#define SP_EQ_TRAINING_LOOP BIT(6) + +/* DP Extra I2C Device Address Register */ +#define SP_DP_EXTRA_I2C_DEV_ADDR_REG 0xce +#define SP_I2C_STRETCH_DISABLE BIT(7) + +#define SP_I2C_EXTRA_ADDR 0x50 + +/* DP Downspread Control Register 1 */ +#define SP_DP_DOWNSPREAD_CTRL1_REG 0xd0 + +/* DP M Value Calculation Control Register */ +#define SP_DP_M_CALCULATION_CTRL_REG 0xd9 +#define SP_M_GEN_CLK_SEL BIT(0) + +/* AUX Channel Access Status Register */ +#define SP_AUX_CH_STATUS_REG 0xe0 +#define SP_AUX_STATUS 0x0f + +/* AUX Channel DEFER Control Register */ +#define SP_AUX_DEFER_CTRL_REG 0xe2 +#define SP_DEFER_CTRL_EN BIT(7) + +/* DP Buffer Data Count Register */ +#define SP_BUF_DATA_COUNT_REG 0xe4 +#define SP_BUF_DATA_COUNT_MASK 0x1f +#define SP_BUF_CLR BIT(7) + +/* DP AUX Channel Control Register 1 */ +#define SP_DP_AUX_CH_CTRL1_REG 0xe5 +#define SP_AUX_TX_COMM_MASK 0x0f +#define SP_AUX_LENGTH_MASK 0xf0 +#define SP_AUX_LENGTH_SHIFT 4 + +/* DP AUX CH Address Register 0 */ +#define SP_AUX_ADDR_7_0_REG 0xe6 + +/* DP AUX CH Address Register 1 */ +#define SP_AUX_ADDR_15_8_REG 0xe7 + +/* DP AUX CH Address Register 2 */ +#define SP_AUX_ADDR_19_16_REG 0xe8 +#define SP_AUX_ADDR_19_16_MASK 0x0f + +/* DP AUX Channel Control Register 2 */ +#define SP_DP_AUX_CH_CTRL2_REG 0xe9 +#define SP_AUX_SEL_RXCM BIT(6) +#define SP_AUX_CHSEL BIT(3) +#define SP_AUX_PN_INV BIT(2) +#define SP_ADDR_ONLY BIT(1) +#define SP_AUX_EN BIT(0) + +/* DP Video Stream Control InfoFrame Register */ +#define SP_DP_3D_VSC_CTRL_REG 0xea +#define SP_INFO_FRAME_VSC_EN BIT(0) + +/* DP Video Stream Data Byte 1 Register */ +#define SP_DP_VSC_DB1_REG 0xeb + +/* DP AUX Channel Control Register 3 */ +#define SP_DP_AUX_CH_CTRL3_REG 0xec +#define SP_WAIT_COUNTER_7_0_MASK 0xff + +/* DP AUX Channel Control Register 4 */ +#define SP_DP_AUX_CH_CTRL4_REG 0xed + +/* DP AUX Buffer Data Registers */ +#define SP_DP_BUF_DATA0_REG 0xf0 + +#endif diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h b/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h new file mode 100644 index 000000000000..c1030e0f74cc --- /dev/null +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h @@ -0,0 +1,233 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright(c) 2016, Analogix Semiconductor. All rights reserved. + */ +#ifndef _ANALOGIX_I2C_TXCOMMON_H_ +#define _ANALOGIX_I2C_TXCOMMON_H_ + +#define ANALOGIX_I2C_TXCOMMON 0x72 + +/***************************************************************/ +/* Register definition of device address 0x72 */ +/***************************************************************/ + +/* + * Core Register Definitions + */ + +/* Device ID Low Byte Register */ +#define SP_DEVICE_IDL_REG 0x02 + +/* Device ID High Byte Register */ +#define SP_DEVICE_IDH_REG 0x03 + +/* Device version register */ +#define SP_DEVICE_VERSION_REG 0x04 + +/* Power Down Control Register */ +#define SP_POWERDOWN_CTRL_REG 0x05 +#define SP_REGISTER_PD BIT(7) +#define SP_HDCP_PD BIT(5) +#define SP_AUDIO_PD BIT(4) +#define SP_VIDEO_PD BIT(3) +#define SP_LINK_PD BIT(2) +#define SP_TOTAL_PD BIT(1) + +/* Reset Control Register 1 */ +#define SP_RESET_CTRL1_REG 0x06 +#define SP_MISC_RST BIT(7) +#define SP_VIDCAP_RST BIT(6) +#define SP_VIDFIF_RST BIT(5) +#define SP_AUDFIF_RST BIT(4) +#define SP_AUDCAP_RST BIT(3) +#define SP_HDCP_RST BIT(2) +#define SP_SW_RST BIT(1) +#define SP_HW_RST BIT(0) + +/* Reset Control Register 2 */ +#define SP_RESET_CTRL2_REG 0x07 +#define SP_AUX_RST BIT(2) +#define SP_SERDES_FIFO_RST BIT(1) +#define SP_I2C_REG_RST BIT(0) + +/* Video Control Register 1 */ +#define SP_VID_CTRL1_REG 0x08 +#define SP_VIDEO_EN BIT(7) +#define SP_VIDEO_MUTE BIT(2) +#define SP_DE_GEN BIT(1) +#define SP_DEMUX BIT(0) + +/* Video Control Register 2 */ +#define SP_VID_CTRL2_REG 0x09 +#define SP_IN_COLOR_F_MASK 0x03 +#define SP_IN_YC_BIT_SEL BIT(2) +#define SP_IN_BPC_MASK 0x70 +#define SP_IN_BPC_SHIFT 4 +# define SP_IN_BPC_12BIT 0x03 +# define SP_IN_BPC_10BIT 0x02 +# define SP_IN_BPC_8BIT 0x01 +# define SP_IN_BPC_6BIT 0x00 +#define SP_IN_D_RANGE BIT(7) + +/* Video Control Register 3 */ +#define SP_VID_CTRL3_REG 0x0a +#define SP_HPD_OUT BIT(6) + +/* Video Control Register 5 */ +#define SP_VID_CTRL5_REG 0x0c +#define SP_CSC_STD_SEL BIT(7) +#define SP_XVYCC_RNG_LMT BIT(6) +#define SP_RANGE_Y2R BIT(5) +#define SP_CSPACE_Y2R BIT(4) +#define SP_RGB_RNG_LMT BIT(3) +#define SP_Y_RNG_LMT BIT(2) +#define SP_RANGE_R2Y BIT(1) +#define SP_CSPACE_R2Y BIT(0) + +/* Video Control Register 6 */ +#define SP_VID_CTRL6_REG 0x0d +#define SP_TEST_PATTERN_EN BIT(7) +#define SP_VIDEO_PROCESS_EN BIT(6) +#define SP_VID_US_MODE BIT(3) +#define SP_VID_DS_MODE BIT(2) +#define SP_UP_SAMPLE BIT(1) +#define SP_DOWN_SAMPLE BIT(0) + +/* Video Control Register 8 */ +#define SP_VID_CTRL8_REG 0x0f +#define SP_VID_VRES_TH BIT(0) + +/* Total Line Status Low Byte Register */ +#define SP_TOTAL_LINE_STAL_REG 0x24 + +/* Total Line Status High Byte Register */ +#define SP_TOTAL_LINE_STAH_REG 0x25 + +/* Active Line Status Low Byte Register */ +#define SP_ACT_LINE_STAL_REG 0x26 + +/* Active Line Status High Byte Register */ +#define SP_ACT_LINE_STAH_REG 0x27 + +/* Vertical Front Porch Status Register */ +#define SP_V_F_PORCH_STA_REG 0x28 + +/* Vertical SYNC Width Status Register */ +#define SP_V_SYNC_STA_REG 0x29 + +/* Vertical Back Porch Status Register */ +#define SP_V_B_PORCH_STA_REG 0x2a + +/* Total Pixel Status Low Byte Register */ +#define SP_TOTAL_PIXEL_STAL_REG 0x2b + +/* Total Pixel Status High Byte Register */ +#define SP_TOTAL_PIXEL_STAH_REG 0x2c + +/* Active Pixel Status Low Byte Register */ +#define SP_ACT_PIXEL_STAL_REG 0x2d + +/* Active Pixel Status High Byte Register */ +#define SP_ACT_PIXEL_STAH_REG 0x2e + +/* Horizontal Front Porch Status Low Byte Register */ +#define SP_H_F_PORCH_STAL_REG 0x2f + +/* Horizontal Front Porch Statys High Byte Register */ +#define SP_H_F_PORCH_STAH_REG 0x30 + +/* Horizontal SYNC Width Status Low Byte Register */ +#define SP_H_SYNC_STAL_REG 0x31 + +/* Horizontal SYNC Width Status High Byte Register */ +#define SP_H_SYNC_STAH_REG 0x32 + +/* Horizontal Back Porch Status Low Byte Register */ +#define SP_H_B_PORCH_STAL_REG 0x33 + +/* Horizontal Back Porch Status High Byte Register */ +#define SP_H_B_PORCH_STAH_REG 0x34 + +/* InfoFrame AVI Packet DB1 Register */ +#define SP_INFOFRAME_AVI_DB1_REG 0x70 + +/* Bit Control Specific Register */ +#define SP_BIT_CTRL_SPECIFIC_REG 0x80 +#define SP_BIT_CTRL_SELECT_SHIFT 1 +#define SP_ENABLE_BIT_CTRL BIT(0) + +/* InfoFrame Audio Packet DB1 Register */ +#define SP_INFOFRAME_AUD_DB1_REG 0x83 + +/* InfoFrame MPEG Packet DB1 Register */ +#define SP_INFOFRAME_MPEG_DB1_REG 0xb0 + +/* Audio Channel Status Registers */ +#define SP_AUD_CH_STATUS_BASE 0xd0 + +/* Audio Channel Num Register 5 */ +#define SP_I2S_CHANNEL_NUM_MASK 0xe0 +# define SP_I2S_CH_NUM_1 (0x00 << 5) +# define SP_I2S_CH_NUM_2 (0x01 << 5) +# define SP_I2S_CH_NUM_3 (0x02 << 5) +# define SP_I2S_CH_NUM_4 (0x03 << 5) +# define SP_I2S_CH_NUM_5 (0x04 << 5) +# define SP_I2S_CH_NUM_6 (0x05 << 5) +# define SP_I2S_CH_NUM_7 (0x06 << 5) +# define SP_I2S_CH_NUM_8 (0x07 << 5) +#define SP_EXT_VUCP BIT(2) +#define SP_VBIT BIT(1) +#define SP_AUDIO_LAYOUT BIT(0) + +/* Analog Debug Register 2 */ +#define SP_ANALOG_DEBUG2_REG 0xdd +#define SP_FORCE_SW_OFF_BYPASS 0x20 +#define SP_XTAL_FRQ 0x1c +# define SP_XTAL_FRQ_19M2 (0x00 << 2) +# define SP_XTAL_FRQ_24M (0x01 << 2) +# define SP_XTAL_FRQ_25M (0x02 << 2) +# define SP_XTAL_FRQ_26M (0x03 << 2) +# define SP_XTAL_FRQ_27M (0x04 << 2) +# define SP_XTAL_FRQ_38M4 (0x05 << 2) +# define SP_XTAL_FRQ_52M (0x06 << 2) +#define SP_POWERON_TIME_1P5MS 0x03 + +/* Analog Control 0 Register */ +#define SP_ANALOG_CTRL0_REG 0xe1 + +/* Common Interrupt Status Register 1 */ +#define SP_COMMON_INT_STATUS_BASE (0xf1 - 1) +#define SP_PLL_LOCK_CHG 0x40 + +/* Common Interrupt Status Register 2 */ +#define SP_COMMON_INT_STATUS2 0xf2 +#define SP_HDCP_AUTH_CHG BIT(1) +#define SP_HDCP_AUTH_DONE BIT(0) + +#define SP_HDCP_LINK_CHECK_FAIL BIT(0) + +/* Common Interrupt Status Register 4 */ +#define SP_COMMON_INT_STATUS4_REG 0xf4 +#define SP_HPD_IRQ BIT(6) +#define SP_HPD_ESYNC_ERR BIT(4) +#define SP_HPD_CHG BIT(2) +#define SP_HPD_LOST BIT(1) +#define SP_HPD_PLUG BIT(0) + +/* DP Interrupt Status Register */ +#define SP_DP_INT_STATUS1_REG 0xf7 +#define SP_TRAINING_FINISH BIT(5) +#define SP_POLLING_ERR BIT(4) + +/* Common Interrupt Mask Register */ +#define SP_COMMON_INT_MASK_BASE (0xf8 - 1) + +#define SP_COMMON_INT_MASK4_REG 0xfb + +/* DP Interrupts Mask Register */ +#define SP_DP_INT_MASK1_REG 0xfe + +/* Interrupt Control Register */ +#define SP_INT_CTRL_REG 0xff + +#endif /* _ANALOGIX_I2C_TXCOMMON_H_ */ -- 2.16.4 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 2/7] drm/bridge: split some definitions of ANX78xx to dedicated headers @ 2019-07-22 15:11 ` Torsten Duwe 0 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-22 15:11 UTC (permalink / raw) To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Vasily Khoruzhick, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner Cc: devicetree, linux-arm-kernel, dri-devel, linux-kernel From: Icenowy Zheng <icenowy@aosc.io> Some definitions currently in analogix-anx78xx.h are not restricted to the ANX78xx series, but also applicable to other DisplayPort transmitters by Analogix. Split out them to dedicated headers, and make analogix-anx78xx.h include them. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Torsten Duwe <duwe@suse.de> Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> --- drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h | 465 +-------------------- .../gpu/drm/bridge/analogix/analogix-i2c-dptx.h | 247 +++++++++++ .../drm/bridge/analogix/analogix-i2c-txcommon.h | 233 +++++++++++ 3 files changed, 485 insertions(+), 460 deletions(-) create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h index 25e063bcecbc..be68afc955c9 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h @@ -2,13 +2,15 @@ /* * Copyright(c) 2016, Analogix Semiconductor. All rights reserved. */ - #ifndef __ANX78xx_H #define __ANX78xx_H -#define TX_P0 0x70 +#include "analogix-i2c-dptx.h" +#include "analogix-i2c-txcommon.h" + +#define TX_P0 ANALOGIX_I2C_DPTX #define TX_P1 0x7a -#define TX_P2 0x72 +#define TX_P2 ANALOGIX_I2C_TXCOMMON #define RX_P0 0x7e #define RX_P1 0x80 @@ -216,463 +218,6 @@ #define SP_CLEAR_AVMUTE BIT(4) #define SP_SET_AVMUTE BIT(0) -/***************************************************************/ -/* Register definition of device address 0x70 */ -/***************************************************************/ - -/* HDCP Status Register */ -#define SP_TX_HDCP_STATUS_REG 0x00 -#define SP_AUTH_FAIL BIT(5) -#define SP_AUTHEN_PASS BIT(1) - -/* HDCP Control Register 0 */ -#define SP_HDCP_CTRL0_REG 0x01 -#define SP_RX_REPEATER BIT(6) -#define SP_RE_AUTH BIT(5) -#define SP_SW_AUTH_OK BIT(4) -#define SP_HARD_AUTH_EN BIT(3) -#define SP_HDCP_ENC_EN BIT(2) -#define SP_BKSV_SRM_PASS BIT(1) -#define SP_KSVLIST_VLD BIT(0) -/* HDCP Function Enabled */ -#define SP_HDCP_FUNCTION_ENABLED (BIT(0) | BIT(1) | BIT(2) | BIT(3)) - -/* HDCP Receiver BSTATUS Register 0 */ -#define SP_HDCP_RX_BSTATUS0_REG 0x1b -/* HDCP Receiver BSTATUS Register 1 */ -#define SP_HDCP_RX_BSTATUS1_REG 0x1c - -/* HDCP Embedded "Blue Screen" Content Registers */ -#define SP_HDCP_VID0_BLUE_SCREEN_REG 0x2c -#define SP_HDCP_VID1_BLUE_SCREEN_REG 0x2d -#define SP_HDCP_VID2_BLUE_SCREEN_REG 0x2e - -/* HDCP Wait R0 Timing Register */ -#define SP_HDCP_WAIT_R0_TIME_REG 0x40 - -/* HDCP Link Integrity Check Timer Register */ -#define SP_HDCP_LINK_CHECK_TIMER_REG 0x41 - -/* HDCP Repeater Ready Wait Timer Register */ -#define SP_HDCP_RPTR_RDY_WAIT_TIME_REG 0x42 - -/* HDCP Auto Timer Register */ -#define SP_HDCP_AUTO_TIMER_REG 0x51 - -/* HDCP Key Status Register */ -#define SP_HDCP_KEY_STATUS_REG 0x5e - -/* HDCP Key Command Register */ -#define SP_HDCP_KEY_COMMAND_REG 0x5f -#define SP_DISABLE_SYNC_HDCP BIT(2) - -/* OTP Memory Key Protection Registers */ -#define SP_OTP_KEY_PROTECT1_REG 0x60 -#define SP_OTP_KEY_PROTECT2_REG 0x61 -#define SP_OTP_KEY_PROTECT3_REG 0x62 -#define SP_OTP_PSW1 0xa2 -#define SP_OTP_PSW2 0x7e -#define SP_OTP_PSW3 0xc6 - -/* DP System Control Registers */ -#define SP_DP_SYSTEM_CTRL_BASE (0x80 - 1) -/* Bits for DP System Control Register 2 */ -#define SP_CHA_STA BIT(2) -/* Bits for DP System Control Register 3 */ -#define SP_HPD_STATUS BIT(6) -#define SP_STRM_VALID BIT(2) -/* Bits for DP System Control Register 4 */ -#define SP_ENHANCED_MODE BIT(3) - -/* DP Video Control Register */ -#define SP_DP_VIDEO_CTRL_REG 0x84 -#define SP_COLOR_F_MASK 0x06 -#define SP_COLOR_F_SHIFT 1 -#define SP_BPC_MASK 0xe0 -#define SP_BPC_SHIFT 5 -# define SP_BPC_6BITS 0x00 -# define SP_BPC_8BITS 0x01 -# define SP_BPC_10BITS 0x02 -# define SP_BPC_12BITS 0x03 - -/* DP Audio Control Register */ -#define SP_DP_AUDIO_CTRL_REG 0x87 -#define SP_AUD_EN BIT(0) - -/* 10us Pulse Generate Timer Registers */ -#define SP_I2C_GEN_10US_TIMER0_REG 0x88 -#define SP_I2C_GEN_10US_TIMER1_REG 0x89 - -/* Packet Send Control Register */ -#define SP_PACKET_SEND_CTRL_REG 0x90 -#define SP_AUD_IF_UP BIT(7) -#define SP_AVI_IF_UD BIT(6) -#define SP_MPEG_IF_UD BIT(5) -#define SP_SPD_IF_UD BIT(4) -#define SP_AUD_IF_EN BIT(3) -#define SP_AVI_IF_EN BIT(2) -#define SP_MPEG_IF_EN BIT(1) -#define SP_SPD_IF_EN BIT(0) - -/* DP HDCP Control Register */ -#define SP_DP_HDCP_CTRL_REG 0x92 -#define SP_AUTO_EN BIT(7) -#define SP_AUTO_START BIT(5) -#define SP_LINK_POLLING BIT(1) - -/* DP Main Link Bandwidth Setting Register */ -#define SP_DP_MAIN_LINK_BW_SET_REG 0xa0 -#define SP_LINK_BW_SET_MASK 0x1f -#define SP_INITIAL_SLIM_M_AUD_SEL BIT(5) - -/* DP Training Pattern Set Register */ -#define SP_DP_TRAINING_PATTERN_SET_REG 0xa2 - -/* DP Lane 0 Link Training Control Register */ -#define SP_DP_LANE0_LT_CTRL_REG 0xa3 -#define SP_TX_SW_SET_MASK 0x1b -#define SP_MAX_PRE_REACH BIT(5) -#define SP_MAX_DRIVE_REACH BIT(4) -#define SP_PRE_EMP_LEVEL1 BIT(3) -#define SP_DRVIE_CURRENT_LEVEL1 BIT(0) - -/* DP Link Training Control Register */ -#define SP_DP_LT_CTRL_REG 0xa8 -#define SP_LT_ERROR_TYPE_MASK 0x70 -# define SP_LT_NO_ERROR 0x00 -# define SP_LT_AUX_WRITE_ERROR 0x01 -# define SP_LT_MAX_DRIVE_REACHED 0x02 -# define SP_LT_WRONG_LANE_COUNT_SET 0x03 -# define SP_LT_LOOP_SAME_5_TIME 0x04 -# define SP_LT_CR_FAIL_IN_EQ 0x05 -# define SP_LT_EQ_LOOP_5_TIME 0x06 -#define SP_LT_EN BIT(0) - -/* DP CEP Training Control Registers */ -#define SP_DP_CEP_TRAINING_CTRL0_REG 0xa9 -#define SP_DP_CEP_TRAINING_CTRL1_REG 0xaa - -/* DP Debug Register 1 */ -#define SP_DP_DEBUG1_REG 0xb0 -#define SP_DEBUG_PLL_LOCK BIT(4) -#define SP_POLLING_EN BIT(1) - -/* DP Polling Control Register */ -#define SP_DP_POLLING_CTRL_REG 0xb4 -#define SP_AUTO_POLLING_DISABLE BIT(0) - -/* DP Link Debug Control Register */ -#define SP_DP_LINK_DEBUG_CTRL_REG 0xb8 -#define SP_M_VID_DEBUG BIT(5) -#define SP_NEW_PRBS7 BIT(4) -#define SP_INSERT_ER BIT(1) -#define SP_PRBS31_EN BIT(0) - -/* AUX Misc control Register */ -#define SP_AUX_MISC_CTRL_REG 0xbf - -/* DP PLL control Register */ -#define SP_DP_PLL_CTRL_REG 0xc7 -#define SP_PLL_RST BIT(6) - -/* DP Analog Power Down Register */ -#define SP_DP_ANALOG_POWER_DOWN_REG 0xc8 -#define SP_CH0_PD BIT(0) - -/* DP Misc Control Register */ -#define SP_DP_MISC_CTRL_REG 0xcd -#define SP_EQ_TRAINING_LOOP BIT(6) - -/* DP Extra I2C Device Address Register */ -#define SP_DP_EXTRA_I2C_DEV_ADDR_REG 0xce -#define SP_I2C_STRETCH_DISABLE BIT(7) - -#define SP_I2C_EXTRA_ADDR 0x50 - -/* DP Downspread Control Register 1 */ -#define SP_DP_DOWNSPREAD_CTRL1_REG 0xd0 - -/* DP M Value Calculation Control Register */ -#define SP_DP_M_CALCULATION_CTRL_REG 0xd9 -#define SP_M_GEN_CLK_SEL BIT(0) - -/* AUX Channel Access Status Register */ -#define SP_AUX_CH_STATUS_REG 0xe0 -#define SP_AUX_STATUS 0x0f - -/* AUX Channel DEFER Control Register */ -#define SP_AUX_DEFER_CTRL_REG 0xe2 -#define SP_DEFER_CTRL_EN BIT(7) - -/* DP Buffer Data Count Register */ -#define SP_BUF_DATA_COUNT_REG 0xe4 -#define SP_BUF_DATA_COUNT_MASK 0x1f -#define SP_BUF_CLR BIT(7) - -/* DP AUX Channel Control Register 1 */ -#define SP_DP_AUX_CH_CTRL1_REG 0xe5 -#define SP_AUX_TX_COMM_MASK 0x0f -#define SP_AUX_LENGTH_MASK 0xf0 -#define SP_AUX_LENGTH_SHIFT 4 - -/* DP AUX CH Address Register 0 */ -#define SP_AUX_ADDR_7_0_REG 0xe6 - -/* DP AUX CH Address Register 1 */ -#define SP_AUX_ADDR_15_8_REG 0xe7 - -/* DP AUX CH Address Register 2 */ -#define SP_AUX_ADDR_19_16_REG 0xe8 -#define SP_AUX_ADDR_19_16_MASK 0x0f - -/* DP AUX Channel Control Register 2 */ -#define SP_DP_AUX_CH_CTRL2_REG 0xe9 -#define SP_AUX_SEL_RXCM BIT(6) -#define SP_AUX_CHSEL BIT(3) -#define SP_AUX_PN_INV BIT(2) -#define SP_ADDR_ONLY BIT(1) -#define SP_AUX_EN BIT(0) - -/* DP Video Stream Control InfoFrame Register */ -#define SP_DP_3D_VSC_CTRL_REG 0xea -#define SP_INFO_FRAME_VSC_EN BIT(0) - -/* DP Video Stream Data Byte 1 Register */ -#define SP_DP_VSC_DB1_REG 0xeb - -/* DP AUX Channel Control Register 3 */ -#define SP_DP_AUX_CH_CTRL3_REG 0xec -#define SP_WAIT_COUNTER_7_0_MASK 0xff - -/* DP AUX Channel Control Register 4 */ -#define SP_DP_AUX_CH_CTRL4_REG 0xed - -/* DP AUX Buffer Data Registers */ -#define SP_DP_BUF_DATA0_REG 0xf0 - -/***************************************************************/ -/* Register definition of device address 0x72 */ -/***************************************************************/ - -/* - * Core Register Definitions - */ - -/* Device ID Low Byte Register */ -#define SP_DEVICE_IDL_REG 0x02 - -/* Device ID High Byte Register */ -#define SP_DEVICE_IDH_REG 0x03 - -/* Device version register */ -#define SP_DEVICE_VERSION_REG 0x04 - -/* Power Down Control Register */ -#define SP_POWERDOWN_CTRL_REG 0x05 -#define SP_REGISTER_PD BIT(7) -#define SP_HDCP_PD BIT(5) -#define SP_AUDIO_PD BIT(4) -#define SP_VIDEO_PD BIT(3) -#define SP_LINK_PD BIT(2) -#define SP_TOTAL_PD BIT(1) - -/* Reset Control Register 1 */ -#define SP_RESET_CTRL1_REG 0x06 -#define SP_MISC_RST BIT(7) -#define SP_VIDCAP_RST BIT(6) -#define SP_VIDFIF_RST BIT(5) -#define SP_AUDFIF_RST BIT(4) -#define SP_AUDCAP_RST BIT(3) -#define SP_HDCP_RST BIT(2) -#define SP_SW_RST BIT(1) -#define SP_HW_RST BIT(0) - -/* Reset Control Register 2 */ -#define SP_RESET_CTRL2_REG 0x07 -#define SP_AUX_RST BIT(2) -#define SP_SERDES_FIFO_RST BIT(1) -#define SP_I2C_REG_RST BIT(0) - -/* Video Control Register 1 */ -#define SP_VID_CTRL1_REG 0x08 -#define SP_VIDEO_EN BIT(7) -#define SP_VIDEO_MUTE BIT(2) -#define SP_DE_GEN BIT(1) -#define SP_DEMUX BIT(0) - -/* Video Control Register 2 */ -#define SP_VID_CTRL2_REG 0x09 -#define SP_IN_COLOR_F_MASK 0x03 -#define SP_IN_YC_BIT_SEL BIT(2) -#define SP_IN_BPC_MASK 0x70 -#define SP_IN_BPC_SHIFT 4 -# define SP_IN_BPC_12BIT 0x03 -# define SP_IN_BPC_10BIT 0x02 -# define SP_IN_BPC_8BIT 0x01 -# define SP_IN_BPC_6BIT 0x00 -#define SP_IN_D_RANGE BIT(7) - -/* Video Control Register 3 */ -#define SP_VID_CTRL3_REG 0x0a -#define SP_HPD_OUT BIT(6) - -/* Video Control Register 5 */ -#define SP_VID_CTRL5_REG 0x0c -#define SP_CSC_STD_SEL BIT(7) -#define SP_XVYCC_RNG_LMT BIT(6) -#define SP_RANGE_Y2R BIT(5) -#define SP_CSPACE_Y2R BIT(4) -#define SP_RGB_RNG_LMT BIT(3) -#define SP_Y_RNG_LMT BIT(2) -#define SP_RANGE_R2Y BIT(1) -#define SP_CSPACE_R2Y BIT(0) - -/* Video Control Register 6 */ -#define SP_VID_CTRL6_REG 0x0d -#define SP_TEST_PATTERN_EN BIT(7) -#define SP_VIDEO_PROCESS_EN BIT(6) -#define SP_VID_US_MODE BIT(3) -#define SP_VID_DS_MODE BIT(2) -#define SP_UP_SAMPLE BIT(1) -#define SP_DOWN_SAMPLE BIT(0) - -/* Video Control Register 8 */ -#define SP_VID_CTRL8_REG 0x0f -#define SP_VID_VRES_TH BIT(0) - -/* Total Line Status Low Byte Register */ -#define SP_TOTAL_LINE_STAL_REG 0x24 - -/* Total Line Status High Byte Register */ -#define SP_TOTAL_LINE_STAH_REG 0x25 - -/* Active Line Status Low Byte Register */ -#define SP_ACT_LINE_STAL_REG 0x26 - -/* Active Line Status High Byte Register */ -#define SP_ACT_LINE_STAH_REG 0x27 - -/* Vertical Front Porch Status Register */ -#define SP_V_F_PORCH_STA_REG 0x28 - -/* Vertical SYNC Width Status Register */ -#define SP_V_SYNC_STA_REG 0x29 - -/* Vertical Back Porch Status Register */ -#define SP_V_B_PORCH_STA_REG 0x2a - -/* Total Pixel Status Low Byte Register */ -#define SP_TOTAL_PIXEL_STAL_REG 0x2b - -/* Total Pixel Status High Byte Register */ -#define SP_TOTAL_PIXEL_STAH_REG 0x2c - -/* Active Pixel Status Low Byte Register */ -#define SP_ACT_PIXEL_STAL_REG 0x2d - -/* Active Pixel Status High Byte Register */ -#define SP_ACT_PIXEL_STAH_REG 0x2e - -/* Horizontal Front Porch Status Low Byte Register */ -#define SP_H_F_PORCH_STAL_REG 0x2f - -/* Horizontal Front Porch Statys High Byte Register */ -#define SP_H_F_PORCH_STAH_REG 0x30 - -/* Horizontal SYNC Width Status Low Byte Register */ -#define SP_H_SYNC_STAL_REG 0x31 - -/* Horizontal SYNC Width Status High Byte Register */ -#define SP_H_SYNC_STAH_REG 0x32 - -/* Horizontal Back Porch Status Low Byte Register */ -#define SP_H_B_PORCH_STAL_REG 0x33 - -/* Horizontal Back Porch Status High Byte Register */ -#define SP_H_B_PORCH_STAH_REG 0x34 - -/* InfoFrame AVI Packet DB1 Register */ -#define SP_INFOFRAME_AVI_DB1_REG 0x70 - -/* Bit Control Specific Register */ -#define SP_BIT_CTRL_SPECIFIC_REG 0x80 -#define SP_BIT_CTRL_SELECT_SHIFT 1 -#define SP_ENABLE_BIT_CTRL BIT(0) - -/* InfoFrame Audio Packet DB1 Register */ -#define SP_INFOFRAME_AUD_DB1_REG 0x83 - -/* InfoFrame MPEG Packet DB1 Register */ -#define SP_INFOFRAME_MPEG_DB1_REG 0xb0 - -/* Audio Channel Status Registers */ -#define SP_AUD_CH_STATUS_BASE 0xd0 - -/* Audio Channel Num Register 5 */ -#define SP_I2S_CHANNEL_NUM_MASK 0xe0 -# define SP_I2S_CH_NUM_1 (0x00 << 5) -# define SP_I2S_CH_NUM_2 (0x01 << 5) -# define SP_I2S_CH_NUM_3 (0x02 << 5) -# define SP_I2S_CH_NUM_4 (0x03 << 5) -# define SP_I2S_CH_NUM_5 (0x04 << 5) -# define SP_I2S_CH_NUM_6 (0x05 << 5) -# define SP_I2S_CH_NUM_7 (0x06 << 5) -# define SP_I2S_CH_NUM_8 (0x07 << 5) -#define SP_EXT_VUCP BIT(2) -#define SP_VBIT BIT(1) -#define SP_AUDIO_LAYOUT BIT(0) - -/* Analog Debug Register 2 */ -#define SP_ANALOG_DEBUG2_REG 0xdd -#define SP_FORCE_SW_OFF_BYPASS 0x20 -#define SP_XTAL_FRQ 0x1c -# define SP_XTAL_FRQ_19M2 (0x00 << 2) -# define SP_XTAL_FRQ_24M (0x01 << 2) -# define SP_XTAL_FRQ_25M (0x02 << 2) -# define SP_XTAL_FRQ_26M (0x03 << 2) -# define SP_XTAL_FRQ_27M (0x04 << 2) -# define SP_XTAL_FRQ_38M4 (0x05 << 2) -# define SP_XTAL_FRQ_52M (0x06 << 2) -#define SP_POWERON_TIME_1P5MS 0x03 - -/* Analog Control 0 Register */ -#define SP_ANALOG_CTRL0_REG 0xe1 - -/* Common Interrupt Status Register 1 */ -#define SP_COMMON_INT_STATUS_BASE (0xf1 - 1) -#define SP_PLL_LOCK_CHG 0x40 - -/* Common Interrupt Status Register 2 */ -#define SP_COMMON_INT_STATUS2 0xf2 -#define SP_HDCP_AUTH_CHG BIT(1) -#define SP_HDCP_AUTH_DONE BIT(0) - -#define SP_HDCP_LINK_CHECK_FAIL BIT(0) - -/* Common Interrupt Status Register 4 */ -#define SP_COMMON_INT_STATUS4_REG 0xf4 -#define SP_HPD_IRQ BIT(6) -#define SP_HPD_ESYNC_ERR BIT(4) -#define SP_HPD_CHG BIT(2) -#define SP_HPD_LOST BIT(1) -#define SP_HPD_PLUG BIT(0) - -/* DP Interrupt Status Register */ -#define SP_DP_INT_STATUS1_REG 0xf7 -#define SP_TRAINING_FINISH BIT(5) -#define SP_POLLING_ERR BIT(4) - -/* Common Interrupt Mask Register */ -#define SP_COMMON_INT_MASK_BASE (0xf8 - 1) - -#define SP_COMMON_INT_MASK4_REG 0xfb - -/* DP Interrupts Mask Register */ -#define SP_DP_INT_MASK1_REG 0xfe - -/* Interrupt Control Register */ -#define SP_INT_CTRL_REG 0xff - /***************************************************************/ /* Register definition of device address 0x7a */ /***************************************************************/ diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h new file mode 100644 index 000000000000..6295be668cae --- /dev/null +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h @@ -0,0 +1,247 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright(c) 2016, Analogix Semiconductor. + * + * Based on anx7808 driver obtained from chromeos with copyright: + * Copyright(c) 2013, Google Inc. + */ +#ifndef _ANALOGIX_I2C_DPTX_H_ +#define _ANALOGIX_I2C_DPTX_H_ + +#define ANALOGIX_I2C_DPTX 0x70 + +/***************************************************************/ +/* Register definition of device address 0x70 */ +/***************************************************************/ + +/* HDCP Status Register */ +#define SP_TX_HDCP_STATUS_REG 0x00 +#define SP_AUTH_FAIL BIT(5) +#define SP_AUTHEN_PASS BIT(1) + +/* HDCP Control Register 0 */ +#define SP_HDCP_CTRL0_REG 0x01 +#define SP_RX_REPEATER BIT(6) +#define SP_RE_AUTH BIT(5) +#define SP_SW_AUTH_OK BIT(4) +#define SP_HARD_AUTH_EN BIT(3) +#define SP_HDCP_ENC_EN BIT(2) +#define SP_BKSV_SRM_PASS BIT(1) +#define SP_KSVLIST_VLD BIT(0) +/* HDCP Function Enabled */ +#define SP_HDCP_FUNCTION_ENABLED (BIT(0) | BIT(1) | BIT(2) | BIT(3)) + +/* HDCP Receiver BSTATUS Register 0 */ +#define SP_HDCP_RX_BSTATUS0_REG 0x1b +/* HDCP Receiver BSTATUS Register 1 */ +#define SP_HDCP_RX_BSTATUS1_REG 0x1c + +/* HDCP Embedded "Blue Screen" Content Registers */ +#define SP_HDCP_VID0_BLUE_SCREEN_REG 0x2c +#define SP_HDCP_VID1_BLUE_SCREEN_REG 0x2d +#define SP_HDCP_VID2_BLUE_SCREEN_REG 0x2e + +/* HDCP Wait R0 Timing Register */ +#define SP_HDCP_WAIT_R0_TIME_REG 0x40 + +/* HDCP Link Integrity Check Timer Register */ +#define SP_HDCP_LINK_CHECK_TIMER_REG 0x41 + +/* HDCP Repeater Ready Wait Timer Register */ +#define SP_HDCP_RPTR_RDY_WAIT_TIME_REG 0x42 + +/* HDCP Auto Timer Register */ +#define SP_HDCP_AUTO_TIMER_REG 0x51 + +/* HDCP Key Status Register */ +#define SP_HDCP_KEY_STATUS_REG 0x5e + +/* HDCP Key Command Register */ +#define SP_HDCP_KEY_COMMAND_REG 0x5f +#define SP_DISABLE_SYNC_HDCP BIT(2) + +/* OTP Memory Key Protection Registers */ +#define SP_OTP_KEY_PROTECT1_REG 0x60 +#define SP_OTP_KEY_PROTECT2_REG 0x61 +#define SP_OTP_KEY_PROTECT3_REG 0x62 +#define SP_OTP_PSW1 0xa2 +#define SP_OTP_PSW2 0x7e +#define SP_OTP_PSW3 0xc6 + +/* DP System Control Registers */ +#define SP_DP_SYSTEM_CTRL_BASE (0x80 - 1) +/* Bits for DP System Control Register 2 */ +#define SP_CHA_STA BIT(2) +/* Bits for DP System Control Register 3 */ +#define SP_HPD_STATUS BIT(6) +#define SP_STRM_VALID BIT(2) +/* Bits for DP System Control Register 4 */ +#define SP_ENHANCED_MODE BIT(3) + +/* DP Video Control Register */ +#define SP_DP_VIDEO_CTRL_REG 0x84 +#define SP_COLOR_F_MASK 0x06 +#define SP_COLOR_F_SHIFT 1 +#define SP_BPC_MASK 0xe0 +#define SP_BPC_SHIFT 5 +# define SP_BPC_6BITS 0x00 +# define SP_BPC_8BITS 0x01 +# define SP_BPC_10BITS 0x02 +# define SP_BPC_12BITS 0x03 + +/* DP Audio Control Register */ +#define SP_DP_AUDIO_CTRL_REG 0x87 +#define SP_AUD_EN BIT(0) + +/* 10us Pulse Generate Timer Registers */ +#define SP_I2C_GEN_10US_TIMER0_REG 0x88 +#define SP_I2C_GEN_10US_TIMER1_REG 0x89 + +/* Packet Send Control Register */ +#define SP_PACKET_SEND_CTRL_REG 0x90 +#define SP_AUD_IF_UP BIT(7) +#define SP_AVI_IF_UD BIT(6) +#define SP_MPEG_IF_UD BIT(5) +#define SP_SPD_IF_UD BIT(4) +#define SP_AUD_IF_EN BIT(3) +#define SP_AVI_IF_EN BIT(2) +#define SP_MPEG_IF_EN BIT(1) +#define SP_SPD_IF_EN BIT(0) + +/* DP HDCP Control Register */ +#define SP_DP_HDCP_CTRL_REG 0x92 +#define SP_AUTO_EN BIT(7) +#define SP_AUTO_START BIT(5) +#define SP_LINK_POLLING BIT(1) + +/* DP Main Link Bandwidth Setting Register */ +#define SP_DP_MAIN_LINK_BW_SET_REG 0xa0 +#define SP_LINK_BW_SET_MASK 0x1f +#define SP_INITIAL_SLIM_M_AUD_SEL BIT(5) + +/* DP Training Pattern Set Register */ +#define SP_DP_TRAINING_PATTERN_SET_REG 0xa2 + +/* DP Lane 0 Link Training Control Register */ +#define SP_DP_LANE0_LT_CTRL_REG 0xa3 +#define SP_TX_SW_SET_MASK 0x1b +#define SP_MAX_PRE_REACH BIT(5) +#define SP_MAX_DRIVE_REACH BIT(4) +#define SP_PRE_EMP_LEVEL1 BIT(3) +#define SP_DRVIE_CURRENT_LEVEL1 BIT(0) + +/* DP Link Training Control Register */ +#define SP_DP_LT_CTRL_REG 0xa8 +#define SP_LT_ERROR_TYPE_MASK 0x70 +# define SP_LT_NO_ERROR 0x00 +# define SP_LT_AUX_WRITE_ERROR 0x01 +# define SP_LT_MAX_DRIVE_REACHED 0x02 +# define SP_LT_WRONG_LANE_COUNT_SET 0x03 +# define SP_LT_LOOP_SAME_5_TIME 0x04 +# define SP_LT_CR_FAIL_IN_EQ 0x05 +# define SP_LT_EQ_LOOP_5_TIME 0x06 +#define SP_LT_EN BIT(0) + +/* DP CEP Training Control Registers */ +#define SP_DP_CEP_TRAINING_CTRL0_REG 0xa9 +#define SP_DP_CEP_TRAINING_CTRL1_REG 0xaa + +/* DP Debug Register 1 */ +#define SP_DP_DEBUG1_REG 0xb0 +#define SP_DEBUG_PLL_LOCK BIT(4) +#define SP_POLLING_EN BIT(1) + +/* DP Polling Control Register */ +#define SP_DP_POLLING_CTRL_REG 0xb4 +#define SP_AUTO_POLLING_DISABLE BIT(0) + +/* DP Link Debug Control Register */ +#define SP_DP_LINK_DEBUG_CTRL_REG 0xb8 +#define SP_M_VID_DEBUG BIT(5) +#define SP_NEW_PRBS7 BIT(4) +#define SP_INSERT_ER BIT(1) +#define SP_PRBS31_EN BIT(0) + +/* AUX Misc control Register */ +#define SP_AUX_MISC_CTRL_REG 0xbf + +/* DP PLL control Register */ +#define SP_DP_PLL_CTRL_REG 0xc7 +#define SP_PLL_RST BIT(6) + +/* DP Analog Power Down Register */ +#define SP_DP_ANALOG_POWER_DOWN_REG 0xc8 +#define SP_CH0_PD BIT(0) + +/* DP Misc Control Register */ +#define SP_DP_MISC_CTRL_REG 0xcd +#define SP_EQ_TRAINING_LOOP BIT(6) + +/* DP Extra I2C Device Address Register */ +#define SP_DP_EXTRA_I2C_DEV_ADDR_REG 0xce +#define SP_I2C_STRETCH_DISABLE BIT(7) + +#define SP_I2C_EXTRA_ADDR 0x50 + +/* DP Downspread Control Register 1 */ +#define SP_DP_DOWNSPREAD_CTRL1_REG 0xd0 + +/* DP M Value Calculation Control Register */ +#define SP_DP_M_CALCULATION_CTRL_REG 0xd9 +#define SP_M_GEN_CLK_SEL BIT(0) + +/* AUX Channel Access Status Register */ +#define SP_AUX_CH_STATUS_REG 0xe0 +#define SP_AUX_STATUS 0x0f + +/* AUX Channel DEFER Control Register */ +#define SP_AUX_DEFER_CTRL_REG 0xe2 +#define SP_DEFER_CTRL_EN BIT(7) + +/* DP Buffer Data Count Register */ +#define SP_BUF_DATA_COUNT_REG 0xe4 +#define SP_BUF_DATA_COUNT_MASK 0x1f +#define SP_BUF_CLR BIT(7) + +/* DP AUX Channel Control Register 1 */ +#define SP_DP_AUX_CH_CTRL1_REG 0xe5 +#define SP_AUX_TX_COMM_MASK 0x0f +#define SP_AUX_LENGTH_MASK 0xf0 +#define SP_AUX_LENGTH_SHIFT 4 + +/* DP AUX CH Address Register 0 */ +#define SP_AUX_ADDR_7_0_REG 0xe6 + +/* DP AUX CH Address Register 1 */ +#define SP_AUX_ADDR_15_8_REG 0xe7 + +/* DP AUX CH Address Register 2 */ +#define SP_AUX_ADDR_19_16_REG 0xe8 +#define SP_AUX_ADDR_19_16_MASK 0x0f + +/* DP AUX Channel Control Register 2 */ +#define SP_DP_AUX_CH_CTRL2_REG 0xe9 +#define SP_AUX_SEL_RXCM BIT(6) +#define SP_AUX_CHSEL BIT(3) +#define SP_AUX_PN_INV BIT(2) +#define SP_ADDR_ONLY BIT(1) +#define SP_AUX_EN BIT(0) + +/* DP Video Stream Control InfoFrame Register */ +#define SP_DP_3D_VSC_CTRL_REG 0xea +#define SP_INFO_FRAME_VSC_EN BIT(0) + +/* DP Video Stream Data Byte 1 Register */ +#define SP_DP_VSC_DB1_REG 0xeb + +/* DP AUX Channel Control Register 3 */ +#define SP_DP_AUX_CH_CTRL3_REG 0xec +#define SP_WAIT_COUNTER_7_0_MASK 0xff + +/* DP AUX Channel Control Register 4 */ +#define SP_DP_AUX_CH_CTRL4_REG 0xed + +/* DP AUX Buffer Data Registers */ +#define SP_DP_BUF_DATA0_REG 0xf0 + +#endif diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h b/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h new file mode 100644 index 000000000000..c1030e0f74cc --- /dev/null +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h @@ -0,0 +1,233 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright(c) 2016, Analogix Semiconductor. All rights reserved. + */ +#ifndef _ANALOGIX_I2C_TXCOMMON_H_ +#define _ANALOGIX_I2C_TXCOMMON_H_ + +#define ANALOGIX_I2C_TXCOMMON 0x72 + +/***************************************************************/ +/* Register definition of device address 0x72 */ +/***************************************************************/ + +/* + * Core Register Definitions + */ + +/* Device ID Low Byte Register */ +#define SP_DEVICE_IDL_REG 0x02 + +/* Device ID High Byte Register */ +#define SP_DEVICE_IDH_REG 0x03 + +/* Device version register */ +#define SP_DEVICE_VERSION_REG 0x04 + +/* Power Down Control Register */ +#define SP_POWERDOWN_CTRL_REG 0x05 +#define SP_REGISTER_PD BIT(7) +#define SP_HDCP_PD BIT(5) +#define SP_AUDIO_PD BIT(4) +#define SP_VIDEO_PD BIT(3) +#define SP_LINK_PD BIT(2) +#define SP_TOTAL_PD BIT(1) + +/* Reset Control Register 1 */ +#define SP_RESET_CTRL1_REG 0x06 +#define SP_MISC_RST BIT(7) +#define SP_VIDCAP_RST BIT(6) +#define SP_VIDFIF_RST BIT(5) +#define SP_AUDFIF_RST BIT(4) +#define SP_AUDCAP_RST BIT(3) +#define SP_HDCP_RST BIT(2) +#define SP_SW_RST BIT(1) +#define SP_HW_RST BIT(0) + +/* Reset Control Register 2 */ +#define SP_RESET_CTRL2_REG 0x07 +#define SP_AUX_RST BIT(2) +#define SP_SERDES_FIFO_RST BIT(1) +#define SP_I2C_REG_RST BIT(0) + +/* Video Control Register 1 */ +#define SP_VID_CTRL1_REG 0x08 +#define SP_VIDEO_EN BIT(7) +#define SP_VIDEO_MUTE BIT(2) +#define SP_DE_GEN BIT(1) +#define SP_DEMUX BIT(0) + +/* Video Control Register 2 */ +#define SP_VID_CTRL2_REG 0x09 +#define SP_IN_COLOR_F_MASK 0x03 +#define SP_IN_YC_BIT_SEL BIT(2) +#define SP_IN_BPC_MASK 0x70 +#define SP_IN_BPC_SHIFT 4 +# define SP_IN_BPC_12BIT 0x03 +# define SP_IN_BPC_10BIT 0x02 +# define SP_IN_BPC_8BIT 0x01 +# define SP_IN_BPC_6BIT 0x00 +#define SP_IN_D_RANGE BIT(7) + +/* Video Control Register 3 */ +#define SP_VID_CTRL3_REG 0x0a +#define SP_HPD_OUT BIT(6) + +/* Video Control Register 5 */ +#define SP_VID_CTRL5_REG 0x0c +#define SP_CSC_STD_SEL BIT(7) +#define SP_XVYCC_RNG_LMT BIT(6) +#define SP_RANGE_Y2R BIT(5) +#define SP_CSPACE_Y2R BIT(4) +#define SP_RGB_RNG_LMT BIT(3) +#define SP_Y_RNG_LMT BIT(2) +#define SP_RANGE_R2Y BIT(1) +#define SP_CSPACE_R2Y BIT(0) + +/* Video Control Register 6 */ +#define SP_VID_CTRL6_REG 0x0d +#define SP_TEST_PATTERN_EN BIT(7) +#define SP_VIDEO_PROCESS_EN BIT(6) +#define SP_VID_US_MODE BIT(3) +#define SP_VID_DS_MODE BIT(2) +#define SP_UP_SAMPLE BIT(1) +#define SP_DOWN_SAMPLE BIT(0) + +/* Video Control Register 8 */ +#define SP_VID_CTRL8_REG 0x0f +#define SP_VID_VRES_TH BIT(0) + +/* Total Line Status Low Byte Register */ +#define SP_TOTAL_LINE_STAL_REG 0x24 + +/* Total Line Status High Byte Register */ +#define SP_TOTAL_LINE_STAH_REG 0x25 + +/* Active Line Status Low Byte Register */ +#define SP_ACT_LINE_STAL_REG 0x26 + +/* Active Line Status High Byte Register */ +#define SP_ACT_LINE_STAH_REG 0x27 + +/* Vertical Front Porch Status Register */ +#define SP_V_F_PORCH_STA_REG 0x28 + +/* Vertical SYNC Width Status Register */ +#define SP_V_SYNC_STA_REG 0x29 + +/* Vertical Back Porch Status Register */ +#define SP_V_B_PORCH_STA_REG 0x2a + +/* Total Pixel Status Low Byte Register */ +#define SP_TOTAL_PIXEL_STAL_REG 0x2b + +/* Total Pixel Status High Byte Register */ +#define SP_TOTAL_PIXEL_STAH_REG 0x2c + +/* Active Pixel Status Low Byte Register */ +#define SP_ACT_PIXEL_STAL_REG 0x2d + +/* Active Pixel Status High Byte Register */ +#define SP_ACT_PIXEL_STAH_REG 0x2e + +/* Horizontal Front Porch Status Low Byte Register */ +#define SP_H_F_PORCH_STAL_REG 0x2f + +/* Horizontal Front Porch Statys High Byte Register */ +#define SP_H_F_PORCH_STAH_REG 0x30 + +/* Horizontal SYNC Width Status Low Byte Register */ +#define SP_H_SYNC_STAL_REG 0x31 + +/* Horizontal SYNC Width Status High Byte Register */ +#define SP_H_SYNC_STAH_REG 0x32 + +/* Horizontal Back Porch Status Low Byte Register */ +#define SP_H_B_PORCH_STAL_REG 0x33 + +/* Horizontal Back Porch Status High Byte Register */ +#define SP_H_B_PORCH_STAH_REG 0x34 + +/* InfoFrame AVI Packet DB1 Register */ +#define SP_INFOFRAME_AVI_DB1_REG 0x70 + +/* Bit Control Specific Register */ +#define SP_BIT_CTRL_SPECIFIC_REG 0x80 +#define SP_BIT_CTRL_SELECT_SHIFT 1 +#define SP_ENABLE_BIT_CTRL BIT(0) + +/* InfoFrame Audio Packet DB1 Register */ +#define SP_INFOFRAME_AUD_DB1_REG 0x83 + +/* InfoFrame MPEG Packet DB1 Register */ +#define SP_INFOFRAME_MPEG_DB1_REG 0xb0 + +/* Audio Channel Status Registers */ +#define SP_AUD_CH_STATUS_BASE 0xd0 + +/* Audio Channel Num Register 5 */ +#define SP_I2S_CHANNEL_NUM_MASK 0xe0 +# define SP_I2S_CH_NUM_1 (0x00 << 5) +# define SP_I2S_CH_NUM_2 (0x01 << 5) +# define SP_I2S_CH_NUM_3 (0x02 << 5) +# define SP_I2S_CH_NUM_4 (0x03 << 5) +# define SP_I2S_CH_NUM_5 (0x04 << 5) +# define SP_I2S_CH_NUM_6 (0x05 << 5) +# define SP_I2S_CH_NUM_7 (0x06 << 5) +# define SP_I2S_CH_NUM_8 (0x07 << 5) +#define SP_EXT_VUCP BIT(2) +#define SP_VBIT BIT(1) +#define SP_AUDIO_LAYOUT BIT(0) + +/* Analog Debug Register 2 */ +#define SP_ANALOG_DEBUG2_REG 0xdd +#define SP_FORCE_SW_OFF_BYPASS 0x20 +#define SP_XTAL_FRQ 0x1c +# define SP_XTAL_FRQ_19M2 (0x00 << 2) +# define SP_XTAL_FRQ_24M (0x01 << 2) +# define SP_XTAL_FRQ_25M (0x02 << 2) +# define SP_XTAL_FRQ_26M (0x03 << 2) +# define SP_XTAL_FRQ_27M (0x04 << 2) +# define SP_XTAL_FRQ_38M4 (0x05 << 2) +# define SP_XTAL_FRQ_52M (0x06 << 2) +#define SP_POWERON_TIME_1P5MS 0x03 + +/* Analog Control 0 Register */ +#define SP_ANALOG_CTRL0_REG 0xe1 + +/* Common Interrupt Status Register 1 */ +#define SP_COMMON_INT_STATUS_BASE (0xf1 - 1) +#define SP_PLL_LOCK_CHG 0x40 + +/* Common Interrupt Status Register 2 */ +#define SP_COMMON_INT_STATUS2 0xf2 +#define SP_HDCP_AUTH_CHG BIT(1) +#define SP_HDCP_AUTH_DONE BIT(0) + +#define SP_HDCP_LINK_CHECK_FAIL BIT(0) + +/* Common Interrupt Status Register 4 */ +#define SP_COMMON_INT_STATUS4_REG 0xf4 +#define SP_HPD_IRQ BIT(6) +#define SP_HPD_ESYNC_ERR BIT(4) +#define SP_HPD_CHG BIT(2) +#define SP_HPD_LOST BIT(1) +#define SP_HPD_PLUG BIT(0) + +/* DP Interrupt Status Register */ +#define SP_DP_INT_STATUS1_REG 0xf7 +#define SP_TRAINING_FINISH BIT(5) +#define SP_POLLING_ERR BIT(4) + +/* Common Interrupt Mask Register */ +#define SP_COMMON_INT_MASK_BASE (0xf8 - 1) + +#define SP_COMMON_INT_MASK4_REG 0xfb + +/* DP Interrupts Mask Register */ +#define SP_DP_INT_MASK1_REG 0xfe + +/* Interrupt Control Register */ +#define SP_INT_CTRL_REG 0xff + +#endif /* _ANALOGIX_I2C_TXCOMMON_H_ */ -- 2.16.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 3/7] drm/bridge: extract some Analogix I2C DP common code [not found] <<20190722150414.9F97668B20@verein.lst.de> @ 2019-07-22 15:11 ` Torsten Duwe 2019-07-22 15:11 ` Torsten Duwe ` (5 subsequent siblings) 6 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-22 15:11 UTC (permalink / raw) To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Vasily Khoruzhick, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner Cc: dri-devel, devicetree, linux-arm-kernel, linux-kernel From: Icenowy Zheng <icenowy@aosc.io> Some code can be shared within different DP bridges by Analogix. Extract them to analogix_dp. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Torsten Duwe <duwe@suse.de> Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> --- drivers/gpu/drm/bridge/analogix/Makefile | 2 +- drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 146 +----------------- .../gpu/drm/bridge/analogix/analogix-i2c-dptx.c | 165 +++++++++++++++++++++ .../gpu/drm/bridge/analogix/analogix-i2c-dptx.h | 3 + 4 files changed, 170 insertions(+), 146 deletions(-) create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c diff --git a/drivers/gpu/drm/bridge/analogix/Makefile b/drivers/gpu/drm/bridge/analogix/Makefile index 6fcbfd3ee560..7623b9b80167 100644 --- a/drivers/gpu/drm/bridge/analogix/Makefile +++ b/drivers/gpu/drm/bridge/analogix/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o +analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o analogix-i2c-dptx.o obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c index 3c7cc5af735c..c36e2c9445a3 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c @@ -35,8 +35,6 @@ #define I2C_IDX_RX_P1 4 #define XTAL_CLK 270 /* 27M */ -#define AUX_CH_BUFFER_SIZE 16 -#define AUX_WAIT_TIMEOUT_MS 15 static const u8 anx78xx_i2c_addresses[] = { [I2C_IDX_TX_P0] = TX_P0, @@ -99,153 +97,11 @@ static int anx78xx_clear_bits(struct regmap *map, u8 reg, u8 mask) return regmap_update_bits(map, reg, mask, 0); } -static bool anx78xx_aux_op_finished(struct anx78xx *anx78xx) -{ - unsigned int value; - int err; - - err = regmap_read(anx78xx->map[I2C_IDX_TX_P0], SP_DP_AUX_CH_CTRL2_REG, - &value); - if (err < 0) - return false; - - return (value & SP_AUX_EN) == 0; -} - -static int anx78xx_aux_wait(struct anx78xx *anx78xx) -{ - unsigned long timeout; - unsigned int status; - int err; - - timeout = jiffies + msecs_to_jiffies(AUX_WAIT_TIMEOUT_MS) + 1; - - while (!anx78xx_aux_op_finished(anx78xx)) { - if (time_after(jiffies, timeout)) { - if (!anx78xx_aux_op_finished(anx78xx)) { - DRM_ERROR("Timed out waiting AUX to finish\n"); - return -ETIMEDOUT; - } - - break; - } - - usleep_range(1000, 2000); - } - - /* Read the AUX channel access status */ - err = regmap_read(anx78xx->map[I2C_IDX_TX_P0], SP_AUX_CH_STATUS_REG, - &status); - if (err < 0) { - DRM_ERROR("Failed to read from AUX channel: %d\n", err); - return err; - } - - if (status & SP_AUX_STATUS) { - DRM_ERROR("Failed to wait for AUX channel (status: %02x)\n", - status); - return -ETIMEDOUT; - } - - return 0; -} - -static int anx78xx_aux_address(struct anx78xx *anx78xx, unsigned int addr) -{ - int err; - - err = regmap_write(anx78xx->map[I2C_IDX_TX_P0], SP_AUX_ADDR_7_0_REG, - addr & 0xff); - if (err) - return err; - - err = regmap_write(anx78xx->map[I2C_IDX_TX_P0], SP_AUX_ADDR_15_8_REG, - (addr & 0xff00) >> 8); - if (err) - return err; - - /* - * DP AUX CH Address Register #2, only update bits[3:0] - * [7:4] RESERVED - * [3:0] AUX_ADDR[19:16], Register control AUX CH address. - */ - err = regmap_update_bits(anx78xx->map[I2C_IDX_TX_P0], - SP_AUX_ADDR_19_16_REG, - SP_AUX_ADDR_19_16_MASK, - (addr & 0xf0000) >> 16); - - if (err) - return err; - - return 0; -} - static ssize_t anx78xx_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) { struct anx78xx *anx78xx = container_of(aux, struct anx78xx, aux); - u8 ctrl1 = msg->request; - u8 ctrl2 = SP_AUX_EN; - u8 *buffer = msg->buffer; - int err; - - /* The DP AUX transmit and receive buffer has 16 bytes. */ - if (WARN_ON(msg->size > AUX_CH_BUFFER_SIZE)) - return -E2BIG; - - /* Zero-sized messages specify address-only transactions. */ - if (msg->size < 1) - ctrl2 |= SP_ADDR_ONLY; - else /* For non-zero-sized set the length field. */ - ctrl1 |= (msg->size - 1) << SP_AUX_LENGTH_SHIFT; - - if ((msg->request & DP_AUX_I2C_READ) == 0) { - /* When WRITE | MOT write values to data buffer */ - err = regmap_bulk_write(anx78xx->map[I2C_IDX_TX_P0], - SP_DP_BUF_DATA0_REG, buffer, - msg->size); - if (err) - return err; - } - - /* Write address and request */ - err = anx78xx_aux_address(anx78xx, msg->address); - if (err) - return err; - - err = regmap_write(anx78xx->map[I2C_IDX_TX_P0], SP_DP_AUX_CH_CTRL1_REG, - ctrl1); - if (err) - return err; - - /* Start transaction */ - err = regmap_update_bits(anx78xx->map[I2C_IDX_TX_P0], - SP_DP_AUX_CH_CTRL2_REG, SP_ADDR_ONLY | - SP_AUX_EN, ctrl2); - if (err) - return err; - - err = anx78xx_aux_wait(anx78xx); - if (err) - return err; - - msg->reply = DP_AUX_I2C_REPLY_ACK; - - if ((msg->size > 0) && (msg->request & DP_AUX_I2C_READ)) { - /* Read values from data buffer */ - err = regmap_bulk_read(anx78xx->map[I2C_IDX_TX_P0], - SP_DP_BUF_DATA0_REG, buffer, - msg->size); - if (err) - return err; - } - - err = anx78xx_clear_bits(anx78xx->map[I2C_IDX_TX_P0], - SP_DP_AUX_CH_CTRL2_REG, SP_ADDR_ONLY); - if (err) - return err; - - return msg->size; + return anx_dp_aux_transfer(anx78xx->map[I2C_IDX_TX_P0], msg); } static int anx78xx_set_hpd(struct anx78xx *anx78xx) diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c new file mode 100644 index 000000000000..60707bb5afe7 --- /dev/null +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c @@ -0,0 +1,165 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright(c) 2016, Analogix Semiconductor. + * + * Based on anx7808 driver obtained from chromeos with copyright: + * Copyright(c) 2013, Google Inc. + */ +#include <linux/regmap.h> + +#include <drm/drm.h> +#include <drm/drm_dp_helper.h> +#include <drm/drm_print.h> + +#include "analogix-i2c-dptx.h" + +#define AUX_WAIT_TIMEOUT_MS 15 +#define AUX_CH_BUFFER_SIZE 16 + +static int anx_i2c_dp_clear_bits(struct regmap *map, u8 reg, u8 mask) +{ + return regmap_update_bits(map, reg, mask, 0); +} + +static bool anx_dp_aux_op_finished(struct regmap *map_dptx) +{ + unsigned int value; + int err; + + err = regmap_read(map_dptx, SP_DP_AUX_CH_CTRL2_REG, &value); + if (err < 0) + return false; + + return (value & SP_AUX_EN) == 0; +} + +static int anx_dp_aux_wait(struct regmap *map_dptx) +{ + unsigned long timeout; + unsigned int status; + int err; + + timeout = jiffies + msecs_to_jiffies(AUX_WAIT_TIMEOUT_MS) + 1; + + while (!anx_dp_aux_op_finished(map_dptx)) { + if (time_after(jiffies, timeout)) { + if (!anx_dp_aux_op_finished(map_dptx)) { + DRM_ERROR("Timed out waiting AUX to finish\n"); + return -ETIMEDOUT; + } + + break; + } + + usleep_range(1000, 2000); + } + + /* Read the AUX channel access status */ + err = regmap_read(map_dptx, SP_AUX_CH_STATUS_REG, &status); + if (err < 0) { + DRM_ERROR("Failed to read from AUX channel: %d\n", err); + return err; + } + + if (status & SP_AUX_STATUS) { + DRM_ERROR("Failed to wait for AUX channel (status: %02x)\n", + status); + return -ETIMEDOUT; + } + + return 0; +} + +static int anx_dp_aux_address(struct regmap *map_dptx, unsigned int addr) +{ + int err; + + err = regmap_write(map_dptx, SP_AUX_ADDR_7_0_REG, addr & 0xff); + if (err) + return err; + + err = regmap_write(map_dptx, SP_AUX_ADDR_15_8_REG, + (addr & 0xff00) >> 8); + if (err) + return err; + + /* + * DP AUX CH Address Register #2, only update bits[3:0] + * [7:4] RESERVED + * [3:0] AUX_ADDR[19:16], Register control AUX CH address. + */ + err = regmap_update_bits(map_dptx, SP_AUX_ADDR_19_16_REG, + SP_AUX_ADDR_19_16_MASK, + (addr & 0xf0000) >> 16); + + if (err) + return err; + + return 0; +} + +ssize_t anx_dp_aux_transfer(struct regmap *map_dptx, + struct drm_dp_aux_msg *msg) +{ + u8 ctrl1 = msg->request; + u8 ctrl2 = SP_AUX_EN; + u8 *buffer = msg->buffer; + int err; + + /* The DP AUX transmit and receive buffer has 16 bytes. */ + if (WARN_ON(msg->size > AUX_CH_BUFFER_SIZE)) + return -E2BIG; + + /* Zero-sized messages specify address-only transactions. */ + if (msg->size < 1) + ctrl2 |= SP_ADDR_ONLY; + else /* For non-zero-sized set the length field. */ + ctrl1 |= (msg->size - 1) << SP_AUX_LENGTH_SHIFT; + + if ((msg->request & DP_AUX_I2C_READ) == 0) { + /* When WRITE | MOT write values to data buffer */ + err = regmap_bulk_write(map_dptx, + SP_DP_BUF_DATA0_REG, buffer, + msg->size); + if (err) + return err; + } + + /* Write address and request */ + err = anx_dp_aux_address(map_dptx, msg->address); + if (err) + return err; + + err = regmap_write(map_dptx, SP_DP_AUX_CH_CTRL1_REG, ctrl1); + if (err) + return err; + + /* Start transaction */ + err = regmap_update_bits(map_dptx, SP_DP_AUX_CH_CTRL2_REG, + SP_ADDR_ONLY | SP_AUX_EN, ctrl2); + if (err) + return err; + + err = anx_dp_aux_wait(map_dptx); + if (err) + return err; + + msg->reply = DP_AUX_I2C_REPLY_ACK; + + if ((msg->size > 0) && (msg->request & DP_AUX_I2C_READ)) { + /* Read values from data buffer */ + err = regmap_bulk_read(map_dptx, + SP_DP_BUF_DATA0_REG, buffer, + msg->size); + if (err) + return err; + } + + err = anx_i2c_dp_clear_bits(map_dptx, SP_DP_AUX_CH_CTRL2_REG, + SP_ADDR_ONLY); + if (err) + return err; + + return msg->size; +} +EXPORT_SYMBOL_GPL(anx_dp_aux_transfer); diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h index 6295be668cae..430a039c10cd 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h @@ -244,4 +244,7 @@ /* DP AUX Buffer Data Registers */ #define SP_DP_BUF_DATA0_REG 0xf0 +ssize_t anx_dp_aux_transfer(struct regmap *map_dptx, + struct drm_dp_aux_msg *msg); + #endif -- 2.16.4 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 3/7] drm/bridge: extract some Analogix I2C DP common code @ 2019-07-22 15:11 ` Torsten Duwe 0 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-22 15:11 UTC (permalink / raw) To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Vasily Khoruzhick, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner Cc: devicetree, linux-arm-kernel, dri-devel, linux-kernel From: Icenowy Zheng <icenowy@aosc.io> Some code can be shared within different DP bridges by Analogix. Extract them to analogix_dp. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Torsten Duwe <duwe@suse.de> Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> --- drivers/gpu/drm/bridge/analogix/Makefile | 2 +- drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 146 +----------------- .../gpu/drm/bridge/analogix/analogix-i2c-dptx.c | 165 +++++++++++++++++++++ .../gpu/drm/bridge/analogix/analogix-i2c-dptx.h | 3 + 4 files changed, 170 insertions(+), 146 deletions(-) create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c diff --git a/drivers/gpu/drm/bridge/analogix/Makefile b/drivers/gpu/drm/bridge/analogix/Makefile index 6fcbfd3ee560..7623b9b80167 100644 --- a/drivers/gpu/drm/bridge/analogix/Makefile +++ b/drivers/gpu/drm/bridge/analogix/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o +analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o analogix-i2c-dptx.o obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c index 3c7cc5af735c..c36e2c9445a3 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c @@ -35,8 +35,6 @@ #define I2C_IDX_RX_P1 4 #define XTAL_CLK 270 /* 27M */ -#define AUX_CH_BUFFER_SIZE 16 -#define AUX_WAIT_TIMEOUT_MS 15 static const u8 anx78xx_i2c_addresses[] = { [I2C_IDX_TX_P0] = TX_P0, @@ -99,153 +97,11 @@ static int anx78xx_clear_bits(struct regmap *map, u8 reg, u8 mask) return regmap_update_bits(map, reg, mask, 0); } -static bool anx78xx_aux_op_finished(struct anx78xx *anx78xx) -{ - unsigned int value; - int err; - - err = regmap_read(anx78xx->map[I2C_IDX_TX_P0], SP_DP_AUX_CH_CTRL2_REG, - &value); - if (err < 0) - return false; - - return (value & SP_AUX_EN) == 0; -} - -static int anx78xx_aux_wait(struct anx78xx *anx78xx) -{ - unsigned long timeout; - unsigned int status; - int err; - - timeout = jiffies + msecs_to_jiffies(AUX_WAIT_TIMEOUT_MS) + 1; - - while (!anx78xx_aux_op_finished(anx78xx)) { - if (time_after(jiffies, timeout)) { - if (!anx78xx_aux_op_finished(anx78xx)) { - DRM_ERROR("Timed out waiting AUX to finish\n"); - return -ETIMEDOUT; - } - - break; - } - - usleep_range(1000, 2000); - } - - /* Read the AUX channel access status */ - err = regmap_read(anx78xx->map[I2C_IDX_TX_P0], SP_AUX_CH_STATUS_REG, - &status); - if (err < 0) { - DRM_ERROR("Failed to read from AUX channel: %d\n", err); - return err; - } - - if (status & SP_AUX_STATUS) { - DRM_ERROR("Failed to wait for AUX channel (status: %02x)\n", - status); - return -ETIMEDOUT; - } - - return 0; -} - -static int anx78xx_aux_address(struct anx78xx *anx78xx, unsigned int addr) -{ - int err; - - err = regmap_write(anx78xx->map[I2C_IDX_TX_P0], SP_AUX_ADDR_7_0_REG, - addr & 0xff); - if (err) - return err; - - err = regmap_write(anx78xx->map[I2C_IDX_TX_P0], SP_AUX_ADDR_15_8_REG, - (addr & 0xff00) >> 8); - if (err) - return err; - - /* - * DP AUX CH Address Register #2, only update bits[3:0] - * [7:4] RESERVED - * [3:0] AUX_ADDR[19:16], Register control AUX CH address. - */ - err = regmap_update_bits(anx78xx->map[I2C_IDX_TX_P0], - SP_AUX_ADDR_19_16_REG, - SP_AUX_ADDR_19_16_MASK, - (addr & 0xf0000) >> 16); - - if (err) - return err; - - return 0; -} - static ssize_t anx78xx_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) { struct anx78xx *anx78xx = container_of(aux, struct anx78xx, aux); - u8 ctrl1 = msg->request; - u8 ctrl2 = SP_AUX_EN; - u8 *buffer = msg->buffer; - int err; - - /* The DP AUX transmit and receive buffer has 16 bytes. */ - if (WARN_ON(msg->size > AUX_CH_BUFFER_SIZE)) - return -E2BIG; - - /* Zero-sized messages specify address-only transactions. */ - if (msg->size < 1) - ctrl2 |= SP_ADDR_ONLY; - else /* For non-zero-sized set the length field. */ - ctrl1 |= (msg->size - 1) << SP_AUX_LENGTH_SHIFT; - - if ((msg->request & DP_AUX_I2C_READ) == 0) { - /* When WRITE | MOT write values to data buffer */ - err = regmap_bulk_write(anx78xx->map[I2C_IDX_TX_P0], - SP_DP_BUF_DATA0_REG, buffer, - msg->size); - if (err) - return err; - } - - /* Write address and request */ - err = anx78xx_aux_address(anx78xx, msg->address); - if (err) - return err; - - err = regmap_write(anx78xx->map[I2C_IDX_TX_P0], SP_DP_AUX_CH_CTRL1_REG, - ctrl1); - if (err) - return err; - - /* Start transaction */ - err = regmap_update_bits(anx78xx->map[I2C_IDX_TX_P0], - SP_DP_AUX_CH_CTRL2_REG, SP_ADDR_ONLY | - SP_AUX_EN, ctrl2); - if (err) - return err; - - err = anx78xx_aux_wait(anx78xx); - if (err) - return err; - - msg->reply = DP_AUX_I2C_REPLY_ACK; - - if ((msg->size > 0) && (msg->request & DP_AUX_I2C_READ)) { - /* Read values from data buffer */ - err = regmap_bulk_read(anx78xx->map[I2C_IDX_TX_P0], - SP_DP_BUF_DATA0_REG, buffer, - msg->size); - if (err) - return err; - } - - err = anx78xx_clear_bits(anx78xx->map[I2C_IDX_TX_P0], - SP_DP_AUX_CH_CTRL2_REG, SP_ADDR_ONLY); - if (err) - return err; - - return msg->size; + return anx_dp_aux_transfer(anx78xx->map[I2C_IDX_TX_P0], msg); } static int anx78xx_set_hpd(struct anx78xx *anx78xx) diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c new file mode 100644 index 000000000000..60707bb5afe7 --- /dev/null +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c @@ -0,0 +1,165 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright(c) 2016, Analogix Semiconductor. + * + * Based on anx7808 driver obtained from chromeos with copyright: + * Copyright(c) 2013, Google Inc. + */ +#include <linux/regmap.h> + +#include <drm/drm.h> +#include <drm/drm_dp_helper.h> +#include <drm/drm_print.h> + +#include "analogix-i2c-dptx.h" + +#define AUX_WAIT_TIMEOUT_MS 15 +#define AUX_CH_BUFFER_SIZE 16 + +static int anx_i2c_dp_clear_bits(struct regmap *map, u8 reg, u8 mask) +{ + return regmap_update_bits(map, reg, mask, 0); +} + +static bool anx_dp_aux_op_finished(struct regmap *map_dptx) +{ + unsigned int value; + int err; + + err = regmap_read(map_dptx, SP_DP_AUX_CH_CTRL2_REG, &value); + if (err < 0) + return false; + + return (value & SP_AUX_EN) == 0; +} + +static int anx_dp_aux_wait(struct regmap *map_dptx) +{ + unsigned long timeout; + unsigned int status; + int err; + + timeout = jiffies + msecs_to_jiffies(AUX_WAIT_TIMEOUT_MS) + 1; + + while (!anx_dp_aux_op_finished(map_dptx)) { + if (time_after(jiffies, timeout)) { + if (!anx_dp_aux_op_finished(map_dptx)) { + DRM_ERROR("Timed out waiting AUX to finish\n"); + return -ETIMEDOUT; + } + + break; + } + + usleep_range(1000, 2000); + } + + /* Read the AUX channel access status */ + err = regmap_read(map_dptx, SP_AUX_CH_STATUS_REG, &status); + if (err < 0) { + DRM_ERROR("Failed to read from AUX channel: %d\n", err); + return err; + } + + if (status & SP_AUX_STATUS) { + DRM_ERROR("Failed to wait for AUX channel (status: %02x)\n", + status); + return -ETIMEDOUT; + } + + return 0; +} + +static int anx_dp_aux_address(struct regmap *map_dptx, unsigned int addr) +{ + int err; + + err = regmap_write(map_dptx, SP_AUX_ADDR_7_0_REG, addr & 0xff); + if (err) + return err; + + err = regmap_write(map_dptx, SP_AUX_ADDR_15_8_REG, + (addr & 0xff00) >> 8); + if (err) + return err; + + /* + * DP AUX CH Address Register #2, only update bits[3:0] + * [7:4] RESERVED + * [3:0] AUX_ADDR[19:16], Register control AUX CH address. + */ + err = regmap_update_bits(map_dptx, SP_AUX_ADDR_19_16_REG, + SP_AUX_ADDR_19_16_MASK, + (addr & 0xf0000) >> 16); + + if (err) + return err; + + return 0; +} + +ssize_t anx_dp_aux_transfer(struct regmap *map_dptx, + struct drm_dp_aux_msg *msg) +{ + u8 ctrl1 = msg->request; + u8 ctrl2 = SP_AUX_EN; + u8 *buffer = msg->buffer; + int err; + + /* The DP AUX transmit and receive buffer has 16 bytes. */ + if (WARN_ON(msg->size > AUX_CH_BUFFER_SIZE)) + return -E2BIG; + + /* Zero-sized messages specify address-only transactions. */ + if (msg->size < 1) + ctrl2 |= SP_ADDR_ONLY; + else /* For non-zero-sized set the length field. */ + ctrl1 |= (msg->size - 1) << SP_AUX_LENGTH_SHIFT; + + if ((msg->request & DP_AUX_I2C_READ) == 0) { + /* When WRITE | MOT write values to data buffer */ + err = regmap_bulk_write(map_dptx, + SP_DP_BUF_DATA0_REG, buffer, + msg->size); + if (err) + return err; + } + + /* Write address and request */ + err = anx_dp_aux_address(map_dptx, msg->address); + if (err) + return err; + + err = regmap_write(map_dptx, SP_DP_AUX_CH_CTRL1_REG, ctrl1); + if (err) + return err; + + /* Start transaction */ + err = regmap_update_bits(map_dptx, SP_DP_AUX_CH_CTRL2_REG, + SP_ADDR_ONLY | SP_AUX_EN, ctrl2); + if (err) + return err; + + err = anx_dp_aux_wait(map_dptx); + if (err) + return err; + + msg->reply = DP_AUX_I2C_REPLY_ACK; + + if ((msg->size > 0) && (msg->request & DP_AUX_I2C_READ)) { + /* Read values from data buffer */ + err = regmap_bulk_read(map_dptx, + SP_DP_BUF_DATA0_REG, buffer, + msg->size); + if (err) + return err; + } + + err = anx_i2c_dp_clear_bits(map_dptx, SP_DP_AUX_CH_CTRL2_REG, + SP_ADDR_ONLY); + if (err) + return err; + + return msg->size; +} +EXPORT_SYMBOL_GPL(anx_dp_aux_transfer); diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h index 6295be668cae..430a039c10cd 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h @@ -244,4 +244,7 @@ /* DP AUX Buffer Data Registers */ #define SP_DP_BUF_DATA0_REG 0xf0 +ssize_t anx_dp_aux_transfer(struct regmap *map_dptx, + struct drm_dp_aux_msg *msg); + #endif -- 2.16.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 4/7] drm/bridge: Prepare Analogix anx6345 support [not found] <<20190722150414.9F97668B20@verein.lst.de> @ 2019-07-22 15:11 ` Torsten Duwe 2019-07-22 15:11 ` Torsten Duwe ` (5 subsequent siblings) 6 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-22 15:11 UTC (permalink / raw) To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Vasily Khoruzhick, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner Cc: dri-devel, devicetree, linux-arm-kernel, linux-kernel Add bit definitions required for the anx6345 and add a sanity check in anx_dp_aux_transfer. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Torsten Duwe <duwe@suse.de> Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> --- drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c | 2 +- drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h | 8 ++++++++ drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c index 60707bb5afe7..fe40bab21530 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c @@ -116,7 +116,7 @@ ssize_t anx_dp_aux_transfer(struct regmap *map_dptx, else /* For non-zero-sized set the length field. */ ctrl1 |= (msg->size - 1) << SP_AUX_LENGTH_SHIFT; - if ((msg->request & DP_AUX_I2C_READ) == 0) { + if ((msg->size > 0) && ((msg->request & DP_AUX_I2C_READ) == 0)) { /* When WRITE | MOT write values to data buffer */ err = regmap_bulk_write(map_dptx, SP_DP_BUF_DATA0_REG, buffer, diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h index 430a039c10cd..24bc67ac5479 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h @@ -74,7 +74,11 @@ #define SP_CHA_STA BIT(2) /* Bits for DP System Control Register 3 */ #define SP_HPD_STATUS BIT(6) +#define SP_HPD_FORCE BIT(5) +#define SP_HPD_CTRL BIT(4) #define SP_STRM_VALID BIT(2) +#define SP_STRM_FORCE BIT(1) +#define SP_STRM_CTRL BIT(0) /* Bits for DP System Control Register 4 */ #define SP_ENHANCED_MODE BIT(3) @@ -119,6 +123,9 @@ #define SP_LINK_BW_SET_MASK 0x1f #define SP_INITIAL_SLIM_M_AUD_SEL BIT(5) +/* DP Lane Count Setting Register */ +#define SP_DP_LANE_COUNT_SET_REG 0xa1 + /* DP Training Pattern Set Register */ #define SP_DP_TRAINING_PATTERN_SET_REG 0xa2 @@ -132,6 +139,7 @@ /* DP Link Training Control Register */ #define SP_DP_LT_CTRL_REG 0xa8 +#define SP_DP_LT_INPROGRESS 0x80 #define SP_LT_ERROR_TYPE_MASK 0x70 # define SP_LT_NO_ERROR 0x00 # define SP_LT_AUX_WRITE_ERROR 0x01 diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h b/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h index c1030e0f74cc..9fa6f426f990 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h @@ -179,6 +179,9 @@ #define SP_VBIT BIT(1) #define SP_AUDIO_LAYOUT BIT(0) +/* Analog Debug Register 1 */ +#define SP_ANALOG_DEBUG1_REG 0xdc + /* Analog Debug Register 2 */ #define SP_ANALOG_DEBUG2_REG 0xdd #define SP_FORCE_SW_OFF_BYPASS 0x20 -- 2.16.4 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 4/7] drm/bridge: Prepare Analogix anx6345 support @ 2019-07-22 15:11 ` Torsten Duwe 0 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-22 15:11 UTC (permalink / raw) To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Vasily Khoruzhick, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner Cc: devicetree, linux-arm-kernel, dri-devel, linux-kernel Add bit definitions required for the anx6345 and add a sanity check in anx_dp_aux_transfer. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Torsten Duwe <duwe@suse.de> Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> --- drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c | 2 +- drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h | 8 ++++++++ drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c index 60707bb5afe7..fe40bab21530 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c @@ -116,7 +116,7 @@ ssize_t anx_dp_aux_transfer(struct regmap *map_dptx, else /* For non-zero-sized set the length field. */ ctrl1 |= (msg->size - 1) << SP_AUX_LENGTH_SHIFT; - if ((msg->request & DP_AUX_I2C_READ) == 0) { + if ((msg->size > 0) && ((msg->request & DP_AUX_I2C_READ) == 0)) { /* When WRITE | MOT write values to data buffer */ err = regmap_bulk_write(map_dptx, SP_DP_BUF_DATA0_REG, buffer, diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h index 430a039c10cd..24bc67ac5479 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h @@ -74,7 +74,11 @@ #define SP_CHA_STA BIT(2) /* Bits for DP System Control Register 3 */ #define SP_HPD_STATUS BIT(6) +#define SP_HPD_FORCE BIT(5) +#define SP_HPD_CTRL BIT(4) #define SP_STRM_VALID BIT(2) +#define SP_STRM_FORCE BIT(1) +#define SP_STRM_CTRL BIT(0) /* Bits for DP System Control Register 4 */ #define SP_ENHANCED_MODE BIT(3) @@ -119,6 +123,9 @@ #define SP_LINK_BW_SET_MASK 0x1f #define SP_INITIAL_SLIM_M_AUD_SEL BIT(5) +/* DP Lane Count Setting Register */ +#define SP_DP_LANE_COUNT_SET_REG 0xa1 + /* DP Training Pattern Set Register */ #define SP_DP_TRAINING_PATTERN_SET_REG 0xa2 @@ -132,6 +139,7 @@ /* DP Link Training Control Register */ #define SP_DP_LT_CTRL_REG 0xa8 +#define SP_DP_LT_INPROGRESS 0x80 #define SP_LT_ERROR_TYPE_MASK 0x70 # define SP_LT_NO_ERROR 0x00 # define SP_LT_AUX_WRITE_ERROR 0x01 diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h b/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h index c1030e0f74cc..9fa6f426f990 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h @@ -179,6 +179,9 @@ #define SP_VBIT BIT(1) #define SP_AUDIO_LAYOUT BIT(0) +/* Analog Debug Register 1 */ +#define SP_ANALOG_DEBUG1_REG 0xdc + /* Analog Debug Register 2 */ #define SP_ANALOG_DEBUG2_REG 0xdd #define SP_FORCE_SW_OFF_BYPASS 0x20 -- 2.16.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 5/7] drm/bridge: Add Analogix anx6345 support [not found] <<20190722150414.9F97668B20@verein.lst.de> @ 2019-07-22 15:11 ` Torsten Duwe 2019-07-22 15:11 ` Torsten Duwe ` (5 subsequent siblings) 6 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-22 15:11 UTC (permalink / raw) To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Vasily Khoruzhick, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner Cc: dri-devel, devicetree, linux-arm-kernel, linux-kernel From: Icenowy Zheng <icenowy@aosc.io> The ANX6345 is an ultra-low power DisplayPower/eDP transmitter designed for portable devices. This driver adds initial support for RGB to eDP mode, without HPD and interrupts. This is a configuration usually seen in eDP applications. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Torsten Duwe <duwe@suse.de> --- drivers/gpu/drm/bridge/analogix/Kconfig | 12 + drivers/gpu/drm/bridge/analogix/Makefile | 1 + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 797 +++++++++++++++++++++ 3 files changed, 810 insertions(+) create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-anx6345.c --- a/drivers/gpu/drm/bridge/analogix/Kconfig +++ b/drivers/gpu/drm/bridge/analogix/Kconfig @@ -1,6 +1,18 @@ # SPDX-License-Identifier: GPL-2.0-only +config DRM_ANALOGIX_ANX6345 + tristate "Analogix ANX6345 bridge" + select DRM_ANALOGIX_DP + select DRM_KMS_HELPER + select REGMAP_I2C + help + ANX6345 is an ultra-low Full-HD DisplayPort/eDP + transmitter designed for portable devices. The + ANX6345 transforms the LVTTL RGB output of an + application processor to eDP or DisplayPort. + config DRM_ANALOGIX_ANX78XX tristate "Analogix ANX78XX bridge" + select DRM_ANALOGIX_DP select DRM_KMS_HELPER select REGMAP_I2C help --- a/drivers/gpu/drm/bridge/analogix/Makefile +++ b/drivers/gpu/drm/bridge/analogix/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o analogix-i2c-dptx.o +obj-$(CONFIG_DRM_ANALOGIX_ANX6345) += analogix-anx6345.o obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o --- /dev/null +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c @@ -0,0 +1,793 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright(c) 2016, Analogix Semiconductor. + * Copyright(c) 2017, Icenowy Zheng <icenowy@aosc.io> + * + * Based on anx7808 driver obtained from chromeos with copyright: + * Copyright(c) 2013, Google Inc. + */ +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/gpio/consumer.h> +#include <linux/i2c.h> +#include <linux/interrupt.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_platform.h> +#include <linux/regmap.h> +#include <linux/regulator/consumer.h> +#include <linux/types.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_dp_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> + +#include "analogix-i2c-dptx.h" +#include "analogix-i2c-txcommon.h" + +#define POLL_DELAY 50000 /* us */ +#define POLL_TIMEOUT 5000000 /* us */ + +#define I2C_IDX_DPTX 0 +#define I2C_IDX_TXCOM 1 + +static const u8 anx6345_i2c_addresses[] = { + [I2C_IDX_DPTX] = ANALOGIX_I2C_DPTX, + [I2C_IDX_TXCOM] = ANALOGIX_I2C_TXCOMMON, +}; +#define I2C_NUM_ADDRESSES ARRAY_SIZE(anx6345_i2c_addresses) + +struct anx6345 { + struct drm_dp_aux aux; + struct drm_bridge bridge; + struct i2c_client *client; + struct edid *edid; + struct drm_connector connector; + struct drm_dp_link link; + struct drm_panel *panel; + struct regulator *dvdd12; + struct regulator *dvdd25; + struct gpio_desc *gpiod_reset; + struct mutex lock; /* protect EDID access */ + + /* I2C Slave addresses of ANX6345 are mapped as DPTX and SYS */ + struct i2c_client *i2c_clients[I2C_NUM_ADDRESSES]; + struct regmap *map[I2C_NUM_ADDRESSES]; + + u16 chipid; + u8 dpcd[DP_RECEIVER_CAP_SIZE]; + + bool powered; +}; + +static inline struct anx6345 *connector_to_anx6345(struct drm_connector *c) +{ + return container_of(c, struct anx6345, connector); +} + +static inline struct anx6345 *bridge_to_anx6345(struct drm_bridge *bridge) +{ + return container_of(bridge, struct anx6345, bridge); +} + +static int anx6345_set_bits(struct regmap *map, u8 reg, u8 mask) +{ + return regmap_update_bits(map, reg, mask, mask); +} + +static int anx6345_clear_bits(struct regmap *map, u8 reg, u8 mask) +{ + return regmap_update_bits(map, reg, mask, 0); +} + +static ssize_t anx6345_aux_transfer(struct drm_dp_aux *aux, + struct drm_dp_aux_msg *msg) +{ + struct anx6345 *anx6345 = container_of(aux, struct anx6345, aux); + + return anx_dp_aux_transfer(anx6345->map[I2C_IDX_DPTX], msg); +} + +static int anx6345_dp_link_training(struct anx6345 *anx6345) +{ + unsigned int value; + u8 dp_bw; + int err; + + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], + SP_POWERDOWN_CTRL_REG, + SP_TOTAL_PD); + if (err) + return err; + + err = drm_dp_dpcd_readb(&anx6345->aux, DP_MAX_LINK_RATE, &dp_bw); + if (err < 0) + return err; + + switch (dp_bw) { + case DP_LINK_BW_1_62: + case DP_LINK_BW_2_7: + break; + + default: + DRM_DEBUG_KMS("DP bandwidth (%#02x) not supported\n", dp_bw); + return -EINVAL; + } + + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, + SP_VIDEO_MUTE); + if (err) + return err; + + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], + SP_VID_CTRL1_REG, SP_VIDEO_EN); + if (err) + return err; + + /* Get DPCD info */ + err = drm_dp_dpcd_read(&anx6345->aux, DP_DPCD_REV, + &anx6345->dpcd, DP_RECEIVER_CAP_SIZE); + if (err < 0) { + DRM_ERROR("Failed to read DPCD: %d\n", err); + return err; + } + + /* Clear channel x SERDES power down */ + err = anx6345_clear_bits(anx6345->map[I2C_IDX_DPTX], + SP_DP_ANALOG_POWER_DOWN_REG, SP_CH0_PD); + if (err) + return err; + + /* Check link capabilities */ + err = drm_dp_link_probe(&anx6345->aux, &anx6345->link); + if (err < 0) { + DRM_ERROR("Failed to probe link capabilities: %d\n", err); + return err; + } + + /* Power up the sink */ + err = drm_dp_link_power_up(&anx6345->aux, &anx6345->link); + if (err < 0) { + DRM_ERROR("Failed to power up DisplayPort link: %d\n", err); + return err; + } + + /* Possibly enable downspread on the sink */ + err = regmap_write(anx6345->map[I2C_IDX_DPTX], + SP_DP_DOWNSPREAD_CTRL1_REG, 0); + if (err) + return err; + + if (anx6345->dpcd[DP_MAX_DOWNSPREAD] & DP_MAX_DOWNSPREAD_0_5) { + DRM_DEBUG("Enable downspread on the sink\n"); + /* 4000PPM */ + err = regmap_write(anx6345->map[I2C_IDX_DPTX], + SP_DP_DOWNSPREAD_CTRL1_REG, 8); + if (err) + return err; + + err = drm_dp_dpcd_writeb(&anx6345->aux, DP_DOWNSPREAD_CTRL, + DP_SPREAD_AMP_0_5); + if (err < 0) + return err; + } else { + err = drm_dp_dpcd_writeb(&anx6345->aux, DP_DOWNSPREAD_CTRL, 0); + if (err < 0) + return err; + } + + /* Set the lane count and the link rate on the sink */ + if (drm_dp_enhanced_frame_cap(anx6345->dpcd)) + err = anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], + SP_DP_SYSTEM_CTRL_BASE + 4, + SP_ENHANCED_MODE); + else + err = anx6345_clear_bits(anx6345->map[I2C_IDX_DPTX], + SP_DP_SYSTEM_CTRL_BASE + 4, + SP_ENHANCED_MODE); + if (err) + return err; + + value = drm_dp_link_rate_to_bw_code(anx6345->link.rate); + err = regmap_write(anx6345->map[I2C_IDX_DPTX], + SP_DP_MAIN_LINK_BW_SET_REG, value); + if (err) + return err; + + err = regmap_write(anx6345->map[I2C_IDX_DPTX], + SP_DP_LANE_COUNT_SET_REG, anx6345->link.num_lanes); + if (err) + return err; + + err = drm_dp_link_configure(&anx6345->aux, &anx6345->link); + if (err < 0) { + DRM_ERROR("Failed to configure DisplayPort link: %d\n", err); + return err; + } + + /* Start training on the source */ + err = regmap_write(anx6345->map[I2C_IDX_DPTX], SP_DP_LT_CTRL_REG, + SP_LT_EN); + if (err) + return err; + + return regmap_read_poll_timeout(anx6345->map[I2C_IDX_DPTX], + SP_DP_LT_CTRL_REG, + value, !(value & SP_DP_LT_INPROGRESS), + POLL_DELAY, POLL_TIMEOUT); +} + +static int anx6345_tx_initialization(struct anx6345 *anx6345) +{ + int err, i; + + /* FIXME: colordepth is hardcoded for now */ + err = regmap_write(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL2_REG, + SP_IN_BPC_6BIT << SP_IN_BPC_SHIFT); + if (err) + return err; + + err = regmap_write(anx6345->map[I2C_IDX_DPTX], SP_DP_PLL_CTRL_REG, 0); + if (err) + return err; + + err = regmap_write(anx6345->map[I2C_IDX_TXCOM], + SP_ANALOG_DEBUG1_REG, 0); + if (err) + return err; + + err = regmap_write(anx6345->map[I2C_IDX_DPTX], + SP_DP_LINK_DEBUG_CTRL_REG, + SP_NEW_PRBS7 | SP_M_VID_DEBUG); + if (err) + return err; + + err = regmap_write(anx6345->map[I2C_IDX_DPTX], + SP_DP_ANALOG_POWER_DOWN_REG, 0); + if (err) + return err; + + /* Force HPD */ + err = anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], + SP_DP_SYSTEM_CTRL_BASE + 3, + SP_HPD_FORCE | SP_HPD_CTRL); + if (err) + return err; + + for (i = 0; i < 4; i++) { + /* 4 lanes */ + err = regmap_write(anx6345->map[I2C_IDX_DPTX], + SP_DP_LANE0_LT_CTRL_REG + i, 0); + if (err) + return err; + } + + /* Reset AUX */ + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], + SP_RESET_CTRL2_REG, SP_AUX_RST); + if (err) + return err; + + return anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], + SP_RESET_CTRL2_REG, SP_AUX_RST); +} + +static void anx6345_poweron(struct anx6345 *anx6345) +{ + int err; + + /* Ensure reset is asserted before starting power on sequence */ + gpiod_set_value_cansleep(anx6345->gpiod_reset, 1); + usleep_range(1000, 2000); + + err = regulator_enable(anx6345->dvdd12); + if (err) { + DRM_ERROR("Failed to enable dvdd12 regulator: %d\n", + err); + return; + } + + /* T1 - delay between VDD12 and VDD25 should be 0-2ms */ + usleep_range(1000, 2000); + + err = regulator_enable(anx6345->dvdd25); + if (err) { + DRM_ERROR("Failed to enable dvdd25 regulator: %d\n", + err); + return; + } + + /* T2 - delay between RESETN and all power rail stable, + * should be 2-5ms + */ + usleep_range(2000, 5000); + + gpiod_set_value_cansleep(anx6345->gpiod_reset, 0); + + /* Power on registers module */ + anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, + SP_HDCP_PD | SP_AUDIO_PD | SP_VIDEO_PD | SP_LINK_PD); + anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, + SP_REGISTER_PD | SP_TOTAL_PD); + + if (anx6345->panel) + drm_panel_prepare(anx6345->panel); + + anx6345->powered = true; +} + +static void anx6345_poweroff(struct anx6345 *anx6345) +{ + int err; + + gpiod_set_value_cansleep(anx6345->gpiod_reset, 1); + usleep_range(1000, 2000); + + if (anx6345->panel) + drm_panel_unprepare(anx6345->panel); + + err = regulator_disable(anx6345->dvdd25); + if (err) { + DRM_ERROR("Failed to disable dvdd25 regulator: %d\n", + err); + return; + } + + usleep_range(5000, 10000); + + err = regulator_disable(anx6345->dvdd12); + if (err) { + DRM_ERROR("Failed to disable dvdd12 regulator: %d\n", + err); + return; + } + + usleep_range(1000, 2000); + + anx6345->powered = false; +} + +static int anx6345_start(struct anx6345 *anx6345) +{ + int err; + + if (!anx6345->powered) + anx6345_poweron(anx6345); + + /* Power on needed modules */ + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], + SP_POWERDOWN_CTRL_REG, + SP_VIDEO_PD | SP_LINK_PD); + + err = anx6345_tx_initialization(anx6345); + if (err) { + DRM_ERROR("Failed eDP transmitter initialization: %d\n", err); + anx6345_poweroff(anx6345); + return err; + } + + err = anx6345_dp_link_training(anx6345); + if (err) { + DRM_ERROR("Failed link training: %d\n", err); + anx6345_poweroff(anx6345); + return err; + } + + /* + * This delay seems to help keep the hardware in a good state. Without + * it, there are times where it fails silently. + */ + usleep_range(10000, 15000); + + return 0; +} + +static int anx6345_config_dp_output(struct anx6345 *anx6345) +{ + int err; + + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, + SP_VIDEO_MUTE); + if (err) + return err; + + /* Enable DP output */ + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, + SP_VIDEO_EN); + if (err) + return err; + + /* Force stream valid */ + return anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], + SP_DP_SYSTEM_CTRL_BASE + 3, + SP_STRM_FORCE | SP_STRM_CTRL); +} + +static int anx6345_get_downstream_info(struct anx6345 *anx6345) +{ + u8 value; + int err; + + err = drm_dp_dpcd_readb(&anx6345->aux, DP_SINK_COUNT, &value); + if (err < 0) { + DRM_ERROR("Get sink count failed %d\n", err); + return err; + } + + if (!DP_GET_SINK_COUNT(value)) { + DRM_ERROR("Downstream disconnected\n"); + return -EIO; + } + + return 0; +} + +static int anx6345_get_modes(struct drm_connector *connector) +{ + struct anx6345 *anx6345 = connector_to_anx6345(connector); + int err, num_modes = 0; + bool power_off = false; + + mutex_lock(&anx6345->lock); + + if (!anx6345->edid) { + if (!anx6345->powered) { + anx6345_poweron(anx6345); + power_off = true; + } + + err = anx6345_get_downstream_info(anx6345); + if (err) { + DRM_ERROR("Failed to get downstream info: %d\n", err); + goto unlock; + } + + anx6345->edid = drm_get_edid(connector, &anx6345->aux.ddc); + if (!anx6345->edid) + DRM_ERROR("Failed to read EDID from panel\n"); + + err = drm_connector_update_edid_property(connector, + anx6345->edid); + if (err) { + DRM_ERROR("Failed to update EDID property: %d\n", err); + goto unlock; + } + } + + num_modes += drm_add_edid_modes(connector, anx6345->edid); + +unlock: + if (power_off) + anx6345_poweroff(anx6345); + + mutex_unlock(&anx6345->lock); + + if (!num_modes && anx6345->panel) + num_modes += drm_panel_get_modes(anx6345->panel); + + return num_modes; +} + +static const struct drm_connector_helper_funcs anx6345_connector_helper_funcs = { + .get_modes = anx6345_get_modes, +}; + +static void +anx6345_connector_destroy(struct drm_connector *connector) +{ + struct anx6345 *anx6345 = connector_to_anx6345(connector); + + if (anx6345->panel) + drm_panel_detach(anx6345->panel); + drm_connector_cleanup(connector); +} + +static const struct drm_connector_funcs anx6345_connector_funcs = { + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = anx6345_connector_destroy, + .reset = drm_atomic_helper_connector_reset, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +static int anx6345_bridge_attach(struct drm_bridge *bridge) +{ + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); + int err; + + if (!bridge->encoder) { + DRM_ERROR("Parent encoder object not found"); + return -ENODEV; + } + + /* Register aux channel */ + anx6345->aux.name = "DP-AUX"; + anx6345->aux.dev = &anx6345->client->dev; + anx6345->aux.transfer = anx6345_aux_transfer; + + err = drm_dp_aux_register(&anx6345->aux); + if (err < 0) { + DRM_ERROR("Failed to register aux channel: %d\n", err); + return err; + } + + err = drm_connector_init(bridge->dev, &anx6345->connector, + &anx6345_connector_funcs, + DRM_MODE_CONNECTOR_eDP); + if (err) { + DRM_ERROR("Failed to initialize connector: %d\n", err); + return err; + } + + drm_connector_helper_add(&anx6345->connector, + &anx6345_connector_helper_funcs); + + err = drm_connector_register(&anx6345->connector); + if (err) { + DRM_ERROR("Failed to register connector: %d\n", err); + return err; + } + + anx6345->connector.polled = DRM_CONNECTOR_POLL_HPD; + + err = drm_connector_attach_encoder(&anx6345->connector, + bridge->encoder); + if (err) { + DRM_ERROR("Failed to link up connector to encoder: %d\n", err); + return err; + } + + if (anx6345->panel) { + err = drm_panel_attach(anx6345->panel, &anx6345->connector); + if (err) { + DRM_ERROR("Failed to attach panel: %d\n", err); + return err; + } + } + + return 0; +} + +static enum drm_mode_status +anx6345_bridge_mode_valid(struct drm_bridge *bridge, + const struct drm_display_mode *mode) +{ + if (mode->flags & DRM_MODE_FLAG_INTERLACE) + return MODE_NO_INTERLACE; + + /* Max 1200p at 5.4 Ghz, one lane */ + if (mode->clock > 154000) + return MODE_CLOCK_HIGH; + + return MODE_OK; +} + +static void anx6345_bridge_disable(struct drm_bridge *bridge) +{ + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); + + /* Power off all modules except configuration registers access */ + anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, + SP_HDCP_PD | SP_AUDIO_PD | SP_VIDEO_PD | SP_LINK_PD); + if (anx6345->panel) + drm_panel_disable(anx6345->panel); + + if (anx6345->powered) + anx6345_poweroff(anx6345); +} + +static void anx6345_bridge_enable(struct drm_bridge *bridge) +{ + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); + int err; + + if (anx6345->panel) + drm_panel_enable(anx6345->panel); + + err = anx6345_start(anx6345); + if (err) { + DRM_ERROR("Failed to initialize: %d\n", err); + return; + } + + err = anx6345_config_dp_output(anx6345); + if (err) + DRM_ERROR("Failed to enable DP output: %d\n", err); +} + +static const struct drm_bridge_funcs anx6345_bridge_funcs = { + .attach = anx6345_bridge_attach, + .mode_valid = anx6345_bridge_mode_valid, + .disable = anx6345_bridge_disable, + .enable = anx6345_bridge_enable, +}; + +static void unregister_i2c_dummy_clients(struct anx6345 *anx6345) +{ + unsigned int i; + + for (i = 1; i < ARRAY_SIZE(anx6345->i2c_clients); i++) + if (anx6345->i2c_clients[i] && + anx6345->i2c_clients[i]->addr != anx6345->client->addr) + i2c_unregister_device(anx6345->i2c_clients[i]); +} + +static const struct regmap_config anx6345_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .max_register = 0xff, + .cache_type = REGCACHE_NONE, +}; + +static const u16 anx6345_chipid_list[] = { + 0x6345, +}; + +static bool anx6345_get_chip_id(struct anx6345 *anx6345) +{ + unsigned int i, idl, idh, version; + + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_IDL_REG, &idl)) + return false; + + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_IDH_REG, &idh)) + return false; + + anx6345->chipid = (u8)idl | ((u8)idh << 8); + + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_VERSION_REG, + &version)) + return false; + + for (i = 0; i < ARRAY_SIZE(anx6345_chipid_list); i++) { + if (anx6345->chipid == anx6345_chipid_list[i]) { + DRM_INFO("Found ANX%x (ver. %d) eDP Transmitter\n", + anx6345->chipid, version); + return true; + } + } + + DRM_ERROR("ANX%x (ver. %d) not supported by this driver\n", + anx6345->chipid, version); + + return false; +} + +static int anx6345_i2c_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct anx6345 *anx6345; + struct device *dev; + int i, err; + + anx6345 = devm_kzalloc(&client->dev, sizeof(*anx6345), GFP_KERNEL); + if (!anx6345) + return -ENOMEM; + + mutex_init(&anx6345->lock); + + anx6345->bridge.of_node = client->dev.of_node; + + anx6345->client = client; + i2c_set_clientdata(client, anx6345); + + dev = &anx6345->client->dev; + + err = drm_of_find_panel_or_bridge(client->dev.of_node, 1, 0, + &anx6345->panel, NULL); + if (err == -EPROBE_DEFER) + return err; + + if (err) + DRM_DEBUG("No panel found\n"); + + /* 1.2V digital core power regulator */ + anx6345->dvdd12 = devm_regulator_get(dev, "dvdd12-supply"); + if (IS_ERR(anx6345->dvdd12)) { + DRM_ERROR("dvdd12-supply not found\n"); + return PTR_ERR(anx6345->dvdd12); + } + + /* 2.5V digital core power regulator */ + anx6345->dvdd25 = devm_regulator_get(dev, "dvdd25-supply"); + if (IS_ERR(anx6345->dvdd25)) { + DRM_ERROR("dvdd25-supply not found\n"); + return PTR_ERR(anx6345->dvdd25); + } + + /* GPIO for chip reset */ + anx6345->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); + if (IS_ERR(anx6345->gpiod_reset)) { + DRM_ERROR("Reset gpio not found\n"); + return PTR_ERR(anx6345->gpiod_reset); + } + + /* Map slave addresses of ANX6345 */ + for (i = 0; i < I2C_NUM_ADDRESSES; i++) { + if (anx6345_i2c_addresses[i] >> 1 != client->addr) + anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter, + anx6345_i2c_addresses[i] >> 1); + else + anx6345->i2c_clients[i] = client; + + if (!anx6345->i2c_clients[i]) { + err = -ENOMEM; + DRM_ERROR("Failed to reserve I2C bus %02x\n", + anx6345_i2c_addresses[i]); + goto err_unregister_i2c; + } + + anx6345->map[i] = devm_regmap_init_i2c(anx6345->i2c_clients[i], + &anx6345_regmap_config); + if (IS_ERR(anx6345->map[i])) { + err = PTR_ERR(anx6345->map[i]); + DRM_ERROR("Failed regmap initialization %02x\n", + anx6345_i2c_addresses[i]); + goto err_unregister_i2c; + } + } + + /* Look for supported chip ID */ + anx6345_poweron(anx6345); + if (anx6345_get_chip_id(anx6345)) { + anx6345->bridge.funcs = &anx6345_bridge_funcs; + drm_bridge_add(&anx6345->bridge); + + return 0; + } else { + anx6345_poweroff(anx6345); + err = -ENODEV; + } + +err_unregister_i2c: + unregister_i2c_dummy_clients(anx6345); + return err; +} + +static int anx6345_i2c_remove(struct i2c_client *client) +{ + struct anx6345 *anx6345 = i2c_get_clientdata(client); + + drm_bridge_remove(&anx6345->bridge); + + unregister_i2c_dummy_clients(anx6345); + + kfree(anx6345->edid); + + mutex_destroy(&anx6345->lock); + + return 0; +} + +static const struct i2c_device_id anx6345_id[] = { + { "anx6345", 0 }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(i2c, anx6345_id); + +static const struct of_device_id anx6345_match_table[] = { + { .compatible = "analogix,anx6345", }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(of, anx6345_match_table); + +static struct i2c_driver anx6345_driver = { + .driver = { + .name = "anx6345", + .of_match_table = of_match_ptr(anx6345_match_table), + }, + .probe = anx6345_i2c_probe, + .remove = anx6345_i2c_remove, + .id_table = anx6345_id, +}; +module_i2c_driver(anx6345_driver); + +MODULE_DESCRIPTION("ANX6345 eDP Transmitter driver"); +MODULE_AUTHOR("Enric Balletbo i Serra <enric.balletbo@collabora.com>"); +MODULE_LICENSE("GPL v2"); ^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH v3 5/7] drm/bridge: Add Analogix anx6345 support @ 2019-07-22 15:11 ` Torsten Duwe 0 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-22 15:11 UTC (permalink / raw) To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Vasily Khoruzhick, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner Cc: devicetree, linux-arm-kernel, dri-devel, linux-kernel From: Icenowy Zheng <icenowy@aosc.io> The ANX6345 is an ultra-low power DisplayPower/eDP transmitter designed for portable devices. This driver adds initial support for RGB to eDP mode, without HPD and interrupts. This is a configuration usually seen in eDP applications. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Torsten Duwe <duwe@suse.de> --- drivers/gpu/drm/bridge/analogix/Kconfig | 12 + drivers/gpu/drm/bridge/analogix/Makefile | 1 + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 797 +++++++++++++++++++++ 3 files changed, 810 insertions(+) create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-anx6345.c --- a/drivers/gpu/drm/bridge/analogix/Kconfig +++ b/drivers/gpu/drm/bridge/analogix/Kconfig @@ -1,6 +1,18 @@ # SPDX-License-Identifier: GPL-2.0-only +config DRM_ANALOGIX_ANX6345 + tristate "Analogix ANX6345 bridge" + select DRM_ANALOGIX_DP + select DRM_KMS_HELPER + select REGMAP_I2C + help + ANX6345 is an ultra-low Full-HD DisplayPort/eDP + transmitter designed for portable devices. The + ANX6345 transforms the LVTTL RGB output of an + application processor to eDP or DisplayPort. + config DRM_ANALOGIX_ANX78XX tristate "Analogix ANX78XX bridge" + select DRM_ANALOGIX_DP select DRM_KMS_HELPER select REGMAP_I2C help --- a/drivers/gpu/drm/bridge/analogix/Makefile +++ b/drivers/gpu/drm/bridge/analogix/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o analogix-i2c-dptx.o +obj-$(CONFIG_DRM_ANALOGIX_ANX6345) += analogix-anx6345.o obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o --- /dev/null +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c @@ -0,0 +1,793 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright(c) 2016, Analogix Semiconductor. + * Copyright(c) 2017, Icenowy Zheng <icenowy@aosc.io> + * + * Based on anx7808 driver obtained from chromeos with copyright: + * Copyright(c) 2013, Google Inc. + */ +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/gpio/consumer.h> +#include <linux/i2c.h> +#include <linux/interrupt.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_platform.h> +#include <linux/regmap.h> +#include <linux/regulator/consumer.h> +#include <linux/types.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_dp_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> + +#include "analogix-i2c-dptx.h" +#include "analogix-i2c-txcommon.h" + +#define POLL_DELAY 50000 /* us */ +#define POLL_TIMEOUT 5000000 /* us */ + +#define I2C_IDX_DPTX 0 +#define I2C_IDX_TXCOM 1 + +static const u8 anx6345_i2c_addresses[] = { + [I2C_IDX_DPTX] = ANALOGIX_I2C_DPTX, + [I2C_IDX_TXCOM] = ANALOGIX_I2C_TXCOMMON, +}; +#define I2C_NUM_ADDRESSES ARRAY_SIZE(anx6345_i2c_addresses) + +struct anx6345 { + struct drm_dp_aux aux; + struct drm_bridge bridge; + struct i2c_client *client; + struct edid *edid; + struct drm_connector connector; + struct drm_dp_link link; + struct drm_panel *panel; + struct regulator *dvdd12; + struct regulator *dvdd25; + struct gpio_desc *gpiod_reset; + struct mutex lock; /* protect EDID access */ + + /* I2C Slave addresses of ANX6345 are mapped as DPTX and SYS */ + struct i2c_client *i2c_clients[I2C_NUM_ADDRESSES]; + struct regmap *map[I2C_NUM_ADDRESSES]; + + u16 chipid; + u8 dpcd[DP_RECEIVER_CAP_SIZE]; + + bool powered; +}; + +static inline struct anx6345 *connector_to_anx6345(struct drm_connector *c) +{ + return container_of(c, struct anx6345, connector); +} + +static inline struct anx6345 *bridge_to_anx6345(struct drm_bridge *bridge) +{ + return container_of(bridge, struct anx6345, bridge); +} + +static int anx6345_set_bits(struct regmap *map, u8 reg, u8 mask) +{ + return regmap_update_bits(map, reg, mask, mask); +} + +static int anx6345_clear_bits(struct regmap *map, u8 reg, u8 mask) +{ + return regmap_update_bits(map, reg, mask, 0); +} + +static ssize_t anx6345_aux_transfer(struct drm_dp_aux *aux, + struct drm_dp_aux_msg *msg) +{ + struct anx6345 *anx6345 = container_of(aux, struct anx6345, aux); + + return anx_dp_aux_transfer(anx6345->map[I2C_IDX_DPTX], msg); +} + +static int anx6345_dp_link_training(struct anx6345 *anx6345) +{ + unsigned int value; + u8 dp_bw; + int err; + + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], + SP_POWERDOWN_CTRL_REG, + SP_TOTAL_PD); + if (err) + return err; + + err = drm_dp_dpcd_readb(&anx6345->aux, DP_MAX_LINK_RATE, &dp_bw); + if (err < 0) + return err; + + switch (dp_bw) { + case DP_LINK_BW_1_62: + case DP_LINK_BW_2_7: + break; + + default: + DRM_DEBUG_KMS("DP bandwidth (%#02x) not supported\n", dp_bw); + return -EINVAL; + } + + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, + SP_VIDEO_MUTE); + if (err) + return err; + + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], + SP_VID_CTRL1_REG, SP_VIDEO_EN); + if (err) + return err; + + /* Get DPCD info */ + err = drm_dp_dpcd_read(&anx6345->aux, DP_DPCD_REV, + &anx6345->dpcd, DP_RECEIVER_CAP_SIZE); + if (err < 0) { + DRM_ERROR("Failed to read DPCD: %d\n", err); + return err; + } + + /* Clear channel x SERDES power down */ + err = anx6345_clear_bits(anx6345->map[I2C_IDX_DPTX], + SP_DP_ANALOG_POWER_DOWN_REG, SP_CH0_PD); + if (err) + return err; + + /* Check link capabilities */ + err = drm_dp_link_probe(&anx6345->aux, &anx6345->link); + if (err < 0) { + DRM_ERROR("Failed to probe link capabilities: %d\n", err); + return err; + } + + /* Power up the sink */ + err = drm_dp_link_power_up(&anx6345->aux, &anx6345->link); + if (err < 0) { + DRM_ERROR("Failed to power up DisplayPort link: %d\n", err); + return err; + } + + /* Possibly enable downspread on the sink */ + err = regmap_write(anx6345->map[I2C_IDX_DPTX], + SP_DP_DOWNSPREAD_CTRL1_REG, 0); + if (err) + return err; + + if (anx6345->dpcd[DP_MAX_DOWNSPREAD] & DP_MAX_DOWNSPREAD_0_5) { + DRM_DEBUG("Enable downspread on the sink\n"); + /* 4000PPM */ + err = regmap_write(anx6345->map[I2C_IDX_DPTX], + SP_DP_DOWNSPREAD_CTRL1_REG, 8); + if (err) + return err; + + err = drm_dp_dpcd_writeb(&anx6345->aux, DP_DOWNSPREAD_CTRL, + DP_SPREAD_AMP_0_5); + if (err < 0) + return err; + } else { + err = drm_dp_dpcd_writeb(&anx6345->aux, DP_DOWNSPREAD_CTRL, 0); + if (err < 0) + return err; + } + + /* Set the lane count and the link rate on the sink */ + if (drm_dp_enhanced_frame_cap(anx6345->dpcd)) + err = anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], + SP_DP_SYSTEM_CTRL_BASE + 4, + SP_ENHANCED_MODE); + else + err = anx6345_clear_bits(anx6345->map[I2C_IDX_DPTX], + SP_DP_SYSTEM_CTRL_BASE + 4, + SP_ENHANCED_MODE); + if (err) + return err; + + value = drm_dp_link_rate_to_bw_code(anx6345->link.rate); + err = regmap_write(anx6345->map[I2C_IDX_DPTX], + SP_DP_MAIN_LINK_BW_SET_REG, value); + if (err) + return err; + + err = regmap_write(anx6345->map[I2C_IDX_DPTX], + SP_DP_LANE_COUNT_SET_REG, anx6345->link.num_lanes); + if (err) + return err; + + err = drm_dp_link_configure(&anx6345->aux, &anx6345->link); + if (err < 0) { + DRM_ERROR("Failed to configure DisplayPort link: %d\n", err); + return err; + } + + /* Start training on the source */ + err = regmap_write(anx6345->map[I2C_IDX_DPTX], SP_DP_LT_CTRL_REG, + SP_LT_EN); + if (err) + return err; + + return regmap_read_poll_timeout(anx6345->map[I2C_IDX_DPTX], + SP_DP_LT_CTRL_REG, + value, !(value & SP_DP_LT_INPROGRESS), + POLL_DELAY, POLL_TIMEOUT); +} + +static int anx6345_tx_initialization(struct anx6345 *anx6345) +{ + int err, i; + + /* FIXME: colordepth is hardcoded for now */ + err = regmap_write(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL2_REG, + SP_IN_BPC_6BIT << SP_IN_BPC_SHIFT); + if (err) + return err; + + err = regmap_write(anx6345->map[I2C_IDX_DPTX], SP_DP_PLL_CTRL_REG, 0); + if (err) + return err; + + err = regmap_write(anx6345->map[I2C_IDX_TXCOM], + SP_ANALOG_DEBUG1_REG, 0); + if (err) + return err; + + err = regmap_write(anx6345->map[I2C_IDX_DPTX], + SP_DP_LINK_DEBUG_CTRL_REG, + SP_NEW_PRBS7 | SP_M_VID_DEBUG); + if (err) + return err; + + err = regmap_write(anx6345->map[I2C_IDX_DPTX], + SP_DP_ANALOG_POWER_DOWN_REG, 0); + if (err) + return err; + + /* Force HPD */ + err = anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], + SP_DP_SYSTEM_CTRL_BASE + 3, + SP_HPD_FORCE | SP_HPD_CTRL); + if (err) + return err; + + for (i = 0; i < 4; i++) { + /* 4 lanes */ + err = regmap_write(anx6345->map[I2C_IDX_DPTX], + SP_DP_LANE0_LT_CTRL_REG + i, 0); + if (err) + return err; + } + + /* Reset AUX */ + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], + SP_RESET_CTRL2_REG, SP_AUX_RST); + if (err) + return err; + + return anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], + SP_RESET_CTRL2_REG, SP_AUX_RST); +} + +static void anx6345_poweron(struct anx6345 *anx6345) +{ + int err; + + /* Ensure reset is asserted before starting power on sequence */ + gpiod_set_value_cansleep(anx6345->gpiod_reset, 1); + usleep_range(1000, 2000); + + err = regulator_enable(anx6345->dvdd12); + if (err) { + DRM_ERROR("Failed to enable dvdd12 regulator: %d\n", + err); + return; + } + + /* T1 - delay between VDD12 and VDD25 should be 0-2ms */ + usleep_range(1000, 2000); + + err = regulator_enable(anx6345->dvdd25); + if (err) { + DRM_ERROR("Failed to enable dvdd25 regulator: %d\n", + err); + return; + } + + /* T2 - delay between RESETN and all power rail stable, + * should be 2-5ms + */ + usleep_range(2000, 5000); + + gpiod_set_value_cansleep(anx6345->gpiod_reset, 0); + + /* Power on registers module */ + anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, + SP_HDCP_PD | SP_AUDIO_PD | SP_VIDEO_PD | SP_LINK_PD); + anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, + SP_REGISTER_PD | SP_TOTAL_PD); + + if (anx6345->panel) + drm_panel_prepare(anx6345->panel); + + anx6345->powered = true; +} + +static void anx6345_poweroff(struct anx6345 *anx6345) +{ + int err; + + gpiod_set_value_cansleep(anx6345->gpiod_reset, 1); + usleep_range(1000, 2000); + + if (anx6345->panel) + drm_panel_unprepare(anx6345->panel); + + err = regulator_disable(anx6345->dvdd25); + if (err) { + DRM_ERROR("Failed to disable dvdd25 regulator: %d\n", + err); + return; + } + + usleep_range(5000, 10000); + + err = regulator_disable(anx6345->dvdd12); + if (err) { + DRM_ERROR("Failed to disable dvdd12 regulator: %d\n", + err); + return; + } + + usleep_range(1000, 2000); + + anx6345->powered = false; +} + +static int anx6345_start(struct anx6345 *anx6345) +{ + int err; + + if (!anx6345->powered) + anx6345_poweron(anx6345); + + /* Power on needed modules */ + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], + SP_POWERDOWN_CTRL_REG, + SP_VIDEO_PD | SP_LINK_PD); + + err = anx6345_tx_initialization(anx6345); + if (err) { + DRM_ERROR("Failed eDP transmitter initialization: %d\n", err); + anx6345_poweroff(anx6345); + return err; + } + + err = anx6345_dp_link_training(anx6345); + if (err) { + DRM_ERROR("Failed link training: %d\n", err); + anx6345_poweroff(anx6345); + return err; + } + + /* + * This delay seems to help keep the hardware in a good state. Without + * it, there are times where it fails silently. + */ + usleep_range(10000, 15000); + + return 0; +} + +static int anx6345_config_dp_output(struct anx6345 *anx6345) +{ + int err; + + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, + SP_VIDEO_MUTE); + if (err) + return err; + + /* Enable DP output */ + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, + SP_VIDEO_EN); + if (err) + return err; + + /* Force stream valid */ + return anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], + SP_DP_SYSTEM_CTRL_BASE + 3, + SP_STRM_FORCE | SP_STRM_CTRL); +} + +static int anx6345_get_downstream_info(struct anx6345 *anx6345) +{ + u8 value; + int err; + + err = drm_dp_dpcd_readb(&anx6345->aux, DP_SINK_COUNT, &value); + if (err < 0) { + DRM_ERROR("Get sink count failed %d\n", err); + return err; + } + + if (!DP_GET_SINK_COUNT(value)) { + DRM_ERROR("Downstream disconnected\n"); + return -EIO; + } + + return 0; +} + +static int anx6345_get_modes(struct drm_connector *connector) +{ + struct anx6345 *anx6345 = connector_to_anx6345(connector); + int err, num_modes = 0; + bool power_off = false; + + mutex_lock(&anx6345->lock); + + if (!anx6345->edid) { + if (!anx6345->powered) { + anx6345_poweron(anx6345); + power_off = true; + } + + err = anx6345_get_downstream_info(anx6345); + if (err) { + DRM_ERROR("Failed to get downstream info: %d\n", err); + goto unlock; + } + + anx6345->edid = drm_get_edid(connector, &anx6345->aux.ddc); + if (!anx6345->edid) + DRM_ERROR("Failed to read EDID from panel\n"); + + err = drm_connector_update_edid_property(connector, + anx6345->edid); + if (err) { + DRM_ERROR("Failed to update EDID property: %d\n", err); + goto unlock; + } + } + + num_modes += drm_add_edid_modes(connector, anx6345->edid); + +unlock: + if (power_off) + anx6345_poweroff(anx6345); + + mutex_unlock(&anx6345->lock); + + if (!num_modes && anx6345->panel) + num_modes += drm_panel_get_modes(anx6345->panel); + + return num_modes; +} + +static const struct drm_connector_helper_funcs anx6345_connector_helper_funcs = { + .get_modes = anx6345_get_modes, +}; + +static void +anx6345_connector_destroy(struct drm_connector *connector) +{ + struct anx6345 *anx6345 = connector_to_anx6345(connector); + + if (anx6345->panel) + drm_panel_detach(anx6345->panel); + drm_connector_cleanup(connector); +} + +static const struct drm_connector_funcs anx6345_connector_funcs = { + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = anx6345_connector_destroy, + .reset = drm_atomic_helper_connector_reset, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +static int anx6345_bridge_attach(struct drm_bridge *bridge) +{ + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); + int err; + + if (!bridge->encoder) { + DRM_ERROR("Parent encoder object not found"); + return -ENODEV; + } + + /* Register aux channel */ + anx6345->aux.name = "DP-AUX"; + anx6345->aux.dev = &anx6345->client->dev; + anx6345->aux.transfer = anx6345_aux_transfer; + + err = drm_dp_aux_register(&anx6345->aux); + if (err < 0) { + DRM_ERROR("Failed to register aux channel: %d\n", err); + return err; + } + + err = drm_connector_init(bridge->dev, &anx6345->connector, + &anx6345_connector_funcs, + DRM_MODE_CONNECTOR_eDP); + if (err) { + DRM_ERROR("Failed to initialize connector: %d\n", err); + return err; + } + + drm_connector_helper_add(&anx6345->connector, + &anx6345_connector_helper_funcs); + + err = drm_connector_register(&anx6345->connector); + if (err) { + DRM_ERROR("Failed to register connector: %d\n", err); + return err; + } + + anx6345->connector.polled = DRM_CONNECTOR_POLL_HPD; + + err = drm_connector_attach_encoder(&anx6345->connector, + bridge->encoder); + if (err) { + DRM_ERROR("Failed to link up connector to encoder: %d\n", err); + return err; + } + + if (anx6345->panel) { + err = drm_panel_attach(anx6345->panel, &anx6345->connector); + if (err) { + DRM_ERROR("Failed to attach panel: %d\n", err); + return err; + } + } + + return 0; +} + +static enum drm_mode_status +anx6345_bridge_mode_valid(struct drm_bridge *bridge, + const struct drm_display_mode *mode) +{ + if (mode->flags & DRM_MODE_FLAG_INTERLACE) + return MODE_NO_INTERLACE; + + /* Max 1200p at 5.4 Ghz, one lane */ + if (mode->clock > 154000) + return MODE_CLOCK_HIGH; + + return MODE_OK; +} + +static void anx6345_bridge_disable(struct drm_bridge *bridge) +{ + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); + + /* Power off all modules except configuration registers access */ + anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, + SP_HDCP_PD | SP_AUDIO_PD | SP_VIDEO_PD | SP_LINK_PD); + if (anx6345->panel) + drm_panel_disable(anx6345->panel); + + if (anx6345->powered) + anx6345_poweroff(anx6345); +} + +static void anx6345_bridge_enable(struct drm_bridge *bridge) +{ + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); + int err; + + if (anx6345->panel) + drm_panel_enable(anx6345->panel); + + err = anx6345_start(anx6345); + if (err) { + DRM_ERROR("Failed to initialize: %d\n", err); + return; + } + + err = anx6345_config_dp_output(anx6345); + if (err) + DRM_ERROR("Failed to enable DP output: %d\n", err); +} + +static const struct drm_bridge_funcs anx6345_bridge_funcs = { + .attach = anx6345_bridge_attach, + .mode_valid = anx6345_bridge_mode_valid, + .disable = anx6345_bridge_disable, + .enable = anx6345_bridge_enable, +}; + +static void unregister_i2c_dummy_clients(struct anx6345 *anx6345) +{ + unsigned int i; + + for (i = 1; i < ARRAY_SIZE(anx6345->i2c_clients); i++) + if (anx6345->i2c_clients[i] && + anx6345->i2c_clients[i]->addr != anx6345->client->addr) + i2c_unregister_device(anx6345->i2c_clients[i]); +} + +static const struct regmap_config anx6345_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .max_register = 0xff, + .cache_type = REGCACHE_NONE, +}; + +static const u16 anx6345_chipid_list[] = { + 0x6345, +}; + +static bool anx6345_get_chip_id(struct anx6345 *anx6345) +{ + unsigned int i, idl, idh, version; + + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_IDL_REG, &idl)) + return false; + + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_IDH_REG, &idh)) + return false; + + anx6345->chipid = (u8)idl | ((u8)idh << 8); + + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_VERSION_REG, + &version)) + return false; + + for (i = 0; i < ARRAY_SIZE(anx6345_chipid_list); i++) { + if (anx6345->chipid == anx6345_chipid_list[i]) { + DRM_INFO("Found ANX%x (ver. %d) eDP Transmitter\n", + anx6345->chipid, version); + return true; + } + } + + DRM_ERROR("ANX%x (ver. %d) not supported by this driver\n", + anx6345->chipid, version); + + return false; +} + +static int anx6345_i2c_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct anx6345 *anx6345; + struct device *dev; + int i, err; + + anx6345 = devm_kzalloc(&client->dev, sizeof(*anx6345), GFP_KERNEL); + if (!anx6345) + return -ENOMEM; + + mutex_init(&anx6345->lock); + + anx6345->bridge.of_node = client->dev.of_node; + + anx6345->client = client; + i2c_set_clientdata(client, anx6345); + + dev = &anx6345->client->dev; + + err = drm_of_find_panel_or_bridge(client->dev.of_node, 1, 0, + &anx6345->panel, NULL); + if (err == -EPROBE_DEFER) + return err; + + if (err) + DRM_DEBUG("No panel found\n"); + + /* 1.2V digital core power regulator */ + anx6345->dvdd12 = devm_regulator_get(dev, "dvdd12-supply"); + if (IS_ERR(anx6345->dvdd12)) { + DRM_ERROR("dvdd12-supply not found\n"); + return PTR_ERR(anx6345->dvdd12); + } + + /* 2.5V digital core power regulator */ + anx6345->dvdd25 = devm_regulator_get(dev, "dvdd25-supply"); + if (IS_ERR(anx6345->dvdd25)) { + DRM_ERROR("dvdd25-supply not found\n"); + return PTR_ERR(anx6345->dvdd25); + } + + /* GPIO for chip reset */ + anx6345->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); + if (IS_ERR(anx6345->gpiod_reset)) { + DRM_ERROR("Reset gpio not found\n"); + return PTR_ERR(anx6345->gpiod_reset); + } + + /* Map slave addresses of ANX6345 */ + for (i = 0; i < I2C_NUM_ADDRESSES; i++) { + if (anx6345_i2c_addresses[i] >> 1 != client->addr) + anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter, + anx6345_i2c_addresses[i] >> 1); + else + anx6345->i2c_clients[i] = client; + + if (!anx6345->i2c_clients[i]) { + err = -ENOMEM; + DRM_ERROR("Failed to reserve I2C bus %02x\n", + anx6345_i2c_addresses[i]); + goto err_unregister_i2c; + } + + anx6345->map[i] = devm_regmap_init_i2c(anx6345->i2c_clients[i], + &anx6345_regmap_config); + if (IS_ERR(anx6345->map[i])) { + err = PTR_ERR(anx6345->map[i]); + DRM_ERROR("Failed regmap initialization %02x\n", + anx6345_i2c_addresses[i]); + goto err_unregister_i2c; + } + } + + /* Look for supported chip ID */ + anx6345_poweron(anx6345); + if (anx6345_get_chip_id(anx6345)) { + anx6345->bridge.funcs = &anx6345_bridge_funcs; + drm_bridge_add(&anx6345->bridge); + + return 0; + } else { + anx6345_poweroff(anx6345); + err = -ENODEV; + } + +err_unregister_i2c: + unregister_i2c_dummy_clients(anx6345); + return err; +} + +static int anx6345_i2c_remove(struct i2c_client *client) +{ + struct anx6345 *anx6345 = i2c_get_clientdata(client); + + drm_bridge_remove(&anx6345->bridge); + + unregister_i2c_dummy_clients(anx6345); + + kfree(anx6345->edid); + + mutex_destroy(&anx6345->lock); + + return 0; +} + +static const struct i2c_device_id anx6345_id[] = { + { "anx6345", 0 }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(i2c, anx6345_id); + +static const struct of_device_id anx6345_match_table[] = { + { .compatible = "analogix,anx6345", }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(of, anx6345_match_table); + +static struct i2c_driver anx6345_driver = { + .driver = { + .name = "anx6345", + .of_match_table = of_match_ptr(anx6345_match_table), + }, + .probe = anx6345_i2c_probe, + .remove = anx6345_i2c_remove, + .id_table = anx6345_id, +}; +module_i2c_driver(anx6345_driver); + +MODULE_DESCRIPTION("ANX6345 eDP Transmitter driver"); +MODULE_AUTHOR("Enric Balletbo i Serra <enric.balletbo@collabora.com>"); +MODULE_LICENSE("GPL v2"); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 5/7] drm/bridge: Add Analogix anx6345 support 2019-07-22 15:11 ` Torsten Duwe (?) @ 2019-07-22 18:49 ` Vasily Khoruzhick -1 siblings, 0 replies; 27+ messages in thread From: Vasily Khoruzhick @ 2019-07-22 18:49 UTC (permalink / raw) To: Torsten Duwe Cc: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner, dri-devel, devicetree, arm-linux, linux-kernel On Mon, Jul 22, 2019 at 8:11 AM Torsten Duwe <duwe@lst.de> wrote: > > From: Icenowy Zheng <icenowy@aosc.io> > > The ANX6345 is an ultra-low power DisplayPower/eDP transmitter designed > for portable devices. This driver adds initial support for RGB to eDP > mode, without HPD and interrupts. > > This is a configuration usually seen in eDP applications. > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > Signed-off-by: Torsten Duwe <duwe@suse.de> > --- > drivers/gpu/drm/bridge/analogix/Kconfig | 12 + > drivers/gpu/drm/bridge/analogix/Makefile | 1 + > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 797 +++++++++++++++++++++ > 3 files changed, 810 insertions(+) > create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-anx6345.c > > --- a/drivers/gpu/drm/bridge/analogix/Kconfig > +++ b/drivers/gpu/drm/bridge/analogix/Kconfig > @@ -1,6 +1,18 @@ > # SPDX-License-Identifier: GPL-2.0-only > +config DRM_ANALOGIX_ANX6345 > + tristate "Analogix ANX6345 bridge" > + select DRM_ANALOGIX_DP > + select DRM_KMS_HELPER > + select REGMAP_I2C > + help > + ANX6345 is an ultra-low Full-HD DisplayPort/eDP > + transmitter designed for portable devices. The > + ANX6345 transforms the LVTTL RGB output of an > + application processor to eDP or DisplayPort. > + > config DRM_ANALOGIX_ANX78XX > tristate "Analogix ANX78XX bridge" > + select DRM_ANALOGIX_DP > select DRM_KMS_HELPER > select REGMAP_I2C > help > --- a/drivers/gpu/drm/bridge/analogix/Makefile > +++ b/drivers/gpu/drm/bridge/analogix/Makefile > @@ -1,4 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0-only > analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o analogix-i2c-dptx.o > +obj-$(CONFIG_DRM_ANALOGIX_ANX6345) += analogix-anx6345.o > obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o > obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o > --- /dev/null > +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c > @@ -0,0 +1,793 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Copyright(c) 2016, Analogix Semiconductor. > + * Copyright(c) 2017, Icenowy Zheng <icenowy@aosc.io> > + * > + * Based on anx7808 driver obtained from chromeos with copyright: > + * Copyright(c) 2013, Google Inc. > + */ > +#include <linux/delay.h> > +#include <linux/err.h> > +#include <linux/gpio/consumer.h> > +#include <linux/i2c.h> > +#include <linux/interrupt.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/of_platform.h> > +#include <linux/regmap.h> > +#include <linux/regulator/consumer.h> > +#include <linux/types.h> > + > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_dp_helper.h> > +#include <drm/drm_edid.h> > +#include <drm/drm_of.h> > +#include <drm/drm_panel.h> > +#include <drm/drm_print.h> > +#include <drm/drm_probe_helper.h> > + > +#include "analogix-i2c-dptx.h" > +#include "analogix-i2c-txcommon.h" > + > +#define POLL_DELAY 50000 /* us */ > +#define POLL_TIMEOUT 5000000 /* us */ > + > +#define I2C_IDX_DPTX 0 > +#define I2C_IDX_TXCOM 1 > + > +static const u8 anx6345_i2c_addresses[] = { > + [I2C_IDX_DPTX] = ANALOGIX_I2C_DPTX, > + [I2C_IDX_TXCOM] = ANALOGIX_I2C_TXCOMMON, > +}; > +#define I2C_NUM_ADDRESSES ARRAY_SIZE(anx6345_i2c_addresses) > + > +struct anx6345 { > + struct drm_dp_aux aux; > + struct drm_bridge bridge; > + struct i2c_client *client; > + struct edid *edid; > + struct drm_connector connector; > + struct drm_dp_link link; > + struct drm_panel *panel; > + struct regulator *dvdd12; > + struct regulator *dvdd25; > + struct gpio_desc *gpiod_reset; > + struct mutex lock; /* protect EDID access */ > + > + /* I2C Slave addresses of ANX6345 are mapped as DPTX and SYS */ > + struct i2c_client *i2c_clients[I2C_NUM_ADDRESSES]; > + struct regmap *map[I2C_NUM_ADDRESSES]; > + > + u16 chipid; > + u8 dpcd[DP_RECEIVER_CAP_SIZE]; > + > + bool powered; > +}; > + > +static inline struct anx6345 *connector_to_anx6345(struct drm_connector *c) > +{ > + return container_of(c, struct anx6345, connector); > +} > + > +static inline struct anx6345 *bridge_to_anx6345(struct drm_bridge *bridge) > +{ > + return container_of(bridge, struct anx6345, bridge); > +} > + > +static int anx6345_set_bits(struct regmap *map, u8 reg, u8 mask) > +{ > + return regmap_update_bits(map, reg, mask, mask); > +} > + > +static int anx6345_clear_bits(struct regmap *map, u8 reg, u8 mask) > +{ > + return regmap_update_bits(map, reg, mask, 0); > +} > + > +static ssize_t anx6345_aux_transfer(struct drm_dp_aux *aux, > + struct drm_dp_aux_msg *msg) > +{ > + struct anx6345 *anx6345 = container_of(aux, struct anx6345, aux); > + > + return anx_dp_aux_transfer(anx6345->map[I2C_IDX_DPTX], msg); > +} > + > +static int anx6345_dp_link_training(struct anx6345 *anx6345) > +{ > + unsigned int value; > + u8 dp_bw; > + int err; > + > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_POWERDOWN_CTRL_REG, > + SP_TOTAL_PD); > + if (err) > + return err; > + > + err = drm_dp_dpcd_readb(&anx6345->aux, DP_MAX_LINK_RATE, &dp_bw); > + if (err < 0) > + return err; > + > + switch (dp_bw) { > + case DP_LINK_BW_1_62: > + case DP_LINK_BW_2_7: > + break; > + > + default: > + DRM_DEBUG_KMS("DP bandwidth (%#02x) not supported\n", dp_bw); > + return -EINVAL; > + } > + > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > + SP_VIDEO_MUTE); > + if (err) > + return err; > + > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_VID_CTRL1_REG, SP_VIDEO_EN); > + if (err) > + return err; > + > + /* Get DPCD info */ > + err = drm_dp_dpcd_read(&anx6345->aux, DP_DPCD_REV, > + &anx6345->dpcd, DP_RECEIVER_CAP_SIZE); > + if (err < 0) { > + DRM_ERROR("Failed to read DPCD: %d\n", err); > + return err; > + } > + > + /* Clear channel x SERDES power down */ > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_ANALOG_POWER_DOWN_REG, SP_CH0_PD); > + if (err) > + return err; > + > + /* Check link capabilities */ > + err = drm_dp_link_probe(&anx6345->aux, &anx6345->link); > + if (err < 0) { > + DRM_ERROR("Failed to probe link capabilities: %d\n", err); > + return err; > + } > + > + /* Power up the sink */ > + err = drm_dp_link_power_up(&anx6345->aux, &anx6345->link); > + if (err < 0) { > + DRM_ERROR("Failed to power up DisplayPort link: %d\n", err); > + return err; > + } > + > + /* Possibly enable downspread on the sink */ > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_DOWNSPREAD_CTRL1_REG, 0); > + if (err) > + return err; > + > + if (anx6345->dpcd[DP_MAX_DOWNSPREAD] & DP_MAX_DOWNSPREAD_0_5) { > + DRM_DEBUG("Enable downspread on the sink\n"); > + /* 4000PPM */ > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_DOWNSPREAD_CTRL1_REG, 8); > + if (err) > + return err; > + > + err = drm_dp_dpcd_writeb(&anx6345->aux, DP_DOWNSPREAD_CTRL, > + DP_SPREAD_AMP_0_5); > + if (err < 0) > + return err; > + } else { > + err = drm_dp_dpcd_writeb(&anx6345->aux, DP_DOWNSPREAD_CTRL, 0); > + if (err < 0) > + return err; > + } > + > + /* Set the lane count and the link rate on the sink */ > + if (drm_dp_enhanced_frame_cap(anx6345->dpcd)) > + err = anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_SYSTEM_CTRL_BASE + 4, > + SP_ENHANCED_MODE); > + else > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_SYSTEM_CTRL_BASE + 4, > + SP_ENHANCED_MODE); > + if (err) > + return err; > + > + value = drm_dp_link_rate_to_bw_code(anx6345->link.rate); > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_MAIN_LINK_BW_SET_REG, value); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_LANE_COUNT_SET_REG, anx6345->link.num_lanes); > + if (err) > + return err; > + > + err = drm_dp_link_configure(&anx6345->aux, &anx6345->link); > + if (err < 0) { > + DRM_ERROR("Failed to configure DisplayPort link: %d\n", err); > + return err; > + } > + > + /* Start training on the source */ > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], SP_DP_LT_CTRL_REG, > + SP_LT_EN); > + if (err) > + return err; > + > + return regmap_read_poll_timeout(anx6345->map[I2C_IDX_DPTX], > + SP_DP_LT_CTRL_REG, > + value, !(value & SP_DP_LT_INPROGRESS), > + POLL_DELAY, POLL_TIMEOUT); > +} > + > +static int anx6345_tx_initialization(struct anx6345 *anx6345) > +{ > + int err, i; > + > + /* FIXME: colordepth is hardcoded for now */ > + err = regmap_write(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL2_REG, > + SP_IN_BPC_6BIT << SP_IN_BPC_SHIFT); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], SP_DP_PLL_CTRL_REG, 0); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_TXCOM], > + SP_ANALOG_DEBUG1_REG, 0); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_LINK_DEBUG_CTRL_REG, > + SP_NEW_PRBS7 | SP_M_VID_DEBUG); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_ANALOG_POWER_DOWN_REG, 0); > + if (err) > + return err; > + > + /* Force HPD */ > + err = anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_SYSTEM_CTRL_BASE + 3, > + SP_HPD_FORCE | SP_HPD_CTRL); > + if (err) > + return err; > + > + for (i = 0; i < 4; i++) { > + /* 4 lanes */ > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_LANE0_LT_CTRL_REG + i, 0); > + if (err) > + return err; > + } > + > + /* Reset AUX */ > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_RESET_CTRL2_REG, SP_AUX_RST); > + if (err) > + return err; > + > + return anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_RESET_CTRL2_REG, SP_AUX_RST); > +} > + > +static void anx6345_poweron(struct anx6345 *anx6345) > +{ > + int err; > + > + /* Ensure reset is asserted before starting power on sequence */ > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 1); > + usleep_range(1000, 2000); > + > + err = regulator_enable(anx6345->dvdd12); > + if (err) { > + DRM_ERROR("Failed to enable dvdd12 regulator: %d\n", > + err); > + return; > + } > + > + /* T1 - delay between VDD12 and VDD25 should be 0-2ms */ > + usleep_range(1000, 2000); > + > + err = regulator_enable(anx6345->dvdd25); > + if (err) { > + DRM_ERROR("Failed to enable dvdd25 regulator: %d\n", > + err); > + return; > + } > + > + /* T2 - delay between RESETN and all power rail stable, > + * should be 2-5ms > + */ > + usleep_range(2000, 5000); > + > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 0); > + > + /* Power on registers module */ > + anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > + SP_HDCP_PD | SP_AUDIO_PD | SP_VIDEO_PD | SP_LINK_PD); > + anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > + SP_REGISTER_PD | SP_TOTAL_PD); > + > + if (anx6345->panel) > + drm_panel_prepare(anx6345->panel); > + > + anx6345->powered = true; > +} > + > +static void anx6345_poweroff(struct anx6345 *anx6345) > +{ > + int err; > + > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 1); > + usleep_range(1000, 2000); > + > + if (anx6345->panel) > + drm_panel_unprepare(anx6345->panel); > + > + err = regulator_disable(anx6345->dvdd25); > + if (err) { > + DRM_ERROR("Failed to disable dvdd25 regulator: %d\n", > + err); > + return; > + } > + > + usleep_range(5000, 10000); > + > + err = regulator_disable(anx6345->dvdd12); > + if (err) { > + DRM_ERROR("Failed to disable dvdd12 regulator: %d\n", > + err); > + return; > + } > + > + usleep_range(1000, 2000); > + > + anx6345->powered = false; > +} > + > +static int anx6345_start(struct anx6345 *anx6345) > +{ > + int err; > + > + if (!anx6345->powered) > + anx6345_poweron(anx6345); > + > + /* Power on needed modules */ > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_POWERDOWN_CTRL_REG, > + SP_VIDEO_PD | SP_LINK_PD); > + > + err = anx6345_tx_initialization(anx6345); > + if (err) { > + DRM_ERROR("Failed eDP transmitter initialization: %d\n", err); > + anx6345_poweroff(anx6345); > + return err; > + } > + > + err = anx6345_dp_link_training(anx6345); > + if (err) { > + DRM_ERROR("Failed link training: %d\n", err); > + anx6345_poweroff(anx6345); > + return err; > + } > + > + /* > + * This delay seems to help keep the hardware in a good state. Without > + * it, there are times where it fails silently. > + */ > + usleep_range(10000, 15000); > + > + return 0; > +} > + > +static int anx6345_config_dp_output(struct anx6345 *anx6345) > +{ > + int err; > + > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > + SP_VIDEO_MUTE); > + if (err) > + return err; > + > + /* Enable DP output */ > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > + SP_VIDEO_EN); > + if (err) > + return err; > + > + /* Force stream valid */ > + return anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_SYSTEM_CTRL_BASE + 3, > + SP_STRM_FORCE | SP_STRM_CTRL); > +} > + > +static int anx6345_get_downstream_info(struct anx6345 *anx6345) > +{ > + u8 value; > + int err; > + > + err = drm_dp_dpcd_readb(&anx6345->aux, DP_SINK_COUNT, &value); > + if (err < 0) { > + DRM_ERROR("Get sink count failed %d\n", err); > + return err; > + } > + > + if (!DP_GET_SINK_COUNT(value)) { > + DRM_ERROR("Downstream disconnected\n"); > + return -EIO; > + } > + > + return 0; > +} > + > +static int anx6345_get_modes(struct drm_connector *connector) > +{ > + struct anx6345 *anx6345 = connector_to_anx6345(connector); > + int err, num_modes = 0; > + bool power_off = false; > + > + mutex_lock(&anx6345->lock); > + > + if (!anx6345->edid) { > + if (!anx6345->powered) { > + anx6345_poweron(anx6345); > + power_off = true; > + } > + > + err = anx6345_get_downstream_info(anx6345); > + if (err) { > + DRM_ERROR("Failed to get downstream info: %d\n", err); > + goto unlock; > + } > + > + anx6345->edid = drm_get_edid(connector, &anx6345->aux.ddc); > + if (!anx6345->edid) > + DRM_ERROR("Failed to read EDID from panel\n"); > + > + err = drm_connector_update_edid_property(connector, > + anx6345->edid); > + if (err) { > + DRM_ERROR("Failed to update EDID property: %d\n", err); > + goto unlock; > + } > + } > + > + num_modes += drm_add_edid_modes(connector, anx6345->edid); > + > +unlock: > + if (power_off) > + anx6345_poweroff(anx6345); > + > + mutex_unlock(&anx6345->lock); > + > + if (!num_modes && anx6345->panel) > + num_modes += drm_panel_get_modes(anx6345->panel); > + > + return num_modes; > +} > + > +static const struct drm_connector_helper_funcs anx6345_connector_helper_funcs = { > + .get_modes = anx6345_get_modes, > +}; > + > +static void > +anx6345_connector_destroy(struct drm_connector *connector) > +{ > + struct anx6345 *anx6345 = connector_to_anx6345(connector); > + > + if (anx6345->panel) > + drm_panel_detach(anx6345->panel); > + drm_connector_cleanup(connector); > +} > + > +static const struct drm_connector_funcs anx6345_connector_funcs = { > + .fill_modes = drm_helper_probe_single_connector_modes, > + .destroy = anx6345_connector_destroy, > + .reset = drm_atomic_helper_connector_reset, > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > +}; > + > +static int anx6345_bridge_attach(struct drm_bridge *bridge) > +{ > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > + int err; > + > + if (!bridge->encoder) { > + DRM_ERROR("Parent encoder object not found"); > + return -ENODEV; > + } > + > + /* Register aux channel */ > + anx6345->aux.name = "DP-AUX"; > + anx6345->aux.dev = &anx6345->client->dev; > + anx6345->aux.transfer = anx6345_aux_transfer; > + > + err = drm_dp_aux_register(&anx6345->aux); > + if (err < 0) { > + DRM_ERROR("Failed to register aux channel: %d\n", err); > + return err; > + } > + > + err = drm_connector_init(bridge->dev, &anx6345->connector, > + &anx6345_connector_funcs, > + DRM_MODE_CONNECTOR_eDP); > + if (err) { > + DRM_ERROR("Failed to initialize connector: %d\n", err); > + return err; > + } > + > + drm_connector_helper_add(&anx6345->connector, > + &anx6345_connector_helper_funcs); > + > + err = drm_connector_register(&anx6345->connector); > + if (err) { > + DRM_ERROR("Failed to register connector: %d\n", err); > + return err; > + } > + > + anx6345->connector.polled = DRM_CONNECTOR_POLL_HPD; > + > + err = drm_connector_attach_encoder(&anx6345->connector, > + bridge->encoder); > + if (err) { > + DRM_ERROR("Failed to link up connector to encoder: %d\n", err); > + return err; > + } > + > + if (anx6345->panel) { > + err = drm_panel_attach(anx6345->panel, &anx6345->connector); > + if (err) { > + DRM_ERROR("Failed to attach panel: %d\n", err); > + return err; > + } > + } > + > + return 0; > +} > + > +static enum drm_mode_status > +anx6345_bridge_mode_valid(struct drm_bridge *bridge, > + const struct drm_display_mode *mode) > +{ > + if (mode->flags & DRM_MODE_FLAG_INTERLACE) > + return MODE_NO_INTERLACE; > + > + /* Max 1200p at 5.4 Ghz, one lane */ > + if (mode->clock > 154000) > + return MODE_CLOCK_HIGH; > + > + return MODE_OK; > +} > + > +static void anx6345_bridge_disable(struct drm_bridge *bridge) > +{ > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > + > + /* Power off all modules except configuration registers access */ > + anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > + SP_HDCP_PD | SP_AUDIO_PD | SP_VIDEO_PD | SP_LINK_PD); > + if (anx6345->panel) > + drm_panel_disable(anx6345->panel); > + > + if (anx6345->powered) > + anx6345_poweroff(anx6345); > +} > + > +static void anx6345_bridge_enable(struct drm_bridge *bridge) > +{ > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > + int err; > + > + if (anx6345->panel) > + drm_panel_enable(anx6345->panel); > + > + err = anx6345_start(anx6345); > + if (err) { > + DRM_ERROR("Failed to initialize: %d\n", err); > + return; > + } > + > + err = anx6345_config_dp_output(anx6345); > + if (err) > + DRM_ERROR("Failed to enable DP output: %d\n", err); > +} > + > +static const struct drm_bridge_funcs anx6345_bridge_funcs = { > + .attach = anx6345_bridge_attach, > + .mode_valid = anx6345_bridge_mode_valid, > + .disable = anx6345_bridge_disable, > + .enable = anx6345_bridge_enable, > +}; > + > +static void unregister_i2c_dummy_clients(struct anx6345 *anx6345) > +{ > + unsigned int i; > + > + for (i = 1; i < ARRAY_SIZE(anx6345->i2c_clients); i++) > + if (anx6345->i2c_clients[i] && > + anx6345->i2c_clients[i]->addr != anx6345->client->addr) > + i2c_unregister_device(anx6345->i2c_clients[i]); > +} > + > +static const struct regmap_config anx6345_regmap_config = { > + .reg_bits = 8, > + .val_bits = 8, > + .max_register = 0xff, > + .cache_type = REGCACHE_NONE, > +}; > + > +static const u16 anx6345_chipid_list[] = { > + 0x6345, > +}; > + > +static bool anx6345_get_chip_id(struct anx6345 *anx6345) > +{ > + unsigned int i, idl, idh, version; > + > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_IDL_REG, &idl)) > + return false; > + > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_IDH_REG, &idh)) > + return false; > + > + anx6345->chipid = (u8)idl | ((u8)idh << 8); > + > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_VERSION_REG, > + &version)) > + return false; > + > + for (i = 0; i < ARRAY_SIZE(anx6345_chipid_list); i++) { > + if (anx6345->chipid == anx6345_chipid_list[i]) { > + DRM_INFO("Found ANX%x (ver. %d) eDP Transmitter\n", > + anx6345->chipid, version); > + return true; > + } > + } > + > + DRM_ERROR("ANX%x (ver. %d) not supported by this driver\n", > + anx6345->chipid, version); > + > + return false; > +} > + > +static int anx6345_i2c_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + struct anx6345 *anx6345; > + struct device *dev; > + int i, err; > + > + anx6345 = devm_kzalloc(&client->dev, sizeof(*anx6345), GFP_KERNEL); > + if (!anx6345) > + return -ENOMEM; > + > + mutex_init(&anx6345->lock); > + > + anx6345->bridge.of_node = client->dev.of_node; > + > + anx6345->client = client; > + i2c_set_clientdata(client, anx6345); > + > + dev = &anx6345->client->dev; > + > + err = drm_of_find_panel_or_bridge(client->dev.of_node, 1, 0, > + &anx6345->panel, NULL); > + if (err == -EPROBE_DEFER) > + return err; > + > + if (err) > + DRM_DEBUG("No panel found\n"); > + > + /* 1.2V digital core power regulator */ > + anx6345->dvdd12 = devm_regulator_get(dev, "dvdd12-supply"); > + if (IS_ERR(anx6345->dvdd12)) { > + DRM_ERROR("dvdd12-supply not found\n"); > + return PTR_ERR(anx6345->dvdd12); > + } > + > + /* 2.5V digital core power regulator */ > + anx6345->dvdd25 = devm_regulator_get(dev, "dvdd25-supply"); > + if (IS_ERR(anx6345->dvdd25)) { > + DRM_ERROR("dvdd25-supply not found\n"); > + return PTR_ERR(anx6345->dvdd25); > + } > + > + /* GPIO for chip reset */ > + anx6345->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); > + if (IS_ERR(anx6345->gpiod_reset)) { > + DRM_ERROR("Reset gpio not found\n"); > + return PTR_ERR(anx6345->gpiod_reset); > + } > + > + /* Map slave addresses of ANX6345 */ > + for (i = 0; i < I2C_NUM_ADDRESSES; i++) { > + if (anx6345_i2c_addresses[i] >> 1 != client->addr) > + anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter, > + anx6345_i2c_addresses[i] >> 1); > + else > + anx6345->i2c_clients[i] = client; > + > + if (!anx6345->i2c_clients[i]) { > + err = -ENOMEM; > + DRM_ERROR("Failed to reserve I2C bus %02x\n", > + anx6345_i2c_addresses[i]); > + goto err_unregister_i2c; > + } > + > + anx6345->map[i] = devm_regmap_init_i2c(anx6345->i2c_clients[i], > + &anx6345_regmap_config); > + if (IS_ERR(anx6345->map[i])) { > + err = PTR_ERR(anx6345->map[i]); > + DRM_ERROR("Failed regmap initialization %02x\n", > + anx6345_i2c_addresses[i]); > + goto err_unregister_i2c; > + } > + } > + > + /* Look for supported chip ID */ > + anx6345_poweron(anx6345); > + if (anx6345_get_chip_id(anx6345)) { > + anx6345->bridge.funcs = &anx6345_bridge_funcs; > + drm_bridge_add(&anx6345->bridge); > + > + return 0; > + } else { > + anx6345_poweroff(anx6345); > + err = -ENODEV; > + } > + > +err_unregister_i2c: > + unregister_i2c_dummy_clients(anx6345); > + return err; > +} > + > +static int anx6345_i2c_remove(struct i2c_client *client) > +{ > + struct anx6345 *anx6345 = i2c_get_clientdata(client); > + > + drm_bridge_remove(&anx6345->bridge); > + > + unregister_i2c_dummy_clients(anx6345); > + > + kfree(anx6345->edid); > + > + mutex_destroy(&anx6345->lock); > + > + return 0; > +} > + > +static const struct i2c_device_id anx6345_id[] = { > + { "anx6345", 0 }, > + { /* sentinel */ } > +}; > +MODULE_DEVICE_TABLE(i2c, anx6345_id); > + > +static const struct of_device_id anx6345_match_table[] = { > + { .compatible = "analogix,anx6345", }, > + { /* sentinel */ }, > +}; > +MODULE_DEVICE_TABLE(of, anx6345_match_table); > + > +static struct i2c_driver anx6345_driver = { > + .driver = { > + .name = "anx6345", > + .of_match_table = of_match_ptr(anx6345_match_table), > + }, > + .probe = anx6345_i2c_probe, > + .remove = anx6345_i2c_remove, > + .id_table = anx6345_id, > +}; > +module_i2c_driver(anx6345_driver); > + > +MODULE_DESCRIPTION("ANX6345 eDP Transmitter driver"); > +MODULE_AUTHOR("Enric Balletbo i Serra <enric.balletbo@collabora.com>"); I believe Icenowy is the author of this driver. If you think otherwise please add Enric to CC and get his Signed-off-by. > +MODULE_LICENSE("GPL v2"); ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 5/7] drm/bridge: Add Analogix anx6345 support @ 2019-07-22 18:49 ` Vasily Khoruzhick 0 siblings, 0 replies; 27+ messages in thread From: Vasily Khoruzhick @ 2019-07-22 18:49 UTC (permalink / raw) To: Torsten Duwe Cc: Mark Rutland, devicetree, Andrzej Hajda, Maxime Ripard, Greg Kroah-Hartman, linux-kernel, dri-devel, David Airlie, Chen-Yu Tsai, Rob Herring, Thierry Reding, Laurent Pinchart, Daniel Vetter, Harald Geyer, Sean Paul, Thomas Gleixner, arm-linux, Icenowy Zheng On Mon, Jul 22, 2019 at 8:11 AM Torsten Duwe <duwe@lst.de> wrote: > > From: Icenowy Zheng <icenowy@aosc.io> > > The ANX6345 is an ultra-low power DisplayPower/eDP transmitter designed > for portable devices. This driver adds initial support for RGB to eDP > mode, without HPD and interrupts. > > This is a configuration usually seen in eDP applications. > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > Signed-off-by: Torsten Duwe <duwe@suse.de> > --- > drivers/gpu/drm/bridge/analogix/Kconfig | 12 + > drivers/gpu/drm/bridge/analogix/Makefile | 1 + > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 797 +++++++++++++++++++++ > 3 files changed, 810 insertions(+) > create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-anx6345.c > > --- a/drivers/gpu/drm/bridge/analogix/Kconfig > +++ b/drivers/gpu/drm/bridge/analogix/Kconfig > @@ -1,6 +1,18 @@ > # SPDX-License-Identifier: GPL-2.0-only > +config DRM_ANALOGIX_ANX6345 > + tristate "Analogix ANX6345 bridge" > + select DRM_ANALOGIX_DP > + select DRM_KMS_HELPER > + select REGMAP_I2C > + help > + ANX6345 is an ultra-low Full-HD DisplayPort/eDP > + transmitter designed for portable devices. The > + ANX6345 transforms the LVTTL RGB output of an > + application processor to eDP or DisplayPort. > + > config DRM_ANALOGIX_ANX78XX > tristate "Analogix ANX78XX bridge" > + select DRM_ANALOGIX_DP > select DRM_KMS_HELPER > select REGMAP_I2C > help > --- a/drivers/gpu/drm/bridge/analogix/Makefile > +++ b/drivers/gpu/drm/bridge/analogix/Makefile > @@ -1,4 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0-only > analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o analogix-i2c-dptx.o > +obj-$(CONFIG_DRM_ANALOGIX_ANX6345) += analogix-anx6345.o > obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o > obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o > --- /dev/null > +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c > @@ -0,0 +1,793 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Copyright(c) 2016, Analogix Semiconductor. > + * Copyright(c) 2017, Icenowy Zheng <icenowy@aosc.io> > + * > + * Based on anx7808 driver obtained from chromeos with copyright: > + * Copyright(c) 2013, Google Inc. > + */ > +#include <linux/delay.h> > +#include <linux/err.h> > +#include <linux/gpio/consumer.h> > +#include <linux/i2c.h> > +#include <linux/interrupt.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/of_platform.h> > +#include <linux/regmap.h> > +#include <linux/regulator/consumer.h> > +#include <linux/types.h> > + > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_dp_helper.h> > +#include <drm/drm_edid.h> > +#include <drm/drm_of.h> > +#include <drm/drm_panel.h> > +#include <drm/drm_print.h> > +#include <drm/drm_probe_helper.h> > + > +#include "analogix-i2c-dptx.h" > +#include "analogix-i2c-txcommon.h" > + > +#define POLL_DELAY 50000 /* us */ > +#define POLL_TIMEOUT 5000000 /* us */ > + > +#define I2C_IDX_DPTX 0 > +#define I2C_IDX_TXCOM 1 > + > +static const u8 anx6345_i2c_addresses[] = { > + [I2C_IDX_DPTX] = ANALOGIX_I2C_DPTX, > + [I2C_IDX_TXCOM] = ANALOGIX_I2C_TXCOMMON, > +}; > +#define I2C_NUM_ADDRESSES ARRAY_SIZE(anx6345_i2c_addresses) > + > +struct anx6345 { > + struct drm_dp_aux aux; > + struct drm_bridge bridge; > + struct i2c_client *client; > + struct edid *edid; > + struct drm_connector connector; > + struct drm_dp_link link; > + struct drm_panel *panel; > + struct regulator *dvdd12; > + struct regulator *dvdd25; > + struct gpio_desc *gpiod_reset; > + struct mutex lock; /* protect EDID access */ > + > + /* I2C Slave addresses of ANX6345 are mapped as DPTX and SYS */ > + struct i2c_client *i2c_clients[I2C_NUM_ADDRESSES]; > + struct regmap *map[I2C_NUM_ADDRESSES]; > + > + u16 chipid; > + u8 dpcd[DP_RECEIVER_CAP_SIZE]; > + > + bool powered; > +}; > + > +static inline struct anx6345 *connector_to_anx6345(struct drm_connector *c) > +{ > + return container_of(c, struct anx6345, connector); > +} > + > +static inline struct anx6345 *bridge_to_anx6345(struct drm_bridge *bridge) > +{ > + return container_of(bridge, struct anx6345, bridge); > +} > + > +static int anx6345_set_bits(struct regmap *map, u8 reg, u8 mask) > +{ > + return regmap_update_bits(map, reg, mask, mask); > +} > + > +static int anx6345_clear_bits(struct regmap *map, u8 reg, u8 mask) > +{ > + return regmap_update_bits(map, reg, mask, 0); > +} > + > +static ssize_t anx6345_aux_transfer(struct drm_dp_aux *aux, > + struct drm_dp_aux_msg *msg) > +{ > + struct anx6345 *anx6345 = container_of(aux, struct anx6345, aux); > + > + return anx_dp_aux_transfer(anx6345->map[I2C_IDX_DPTX], msg); > +} > + > +static int anx6345_dp_link_training(struct anx6345 *anx6345) > +{ > + unsigned int value; > + u8 dp_bw; > + int err; > + > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_POWERDOWN_CTRL_REG, > + SP_TOTAL_PD); > + if (err) > + return err; > + > + err = drm_dp_dpcd_readb(&anx6345->aux, DP_MAX_LINK_RATE, &dp_bw); > + if (err < 0) > + return err; > + > + switch (dp_bw) { > + case DP_LINK_BW_1_62: > + case DP_LINK_BW_2_7: > + break; > + > + default: > + DRM_DEBUG_KMS("DP bandwidth (%#02x) not supported\n", dp_bw); > + return -EINVAL; > + } > + > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > + SP_VIDEO_MUTE); > + if (err) > + return err; > + > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_VID_CTRL1_REG, SP_VIDEO_EN); > + if (err) > + return err; > + > + /* Get DPCD info */ > + err = drm_dp_dpcd_read(&anx6345->aux, DP_DPCD_REV, > + &anx6345->dpcd, DP_RECEIVER_CAP_SIZE); > + if (err < 0) { > + DRM_ERROR("Failed to read DPCD: %d\n", err); > + return err; > + } > + > + /* Clear channel x SERDES power down */ > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_ANALOG_POWER_DOWN_REG, SP_CH0_PD); > + if (err) > + return err; > + > + /* Check link capabilities */ > + err = drm_dp_link_probe(&anx6345->aux, &anx6345->link); > + if (err < 0) { > + DRM_ERROR("Failed to probe link capabilities: %d\n", err); > + return err; > + } > + > + /* Power up the sink */ > + err = drm_dp_link_power_up(&anx6345->aux, &anx6345->link); > + if (err < 0) { > + DRM_ERROR("Failed to power up DisplayPort link: %d\n", err); > + return err; > + } > + > + /* Possibly enable downspread on the sink */ > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_DOWNSPREAD_CTRL1_REG, 0); > + if (err) > + return err; > + > + if (anx6345->dpcd[DP_MAX_DOWNSPREAD] & DP_MAX_DOWNSPREAD_0_5) { > + DRM_DEBUG("Enable downspread on the sink\n"); > + /* 4000PPM */ > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_DOWNSPREAD_CTRL1_REG, 8); > + if (err) > + return err; > + > + err = drm_dp_dpcd_writeb(&anx6345->aux, DP_DOWNSPREAD_CTRL, > + DP_SPREAD_AMP_0_5); > + if (err < 0) > + return err; > + } else { > + err = drm_dp_dpcd_writeb(&anx6345->aux, DP_DOWNSPREAD_CTRL, 0); > + if (err < 0) > + return err; > + } > + > + /* Set the lane count and the link rate on the sink */ > + if (drm_dp_enhanced_frame_cap(anx6345->dpcd)) > + err = anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_SYSTEM_CTRL_BASE + 4, > + SP_ENHANCED_MODE); > + else > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_SYSTEM_CTRL_BASE + 4, > + SP_ENHANCED_MODE); > + if (err) > + return err; > + > + value = drm_dp_link_rate_to_bw_code(anx6345->link.rate); > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_MAIN_LINK_BW_SET_REG, value); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_LANE_COUNT_SET_REG, anx6345->link.num_lanes); > + if (err) > + return err; > + > + err = drm_dp_link_configure(&anx6345->aux, &anx6345->link); > + if (err < 0) { > + DRM_ERROR("Failed to configure DisplayPort link: %d\n", err); > + return err; > + } > + > + /* Start training on the source */ > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], SP_DP_LT_CTRL_REG, > + SP_LT_EN); > + if (err) > + return err; > + > + return regmap_read_poll_timeout(anx6345->map[I2C_IDX_DPTX], > + SP_DP_LT_CTRL_REG, > + value, !(value & SP_DP_LT_INPROGRESS), > + POLL_DELAY, POLL_TIMEOUT); > +} > + > +static int anx6345_tx_initialization(struct anx6345 *anx6345) > +{ > + int err, i; > + > + /* FIXME: colordepth is hardcoded for now */ > + err = regmap_write(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL2_REG, > + SP_IN_BPC_6BIT << SP_IN_BPC_SHIFT); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], SP_DP_PLL_CTRL_REG, 0); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_TXCOM], > + SP_ANALOG_DEBUG1_REG, 0); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_LINK_DEBUG_CTRL_REG, > + SP_NEW_PRBS7 | SP_M_VID_DEBUG); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_ANALOG_POWER_DOWN_REG, 0); > + if (err) > + return err; > + > + /* Force HPD */ > + err = anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_SYSTEM_CTRL_BASE + 3, > + SP_HPD_FORCE | SP_HPD_CTRL); > + if (err) > + return err; > + > + for (i = 0; i < 4; i++) { > + /* 4 lanes */ > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_LANE0_LT_CTRL_REG + i, 0); > + if (err) > + return err; > + } > + > + /* Reset AUX */ > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_RESET_CTRL2_REG, SP_AUX_RST); > + if (err) > + return err; > + > + return anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_RESET_CTRL2_REG, SP_AUX_RST); > +} > + > +static void anx6345_poweron(struct anx6345 *anx6345) > +{ > + int err; > + > + /* Ensure reset is asserted before starting power on sequence */ > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 1); > + usleep_range(1000, 2000); > + > + err = regulator_enable(anx6345->dvdd12); > + if (err) { > + DRM_ERROR("Failed to enable dvdd12 regulator: %d\n", > + err); > + return; > + } > + > + /* T1 - delay between VDD12 and VDD25 should be 0-2ms */ > + usleep_range(1000, 2000); > + > + err = regulator_enable(anx6345->dvdd25); > + if (err) { > + DRM_ERROR("Failed to enable dvdd25 regulator: %d\n", > + err); > + return; > + } > + > + /* T2 - delay between RESETN and all power rail stable, > + * should be 2-5ms > + */ > + usleep_range(2000, 5000); > + > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 0); > + > + /* Power on registers module */ > + anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > + SP_HDCP_PD | SP_AUDIO_PD | SP_VIDEO_PD | SP_LINK_PD); > + anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > + SP_REGISTER_PD | SP_TOTAL_PD); > + > + if (anx6345->panel) > + drm_panel_prepare(anx6345->panel); > + > + anx6345->powered = true; > +} > + > +static void anx6345_poweroff(struct anx6345 *anx6345) > +{ > + int err; > + > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 1); > + usleep_range(1000, 2000); > + > + if (anx6345->panel) > + drm_panel_unprepare(anx6345->panel); > + > + err = regulator_disable(anx6345->dvdd25); > + if (err) { > + DRM_ERROR("Failed to disable dvdd25 regulator: %d\n", > + err); > + return; > + } > + > + usleep_range(5000, 10000); > + > + err = regulator_disable(anx6345->dvdd12); > + if (err) { > + DRM_ERROR("Failed to disable dvdd12 regulator: %d\n", > + err); > + return; > + } > + > + usleep_range(1000, 2000); > + > + anx6345->powered = false; > +} > + > +static int anx6345_start(struct anx6345 *anx6345) > +{ > + int err; > + > + if (!anx6345->powered) > + anx6345_poweron(anx6345); > + > + /* Power on needed modules */ > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_POWERDOWN_CTRL_REG, > + SP_VIDEO_PD | SP_LINK_PD); > + > + err = anx6345_tx_initialization(anx6345); > + if (err) { > + DRM_ERROR("Failed eDP transmitter initialization: %d\n", err); > + anx6345_poweroff(anx6345); > + return err; > + } > + > + err = anx6345_dp_link_training(anx6345); > + if (err) { > + DRM_ERROR("Failed link training: %d\n", err); > + anx6345_poweroff(anx6345); > + return err; > + } > + > + /* > + * This delay seems to help keep the hardware in a good state. Without > + * it, there are times where it fails silently. > + */ > + usleep_range(10000, 15000); > + > + return 0; > +} > + > +static int anx6345_config_dp_output(struct anx6345 *anx6345) > +{ > + int err; > + > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > + SP_VIDEO_MUTE); > + if (err) > + return err; > + > + /* Enable DP output */ > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > + SP_VIDEO_EN); > + if (err) > + return err; > + > + /* Force stream valid */ > + return anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_SYSTEM_CTRL_BASE + 3, > + SP_STRM_FORCE | SP_STRM_CTRL); > +} > + > +static int anx6345_get_downstream_info(struct anx6345 *anx6345) > +{ > + u8 value; > + int err; > + > + err = drm_dp_dpcd_readb(&anx6345->aux, DP_SINK_COUNT, &value); > + if (err < 0) { > + DRM_ERROR("Get sink count failed %d\n", err); > + return err; > + } > + > + if (!DP_GET_SINK_COUNT(value)) { > + DRM_ERROR("Downstream disconnected\n"); > + return -EIO; > + } > + > + return 0; > +} > + > +static int anx6345_get_modes(struct drm_connector *connector) > +{ > + struct anx6345 *anx6345 = connector_to_anx6345(connector); > + int err, num_modes = 0; > + bool power_off = false; > + > + mutex_lock(&anx6345->lock); > + > + if (!anx6345->edid) { > + if (!anx6345->powered) { > + anx6345_poweron(anx6345); > + power_off = true; > + } > + > + err = anx6345_get_downstream_info(anx6345); > + if (err) { > + DRM_ERROR("Failed to get downstream info: %d\n", err); > + goto unlock; > + } > + > + anx6345->edid = drm_get_edid(connector, &anx6345->aux.ddc); > + if (!anx6345->edid) > + DRM_ERROR("Failed to read EDID from panel\n"); > + > + err = drm_connector_update_edid_property(connector, > + anx6345->edid); > + if (err) { > + DRM_ERROR("Failed to update EDID property: %d\n", err); > + goto unlock; > + } > + } > + > + num_modes += drm_add_edid_modes(connector, anx6345->edid); > + > +unlock: > + if (power_off) > + anx6345_poweroff(anx6345); > + > + mutex_unlock(&anx6345->lock); > + > + if (!num_modes && anx6345->panel) > + num_modes += drm_panel_get_modes(anx6345->panel); > + > + return num_modes; > +} > + > +static const struct drm_connector_helper_funcs anx6345_connector_helper_funcs = { > + .get_modes = anx6345_get_modes, > +}; > + > +static void > +anx6345_connector_destroy(struct drm_connector *connector) > +{ > + struct anx6345 *anx6345 = connector_to_anx6345(connector); > + > + if (anx6345->panel) > + drm_panel_detach(anx6345->panel); > + drm_connector_cleanup(connector); > +} > + > +static const struct drm_connector_funcs anx6345_connector_funcs = { > + .fill_modes = drm_helper_probe_single_connector_modes, > + .destroy = anx6345_connector_destroy, > + .reset = drm_atomic_helper_connector_reset, > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > +}; > + > +static int anx6345_bridge_attach(struct drm_bridge *bridge) > +{ > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > + int err; > + > + if (!bridge->encoder) { > + DRM_ERROR("Parent encoder object not found"); > + return -ENODEV; > + } > + > + /* Register aux channel */ > + anx6345->aux.name = "DP-AUX"; > + anx6345->aux.dev = &anx6345->client->dev; > + anx6345->aux.transfer = anx6345_aux_transfer; > + > + err = drm_dp_aux_register(&anx6345->aux); > + if (err < 0) { > + DRM_ERROR("Failed to register aux channel: %d\n", err); > + return err; > + } > + > + err = drm_connector_init(bridge->dev, &anx6345->connector, > + &anx6345_connector_funcs, > + DRM_MODE_CONNECTOR_eDP); > + if (err) { > + DRM_ERROR("Failed to initialize connector: %d\n", err); > + return err; > + } > + > + drm_connector_helper_add(&anx6345->connector, > + &anx6345_connector_helper_funcs); > + > + err = drm_connector_register(&anx6345->connector); > + if (err) { > + DRM_ERROR("Failed to register connector: %d\n", err); > + return err; > + } > + > + anx6345->connector.polled = DRM_CONNECTOR_POLL_HPD; > + > + err = drm_connector_attach_encoder(&anx6345->connector, > + bridge->encoder); > + if (err) { > + DRM_ERROR("Failed to link up connector to encoder: %d\n", err); > + return err; > + } > + > + if (anx6345->panel) { > + err = drm_panel_attach(anx6345->panel, &anx6345->connector); > + if (err) { > + DRM_ERROR("Failed to attach panel: %d\n", err); > + return err; > + } > + } > + > + return 0; > +} > + > +static enum drm_mode_status > +anx6345_bridge_mode_valid(struct drm_bridge *bridge, > + const struct drm_display_mode *mode) > +{ > + if (mode->flags & DRM_MODE_FLAG_INTERLACE) > + return MODE_NO_INTERLACE; > + > + /* Max 1200p at 5.4 Ghz, one lane */ > + if (mode->clock > 154000) > + return MODE_CLOCK_HIGH; > + > + return MODE_OK; > +} > + > +static void anx6345_bridge_disable(struct drm_bridge *bridge) > +{ > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > + > + /* Power off all modules except configuration registers access */ > + anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > + SP_HDCP_PD | SP_AUDIO_PD | SP_VIDEO_PD | SP_LINK_PD); > + if (anx6345->panel) > + drm_panel_disable(anx6345->panel); > + > + if (anx6345->powered) > + anx6345_poweroff(anx6345); > +} > + > +static void anx6345_bridge_enable(struct drm_bridge *bridge) > +{ > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > + int err; > + > + if (anx6345->panel) > + drm_panel_enable(anx6345->panel); > + > + err = anx6345_start(anx6345); > + if (err) { > + DRM_ERROR("Failed to initialize: %d\n", err); > + return; > + } > + > + err = anx6345_config_dp_output(anx6345); > + if (err) > + DRM_ERROR("Failed to enable DP output: %d\n", err); > +} > + > +static const struct drm_bridge_funcs anx6345_bridge_funcs = { > + .attach = anx6345_bridge_attach, > + .mode_valid = anx6345_bridge_mode_valid, > + .disable = anx6345_bridge_disable, > + .enable = anx6345_bridge_enable, > +}; > + > +static void unregister_i2c_dummy_clients(struct anx6345 *anx6345) > +{ > + unsigned int i; > + > + for (i = 1; i < ARRAY_SIZE(anx6345->i2c_clients); i++) > + if (anx6345->i2c_clients[i] && > + anx6345->i2c_clients[i]->addr != anx6345->client->addr) > + i2c_unregister_device(anx6345->i2c_clients[i]); > +} > + > +static const struct regmap_config anx6345_regmap_config = { > + .reg_bits = 8, > + .val_bits = 8, > + .max_register = 0xff, > + .cache_type = REGCACHE_NONE, > +}; > + > +static const u16 anx6345_chipid_list[] = { > + 0x6345, > +}; > + > +static bool anx6345_get_chip_id(struct anx6345 *anx6345) > +{ > + unsigned int i, idl, idh, version; > + > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_IDL_REG, &idl)) > + return false; > + > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_IDH_REG, &idh)) > + return false; > + > + anx6345->chipid = (u8)idl | ((u8)idh << 8); > + > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_VERSION_REG, > + &version)) > + return false; > + > + for (i = 0; i < ARRAY_SIZE(anx6345_chipid_list); i++) { > + if (anx6345->chipid == anx6345_chipid_list[i]) { > + DRM_INFO("Found ANX%x (ver. %d) eDP Transmitter\n", > + anx6345->chipid, version); > + return true; > + } > + } > + > + DRM_ERROR("ANX%x (ver. %d) not supported by this driver\n", > + anx6345->chipid, version); > + > + return false; > +} > + > +static int anx6345_i2c_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + struct anx6345 *anx6345; > + struct device *dev; > + int i, err; > + > + anx6345 = devm_kzalloc(&client->dev, sizeof(*anx6345), GFP_KERNEL); > + if (!anx6345) > + return -ENOMEM; > + > + mutex_init(&anx6345->lock); > + > + anx6345->bridge.of_node = client->dev.of_node; > + > + anx6345->client = client; > + i2c_set_clientdata(client, anx6345); > + > + dev = &anx6345->client->dev; > + > + err = drm_of_find_panel_or_bridge(client->dev.of_node, 1, 0, > + &anx6345->panel, NULL); > + if (err == -EPROBE_DEFER) > + return err; > + > + if (err) > + DRM_DEBUG("No panel found\n"); > + > + /* 1.2V digital core power regulator */ > + anx6345->dvdd12 = devm_regulator_get(dev, "dvdd12-supply"); > + if (IS_ERR(anx6345->dvdd12)) { > + DRM_ERROR("dvdd12-supply not found\n"); > + return PTR_ERR(anx6345->dvdd12); > + } > + > + /* 2.5V digital core power regulator */ > + anx6345->dvdd25 = devm_regulator_get(dev, "dvdd25-supply"); > + if (IS_ERR(anx6345->dvdd25)) { > + DRM_ERROR("dvdd25-supply not found\n"); > + return PTR_ERR(anx6345->dvdd25); > + } > + > + /* GPIO for chip reset */ > + anx6345->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); > + if (IS_ERR(anx6345->gpiod_reset)) { > + DRM_ERROR("Reset gpio not found\n"); > + return PTR_ERR(anx6345->gpiod_reset); > + } > + > + /* Map slave addresses of ANX6345 */ > + for (i = 0; i < I2C_NUM_ADDRESSES; i++) { > + if (anx6345_i2c_addresses[i] >> 1 != client->addr) > + anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter, > + anx6345_i2c_addresses[i] >> 1); > + else > + anx6345->i2c_clients[i] = client; > + > + if (!anx6345->i2c_clients[i]) { > + err = -ENOMEM; > + DRM_ERROR("Failed to reserve I2C bus %02x\n", > + anx6345_i2c_addresses[i]); > + goto err_unregister_i2c; > + } > + > + anx6345->map[i] = devm_regmap_init_i2c(anx6345->i2c_clients[i], > + &anx6345_regmap_config); > + if (IS_ERR(anx6345->map[i])) { > + err = PTR_ERR(anx6345->map[i]); > + DRM_ERROR("Failed regmap initialization %02x\n", > + anx6345_i2c_addresses[i]); > + goto err_unregister_i2c; > + } > + } > + > + /* Look for supported chip ID */ > + anx6345_poweron(anx6345); > + if (anx6345_get_chip_id(anx6345)) { > + anx6345->bridge.funcs = &anx6345_bridge_funcs; > + drm_bridge_add(&anx6345->bridge); > + > + return 0; > + } else { > + anx6345_poweroff(anx6345); > + err = -ENODEV; > + } > + > +err_unregister_i2c: > + unregister_i2c_dummy_clients(anx6345); > + return err; > +} > + > +static int anx6345_i2c_remove(struct i2c_client *client) > +{ > + struct anx6345 *anx6345 = i2c_get_clientdata(client); > + > + drm_bridge_remove(&anx6345->bridge); > + > + unregister_i2c_dummy_clients(anx6345); > + > + kfree(anx6345->edid); > + > + mutex_destroy(&anx6345->lock); > + > + return 0; > +} > + > +static const struct i2c_device_id anx6345_id[] = { > + { "anx6345", 0 }, > + { /* sentinel */ } > +}; > +MODULE_DEVICE_TABLE(i2c, anx6345_id); > + > +static const struct of_device_id anx6345_match_table[] = { > + { .compatible = "analogix,anx6345", }, > + { /* sentinel */ }, > +}; > +MODULE_DEVICE_TABLE(of, anx6345_match_table); > + > +static struct i2c_driver anx6345_driver = { > + .driver = { > + .name = "anx6345", > + .of_match_table = of_match_ptr(anx6345_match_table), > + }, > + .probe = anx6345_i2c_probe, > + .remove = anx6345_i2c_remove, > + .id_table = anx6345_id, > +}; > +module_i2c_driver(anx6345_driver); > + > +MODULE_DESCRIPTION("ANX6345 eDP Transmitter driver"); > +MODULE_AUTHOR("Enric Balletbo i Serra <enric.balletbo@collabora.com>"); I believe Icenowy is the author of this driver. If you think otherwise please add Enric to CC and get his Signed-off-by. > +MODULE_LICENSE("GPL v2"); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 5/7] drm/bridge: Add Analogix anx6345 support @ 2019-07-22 18:49 ` Vasily Khoruzhick 0 siblings, 0 replies; 27+ messages in thread From: Vasily Khoruzhick @ 2019-07-22 18:49 UTC (permalink / raw) To: Torsten Duwe Cc: Mark Rutland, devicetree, Maxime Ripard, Greg Kroah-Hartman, linux-kernel, dri-devel, David Airlie, Chen-Yu Tsai, Rob Herring, Thierry Reding, Laurent Pinchart, Harald Geyer, Sean Paul, Thomas Gleixner, arm-linux, Icenowy Zheng On Mon, Jul 22, 2019 at 8:11 AM Torsten Duwe <duwe@lst.de> wrote: > > From: Icenowy Zheng <icenowy@aosc.io> > > The ANX6345 is an ultra-low power DisplayPower/eDP transmitter designed > for portable devices. This driver adds initial support for RGB to eDP > mode, without HPD and interrupts. > > This is a configuration usually seen in eDP applications. > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > Signed-off-by: Torsten Duwe <duwe@suse.de> > --- > drivers/gpu/drm/bridge/analogix/Kconfig | 12 + > drivers/gpu/drm/bridge/analogix/Makefile | 1 + > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 797 +++++++++++++++++++++ > 3 files changed, 810 insertions(+) > create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-anx6345.c > > --- a/drivers/gpu/drm/bridge/analogix/Kconfig > +++ b/drivers/gpu/drm/bridge/analogix/Kconfig > @@ -1,6 +1,18 @@ > # SPDX-License-Identifier: GPL-2.0-only > +config DRM_ANALOGIX_ANX6345 > + tristate "Analogix ANX6345 bridge" > + select DRM_ANALOGIX_DP > + select DRM_KMS_HELPER > + select REGMAP_I2C > + help > + ANX6345 is an ultra-low Full-HD DisplayPort/eDP > + transmitter designed for portable devices. The > + ANX6345 transforms the LVTTL RGB output of an > + application processor to eDP or DisplayPort. > + > config DRM_ANALOGIX_ANX78XX > tristate "Analogix ANX78XX bridge" > + select DRM_ANALOGIX_DP > select DRM_KMS_HELPER > select REGMAP_I2C > help > --- a/drivers/gpu/drm/bridge/analogix/Makefile > +++ b/drivers/gpu/drm/bridge/analogix/Makefile > @@ -1,4 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0-only > analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o analogix-i2c-dptx.o > +obj-$(CONFIG_DRM_ANALOGIX_ANX6345) += analogix-anx6345.o > obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o > obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o > --- /dev/null > +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c > @@ -0,0 +1,793 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Copyright(c) 2016, Analogix Semiconductor. > + * Copyright(c) 2017, Icenowy Zheng <icenowy@aosc.io> > + * > + * Based on anx7808 driver obtained from chromeos with copyright: > + * Copyright(c) 2013, Google Inc. > + */ > +#include <linux/delay.h> > +#include <linux/err.h> > +#include <linux/gpio/consumer.h> > +#include <linux/i2c.h> > +#include <linux/interrupt.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/of_platform.h> > +#include <linux/regmap.h> > +#include <linux/regulator/consumer.h> > +#include <linux/types.h> > + > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_dp_helper.h> > +#include <drm/drm_edid.h> > +#include <drm/drm_of.h> > +#include <drm/drm_panel.h> > +#include <drm/drm_print.h> > +#include <drm/drm_probe_helper.h> > + > +#include "analogix-i2c-dptx.h" > +#include "analogix-i2c-txcommon.h" > + > +#define POLL_DELAY 50000 /* us */ > +#define POLL_TIMEOUT 5000000 /* us */ > + > +#define I2C_IDX_DPTX 0 > +#define I2C_IDX_TXCOM 1 > + > +static const u8 anx6345_i2c_addresses[] = { > + [I2C_IDX_DPTX] = ANALOGIX_I2C_DPTX, > + [I2C_IDX_TXCOM] = ANALOGIX_I2C_TXCOMMON, > +}; > +#define I2C_NUM_ADDRESSES ARRAY_SIZE(anx6345_i2c_addresses) > + > +struct anx6345 { > + struct drm_dp_aux aux; > + struct drm_bridge bridge; > + struct i2c_client *client; > + struct edid *edid; > + struct drm_connector connector; > + struct drm_dp_link link; > + struct drm_panel *panel; > + struct regulator *dvdd12; > + struct regulator *dvdd25; > + struct gpio_desc *gpiod_reset; > + struct mutex lock; /* protect EDID access */ > + > + /* I2C Slave addresses of ANX6345 are mapped as DPTX and SYS */ > + struct i2c_client *i2c_clients[I2C_NUM_ADDRESSES]; > + struct regmap *map[I2C_NUM_ADDRESSES]; > + > + u16 chipid; > + u8 dpcd[DP_RECEIVER_CAP_SIZE]; > + > + bool powered; > +}; > + > +static inline struct anx6345 *connector_to_anx6345(struct drm_connector *c) > +{ > + return container_of(c, struct anx6345, connector); > +} > + > +static inline struct anx6345 *bridge_to_anx6345(struct drm_bridge *bridge) > +{ > + return container_of(bridge, struct anx6345, bridge); > +} > + > +static int anx6345_set_bits(struct regmap *map, u8 reg, u8 mask) > +{ > + return regmap_update_bits(map, reg, mask, mask); > +} > + > +static int anx6345_clear_bits(struct regmap *map, u8 reg, u8 mask) > +{ > + return regmap_update_bits(map, reg, mask, 0); > +} > + > +static ssize_t anx6345_aux_transfer(struct drm_dp_aux *aux, > + struct drm_dp_aux_msg *msg) > +{ > + struct anx6345 *anx6345 = container_of(aux, struct anx6345, aux); > + > + return anx_dp_aux_transfer(anx6345->map[I2C_IDX_DPTX], msg); > +} > + > +static int anx6345_dp_link_training(struct anx6345 *anx6345) > +{ > + unsigned int value; > + u8 dp_bw; > + int err; > + > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_POWERDOWN_CTRL_REG, > + SP_TOTAL_PD); > + if (err) > + return err; > + > + err = drm_dp_dpcd_readb(&anx6345->aux, DP_MAX_LINK_RATE, &dp_bw); > + if (err < 0) > + return err; > + > + switch (dp_bw) { > + case DP_LINK_BW_1_62: > + case DP_LINK_BW_2_7: > + break; > + > + default: > + DRM_DEBUG_KMS("DP bandwidth (%#02x) not supported\n", dp_bw); > + return -EINVAL; > + } > + > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > + SP_VIDEO_MUTE); > + if (err) > + return err; > + > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_VID_CTRL1_REG, SP_VIDEO_EN); > + if (err) > + return err; > + > + /* Get DPCD info */ > + err = drm_dp_dpcd_read(&anx6345->aux, DP_DPCD_REV, > + &anx6345->dpcd, DP_RECEIVER_CAP_SIZE); > + if (err < 0) { > + DRM_ERROR("Failed to read DPCD: %d\n", err); > + return err; > + } > + > + /* Clear channel x SERDES power down */ > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_ANALOG_POWER_DOWN_REG, SP_CH0_PD); > + if (err) > + return err; > + > + /* Check link capabilities */ > + err = drm_dp_link_probe(&anx6345->aux, &anx6345->link); > + if (err < 0) { > + DRM_ERROR("Failed to probe link capabilities: %d\n", err); > + return err; > + } > + > + /* Power up the sink */ > + err = drm_dp_link_power_up(&anx6345->aux, &anx6345->link); > + if (err < 0) { > + DRM_ERROR("Failed to power up DisplayPort link: %d\n", err); > + return err; > + } > + > + /* Possibly enable downspread on the sink */ > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_DOWNSPREAD_CTRL1_REG, 0); > + if (err) > + return err; > + > + if (anx6345->dpcd[DP_MAX_DOWNSPREAD] & DP_MAX_DOWNSPREAD_0_5) { > + DRM_DEBUG("Enable downspread on the sink\n"); > + /* 4000PPM */ > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_DOWNSPREAD_CTRL1_REG, 8); > + if (err) > + return err; > + > + err = drm_dp_dpcd_writeb(&anx6345->aux, DP_DOWNSPREAD_CTRL, > + DP_SPREAD_AMP_0_5); > + if (err < 0) > + return err; > + } else { > + err = drm_dp_dpcd_writeb(&anx6345->aux, DP_DOWNSPREAD_CTRL, 0); > + if (err < 0) > + return err; > + } > + > + /* Set the lane count and the link rate on the sink */ > + if (drm_dp_enhanced_frame_cap(anx6345->dpcd)) > + err = anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_SYSTEM_CTRL_BASE + 4, > + SP_ENHANCED_MODE); > + else > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_SYSTEM_CTRL_BASE + 4, > + SP_ENHANCED_MODE); > + if (err) > + return err; > + > + value = drm_dp_link_rate_to_bw_code(anx6345->link.rate); > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_MAIN_LINK_BW_SET_REG, value); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_LANE_COUNT_SET_REG, anx6345->link.num_lanes); > + if (err) > + return err; > + > + err = drm_dp_link_configure(&anx6345->aux, &anx6345->link); > + if (err < 0) { > + DRM_ERROR("Failed to configure DisplayPort link: %d\n", err); > + return err; > + } > + > + /* Start training on the source */ > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], SP_DP_LT_CTRL_REG, > + SP_LT_EN); > + if (err) > + return err; > + > + return regmap_read_poll_timeout(anx6345->map[I2C_IDX_DPTX], > + SP_DP_LT_CTRL_REG, > + value, !(value & SP_DP_LT_INPROGRESS), > + POLL_DELAY, POLL_TIMEOUT); > +} > + > +static int anx6345_tx_initialization(struct anx6345 *anx6345) > +{ > + int err, i; > + > + /* FIXME: colordepth is hardcoded for now */ > + err = regmap_write(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL2_REG, > + SP_IN_BPC_6BIT << SP_IN_BPC_SHIFT); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], SP_DP_PLL_CTRL_REG, 0); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_TXCOM], > + SP_ANALOG_DEBUG1_REG, 0); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_LINK_DEBUG_CTRL_REG, > + SP_NEW_PRBS7 | SP_M_VID_DEBUG); > + if (err) > + return err; > + > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_ANALOG_POWER_DOWN_REG, 0); > + if (err) > + return err; > + > + /* Force HPD */ > + err = anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_SYSTEM_CTRL_BASE + 3, > + SP_HPD_FORCE | SP_HPD_CTRL); > + if (err) > + return err; > + > + for (i = 0; i < 4; i++) { > + /* 4 lanes */ > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > + SP_DP_LANE0_LT_CTRL_REG + i, 0); > + if (err) > + return err; > + } > + > + /* Reset AUX */ > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_RESET_CTRL2_REG, SP_AUX_RST); > + if (err) > + return err; > + > + return anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_RESET_CTRL2_REG, SP_AUX_RST); > +} > + > +static void anx6345_poweron(struct anx6345 *anx6345) > +{ > + int err; > + > + /* Ensure reset is asserted before starting power on sequence */ > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 1); > + usleep_range(1000, 2000); > + > + err = regulator_enable(anx6345->dvdd12); > + if (err) { > + DRM_ERROR("Failed to enable dvdd12 regulator: %d\n", > + err); > + return; > + } > + > + /* T1 - delay between VDD12 and VDD25 should be 0-2ms */ > + usleep_range(1000, 2000); > + > + err = regulator_enable(anx6345->dvdd25); > + if (err) { > + DRM_ERROR("Failed to enable dvdd25 regulator: %d\n", > + err); > + return; > + } > + > + /* T2 - delay between RESETN and all power rail stable, > + * should be 2-5ms > + */ > + usleep_range(2000, 5000); > + > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 0); > + > + /* Power on registers module */ > + anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > + SP_HDCP_PD | SP_AUDIO_PD | SP_VIDEO_PD | SP_LINK_PD); > + anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > + SP_REGISTER_PD | SP_TOTAL_PD); > + > + if (anx6345->panel) > + drm_panel_prepare(anx6345->panel); > + > + anx6345->powered = true; > +} > + > +static void anx6345_poweroff(struct anx6345 *anx6345) > +{ > + int err; > + > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 1); > + usleep_range(1000, 2000); > + > + if (anx6345->panel) > + drm_panel_unprepare(anx6345->panel); > + > + err = regulator_disable(anx6345->dvdd25); > + if (err) { > + DRM_ERROR("Failed to disable dvdd25 regulator: %d\n", > + err); > + return; > + } > + > + usleep_range(5000, 10000); > + > + err = regulator_disable(anx6345->dvdd12); > + if (err) { > + DRM_ERROR("Failed to disable dvdd12 regulator: %d\n", > + err); > + return; > + } > + > + usleep_range(1000, 2000); > + > + anx6345->powered = false; > +} > + > +static int anx6345_start(struct anx6345 *anx6345) > +{ > + int err; > + > + if (!anx6345->powered) > + anx6345_poweron(anx6345); > + > + /* Power on needed modules */ > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > + SP_POWERDOWN_CTRL_REG, > + SP_VIDEO_PD | SP_LINK_PD); > + > + err = anx6345_tx_initialization(anx6345); > + if (err) { > + DRM_ERROR("Failed eDP transmitter initialization: %d\n", err); > + anx6345_poweroff(anx6345); > + return err; > + } > + > + err = anx6345_dp_link_training(anx6345); > + if (err) { > + DRM_ERROR("Failed link training: %d\n", err); > + anx6345_poweroff(anx6345); > + return err; > + } > + > + /* > + * This delay seems to help keep the hardware in a good state. Without > + * it, there are times where it fails silently. > + */ > + usleep_range(10000, 15000); > + > + return 0; > +} > + > +static int anx6345_config_dp_output(struct anx6345 *anx6345) > +{ > + int err; > + > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > + SP_VIDEO_MUTE); > + if (err) > + return err; > + > + /* Enable DP output */ > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > + SP_VIDEO_EN); > + if (err) > + return err; > + > + /* Force stream valid */ > + return anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > + SP_DP_SYSTEM_CTRL_BASE + 3, > + SP_STRM_FORCE | SP_STRM_CTRL); > +} > + > +static int anx6345_get_downstream_info(struct anx6345 *anx6345) > +{ > + u8 value; > + int err; > + > + err = drm_dp_dpcd_readb(&anx6345->aux, DP_SINK_COUNT, &value); > + if (err < 0) { > + DRM_ERROR("Get sink count failed %d\n", err); > + return err; > + } > + > + if (!DP_GET_SINK_COUNT(value)) { > + DRM_ERROR("Downstream disconnected\n"); > + return -EIO; > + } > + > + return 0; > +} > + > +static int anx6345_get_modes(struct drm_connector *connector) > +{ > + struct anx6345 *anx6345 = connector_to_anx6345(connector); > + int err, num_modes = 0; > + bool power_off = false; > + > + mutex_lock(&anx6345->lock); > + > + if (!anx6345->edid) { > + if (!anx6345->powered) { > + anx6345_poweron(anx6345); > + power_off = true; > + } > + > + err = anx6345_get_downstream_info(anx6345); > + if (err) { > + DRM_ERROR("Failed to get downstream info: %d\n", err); > + goto unlock; > + } > + > + anx6345->edid = drm_get_edid(connector, &anx6345->aux.ddc); > + if (!anx6345->edid) > + DRM_ERROR("Failed to read EDID from panel\n"); > + > + err = drm_connector_update_edid_property(connector, > + anx6345->edid); > + if (err) { > + DRM_ERROR("Failed to update EDID property: %d\n", err); > + goto unlock; > + } > + } > + > + num_modes += drm_add_edid_modes(connector, anx6345->edid); > + > +unlock: > + if (power_off) > + anx6345_poweroff(anx6345); > + > + mutex_unlock(&anx6345->lock); > + > + if (!num_modes && anx6345->panel) > + num_modes += drm_panel_get_modes(anx6345->panel); > + > + return num_modes; > +} > + > +static const struct drm_connector_helper_funcs anx6345_connector_helper_funcs = { > + .get_modes = anx6345_get_modes, > +}; > + > +static void > +anx6345_connector_destroy(struct drm_connector *connector) > +{ > + struct anx6345 *anx6345 = connector_to_anx6345(connector); > + > + if (anx6345->panel) > + drm_panel_detach(anx6345->panel); > + drm_connector_cleanup(connector); > +} > + > +static const struct drm_connector_funcs anx6345_connector_funcs = { > + .fill_modes = drm_helper_probe_single_connector_modes, > + .destroy = anx6345_connector_destroy, > + .reset = drm_atomic_helper_connector_reset, > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > +}; > + > +static int anx6345_bridge_attach(struct drm_bridge *bridge) > +{ > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > + int err; > + > + if (!bridge->encoder) { > + DRM_ERROR("Parent encoder object not found"); > + return -ENODEV; > + } > + > + /* Register aux channel */ > + anx6345->aux.name = "DP-AUX"; > + anx6345->aux.dev = &anx6345->client->dev; > + anx6345->aux.transfer = anx6345_aux_transfer; > + > + err = drm_dp_aux_register(&anx6345->aux); > + if (err < 0) { > + DRM_ERROR("Failed to register aux channel: %d\n", err); > + return err; > + } > + > + err = drm_connector_init(bridge->dev, &anx6345->connector, > + &anx6345_connector_funcs, > + DRM_MODE_CONNECTOR_eDP); > + if (err) { > + DRM_ERROR("Failed to initialize connector: %d\n", err); > + return err; > + } > + > + drm_connector_helper_add(&anx6345->connector, > + &anx6345_connector_helper_funcs); > + > + err = drm_connector_register(&anx6345->connector); > + if (err) { > + DRM_ERROR("Failed to register connector: %d\n", err); > + return err; > + } > + > + anx6345->connector.polled = DRM_CONNECTOR_POLL_HPD; > + > + err = drm_connector_attach_encoder(&anx6345->connector, > + bridge->encoder); > + if (err) { > + DRM_ERROR("Failed to link up connector to encoder: %d\n", err); > + return err; > + } > + > + if (anx6345->panel) { > + err = drm_panel_attach(anx6345->panel, &anx6345->connector); > + if (err) { > + DRM_ERROR("Failed to attach panel: %d\n", err); > + return err; > + } > + } > + > + return 0; > +} > + > +static enum drm_mode_status > +anx6345_bridge_mode_valid(struct drm_bridge *bridge, > + const struct drm_display_mode *mode) > +{ > + if (mode->flags & DRM_MODE_FLAG_INTERLACE) > + return MODE_NO_INTERLACE; > + > + /* Max 1200p at 5.4 Ghz, one lane */ > + if (mode->clock > 154000) > + return MODE_CLOCK_HIGH; > + > + return MODE_OK; > +} > + > +static void anx6345_bridge_disable(struct drm_bridge *bridge) > +{ > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > + > + /* Power off all modules except configuration registers access */ > + anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > + SP_HDCP_PD | SP_AUDIO_PD | SP_VIDEO_PD | SP_LINK_PD); > + if (anx6345->panel) > + drm_panel_disable(anx6345->panel); > + > + if (anx6345->powered) > + anx6345_poweroff(anx6345); > +} > + > +static void anx6345_bridge_enable(struct drm_bridge *bridge) > +{ > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > + int err; > + > + if (anx6345->panel) > + drm_panel_enable(anx6345->panel); > + > + err = anx6345_start(anx6345); > + if (err) { > + DRM_ERROR("Failed to initialize: %d\n", err); > + return; > + } > + > + err = anx6345_config_dp_output(anx6345); > + if (err) > + DRM_ERROR("Failed to enable DP output: %d\n", err); > +} > + > +static const struct drm_bridge_funcs anx6345_bridge_funcs = { > + .attach = anx6345_bridge_attach, > + .mode_valid = anx6345_bridge_mode_valid, > + .disable = anx6345_bridge_disable, > + .enable = anx6345_bridge_enable, > +}; > + > +static void unregister_i2c_dummy_clients(struct anx6345 *anx6345) > +{ > + unsigned int i; > + > + for (i = 1; i < ARRAY_SIZE(anx6345->i2c_clients); i++) > + if (anx6345->i2c_clients[i] && > + anx6345->i2c_clients[i]->addr != anx6345->client->addr) > + i2c_unregister_device(anx6345->i2c_clients[i]); > +} > + > +static const struct regmap_config anx6345_regmap_config = { > + .reg_bits = 8, > + .val_bits = 8, > + .max_register = 0xff, > + .cache_type = REGCACHE_NONE, > +}; > + > +static const u16 anx6345_chipid_list[] = { > + 0x6345, > +}; > + > +static bool anx6345_get_chip_id(struct anx6345 *anx6345) > +{ > + unsigned int i, idl, idh, version; > + > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_IDL_REG, &idl)) > + return false; > + > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_IDH_REG, &idh)) > + return false; > + > + anx6345->chipid = (u8)idl | ((u8)idh << 8); > + > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_VERSION_REG, > + &version)) > + return false; > + > + for (i = 0; i < ARRAY_SIZE(anx6345_chipid_list); i++) { > + if (anx6345->chipid == anx6345_chipid_list[i]) { > + DRM_INFO("Found ANX%x (ver. %d) eDP Transmitter\n", > + anx6345->chipid, version); > + return true; > + } > + } > + > + DRM_ERROR("ANX%x (ver. %d) not supported by this driver\n", > + anx6345->chipid, version); > + > + return false; > +} > + > +static int anx6345_i2c_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + struct anx6345 *anx6345; > + struct device *dev; > + int i, err; > + > + anx6345 = devm_kzalloc(&client->dev, sizeof(*anx6345), GFP_KERNEL); > + if (!anx6345) > + return -ENOMEM; > + > + mutex_init(&anx6345->lock); > + > + anx6345->bridge.of_node = client->dev.of_node; > + > + anx6345->client = client; > + i2c_set_clientdata(client, anx6345); > + > + dev = &anx6345->client->dev; > + > + err = drm_of_find_panel_or_bridge(client->dev.of_node, 1, 0, > + &anx6345->panel, NULL); > + if (err == -EPROBE_DEFER) > + return err; > + > + if (err) > + DRM_DEBUG("No panel found\n"); > + > + /* 1.2V digital core power regulator */ > + anx6345->dvdd12 = devm_regulator_get(dev, "dvdd12-supply"); > + if (IS_ERR(anx6345->dvdd12)) { > + DRM_ERROR("dvdd12-supply not found\n"); > + return PTR_ERR(anx6345->dvdd12); > + } > + > + /* 2.5V digital core power regulator */ > + anx6345->dvdd25 = devm_regulator_get(dev, "dvdd25-supply"); > + if (IS_ERR(anx6345->dvdd25)) { > + DRM_ERROR("dvdd25-supply not found\n"); > + return PTR_ERR(anx6345->dvdd25); > + } > + > + /* GPIO for chip reset */ > + anx6345->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); > + if (IS_ERR(anx6345->gpiod_reset)) { > + DRM_ERROR("Reset gpio not found\n"); > + return PTR_ERR(anx6345->gpiod_reset); > + } > + > + /* Map slave addresses of ANX6345 */ > + for (i = 0; i < I2C_NUM_ADDRESSES; i++) { > + if (anx6345_i2c_addresses[i] >> 1 != client->addr) > + anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter, > + anx6345_i2c_addresses[i] >> 1); > + else > + anx6345->i2c_clients[i] = client; > + > + if (!anx6345->i2c_clients[i]) { > + err = -ENOMEM; > + DRM_ERROR("Failed to reserve I2C bus %02x\n", > + anx6345_i2c_addresses[i]); > + goto err_unregister_i2c; > + } > + > + anx6345->map[i] = devm_regmap_init_i2c(anx6345->i2c_clients[i], > + &anx6345_regmap_config); > + if (IS_ERR(anx6345->map[i])) { > + err = PTR_ERR(anx6345->map[i]); > + DRM_ERROR("Failed regmap initialization %02x\n", > + anx6345_i2c_addresses[i]); > + goto err_unregister_i2c; > + } > + } > + > + /* Look for supported chip ID */ > + anx6345_poweron(anx6345); > + if (anx6345_get_chip_id(anx6345)) { > + anx6345->bridge.funcs = &anx6345_bridge_funcs; > + drm_bridge_add(&anx6345->bridge); > + > + return 0; > + } else { > + anx6345_poweroff(anx6345); > + err = -ENODEV; > + } > + > +err_unregister_i2c: > + unregister_i2c_dummy_clients(anx6345); > + return err; > +} > + > +static int anx6345_i2c_remove(struct i2c_client *client) > +{ > + struct anx6345 *anx6345 = i2c_get_clientdata(client); > + > + drm_bridge_remove(&anx6345->bridge); > + > + unregister_i2c_dummy_clients(anx6345); > + > + kfree(anx6345->edid); > + > + mutex_destroy(&anx6345->lock); > + > + return 0; > +} > + > +static const struct i2c_device_id anx6345_id[] = { > + { "anx6345", 0 }, > + { /* sentinel */ } > +}; > +MODULE_DEVICE_TABLE(i2c, anx6345_id); > + > +static const struct of_device_id anx6345_match_table[] = { > + { .compatible = "analogix,anx6345", }, > + { /* sentinel */ }, > +}; > +MODULE_DEVICE_TABLE(of, anx6345_match_table); > + > +static struct i2c_driver anx6345_driver = { > + .driver = { > + .name = "anx6345", > + .of_match_table = of_match_ptr(anx6345_match_table), > + }, > + .probe = anx6345_i2c_probe, > + .remove = anx6345_i2c_remove, > + .id_table = anx6345_id, > +}; > +module_i2c_driver(anx6345_driver); > + > +MODULE_DESCRIPTION("ANX6345 eDP Transmitter driver"); > +MODULE_AUTHOR("Enric Balletbo i Serra <enric.balletbo@collabora.com>"); I believe Icenowy is the author of this driver. If you think otherwise please add Enric to CC and get his Signed-off-by. > +MODULE_LICENSE("GPL v2"); _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 5/7] drm/bridge: Add Analogix anx6345 support 2019-07-22 18:49 ` Vasily Khoruzhick @ 2019-07-25 15:26 ` Torsten Duwe -1 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-25 15:26 UTC (permalink / raw) To: Vasily Khoruzhick, Enric Balletbo i Serra Cc: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner, dri-devel, devicetree, arm-linux, linux-kernel On Mon, Jul 22, 2019 at 11:49:48AM -0700, Vasily Khoruzhick wrote: > On Mon, Jul 22, 2019 at 8:11 AM Torsten Duwe <duwe@lst.de> wrote: > > > > +module_i2c_driver(anx6345_driver); > > + > > +MODULE_DESCRIPTION("ANX6345 eDP Transmitter driver"); > > +MODULE_AUTHOR("Enric Balletbo i Serra <enric.balletbo@collabora.com>"); > > I believe Icenowy is the author of this driver. If you think otherwise > please add Enric to CC and get his Signed-off-by. This has already been questioned, and consequently I had a closer look. Icenowy did the work of finding and splitting the common parts, and copied and modified those that needed adaption. Please read the change log(s) in the cover letter(s). I guess Enric already did sign off his code, which only got moved, copied and modified. Torsten ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 5/7] drm/bridge: Add Analogix anx6345 support @ 2019-07-25 15:26 ` Torsten Duwe 0 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-25 15:26 UTC (permalink / raw) To: Vasily Khoruzhick, Enric Balletbo i Serra Cc: Mark Rutland, devicetree, Andrzej Hajda, Maxime Ripard, Greg Kroah-Hartman, linux-kernel, dri-devel, David Airlie, Chen-Yu Tsai, Rob Herring, Thierry Reding, Laurent Pinchart, Daniel Vetter, Harald Geyer, Sean Paul, Thomas Gleixner, arm-linux, Icenowy Zheng On Mon, Jul 22, 2019 at 11:49:48AM -0700, Vasily Khoruzhick wrote: > On Mon, Jul 22, 2019 at 8:11 AM Torsten Duwe <duwe@lst.de> wrote: > > > > +module_i2c_driver(anx6345_driver); > > + > > +MODULE_DESCRIPTION("ANX6345 eDP Transmitter driver"); > > +MODULE_AUTHOR("Enric Balletbo i Serra <enric.balletbo@collabora.com>"); > > I believe Icenowy is the author of this driver. If you think otherwise > please add Enric to CC and get his Signed-off-by. This has already been questioned, and consequently I had a closer look. Icenowy did the work of finding and splitting the common parts, and copied and modified those that needed adaption. Please read the change log(s) in the cover letter(s). I guess Enric already did sign off his code, which only got moved, copied and modified. Torsten _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 5/7] drm/bridge: Add Analogix anx6345 support 2019-07-22 18:49 ` Vasily Khoruzhick @ 2019-07-25 15:45 ` Enric Balletbo Serra -1 siblings, 0 replies; 27+ messages in thread From: Enric Balletbo Serra @ 2019-07-25 15:45 UTC (permalink / raw) To: Vasily Khoruzhick Cc: Torsten Duwe, Mark Rutland, devicetree, Maxime Ripard, Greg Kroah-Hartman, linux-kernel, dri-devel, David Airlie, Chen-Yu Tsai, Rob Herring, Thierry Reding, Laurent Pinchart, Harald Geyer, Sean Paul, Thomas Gleixner, arm-linux, Icenowy Zheng Hi, Missatge de Vasily Khoruzhick <anarsoul@gmail.com> del dia dl., 22 de jul. 2019 a les 20:50: > > On Mon, Jul 22, 2019 at 8:11 AM Torsten Duwe <duwe@lst.de> wrote: > > > > From: Icenowy Zheng <icenowy@aosc.io> > > > > The ANX6345 is an ultra-low power DisplayPower/eDP transmitter designed > > for portable devices. This driver adds initial support for RGB to eDP > > mode, without HPD and interrupts. > > > > This is a configuration usually seen in eDP applications. > > > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > > Signed-off-by: Torsten Duwe <duwe@suse.de> > > --- > > drivers/gpu/drm/bridge/analogix/Kconfig | 12 + > > drivers/gpu/drm/bridge/analogix/Makefile | 1 + > > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 797 +++++++++++++++++++++ > > 3 files changed, 810 insertions(+) > > create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-anx6345.c > > > > --- a/drivers/gpu/drm/bridge/analogix/Kconfig > > +++ b/drivers/gpu/drm/bridge/analogix/Kconfig > > @@ -1,6 +1,18 @@ > > # SPDX-License-Identifier: GPL-2.0-only > > +config DRM_ANALOGIX_ANX6345 > > + tristate "Analogix ANX6345 bridge" > > + select DRM_ANALOGIX_DP > > + select DRM_KMS_HELPER > > + select REGMAP_I2C > > + help > > + ANX6345 is an ultra-low Full-HD DisplayPort/eDP > > + transmitter designed for portable devices. The > > + ANX6345 transforms the LVTTL RGB output of an > > + application processor to eDP or DisplayPort. > > + > > config DRM_ANALOGIX_ANX78XX > > tristate "Analogix ANX78XX bridge" > > + select DRM_ANALOGIX_DP > > select DRM_KMS_HELPER > > select REGMAP_I2C > > help > > --- a/drivers/gpu/drm/bridge/analogix/Makefile > > +++ b/drivers/gpu/drm/bridge/analogix/Makefile > > @@ -1,4 +1,5 @@ > > # SPDX-License-Identifier: GPL-2.0-only > > analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o analogix-i2c-dptx.o > > +obj-$(CONFIG_DRM_ANALOGIX_ANX6345) += analogix-anx6345.o > > obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o > > obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o > > --- /dev/null > > +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c > > @@ -0,0 +1,793 @@ > > +/* SPDX-License-Identifier: GPL-2.0-only */ > > +/* > > + * Copyright(c) 2016, Analogix Semiconductor. > > + * Copyright(c) 2017, Icenowy Zheng <icenowy@aosc.io> > > + * > > + * Based on anx7808 driver obtained from chromeos with copyright: > > + * Copyright(c) 2013, Google Inc. > > + */ > > +#include <linux/delay.h> > > +#include <linux/err.h> > > +#include <linux/gpio/consumer.h> > > +#include <linux/i2c.h> > > +#include <linux/interrupt.h> > > +#include <linux/kernel.h> > > +#include <linux/module.h> > > +#include <linux/of_platform.h> > > +#include <linux/regmap.h> > > +#include <linux/regulator/consumer.h> > > +#include <linux/types.h> > > + > > +#include <drm/drm_atomic_helper.h> > > +#include <drm/drm_crtc.h> > > +#include <drm/drm_crtc_helper.h> > > +#include <drm/drm_dp_helper.h> > > +#include <drm/drm_edid.h> > > +#include <drm/drm_of.h> > > +#include <drm/drm_panel.h> > > +#include <drm/drm_print.h> > > +#include <drm/drm_probe_helper.h> > > + > > +#include "analogix-i2c-dptx.h" > > +#include "analogix-i2c-txcommon.h" > > + > > +#define POLL_DELAY 50000 /* us */ > > +#define POLL_TIMEOUT 5000000 /* us */ > > + > > +#define I2C_IDX_DPTX 0 > > +#define I2C_IDX_TXCOM 1 > > + > > +static const u8 anx6345_i2c_addresses[] = { > > + [I2C_IDX_DPTX] = ANALOGIX_I2C_DPTX, > > + [I2C_IDX_TXCOM] = ANALOGIX_I2C_TXCOMMON, > > +}; > > +#define I2C_NUM_ADDRESSES ARRAY_SIZE(anx6345_i2c_addresses) > > + > > +struct anx6345 { > > + struct drm_dp_aux aux; > > + struct drm_bridge bridge; > > + struct i2c_client *client; > > + struct edid *edid; > > + struct drm_connector connector; > > + struct drm_dp_link link; > > + struct drm_panel *panel; > > + struct regulator *dvdd12; > > + struct regulator *dvdd25; > > + struct gpio_desc *gpiod_reset; > > + struct mutex lock; /* protect EDID access */ > > + > > + /* I2C Slave addresses of ANX6345 are mapped as DPTX and SYS */ > > + struct i2c_client *i2c_clients[I2C_NUM_ADDRESSES]; > > + struct regmap *map[I2C_NUM_ADDRESSES]; > > + > > + u16 chipid; > > + u8 dpcd[DP_RECEIVER_CAP_SIZE]; > > + > > + bool powered; > > +}; > > + > > +static inline struct anx6345 *connector_to_anx6345(struct drm_connector *c) > > +{ > > + return container_of(c, struct anx6345, connector); > > +} > > + > > +static inline struct anx6345 *bridge_to_anx6345(struct drm_bridge *bridge) > > +{ > > + return container_of(bridge, struct anx6345, bridge); > > +} > > + > > +static int anx6345_set_bits(struct regmap *map, u8 reg, u8 mask) > > +{ > > + return regmap_update_bits(map, reg, mask, mask); > > +} > > + > > +static int anx6345_clear_bits(struct regmap *map, u8 reg, u8 mask) > > +{ > > + return regmap_update_bits(map, reg, mask, 0); > > +} > > + > > +static ssize_t anx6345_aux_transfer(struct drm_dp_aux *aux, > > + struct drm_dp_aux_msg *msg) > > +{ > > + struct anx6345 *anx6345 = container_of(aux, struct anx6345, aux); > > + > > + return anx_dp_aux_transfer(anx6345->map[I2C_IDX_DPTX], msg); > > +} > > + > > +static int anx6345_dp_link_training(struct anx6345 *anx6345) > > +{ > > + unsigned int value; > > + u8 dp_bw; > > + int err; > > + > > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > > + SP_POWERDOWN_CTRL_REG, > > + SP_TOTAL_PD); > > + if (err) > > + return err; > > + > > + err = drm_dp_dpcd_readb(&anx6345->aux, DP_MAX_LINK_RATE, &dp_bw); > > + if (err < 0) > > + return err; > > + > > + switch (dp_bw) { > > + case DP_LINK_BW_1_62: > > + case DP_LINK_BW_2_7: > > + break; > > + > > + default: > > + DRM_DEBUG_KMS("DP bandwidth (%#02x) not supported\n", dp_bw); > > + return -EINVAL; > > + } > > + > > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > > + SP_VIDEO_MUTE); > > + if (err) > > + return err; > > + > > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > > + SP_VID_CTRL1_REG, SP_VIDEO_EN); > > + if (err) > > + return err; > > + > > + /* Get DPCD info */ > > + err = drm_dp_dpcd_read(&anx6345->aux, DP_DPCD_REV, > > + &anx6345->dpcd, DP_RECEIVER_CAP_SIZE); > > + if (err < 0) { > > + DRM_ERROR("Failed to read DPCD: %d\n", err); > > + return err; > > + } > > + > > + /* Clear channel x SERDES power down */ > > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_ANALOG_POWER_DOWN_REG, SP_CH0_PD); > > + if (err) > > + return err; > > + > > + /* Check link capabilities */ > > + err = drm_dp_link_probe(&anx6345->aux, &anx6345->link); > > + if (err < 0) { > > + DRM_ERROR("Failed to probe link capabilities: %d\n", err); > > + return err; > > + } > > + > > + /* Power up the sink */ > > + err = drm_dp_link_power_up(&anx6345->aux, &anx6345->link); > > + if (err < 0) { > > + DRM_ERROR("Failed to power up DisplayPort link: %d\n", err); > > + return err; > > + } > > + > > + /* Possibly enable downspread on the sink */ > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_DOWNSPREAD_CTRL1_REG, 0); > > + if (err) > > + return err; > > + > > + if (anx6345->dpcd[DP_MAX_DOWNSPREAD] & DP_MAX_DOWNSPREAD_0_5) { > > + DRM_DEBUG("Enable downspread on the sink\n"); > > + /* 4000PPM */ > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_DOWNSPREAD_CTRL1_REG, 8); > > + if (err) > > + return err; > > + > > + err = drm_dp_dpcd_writeb(&anx6345->aux, DP_DOWNSPREAD_CTRL, > > + DP_SPREAD_AMP_0_5); > > + if (err < 0) > > + return err; > > + } else { > > + err = drm_dp_dpcd_writeb(&anx6345->aux, DP_DOWNSPREAD_CTRL, 0); > > + if (err < 0) > > + return err; > > + } > > + > > + /* Set the lane count and the link rate on the sink */ > > + if (drm_dp_enhanced_frame_cap(anx6345->dpcd)) > > + err = anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_SYSTEM_CTRL_BASE + 4, > > + SP_ENHANCED_MODE); > > + else > > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_SYSTEM_CTRL_BASE + 4, > > + SP_ENHANCED_MODE); > > + if (err) > > + return err; > > + > > + value = drm_dp_link_rate_to_bw_code(anx6345->link.rate); > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_MAIN_LINK_BW_SET_REG, value); > > + if (err) > > + return err; > > + > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_LANE_COUNT_SET_REG, anx6345->link.num_lanes); > > + if (err) > > + return err; > > + > > + err = drm_dp_link_configure(&anx6345->aux, &anx6345->link); > > + if (err < 0) { > > + DRM_ERROR("Failed to configure DisplayPort link: %d\n", err); > > + return err; > > + } > > + > > + /* Start training on the source */ > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], SP_DP_LT_CTRL_REG, > > + SP_LT_EN); > > + if (err) > > + return err; > > + > > + return regmap_read_poll_timeout(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_LT_CTRL_REG, > > + value, !(value & SP_DP_LT_INPROGRESS), > > + POLL_DELAY, POLL_TIMEOUT); > > +} > > + > > +static int anx6345_tx_initialization(struct anx6345 *anx6345) > > +{ > > + int err, i; > > + > > + /* FIXME: colordepth is hardcoded for now */ > > + err = regmap_write(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL2_REG, > > + SP_IN_BPC_6BIT << SP_IN_BPC_SHIFT); > > + if (err) > > + return err; > > + > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], SP_DP_PLL_CTRL_REG, 0); > > + if (err) > > + return err; > > + > > + err = regmap_write(anx6345->map[I2C_IDX_TXCOM], > > + SP_ANALOG_DEBUG1_REG, 0); > > + if (err) > > + return err; > > + > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_LINK_DEBUG_CTRL_REG, > > + SP_NEW_PRBS7 | SP_M_VID_DEBUG); > > + if (err) > > + return err; > > + > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_ANALOG_POWER_DOWN_REG, 0); > > + if (err) > > + return err; > > + > > + /* Force HPD */ > > + err = anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_SYSTEM_CTRL_BASE + 3, > > + SP_HPD_FORCE | SP_HPD_CTRL); > > + if (err) > > + return err; > > + > > + for (i = 0; i < 4; i++) { > > + /* 4 lanes */ > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_LANE0_LT_CTRL_REG + i, 0); > > + if (err) > > + return err; > > + } > > + > > + /* Reset AUX */ > > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], > > + SP_RESET_CTRL2_REG, SP_AUX_RST); > > + if (err) > > + return err; > > + > > + return anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > > + SP_RESET_CTRL2_REG, SP_AUX_RST); > > +} > > + > > +static void anx6345_poweron(struct anx6345 *anx6345) > > +{ > > + int err; > > + > > + /* Ensure reset is asserted before starting power on sequence */ > > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 1); > > + usleep_range(1000, 2000); > > + > > + err = regulator_enable(anx6345->dvdd12); > > + if (err) { > > + DRM_ERROR("Failed to enable dvdd12 regulator: %d\n", > > + err); > > + return; > > + } > > + > > + /* T1 - delay between VDD12 and VDD25 should be 0-2ms */ > > + usleep_range(1000, 2000); > > + > > + err = regulator_enable(anx6345->dvdd25); > > + if (err) { > > + DRM_ERROR("Failed to enable dvdd25 regulator: %d\n", > > + err); > > + return; > > + } > > + > > + /* T2 - delay between RESETN and all power rail stable, > > + * should be 2-5ms > > + */ > > + usleep_range(2000, 5000); > > + > > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 0); > > + > > + /* Power on registers module */ > > + anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > > + SP_HDCP_PD | SP_AUDIO_PD | SP_VIDEO_PD | SP_LINK_PD); > > + anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > > + SP_REGISTER_PD | SP_TOTAL_PD); > > + > > + if (anx6345->panel) > > + drm_panel_prepare(anx6345->panel); > > + > > + anx6345->powered = true; > > +} > > + > > +static void anx6345_poweroff(struct anx6345 *anx6345) > > +{ > > + int err; > > + > > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 1); > > + usleep_range(1000, 2000); > > + > > + if (anx6345->panel) > > + drm_panel_unprepare(anx6345->panel); > > + > > + err = regulator_disable(anx6345->dvdd25); > > + if (err) { > > + DRM_ERROR("Failed to disable dvdd25 regulator: %d\n", > > + err); > > + return; > > + } > > + > > + usleep_range(5000, 10000); > > + > > + err = regulator_disable(anx6345->dvdd12); > > + if (err) { > > + DRM_ERROR("Failed to disable dvdd12 regulator: %d\n", > > + err); > > + return; > > + } > > + > > + usleep_range(1000, 2000); > > + > > + anx6345->powered = false; > > +} > > + > > +static int anx6345_start(struct anx6345 *anx6345) > > +{ > > + int err; > > + > > + if (!anx6345->powered) > > + anx6345_poweron(anx6345); > > + > > + /* Power on needed modules */ > > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > > + SP_POWERDOWN_CTRL_REG, > > + SP_VIDEO_PD | SP_LINK_PD); > > + > > + err = anx6345_tx_initialization(anx6345); > > + if (err) { > > + DRM_ERROR("Failed eDP transmitter initialization: %d\n", err); > > + anx6345_poweroff(anx6345); > > + return err; > > + } > > + > > + err = anx6345_dp_link_training(anx6345); > > + if (err) { > > + DRM_ERROR("Failed link training: %d\n", err); > > + anx6345_poweroff(anx6345); > > + return err; > > + } > > + > > + /* > > + * This delay seems to help keep the hardware in a good state. Without > > + * it, there are times where it fails silently. > > + */ > > + usleep_range(10000, 15000); > > + > > + return 0; > > +} > > + > > +static int anx6345_config_dp_output(struct anx6345 *anx6345) > > +{ > > + int err; > > + > > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > > + SP_VIDEO_MUTE); > > + if (err) > > + return err; > > + > > + /* Enable DP output */ > > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > > + SP_VIDEO_EN); > > + if (err) > > + return err; > > + > > + /* Force stream valid */ > > + return anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_SYSTEM_CTRL_BASE + 3, > > + SP_STRM_FORCE | SP_STRM_CTRL); > > +} > > + > > +static int anx6345_get_downstream_info(struct anx6345 *anx6345) > > +{ > > + u8 value; > > + int err; > > + > > + err = drm_dp_dpcd_readb(&anx6345->aux, DP_SINK_COUNT, &value); > > + if (err < 0) { > > + DRM_ERROR("Get sink count failed %d\n", err); > > + return err; > > + } > > + > > + if (!DP_GET_SINK_COUNT(value)) { > > + DRM_ERROR("Downstream disconnected\n"); > > + return -EIO; > > + } > > + > > + return 0; > > +} > > + > > +static int anx6345_get_modes(struct drm_connector *connector) > > +{ > > + struct anx6345 *anx6345 = connector_to_anx6345(connector); > > + int err, num_modes = 0; > > + bool power_off = false; > > + > > + mutex_lock(&anx6345->lock); > > + > > + if (!anx6345->edid) { > > + if (!anx6345->powered) { > > + anx6345_poweron(anx6345); > > + power_off = true; > > + } > > + > > + err = anx6345_get_downstream_info(anx6345); > > + if (err) { > > + DRM_ERROR("Failed to get downstream info: %d\n", err); > > + goto unlock; > > + } > > + > > + anx6345->edid = drm_get_edid(connector, &anx6345->aux.ddc); > > + if (!anx6345->edid) > > + DRM_ERROR("Failed to read EDID from panel\n"); > > + > > + err = drm_connector_update_edid_property(connector, > > + anx6345->edid); > > + if (err) { > > + DRM_ERROR("Failed to update EDID property: %d\n", err); > > + goto unlock; > > + } > > + } > > + > > + num_modes += drm_add_edid_modes(connector, anx6345->edid); > > + > > +unlock: > > + if (power_off) > > + anx6345_poweroff(anx6345); > > + > > + mutex_unlock(&anx6345->lock); > > + > > + if (!num_modes && anx6345->panel) > > + num_modes += drm_panel_get_modes(anx6345->panel); > > + > > + return num_modes; > > +} > > + > > +static const struct drm_connector_helper_funcs anx6345_connector_helper_funcs = { > > + .get_modes = anx6345_get_modes, > > +}; > > + > > +static void > > +anx6345_connector_destroy(struct drm_connector *connector) > > +{ > > + struct anx6345 *anx6345 = connector_to_anx6345(connector); > > + > > + if (anx6345->panel) > > + drm_panel_detach(anx6345->panel); > > + drm_connector_cleanup(connector); > > +} > > + > > +static const struct drm_connector_funcs anx6345_connector_funcs = { > > + .fill_modes = drm_helper_probe_single_connector_modes, > > + .destroy = anx6345_connector_destroy, > > + .reset = drm_atomic_helper_connector_reset, > > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > > +}; > > + > > +static int anx6345_bridge_attach(struct drm_bridge *bridge) > > +{ > > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > > + int err; > > + > > + if (!bridge->encoder) { > > + DRM_ERROR("Parent encoder object not found"); > > + return -ENODEV; > > + } > > + > > + /* Register aux channel */ > > + anx6345->aux.name = "DP-AUX"; > > + anx6345->aux.dev = &anx6345->client->dev; > > + anx6345->aux.transfer = anx6345_aux_transfer; > > + > > + err = drm_dp_aux_register(&anx6345->aux); > > + if (err < 0) { > > + DRM_ERROR("Failed to register aux channel: %d\n", err); > > + return err; > > + } > > + > > + err = drm_connector_init(bridge->dev, &anx6345->connector, > > + &anx6345_connector_funcs, > > + DRM_MODE_CONNECTOR_eDP); > > + if (err) { > > + DRM_ERROR("Failed to initialize connector: %d\n", err); > > + return err; > > + } > > + > > + drm_connector_helper_add(&anx6345->connector, > > + &anx6345_connector_helper_funcs); > > + > > + err = drm_connector_register(&anx6345->connector); > > + if (err) { > > + DRM_ERROR("Failed to register connector: %d\n", err); > > + return err; > > + } > > + > > + anx6345->connector.polled = DRM_CONNECTOR_POLL_HPD; > > + > > + err = drm_connector_attach_encoder(&anx6345->connector, > > + bridge->encoder); > > + if (err) { > > + DRM_ERROR("Failed to link up connector to encoder: %d\n", err); > > + return err; > > + } > > + > > + if (anx6345->panel) { > > + err = drm_panel_attach(anx6345->panel, &anx6345->connector); > > + if (err) { > > + DRM_ERROR("Failed to attach panel: %d\n", err); > > + return err; > > + } > > + } > > + > > + return 0; > > +} > > + > > +static enum drm_mode_status > > +anx6345_bridge_mode_valid(struct drm_bridge *bridge, > > + const struct drm_display_mode *mode) > > +{ > > + if (mode->flags & DRM_MODE_FLAG_INTERLACE) > > + return MODE_NO_INTERLACE; > > + > > + /* Max 1200p at 5.4 Ghz, one lane */ > > + if (mode->clock > 154000) > > + return MODE_CLOCK_HIGH; > > + > > + return MODE_OK; > > +} > > + > > +static void anx6345_bridge_disable(struct drm_bridge *bridge) > > +{ > > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > > + > > + /* Power off all modules except configuration registers access */ > > + anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > > + SP_HDCP_PD | SP_AUDIO_PD | SP_VIDEO_PD | SP_LINK_PD); > > + if (anx6345->panel) > > + drm_panel_disable(anx6345->panel); > > + > > + if (anx6345->powered) > > + anx6345_poweroff(anx6345); > > +} > > + > > +static void anx6345_bridge_enable(struct drm_bridge *bridge) > > +{ > > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > > + int err; > > + > > + if (anx6345->panel) > > + drm_panel_enable(anx6345->panel); > > + > > + err = anx6345_start(anx6345); > > + if (err) { > > + DRM_ERROR("Failed to initialize: %d\n", err); > > + return; > > + } > > + > > + err = anx6345_config_dp_output(anx6345); > > + if (err) > > + DRM_ERROR("Failed to enable DP output: %d\n", err); > > +} > > + > > +static const struct drm_bridge_funcs anx6345_bridge_funcs = { > > + .attach = anx6345_bridge_attach, > > + .mode_valid = anx6345_bridge_mode_valid, > > + .disable = anx6345_bridge_disable, > > + .enable = anx6345_bridge_enable, > > +}; > > + > > +static void unregister_i2c_dummy_clients(struct anx6345 *anx6345) > > +{ > > + unsigned int i; > > + > > + for (i = 1; i < ARRAY_SIZE(anx6345->i2c_clients); i++) > > + if (anx6345->i2c_clients[i] && > > + anx6345->i2c_clients[i]->addr != anx6345->client->addr) > > + i2c_unregister_device(anx6345->i2c_clients[i]); > > +} > > + > > +static const struct regmap_config anx6345_regmap_config = { > > + .reg_bits = 8, > > + .val_bits = 8, > > + .max_register = 0xff, > > + .cache_type = REGCACHE_NONE, > > +}; > > + > > +static const u16 anx6345_chipid_list[] = { > > + 0x6345, > > +}; > > + > > +static bool anx6345_get_chip_id(struct anx6345 *anx6345) > > +{ > > + unsigned int i, idl, idh, version; > > + > > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_IDL_REG, &idl)) > > + return false; > > + > > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_IDH_REG, &idh)) > > + return false; > > + > > + anx6345->chipid = (u8)idl | ((u8)idh << 8); > > + > > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_VERSION_REG, > > + &version)) > > + return false; > > + > > + for (i = 0; i < ARRAY_SIZE(anx6345_chipid_list); i++) { > > + if (anx6345->chipid == anx6345_chipid_list[i]) { > > + DRM_INFO("Found ANX%x (ver. %d) eDP Transmitter\n", > > + anx6345->chipid, version); > > + return true; > > + } > > + } > > + > > + DRM_ERROR("ANX%x (ver. %d) not supported by this driver\n", > > + anx6345->chipid, version); > > + > > + return false; > > +} > > + > > +static int anx6345_i2c_probe(struct i2c_client *client, > > + const struct i2c_device_id *id) > > +{ > > + struct anx6345 *anx6345; > > + struct device *dev; > > + int i, err; > > + > > + anx6345 = devm_kzalloc(&client->dev, sizeof(*anx6345), GFP_KERNEL); > > + if (!anx6345) > > + return -ENOMEM; > > + > > + mutex_init(&anx6345->lock); > > + > > + anx6345->bridge.of_node = client->dev.of_node; > > + > > + anx6345->client = client; > > + i2c_set_clientdata(client, anx6345); > > + > > + dev = &anx6345->client->dev; > > + > > + err = drm_of_find_panel_or_bridge(client->dev.of_node, 1, 0, > > + &anx6345->panel, NULL); > > + if (err == -EPROBE_DEFER) > > + return err; > > + > > + if (err) > > + DRM_DEBUG("No panel found\n"); > > + > > + /* 1.2V digital core power regulator */ > > + anx6345->dvdd12 = devm_regulator_get(dev, "dvdd12-supply"); > > + if (IS_ERR(anx6345->dvdd12)) { > > + DRM_ERROR("dvdd12-supply not found\n"); > > + return PTR_ERR(anx6345->dvdd12); > > + } > > + > > + /* 2.5V digital core power regulator */ > > + anx6345->dvdd25 = devm_regulator_get(dev, "dvdd25-supply"); > > + if (IS_ERR(anx6345->dvdd25)) { > > + DRM_ERROR("dvdd25-supply not found\n"); > > + return PTR_ERR(anx6345->dvdd25); > > + } > > + > > + /* GPIO for chip reset */ > > + anx6345->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); > > + if (IS_ERR(anx6345->gpiod_reset)) { > > + DRM_ERROR("Reset gpio not found\n"); > > + return PTR_ERR(anx6345->gpiod_reset); > > + } > > + > > + /* Map slave addresses of ANX6345 */ > > + for (i = 0; i < I2C_NUM_ADDRESSES; i++) { > > + if (anx6345_i2c_addresses[i] >> 1 != client->addr) > > + anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter, > > + anx6345_i2c_addresses[i] >> 1); > > + else > > + anx6345->i2c_clients[i] = client; > > + > > + if (!anx6345->i2c_clients[i]) { > > + err = -ENOMEM; > > + DRM_ERROR("Failed to reserve I2C bus %02x\n", > > + anx6345_i2c_addresses[i]); > > + goto err_unregister_i2c; > > + } > > + > > + anx6345->map[i] = devm_regmap_init_i2c(anx6345->i2c_clients[i], > > + &anx6345_regmap_config); > > + if (IS_ERR(anx6345->map[i])) { > > + err = PTR_ERR(anx6345->map[i]); > > + DRM_ERROR("Failed regmap initialization %02x\n", > > + anx6345_i2c_addresses[i]); > > + goto err_unregister_i2c; > > + } > > + } > > + > > + /* Look for supported chip ID */ > > + anx6345_poweron(anx6345); > > + if (anx6345_get_chip_id(anx6345)) { > > + anx6345->bridge.funcs = &anx6345_bridge_funcs; > > + drm_bridge_add(&anx6345->bridge); > > + > > + return 0; > > + } else { > > + anx6345_poweroff(anx6345); > > + err = -ENODEV; > > + } > > + > > +err_unregister_i2c: > > + unregister_i2c_dummy_clients(anx6345); > > + return err; > > +} > > + > > +static int anx6345_i2c_remove(struct i2c_client *client) > > +{ > > + struct anx6345 *anx6345 = i2c_get_clientdata(client); > > + > > + drm_bridge_remove(&anx6345->bridge); > > + > > + unregister_i2c_dummy_clients(anx6345); > > + > > + kfree(anx6345->edid); > > + > > + mutex_destroy(&anx6345->lock); > > + > > + return 0; > > +} > > + > > +static const struct i2c_device_id anx6345_id[] = { > > + { "anx6345", 0 }, > > + { /* sentinel */ } > > +}; > > +MODULE_DEVICE_TABLE(i2c, anx6345_id); > > + > > +static const struct of_device_id anx6345_match_table[] = { > > + { .compatible = "analogix,anx6345", }, > > + { /* sentinel */ }, > > +}; > > +MODULE_DEVICE_TABLE(of, anx6345_match_table); > > + > > +static struct i2c_driver anx6345_driver = { > > + .driver = { > > + .name = "anx6345", > > + .of_match_table = of_match_ptr(anx6345_match_table), > > + }, > > + .probe = anx6345_i2c_probe, > > + .remove = anx6345_i2c_remove, > > + .id_table = anx6345_id, > > +}; > > +module_i2c_driver(anx6345_driver); > > + > > +MODULE_DESCRIPTION("ANX6345 eDP Transmitter driver"); > > +MODULE_AUTHOR("Enric Balletbo i Serra <enric.balletbo@collabora.com>"); > > I believe Icenowy is the author of this driver. If you think otherwise > please add Enric to CC and get his Signed-off-by. > I think that the only reason my name appears here is because is a copy/paste from analogix-anx78xx.c (probably this driver took that file as a reference?). Indeed I am not the author of this driver, so Icenowy should be here, not me. Thanks, Enric > > +MODULE_LICENSE("GPL v2"); > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 5/7] drm/bridge: Add Analogix anx6345 support @ 2019-07-25 15:45 ` Enric Balletbo Serra 0 siblings, 0 replies; 27+ messages in thread From: Enric Balletbo Serra @ 2019-07-25 15:45 UTC (permalink / raw) To: Vasily Khoruzhick Cc: Mark Rutland, devicetree, Sean Paul, Maxime Ripard, Greg Kroah-Hartman, linux-kernel, dri-devel, David Airlie, Chen-Yu Tsai, Rob Herring, Torsten Duwe, Laurent Pinchart, Harald Geyer, Thierry Reding, Thomas Gleixner, arm-linux, Icenowy Zheng Hi, Missatge de Vasily Khoruzhick <anarsoul@gmail.com> del dia dl., 22 de jul. 2019 a les 20:50: > > On Mon, Jul 22, 2019 at 8:11 AM Torsten Duwe <duwe@lst.de> wrote: > > > > From: Icenowy Zheng <icenowy@aosc.io> > > > > The ANX6345 is an ultra-low power DisplayPower/eDP transmitter designed > > for portable devices. This driver adds initial support for RGB to eDP > > mode, without HPD and interrupts. > > > > This is a configuration usually seen in eDP applications. > > > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > > Signed-off-by: Torsten Duwe <duwe@suse.de> > > --- > > drivers/gpu/drm/bridge/analogix/Kconfig | 12 + > > drivers/gpu/drm/bridge/analogix/Makefile | 1 + > > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 797 +++++++++++++++++++++ > > 3 files changed, 810 insertions(+) > > create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-anx6345.c > > > > --- a/drivers/gpu/drm/bridge/analogix/Kconfig > > +++ b/drivers/gpu/drm/bridge/analogix/Kconfig > > @@ -1,6 +1,18 @@ > > # SPDX-License-Identifier: GPL-2.0-only > > +config DRM_ANALOGIX_ANX6345 > > + tristate "Analogix ANX6345 bridge" > > + select DRM_ANALOGIX_DP > > + select DRM_KMS_HELPER > > + select REGMAP_I2C > > + help > > + ANX6345 is an ultra-low Full-HD DisplayPort/eDP > > + transmitter designed for portable devices. The > > + ANX6345 transforms the LVTTL RGB output of an > > + application processor to eDP or DisplayPort. > > + > > config DRM_ANALOGIX_ANX78XX > > tristate "Analogix ANX78XX bridge" > > + select DRM_ANALOGIX_DP > > select DRM_KMS_HELPER > > select REGMAP_I2C > > help > > --- a/drivers/gpu/drm/bridge/analogix/Makefile > > +++ b/drivers/gpu/drm/bridge/analogix/Makefile > > @@ -1,4 +1,5 @@ > > # SPDX-License-Identifier: GPL-2.0-only > > analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o analogix-i2c-dptx.o > > +obj-$(CONFIG_DRM_ANALOGIX_ANX6345) += analogix-anx6345.o > > obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o > > obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o > > --- /dev/null > > +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c > > @@ -0,0 +1,793 @@ > > +/* SPDX-License-Identifier: GPL-2.0-only */ > > +/* > > + * Copyright(c) 2016, Analogix Semiconductor. > > + * Copyright(c) 2017, Icenowy Zheng <icenowy@aosc.io> > > + * > > + * Based on anx7808 driver obtained from chromeos with copyright: > > + * Copyright(c) 2013, Google Inc. > > + */ > > +#include <linux/delay.h> > > +#include <linux/err.h> > > +#include <linux/gpio/consumer.h> > > +#include <linux/i2c.h> > > +#include <linux/interrupt.h> > > +#include <linux/kernel.h> > > +#include <linux/module.h> > > +#include <linux/of_platform.h> > > +#include <linux/regmap.h> > > +#include <linux/regulator/consumer.h> > > +#include <linux/types.h> > > + > > +#include <drm/drm_atomic_helper.h> > > +#include <drm/drm_crtc.h> > > +#include <drm/drm_crtc_helper.h> > > +#include <drm/drm_dp_helper.h> > > +#include <drm/drm_edid.h> > > +#include <drm/drm_of.h> > > +#include <drm/drm_panel.h> > > +#include <drm/drm_print.h> > > +#include <drm/drm_probe_helper.h> > > + > > +#include "analogix-i2c-dptx.h" > > +#include "analogix-i2c-txcommon.h" > > + > > +#define POLL_DELAY 50000 /* us */ > > +#define POLL_TIMEOUT 5000000 /* us */ > > + > > +#define I2C_IDX_DPTX 0 > > +#define I2C_IDX_TXCOM 1 > > + > > +static const u8 anx6345_i2c_addresses[] = { > > + [I2C_IDX_DPTX] = ANALOGIX_I2C_DPTX, > > + [I2C_IDX_TXCOM] = ANALOGIX_I2C_TXCOMMON, > > +}; > > +#define I2C_NUM_ADDRESSES ARRAY_SIZE(anx6345_i2c_addresses) > > + > > +struct anx6345 { > > + struct drm_dp_aux aux; > > + struct drm_bridge bridge; > > + struct i2c_client *client; > > + struct edid *edid; > > + struct drm_connector connector; > > + struct drm_dp_link link; > > + struct drm_panel *panel; > > + struct regulator *dvdd12; > > + struct regulator *dvdd25; > > + struct gpio_desc *gpiod_reset; > > + struct mutex lock; /* protect EDID access */ > > + > > + /* I2C Slave addresses of ANX6345 are mapped as DPTX and SYS */ > > + struct i2c_client *i2c_clients[I2C_NUM_ADDRESSES]; > > + struct regmap *map[I2C_NUM_ADDRESSES]; > > + > > + u16 chipid; > > + u8 dpcd[DP_RECEIVER_CAP_SIZE]; > > + > > + bool powered; > > +}; > > + > > +static inline struct anx6345 *connector_to_anx6345(struct drm_connector *c) > > +{ > > + return container_of(c, struct anx6345, connector); > > +} > > + > > +static inline struct anx6345 *bridge_to_anx6345(struct drm_bridge *bridge) > > +{ > > + return container_of(bridge, struct anx6345, bridge); > > +} > > + > > +static int anx6345_set_bits(struct regmap *map, u8 reg, u8 mask) > > +{ > > + return regmap_update_bits(map, reg, mask, mask); > > +} > > + > > +static int anx6345_clear_bits(struct regmap *map, u8 reg, u8 mask) > > +{ > > + return regmap_update_bits(map, reg, mask, 0); > > +} > > + > > +static ssize_t anx6345_aux_transfer(struct drm_dp_aux *aux, > > + struct drm_dp_aux_msg *msg) > > +{ > > + struct anx6345 *anx6345 = container_of(aux, struct anx6345, aux); > > + > > + return anx_dp_aux_transfer(anx6345->map[I2C_IDX_DPTX], msg); > > +} > > + > > +static int anx6345_dp_link_training(struct anx6345 *anx6345) > > +{ > > + unsigned int value; > > + u8 dp_bw; > > + int err; > > + > > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > > + SP_POWERDOWN_CTRL_REG, > > + SP_TOTAL_PD); > > + if (err) > > + return err; > > + > > + err = drm_dp_dpcd_readb(&anx6345->aux, DP_MAX_LINK_RATE, &dp_bw); > > + if (err < 0) > > + return err; > > + > > + switch (dp_bw) { > > + case DP_LINK_BW_1_62: > > + case DP_LINK_BW_2_7: > > + break; > > + > > + default: > > + DRM_DEBUG_KMS("DP bandwidth (%#02x) not supported\n", dp_bw); > > + return -EINVAL; > > + } > > + > > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > > + SP_VIDEO_MUTE); > > + if (err) > > + return err; > > + > > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > > + SP_VID_CTRL1_REG, SP_VIDEO_EN); > > + if (err) > > + return err; > > + > > + /* Get DPCD info */ > > + err = drm_dp_dpcd_read(&anx6345->aux, DP_DPCD_REV, > > + &anx6345->dpcd, DP_RECEIVER_CAP_SIZE); > > + if (err < 0) { > > + DRM_ERROR("Failed to read DPCD: %d\n", err); > > + return err; > > + } > > + > > + /* Clear channel x SERDES power down */ > > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_ANALOG_POWER_DOWN_REG, SP_CH0_PD); > > + if (err) > > + return err; > > + > > + /* Check link capabilities */ > > + err = drm_dp_link_probe(&anx6345->aux, &anx6345->link); > > + if (err < 0) { > > + DRM_ERROR("Failed to probe link capabilities: %d\n", err); > > + return err; > > + } > > + > > + /* Power up the sink */ > > + err = drm_dp_link_power_up(&anx6345->aux, &anx6345->link); > > + if (err < 0) { > > + DRM_ERROR("Failed to power up DisplayPort link: %d\n", err); > > + return err; > > + } > > + > > + /* Possibly enable downspread on the sink */ > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_DOWNSPREAD_CTRL1_REG, 0); > > + if (err) > > + return err; > > + > > + if (anx6345->dpcd[DP_MAX_DOWNSPREAD] & DP_MAX_DOWNSPREAD_0_5) { > > + DRM_DEBUG("Enable downspread on the sink\n"); > > + /* 4000PPM */ > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_DOWNSPREAD_CTRL1_REG, 8); > > + if (err) > > + return err; > > + > > + err = drm_dp_dpcd_writeb(&anx6345->aux, DP_DOWNSPREAD_CTRL, > > + DP_SPREAD_AMP_0_5); > > + if (err < 0) > > + return err; > > + } else { > > + err = drm_dp_dpcd_writeb(&anx6345->aux, DP_DOWNSPREAD_CTRL, 0); > > + if (err < 0) > > + return err; > > + } > > + > > + /* Set the lane count and the link rate on the sink */ > > + if (drm_dp_enhanced_frame_cap(anx6345->dpcd)) > > + err = anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_SYSTEM_CTRL_BASE + 4, > > + SP_ENHANCED_MODE); > > + else > > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_SYSTEM_CTRL_BASE + 4, > > + SP_ENHANCED_MODE); > > + if (err) > > + return err; > > + > > + value = drm_dp_link_rate_to_bw_code(anx6345->link.rate); > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_MAIN_LINK_BW_SET_REG, value); > > + if (err) > > + return err; > > + > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_LANE_COUNT_SET_REG, anx6345->link.num_lanes); > > + if (err) > > + return err; > > + > > + err = drm_dp_link_configure(&anx6345->aux, &anx6345->link); > > + if (err < 0) { > > + DRM_ERROR("Failed to configure DisplayPort link: %d\n", err); > > + return err; > > + } > > + > > + /* Start training on the source */ > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], SP_DP_LT_CTRL_REG, > > + SP_LT_EN); > > + if (err) > > + return err; > > + > > + return regmap_read_poll_timeout(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_LT_CTRL_REG, > > + value, !(value & SP_DP_LT_INPROGRESS), > > + POLL_DELAY, POLL_TIMEOUT); > > +} > > + > > +static int anx6345_tx_initialization(struct anx6345 *anx6345) > > +{ > > + int err, i; > > + > > + /* FIXME: colordepth is hardcoded for now */ > > + err = regmap_write(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL2_REG, > > + SP_IN_BPC_6BIT << SP_IN_BPC_SHIFT); > > + if (err) > > + return err; > > + > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], SP_DP_PLL_CTRL_REG, 0); > > + if (err) > > + return err; > > + > > + err = regmap_write(anx6345->map[I2C_IDX_TXCOM], > > + SP_ANALOG_DEBUG1_REG, 0); > > + if (err) > > + return err; > > + > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_LINK_DEBUG_CTRL_REG, > > + SP_NEW_PRBS7 | SP_M_VID_DEBUG); > > + if (err) > > + return err; > > + > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_ANALOG_POWER_DOWN_REG, 0); > > + if (err) > > + return err; > > + > > + /* Force HPD */ > > + err = anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_SYSTEM_CTRL_BASE + 3, > > + SP_HPD_FORCE | SP_HPD_CTRL); > > + if (err) > > + return err; > > + > > + for (i = 0; i < 4; i++) { > > + /* 4 lanes */ > > + err = regmap_write(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_LANE0_LT_CTRL_REG + i, 0); > > + if (err) > > + return err; > > + } > > + > > + /* Reset AUX */ > > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], > > + SP_RESET_CTRL2_REG, SP_AUX_RST); > > + if (err) > > + return err; > > + > > + return anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > > + SP_RESET_CTRL2_REG, SP_AUX_RST); > > +} > > + > > +static void anx6345_poweron(struct anx6345 *anx6345) > > +{ > > + int err; > > + > > + /* Ensure reset is asserted before starting power on sequence */ > > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 1); > > + usleep_range(1000, 2000); > > + > > + err = regulator_enable(anx6345->dvdd12); > > + if (err) { > > + DRM_ERROR("Failed to enable dvdd12 regulator: %d\n", > > + err); > > + return; > > + } > > + > > + /* T1 - delay between VDD12 and VDD25 should be 0-2ms */ > > + usleep_range(1000, 2000); > > + > > + err = regulator_enable(anx6345->dvdd25); > > + if (err) { > > + DRM_ERROR("Failed to enable dvdd25 regulator: %d\n", > > + err); > > + return; > > + } > > + > > + /* T2 - delay between RESETN and all power rail stable, > > + * should be 2-5ms > > + */ > > + usleep_range(2000, 5000); > > + > > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 0); > > + > > + /* Power on registers module */ > > + anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > > + SP_HDCP_PD | SP_AUDIO_PD | SP_VIDEO_PD | SP_LINK_PD); > > + anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > > + SP_REGISTER_PD | SP_TOTAL_PD); > > + > > + if (anx6345->panel) > > + drm_panel_prepare(anx6345->panel); > > + > > + anx6345->powered = true; > > +} > > + > > +static void anx6345_poweroff(struct anx6345 *anx6345) > > +{ > > + int err; > > + > > + gpiod_set_value_cansleep(anx6345->gpiod_reset, 1); > > + usleep_range(1000, 2000); > > + > > + if (anx6345->panel) > > + drm_panel_unprepare(anx6345->panel); > > + > > + err = regulator_disable(anx6345->dvdd25); > > + if (err) { > > + DRM_ERROR("Failed to disable dvdd25 regulator: %d\n", > > + err); > > + return; > > + } > > + > > + usleep_range(5000, 10000); > > + > > + err = regulator_disable(anx6345->dvdd12); > > + if (err) { > > + DRM_ERROR("Failed to disable dvdd12 regulator: %d\n", > > + err); > > + return; > > + } > > + > > + usleep_range(1000, 2000); > > + > > + anx6345->powered = false; > > +} > > + > > +static int anx6345_start(struct anx6345 *anx6345) > > +{ > > + int err; > > + > > + if (!anx6345->powered) > > + anx6345_poweron(anx6345); > > + > > + /* Power on needed modules */ > > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], > > + SP_POWERDOWN_CTRL_REG, > > + SP_VIDEO_PD | SP_LINK_PD); > > + > > + err = anx6345_tx_initialization(anx6345); > > + if (err) { > > + DRM_ERROR("Failed eDP transmitter initialization: %d\n", err); > > + anx6345_poweroff(anx6345); > > + return err; > > + } > > + > > + err = anx6345_dp_link_training(anx6345); > > + if (err) { > > + DRM_ERROR("Failed link training: %d\n", err); > > + anx6345_poweroff(anx6345); > > + return err; > > + } > > + > > + /* > > + * This delay seems to help keep the hardware in a good state. Without > > + * it, there are times where it fails silently. > > + */ > > + usleep_range(10000, 15000); > > + > > + return 0; > > +} > > + > > +static int anx6345_config_dp_output(struct anx6345 *anx6345) > > +{ > > + int err; > > + > > + err = anx6345_clear_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > > + SP_VIDEO_MUTE); > > + if (err) > > + return err; > > + > > + /* Enable DP output */ > > + err = anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_VID_CTRL1_REG, > > + SP_VIDEO_EN); > > + if (err) > > + return err; > > + > > + /* Force stream valid */ > > + return anx6345_set_bits(anx6345->map[I2C_IDX_DPTX], > > + SP_DP_SYSTEM_CTRL_BASE + 3, > > + SP_STRM_FORCE | SP_STRM_CTRL); > > +} > > + > > +static int anx6345_get_downstream_info(struct anx6345 *anx6345) > > +{ > > + u8 value; > > + int err; > > + > > + err = drm_dp_dpcd_readb(&anx6345->aux, DP_SINK_COUNT, &value); > > + if (err < 0) { > > + DRM_ERROR("Get sink count failed %d\n", err); > > + return err; > > + } > > + > > + if (!DP_GET_SINK_COUNT(value)) { > > + DRM_ERROR("Downstream disconnected\n"); > > + return -EIO; > > + } > > + > > + return 0; > > +} > > + > > +static int anx6345_get_modes(struct drm_connector *connector) > > +{ > > + struct anx6345 *anx6345 = connector_to_anx6345(connector); > > + int err, num_modes = 0; > > + bool power_off = false; > > + > > + mutex_lock(&anx6345->lock); > > + > > + if (!anx6345->edid) { > > + if (!anx6345->powered) { > > + anx6345_poweron(anx6345); > > + power_off = true; > > + } > > + > > + err = anx6345_get_downstream_info(anx6345); > > + if (err) { > > + DRM_ERROR("Failed to get downstream info: %d\n", err); > > + goto unlock; > > + } > > + > > + anx6345->edid = drm_get_edid(connector, &anx6345->aux.ddc); > > + if (!anx6345->edid) > > + DRM_ERROR("Failed to read EDID from panel\n"); > > + > > + err = drm_connector_update_edid_property(connector, > > + anx6345->edid); > > + if (err) { > > + DRM_ERROR("Failed to update EDID property: %d\n", err); > > + goto unlock; > > + } > > + } > > + > > + num_modes += drm_add_edid_modes(connector, anx6345->edid); > > + > > +unlock: > > + if (power_off) > > + anx6345_poweroff(anx6345); > > + > > + mutex_unlock(&anx6345->lock); > > + > > + if (!num_modes && anx6345->panel) > > + num_modes += drm_panel_get_modes(anx6345->panel); > > + > > + return num_modes; > > +} > > + > > +static const struct drm_connector_helper_funcs anx6345_connector_helper_funcs = { > > + .get_modes = anx6345_get_modes, > > +}; > > + > > +static void > > +anx6345_connector_destroy(struct drm_connector *connector) > > +{ > > + struct anx6345 *anx6345 = connector_to_anx6345(connector); > > + > > + if (anx6345->panel) > > + drm_panel_detach(anx6345->panel); > > + drm_connector_cleanup(connector); > > +} > > + > > +static const struct drm_connector_funcs anx6345_connector_funcs = { > > + .fill_modes = drm_helper_probe_single_connector_modes, > > + .destroy = anx6345_connector_destroy, > > + .reset = drm_atomic_helper_connector_reset, > > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > > +}; > > + > > +static int anx6345_bridge_attach(struct drm_bridge *bridge) > > +{ > > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > > + int err; > > + > > + if (!bridge->encoder) { > > + DRM_ERROR("Parent encoder object not found"); > > + return -ENODEV; > > + } > > + > > + /* Register aux channel */ > > + anx6345->aux.name = "DP-AUX"; > > + anx6345->aux.dev = &anx6345->client->dev; > > + anx6345->aux.transfer = anx6345_aux_transfer; > > + > > + err = drm_dp_aux_register(&anx6345->aux); > > + if (err < 0) { > > + DRM_ERROR("Failed to register aux channel: %d\n", err); > > + return err; > > + } > > + > > + err = drm_connector_init(bridge->dev, &anx6345->connector, > > + &anx6345_connector_funcs, > > + DRM_MODE_CONNECTOR_eDP); > > + if (err) { > > + DRM_ERROR("Failed to initialize connector: %d\n", err); > > + return err; > > + } > > + > > + drm_connector_helper_add(&anx6345->connector, > > + &anx6345_connector_helper_funcs); > > + > > + err = drm_connector_register(&anx6345->connector); > > + if (err) { > > + DRM_ERROR("Failed to register connector: %d\n", err); > > + return err; > > + } > > + > > + anx6345->connector.polled = DRM_CONNECTOR_POLL_HPD; > > + > > + err = drm_connector_attach_encoder(&anx6345->connector, > > + bridge->encoder); > > + if (err) { > > + DRM_ERROR("Failed to link up connector to encoder: %d\n", err); > > + return err; > > + } > > + > > + if (anx6345->panel) { > > + err = drm_panel_attach(anx6345->panel, &anx6345->connector); > > + if (err) { > > + DRM_ERROR("Failed to attach panel: %d\n", err); > > + return err; > > + } > > + } > > + > > + return 0; > > +} > > + > > +static enum drm_mode_status > > +anx6345_bridge_mode_valid(struct drm_bridge *bridge, > > + const struct drm_display_mode *mode) > > +{ > > + if (mode->flags & DRM_MODE_FLAG_INTERLACE) > > + return MODE_NO_INTERLACE; > > + > > + /* Max 1200p at 5.4 Ghz, one lane */ > > + if (mode->clock > 154000) > > + return MODE_CLOCK_HIGH; > > + > > + return MODE_OK; > > +} > > + > > +static void anx6345_bridge_disable(struct drm_bridge *bridge) > > +{ > > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > > + > > + /* Power off all modules except configuration registers access */ > > + anx6345_set_bits(anx6345->map[I2C_IDX_TXCOM], SP_POWERDOWN_CTRL_REG, > > + SP_HDCP_PD | SP_AUDIO_PD | SP_VIDEO_PD | SP_LINK_PD); > > + if (anx6345->panel) > > + drm_panel_disable(anx6345->panel); > > + > > + if (anx6345->powered) > > + anx6345_poweroff(anx6345); > > +} > > + > > +static void anx6345_bridge_enable(struct drm_bridge *bridge) > > +{ > > + struct anx6345 *anx6345 = bridge_to_anx6345(bridge); > > + int err; > > + > > + if (anx6345->panel) > > + drm_panel_enable(anx6345->panel); > > + > > + err = anx6345_start(anx6345); > > + if (err) { > > + DRM_ERROR("Failed to initialize: %d\n", err); > > + return; > > + } > > + > > + err = anx6345_config_dp_output(anx6345); > > + if (err) > > + DRM_ERROR("Failed to enable DP output: %d\n", err); > > +} > > + > > +static const struct drm_bridge_funcs anx6345_bridge_funcs = { > > + .attach = anx6345_bridge_attach, > > + .mode_valid = anx6345_bridge_mode_valid, > > + .disable = anx6345_bridge_disable, > > + .enable = anx6345_bridge_enable, > > +}; > > + > > +static void unregister_i2c_dummy_clients(struct anx6345 *anx6345) > > +{ > > + unsigned int i; > > + > > + for (i = 1; i < ARRAY_SIZE(anx6345->i2c_clients); i++) > > + if (anx6345->i2c_clients[i] && > > + anx6345->i2c_clients[i]->addr != anx6345->client->addr) > > + i2c_unregister_device(anx6345->i2c_clients[i]); > > +} > > + > > +static const struct regmap_config anx6345_regmap_config = { > > + .reg_bits = 8, > > + .val_bits = 8, > > + .max_register = 0xff, > > + .cache_type = REGCACHE_NONE, > > +}; > > + > > +static const u16 anx6345_chipid_list[] = { > > + 0x6345, > > +}; > > + > > +static bool anx6345_get_chip_id(struct anx6345 *anx6345) > > +{ > > + unsigned int i, idl, idh, version; > > + > > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_IDL_REG, &idl)) > > + return false; > > + > > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_IDH_REG, &idh)) > > + return false; > > + > > + anx6345->chipid = (u8)idl | ((u8)idh << 8); > > + > > + if (regmap_read(anx6345->map[I2C_IDX_TXCOM], SP_DEVICE_VERSION_REG, > > + &version)) > > + return false; > > + > > + for (i = 0; i < ARRAY_SIZE(anx6345_chipid_list); i++) { > > + if (anx6345->chipid == anx6345_chipid_list[i]) { > > + DRM_INFO("Found ANX%x (ver. %d) eDP Transmitter\n", > > + anx6345->chipid, version); > > + return true; > > + } > > + } > > + > > + DRM_ERROR("ANX%x (ver. %d) not supported by this driver\n", > > + anx6345->chipid, version); > > + > > + return false; > > +} > > + > > +static int anx6345_i2c_probe(struct i2c_client *client, > > + const struct i2c_device_id *id) > > +{ > > + struct anx6345 *anx6345; > > + struct device *dev; > > + int i, err; > > + > > + anx6345 = devm_kzalloc(&client->dev, sizeof(*anx6345), GFP_KERNEL); > > + if (!anx6345) > > + return -ENOMEM; > > + > > + mutex_init(&anx6345->lock); > > + > > + anx6345->bridge.of_node = client->dev.of_node; > > + > > + anx6345->client = client; > > + i2c_set_clientdata(client, anx6345); > > + > > + dev = &anx6345->client->dev; > > + > > + err = drm_of_find_panel_or_bridge(client->dev.of_node, 1, 0, > > + &anx6345->panel, NULL); > > + if (err == -EPROBE_DEFER) > > + return err; > > + > > + if (err) > > + DRM_DEBUG("No panel found\n"); > > + > > + /* 1.2V digital core power regulator */ > > + anx6345->dvdd12 = devm_regulator_get(dev, "dvdd12-supply"); > > + if (IS_ERR(anx6345->dvdd12)) { > > + DRM_ERROR("dvdd12-supply not found\n"); > > + return PTR_ERR(anx6345->dvdd12); > > + } > > + > > + /* 2.5V digital core power regulator */ > > + anx6345->dvdd25 = devm_regulator_get(dev, "dvdd25-supply"); > > + if (IS_ERR(anx6345->dvdd25)) { > > + DRM_ERROR("dvdd25-supply not found\n"); > > + return PTR_ERR(anx6345->dvdd25); > > + } > > + > > + /* GPIO for chip reset */ > > + anx6345->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); > > + if (IS_ERR(anx6345->gpiod_reset)) { > > + DRM_ERROR("Reset gpio not found\n"); > > + return PTR_ERR(anx6345->gpiod_reset); > > + } > > + > > + /* Map slave addresses of ANX6345 */ > > + for (i = 0; i < I2C_NUM_ADDRESSES; i++) { > > + if (anx6345_i2c_addresses[i] >> 1 != client->addr) > > + anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter, > > + anx6345_i2c_addresses[i] >> 1); > > + else > > + anx6345->i2c_clients[i] = client; > > + > > + if (!anx6345->i2c_clients[i]) { > > + err = -ENOMEM; > > + DRM_ERROR("Failed to reserve I2C bus %02x\n", > > + anx6345_i2c_addresses[i]); > > + goto err_unregister_i2c; > > + } > > + > > + anx6345->map[i] = devm_regmap_init_i2c(anx6345->i2c_clients[i], > > + &anx6345_regmap_config); > > + if (IS_ERR(anx6345->map[i])) { > > + err = PTR_ERR(anx6345->map[i]); > > + DRM_ERROR("Failed regmap initialization %02x\n", > > + anx6345_i2c_addresses[i]); > > + goto err_unregister_i2c; > > + } > > + } > > + > > + /* Look for supported chip ID */ > > + anx6345_poweron(anx6345); > > + if (anx6345_get_chip_id(anx6345)) { > > + anx6345->bridge.funcs = &anx6345_bridge_funcs; > > + drm_bridge_add(&anx6345->bridge); > > + > > + return 0; > > + } else { > > + anx6345_poweroff(anx6345); > > + err = -ENODEV; > > + } > > + > > +err_unregister_i2c: > > + unregister_i2c_dummy_clients(anx6345); > > + return err; > > +} > > + > > +static int anx6345_i2c_remove(struct i2c_client *client) > > +{ > > + struct anx6345 *anx6345 = i2c_get_clientdata(client); > > + > > + drm_bridge_remove(&anx6345->bridge); > > + > > + unregister_i2c_dummy_clients(anx6345); > > + > > + kfree(anx6345->edid); > > + > > + mutex_destroy(&anx6345->lock); > > + > > + return 0; > > +} > > + > > +static const struct i2c_device_id anx6345_id[] = { > > + { "anx6345", 0 }, > > + { /* sentinel */ } > > +}; > > +MODULE_DEVICE_TABLE(i2c, anx6345_id); > > + > > +static const struct of_device_id anx6345_match_table[] = { > > + { .compatible = "analogix,anx6345", }, > > + { /* sentinel */ }, > > +}; > > +MODULE_DEVICE_TABLE(of, anx6345_match_table); > > + > > +static struct i2c_driver anx6345_driver = { > > + .driver = { > > + .name = "anx6345", > > + .of_match_table = of_match_ptr(anx6345_match_table), > > + }, > > + .probe = anx6345_i2c_probe, > > + .remove = anx6345_i2c_remove, > > + .id_table = anx6345_id, > > +}; > > +module_i2c_driver(anx6345_driver); > > + > > +MODULE_DESCRIPTION("ANX6345 eDP Transmitter driver"); > > +MODULE_AUTHOR("Enric Balletbo i Serra <enric.balletbo@collabora.com>"); > > I believe Icenowy is the author of this driver. If you think otherwise > please add Enric to CC and get his Signed-off-by. > I think that the only reason my name appears here is because is a copy/paste from analogix-anx78xx.c (probably this driver took that file as a reference?). Indeed I am not the author of this driver, so Icenowy should be here, not me. Thanks, Enric > > +MODULE_LICENSE("GPL v2"); > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 5/7] drm/bridge: Add Analogix anx6345 support 2019-07-25 15:45 ` Enric Balletbo Serra @ 2019-07-25 15:53 ` Torsten Duwe -1 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-25 15:53 UTC (permalink / raw) To: Enric Balletbo Serra Cc: Vasily Khoruzhick, Mark Rutland, devicetree, Maxime Ripard, Greg Kroah-Hartman, linux-kernel, dri-devel, David Airlie, Chen-Yu Tsai, Rob Herring, Thierry Reding, Laurent Pinchart, Harald Geyer, Sean Paul, Thomas Gleixner, arm-linux, Icenowy Zheng On Thu, Jul 25, 2019 at 05:45:15PM +0200, Enric Balletbo Serra wrote: > Hi, > > Missatge de Vasily Khoruzhick <anarsoul@gmail.com> del dia dl., 22 de > jul. 2019 a les 20:50: > > > > On Mon, Jul 22, 2019 at 8:11 AM Torsten Duwe <duwe@lst.de> wrote: > > > > > > +module_i2c_driver(anx6345_driver); > > > + > > > +MODULE_DESCRIPTION("ANX6345 eDP Transmitter driver"); > > > +MODULE_AUTHOR("Enric Balletbo i Serra <enric.balletbo@collabora.com>"); > > > > I believe Icenowy is the author of this driver. If you think otherwise > > please add Enric to CC and get his Signed-off-by. > > > > I think that the only reason my name appears here is because is a > copy/paste from analogix-anx78xx.c (probably this driver took that Yes, this is the case. You wrote / authored 500 lines of it, Icenowy about 300. > file as a reference?). Indeed I am not the author of this driver, so > Icenowy should be here, not me. Very well. Thanks for this clear statement! Torsten ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 5/7] drm/bridge: Add Analogix anx6345 support @ 2019-07-25 15:53 ` Torsten Duwe 0 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-25 15:53 UTC (permalink / raw) To: Enric Balletbo Serra Cc: Mark Rutland, devicetree, Maxime Ripard, Greg Kroah-Hartman, linux-kernel, dri-devel, David Airlie, Chen-Yu Tsai, Rob Herring, Thierry Reding, Laurent Pinchart, Harald Geyer, Sean Paul, Thomas Gleixner, arm-linux, Icenowy Zheng On Thu, Jul 25, 2019 at 05:45:15PM +0200, Enric Balletbo Serra wrote: > Hi, > > Missatge de Vasily Khoruzhick <anarsoul@gmail.com> del dia dl., 22 de > jul. 2019 a les 20:50: > > > > On Mon, Jul 22, 2019 at 8:11 AM Torsten Duwe <duwe@lst.de> wrote: > > > > > > +module_i2c_driver(anx6345_driver); > > > + > > > +MODULE_DESCRIPTION("ANX6345 eDP Transmitter driver"); > > > +MODULE_AUTHOR("Enric Balletbo i Serra <enric.balletbo@collabora.com>"); > > > > I believe Icenowy is the author of this driver. If you think otherwise > > please add Enric to CC and get his Signed-off-by. > > > > I think that the only reason my name appears here is because is a > copy/paste from analogix-anx78xx.c (probably this driver took that Yes, this is the case. You wrote / authored 500 lines of it, Icenowy about 300. > file as a reference?). Indeed I am not the author of this driver, so > Icenowy should be here, not me. Very well. Thanks for this clear statement! Torsten _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH v3 6/7] dt-bindings: Add ANX6345 DP/eDP transmitter binding [not found] <<20190722150414.9F97668B20@verein.lst.de> @ 2019-07-22 15:12 ` Torsten Duwe 2019-07-22 15:11 ` Torsten Duwe ` (5 subsequent siblings) 6 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-22 15:12 UTC (permalink / raw) To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Vasily Khoruzhick, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner Cc: dri-devel, devicetree, linux-arm-kernel, linux-kernel The anx6345 is an ultra-low power DisplayPort/eDP transmitter designed for portable devices. Add a binding document for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Reviewed-by: Rob Herring <robh@kernel.org> Signed-off-by: Torsten Duwe <duwe@suse.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- .../devicetree/bindings/display/bridge/anx6345.txt | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/anx6345.txt diff --git a/Documentation/devicetree/bindings/display/bridge/anx6345.txt b/Documentation/devicetree/bindings/display/bridge/anx6345.txt new file mode 100644 index 000000000000..0af092d101c5 --- /dev/null +++ b/Documentation/devicetree/bindings/display/bridge/anx6345.txt @@ -0,0 +1,57 @@ +Analogix ANX6345 eDP Transmitter +-------------------------------- + +The ANX6345 is an ultra-low power Full-HD eDP transmitter designed for +portable devices. + +Required properties: + + - compatible : "analogix,anx6345" + - reg : I2C address of the device + - reset-gpios : Which GPIO to use for reset (active low) + - dvdd12-supply : Regulator for 1.2V digital core power. + - dvdd25-supply : Regulator for 2.5V digital core power. + - Video port 0 for LVTTL input, using the DT bindings defined in [1]. + +Optional properties: + + - Video port 1 for eDP output (panel or connector) using the DT bindings + defined in [1]. + +[1]: Documentation/devicetree/bindings/media/video-interfaces.txt + +Example: + +anx6345: anx6345@38 { + compatible = "analogix,anx6345"; + reg = <0x38>; + reset-gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24 */ + dvdd25-supply = <®_dldo2>; + dvdd12-supply = <®_fldo1>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + anx6345_in: port@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + anx6345_in_tcon0: endpoint@0 { + reg = <0>; + remote-endpoint = <&tcon0_out_anx6345>; + }; + }; + + anx6345_out: port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + anx6345_out_panel: endpoint@0 { + reg = <0>; + remote-endpoint = <&panel_in_edp>; + }; + }; + }; +}; -- 2.16.4 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 6/7] dt-bindings: Add ANX6345 DP/eDP transmitter binding @ 2019-07-22 15:12 ` Torsten Duwe 0 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-22 15:12 UTC (permalink / raw) To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Vasily Khoruzhick, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner Cc: devicetree, linux-arm-kernel, dri-devel, linux-kernel The anx6345 is an ultra-low power DisplayPort/eDP transmitter designed for portable devices. Add a binding document for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Reviewed-by: Rob Herring <robh@kernel.org> Signed-off-by: Torsten Duwe <duwe@suse.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- .../devicetree/bindings/display/bridge/anx6345.txt | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/anx6345.txt diff --git a/Documentation/devicetree/bindings/display/bridge/anx6345.txt b/Documentation/devicetree/bindings/display/bridge/anx6345.txt new file mode 100644 index 000000000000..0af092d101c5 --- /dev/null +++ b/Documentation/devicetree/bindings/display/bridge/anx6345.txt @@ -0,0 +1,57 @@ +Analogix ANX6345 eDP Transmitter +-------------------------------- + +The ANX6345 is an ultra-low power Full-HD eDP transmitter designed for +portable devices. + +Required properties: + + - compatible : "analogix,anx6345" + - reg : I2C address of the device + - reset-gpios : Which GPIO to use for reset (active low) + - dvdd12-supply : Regulator for 1.2V digital core power. + - dvdd25-supply : Regulator for 2.5V digital core power. + - Video port 0 for LVTTL input, using the DT bindings defined in [1]. + +Optional properties: + + - Video port 1 for eDP output (panel or connector) using the DT bindings + defined in [1]. + +[1]: Documentation/devicetree/bindings/media/video-interfaces.txt + +Example: + +anx6345: anx6345@38 { + compatible = "analogix,anx6345"; + reg = <0x38>; + reset-gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24 */ + dvdd25-supply = <®_dldo2>; + dvdd12-supply = <®_fldo1>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + anx6345_in: port@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + anx6345_in_tcon0: endpoint@0 { + reg = <0>; + remote-endpoint = <&tcon0_out_anx6345>; + }; + }; + + anx6345_out: port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + anx6345_out_panel: endpoint@0 { + reg = <0>; + remote-endpoint = <&panel_in_edp>; + }; + }; + }; +}; -- 2.16.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCH v3 6/7] dt-bindings: Add ANX6345 DP/eDP transmitter binding 2019-07-22 15:12 ` Torsten Duwe @ 2019-07-22 18:51 ` Vasily Khoruzhick -1 siblings, 0 replies; 27+ messages in thread From: Vasily Khoruzhick @ 2019-07-22 18:51 UTC (permalink / raw) To: Torsten Duwe Cc: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner, dri-devel, devicetree, arm-linux, linux-kernel On Mon, Jul 22, 2019 at 8:12 AM Torsten Duwe <duwe@lst.de> wrote: > > The anx6345 is an ultra-low power DisplayPort/eDP transmitter designed > for portable devices. > > Add a binding document for it. I believe you'll have to convert it to yaml format. > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > Reviewed-by: Rob Herring <robh@kernel.org> > Signed-off-by: Torsten Duwe <duwe@suse.de> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > .../devicetree/bindings/display/bridge/anx6345.txt | 57 ++++++++++++++++++++++ > 1 file changed, 57 insertions(+) > create mode 100644 Documentation/devicetree/bindings/display/bridge/anx6345.txt > > diff --git a/Documentation/devicetree/bindings/display/bridge/anx6345.txt b/Documentation/devicetree/bindings/display/bridge/anx6345.txt > new file mode 100644 > index 000000000000..0af092d101c5 > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/bridge/anx6345.txt > @@ -0,0 +1,57 @@ > +Analogix ANX6345 eDP Transmitter > +-------------------------------- > + > +The ANX6345 is an ultra-low power Full-HD eDP transmitter designed for > +portable devices. > + > +Required properties: > + > + - compatible : "analogix,anx6345" > + - reg : I2C address of the device > + - reset-gpios : Which GPIO to use for reset (active low) > + - dvdd12-supply : Regulator for 1.2V digital core power. > + - dvdd25-supply : Regulator for 2.5V digital core power. > + - Video port 0 for LVTTL input, using the DT bindings defined in [1]. > + > +Optional properties: > + > + - Video port 1 for eDP output (panel or connector) using the DT bindings > + defined in [1]. > + > +[1]: Documentation/devicetree/bindings/media/video-interfaces.txt > + > +Example: > + > +anx6345: anx6345@38 { > + compatible = "analogix,anx6345"; > + reg = <0x38>; > + reset-gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24 */ > + dvdd25-supply = <®_dldo2>; > + dvdd12-supply = <®_fldo1>; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + anx6345_in: port@0 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0>; > + anx6345_in_tcon0: endpoint@0 { > + reg = <0>; > + remote-endpoint = <&tcon0_out_anx6345>; > + }; > + }; > + > + anx6345_out: port@1 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <1>; > + > + anx6345_out_panel: endpoint@0 { > + reg = <0>; > + remote-endpoint = <&panel_in_edp>; > + }; > + }; > + }; > +}; > -- > 2.16.4 > ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 6/7] dt-bindings: Add ANX6345 DP/eDP transmitter binding @ 2019-07-22 18:51 ` Vasily Khoruzhick 0 siblings, 0 replies; 27+ messages in thread From: Vasily Khoruzhick @ 2019-07-22 18:51 UTC (permalink / raw) To: Torsten Duwe Cc: Mark Rutland, devicetree, Andrzej Hajda, Maxime Ripard, Greg Kroah-Hartman, linux-kernel, dri-devel, David Airlie, Chen-Yu Tsai, Rob Herring, Thierry Reding, Laurent Pinchart, Daniel Vetter, Harald Geyer, Sean Paul, Thomas Gleixner, arm-linux, Icenowy Zheng On Mon, Jul 22, 2019 at 8:12 AM Torsten Duwe <duwe@lst.de> wrote: > > The anx6345 is an ultra-low power DisplayPort/eDP transmitter designed > for portable devices. > > Add a binding document for it. I believe you'll have to convert it to yaml format. > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > Reviewed-by: Rob Herring <robh@kernel.org> > Signed-off-by: Torsten Duwe <duwe@suse.de> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > .../devicetree/bindings/display/bridge/anx6345.txt | 57 ++++++++++++++++++++++ > 1 file changed, 57 insertions(+) > create mode 100644 Documentation/devicetree/bindings/display/bridge/anx6345.txt > > diff --git a/Documentation/devicetree/bindings/display/bridge/anx6345.txt b/Documentation/devicetree/bindings/display/bridge/anx6345.txt > new file mode 100644 > index 000000000000..0af092d101c5 > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/bridge/anx6345.txt > @@ -0,0 +1,57 @@ > +Analogix ANX6345 eDP Transmitter > +-------------------------------- > + > +The ANX6345 is an ultra-low power Full-HD eDP transmitter designed for > +portable devices. > + > +Required properties: > + > + - compatible : "analogix,anx6345" > + - reg : I2C address of the device > + - reset-gpios : Which GPIO to use for reset (active low) > + - dvdd12-supply : Regulator for 1.2V digital core power. > + - dvdd25-supply : Regulator for 2.5V digital core power. > + - Video port 0 for LVTTL input, using the DT bindings defined in [1]. > + > +Optional properties: > + > + - Video port 1 for eDP output (panel or connector) using the DT bindings > + defined in [1]. > + > +[1]: Documentation/devicetree/bindings/media/video-interfaces.txt > + > +Example: > + > +anx6345: anx6345@38 { > + compatible = "analogix,anx6345"; > + reg = <0x38>; > + reset-gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24 */ > + dvdd25-supply = <®_dldo2>; > + dvdd12-supply = <®_fldo1>; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + anx6345_in: port@0 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0>; > + anx6345_in_tcon0: endpoint@0 { > + reg = <0>; > + remote-endpoint = <&tcon0_out_anx6345>; > + }; > + }; > + > + anx6345_out: port@1 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <1>; > + > + anx6345_out_panel: endpoint@0 { > + reg = <0>; > + remote-endpoint = <&panel_in_edp>; > + }; > + }; > + }; > +}; > -- > 2.16.4 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 6/7] dt-bindings: Add ANX6345 DP/eDP transmitter binding 2019-07-22 18:51 ` Vasily Khoruzhick @ 2019-07-25 15:17 ` Torsten Duwe -1 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-25 15:17 UTC (permalink / raw) To: Vasily Khoruzhick Cc: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner, dri-devel, devicetree, arm-linux, linux-kernel On Mon, Jul 22, 2019 at 11:51:36AM -0700, Vasily Khoruzhick wrote: > On Mon, Jul 22, 2019 at 8:12 AM Torsten Duwe <duwe@lst.de> wrote: > > > > The anx6345 is an ultra-low power DisplayPort/eDP transmitter designed > > for portable devices. > > > > Add a binding document for it. > > I believe you'll have to convert it to yaml format. Right. Thanks for the reminder. Torsten ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 6/7] dt-bindings: Add ANX6345 DP/eDP transmitter binding @ 2019-07-25 15:17 ` Torsten Duwe 0 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-25 15:17 UTC (permalink / raw) To: Vasily Khoruzhick Cc: Mark Rutland, devicetree, Andrzej Hajda, Maxime Ripard, Greg Kroah-Hartman, linux-kernel, dri-devel, David Airlie, Chen-Yu Tsai, Rob Herring, Thierry Reding, Laurent Pinchart, Daniel Vetter, Harald Geyer, Sean Paul, Thomas Gleixner, arm-linux, Icenowy Zheng On Mon, Jul 22, 2019 at 11:51:36AM -0700, Vasily Khoruzhick wrote: > On Mon, Jul 22, 2019 at 8:12 AM Torsten Duwe <duwe@lst.de> wrote: > > > > The anx6345 is an ultra-low power DisplayPort/eDP transmitter designed > > for portable devices. > > > > Add a binding document for it. > > I believe you'll have to convert it to yaml format. Right. Thanks for the reminder. Torsten _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH v3 7/7] arm64: dts: allwinner: a64: enable ANX6345 bridge on Teres-I [not found] <<20190722150414.9F97668B20@verein.lst.de> @ 2019-07-22 15:12 ` Torsten Duwe 2019-07-22 15:11 ` Torsten Duwe ` (5 subsequent siblings) 6 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-22 15:12 UTC (permalink / raw) To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Vasily Khoruzhick, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner Cc: dri-devel, devicetree, linux-arm-kernel, linux-kernel Teres-I has an anx6345 bridge connected to the RGB666 LCD output, and the I2C controlling signals are connected to I2C0 bus. Enable it in the device tree, and the display engine, video mixer and tcon0 as well. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Torsten Duwe <duwe@suse.de> --- .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 45 ++++++++++++++++++++-- 1 file changed, 41 insertions(+), 4 deletions(-) --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts @@ -100,18 +100,41 @@ status = "okay"; }; +&de { + status = "okay"; +}; + &ehci1 { status = "okay"; }; -/* The ANX6345 eDP-bridge is on i2c0. There is no linux (mainline) - * driver for this chip at the moment, the bootloader initializes it. - * However it can be accessed with the i2c-dev driver from user space. - */ &i2c0 { clock-frequency = <100000>; status = "okay"; + + anx6345: anx6345@38 { + compatible = "analogix,anx6345"; + reg = <0x38>; + reset-gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24 */ + dvdd25-supply = <®_dldo2>; + dvdd12-supply = <®_dldo3>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + anx6345_in: endpoint { + remote-endpoint = <&tcon0_out_anx6345>; + }; + }; + }; + }; +}; + +&mixer0 { + status = "okay"; }; &mmc0 { @@ -319,6 +342,20 @@ status = "okay"; }; +&tcon0 { + pinctrl-names = "default"; + pinctrl-0 = <&lcd_rgb666_pins>; + + status = "okay"; +}; + +&tcon0_out { + tcon0_out_anx6345: endpoint@0 { + reg = <0>; + remote-endpoint = <&anx6345_in>; + }; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pb_pins>; ^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH v3 7/7] arm64: dts: allwinner: a64: enable ANX6345 bridge on Teres-I @ 2019-07-22 15:12 ` Torsten Duwe 0 siblings, 0 replies; 27+ messages in thread From: Torsten Duwe @ 2019-07-22 15:12 UTC (permalink / raw) To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Thierry Reding, David Airlie, Daniel Vetter, Andrzej Hajda, Laurent Pinchart, Icenowy Zheng, Sean Paul, Vasily Khoruzhick, Harald Geyer, Greg Kroah-Hartman, Thomas Gleixner Cc: devicetree, linux-arm-kernel, dri-devel, linux-kernel Teres-I has an anx6345 bridge connected to the RGB666 LCD output, and the I2C controlling signals are connected to I2C0 bus. Enable it in the device tree, and the display engine, video mixer and tcon0 as well. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Torsten Duwe <duwe@suse.de> --- .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 45 ++++++++++++++++++++-- 1 file changed, 41 insertions(+), 4 deletions(-) --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts @@ -100,18 +100,41 @@ status = "okay"; }; +&de { + status = "okay"; +}; + &ehci1 { status = "okay"; }; -/* The ANX6345 eDP-bridge is on i2c0. There is no linux (mainline) - * driver for this chip at the moment, the bootloader initializes it. - * However it can be accessed with the i2c-dev driver from user space. - */ &i2c0 { clock-frequency = <100000>; status = "okay"; + + anx6345: anx6345@38 { + compatible = "analogix,anx6345"; + reg = <0x38>; + reset-gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24 */ + dvdd25-supply = <®_dldo2>; + dvdd12-supply = <®_dldo3>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + anx6345_in: endpoint { + remote-endpoint = <&tcon0_out_anx6345>; + }; + }; + }; + }; +}; + +&mixer0 { + status = "okay"; }; &mmc0 { @@ -319,6 +342,20 @@ status = "okay"; }; +&tcon0 { + pinctrl-names = "default"; + pinctrl-0 = <&lcd_rgb666_pins>; + + status = "okay"; +}; + +&tcon0_out { + tcon0_out_anx6345: endpoint@0 { + reg = <0>; + remote-endpoint = <&anx6345_in>; + }; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pb_pins>; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2019-07-25 15:53 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <<20190722150414.9F97668B20@verein.lst.de>
2019-07-22 15:11 ` [PATCH v3 1/7] drm/bridge: move ANA78xx driver to analogix subdirectory Torsten Duwe
2019-07-22 15:11 ` Torsten Duwe
2019-07-22 15:11 ` [PATCH v3 2/7] drm/bridge: split some definitions of ANX78xx to dedicated headers Torsten Duwe
2019-07-22 15:11 ` Torsten Duwe
2019-07-22 15:11 ` [PATCH v3 3/7] drm/bridge: extract some Analogix I2C DP common code Torsten Duwe
2019-07-22 15:11 ` Torsten Duwe
2019-07-22 15:11 ` [PATCH v3 4/7] drm/bridge: Prepare Analogix anx6345 support Torsten Duwe
2019-07-22 15:11 ` Torsten Duwe
2019-07-22 15:11 ` [PATCH v3 5/7] drm/bridge: Add " Torsten Duwe
2019-07-22 15:11 ` Torsten Duwe
2019-07-22 18:49 ` Vasily Khoruzhick
2019-07-22 18:49 ` Vasily Khoruzhick
2019-07-22 18:49 ` Vasily Khoruzhick
2019-07-25 15:26 ` Torsten Duwe
2019-07-25 15:26 ` Torsten Duwe
2019-07-25 15:45 ` Enric Balletbo Serra
2019-07-25 15:45 ` Enric Balletbo Serra
2019-07-25 15:53 ` Torsten Duwe
2019-07-25 15:53 ` Torsten Duwe
2019-07-22 15:12 ` [PATCH v3 6/7] dt-bindings: Add ANX6345 DP/eDP transmitter binding Torsten Duwe
2019-07-22 15:12 ` Torsten Duwe
2019-07-22 18:51 ` Vasily Khoruzhick
2019-07-22 18:51 ` Vasily Khoruzhick
2019-07-25 15:17 ` Torsten Duwe
2019-07-25 15:17 ` Torsten Duwe
2019-07-22 15:12 ` [PATCH v3 7/7] arm64: dts: allwinner: a64: enable ANX6345 bridge on Teres-I Torsten Duwe
2019-07-22 15:12 ` Torsten Duwe
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.