Move analogix chip ANX78XX bridge driver into "analogix" directory.
Signed-off-by: Xin Ji
---
drivers/gpu/drm/bridge/Kconfig | 10 -
drivers/gpu/drm/bridge/Makefile|3 +-
drivers/gpu/drm/bridge/analogix-anx78xx.c | 1485
drivers/gpu/drm/bridge/analogix-anx78xx.h | 710 --
drivers/gpu/drm/bridge/analogix/Kconfig| 10 +
drivers/gpu/drm/bridge/analogix/Makefile |2 +
drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 1485
drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h | 710 ++
8 files changed, 2208 insertions(+), 2207 deletions(-)
delete mode 100644 drivers/gpu/drm/bridge/analogix-anx78xx.c
delete mode 100644 drivers/gpu/drm/bridge/analogix-anx78xx.h
create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index ee77746..862789b 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 4934fcf..02cb4cd 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,8 @@ 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 += synopsys/
+obj-y += analogix/
diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c
b/drivers/gpu/drm/bridge/analogix-anx78xx.c
deleted file mode 100644
index 3c7cc5a..000
--- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
+++ /dev/null
@@ -1,1485 +0,0 @@
-// 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
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "analogix-anx78xx.h"
-
-#define I2C_NUM_ADDRESSES 5
-#define I2C_IDX_TX_P0 0
-#define I2C_IDX_TX_P1 1
-#define I2C_IDX_TX_P2 2
-#define I2C_IDX_RX_P0 3
-#define I2C_IDX_RX_P1 4
-
-#define XTAL_CLK 270 /* 27M */
-#define AUX_CH_BUFFER_SIZE 16
-#define AUX_WAIT_TIMEOUT_MS15
-
-static const u8 anx78xx_i2c_addresses[] = {
- [I2C_IDX_TX_P0] = TX_P0,
- [I2C_IDX_TX_P1] = TX_P1,
- [I2C_IDX_TX_P2] = TX_P2,
- [I2C_IDX_RX_P0] = RX_P0,
- [I2C_IDX_RX_P1] = RX_P1,
-};
-
-struct anx78xx_platform_data {
- struct regulator *dvdd10;
- struct gpio_desc *gpiod_hpd;
- struct gpio_desc *gpiod_pd;
- struct gpio_desc *gpiod_reset;
-
- int hpd_irq;
- int intp_irq;
-};
-
-struct anx78xx {
- 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 anx78xx_platform_data pdata;
- struct mutex lock;
-
- /*
-* I2C Slave addresses of ANX7814 are mapped as TX_P0, TX_P1, TX_P2,
-* RX_P0 and RX_P1.
-*/
- struct i2c_client *i2c_dummy[I2C_NUM_ADDRESSES];
- struct regmap *map[I2C_NUM_ADDRESSES];
-
- u16 chipid;
- u8 dpcd[DP_RECEIVER_CAP_SIZE];
-
- bool powered;
-};
-
-static inline struct anx78xx *connector_to_anx78xx(struct drm_connector *c)
-{
- return container_of(c, struct anx78xx, connector);
-}
-
-static inline struct anx78xx *bridge_to_anx78xx(struct drm_bridge *bridge)
-{
- return container_of(bridge, struct anx78xx, bridge);
-}
-
-static int anx78xx_set_bits(struct regmap *map, u8 reg, u8 mask)
-{
