* [PATCH v2 00/10] drm/sun4i: Allwinner MIPI-DSI support
@ 2018-02-21 9:20 Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 01/10] regmap: mmio: Add function to attach a clock Maxime Ripard
` (9 more replies)
0 siblings, 10 replies; 24+ messages in thread
From: Maxime Ripard @ 2018-02-21 9:20 UTC (permalink / raw)
To: Mark Brown, Thierry Reding, Chen-Yu Tsai, Maxime Ripard,
Mark Rutland, Rob Herring
Cc: dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni
Hi,
Here is an preliminary version of the MIPI-DSI support for the Allwinner
SoCs.
This controller can be found on a number of recent SoCs, such as the
A31, A33 or the A64.
Given the sparse documentation, there's a number of obscure areas, but
the current implementation has been tested with a 4-lanes DSI panel on
an A33.
The support is a bit rough around the edges at the time, and some artifacts
are still shown on the screen for some reasons. Wider testing with
different display will hopefully nail those down.
Let me know what you think,
Maxime
Changes from v1:
- Rebased on 4.16-rc1
- Constified a few function arguments and structures
- Reworked the DT binding example a bit
- Reworked the panel driver to check for DSI return codes, and use DCS
helpers when possible
Maxime Ripard (10):
regmap: mmio: Add function to attach a clock
drm/sun4i: tcon: Add TRI finish interrupt for vblank
drm/sun4i: Protect the TCON pixel clocks
dt-bindings: display: Add Allwinner MIPI-DSI bindings
drm/sun4i: Add Allwinner A31 MIPI-DSI controller support
dt-bindings: vendor: Add Huarui Lighting
dt-bindings: panel: Add Huarui LHR050H41 panel documentation
drm/panel: Add Huarui LHR050H41 panel driver
arm: dts: sun8i: a33: Add the DSI-related nodes
[DO NOT MERGE] arm: dts: sun8i: bpi-m2m: Add DSI display
Documentation/devicetree/bindings/display/panel/huarui,lhr050h41.txt | 19 +-
Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt | 84 +++++-
Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +-
arch/arm/boot/dts/sun8i-a33.dtsi | 35 ++-
arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 39 +++-
drivers/base/regmap/regmap-mmio.c | 24 ++-
drivers/gpu/drm/panel/Kconfig | 9 +-
drivers/gpu/drm/panel/Makefile | 1 +-
drivers/gpu/drm/panel/panel-huarui-lhr050h41.c | 506 +++++++++++++++++++++++++++++++++-
drivers/gpu/drm/sun4i/Kconfig | 10 +-
drivers/gpu/drm/sun4i/Makefile | 4 +-
drivers/gpu/drm/sun4i/sun4i_tcon.c | 115 ++++++-
drivers/gpu/drm/sun4i/sun4i_tcon.h | 46 +++-
drivers/gpu/drm/sun4i/sun6i_mipi_dphy.c | 297 +++++++++++++++++++-
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 1111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 67 ++++-
include/linux/regmap.h | 3 +-
17 files changed, 2366 insertions(+), 5 deletions(-)
create mode 100644 Documentation/devicetree/bindings/display/panel/huarui,lhr050h41.txt
create mode 100644 Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt
create mode 100644 drivers/gpu/drm/panel/panel-huarui-lhr050h41.c
create mode 100644 drivers/gpu/drm/sun4i/sun6i_mipi_dphy.c
create mode 100644 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
create mode 100644 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h
base-commit: 91ab883eb21325ad80f3473633f794c78ac87f51
--
git-series 0.9.1
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v2 01/10] regmap: mmio: Add function to attach a clock
2018-02-21 9:20 [PATCH v2 00/10] drm/sun4i: Allwinner MIPI-DSI support Maxime Ripard
@ 2018-02-21 9:20 ` Maxime Ripard
2018-02-26 11:17 ` Applied "regmap: mmio: Add function to attach a clock" to the regmap tree Mark Brown
2018-02-26 13:12 ` [PATCH v2 01/10] regmap: mmio: Add function to attach a clock Mark Brown
2018-02-21 9:20 ` [PATCH v2 02/10] drm/sun4i: tcon: Add TRI finish interrupt for vblank Maxime Ripard
` (8 subsequent siblings)
9 siblings, 2 replies; 24+ messages in thread
From: Maxime Ripard @ 2018-02-21 9:20 UTC (permalink / raw)
To: Mark Brown, Thierry Reding, Chen-Yu Tsai, Maxime Ripard,
Mark Rutland, Rob Herring
Cc: dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni, Maxime Ripard
From: Maxime Ripard <maxime.ripard@free-electrons.com>
regmap_init_mmio_clk allows to specify a clock that needs to be enabled
while accessing the registers.
However, that clock is retrieved through its clock ID, which means it will
lookup that clock based on the current device that registers the regmap,
and, in the DT case, will only look in that device OF node.
This might be problematic if the clock to enable is stored in another node.
Let's add a function that allows to attach a clock that has already been
retrieved to a regmap in order to fix this.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/base/regmap/regmap-mmio.c | 24 ++++++++++++++++++++++++
include/linux/regmap.h | 3 +++
2 files changed, 27 insertions(+)
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c
index 5189fd6182f6..5cadfd3394d8 100644
--- a/drivers/base/regmap/regmap-mmio.c
+++ b/drivers/base/regmap/regmap-mmio.c
@@ -28,6 +28,8 @@
struct regmap_mmio_context {
void __iomem *regs;
unsigned val_bytes;
+
+ bool attached_clk;
struct clk *clk;
void (*reg_write)(struct regmap_mmio_context *ctx,
@@ -363,4 +365,26 @@ struct regmap *__devm_regmap_init_mmio_clk(struct device *dev,
}
EXPORT_SYMBOL_GPL(__devm_regmap_init_mmio_clk);
+int regmap_mmio_attach_clk(struct regmap *map, struct clk *clk)
+{
+ struct regmap_mmio_context *ctx = map->bus_context;
+
+ ctx->clk = clk;
+ ctx->attached_clk = true;
+
+ return clk_prepare(ctx->clk);
+}
+EXPORT_SYMBOL_GPL(regmap_mmio_attach_clk);
+
+void regmap_mmio_detach_clk(struct regmap *map)
+{
+ struct regmap_mmio_context *ctx = map->bus_context;
+
+ clk_unprepare(ctx->clk);
+
+ ctx->attached_clk = false;
+ ctx->clk = NULL;
+}
+EXPORT_SYMBOL_GPL(regmap_mmio_detach_clk);
+
MODULE_LICENSE("GPL v2");
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 6a3aeba40e9e..5f7ad0552c03 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -21,6 +21,7 @@
#include <linux/lockdep.h>
struct module;
+struct clk;
struct device;
struct i2c_client;
struct irq_domain;
@@ -905,6 +906,8 @@ bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg);
__regmap_lockdep_wrapper(__devm_regmap_init_sdw, #config, \
sdw, config)
+int regmap_mmio_attach_clk(struct regmap *map, struct clk *clk);
+void regmap_mmio_detach_clk(struct regmap *map);
void regmap_exit(struct regmap *map);
int regmap_reinit_cache(struct regmap *map,
const struct regmap_config *config);
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 02/10] drm/sun4i: tcon: Add TRI finish interrupt for vblank
2018-02-21 9:20 [PATCH v2 00/10] drm/sun4i: Allwinner MIPI-DSI support Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 01/10] regmap: mmio: Add function to attach a clock Maxime Ripard
@ 2018-02-21 9:20 ` Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 03/10] drm/sun4i: Protect the TCON pixel clocks Maxime Ripard
` (7 subsequent siblings)
9 siblings, 0 replies; 24+ messages in thread
From: Maxime Ripard @ 2018-02-21 9:20 UTC (permalink / raw)
To: Mark Brown, Thierry Reding, Chen-Yu Tsai, Maxime Ripard,
Mark Rutland, Rob Herring
Cc: dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni, Maxime Ripard
From: Maxime Ripard <maxime.ripard@free-electrons.com>
The "CPU" (or Intel 8080) interface uses a different interrupt called
TRI_FINISH (most likely TRI being for trigger) to notify the end of frames,
and hence the VBLANK period.
And that interrupt to the possible VBLANK interrupts source.
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/gpu/drm/sun4i/sun4i_tcon.c | 9 ++++++---
drivers/gpu/drm/sun4i/sun4i_tcon.h | 4 ++++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
index 3c15cf24b503..b73acab74867 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -196,7 +196,8 @@ void sun4i_tcon_enable_vblank(struct sun4i_tcon *tcon, bool enable)
DRM_DEBUG_DRIVER("%sabling VBLANK interrupt\n", enable ? "En" : "Dis");
mask = SUN4I_TCON_GINT0_VBLANK_ENABLE(0) |
- SUN4I_TCON_GINT0_VBLANK_ENABLE(1);
+ SUN4I_TCON_GINT0_VBLANK_ENABLE(1) |
+ SUN4I_TCON_GINT0_TCON0_TRI_FINISH_ENABLE;
if (enable)
val = mask;
@@ -545,7 +546,8 @@ static irqreturn_t sun4i_tcon_handler(int irq, void *private)
regmap_read(tcon->regs, SUN4I_TCON_GINT0_REG, &status);
if (!(status & (SUN4I_TCON_GINT0_VBLANK_INT(0) |
- SUN4I_TCON_GINT0_VBLANK_INT(1))))
+ SUN4I_TCON_GINT0_VBLANK_INT(1) |
+ SUN4I_TCON_GINT0_TCON0_TRI_FINISH_INT)))
return IRQ_NONE;
drm_crtc_handle_vblank(&scrtc->crtc);
@@ -554,7 +556,8 @@ static irqreturn_t sun4i_tcon_handler(int irq, void *private)
/* Acknowledge the interrupt */
regmap_update_bits(tcon->regs, SUN4I_TCON_GINT0_REG,
SUN4I_TCON_GINT0_VBLANK_INT(0) |
- SUN4I_TCON_GINT0_VBLANK_INT(1),
+ SUN4I_TCON_GINT0_VBLANK_INT(1) |
+ SUN4I_TCON_GINT0_TCON0_TRI_FINISH_INT,
0);
return IRQ_HANDLED;
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.h b/drivers/gpu/drm/sun4i/sun4i_tcon.h
index b761c7b823c5..067183076807 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.h
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.h
@@ -28,7 +28,11 @@
#define SUN4I_TCON_GINT0_REG 0x4
#define SUN4I_TCON_GINT0_VBLANK_ENABLE(pipe) BIT(31 - (pipe))
+#define SUN4I_TCON_GINT0_TCON0_TRI_FINISH_ENABLE BIT(27)
+#define SUN4I_TCON_GINT0_TCON0_TRI_COUNTER_ENABLE BIT(26)
#define SUN4I_TCON_GINT0_VBLANK_INT(pipe) BIT(15 - (pipe))
+#define SUN4I_TCON_GINT0_TCON0_TRI_FINISH_INT BIT(11)
+#define SUN4I_TCON_GINT0_TCON0_TRI_COUNTER_INT BIT(10)
#define SUN4I_TCON_GINT1_REG 0x8
#define SUN4I_TCON_FRM_CTL_REG 0x10
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 03/10] drm/sun4i: Protect the TCON pixel clocks
2018-02-21 9:20 [PATCH v2 00/10] drm/sun4i: Allwinner MIPI-DSI support Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 01/10] regmap: mmio: Add function to attach a clock Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 02/10] drm/sun4i: tcon: Add TRI finish interrupt for vblank Maxime Ripard
@ 2018-02-21 9:20 ` Maxime Ripard
2018-02-23 14:05 ` [v2,03/10] " Giulio Benetti
2018-02-23 23:31 ` Giulio Benetti
2018-02-21 9:20 ` [PATCH v2 04/10] dt-bindings: display: Add Allwinner MIPI-DSI bindings Maxime Ripard
` (6 subsequent siblings)
9 siblings, 2 replies; 24+ messages in thread
From: Maxime Ripard @ 2018-02-21 9:20 UTC (permalink / raw)
To: Mark Brown, Thierry Reding, Chen-Yu Tsai, Maxime Ripard,
Mark Rutland, Rob Herring
Cc: dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni, Maxime Ripard
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Both TCON clocks are very sensitive to clock changes, since any change
might lead to improper timings.
Make sure our rate is never changed.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
index b73acab74867..cbe87cee13d1 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -261,7 +261,7 @@ static void sun4i_tcon0_mode_set_common(struct sun4i_tcon *tcon,
const struct drm_display_mode *mode)
{
/* Configure the dot clock */
- clk_set_rate(tcon->dclk, mode->crtc_clock * 1000);
+ clk_set_rate_exclusive(tcon->dclk, mode->crtc_clock * 1000);
/* Set the resolution */
regmap_write(tcon->regs, SUN4I_TCON0_BASIC0_REG,
@@ -419,7 +419,7 @@ static void sun4i_tcon1_mode_set(struct sun4i_tcon *tcon,
WARN_ON(!tcon->quirks->has_channel_1);
/* Configure the dot clock */
- clk_set_rate(tcon->sclk1, mode->crtc_clock * 1000);
+ clk_set_rate_exclusive(tcon->sclk1, mode->crtc_clock * 1000);
/* Adjust clock delay */
clk_delay = sun4i_tcon_get_clk_delay(mode, 1);
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 04/10] dt-bindings: display: Add Allwinner MIPI-DSI bindings
2018-02-21 9:20 [PATCH v2 00/10] drm/sun4i: Allwinner MIPI-DSI support Maxime Ripard
` (2 preceding siblings ...)
2018-02-21 9:20 ` [PATCH v2 03/10] drm/sun4i: Protect the TCON pixel clocks Maxime Ripard
@ 2018-02-21 9:20 ` Maxime Ripard
2018-03-01 22:15 ` Rob Herring
2018-02-21 9:20 ` [PATCH v2 05/10] drm/sun4i: Add Allwinner A31 MIPI-DSI controller support Maxime Ripard
` (5 subsequent siblings)
9 siblings, 1 reply; 24+ messages in thread
From: Maxime Ripard @ 2018-02-21 9:20 UTC (permalink / raw)
To: Mark Brown, Thierry Reding, Chen-Yu Tsai, Maxime Ripard,
Mark Rutland, Rob Herring
Cc: dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni, Maxime Ripard
From: Maxime Ripard <maxime.ripard@free-electrons.com>
The Allwinner SoCs usually come with a DSI encoder. Add a binding for it.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt | 84 +++++++-
1 file changed, 84 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt
diff --git a/Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt b/Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt
new file mode 100644
index 000000000000..cbcc673b9bcc
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt
@@ -0,0 +1,84 @@
+Allwinner A31 DSI Encoder
+=========================
+
+The DSI pipeline consists of two separate blocks: the DSI controller
+itself, and its associated D-PHY.
+
+DSI Encoder
+-----------
+
+The DSI Encoder generates the DSI signal from the TCON's.
+
+Required properties:
+ - compatible: value must be one of:
+ * allwinner,sun6i-a31-mipi-dsi
+ - reg: base address and size of memory-mapped region
+ - interrupts: interrupt associated to this IP
+ - clocks: phandles to the clocks feeding the DSI encoder
+ * bus: the DSI interface clock
+ * mod: the DSI module clock
+ - clock-names: the clock names mentioned above
+ - phys: phandle to the D-PHY
+ - phy-names: must be "dphy"
+ - resets: phandle to the reset controller driving the encoder
+
+ - ports: A ports node with endpoint definitions as defined in
+ Documentation/devicetree/bindings/media/video-interfaces.txt. The
+ port should be the input endpoint, usually coming from the
+ associated TCON.
+
+Any MIPI-DSI device attached to this should be described according to
+the bindings defined in ../mipi-dsi-bus.txt
+
+D-PHY
+-----
+
+Required properties:
+ - compatible: value must be one of:
+ * allwinner,sun6i-a31-mipi-dphy
+ - reg: base address and size of memory-mapped region
+ - clocks: phandles to the clocks feeding the DSI encoder
+ * bus: the DSI interface clock
+ * mod: the DSI module clock
+ - clock-names: the clock names mentioned above
+ - resets: phandle to the reset controller driving the encoder
+
+Example:
+
+dsi0: dsi@1ca0000 {
+ compatible = "allwinner,sun6i-a31-mipi-dsi";
+ reg = <0x01ca0000 0x1000>;
+ interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_MIPI_DSI>,
+ <&ccu CLK_DSI_SCLK>;
+ clock-names = "bus", "mod";
+ resets = <&ccu RST_BUS_MIPI_DSI>;
+ phys = <&dphy0>;
+ phy-names = "dphy";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ panel@0 {
+ compatible = "huarui,lhr050h41";
+ reg = <0>;
+ power-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* PB07 */
+ reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_LOW>; /* PL05 */
+ backlight = <&pwm_bl>;
+ };
+
+ port {
+ dsi0_in_tcon0: endpoint {
+ remote-endpoint = <&tcon0_out_dsi0>;
+ };
+ };
+};
+
+dphy0: d-phy@1ca1000 {
+ compatible = "allwinner,sun6i-a31-mipi-dphy";
+ reg = <0x01ca1000 0x1000>;
+ clocks = <&ccu CLK_BUS_MIPI_DSI>,
+ <&ccu CLK_DSI_DPHY>;
+ clock-names = "bus", "mod";
+ resets = <&ccu RST_BUS_MIPI_DSI>;
+ #phy-cells = <0>;
+};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 05/10] drm/sun4i: Add Allwinner A31 MIPI-DSI controller support
2018-02-21 9:20 [PATCH v2 00/10] drm/sun4i: Allwinner MIPI-DSI support Maxime Ripard
` (3 preceding siblings ...)
2018-02-21 9:20 ` [PATCH v2 04/10] dt-bindings: display: Add Allwinner MIPI-DSI bindings Maxime Ripard
@ 2018-02-21 9:20 ` Maxime Ripard
2018-02-21 14:48 ` kbuild test robot
2018-02-21 9:20 ` [PATCH v2 06/10] dt-bindings: vendor: Add Huarui Lighting Maxime Ripard
` (4 subsequent siblings)
9 siblings, 1 reply; 24+ messages in thread
From: Maxime Ripard @ 2018-02-21 9:20 UTC (permalink / raw)
To: Mark Brown, Thierry Reding, Chen-Yu Tsai, Maxime Ripard,
Mark Rutland, Rob Herring
Cc: dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni, Maxime Ripard
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Most of the Allwinner SoCs since the A31 share the same MIPI-DSI
controller.
While that controller is mostly undocumented, the code is out there and has
been cleaned up in order to be integrated into DRM. However, there's still
some dark areas that are a bit unclear about how the block exactly
operates.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/gpu/drm/sun4i/Kconfig | 10 +-
drivers/gpu/drm/sun4i/Makefile | 4 +-
drivers/gpu/drm/sun4i/sun4i_tcon.c | 102 ++-
drivers/gpu/drm/sun4i/sun4i_tcon.h | 42 +-
drivers/gpu/drm/sun4i/sun6i_mipi_dphy.c | 297 ++++++-
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 1111 ++++++++++++++++++++++++-
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 67 +-
7 files changed, 1633 insertions(+)
create mode 100644 drivers/gpu/drm/sun4i/sun6i_mipi_dphy.c
create mode 100644 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
create mode 100644 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h
diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig
index 882d85db9053..982db116a658 100644
--- a/drivers/gpu/drm/sun4i/Kconfig
+++ b/drivers/gpu/drm/sun4i/Kconfig
@@ -40,6 +40,16 @@ config DRM_SUN4I_BACKEND
do some alpha blending and feed graphics to TCON. If M is
selected the module will be called sun4i-backend.
+config DRM_SUN6I_DSI
+ tristate "Allwinner A31 MIPI-DSI Controller Support"
+ default MACH_SUN8I
+ select CRC_CCITT
+ select DRM_MIPI_DSI
+ help
+ Choose this option if you want have an Allwinner SoC with
+ MIPI-DSI support. If M is selected the module will be called
+ sun6i-dsi
+
config DRM_SUN8I_MIXER
tristate "Support for Allwinner Display Engine 2.0 Mixer"
default MACH_SUN8I
diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile
index 2b37a6abbb1d..84d8ed85e0c0 100644
--- a/drivers/gpu/drm/sun4i/Makefile
+++ b/drivers/gpu/drm/sun4i/Makefile
@@ -19,6 +19,9 @@ sun4i-tcon-y += sun4i_lvds.o
sun4i-tcon-y += sun4i_tcon.o
sun4i-tcon-y += sun4i_rgb.o
+sun6i-dsi-y += sun6i_mipi_dphy.o
+sun6i-dsi-y += sun6i_mipi_dsi.o
+
obj-$(CONFIG_DRM_SUN4I) += sun4i-drm.o
obj-$(CONFIG_DRM_SUN4I) += sun4i-tcon.o
obj-$(CONFIG_DRM_SUN4I) += sun4i_tv.o
@@ -26,4 +29,5 @@ obj-$(CONFIG_DRM_SUN4I) += sun6i_drc.o
obj-$(CONFIG_DRM_SUN4I_BACKEND) += sun4i-backend.o
obj-$(CONFIG_DRM_SUN4I_HDMI) += sun4i-drm-hdmi.o
+obj-$(CONFIG_DRM_SUN6I_DSI) += sun6i-dsi.o
obj-$(CONFIG_DRM_SUN8I_MIXER) += sun8i-mixer.o
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
index cbe87cee13d1..2dd76b54635c 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -34,6 +34,7 @@
#include "sun4i_lvds.h"
#include "sun4i_rgb.h"
#include "sun4i_tcon.h"
+#include "sun6i_mipi_dsi.h"
#include "sunxi_engine.h"
static struct drm_connector *sun4i_tcon_get_connector(const struct drm_encoder *encoder)
@@ -164,6 +165,7 @@ void sun4i_tcon_set_status(struct sun4i_tcon *tcon,
case DRM_MODE_ENCODER_LVDS:
is_lvds = true;
/* Fallthrough */
+ case DRM_MODE_ENCODER_DSI:
case DRM_MODE_ENCODER_NONE:
channel = 0;
break;
@@ -257,6 +259,29 @@ static int sun4i_tcon_get_clk_delay(const struct drm_display_mode *mode,
return delay;
}
+static void sun4i_tcon0_frame_control_enable(struct sun4i_tcon *tcon)
+{
+ regmap_write(tcon->regs, SUN4I_TCON_FRM_SEED_PR_REG, 1);
+ regmap_write(tcon->regs, SUN4I_TCON_FRM_SEED_PG_REG, 3);
+ regmap_write(tcon->regs, SUN4I_TCON_FRM_SEED_PB_REG, 5);
+ regmap_write(tcon->regs, SUN4I_TCON_FRM_SEED_LR_REG, 7);
+ regmap_write(tcon->regs, SUN4I_TCON_FRM_SEED_LG_REG, 11);
+ regmap_write(tcon->regs, SUN4I_TCON_FRM_SEED_LB_REG, 13);
+
+ regmap_write(tcon->regs, SUN4I_TCON_FRM_TBL0_REG, 0x01010000);
+ regmap_write(tcon->regs, SUN4I_TCON_FRM_TBL1_REG, 0x15151111);
+ regmap_write(tcon->regs, SUN4I_TCON_FRM_TBL2_REG, 0x57575555);
+ regmap_write(tcon->regs, SUN4I_TCON_FRM_TBL3_REG, 0x7f7f7777);
+
+ /*
+ * FIXME: This seems to only be the case for RGB666, but it's
+ * not clear when the TCON should be setup to something
+ * different
+ */
+ regmap_write(tcon->regs, SUN4I_TCON_FRM_CTL_REG,
+ SUN4I_TCON_FRM_CTL_EN);
+}
+
static void sun4i_tcon0_mode_set_common(struct sun4i_tcon *tcon,
const struct drm_display_mode *mode)
{
@@ -269,6 +294,73 @@ static void sun4i_tcon0_mode_set_common(struct sun4i_tcon *tcon,
SUN4I_TCON0_BASIC0_Y(mode->crtc_vdisplay));
}
+static void sun4i_tcon0_mode_set_cpu(struct sun4i_tcon *tcon,
+ struct mipi_dsi_device *device,
+ const struct drm_display_mode *mode)
+{
+ u8 bpp = mipi_dsi_pixel_format_to_bpp(device->format);
+ u8 lanes = device->lanes;
+ u32 block_space, start_delay;
+ u32 tcon_div;
+
+ tcon->dclk_min_div = 4;
+ tcon->dclk_max_div = 127;
+
+ sun4i_tcon0_mode_set_common(tcon, mode);
+
+ regmap_update_bits(tcon->regs, SUN4I_TCON0_CTL_REG,
+ SUN4I_TCON0_CTL_IF_MASK,
+ SUN4I_TCON0_CTL_IF_8080);
+
+ regmap_write(tcon->regs, SUN4I_TCON_ECC_FIFO_REG,
+ SUN4I_TCON_ECC_FIFO_EN);
+
+ regmap_write(tcon->regs, SUN4I_TCON0_CPU_IF_REG,
+ SUN4I_TCON0_CPU_IF_MODE_DSI |
+ SUN4I_TCON0_CPU_IF_TRI_FIFO_FLUSH |
+ SUN4I_TCON0_CPU_IF_TRI_FIFO_EN |
+ SUN4I_TCON0_CPU_IF_TRI_EN);
+
+ /*
+ * This looks suspicious, but it works...
+ *
+ * The datasheet says that this should be set higher than 20 *
+ * pixel cycle, but it's not clear what a pixel cycle is.
+ */
+ regmap_read(tcon->regs, SUN4I_TCON0_DCLK_REG, &tcon_div);
+ tcon_div &= GENMASK(6, 0);
+ block_space = mode->htotal * bpp / (tcon_div * lanes);
+ block_space -= mode->hdisplay + 40;
+
+ regmap_write(tcon->regs, SUN4I_TCON0_CPU_TRI0_REG,
+ SUN4I_TCON0_CPU_TRI0_BLOCK_SPACE(block_space) |
+ SUN4I_TCON0_CPU_TRI0_BLOCK_SIZE(mode->hdisplay));
+
+ regmap_write(tcon->regs, SUN4I_TCON0_CPU_TRI1_REG,
+ SUN4I_TCON0_CPU_TRI1_BLOCK_NUM(mode->vdisplay));
+
+ start_delay = (mode->crtc_vtotal - mode->crtc_vdisplay - 10 - 1);
+ start_delay = start_delay * mode->crtc_htotal * 149;
+ start_delay = start_delay / (mode->crtc_clock / 1000) / 8;
+ regmap_write(tcon->regs, SUN4I_TCON0_CPU_TRI2_REG,
+ SUN4I_TCON0_CPU_TRI2_TRANS_START_SET(10) |
+ SUN4I_TCON0_CPU_TRI2_START_DELAY(start_delay));
+
+ sun4i_tcon0_frame_control_enable(tcon);
+
+ /*
+ * The Allwinner BSP has a comment that the period should be
+ * the display clock * 15, but uses an hardcoded 3000...
+ */
+ regmap_write(tcon->regs, SUN4I_TCON_SAFE_PERIOD_REG,
+ SUN4I_TCON_SAFE_PERIOD_NUM(3000) |
+ SUN4I_TCON_SAFE_PERIOD_MODE(3));
+
+ /* Enable the output on the pins */
+ regmap_write(tcon->regs, SUN4I_TCON0_IO_TRI_REG,
+ 0xe0000000);
+}
+
static void sun4i_tcon0_mode_set_lvds(struct sun4i_tcon *tcon,
const struct drm_encoder *encoder,
const struct drm_display_mode *mode)
@@ -503,7 +595,17 @@ void sun4i_tcon_mode_set(struct sun4i_tcon *tcon,
const struct drm_encoder *encoder,
const struct drm_display_mode *mode)
{
+ struct sun6i_dsi *dsi;
+
switch (encoder->encoder_type) {
+ case DRM_MODE_ENCODER_DSI:
+ /*
+ * This is not really elegant, but it's the "cleaner"
+ * way I could think of...
+ */
+ dsi = encoder_to_sun6i_dsi(encoder);
+ sun4i_tcon0_mode_set_cpu(tcon, dsi->device, mode);
+ break;
case DRM_MODE_ENCODER_LVDS:
sun4i_tcon0_mode_set_lvds(tcon, encoder, mode);
break;
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.h b/drivers/gpu/drm/sun4i/sun4i_tcon.h
index 067183076807..d976c44019ac 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.h
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.h
@@ -35,10 +35,25 @@
#define SUN4I_TCON_GINT0_TCON0_TRI_COUNTER_INT BIT(10)
#define SUN4I_TCON_GINT1_REG 0x8
+
#define SUN4I_TCON_FRM_CTL_REG 0x10
+#define SUN4I_TCON_FRM_CTL_EN BIT(31)
+
+#define SUN4I_TCON_FRM_SEED_PR_REG 0x14
+#define SUN4I_TCON_FRM_SEED_PG_REG 0x18
+#define SUN4I_TCON_FRM_SEED_PB_REG 0x1c
+#define SUN4I_TCON_FRM_SEED_LR_REG 0x20
+#define SUN4I_TCON_FRM_SEED_LG_REG 0x24
+#define SUN4I_TCON_FRM_SEED_LB_REG 0x28
+#define SUN4I_TCON_FRM_TBL0_REG 0x2c
+#define SUN4I_TCON_FRM_TBL1_REG 0x30
+#define SUN4I_TCON_FRM_TBL2_REG 0x34
+#define SUN4I_TCON_FRM_TBL3_REG 0x38
#define SUN4I_TCON0_CTL_REG 0x40
#define SUN4I_TCON0_CTL_TCON_ENABLE BIT(31)
+#define SUN4I_TCON0_CTL_IF_MASK GENMASK(25, 24)
+#define SUN4I_TCON0_CTL_IF_8080 (1 << 24)
#define SUN4I_TCON0_CTL_CLK_DELAY_MASK GENMASK(8, 4)
#define SUN4I_TCON0_CTL_CLK_DELAY(delay) ((delay << 4) & SUN4I_TCON0_CTL_CLK_DELAY_MASK)
#define SUN4I_TCON0_CTL_SRC_SEL_MASK GENMASK(2, 0)
@@ -65,7 +80,14 @@
#define SUN4I_TCON0_BASIC3_V_SYNC(height) (((height) - 1) & 0x7ff)
#define SUN4I_TCON0_HV_IF_REG 0x58
+
#define SUN4I_TCON0_CPU_IF_REG 0x60
+#define SUN4I_TCON0_CPU_IF_MODE_MASK GENMASK(31, 28)
+#define SUN4I_TCON0_CPU_IF_MODE_DSI (1 << 28)
+#define SUN4I_TCON0_CPU_IF_TRI_FIFO_FLUSH BIT(16)
+#define SUN4I_TCON0_CPU_IF_TRI_FIFO_EN BIT(2)
+#define SUN4I_TCON0_CPU_IF_TRI_EN BIT(0)
+
#define SUN4I_TCON0_CPU_WR_REG 0x64
#define SUN4I_TCON0_CPU_RD0_REG 0x68
#define SUN4I_TCON0_CPU_RDA_REG 0x6c
@@ -132,6 +154,10 @@
#define SUN4I_TCON1_IO_POL_REG 0xf0
#define SUN4I_TCON1_IO_TRI_REG 0xf4
+
+#define SUN4I_TCON_ECC_FIFO_REG 0xf8
+#define SUN4I_TCON_ECC_FIFO_EN BIT(3)
+
#define SUN4I_TCON_CEU_CTL_REG 0x100
#define SUN4I_TCON_CEU_MUL_RR_REG 0x110
#define SUN4I_TCON_CEU_MUL_RG_REG 0x114
@@ -148,6 +174,22 @@
#define SUN4I_TCON_CEU_RANGE_R_REG 0x140
#define SUN4I_TCON_CEU_RANGE_G_REG 0x144
#define SUN4I_TCON_CEU_RANGE_B_REG 0x148
+
+#define SUN4I_TCON0_CPU_TRI0_REG 0x160
+#define SUN4I_TCON0_CPU_TRI0_BLOCK_SPACE(space) ((((space) - 1) & 0xfff) << 16)
+#define SUN4I_TCON0_CPU_TRI0_BLOCK_SIZE(size) (((size) - 1) & 0xfff)
+
+#define SUN4I_TCON0_CPU_TRI1_REG 0x164
+#define SUN4I_TCON0_CPU_TRI1_BLOCK_NUM(num) (((num) - 1) & 0xffff)
+
+#define SUN4I_TCON0_CPU_TRI2_REG 0x168
+#define SUN4I_TCON0_CPU_TRI2_START_DELAY(delay) (((delay) & 0xffff) << 16)
+#define SUN4I_TCON0_CPU_TRI2_TRANS_START_SET(set) ((set) & 0xfff)
+
+#define SUN4I_TCON_SAFE_PERIOD_REG 0x1f0
+#define SUN4I_TCON_SAFE_PERIOD_NUM(num) (((num) & 0xfff) << 16)
+#define SUN4I_TCON_SAFE_PERIOD_MODE(mode) ((mode) & 0x3)
+
#define SUN4I_TCON_MUX_CTRL_REG 0x200
#define SUN4I_TCON0_LVDS_ANA0_REG 0x220
diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dphy.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dphy.c
new file mode 100644
index 000000000000..f2acc60f98fa
--- /dev/null
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dphy.c
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2016 Allwinnertech Co., Ltd.
+ * Copyright (C) 2017 Free Electrons
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ */
+
+#include <linux/bitops.h>
+#include <linux/clk.h>
+#include <linux/of_address.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+
+#include "sun6i_mipi_dsi.h"
+
+#define SUN6I_DPHY_GCTL_REG 0x00
+#define SUN6I_DPHY_GCTL_LANE_NUM(n) ((((n) - 1) & 3) << 4)
+#define SUN6I_DPHY_GCTL_EN BIT(0)
+
+#define SUN6I_DPHY_TX_CTL_REG 0x04
+#define SUN6I_DPHY_TX_CTL_HS_TX_CLK_CONT BIT(28)
+
+#define SUN6I_DPHY_TX_TIME0_REG 0x10
+#define SUN6I_DPHY_TX_TIME0_HS_TRAIL(n) (((n) & 0xff) << 24)
+#define SUN6I_DPHY_TX_TIME0_HS_PREPARE(n) (((n) & 0xff) << 16)
+#define SUN6I_DPHY_TX_TIME0_LP_CLK_DIV(n) ((n) & 0xff)
+
+#define SUN6I_DPHY_TX_TIME1_REG 0x14
+#define SUN6I_DPHY_TX_TIME1_CLK_POST(n) (((n) & 0xff) << 24)
+#define SUN6I_DPHY_TX_TIME1_CLK_PRE(n) (((n) & 0xff) << 16)
+#define SUN6I_DPHY_TX_TIME1_CLK_ZERO(n) (((n) & 0xff) << 8)
+#define SUN6I_DPHY_TX_TIME1_CLK_PREPARE(n) ((n) & 0xff)
+
+#define SUN6I_DPHY_TX_TIME2_REG 0x18
+#define SUN6I_DPHY_TX_TIME2_CLK_TRAIL(n) ((n) & 0xff)
+
+#define SUN6I_DPHY_TX_TIME3_REG 0x1c
+
+#define SUN6I_DPHY_TX_TIME4_REG 0x20
+#define SUN6I_DPHY_TX_TIME4_HS_TX_ANA1(n) (((n) & 0xff) << 8)
+#define SUN6I_DPHY_TX_TIME4_HS_TX_ANA0(n) ((n) & 0xff)
+
+#define SUN6I_DPHY_ANA0_REG 0x4c
+#define SUN6I_DPHY_ANA0_REG_PWS BIT(31)
+#define SUN6I_DPHY_ANA0_REG_DMPC BIT(28)
+#define SUN6I_DPHY_ANA0_REG_DMPD(n) (((n) & 0xf) << 24)
+#define SUN6I_DPHY_ANA0_REG_SLV(n) (((n) & 7) << 12)
+#define SUN6I_DPHY_ANA0_REG_DEN(n) (((n) & 0xf) << 8)
+
+#define SUN6I_DPHY_ANA1_REG 0x50
+#define SUN6I_DPHY_ANA1_REG_VTTMODE BIT(31)
+#define SUN6I_DPHY_ANA1_REG_CSMPS(n) (((n) & 3) << 28)
+#define SUN6I_DPHY_ANA1_REG_SVTT(n) (((n) & 0xf) << 24)
+
+#define SUN6I_DPHY_ANA2_REG 0x54
+#define SUN6I_DPHY_ANA2_EN_P2S_CPU(n) (((n) & 0xf) << 24)
+#define SUN6I_DPHY_ANA2_EN_P2S_CPU_MASK GENMASK(27, 24)
+#define SUN6I_DPHY_ANA2_EN_CK_CPU BIT(4)
+#define SUN6I_DPHY_ANA2_REG_ENIB BIT(1)
+
+#define SUN6I_DPHY_ANA3_REG 0x58
+#define SUN6I_DPHY_ANA3_EN_VTTD(n) (((n) & 0xf) << 28)
+#define SUN6I_DPHY_ANA3_EN_VTTD_MASK GENMASK(31, 28)
+#define SUN6I_DPHY_ANA3_EN_VTTC BIT(27)
+#define SUN6I_DPHY_ANA3_EN_DIV BIT(26)
+#define SUN6I_DPHY_ANA3_EN_LDOC BIT(25)
+#define SUN6I_DPHY_ANA3_EN_LDOD BIT(24)
+#define SUN6I_DPHY_ANA3_EN_LDOR BIT(18)
+
+#define SUN6I_DPHY_ANA4_REG 0x5c
+#define SUN6I_DPHY_ANA4_REG_DMPLVC BIT(24)
+#define SUN6I_DPHY_ANA4_REG_DMPLVD(n) (((n) & 0xf) << 20)
+#define SUN6I_DPHY_ANA4_REG_CKDV(n) (((n) & 0x1f) << 12)
+#define SUN6I_DPHY_ANA4_REG_TMSC(n) (((n) & 3) << 10)
+#define SUN6I_DPHY_ANA4_REG_TMSD(n) (((n) & 3) << 8)
+#define SUN6I_DPHY_ANA4_REG_TXDNSC(n) (((n) & 3) << 6)
+#define SUN6I_DPHY_ANA4_REG_TXDNSD(n) (((n) & 3) << 4)
+#define SUN6I_DPHY_ANA4_REG_TXPUSC(n) (((n) & 3) << 2)
+#define SUN6I_DPHY_ANA4_REG_TXPUSD(n) ((n) & 3)
+
+#define SUN6I_DPHY_DBG5_REG 0xf4
+
+int sun6i_dphy_init(struct sun6i_dphy *dphy, unsigned int lanes)
+{
+ reset_control_deassert(dphy->reset);
+ clk_prepare_enable(dphy->mod_clk);
+ clk_set_rate_exclusive(dphy->mod_clk, 150000000);
+
+ regmap_write(dphy->regs, SUN6I_DPHY_TX_CTL_REG,
+ SUN6I_DPHY_TX_CTL_HS_TX_CLK_CONT);
+
+ regmap_write(dphy->regs, SUN6I_DPHY_TX_TIME0_REG,
+ SUN6I_DPHY_TX_TIME0_LP_CLK_DIV(14) |
+ SUN6I_DPHY_TX_TIME0_HS_PREPARE(6) |
+ SUN6I_DPHY_TX_TIME0_HS_TRAIL(10));
+
+ regmap_write(dphy->regs, SUN6I_DPHY_TX_TIME1_REG,
+ SUN6I_DPHY_TX_TIME1_CLK_PREPARE(7) |
+ SUN6I_DPHY_TX_TIME1_CLK_ZERO(50) |
+ SUN6I_DPHY_TX_TIME1_CLK_PRE(3) |
+ SUN6I_DPHY_TX_TIME1_CLK_POST(10));
+
+ regmap_write(dphy->regs, SUN6I_DPHY_TX_TIME2_REG,
+ SUN6I_DPHY_TX_TIME2_CLK_TRAIL(30));
+
+ regmap_write(dphy->regs, SUN6I_DPHY_TX_TIME3_REG, 0);
+
+ regmap_write(dphy->regs, SUN6I_DPHY_TX_TIME4_REG,
+ SUN6I_DPHY_TX_TIME4_HS_TX_ANA0(3) |
+ SUN6I_DPHY_TX_TIME4_HS_TX_ANA1(3));
+
+ /* FIXME: Number of lanes? */
+ regmap_write(dphy->regs, SUN6I_DPHY_GCTL_REG,
+ SUN6I_DPHY_GCTL_LANE_NUM(lanes) |
+ SUN6I_DPHY_GCTL_EN);
+
+ return 0;
+}
+
+int sun6i_dphy_power_on(struct sun6i_dphy *dphy, unsigned int lanes)
+{
+ u8 lanes_mask = GENMASK(lanes - 1, 0);
+
+ regmap_write(dphy->regs, SUN6I_DPHY_ANA0_REG,
+ SUN6I_DPHY_ANA0_REG_PWS |
+ SUN6I_DPHY_ANA0_REG_DMPC |
+ SUN6I_DPHY_ANA0_REG_SLV(7) |
+ SUN6I_DPHY_ANA0_REG_DMPD(lanes_mask) |
+ SUN6I_DPHY_ANA0_REG_DEN(lanes_mask));
+
+ regmap_write(dphy->regs, SUN6I_DPHY_ANA1_REG,
+ SUN6I_DPHY_ANA1_REG_CSMPS(1) |
+ SUN6I_DPHY_ANA1_REG_SVTT(7));
+
+ regmap_write(dphy->regs, SUN6I_DPHY_ANA4_REG,
+ SUN6I_DPHY_ANA4_REG_CKDV(1) |
+ SUN6I_DPHY_ANA4_REG_TMSC(1) |
+ SUN6I_DPHY_ANA4_REG_TMSD(1) |
+ SUN6I_DPHY_ANA4_REG_TXDNSC(1) |
+ SUN6I_DPHY_ANA4_REG_TXDNSD(1) |
+ SUN6I_DPHY_ANA4_REG_TXPUSC(1) |
+ SUN6I_DPHY_ANA4_REG_TXPUSD(1) |
+ SUN6I_DPHY_ANA4_REG_DMPLVC |
+ SUN6I_DPHY_ANA4_REG_DMPLVD(lanes_mask));
+
+ regmap_write(dphy->regs, SUN6I_DPHY_ANA2_REG,
+ SUN6I_DPHY_ANA2_REG_ENIB);
+ udelay(5);
+
+ regmap_write(dphy->regs, SUN6I_DPHY_ANA3_REG,
+ SUN6I_DPHY_ANA3_EN_LDOR |
+ SUN6I_DPHY_ANA3_EN_LDOC |
+ SUN6I_DPHY_ANA3_EN_LDOD);
+ udelay(1);
+
+ regmap_update_bits(dphy->regs, SUN6I_DPHY_ANA3_REG,
+ SUN6I_DPHY_ANA3_EN_VTTC |
+ SUN6I_DPHY_ANA3_EN_VTTD_MASK,
+ SUN6I_DPHY_ANA3_EN_VTTC |
+ SUN6I_DPHY_ANA3_EN_VTTD(lanes_mask));
+ udelay(1);
+
+ regmap_update_bits(dphy->regs, SUN6I_DPHY_ANA3_REG,
+ SUN6I_DPHY_ANA3_EN_DIV,
+ SUN6I_DPHY_ANA3_EN_DIV);
+ udelay(1);
+
+ regmap_update_bits(dphy->regs, SUN6I_DPHY_ANA2_REG,
+ SUN6I_DPHY_ANA2_EN_CK_CPU,
+ SUN6I_DPHY_ANA2_EN_CK_CPU);
+ udelay(1);
+
+ regmap_update_bits(dphy->regs, SUN6I_DPHY_ANA1_REG,
+ SUN6I_DPHY_ANA1_REG_VTTMODE,
+ SUN6I_DPHY_ANA1_REG_VTTMODE);
+
+ regmap_update_bits(dphy->regs, SUN6I_DPHY_ANA2_REG,
+ SUN6I_DPHY_ANA2_EN_P2S_CPU_MASK,
+ SUN6I_DPHY_ANA2_EN_P2S_CPU(lanes_mask));
+
+ return 0;
+}
+
+int sun6i_dphy_power_off(struct sun6i_dphy *dphy)
+{
+ regmap_update_bits(dphy->regs, SUN6I_DPHY_ANA1_REG,
+ SUN6I_DPHY_ANA1_REG_VTTMODE, 0);
+
+ return 0;
+}
+
+int sun6i_dphy_exit(struct sun6i_dphy *dphy)
+{
+ clk_rate_exclusive_put(dphy->mod_clk);
+ clk_disable_unprepare(dphy->mod_clk);
+ reset_control_assert(dphy->reset);
+
+ return 0;
+}
+
+static struct regmap_config sun6i_dphy_regmap_config = {
+ .reg_bits = 32,
+ .val_bits = 32,
+ .reg_stride = 4,
+ .max_register = SUN6I_DPHY_DBG5_REG,
+ .name = "mipi-dphy",
+};
+
+static const struct of_device_id sun6i_dphy_of_table[] = {
+ { .compatible = "allwinner,sun6i-a31-mipi-dphy" },
+ { }
+};
+
+int sun6i_dphy_probe(struct sun6i_dsi *dsi, struct device_node *node)
+{
+ struct sun6i_dphy *dphy;
+ struct resource res;
+ void __iomem *regs;
+ int ret;
+
+ if (!of_match_node(sun6i_dphy_of_table, node)) {
+ dev_err(dsi->dev, "Incompatible D-PHY\n");
+ return -EINVAL;
+ }
+
+ dphy = devm_kzalloc(dsi->dev, sizeof(*dphy), GFP_KERNEL);
+ if (!dphy)
+ return -ENOMEM;
+
+ ret = of_address_to_resource(node, 0, &res);
+ if (ret) {
+ dev_err(dsi->dev, "phy: Couldn't get our resources\n");
+ return ret;
+ }
+
+ regs = devm_ioremap_resource(dsi->dev, &res);
+ if (IS_ERR(regs)) {
+ dev_err(dsi->dev, "Couldn't map the DPHY encoder registers\n");
+ return PTR_ERR(regs);
+ }
+
+ dphy->regs = devm_regmap_init_mmio(dsi->dev, regs,
+ &sun6i_dphy_regmap_config);
+ if (IS_ERR(dphy->regs)) {
+ dev_err(dsi->dev, "Couldn't create the DPHY encoder regmap\n");
+ return PTR_ERR(dphy->regs);
+ }
+
+ dphy->reset = of_reset_control_get_shared(node, NULL);
+ if (IS_ERR(dphy->reset)) {
+ dev_err(dsi->dev, "Couldn't get our reset line\n");
+ return PTR_ERR(dphy->reset);
+ }
+
+ dphy->bus_clk = of_clk_get_by_name(node, "bus");
+ if (IS_ERR(dphy->bus_clk)) {
+ dev_err(dsi->dev, "Couldn't get the DPHY bus clock\n");
+ ret = PTR_ERR(dphy->bus_clk);
+ goto err_free_reset;
+ }
+ regmap_mmio_attach_clk(dphy->regs, dphy->bus_clk);
+
+ dphy->mod_clk = of_clk_get_by_name(node, "mod");
+ if (IS_ERR(dphy->mod_clk)) {
+ dev_err(dsi->dev, "Couldn't get the DPHY mod clock\n");
+ ret = PTR_ERR(dphy->mod_clk);
+ goto err_free_bus;
+ }
+
+ dsi->dphy = dphy;
+
+ return 0;
+
+err_free_bus:
+ regmap_mmio_detach_clk(dphy->regs);
+ clk_put(dphy->bus_clk);
+err_free_reset:
+ reset_control_put(dphy->reset);
+ return ret;
+}
+
+int sun6i_dphy_remove(struct sun6i_dsi *dsi)
+{
+ struct sun6i_dphy *dphy = dsi->dphy;
+
+ regmap_mmio_detach_clk(dphy->regs);
+ clk_put(dphy->mod_clk);
+ clk_put(dphy->bus_clk);
+ reset_control_put(dphy->reset);
+
+ return 0;
+}
diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
new file mode 100644
index 000000000000..566a5c5f6145
--- /dev/null
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
@@ -0,0 +1,1111 @@
+/*
+ * Copyright (c) 2016 Allwinnertech Co., Ltd.
+ * Copyright (C) 2017 Free Electrons
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ */
+
+#include <linux/clk.h>
+#include <linux/component.h>
+#include <linux/crc-ccitt.h>
+#include <linux/of_address.h>
+#include <linux/pm_runtime.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+
+#include <linux/phy/phy.h>
+
+#include <drm/drmP.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_panel.h>
+
+#include "sun4i_drv.h"
+#include "sun6i_mipi_dsi.h"
+
+#include <video/mipi_display.h>
+
+#define SUN6I_DSI_CTL_REG 0x000
+#define SUN6I_DSI_CTL_EN BIT(0)
+
+#define SUN6I_DSI_BASIC_CTL_REG 0x00c
+#define SUN6I_DSI_BASIC_CTL_HBP_DIS BIT(2)
+#define SUN6I_DSI_BASIC_CTL_HSA_HSE_DIS BIT(1)
+#define SUN6I_DSI_BASIC_CTL_VIDEO_BURST BIT(0)
+
+#define SUN6I_DSI_BASIC_CTL0_REG 0x010
+#define SUN6I_DSI_BASIC_CTL0_HS_EOTP_EN BIT(18)
+#define SUN6I_DSI_BASIC_CTL0_CRC_EN BIT(17)
+#define SUN6I_DSI_BASIC_CTL0_ECC_EN BIT(16)
+#define SUN6I_DSI_BASIC_CTL0_INST_ST BIT(0)
+
+#define SUN6I_DSI_BASIC_CTL1_REG 0x014
+#define SUN6I_DSI_BASIC_CTL1_VIDEO_ST_DELAY(n) (((n) & 0x1fff) << 4)
+#define SUN6I_DSI_BASIC_CTL1_VIDEO_FILL BIT(2)
+#define SUN6I_DSI_BASIC_CTL1_VIDEO_PRECISION BIT(1)
+#define SUN6I_DSI_BASIC_CTL1_VIDEO_MODE BIT(0)
+
+#define SUN6I_DSI_BASIC_SIZE0_REG 0x018
+#define SUN6I_DSI_BASIC_SIZE0_VBP(n) (((n) & 0xfff) << 16)
+#define SUN6I_DSI_BASIC_SIZE0_VSA(n) ((n) & 0xfff)
+
+#define SUN6I_DSI_BASIC_SIZE1_REG 0x01c
+#define SUN6I_DSI_BASIC_SIZE1_VT(n) (((n) & 0xfff) << 16)
+#define SUN6I_DSI_BASIC_SIZE1_VACT(n) ((n) & 0xfff)
+
+#define SUN6I_DSI_INST_FUNC_REG(n) (0x020 + (n) * 0x04)
+#define SUN6I_DSI_INST_FUNC_INST_MODE(n) (((n) & 0xf) << 28)
+#define SUN6I_DSI_INST_FUNC_ESCAPE_ENTRY(n) (((n) & 0xf) << 24)
+#define SUN6I_DSI_INST_FUNC_TRANS_PACKET(n) (((n) & 0xf) << 20)
+#define SUN6I_DSI_INST_FUNC_LANE_CEN BIT(4)
+#define SUN6I_DSI_INST_FUNC_LANE_DEN(n) ((n) & 0xf)
+
+#define SUN6I_DSI_INST_LOOP_SEL_REG 0x040
+
+#define SUN6I_DSI_INST_LOOP_NUM_REG(n) (0x044 + (n) * 0x10)
+#define SUN6I_DSI_INST_LOOP_NUM_N1(n) (((n) & 0xfff) << 16)
+#define SUN6I_DSI_INST_LOOP_NUM_N0(n) ((n) & 0xfff)
+
+#define SUN6I_DSI_INST_JUMP_SEL_REG 0x048
+
+#define SUN6I_DSI_INST_JUMP_CFG_REG(n) (0x04c + (n) * 0x04)
+#define SUN6I_DSI_INST_JUMP_CFG_TO(n) (((n) & 0xf) << 20)
+#define SUN6I_DSI_INST_JUMP_CFG_POINT(n) (((n) & 0xf) << 16)
+#define SUN6I_DSI_INST_JUMP_CFG_NUM(n) ((n) & 0xffff)
+
+#define SUN6I_DSI_TRANS_START_REG 0x060
+
+#define SUN6I_DSI_TRANS_ZERO_REG 0x078
+
+#define SUN6I_DSI_TCON_DRQ_REG 0x07c
+#define SUN6I_DSI_TCON_DRQ_ENABLE_MODE BIT(28)
+#define SUN6I_DSI_TCON_DRQ_SET(n) ((n) & 0x3ff)
+
+#define SUN6I_DSI_PIXEL_CTL0_REG 0x080
+#define SUN6I_DSI_PIXEL_CTL0_PD_PLUG_DISABLE BIT(16)
+#define SUN6I_DSI_PIXEL_CTL0_FORMAT(n) ((n) & 0xf)
+
+#define SUN6I_DSI_PIXEL_CTL1_REG 0x084
+
+#define SUN6I_DSI_PIXEL_PH_REG 0x090
+#define SUN6I_DSI_PIXEL_PH_ECC(n) (((n) & 0xff) << 24)
+#define SUN6I_DSI_PIXEL_PH_WC(n) (((n) & 0xffff) << 8)
+#define SUN6I_DSI_PIXEL_PH_VC(n) (((n) & 3) << 6)
+#define SUN6I_DSI_PIXEL_PH_DT(n) ((n) & 0x3f)
+
+#define SUN6I_DSI_PIXEL_PF0_REG 0x098
+#define SUN6I_DSI_PIXEL_PF0_CRC_FORCE(n) ((n) & 0xffff)
+
+#define SUN6I_DSI_PIXEL_PF1_REG 0x09c
+#define SUN6I_DSI_PIXEL_PF1_CRC_INIT_LINEN(n) (((n) & 0xffff) << 16)
+#define SUN6I_DSI_PIXEL_PF1_CRC_INIT_LINE0(n) ((n) & 0xffff)
+
+#define SUN6I_DSI_SYNC_HSS_REG 0x0b0
+
+#define SUN6I_DSI_SYNC_HSE_REG 0x0b4
+
+#define SUN6I_DSI_SYNC_VSS_REG 0x0b8
+
+#define SUN6I_DSI_SYNC_VSE_REG 0x0bc
+
+#define SUN6I_DSI_BLK_HSA0_REG 0x0c0
+
+#define SUN6I_DSI_BLK_HSA1_REG 0x0c4
+#define SUN6I_DSI_BLK_PF(n) (((n) & 0xffff) << 16)
+#define SUN6I_DSI_BLK_PD(n) ((n) & 0xff)
+
+#define SUN6I_DSI_BLK_HBP0_REG 0x0c8
+
+#define SUN6I_DSI_BLK_HBP1_REG 0x0cc
+
+#define SUN6I_DSI_BLK_HFP0_REG 0x0d0
+
+#define SUN6I_DSI_BLK_HFP1_REG 0x0d4
+
+#define SUN6I_DSI_BLK_HBLK0_REG 0x0e0
+
+#define SUN6I_DSI_BLK_HBLK1_REG 0x0e4
+
+#define SUN6I_DSI_BLK_VBLK0_REG 0x0e8
+
+#define SUN6I_DSI_BLK_VBLK1_REG 0x0ec
+
+#define SUN6I_DSI_BURST_LINE_REG 0x0f0
+#define SUN6I_DSI_BURST_LINE_SYNC_POINT(n) (((n) & 0xffff) << 16)
+#define SUN6I_DSI_BURST_LINE_NUM(n) ((n) & 0xffff)
+
+#define SUN6I_DSI_BURST_DRQ_REG 0x0f4
+#define SUN6I_DSI_BURST_DRQ_EDGE1(n) (((n) & 0xffff) << 16)
+#define SUN6I_DSI_BURST_DRQ_EDGE0(n) ((n) & 0xffff)
+
+#define SUN6I_DSI_CMD_CTL_REG 0x200
+#define SUN6I_DSI_CMD_CTL_RX_OVERFLOW BIT(26)
+#define SUN6I_DSI_CMD_CTL_RX_FLAG BIT(25)
+#define SUN6I_DSI_CMD_CTL_TX_FLAG BIT(9)
+
+#define SUN6I_DSI_CMD_RX_REG(n) (0x240 + (n) * 0x04)
+
+#define SUN6I_DSI_DEBUG_DATA_REG 0x2f8
+
+#define SUN6I_DSI_CMD_TX_REG(n) (0x300 + (n) * 0x04)
+
+enum sun6i_dsi_start_inst {
+ DSI_START_LPRX,
+ DSI_START_LPTX,
+ DSI_START_HSC,
+ DSI_START_HSD,
+};
+
+enum sun6i_dsi_inst_id {
+ DSI_INST_ID_LP11 = 0,
+ DSI_INST_ID_TBA,
+ DSI_INST_ID_HSC,
+ DSI_INST_ID_HSD,
+ DSI_INST_ID_LPDT,
+ DSI_INST_ID_HSCEXIT,
+ DSI_INST_ID_NOP,
+ DSI_INST_ID_DLY,
+ DSI_INST_ID_END = 15,
+};
+
+enum sun6i_dsi_inst_mode {
+ DSI_INST_MODE_STOP = 0,
+ DSI_INST_MODE_TBA,
+ DSI_INST_MODE_HS,
+ DSI_INST_MODE_ESCAPE,
+ DSI_INST_MODE_HSCEXIT,
+ DSI_INST_MODE_NOP,
+};
+
+enum sun6i_dsi_inst_escape {
+ DSI_INST_ESCA_LPDT = 0,
+ DSI_INST_ESCA_ULPS,
+ DSI_INST_ESCA_UN1,
+ DSI_INST_ESCA_UN2,
+ DSI_INST_ESCA_RESET,
+ DSI_INST_ESCA_UN3,
+ DSI_INST_ESCA_UN4,
+ DSI_INST_ESCA_UN5,
+};
+
+enum sun6i_dsi_inst_packet {
+ DSI_INST_PACK_PIXEL = 0,
+ DSI_INST_PACK_COMMAND,
+};
+
+static u32 sun6i_dsi_ecc_array[] = {
+ [0] = (BIT(0) | BIT(1) | BIT(2) | BIT(4) | BIT(5) | BIT(7) | BIT(10) |
+ BIT(11) | BIT(13) | BIT(16) | BIT(20) | BIT(21) | BIT(22) |
+ BIT(23)),
+ [1] = (BIT(0) | BIT(1) | BIT(3) | BIT(4) | BIT(6) | BIT(8) | BIT(10) |
+ BIT(12) | BIT(14) | BIT(17) | BIT(20) | BIT(21) | BIT(22) |
+ BIT(23)),
+ [2] = (BIT(0) | BIT(2) | BIT(3) | BIT(5) | BIT(6) | BIT(9) | BIT(11) |
+ BIT(12) | BIT(15) | BIT(18) | BIT(20) | BIT(21) | BIT(22)),
+ [3] = (BIT(1) | BIT(2) | BIT(3) | BIT(7) | BIT(8) | BIT(9) | BIT(13) |
+ BIT(14) | BIT(15) | BIT(19) | BIT(20) | BIT(21) | BIT(23)),
+ [4] = (BIT(4) | BIT(5) | BIT(6) | BIT(7) | BIT(8) | BIT(9) | BIT(16) |
+ BIT(17) | BIT(18) | BIT(19) | BIT(20) | BIT(22) | BIT(23)),
+ [5] = (BIT(10) | BIT(11) | BIT(12) | BIT(13) | BIT(14) | BIT(15) |
+ BIT(16) | BIT(17) | BIT(18) | BIT(19) | BIT(21) | BIT(22) |
+ BIT(23)),
+};
+
+static u32 sun6i_dsi_ecc_compute(unsigned int data)
+{
+ int i;
+ u8 ecc = 0;
+
+ for (i = 0; i < ARRAY_SIZE(sun6i_dsi_ecc_array); i++) {
+ u32 field = sun6i_dsi_ecc_array[i];
+ bool init = false;
+ u8 val = 0;
+ int j;
+
+ for (j = 0; j < 24; j++) {
+ if (!(BIT(j) & field))
+ continue;
+
+ if (!init) {
+ val = (BIT(j) & data) ? 1 : 0;
+ init = true;
+ } else {
+ val ^= (BIT(j) & data) ? 1 : 0;
+ }
+ }
+
+ ecc |= val << i;
+ }
+
+ return ecc;
+}
+
+static u16 sun6i_dsi_crc_compute(u8 const *buffer, size_t len)
+{
+ return crc_ccitt(0xffff, buffer, len);
+}
+
+static u16 sun6i_dsi_crc_repeat_compute(u8 pd, size_t len)
+{
+ u8 buffer[len];
+
+ memset(buffer, pd, len);
+
+ return sun6i_dsi_crc_compute(buffer, len);
+}
+
+static u32 sun6i_dsi_build_sync_pkt(u8 dt, u8 vc, u8 d0, u8 d1)
+{
+ u32 val = dt & 0x3f;
+
+ val |= (vc & 3) << 6;
+ val |= (d0 & 0xff) << 8;
+ val |= (d1 & 0xff) << 16;
+ val |= sun6i_dsi_ecc_compute(val) << 24;
+
+ return val;
+}
+
+static u32 sun6i_dsi_build_blk0_pkt(u8 vc, u16 wc)
+{
+ return sun6i_dsi_build_sync_pkt(MIPI_DSI_BLANKING_PACKET, vc,
+ wc & 0xff, wc >> 8);
+}
+
+static u32 sun6i_dsi_build_blk1_pkt(u16 pd, size_t len)
+{
+ u32 val = SUN6I_DSI_BLK_PD(pd);
+
+ return val | SUN6I_DSI_BLK_PF(sun6i_dsi_crc_repeat_compute(pd, len));
+}
+
+static void sun6i_dsi_inst_abort(struct sun6i_dsi *dsi)
+{
+ regmap_update_bits(dsi->regs, SUN6I_DSI_BASIC_CTL0_REG,
+ SUN6I_DSI_BASIC_CTL0_INST_ST, 0);
+}
+
+static void sun6i_dsi_inst_commit(struct sun6i_dsi *dsi)
+{
+ regmap_update_bits(dsi->regs, SUN6I_DSI_BASIC_CTL0_REG,
+ SUN6I_DSI_BASIC_CTL0_INST_ST,
+ SUN6I_DSI_BASIC_CTL0_INST_ST);
+}
+
+static int sun6i_dsi_inst_wait_for_completion(struct sun6i_dsi *dsi)
+{
+ u32 val;
+
+ return regmap_read_poll_timeout(dsi->regs, SUN6I_DSI_BASIC_CTL0_REG,
+ val,
+ !(val & SUN6I_DSI_BASIC_CTL0_INST_ST),
+ 100, 5000);
+}
+
+static void sun6i_dsi_inst_setup(struct sun6i_dsi *dsi,
+ enum sun6i_dsi_inst_id id,
+ enum sun6i_dsi_inst_mode mode,
+ bool clock, u8 data,
+ enum sun6i_dsi_inst_packet packet,
+ enum sun6i_dsi_inst_escape escape)
+{
+ regmap_write(dsi->regs, SUN6I_DSI_INST_FUNC_REG(id),
+ SUN6I_DSI_INST_FUNC_INST_MODE(mode) |
+ SUN6I_DSI_INST_FUNC_ESCAPE_ENTRY(escape) |
+ SUN6I_DSI_INST_FUNC_TRANS_PACKET(packet) |
+ (clock ? SUN6I_DSI_INST_FUNC_LANE_CEN : 0) |
+ SUN6I_DSI_INST_FUNC_LANE_DEN(data));
+}
+
+static void sun6i_dsi_inst_init(struct sun6i_dsi *dsi,
+ struct mipi_dsi_device *device)
+{
+ u8 lanes_mask = GENMASK(device->lanes - 1, 0);
+
+ sun6i_dsi_inst_setup(dsi, DSI_INST_ID_LP11, DSI_INST_MODE_STOP,
+ true, lanes_mask, 0, 0);
+
+ sun6i_dsi_inst_setup(dsi, DSI_INST_ID_TBA, DSI_INST_MODE_TBA,
+ false, 1, 0, 0);
+
+ sun6i_dsi_inst_setup(dsi, DSI_INST_ID_HSC, DSI_INST_MODE_HS,
+ true, 0, DSI_INST_PACK_PIXEL, 0);
+
+ sun6i_dsi_inst_setup(dsi, DSI_INST_ID_HSD, DSI_INST_MODE_HS,
+ false, lanes_mask, DSI_INST_PACK_PIXEL, 0);
+
+ sun6i_dsi_inst_setup(dsi, DSI_INST_ID_LPDT, DSI_INST_MODE_ESCAPE,
+ false, 1, DSI_INST_PACK_COMMAND,
+ DSI_INST_ESCA_LPDT);
+
+ sun6i_dsi_inst_setup(dsi, DSI_INST_ID_HSCEXIT, DSI_INST_MODE_HSCEXIT,
+ true, 0, 0, 0);
+
+ sun6i_dsi_inst_setup(dsi, DSI_INST_ID_NOP, DSI_INST_MODE_STOP,
+ false, lanes_mask, 0, 0);
+
+ sun6i_dsi_inst_setup(dsi, DSI_INST_ID_DLY, DSI_INST_MODE_NOP,
+ true, lanes_mask, 0, 0);
+
+ regmap_write(dsi->regs, SUN6I_DSI_INST_JUMP_CFG_REG(0),
+ SUN6I_DSI_INST_JUMP_CFG_POINT(DSI_INST_ID_NOP) |
+ SUN6I_DSI_INST_JUMP_CFG_TO(DSI_INST_ID_HSCEXIT) |
+ SUN6I_DSI_INST_JUMP_CFG_NUM(1));
+};
+
+static u16 sun6i_dsi_get_video_start_delay(struct sun6i_dsi *dsi,
+ struct drm_display_mode *mode)
+{
+ return mode->vtotal - (mode->vsync_end - mode->vdisplay) + 1;
+}
+
+static void sun6i_dsi_setup_burst(struct sun6i_dsi *dsi,
+ struct drm_display_mode *mode)
+{
+ struct mipi_dsi_device *device = dsi->device;
+ u32 val = 0;
+
+ if ((mode->hsync_end - mode->hdisplay) > 20) {
+ /* Maaaaaagic */
+ u16 drq = (mode->hsync_end - mode->hdisplay) - 20;
+
+ drq *= mipi_dsi_pixel_format_to_bpp(device->format);
+ drq /= 32;
+
+ val = (SUN6I_DSI_TCON_DRQ_ENABLE_MODE |
+ SUN6I_DSI_TCON_DRQ_SET(drq));
+ }
+
+ regmap_write(dsi->regs, SUN6I_DSI_TCON_DRQ_REG, val);
+}
+
+static void sun6i_dsi_setup_inst_loop(struct sun6i_dsi *dsi,
+ struct drm_display_mode *mode)
+{
+ u16 delay = 50 - 1;
+
+ regmap_write(dsi->regs, SUN6I_DSI_INST_LOOP_NUM_REG(0),
+ SUN6I_DSI_INST_LOOP_NUM_N0(50 - 1) |
+ SUN6I_DSI_INST_LOOP_NUM_N1(delay));
+ regmap_write(dsi->regs, SUN6I_DSI_INST_LOOP_NUM_REG(1),
+ SUN6I_DSI_INST_LOOP_NUM_N0(50 - 1) |
+ SUN6I_DSI_INST_LOOP_NUM_N1(delay));
+}
+
+static void sun6i_dsi_setup_format(struct sun6i_dsi *dsi,
+ struct drm_display_mode *mode)
+{
+ struct mipi_dsi_device *device = dsi->device;
+ u32 val = SUN6I_DSI_PIXEL_PH_VC(device->channel);
+ u8 dt, fmt;
+ u16 wc;
+
+ /*
+ * TODO: The format defines are only valid in video mode and
+ * change in command mode.
+ */
+ switch (device->format) {
+ case MIPI_DSI_FMT_RGB888:
+ dt = MIPI_DSI_PACKED_PIXEL_STREAM_24;
+ fmt = 8;
+ break;
+ case MIPI_DSI_FMT_RGB666:
+ dt = MIPI_DSI_PIXEL_STREAM_3BYTE_18;
+ fmt = 9;
+ break;
+ case MIPI_DSI_FMT_RGB666_PACKED:
+ dt = MIPI_DSI_PACKED_PIXEL_STREAM_18;
+ fmt = 10;
+ break;
+ case MIPI_DSI_FMT_RGB565:
+ dt = MIPI_DSI_PACKED_PIXEL_STREAM_16;
+ fmt = 11;
+ break;
+ default:
+ return;
+ }
+ val |= SUN6I_DSI_PIXEL_PH_DT(dt);
+
+ wc = mode->hdisplay * mipi_dsi_pixel_format_to_bpp(device->format) / 8;
+ val |= SUN6I_DSI_PIXEL_PH_WC(wc);
+ val |= SUN6I_DSI_PIXEL_PH_ECC(sun6i_dsi_ecc_compute(val));
+
+ regmap_write(dsi->regs, SUN6I_DSI_PIXEL_PH_REG, val);
+
+ regmap_write(dsi->regs, SUN6I_DSI_PIXEL_PF0_REG,
+ SUN6I_DSI_PIXEL_PF0_CRC_FORCE(0xffff));
+
+ regmap_write(dsi->regs, SUN6I_DSI_PIXEL_PF1_REG,
+ SUN6I_DSI_PIXEL_PF1_CRC_INIT_LINE0(0xffff) |
+ SUN6I_DSI_PIXEL_PF1_CRC_INIT_LINEN(0xffff));
+
+ regmap_write(dsi->regs, SUN6I_DSI_PIXEL_CTL0_REG,
+ SUN6I_DSI_PIXEL_CTL0_PD_PLUG_DISABLE |
+ SUN6I_DSI_PIXEL_CTL0_FORMAT(fmt));
+}
+
+static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
+ struct drm_display_mode *mode)
+{
+ struct mipi_dsi_device *device = dsi->device;
+ unsigned int Bpp = mipi_dsi_pixel_format_to_bpp(device->format) / 8;
+ u16 hbp, hfp, hsa, hblk, vblk;
+
+ regmap_write(dsi->regs, SUN6I_DSI_BASIC_CTL_REG, 0);
+
+ regmap_write(dsi->regs, SUN6I_DSI_SYNC_HSS_REG,
+ sun6i_dsi_build_sync_pkt(MIPI_DSI_H_SYNC_START,
+ device->channel,
+ 0, 0));
+
+ regmap_write(dsi->regs, SUN6I_DSI_SYNC_HSE_REG,
+ sun6i_dsi_build_sync_pkt(MIPI_DSI_H_SYNC_END,
+ device->channel,
+ 0, 0));
+
+ regmap_write(dsi->regs, SUN6I_DSI_SYNC_VSS_REG,
+ sun6i_dsi_build_sync_pkt(MIPI_DSI_V_SYNC_START,
+ device->channel,
+ 0, 0));
+
+ regmap_write(dsi->regs, SUN6I_DSI_SYNC_VSE_REG,
+ sun6i_dsi_build_sync_pkt(MIPI_DSI_V_SYNC_END,
+ device->channel,
+ 0, 0));
+
+ regmap_write(dsi->regs, SUN6I_DSI_BASIC_SIZE0_REG,
+ SUN6I_DSI_BASIC_SIZE0_VSA(mode->vsync_end -
+ mode->vsync_start) |
+ SUN6I_DSI_BASIC_SIZE0_VBP(mode->vsync_start -
+ mode->vdisplay));
+
+ regmap_write(dsi->regs, SUN6I_DSI_BASIC_SIZE1_REG,
+ SUN6I_DSI_BASIC_SIZE1_VACT(mode->vdisplay) |
+ SUN6I_DSI_BASIC_SIZE1_VT(mode->vtotal));
+
+ /*
+ * A sync period is composed of a blanking packet (4 bytes +
+ * payload + 2 bytes) and a sync event packet (4 bytes). Its
+ * minimal size is therefore 10 bytes
+ */
+#define HSA_PACKET_OVERHEAD 10
+ hsa = max((unsigned int)HSA_PACKET_OVERHEAD,
+ (mode->hsync_end - mode->hsync_start) * Bpp - HSA_PACKET_OVERHEAD);
+ regmap_write(dsi->regs, SUN6I_DSI_BLK_HSA0_REG,
+ sun6i_dsi_build_blk0_pkt(device->channel, hsa));
+ regmap_write(dsi->regs, SUN6I_DSI_BLK_HSA1_REG,
+ sun6i_dsi_build_blk1_pkt(0, hsa));
+
+ /*
+ * The backporch is set using a blanking packet (4 bytes +
+ * payload + 2 bytes). Its minimal size is therefore 6 bytes
+ */
+#define HBP_PACKET_OVERHEAD 6
+ hbp = max((unsigned int)HBP_PACKET_OVERHEAD,
+ (mode->hsync_start - mode->hdisplay) * Bpp - HBP_PACKET_OVERHEAD);
+ regmap_write(dsi->regs, SUN6I_DSI_BLK_HBP0_REG,
+ sun6i_dsi_build_blk0_pkt(device->channel, hbp));
+ regmap_write(dsi->regs, SUN6I_DSI_BLK_HBP1_REG,
+ sun6i_dsi_build_blk1_pkt(0, hbp));
+
+ /*
+ * The frontporch is set using a blanking packet (4 bytes +
+ * payload + 2 bytes). Its minimal size is therefore 6 bytes
+ */
+#define HFP_PACKET_OVERHEAD 6
+ hfp = max((unsigned int)HFP_PACKET_OVERHEAD,
+ (mode->htotal - mode->hsync_end) * Bpp - HFP_PACKET_OVERHEAD);
+ regmap_write(dsi->regs, SUN6I_DSI_BLK_HFP0_REG,
+ sun6i_dsi_build_blk0_pkt(device->channel, hfp));
+ regmap_write(dsi->regs, SUN6I_DSI_BLK_HFP1_REG,
+ sun6i_dsi_build_blk1_pkt(0, hfp));
+
+ /*
+ * hblk seems to be the line + porches length.
+ */
+ hblk = mode->htotal * Bpp - hsa;
+ regmap_write(dsi->regs, SUN6I_DSI_BLK_HBLK0_REG,
+ sun6i_dsi_build_blk0_pkt(device->channel, hblk));
+ regmap_write(dsi->regs, SUN6I_DSI_BLK_HBLK1_REG,
+ sun6i_dsi_build_blk1_pkt(0, hblk));
+
+ /*
+ * And I'm not entirely sure what vblk is about. The driver in
+ * Allwinner BSP is using a rather convoluted calculation
+ * there only for 4 lanes. However, using 0 (the !4 lanes
+ * case) even with a 4 lanes screen seems to work...
+ */
+ vblk = 0;
+ regmap_write(dsi->regs, SUN6I_DSI_BLK_VBLK0_REG,
+ sun6i_dsi_build_blk0_pkt(device->channel, vblk));
+ regmap_write(dsi->regs, SUN6I_DSI_BLK_VBLK1_REG,
+ sun6i_dsi_build_blk1_pkt(0, vblk));
+}
+
+static int sun6i_dsi_start(struct sun6i_dsi *dsi,
+ enum sun6i_dsi_start_inst func)
+{
+ switch (func) {
+ case DSI_START_LPTX:
+ regmap_write(dsi->regs, SUN6I_DSI_INST_JUMP_SEL_REG,
+ DSI_INST_ID_LPDT << (4 * DSI_INST_ID_LP11) |
+ DSI_INST_ID_END << (4 * DSI_INST_ID_LPDT));
+ break;
+ case DSI_START_LPRX:
+ regmap_write(dsi->regs, SUN6I_DSI_INST_JUMP_SEL_REG,
+ DSI_INST_ID_LPDT << (4 * DSI_INST_ID_LP11) |
+ DSI_INST_ID_DLY << (4 * DSI_INST_ID_LPDT) |
+ DSI_INST_ID_TBA << (4 * DSI_INST_ID_DLY) |
+ DSI_INST_ID_END << (4 * DSI_INST_ID_TBA));
+ break;
+ case DSI_START_HSC:
+ regmap_write(dsi->regs, SUN6I_DSI_INST_JUMP_SEL_REG,
+ DSI_INST_ID_HSC << (4 * DSI_INST_ID_LP11) |
+ DSI_INST_ID_END << (4 * DSI_INST_ID_HSC));
+ break;
+ case DSI_START_HSD:
+ regmap_write(dsi->regs, SUN6I_DSI_INST_JUMP_SEL_REG,
+ DSI_INST_ID_NOP << (4 * DSI_INST_ID_LP11) |
+ DSI_INST_ID_HSD << (4 * DSI_INST_ID_NOP) |
+ DSI_INST_ID_DLY << (4 * DSI_INST_ID_HSD) |
+ DSI_INST_ID_NOP << (4 * DSI_INST_ID_DLY) |
+ DSI_INST_ID_END << (4 * DSI_INST_ID_HSCEXIT));
+ break;
+ default:
+ regmap_write(dsi->regs, SUN6I_DSI_INST_JUMP_SEL_REG,
+ DSI_INST_ID_END << (4 * DSI_INST_ID_LP11));
+ break;
+ }
+
+ sun6i_dsi_inst_abort(dsi);
+ sun6i_dsi_inst_commit(dsi);
+
+ if (func == DSI_START_HSC)
+ regmap_write_bits(dsi->regs,
+ SUN6I_DSI_INST_FUNC_REG(DSI_INST_ID_LP11),
+ SUN6I_DSI_INST_FUNC_LANE_CEN, 0);
+
+ return 0;
+}
+
+static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder)
+{
+ struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
+ struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder);
+ struct mipi_dsi_device *device = dsi->device;
+ u16 delay;
+
+ DRM_DEBUG_DRIVER("Enabling DSI output\n");
+
+ pm_runtime_get_sync(dsi->dev);
+
+ delay = sun6i_dsi_get_video_start_delay(dsi, mode);
+ regmap_write(dsi->regs, SUN6I_DSI_BASIC_CTL1_REG,
+ SUN6I_DSI_BASIC_CTL1_VIDEO_ST_DELAY(delay) |
+ SUN6I_DSI_BASIC_CTL1_VIDEO_FILL |
+ SUN6I_DSI_BASIC_CTL1_VIDEO_PRECISION |
+ SUN6I_DSI_BASIC_CTL1_VIDEO_MODE);
+
+ sun6i_dsi_setup_burst(dsi, mode);
+ sun6i_dsi_setup_inst_loop(dsi, mode);
+ sun6i_dsi_setup_format(dsi, mode);
+ sun6i_dsi_setup_timings(dsi, mode);
+
+ sun6i_dphy_init(dsi->dphy, device->lanes);
+ sun6i_dphy_power_on(dsi->dphy, device->lanes);
+
+ if (!IS_ERR(dsi->panel))
+ drm_panel_prepare(dsi->panel);
+
+ /*
+ * FIXME: This should be moved after the switch to HS mode.
+ *
+ * Unfortunately, once in HS mode, it seems like we're not
+ * able to send DCS commands anymore, which would prevent any
+ * panel to send any DCS command as part as their enable
+ * method, which is quite common.
+ *
+ * I haven't seen any artifact due to that sub-optimal
+ * ordering on the panels I've tested it with, so I guess this
+ * will do for now, until that IP is better understood.
+ */
+ if (!IS_ERR(dsi->panel))
+ drm_panel_enable(dsi->panel);
+
+ sun6i_dsi_start(dsi, DSI_START_HSC);
+
+ udelay(1000);
+
+ sun6i_dsi_start(dsi, DSI_START_HSD);
+}
+
+static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder)
+{
+ struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder);
+
+ DRM_DEBUG_DRIVER("Disabling DSI output\n");
+
+ if (!IS_ERR(dsi->panel)) {
+ drm_panel_disable(dsi->panel);
+ drm_panel_unprepare(dsi->panel);
+ }
+
+ sun6i_dphy_power_off(dsi->dphy);
+ sun6i_dphy_exit(dsi->dphy);
+
+ pm_runtime_put(dsi->dev);
+}
+
+static int sun6i_dsi_get_modes(struct drm_connector *connector)
+{
+ struct sun6i_dsi *dsi = connector_to_sun6i_dsi(connector);
+
+ return drm_panel_get_modes(dsi->panel);
+}
+
+static struct drm_connector_helper_funcs sun6i_dsi_connector_helper_funcs = {
+ .get_modes = sun6i_dsi_get_modes,
+};
+
+static enum drm_connector_status
+sun6i_dsi_connector_detect(struct drm_connector *connector, bool force)
+{
+ return connector_status_connected;
+}
+
+static const struct drm_connector_funcs sun6i_dsi_connector_funcs = {
+ .detect = sun6i_dsi_connector_detect,
+ .fill_modes = drm_helper_probe_single_connector_modes,
+ .destroy = drm_connector_cleanup,
+ .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 const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = {
+ .disable = sun6i_dsi_encoder_disable,
+ .enable = sun6i_dsi_encoder_enable,
+};
+
+static const struct drm_encoder_funcs sun6i_dsi_enc_funcs = {
+ .destroy = drm_encoder_cleanup,
+};
+
+static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi,
+ const struct mipi_dsi_msg *msg)
+{
+ u32 pkt = msg->type;
+
+ if (msg->type == MIPI_DSI_DCS_LONG_WRITE) {
+ pkt |= ((msg->tx_len + 1) & 0xffff) << 8;
+ pkt |= (((msg->tx_len + 1) >> 8) & 0xffff) << 16;
+ } else {
+ pkt |= (((u8 *)msg->tx_buf)[0] << 8);
+ if (msg->tx_len > 1)
+ pkt |= (((u8 *)msg->tx_buf)[1] << 16);
+ }
+
+ pkt |= sun6i_dsi_ecc_compute(pkt) << 24;
+
+ return pkt;
+}
+
+static int sun6i_dsi_dcs_write_short(struct sun6i_dsi *dsi,
+ const struct mipi_dsi_msg *msg)
+{
+ regmap_write(dsi->regs, SUN6I_DSI_CMD_TX_REG(0),
+ sun6i_dsi_dcs_build_pkt_hdr(dsi, msg));
+ regmap_write_bits(dsi->regs, SUN6I_DSI_CMD_CTL_REG,
+ 0xff, (4 - 1));
+
+ sun6i_dsi_start(dsi, DSI_START_LPTX);
+
+ return msg->tx_len;
+}
+
+static int sun6i_dsi_dcs_write_long(struct sun6i_dsi *dsi,
+ const struct mipi_dsi_msg *msg)
+{
+ int ret, len = 0;
+ u8 *bounce;
+ u16 crc;
+
+ regmap_write(dsi->regs, SUN6I_DSI_CMD_TX_REG(0),
+ sun6i_dsi_dcs_build_pkt_hdr(dsi, msg));
+
+ bounce = kzalloc(msg->tx_len + sizeof(crc), GFP_KERNEL);
+ if (!bounce)
+ return -ENOMEM;
+
+ memcpy(bounce, msg->tx_buf, msg->tx_len);
+ len += msg->tx_len;
+
+ crc = sun6i_dsi_crc_compute(bounce, msg->tx_len);
+ memcpy((u8 *)bounce + msg->tx_len, &crc, sizeof(crc));
+ len += sizeof(crc);
+
+ regmap_bulk_write(dsi->regs, SUN6I_DSI_CMD_TX_REG(1), bounce, len);
+ regmap_write(dsi->regs, SUN6I_DSI_CMD_CTL_REG, len + 4 - 1);
+ kfree(bounce);
+
+ sun6i_dsi_start(dsi, DSI_START_LPTX);
+
+ ret = sun6i_dsi_inst_wait_for_completion(dsi);
+ if (ret < 0) {
+ sun6i_dsi_inst_abort(dsi);
+ return ret;
+ }
+
+ /*
+ * TODO: There's some bits (reg 0x200, bits 8/9) that
+ * apparently can be used to check whether the data have been
+ * sent, but I couldn't get it to work reliably.
+ */
+ return msg->tx_len;
+}
+
+static int sun6i_dsi_dcs_read(struct sun6i_dsi *dsi,
+ const struct mipi_dsi_msg *msg)
+{
+ u32 val;
+ int ret;
+ u8 byte0;
+
+ regmap_write(dsi->regs, SUN6I_DSI_CMD_TX_REG(0),
+ sun6i_dsi_dcs_build_pkt_hdr(dsi, msg));
+ regmap_write(dsi->regs, SUN6I_DSI_CMD_CTL_REG,
+ (4 - 1));
+
+ sun6i_dsi_start(dsi, DSI_START_LPRX);
+
+ ret = sun6i_dsi_inst_wait_for_completion(dsi);
+ if (ret < 0) {
+ sun6i_dsi_inst_abort(dsi);
+ return ret;
+ }
+
+ /*
+ * TODO: There's some bits (reg 0x200, bits 24/25) that
+ * apparently can be used to check whether the data have been
+ * received, but I couldn't get it to work reliably.
+ */
+ regmap_read(dsi->regs, SUN6I_DSI_CMD_CTL_REG, &val);
+ if (val & SUN6I_DSI_CMD_CTL_RX_OVERFLOW)
+ return -EIO;
+
+ regmap_read(dsi->regs, SUN6I_DSI_CMD_RX_REG(0), &val);
+ byte0 = val & 0xff;
+ if (byte0 == MIPI_DSI_RX_ACKNOWLEDGE_AND_ERROR_REPORT)
+ return -EIO;
+
+ ((u8 *)msg->rx_buf)[0] = (val >> 8);
+
+ return 1;
+}
+
+static int sun6i_dsi_attach(struct mipi_dsi_host *host,
+ struct mipi_dsi_device *device)
+{
+ struct sun6i_dsi *dsi = host_to_sun6i_dsi(host);
+
+ dsi->device = device;
+ dsi->panel = of_drm_find_panel(device->dev.of_node);
+ if (!dsi->panel)
+ return -EINVAL;
+
+ dev_info(host->dev, "Attached device %s\n", device->name);
+
+ return 0;
+}
+
+static int sun6i_dsi_detach(struct mipi_dsi_host *host,
+ struct mipi_dsi_device *device)
+{
+ struct sun6i_dsi *dsi = host_to_sun6i_dsi(host);
+
+ dsi->panel = NULL;
+ dsi->device = NULL;
+
+ return 0;
+}
+
+static ssize_t sun6i_dsi_transfer(struct mipi_dsi_host *host,
+ const struct mipi_dsi_msg *msg)
+{
+ struct sun6i_dsi *dsi = host_to_sun6i_dsi(host);
+ int ret;
+
+ ret = sun6i_dsi_inst_wait_for_completion(dsi);
+ if (ret < 0)
+ sun6i_dsi_inst_abort(dsi);
+
+ regmap_write(dsi->regs, SUN6I_DSI_CMD_CTL_REG,
+ SUN6I_DSI_CMD_CTL_RX_OVERFLOW |
+ SUN6I_DSI_CMD_CTL_RX_FLAG |
+ SUN6I_DSI_CMD_CTL_TX_FLAG);
+
+ switch (msg->type) {
+ case MIPI_DSI_DCS_SHORT_WRITE:
+ case MIPI_DSI_DCS_SHORT_WRITE_PARAM:
+ ret = sun6i_dsi_dcs_write_short(dsi, msg);
+ break;
+
+ case MIPI_DSI_DCS_LONG_WRITE:
+ ret = sun6i_dsi_dcs_write_long(dsi, msg);
+ break;
+
+ case MIPI_DSI_DCS_READ:
+ if (msg->rx_len == 1) {
+ ret = sun6i_dsi_dcs_read(dsi, msg);
+ break;
+ }
+
+ default:
+ ret = -EINVAL;
+ }
+
+ return ret;
+}
+
+static const struct mipi_dsi_host_ops sun6i_dsi_host_ops = {
+ .attach = sun6i_dsi_attach,
+ .detach = sun6i_dsi_detach,
+ .transfer = sun6i_dsi_transfer,
+};
+
+static const struct regmap_config sun6i_dsi_regmap_config = {
+ .reg_bits = 32,
+ .val_bits = 32,
+ .reg_stride = 4,
+ .max_register = SUN6I_DSI_CMD_TX_REG(255),
+ .name = "mipi-dsi",
+};
+
+static int sun6i_dsi_bind(struct device *dev, struct device *master,
+ void *data)
+{
+ struct drm_device *drm = data;
+ struct sun4i_drv *drv = drm->dev_private;
+ struct sun6i_dsi *dsi = dev_get_drvdata(dev);
+ int ret;
+
+ if (!dsi->panel)
+ return -EPROBE_DEFER;
+
+ dsi->drv = drv;
+
+ drm_encoder_helper_add(&dsi->encoder,
+ &sun6i_dsi_enc_helper_funcs);
+ ret = drm_encoder_init(drm,
+ &dsi->encoder,
+ &sun6i_dsi_enc_funcs,
+ DRM_MODE_ENCODER_DSI,
+ NULL);
+ if (ret) {
+ dev_err(dsi->dev, "Couldn't initialise the DSI encoder\n");
+ return ret;
+ }
+ dsi->encoder.possible_crtcs = BIT(0);
+
+ drm_connector_helper_add(&dsi->connector,
+ &sun6i_dsi_connector_helper_funcs);
+ ret = drm_connector_init(drm, &dsi->connector,
+ &sun6i_dsi_connector_funcs,
+ DRM_MODE_CONNECTOR_DSI);
+ if (ret) {
+ dev_err(dsi->dev,
+ "Couldn't initialise the DSI connector\n");
+ goto err_cleanup_connector;
+ }
+
+ drm_mode_connector_attach_encoder(&dsi->connector, &dsi->encoder);
+ drm_panel_attach(dsi->panel, &dsi->connector);
+
+ return 0;
+
+err_cleanup_connector:
+ drm_encoder_cleanup(&dsi->encoder);
+ return ret;
+}
+
+static void sun6i_dsi_unbind(struct device *dev, struct device *master,
+ void *data)
+{
+ struct sun6i_dsi *dsi = dev_get_drvdata(dev);
+
+ drm_panel_detach(dsi->panel);
+}
+
+static const struct component_ops sun6i_dsi_ops = {
+ .bind = sun6i_dsi_bind,
+ .unbind = sun6i_dsi_unbind,
+};
+
+static int sun6i_dsi_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct device_node *dphy_node;
+ struct sun6i_dsi *dsi;
+ struct resource *res;
+ void __iomem *base;
+ int ret;
+
+ dsi = devm_kzalloc(dev, sizeof(*dsi), GFP_KERNEL);
+ if (!dsi)
+ return -ENOMEM;
+ dev_set_drvdata(dev, dsi);
+ dsi->dev = dev;
+ dsi->host.ops = &sun6i_dsi_host_ops;
+ dsi->host.dev = dev;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(base)) {
+ dev_err(dev, "Couldn't map the DSI encoder registers\n");
+ return PTR_ERR(base);
+ }
+
+ dsi->regs = devm_regmap_init_mmio_clk(dev, "bus", base,
+ &sun6i_dsi_regmap_config);
+ if (IS_ERR(dsi->regs)) {
+ dev_err(dev, "Couldn't create the DSI encoder regmap\n");
+ return PTR_ERR(dsi->regs);
+ }
+
+ dsi->reset = devm_reset_control_get_shared(dev, NULL);
+ if (IS_ERR(dsi->reset)) {
+ dev_err(dev, "Couldn't get our reset line\n");
+ return PTR_ERR(dsi->reset);
+ }
+
+ dsi->mod_clk = devm_clk_get(dev, "mod");
+ if (IS_ERR(dsi->mod_clk)) {
+ dev_err(dev, "Couldn't get the DSI mod clock\n");
+ return PTR_ERR(dsi->mod_clk);
+ }
+
+ /*
+ * In order to operate properly, that clock seems to be always
+ * set to 297MHz.
+ */
+ clk_set_rate_exclusive(dsi->mod_clk, 297000000);
+
+ dphy_node = of_parse_phandle(dev->of_node, "phys", 0);
+ ret = sun6i_dphy_probe(dsi, dphy_node);
+ of_node_put(dphy_node);
+ if (ret) {
+ dev_err(dev, "Couldn't get the MIPI D-PHY\n");
+ goto err_unprotect_clk;
+ }
+
+ pm_runtime_enable(dev);
+
+ ret = mipi_dsi_host_register(&dsi->host);
+ if (ret) {
+ dev_err(dev, "Couldn't register MIPI-DSI host\n");
+ goto err_remove_phy;
+ }
+
+ ret = component_add(&pdev->dev, &sun6i_dsi_ops);
+ if (ret) {
+ dev_err(dev, "Couldn't register our component\n");
+ goto err_remove_dsi_host;
+ }
+
+ return 0;
+
+err_remove_dsi_host:
+ mipi_dsi_host_unregister(&dsi->host);
+err_remove_phy:
+ pm_runtime_disable(dev);
+ sun6i_dphy_remove(dsi);
+err_unprotect_clk:
+ clk_rate_exclusive_put(dsi->mod_clk);
+ return ret;
+}
+
+static int sun6i_dsi_remove(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct sun6i_dsi *dsi = dev_get_drvdata(dev);
+
+ component_del(&pdev->dev, &sun6i_dsi_ops);
+ mipi_dsi_host_unregister(&dsi->host);
+ pm_runtime_disable(dev);
+ sun6i_dphy_remove(dsi);
+ clk_rate_exclusive_put(dsi->mod_clk);
+
+ return 0;
+}
+
+static int sun6i_dsi_runtime_resume(struct device *dev)
+{
+ struct sun6i_dsi *dsi = dev_get_drvdata(dev);
+
+ reset_control_deassert(dsi->reset);
+ clk_prepare_enable(dsi->mod_clk);
+
+ /*
+ * Enable the DSI block.
+ *
+ * Some part of it can only be done once we get a number of
+ * lanes, see sun6i_dsi_inst_init
+ */
+ regmap_write(dsi->regs, SUN6I_DSI_CTL_REG, SUN6I_DSI_CTL_EN);
+
+ regmap_write(dsi->regs, SUN6I_DSI_BASIC_CTL0_REG,
+ SUN6I_DSI_BASIC_CTL0_ECC_EN | SUN6I_DSI_BASIC_CTL0_CRC_EN);
+
+ regmap_write(dsi->regs, SUN6I_DSI_TRANS_START_REG, 10);
+ regmap_write(dsi->regs, SUN6I_DSI_TRANS_ZERO_REG, 0);
+
+ if (dsi->device)
+ sun6i_dsi_inst_init(dsi, dsi->device);
+
+ regmap_write(dsi->regs, SUN6I_DSI_DEBUG_DATA_REG, 0xff);
+
+ return 0;
+}
+
+static int sun6i_dsi_runtime_suspend(struct device *dev)
+{
+ struct sun6i_dsi *dsi = dev_get_drvdata(dev);
+
+ clk_disable_unprepare(dsi->mod_clk);
+ reset_control_assert(dsi->reset);
+
+ return 0;
+}
+
+static const struct dev_pm_ops sun6i_dsi_pm_ops = {
+ SET_RUNTIME_PM_OPS(sun6i_dsi_runtime_suspend,
+ sun6i_dsi_runtime_resume,
+ NULL)
+};
+
+static const struct of_device_id sun6i_dsi_of_table[] = {
+ { .compatible = "allwinner,sun6i-a31-mipi-dsi" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, sun6i_dsi_of_table);
+
+static struct platform_driver sun6i_dsi_platform_driver = {
+ .probe = sun6i_dsi_probe,
+ .remove = sun6i_dsi_remove,
+ .driver = {
+ .name = "sun6i-mipi-dsi",
+ .of_match_table = sun6i_dsi_of_table,
+ .pm = &sun6i_dsi_pm_ops,
+ },
+};
+module_platform_driver(sun6i_dsi_platform_driver);
+
+MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>");
+MODULE_DESCRIPTION("Allwinner A31 DSI Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h
new file mode 100644
index 000000000000..363748808637
--- /dev/null
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2016 Allwinnertech Co., Ltd.
+ * Copyright (C) 2017 Free Electrons
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ */
+
+#ifndef _SUN6I_MIPI_DSI_H_
+#define _SUN6I_MIPI_DSI_H_
+
+#include <drm/drm_connector.h>
+#include <drm/drm_encoder.h>
+#include <drm/drm_mipi_dsi.h>
+
+struct sun6i_dphy {
+ struct clk *bus_clk;
+ struct clk *mod_clk;
+ struct regmap *regs;
+ struct reset_control *reset;
+};
+
+struct sun6i_dsi {
+ struct drm_connector connector;
+ struct drm_encoder encoder;
+ struct mipi_dsi_host host;
+
+ struct clk *bus_clk;
+ struct clk *mod_clk;
+ struct regmap *regs;
+ struct reset_control *reset;
+ struct sun6i_dphy *dphy;
+
+ struct device *dev;
+ struct sun4i_drv *drv;
+ struct mipi_dsi_device *device;
+ struct drm_panel *panel;
+};
+
+static inline struct sun6i_dsi *host_to_sun6i_dsi(struct mipi_dsi_host *host)
+{
+ return container_of(host, struct sun6i_dsi, host);
+};
+
+static inline struct sun6i_dsi *connector_to_sun6i_dsi(struct drm_connector *connector)
+{
+ return container_of(connector, struct sun6i_dsi, connector);
+};
+
+static inline struct sun6i_dsi *encoder_to_sun6i_dsi(struct drm_encoder *encoder)
+{
+ return container_of(encoder, struct sun6i_dsi, encoder);
+};
+
+int sun6i_dphy_probe(struct sun6i_dsi *dsi, struct device_node *node);
+int sun6i_dphy_remove(struct sun6i_dsi *dsi);
+
+int sun6i_dphy_init(struct sun6i_dphy *dphy, unsigned int lanes);
+int sun6i_dphy_power_on(struct sun6i_dphy *dphy, unsigned int lanes);
+int sun6i_dphy_power_off(struct sun6i_dphy *dphy);
+int sun6i_dphy_exit(struct sun6i_dphy *dphy);
+
+#endif /* _SUN6I_MIPI_DSI_H_ */
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 06/10] dt-bindings: vendor: Add Huarui Lighting
2018-02-21 9:20 [PATCH v2 00/10] drm/sun4i: Allwinner MIPI-DSI support Maxime Ripard
` (4 preceding siblings ...)
2018-02-21 9:20 ` [PATCH v2 05/10] drm/sun4i: Add Allwinner A31 MIPI-DSI controller support Maxime Ripard
@ 2018-02-21 9:20 ` Maxime Ripard
2018-03-01 22:38 ` Rob Herring
2018-02-21 9:20 ` [PATCH v2 07/10] dt-bindings: panel: Add Huarui LHR050H41 panel documentation Maxime Ripard
` (3 subsequent siblings)
9 siblings, 1 reply; 24+ messages in thread
From: Maxime Ripard @ 2018-02-21 9:20 UTC (permalink / raw)
To: Mark Brown, Thierry Reding, Chen-Yu Tsai, Maxime Ripard,
Mark Rutland, Rob Herring
Cc: dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni, Maxime Ripard
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Huarui Lighting makes display panel, add it to the list of panels.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index ae850d6c0ad3..bfb7aff05c10 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -152,6 +152,7 @@ holt Holt Integrated Circuits, Inc.
honeywell Honeywell
hp Hewlett Packard
holtek Holtek Semiconductor, Inc.
+huarui Huarui Lighting Co. Ltd
hwacom HwaCom Systems Inc.
i2se I2SE GmbH
ibm International Business Machines (IBM)
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 07/10] dt-bindings: panel: Add Huarui LHR050H41 panel documentation
2018-02-21 9:20 [PATCH v2 00/10] drm/sun4i: Allwinner MIPI-DSI support Maxime Ripard
` (5 preceding siblings ...)
2018-02-21 9:20 ` [PATCH v2 06/10] dt-bindings: vendor: Add Huarui Lighting Maxime Ripard
@ 2018-02-21 9:20 ` Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 08/10] drm/panel: Add Huarui LHR050H41 panel driver Maxime Ripard
` (2 subsequent siblings)
9 siblings, 0 replies; 24+ messages in thread
From: Maxime Ripard @ 2018-02-21 9:20 UTC (permalink / raw)
To: Mark Brown, Thierry Reding, Chen-Yu Tsai, Maxime Ripard,
Mark Rutland, Rob Herring
Cc: dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni, Maxime Ripard
From: Maxime Ripard <maxime.ripard@free-electrons.com>
The LHR050H41 is a 1280x700 4-lanes DSI panel.
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
Documentation/devicetree/bindings/display/panel/huarui,lhr050h41.txt | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/panel/huarui,lhr050h41.txt
diff --git a/Documentation/devicetree/bindings/display/panel/huarui,lhr050h41.txt b/Documentation/devicetree/bindings/display/panel/huarui,lhr050h41.txt
new file mode 100644
index 000000000000..b254db4d29c5
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/panel/huarui,lhr050h41.txt
@@ -0,0 +1,19 @@
+Huarui LHR050H41 MIPI-DSI panel
+
+Required properties:
+ - compatible: "huarui,lhr050h41"
+ - reg: DSI virtual channel used by that screen
+ - power-gpios: a GPIO phandle for the power pin
+ - reset-gpios: a GPIO phandle for the reset pin
+
+Optional properties:
+ - backlight: phandle to the backlight used
+
+Example:
+panel@0 {
+ compatible = "huarui,lhr050h41";
+ reg = <0>;
+ power-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* PB07 */
+ reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_LOW>; /* PL05 */
+ backlight = <&pwm_bl>;
+};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 08/10] drm/panel: Add Huarui LHR050H41 panel driver
2018-02-21 9:20 [PATCH v2 00/10] drm/sun4i: Allwinner MIPI-DSI support Maxime Ripard
` (6 preceding siblings ...)
2018-02-21 9:20 ` [PATCH v2 07/10] dt-bindings: panel: Add Huarui LHR050H41 panel documentation Maxime Ripard
@ 2018-02-21 9:20 ` Maxime Ripard
2018-02-21 15:05 ` [RFC PATCH] drm/panel: lhr050h41_init[] can be static kbuild test robot
` (2 more replies)
2018-02-21 9:20 ` [PATCH v2 09/10] arm: dts: sun8i: a33: Add the DSI-related nodes Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 10/10] [DO NOT MERGE] arm: dts: sun8i: bpi-m2m: Add DSI display Maxime Ripard
9 siblings, 3 replies; 24+ messages in thread
From: Maxime Ripard @ 2018-02-21 9:20 UTC (permalink / raw)
To: Mark Brown, Thierry Reding, Chen-Yu Tsai, Maxime Ripard,
Mark Rutland, Rob Herring
Cc: dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni, Maxime Ripard
From: Maxime Ripard <maxime.ripard@free-electrons.com>
The LHR050H41 panel is the panel shipped with the BananaPi M2-Magic. Add a
driver for it.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/gpu/drm/panel/Kconfig | 9 +-
drivers/gpu/drm/panel/Makefile | 1 +-
drivers/gpu/drm/panel/panel-huarui-lhr050h41.c | 506 ++++++++++++++++++-
3 files changed, 516 insertions(+)
create mode 100644 drivers/gpu/drm/panel/panel-huarui-lhr050h41.c
diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
index 6ba4031f3919..965310fd129a 100644
--- a/drivers/gpu/drm/panel/Kconfig
+++ b/drivers/gpu/drm/panel/Kconfig
@@ -28,6 +28,15 @@ config DRM_PANEL_SIMPLE
that it can be automatically turned off when the panel goes into a
low power state.
+config DRM_PANEL_HUARUI_LHR050H41
+ tristate "Huarui LHR050H41 panel"
+ depends on OF
+ depends on DRM_MIPI_DSI
+ depends on BACKLIGHT_CLASS_DEVICE
+ help
+ Say Y if you want to enable support for the Huarui Lighting
+ LHR05041 DSI panel. The panel has a 1280x720 resolution.
+
config DRM_PANEL_ILITEK_IL9322
tristate "Ilitek ILI9322 320x240 QVGA panels"
depends on OF && SPI
diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
index 6d251ebc568c..0eda133d26bb 100644
--- a/drivers/gpu/drm/panel/Makefile
+++ b/drivers/gpu/drm/panel/Makefile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_DRM_PANEL_LVDS) += panel-lvds.o
obj-$(CONFIG_DRM_PANEL_SIMPLE) += panel-simple.o
+obj-$(CONFIG_DRM_PANEL_HUARUI_LHR050H41) += panel-huarui-lhr050h41.o
obj-$(CONFIG_DRM_PANEL_ILITEK_IL9322) += panel-ilitek-ili9322.o
obj-$(CONFIG_DRM_PANEL_INNOLUX_P079ZCA) += panel-innolux-p079zca.o
obj-$(CONFIG_DRM_PANEL_JDI_LT070ME05000) += panel-jdi-lt070me05000.o
diff --git a/drivers/gpu/drm/panel/panel-huarui-lhr050h41.c b/drivers/gpu/drm/panel/panel-huarui-lhr050h41.c
new file mode 100644
index 000000000000..f73d484a695b
--- /dev/null
+++ b/drivers/gpu/drm/panel/panel-huarui-lhr050h41.c
@@ -0,0 +1,506 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2017, Free Electrons
+ * Author: Maxime Ripard <maxime.ripard@free-electrons.com>
+ */
+
+#include <linux/backlight.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/errno.h>
+#include <linux/fb.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+
+#include <linux/gpio/consumer.h>
+
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_modes.h>
+#include <drm/drm_panel.h>
+
+#include <video/mipi_display.h>
+
+struct lhr050h41 {
+ struct drm_panel panel;
+ struct mipi_dsi_device *dsi;
+
+ struct backlight_device *backlight;
+ struct gpio_desc *power;
+ struct gpio_desc *reset;
+};
+
+enum lhr050h41_op {
+ LHR050H41_SWITCH_PAGE,
+ LHR050H41_COMMAND,
+};
+
+struct lhr050h41_instr {
+ enum lhr050h41_op op;
+
+ union arg {
+ struct cmd {
+ u8 cmd;
+ u8 data;
+ } cmd;
+ u8 page;
+ } arg;
+};
+
+#define LHR050H41_SWITCH_PAGE_INSTR(_page) \
+ { \
+ .op = LHR050H41_SWITCH_PAGE, \
+ .arg = { \
+ .page = (_page), \
+ }, \
+ }
+
+#define LHR050H41_COMMAND_INSTR(_cmd, _data) \
+ { \
+ .op = LHR050H41_COMMAND, \
+ .arg = { \
+ .cmd = { \
+ .cmd = (_cmd), \
+ .data = (_data), \
+ }, \
+ }, \
+ }
+
+struct lhr050h41_instr lhr050h41_init[] = {
+ LHR050H41_SWITCH_PAGE_INSTR(3),
+ LHR050H41_COMMAND_INSTR(0x01, 0x00),
+ LHR050H41_COMMAND_INSTR(0x02, 0x00),
+ LHR050H41_COMMAND_INSTR(0x03, 0x73),
+ LHR050H41_COMMAND_INSTR(0x04, 0x03),
+ LHR050H41_COMMAND_INSTR(0x05, 0x00),
+ LHR050H41_COMMAND_INSTR(0x06, 0x06),
+ LHR050H41_COMMAND_INSTR(0x07, 0x06),
+ LHR050H41_COMMAND_INSTR(0x08, 0x00),
+ LHR050H41_COMMAND_INSTR(0x09, 0x18),
+ LHR050H41_COMMAND_INSTR(0x0a, 0x04),
+ LHR050H41_COMMAND_INSTR(0x0b, 0x00),
+ LHR050H41_COMMAND_INSTR(0x0c, 0x02),
+ LHR050H41_COMMAND_INSTR(0x0d, 0x03),
+ LHR050H41_COMMAND_INSTR(0x0e, 0x00),
+ LHR050H41_COMMAND_INSTR(0x0f, 0x25),
+ LHR050H41_COMMAND_INSTR(0x10, 0x25),
+ LHR050H41_COMMAND_INSTR(0x11, 0x00),
+ LHR050H41_COMMAND_INSTR(0x12, 0x00),
+ LHR050H41_COMMAND_INSTR(0x13, 0x00),
+ LHR050H41_COMMAND_INSTR(0x14, 0x00),
+ LHR050H41_COMMAND_INSTR(0x15, 0x00),
+ LHR050H41_COMMAND_INSTR(0x16, 0x0C),
+ LHR050H41_COMMAND_INSTR(0x17, 0x00),
+ LHR050H41_COMMAND_INSTR(0x18, 0x00),
+ LHR050H41_COMMAND_INSTR(0x19, 0x00),
+ LHR050H41_COMMAND_INSTR(0x1a, 0x00),
+ LHR050H41_COMMAND_INSTR(0x1b, 0x00),
+ LHR050H41_COMMAND_INSTR(0x1c, 0x00),
+ LHR050H41_COMMAND_INSTR(0x1d, 0x00),
+ LHR050H41_COMMAND_INSTR(0x1e, 0xC0),
+ LHR050H41_COMMAND_INSTR(0x1f, 0x80),
+ LHR050H41_COMMAND_INSTR(0x20, 0x04),
+ LHR050H41_COMMAND_INSTR(0x21, 0x01),
+ LHR050H41_COMMAND_INSTR(0x22, 0x00),
+ LHR050H41_COMMAND_INSTR(0x23, 0x00),
+ LHR050H41_COMMAND_INSTR(0x24, 0x00),
+ LHR050H41_COMMAND_INSTR(0x25, 0x00),
+ LHR050H41_COMMAND_INSTR(0x26, 0x00),
+ LHR050H41_COMMAND_INSTR(0x27, 0x00),
+ LHR050H41_COMMAND_INSTR(0x28, 0x33),
+ LHR050H41_COMMAND_INSTR(0x29, 0x03),
+ LHR050H41_COMMAND_INSTR(0x2a, 0x00),
+ LHR050H41_COMMAND_INSTR(0x2b, 0x00),
+ LHR050H41_COMMAND_INSTR(0x2c, 0x00),
+ LHR050H41_COMMAND_INSTR(0x2d, 0x00),
+ LHR050H41_COMMAND_INSTR(0x2e, 0x00),
+ LHR050H41_COMMAND_INSTR(0x2f, 0x00),
+ LHR050H41_COMMAND_INSTR(0x30, 0x00),
+ LHR050H41_COMMAND_INSTR(0x31, 0x00),
+ LHR050H41_COMMAND_INSTR(0x32, 0x00),
+ LHR050H41_COMMAND_INSTR(0x33, 0x00),
+ LHR050H41_COMMAND_INSTR(0x34, 0x04),
+ LHR050H41_COMMAND_INSTR(0x35, 0x00),
+ LHR050H41_COMMAND_INSTR(0x36, 0x00),
+ LHR050H41_COMMAND_INSTR(0x37, 0x00),
+ LHR050H41_COMMAND_INSTR(0x38, 0x3C),
+ LHR050H41_COMMAND_INSTR(0x39, 0x00),
+ LHR050H41_COMMAND_INSTR(0x3a, 0x00),
+ LHR050H41_COMMAND_INSTR(0x3b, 0x00),
+ LHR050H41_COMMAND_INSTR(0x3c, 0x00),
+ LHR050H41_COMMAND_INSTR(0x3d, 0x00),
+ LHR050H41_COMMAND_INSTR(0x3e, 0x00),
+ LHR050H41_COMMAND_INSTR(0x3f, 0x00),
+ LHR050H41_COMMAND_INSTR(0x40, 0x00),
+ LHR050H41_COMMAND_INSTR(0x41, 0x00),
+ LHR050H41_COMMAND_INSTR(0x42, 0x00),
+ LHR050H41_COMMAND_INSTR(0x43, 0x00),
+ LHR050H41_COMMAND_INSTR(0x44, 0x00),
+ LHR050H41_COMMAND_INSTR(0x50, 0x01),
+ LHR050H41_COMMAND_INSTR(0x51, 0x23),
+ LHR050H41_COMMAND_INSTR(0x52, 0x45),
+ LHR050H41_COMMAND_INSTR(0x53, 0x67),
+ LHR050H41_COMMAND_INSTR(0x54, 0x89),
+ LHR050H41_COMMAND_INSTR(0x55, 0xab),
+ LHR050H41_COMMAND_INSTR(0x56, 0x01),
+ LHR050H41_COMMAND_INSTR(0x57, 0x23),
+ LHR050H41_COMMAND_INSTR(0x58, 0x45),
+ LHR050H41_COMMAND_INSTR(0x59, 0x67),
+ LHR050H41_COMMAND_INSTR(0x5a, 0x89),
+ LHR050H41_COMMAND_INSTR(0x5b, 0xab),
+ LHR050H41_COMMAND_INSTR(0x5c, 0xcd),
+ LHR050H41_COMMAND_INSTR(0x5d, 0xef),
+ LHR050H41_COMMAND_INSTR(0x5e, 0x11),
+ LHR050H41_COMMAND_INSTR(0x5f, 0x02),
+ LHR050H41_COMMAND_INSTR(0x60, 0x02),
+ LHR050H41_COMMAND_INSTR(0x61, 0x02),
+ LHR050H41_COMMAND_INSTR(0x62, 0x02),
+ LHR050H41_COMMAND_INSTR(0x63, 0x02),
+ LHR050H41_COMMAND_INSTR(0x64, 0x02),
+ LHR050H41_COMMAND_INSTR(0x65, 0x02),
+ LHR050H41_COMMAND_INSTR(0x66, 0x02),
+ LHR050H41_COMMAND_INSTR(0x67, 0x02),
+ LHR050H41_COMMAND_INSTR(0x68, 0x02),
+ LHR050H41_COMMAND_INSTR(0x69, 0x02),
+ LHR050H41_COMMAND_INSTR(0x6a, 0x0C),
+ LHR050H41_COMMAND_INSTR(0x6b, 0x02),
+ LHR050H41_COMMAND_INSTR(0x6c, 0x0F),
+ LHR050H41_COMMAND_INSTR(0x6d, 0x0E),
+ LHR050H41_COMMAND_INSTR(0x6e, 0x0D),
+ LHR050H41_COMMAND_INSTR(0x6f, 0x06),
+ LHR050H41_COMMAND_INSTR(0x70, 0x07),
+ LHR050H41_COMMAND_INSTR(0x71, 0x02),
+ LHR050H41_COMMAND_INSTR(0x72, 0x02),
+ LHR050H41_COMMAND_INSTR(0x73, 0x02),
+ LHR050H41_COMMAND_INSTR(0x74, 0x02),
+ LHR050H41_COMMAND_INSTR(0x75, 0x02),
+ LHR050H41_COMMAND_INSTR(0x76, 0x02),
+ LHR050H41_COMMAND_INSTR(0x77, 0x02),
+ LHR050H41_COMMAND_INSTR(0x78, 0x02),
+ LHR050H41_COMMAND_INSTR(0x79, 0x02),
+ LHR050H41_COMMAND_INSTR(0x7a, 0x02),
+ LHR050H41_COMMAND_INSTR(0x7b, 0x02),
+ LHR050H41_COMMAND_INSTR(0x7c, 0x02),
+ LHR050H41_COMMAND_INSTR(0x7d, 0x02),
+ LHR050H41_COMMAND_INSTR(0x7e, 0x02),
+ LHR050H41_COMMAND_INSTR(0x7f, 0x02),
+ LHR050H41_COMMAND_INSTR(0x80, 0x0C),
+ LHR050H41_COMMAND_INSTR(0x81, 0x02),
+ LHR050H41_COMMAND_INSTR(0x82, 0x0F),
+ LHR050H41_COMMAND_INSTR(0x83, 0x0E),
+ LHR050H41_COMMAND_INSTR(0x84, 0x0D),
+ LHR050H41_COMMAND_INSTR(0x85, 0x06),
+ LHR050H41_COMMAND_INSTR(0x86, 0x07),
+ LHR050H41_COMMAND_INSTR(0x87, 0x02),
+ LHR050H41_COMMAND_INSTR(0x88, 0x02),
+ LHR050H41_COMMAND_INSTR(0x89, 0x02),
+ LHR050H41_COMMAND_INSTR(0x8A, 0x02),
+ LHR050H41_SWITCH_PAGE_INSTR(4),
+ LHR050H41_COMMAND_INSTR(0x6C, 0x15),
+ LHR050H41_COMMAND_INSTR(0x6E, 0x22),
+ LHR050H41_COMMAND_INSTR(0x6F, 0x33),
+ LHR050H41_COMMAND_INSTR(0x3A, 0xA4),
+ LHR050H41_COMMAND_INSTR(0x8D, 0x0D),
+ LHR050H41_COMMAND_INSTR(0x87, 0xBA),
+ LHR050H41_COMMAND_INSTR(0x26, 0x76),
+ LHR050H41_COMMAND_INSTR(0xB2, 0xD1),
+ LHR050H41_SWITCH_PAGE_INSTR(1),
+ LHR050H41_COMMAND_INSTR(0x22, 0x0A),
+ LHR050H41_COMMAND_INSTR(0x53, 0xDC),
+ LHR050H41_COMMAND_INSTR(0x55, 0xA7),
+ LHR050H41_COMMAND_INSTR(0x50, 0x78),
+ LHR050H41_COMMAND_INSTR(0x51, 0x78),
+ LHR050H41_COMMAND_INSTR(0x31, 0x02),
+ LHR050H41_COMMAND_INSTR(0x60, 0x14),
+ LHR050H41_COMMAND_INSTR(0xA0, 0x2A),
+ LHR050H41_COMMAND_INSTR(0xA1, 0x39),
+ LHR050H41_COMMAND_INSTR(0xA2, 0x46),
+ LHR050H41_COMMAND_INSTR(0xA3, 0x0e),
+ LHR050H41_COMMAND_INSTR(0xA4, 0x12),
+ LHR050H41_COMMAND_INSTR(0xA5, 0x25),
+ LHR050H41_COMMAND_INSTR(0xA6, 0x19),
+ LHR050H41_COMMAND_INSTR(0xA7, 0x1d),
+ LHR050H41_COMMAND_INSTR(0xA8, 0xa6),
+ LHR050H41_COMMAND_INSTR(0xA9, 0x1C),
+ LHR050H41_COMMAND_INSTR(0xAA, 0x29),
+ LHR050H41_COMMAND_INSTR(0xAB, 0x85),
+ LHR050H41_COMMAND_INSTR(0xAC, 0x1C),
+ LHR050H41_COMMAND_INSTR(0xAD, 0x1B),
+ LHR050H41_COMMAND_INSTR(0xAE, 0x51),
+ LHR050H41_COMMAND_INSTR(0xAF, 0x22),
+ LHR050H41_COMMAND_INSTR(0xB0, 0x2d),
+ LHR050H41_COMMAND_INSTR(0xB1, 0x4f),
+ LHR050H41_COMMAND_INSTR(0xB2, 0x59),
+ LHR050H41_COMMAND_INSTR(0xB3, 0x3F),
+ LHR050H41_COMMAND_INSTR(0xC0, 0x2A),
+ LHR050H41_COMMAND_INSTR(0xC1, 0x3a),
+ LHR050H41_COMMAND_INSTR(0xC2, 0x45),
+ LHR050H41_COMMAND_INSTR(0xC3, 0x0e),
+ LHR050H41_COMMAND_INSTR(0xC4, 0x11),
+ LHR050H41_COMMAND_INSTR(0xC5, 0x24),
+ LHR050H41_COMMAND_INSTR(0xC6, 0x1a),
+ LHR050H41_COMMAND_INSTR(0xC7, 0x1c),
+ LHR050H41_COMMAND_INSTR(0xC8, 0xaa),
+ LHR050H41_COMMAND_INSTR(0xC9, 0x1C),
+ LHR050H41_COMMAND_INSTR(0xCA, 0x29),
+ LHR050H41_COMMAND_INSTR(0xCB, 0x96),
+ LHR050H41_COMMAND_INSTR(0xCC, 0x1C),
+ LHR050H41_COMMAND_INSTR(0xCD, 0x1B),
+ LHR050H41_COMMAND_INSTR(0xCE, 0x51),
+ LHR050H41_COMMAND_INSTR(0xCF, 0x22),
+ LHR050H41_COMMAND_INSTR(0xD0, 0x2b),
+ LHR050H41_COMMAND_INSTR(0xD1, 0x4b),
+ LHR050H41_COMMAND_INSTR(0xD2, 0x59),
+ LHR050H41_COMMAND_INSTR(0xD3, 0x3F),
+};
+
+static inline struct lhr050h41 *panel_to_lhr050h41(struct drm_panel *panel)
+{
+ return container_of(panel, struct lhr050h41, panel);
+}
+
+static int lhr050h41_switch_page(struct lhr050h41 *ctx, u8 page)
+{
+ u8 buf[4] = { 0xff, 0x98, 0x81, page };
+ int ret;
+
+ ret = mipi_dsi_dcs_write_buffer(ctx->dsi, buf, sizeof(buf));
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+static int lhr050h41_send_cmd_data(struct lhr050h41 *ctx, u8 cmd, u8 data)
+{
+ u8 buf[2] = { cmd, data };
+ int ret;
+
+ ret = mipi_dsi_dcs_write_buffer(ctx->dsi, buf, sizeof(buf));
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+static int lhr050h41_prepare(struct drm_panel *panel)
+{
+ struct lhr050h41 *ctx = panel_to_lhr050h41(panel);
+ int i, ret;
+
+ /* Power the panel */
+ gpiod_set_value(ctx->power, 1);
+ mdelay(5);
+
+ /* And reset it */
+ gpiod_set_value(ctx->reset, 1);
+ mdelay(20);
+
+ gpiod_set_value(ctx->reset, 0);
+ mdelay(20);
+
+ for (i = 0; i < ARRAY_SIZE(lhr050h41_init); i++) {
+ struct lhr050h41_instr *instr = &lhr050h41_init[i];
+
+ if (instr->op == LHR050H41_SWITCH_PAGE)
+ ret = lhr050h41_switch_page(ctx, instr->arg.page);
+ else if (instr->op == LHR050H41_COMMAND)
+ ret = lhr050h41_send_cmd_data(ctx, instr->arg.cmd.cmd,
+ instr->arg.cmd.data);
+
+ if (ret)
+ return ret;
+ }
+
+ ret = lhr050h41_switch_page(ctx, 0);
+ if (ret)
+ return ret;
+
+ ret = mipi_dsi_dcs_set_tear_on(ctx->dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK);
+ if (ret)
+ return ret;
+
+ mipi_dsi_dcs_exit_sleep_mode(ctx->dsi);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+static void lhr050h41_enable_bl(struct lhr050h41 *ctx, bool enable)
+{
+ if (!ctx->backlight)
+ return;
+
+ if (enable) {
+ ctx->backlight->props.state &= ~BL_CORE_FBBLANK;
+ ctx->backlight->props.power = FB_BLANK_UNBLANK;
+ } else {
+ ctx->backlight->props.power = FB_BLANK_POWERDOWN;
+ ctx->backlight->props.state |= BL_CORE_FBBLANK;
+ }
+
+ backlight_update_status(ctx->backlight);
+}
+
+static int lhr050h41_enable(struct drm_panel *panel)
+{
+ struct lhr050h41 *ctx = panel_to_lhr050h41(panel);
+
+ mdelay(120);
+
+ mipi_dsi_dcs_set_display_on(ctx->dsi);
+
+ lhr050h41_enable_bl(ctx, true);
+
+ return 0;
+}
+
+static int lhr050h41_disable(struct drm_panel *panel)
+{
+ struct lhr050h41 *ctx = panel_to_lhr050h41(panel);
+
+ lhr050h41_enable_bl(ctx, false);
+
+ return mipi_dsi_dcs_set_display_off(ctx->dsi);
+}
+
+static int lhr050h41_unprepare(struct drm_panel *panel)
+{
+ struct lhr050h41 *ctx = panel_to_lhr050h41(panel);
+
+ mipi_dsi_dcs_enter_sleep_mode(ctx->dsi);
+ gpiod_set_value(ctx->power, 0);
+ gpiod_set_value(ctx->reset, 1);
+
+ return 0;
+}
+
+static const struct drm_display_mode default_mode = {
+ .clock = 62000,
+ .vrefresh = 60,
+
+ .hdisplay = 720,
+ .hsync_start = 720 + 10,
+ .hsync_end = 720 + 10 + 20,
+ .htotal = 720 + 10 + 20 + 30,
+
+ .vdisplay = 1280,
+ .vsync_start = 1280 + 10,
+ .vsync_end = 1280 + 10 + 10,
+ .vtotal = 1280 + 10 + 10 + 20,
+};
+
+static int lhr050h41_get_modes(struct drm_panel *panel)
+{
+ struct drm_connector *connector = panel->connector;
+ struct lhr050h41 *ctx = panel_to_lhr050h41(panel);
+ struct drm_display_mode *mode;
+
+ mode = drm_mode_duplicate(panel->drm, &default_mode);
+ if (!mode) {
+ dev_err(&ctx->dsi->dev, "failed to add mode %ux%ux@%u\n",
+ default_mode.hdisplay, default_mode.vdisplay,
+ default_mode.vrefresh);
+ return -ENOMEM;
+ }
+
+ drm_mode_set_name(mode);
+
+ mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
+ drm_mode_probed_add(connector, mode);
+
+ panel->connector->display_info.width_mm = 62;
+ panel->connector->display_info.height_mm = 110;
+
+ return 1;
+}
+
+static const struct drm_panel_funcs lhr050h41_funcs = {
+ .prepare = lhr050h41_prepare,
+ .unprepare = lhr050h41_unprepare,
+ .enable = lhr050h41_enable,
+ .disable = lhr050h41_disable,
+ .get_modes = lhr050h41_get_modes,
+};
+
+static int lhr050h41_dsi_probe(struct mipi_dsi_device *dsi)
+{
+ struct device_node *np;
+ struct lhr050h41 *ctx;
+ int ret;
+
+ ctx = devm_kzalloc(&dsi->dev, sizeof(*ctx), GFP_KERNEL);
+ if (!ctx)
+ return -ENOMEM;
+ mipi_dsi_set_drvdata(dsi, ctx);
+ ctx->dsi = dsi;
+
+ drm_panel_init(&ctx->panel);
+ ctx->panel.dev = &dsi->dev;
+ ctx->panel.funcs = &lhr050h41_funcs;
+
+ ctx->power = devm_gpiod_get(&dsi->dev, "power", GPIOD_OUT_LOW);
+ if (IS_ERR(ctx->power)) {
+ dev_err(&dsi->dev, "Couldn't get our power GPIO\n");
+ return PTR_ERR(ctx->power);
+ }
+
+ ctx->reset = devm_gpiod_get(&dsi->dev, "reset", GPIOD_OUT_LOW);
+ if (IS_ERR(ctx->reset)) {
+ dev_err(&dsi->dev, "Couldn't get our reset GPIO\n");
+ return PTR_ERR(ctx->reset);
+ }
+
+ np = of_parse_phandle(dsi->dev.of_node, "backlight", 0);
+ if (np) {
+ ctx->backlight = of_find_backlight_by_node(np);
+ of_node_put(np);
+
+ if (!ctx->backlight)
+ return -EPROBE_DEFER;
+ }
+
+ ret = drm_panel_add(&ctx->panel);
+ if (ret < 0)
+ return ret;
+
+ dsi->mode_flags = MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
+ dsi->format = MIPI_DSI_FMT_RGB888;
+ dsi->lanes = 4;
+
+ return mipi_dsi_attach(dsi);
+}
+
+static int lhr050h41_dsi_remove(struct mipi_dsi_device *dsi)
+{
+ struct lhr050h41 *ctx = mipi_dsi_get_drvdata(dsi);
+
+ mipi_dsi_detach(dsi);
+ drm_panel_remove(&ctx->panel);
+
+ if (ctx->backlight)
+ put_device(&ctx->backlight->dev);
+
+ return 0;
+}
+
+static const struct of_device_id lhr050h41_of_match[] = {
+ { .compatible = "huarui,lhr050h41" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, lhr050h41_of_match);
+
+static struct mipi_dsi_driver lhr050h41_dsi_driver = {
+ .probe = lhr050h41_dsi_probe,
+ .remove = lhr050h41_dsi_remove,
+ .driver = {
+ .name = "lhr050h41-dsi",
+ .of_match_table = lhr050h41_of_match,
+ },
+};
+module_mipi_dsi_driver(lhr050h41_dsi_driver);
+
+MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>");
+MODULE_DESCRIPTION("Huarui LHR050H41 LCD Driver");
+MODULE_LICENSE("GPL v2");
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 09/10] arm: dts: sun8i: a33: Add the DSI-related nodes
2018-02-21 9:20 [PATCH v2 00/10] drm/sun4i: Allwinner MIPI-DSI support Maxime Ripard
` (7 preceding siblings ...)
2018-02-21 9:20 ` [PATCH v2 08/10] drm/panel: Add Huarui LHR050H41 panel driver Maxime Ripard
@ 2018-02-21 9:20 ` Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 10/10] [DO NOT MERGE] arm: dts: sun8i: bpi-m2m: Add DSI display Maxime Ripard
9 siblings, 0 replies; 24+ messages in thread
From: Maxime Ripard @ 2018-02-21 9:20 UTC (permalink / raw)
To: Mark Brown, Thierry Reding, Chen-Yu Tsai, Maxime Ripard,
Mark Rutland, Rob Herring
Cc: dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni, Maxime Ripard
From: Maxime Ripard <maxime.ripard@free-electrons.com>
The A33 has a MIPI-DSI block, along with its D-PHY. Let's add it in order
to use it in the relevant boards.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun8i-a33.dtsi | 35 +++++++++++++++++++++++++++++++++-
1 file changed, 35 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 50eb84fa246a..20400c87d611 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -236,6 +236,11 @@
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
+
+ tcon0_out_dsi0: endpoint@1 {
+ reg = <1>;
+ remote-endpoint = <&dsi0_in_tcon0>;
+ };
};
};
};
@@ -280,6 +285,36 @@
#io-channel-cells = <0>;
};
+ dsi0: dsi@1ca0000 {
+ compatible = "allwinner,sun6i-a31-mipi-dsi";
+ reg = <0x01ca0000 0x1000>;
+ interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_MIPI_DSI>,
+ <&ccu CLK_DSI_SCLK>;
+ clock-names = "bus", "mod";
+ resets = <&ccu RST_BUS_MIPI_DSI>;
+ phys = <&dphy0>;
+ phy-names = "dphy";
+ status = "disabled";
+
+ port {
+ dsi0_in_tcon0: endpoint {
+ remote-endpoint = <&tcon0_out_dsi0>;
+ };
+ };
+ };
+
+ dphy0: d-phy@1ca1000 {
+ compatible = "allwinner,sun6i-a31-mipi-dphy";
+ reg = <0x01ca1000 0x1000>;
+ clocks = <&ccu CLK_BUS_MIPI_DSI>,
+ <&ccu CLK_DSI_DPHY>;
+ clock-names = "bus", "mod";
+ resets = <&ccu RST_BUS_MIPI_DSI>;
+ status = "disabled";
+ #phy-cells = <0>;
+ };
+
fe0: display-frontend@1e00000 {
compatible = "allwinner,sun8i-a33-display-frontend";
reg = <0x01e00000 0x20000>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 10/10] [DO NOT MERGE] arm: dts: sun8i: bpi-m2m: Add DSI display
2018-02-21 9:20 [PATCH v2 00/10] drm/sun4i: Allwinner MIPI-DSI support Maxime Ripard
` (8 preceding siblings ...)
2018-02-21 9:20 ` [PATCH v2 09/10] arm: dts: sun8i: a33: Add the DSI-related nodes Maxime Ripard
@ 2018-02-21 9:20 ` Maxime Ripard
9 siblings, 0 replies; 24+ messages in thread
From: Maxime Ripard @ 2018-02-21 9:20 UTC (permalink / raw)
To: Mark Brown, Thierry Reding, Chen-Yu Tsai, Maxime Ripard,
Mark Rutland, Rob Herring
Cc: dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni, Maxime Ripard
From: Maxime Ripard <maxime.ripard@free-electrons.com>
The BananaPi M2M has an optional 1280x720 DSI panel. Since that panel is
optional, we can only show a DT patch that would show how to enable it.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 39 +++++++++++++++++++++-
1 file changed, 39 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
index eaf09666720d..11a4dfde2679 100644
--- a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
+++ b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
@@ -44,6 +44,7 @@
#include "sun8i-a33.dtsi"
#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pwm/pwm.h>
/ {
model = "BananaPi M2 Magic";
@@ -81,6 +82,14 @@
};
};
+ pwm_bl: backlight {
+ compatible = "pwm-backlight";
+ pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
+ brightness-levels = <1 2 4 8 16 32 64 128 255>;
+ default-brightness-level = <8>;
+ enable-gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PG10 */
+ };
+
reg_vcc5v0: vcc5v0 {
compatible = "regulator-fixed";
regulator-name = "vcc5v0";
@@ -120,6 +129,26 @@
status = "okay";
};
+&de {
+ status = "okay";
+};
+
+&dphy0 {
+ status = "okay";
+};
+
+&dsi0 {
+ status = "okay";
+
+ panel@0 {
+ compatible = "huarui,lhr050h41";
+ reg = <0>;
+ power-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* PB07 */
+ reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_LOW>; /* PL05 */
+ backlight = <&pwm_bl>;
+ };
+};
+
&ehci0 {
status = "okay";
};
@@ -179,6 +208,12 @@
status = "okay";
};
+&pwm {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pwm0_pins>;
+ status = "okay";
+};
+
&r_rsb {
status = "okay";
@@ -291,6 +326,10 @@
status = "okay";
};
+&tcon0 {
+ status = "okay";
+};
+
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_b>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH v2 05/10] drm/sun4i: Add Allwinner A31 MIPI-DSI controller support
2018-02-21 9:20 ` [PATCH v2 05/10] drm/sun4i: Add Allwinner A31 MIPI-DSI controller support Maxime Ripard
@ 2018-02-21 14:48 ` kbuild test robot
0 siblings, 0 replies; 24+ messages in thread
From: kbuild test robot @ 2018-02-21 14:48 UTC (permalink / raw)
To: Maxime Ripard
Cc: kbuild-all, Mark Brown, Thierry Reding, Chen-Yu Tsai,
Maxime Ripard, Mark Rutland, Rob Herring, dri-devel,
Gustavo Padovan, Daniel Vetter, Maarten Lankhorst, Sean Paul,
devicetree, linux-arm-kernel, linux-kernel, Thomas Petazzoni,
Maxime Ripard
[-- Attachment #1: Type: text/plain, Size: 2612 bytes --]
Hi Maxime,
I love your patch! Perhaps something to improve:
[auto build test WARNING on ]
url: https://github.com/0day-ci/linux/commits/Maxime-Ripard/drm-sun4i-Allwinner-MIPI-DSI-support/20180221-203150
base:
config: arm-allmodconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 7.2.0-11) 7.2.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm
All warnings (new ones prefixed by >>):
drivers/gpu/drm/sun4i/sun4i_tcon.c: In function 'sun4i_tcon_mode_set':
>> drivers/gpu/drm/sun4i/sun4i_tcon.c:606:30: warning: passing argument 1 of 'encoder_to_sun6i_dsi' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
dsi = encoder_to_sun6i_dsi(encoder);
^~~~~~~
In file included from drivers/gpu/drm/sun4i/sun4i_tcon.c:37:0:
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h:54:33: note: expected 'struct drm_encoder *' but argument is of type 'const struct drm_encoder *'
static inline struct sun6i_dsi *encoder_to_sun6i_dsi(struct drm_encoder *encoder)
^~~~~~~~~~~~~~~~~~~~
vim +606 drivers/gpu/drm/sun4i/sun4i_tcon.c
593
594 void sun4i_tcon_mode_set(struct sun4i_tcon *tcon,
595 const struct drm_encoder *encoder,
596 const struct drm_display_mode *mode)
597 {
598 struct sun6i_dsi *dsi;
599
600 switch (encoder->encoder_type) {
601 case DRM_MODE_ENCODER_DSI:
602 /*
603 * This is not really elegant, but it's the "cleaner"
604 * way I could think of...
605 */
> 606 dsi = encoder_to_sun6i_dsi(encoder);
607 sun4i_tcon0_mode_set_cpu(tcon, dsi->device, mode);
608 break;
609 case DRM_MODE_ENCODER_LVDS:
610 sun4i_tcon0_mode_set_lvds(tcon, encoder, mode);
611 break;
612 case DRM_MODE_ENCODER_NONE:
613 sun4i_tcon0_mode_set_rgb(tcon, mode);
614 sun4i_tcon_set_mux(tcon, 0, encoder);
615 break;
616 case DRM_MODE_ENCODER_TVDAC:
617 case DRM_MODE_ENCODER_TMDS:
618 sun4i_tcon1_mode_set(tcon, mode);
619 sun4i_tcon_set_mux(tcon, 1, encoder);
620 break;
621 default:
622 DRM_DEBUG_DRIVER("Unknown encoder type, doing nothing...\n");
623 }
624 }
625 EXPORT_SYMBOL(sun4i_tcon_mode_set);
626
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 65152 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* [RFC PATCH] drm/panel: lhr050h41_init[] can be static
2018-02-21 9:20 ` [PATCH v2 08/10] drm/panel: Add Huarui LHR050H41 panel driver Maxime Ripard
@ 2018-02-21 15:05 ` kbuild test robot
2018-02-21 15:05 ` [PATCH v2 08/10] drm/panel: Add Huarui LHR050H41 panel driver kbuild test robot
2018-02-21 15:36 ` Chen-Yu Tsai
2 siblings, 0 replies; 24+ messages in thread
From: kbuild test robot @ 2018-02-21 15:05 UTC (permalink / raw)
To: Maxime Ripard
Cc: kbuild-all, Mark Brown, Thierry Reding, Chen-Yu Tsai,
Maxime Ripard, Mark Rutland, Rob Herring, dri-devel,
Gustavo Padovan, Daniel Vetter, Maarten Lankhorst, Sean Paul,
devicetree, linux-arm-kernel, linux-kernel, Thomas Petazzoni,
Maxime Ripard
Fixes: dcfac3b68dfb ("drm/panel: Add Huarui LHR050H41 panel driver")
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---
panel-huarui-lhr050h41.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panel/panel-huarui-lhr050h41.c b/drivers/gpu/drm/panel/panel-huarui-lhr050h41.c
index f73d484..f71030e 100644
--- a/drivers/gpu/drm/panel/panel-huarui-lhr050h41.c
+++ b/drivers/gpu/drm/panel/panel-huarui-lhr050h41.c
@@ -66,7 +66,7 @@ struct lhr050h41_instr {
}, \
}
-struct lhr050h41_instr lhr050h41_init[] = {
+static struct lhr050h41_instr lhr050h41_init[] = {
LHR050H41_SWITCH_PAGE_INSTR(3),
LHR050H41_COMMAND_INSTR(0x01, 0x00),
LHR050H41_COMMAND_INSTR(0x02, 0x00),
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH v2 08/10] drm/panel: Add Huarui LHR050H41 panel driver
2018-02-21 9:20 ` [PATCH v2 08/10] drm/panel: Add Huarui LHR050H41 panel driver Maxime Ripard
2018-02-21 15:05 ` [RFC PATCH] drm/panel: lhr050h41_init[] can be static kbuild test robot
@ 2018-02-21 15:05 ` kbuild test robot
2018-02-21 15:36 ` Chen-Yu Tsai
2 siblings, 0 replies; 24+ messages in thread
From: kbuild test robot @ 2018-02-21 15:05 UTC (permalink / raw)
To: Maxime Ripard
Cc: kbuild-all, Mark Brown, Thierry Reding, Chen-Yu Tsai,
Maxime Ripard, Mark Rutland, Rob Herring, dri-devel,
Gustavo Padovan, Daniel Vetter, Maarten Lankhorst, Sean Paul,
devicetree, linux-arm-kernel, linux-kernel, Thomas Petazzoni,
Maxime Ripard
Hi Maxime,
I love your patch! Perhaps something to improve:
[auto build test WARNING on ]
url: https://github.com/0day-ci/linux/commits/Maxime-Ripard/drm-sun4i-Allwinner-MIPI-DSI-support/20180221-203150
base:
reproduce:
# apt-get install sparse
make ARCH=x86_64 allmodconfig
make C=1 CF=-D__CHECK_ENDIAN__
sparse warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/panel/panel-huarui-lhr050h41.c:69:24: sparse: symbol 'lhr050h41_init' was not declared. Should it be
Please review and possibly fold the followup patch.
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 08/10] drm/panel: Add Huarui LHR050H41 panel driver
2018-02-21 9:20 ` [PATCH v2 08/10] drm/panel: Add Huarui LHR050H41 panel driver Maxime Ripard
2018-02-21 15:05 ` [RFC PATCH] drm/panel: lhr050h41_init[] can be static kbuild test robot
2018-02-21 15:05 ` [PATCH v2 08/10] drm/panel: Add Huarui LHR050H41 panel driver kbuild test robot
@ 2018-02-21 15:36 ` Chen-Yu Tsai
2018-03-02 9:52 ` Maxime Ripard
2 siblings, 1 reply; 24+ messages in thread
From: Chen-Yu Tsai @ 2018-02-21 15:36 UTC (permalink / raw)
To: Maxime Ripard
Cc: Mark Brown, Thierry Reding, Mark Rutland, Rob Herring, dri-devel,
Gustavo Padovan, Daniel Vetter, Maarten Lankhorst, Sean Paul,
devicetree, linux-arm-kernel, linux-kernel, Thomas Petazzoni,
Maxime Ripard
Hi,
On Wed, Feb 21, 2018 at 5:20 PM, Maxime Ripard
<maxime.ripard@bootlin.com> wrote:
> From: Maxime Ripard <maxime.ripard@free-electrons.com>
>
> The LHR050H41 panel is the panel shipped with the BananaPi M2-Magic. Add a
> driver for it.
So I distinctly remember questioning the vendor name the first time.
I would just use Bananapi as the vendor name instead.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> drivers/gpu/drm/panel/Kconfig | 9 +-
> drivers/gpu/drm/panel/Makefile | 1 +-
> drivers/gpu/drm/panel/panel-huarui-lhr050h41.c | 506 ++++++++++++++++++-
> 3 files changed, 516 insertions(+)
> create mode 100644 drivers/gpu/drm/panel/panel-huarui-lhr050h41.c
>
> diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
> index 6ba4031f3919..965310fd129a 100644
> --- a/drivers/gpu/drm/panel/Kconfig
> +++ b/drivers/gpu/drm/panel/Kconfig
> @@ -28,6 +28,15 @@ config DRM_PANEL_SIMPLE
> that it can be automatically turned off when the panel goes into a
> low power state.
>
> +config DRM_PANEL_HUARUI_LHR050H41
> + tristate "Huarui LHR050H41 panel"
> + depends on OF
> + depends on DRM_MIPI_DSI
> + depends on BACKLIGHT_CLASS_DEVICE
> + help
> + Say Y if you want to enable support for the Huarui Lighting
> + LHR05041 DSI panel. The panel has a 1280x720 resolution.
> +
And it seems this panel is driven by an ILI9881C from Ilitek. So
maybe you could make the panel driver more like the IL9322, as in
having common code for the driver IC, then a data structure tied
to actual panel compatible strings to handle any quirks.
The datasheet can be found simply by googling the part ID, or here:
http://en.startek-lcd.com/res/starteklcden/pdres/201706/20170617115241070.pdf
This should help with the init command sequence.
I also found this:
http://www.ampdisplay.com/documents/pdf/AM-7201280ETZQW-00H.pdf
which might or might not be the same panel.
Now the IL9332 driver simply uses the device model (Dlink DIR-685)
as part of the compatible string.
Regards
ChenYu
> config DRM_PANEL_ILITEK_IL9322
> tristate "Ilitek ILI9322 320x240 QVGA panels"
> depends on OF && SPI
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [v2,03/10] drm/sun4i: Protect the TCON pixel clocks
2018-02-21 9:20 ` [PATCH v2 03/10] drm/sun4i: Protect the TCON pixel clocks Maxime Ripard
@ 2018-02-23 14:05 ` Giulio Benetti
2018-02-23 23:31 ` Giulio Benetti
1 sibling, 0 replies; 24+ messages in thread
From: Giulio Benetti @ 2018-02-23 14:05 UTC (permalink / raw)
To: Maxime Ripard, Mark Brown, Thierry Reding, Chen-Yu Tsai,
Mark Rutland, Rob Herring
Cc: devicetree, linux-kernel, dri-devel, Thomas Petazzoni,
Daniel Vetter, Maxime Ripard, linux-arm-kernel
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Both TCON clocks are very sensitive to clock changes, since any change
might lead to improper timings.
Make sure our rate is never changed.
Tested-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c
b/drivers/gpu/drm/sun4i/sun4i_tcon.c
index b73acab74867..cbe87cee13d1 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -261,7 +261,7 @@ static void sun4i_tcon0_mode_set_common(struct
sun4i_tcon *tcon,
const struct drm_display_mode *mode)
{
/* Configure the dot clock */
- clk_set_rate(tcon->dclk, mode->crtc_clock * 1000);
+ clk_set_rate_exclusive(tcon->dclk, mode->crtc_clock * 1000);
/* Set the resolution */
regmap_write(tcon->regs, SUN4I_TCON0_BASIC0_REG,
@@ -419,7 +419,7 @@ static void sun4i_tcon1_mode_set(struct sun4i_tcon
*tcon,
WARN_ON(!tcon->quirks->has_channel_1);
/* Configure the dot clock */
- clk_set_rate(tcon->sclk1, mode->crtc_clock * 1000);
+ clk_set_rate_exclusive(tcon->sclk1, mode->crtc_clock * 1000);
/* Adjust clock delay */
clk_delay = sun4i_tcon_get_clk_delay(mode, 1);
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [v2,03/10] drm/sun4i: Protect the TCON pixel clocks
2018-02-21 9:20 ` [PATCH v2 03/10] drm/sun4i: Protect the TCON pixel clocks Maxime Ripard
2018-02-23 14:05 ` [v2,03/10] " Giulio Benetti
@ 2018-02-23 23:31 ` Giulio Benetti
2018-02-26 11:15 ` Maxime Ripard
1 sibling, 1 reply; 24+ messages in thread
From: Giulio Benetti @ 2018-02-23 23:31 UTC (permalink / raw)
To: Maxime Ripard, Mark Brown, Thierry Reding, Chen-Yu Tsai,
Mark Rutland, Rob Herring
Cc: devicetree, linux-kernel, dri-devel, Thomas Petazzoni,
Daniel Vetter, Maxime Ripard, linux-arm-kernel
Il 21/02/2018 10:20, Maxime Ripard ha scritto:
> From: Maxime Ripard <maxime.ripard@free-electrons.com>
>
> Both TCON clocks are very sensitive to clock changes, since any change
> might lead to improper timings.
>
> Make sure our rate is never changed.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Tested-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
Tested on A20-LiNova1-4_3i-ctp with Mali r6p2 installed.
Before Mali changed dotclock, now it doesn't anymore.
> ---
> drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
> index b73acab74867..cbe87cee13d1 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
> @@ -261,7 +261,7 @@ static void sun4i_tcon0_mode_set_common(struct sun4i_tcon *tcon,
> const struct drm_display_mode *mode)
> {
> /* Configure the dot clock */
> - clk_set_rate(tcon->dclk, mode->crtc_clock * 1000);
> + clk_set_rate_exclusive(tcon->dclk, mode->crtc_clock * 1000);
>
> /* Set the resolution */
> regmap_write(tcon->regs, SUN4I_TCON0_BASIC0_REG,
> @@ -419,7 +419,7 @@ static void sun4i_tcon1_mode_set(struct sun4i_tcon *tcon,
> WARN_ON(!tcon->quirks->has_channel_1);
>
> /* Configure the dot clock */
> - clk_set_rate(tcon->sclk1, mode->crtc_clock * 1000);
> + clk_set_rate_exclusive(tcon->sclk1, mode->crtc_clock * 1000);
>
> /* Adjust clock delay */
> clk_delay = sun4i_tcon_get_clk_delay(mode, 1);
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [v2,03/10] drm/sun4i: Protect the TCON pixel clocks
2018-02-23 23:31 ` Giulio Benetti
@ 2018-02-26 11:15 ` Maxime Ripard
0 siblings, 0 replies; 24+ messages in thread
From: Maxime Ripard @ 2018-02-26 11:15 UTC (permalink / raw)
To: Giulio Benetti
Cc: Mark Brown, Thierry Reding, Chen-Yu Tsai, Mark Rutland,
Rob Herring, devicetree, linux-kernel, dri-devel,
Thomas Petazzoni, Daniel Vetter, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 746 bytes --]
On Sat, Feb 24, 2018 at 12:31:36AM +0100, Giulio Benetti wrote:
> Il 21/02/2018 10:20, Maxime Ripard ha scritto:
> > From: Maxime Ripard <maxime.ripard@free-electrons.com>
> >
> > Both TCON clocks are very sensitive to clock changes, since any change
> > might lead to improper timings.
> >
> > Make sure our rate is never changed.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Tested-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
>
> Tested on A20-LiNova1-4_3i-ctp with Mali r6p2 installed.
> Before Mali changed dotclock, now it doesn't anymore.
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Applied "regmap: mmio: Add function to attach a clock" to the regmap tree
2018-02-21 9:20 ` [PATCH v2 01/10] regmap: mmio: Add function to attach a clock Maxime Ripard
@ 2018-02-26 11:17 ` Mark Brown
2018-02-26 13:12 ` [PATCH v2 01/10] regmap: mmio: Add function to attach a clock Mark Brown
1 sibling, 0 replies; 24+ messages in thread
From: Mark Brown @ 2018-02-26 11:17 UTC (permalink / raw)
To: Maxime Ripard
Cc: Mark Brown, Mark Brown, Thierry Reding, Chen-Yu Tsai,
Maxime Ripard, Mark Rutland, Rob Herring, dri-devel,
Gustavo Padovan, Daniel Vetter, Maarten Lankhorst, Sean Paul,
devicetree, linux-arm-kernel, linux-kernel, Thomas Petazzoni,
linux-kernel
The patch
regmap: mmio: Add function to attach a clock
has been applied to the regmap tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 31895662f9ba81e8ea9ef05abf8edcb29d4b9c18 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 21 Feb 2018 10:20:25 +0100
Subject: [PATCH] regmap: mmio: Add function to attach a clock
regmap_init_mmio_clk allows to specify a clock that needs to be enabled
while accessing the registers.
However, that clock is retrieved through its clock ID, which means it will
lookup that clock based on the current device that registers the regmap,
and, in the DT case, will only look in that device OF node.
This might be problematic if the clock to enable is stored in another node.
Let's add a function that allows to attach a clock that has already been
retrieved to a regmap in order to fix this.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
drivers/base/regmap/regmap-mmio.c | 24 ++++++++++++++++++++++++
include/linux/regmap.h | 3 +++
2 files changed, 27 insertions(+)
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c
index 5189fd6182f6..5cadfd3394d8 100644
--- a/drivers/base/regmap/regmap-mmio.c
+++ b/drivers/base/regmap/regmap-mmio.c
@@ -28,6 +28,8 @@
struct regmap_mmio_context {
void __iomem *regs;
unsigned val_bytes;
+
+ bool attached_clk;
struct clk *clk;
void (*reg_write)(struct regmap_mmio_context *ctx,
@@ -363,4 +365,26 @@ struct regmap *__devm_regmap_init_mmio_clk(struct device *dev,
}
EXPORT_SYMBOL_GPL(__devm_regmap_init_mmio_clk);
+int regmap_mmio_attach_clk(struct regmap *map, struct clk *clk)
+{
+ struct regmap_mmio_context *ctx = map->bus_context;
+
+ ctx->clk = clk;
+ ctx->attached_clk = true;
+
+ return clk_prepare(ctx->clk);
+}
+EXPORT_SYMBOL_GPL(regmap_mmio_attach_clk);
+
+void regmap_mmio_detach_clk(struct regmap *map)
+{
+ struct regmap_mmio_context *ctx = map->bus_context;
+
+ clk_unprepare(ctx->clk);
+
+ ctx->attached_clk = false;
+ ctx->clk = NULL;
+}
+EXPORT_SYMBOL_GPL(regmap_mmio_detach_clk);
+
MODULE_LICENSE("GPL v2");
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 6a3aeba40e9e..5f7ad0552c03 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -21,6 +21,7 @@
#include <linux/lockdep.h>
struct module;
+struct clk;
struct device;
struct i2c_client;
struct irq_domain;
@@ -905,6 +906,8 @@ bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg);
__regmap_lockdep_wrapper(__devm_regmap_init_sdw, #config, \
sdw, config)
+int regmap_mmio_attach_clk(struct regmap *map, struct clk *clk);
+void regmap_mmio_detach_clk(struct regmap *map);
void regmap_exit(struct regmap *map);
int regmap_reinit_cache(struct regmap *map,
const struct regmap_config *config);
--
2.16.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH v2 01/10] regmap: mmio: Add function to attach a clock
2018-02-21 9:20 ` [PATCH v2 01/10] regmap: mmio: Add function to attach a clock Maxime Ripard
2018-02-26 11:17 ` Applied "regmap: mmio: Add function to attach a clock" to the regmap tree Mark Brown
@ 2018-02-26 13:12 ` Mark Brown
1 sibling, 0 replies; 24+ messages in thread
From: Mark Brown @ 2018-02-26 13:12 UTC (permalink / raw)
To: Maxime Ripard
Cc: Thierry Reding, Chen-Yu Tsai, Mark Rutland, Rob Herring,
dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni, Maxime Ripard
[-- Attachment #1: Type: text/plain, Size: 1166 bytes --]
On Wed, Feb 21, 2018 at 10:20:25AM +0100, Maxime Ripard wrote:
> From: Maxime Ripard <maxime.ripard@free-electrons.com>
>
> regmap_init_mmio_clk allows to specify a clock that needs to be enabled
> while accessing the registers.
The following changes since commit 7928b2cbe55b2a410a0f5c1f154610059c57b1b2:
Linux 4.16-rc1 (2018-02-11 15:04:29 -0800)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git tags/mmio-clk-config
for you to fetch changes up to 31895662f9ba81e8ea9ef05abf8edcb29d4b9c18:
regmap: mmio: Add function to attach a clock (2018-02-26 11:05:44 +0000)
----------------------------------------------------------------
regmap: MMIO regmap clock configuration
This patch provides a mechanism for specifying a different clock to be
used with the regmap clock integration.
----------------------------------------------------------------
Maxime Ripard (1):
regmap: mmio: Add function to attach a clock
drivers/base/regmap/regmap-mmio.c | 24 ++++++++++++++++++++++++
include/linux/regmap.h | 3 +++
2 files changed, 27 insertions(+)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 04/10] dt-bindings: display: Add Allwinner MIPI-DSI bindings
2018-02-21 9:20 ` [PATCH v2 04/10] dt-bindings: display: Add Allwinner MIPI-DSI bindings Maxime Ripard
@ 2018-03-01 22:15 ` Rob Herring
2018-03-06 13:23 ` Maxime Ripard
0 siblings, 1 reply; 24+ messages in thread
From: Rob Herring @ 2018-03-01 22:15 UTC (permalink / raw)
To: Maxime Ripard
Cc: Mark Brown, Thierry Reding, Chen-Yu Tsai, Mark Rutland,
dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni, Maxime Ripard
On Wed, Feb 21, 2018 at 10:20:28AM +0100, Maxime Ripard wrote:
> From: Maxime Ripard <maxime.ripard@free-electrons.com>
>
> The Allwinner SoCs usually come with a DSI encoder. Add a binding for it.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt | 84 +++++++-
> 1 file changed, 84 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt
>
> diff --git a/Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt b/Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt
> new file mode 100644
> index 000000000000..cbcc673b9bcc
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt
> @@ -0,0 +1,84 @@
> +Allwinner A31 DSI Encoder
> +=========================
> +
> +The DSI pipeline consists of two separate blocks: the DSI controller
> +itself, and its associated D-PHY.
> +
> +DSI Encoder
> +-----------
> +
> +The DSI Encoder generates the DSI signal from the TCON's.
> +
> +Required properties:
> + - compatible: value must be one of:
> + * allwinner,sun6i-a31-mipi-dsi
> + - reg: base address and size of memory-mapped region
> + - interrupts: interrupt associated to this IP
> + - clocks: phandles to the clocks feeding the DSI encoder
> + * bus: the DSI interface clock
> + * mod: the DSI module clock
> + - clock-names: the clock names mentioned above
> + - phys: phandle to the D-PHY
> + - phy-names: must be "dphy"
> + - resets: phandle to the reset controller driving the encoder
> +
> + - ports: A ports node with endpoint definitions as defined in
> + Documentation/devicetree/bindings/media/video-interfaces.txt. The
> + port should be the input endpoint, usually coming from the
> + associated TCON.
> +
> +Any MIPI-DSI device attached to this should be described according to
> +the bindings defined in ../mipi-dsi-bus.txt
> +
> +D-PHY
> +-----
> +
> +Required properties:
> + - compatible: value must be one of:
> + * allwinner,sun6i-a31-mipi-dphy
> + - reg: base address and size of memory-mapped region
> + - clocks: phandles to the clocks feeding the DSI encoder
> + * bus: the DSI interface clock
> + * mod: the DSI module clock
> + - clock-names: the clock names mentioned above
> + - resets: phandle to the reset controller driving the encoder
> +
> +Example:
> +
> +dsi0: dsi@1ca0000 {
> + compatible = "allwinner,sun6i-a31-mipi-dsi";
> + reg = <0x01ca0000 0x1000>;
> + interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&ccu CLK_BUS_MIPI_DSI>,
> + <&ccu CLK_DSI_SCLK>;
> + clock-names = "bus", "mod";
> + resets = <&ccu RST_BUS_MIPI_DSI>;
> + phys = <&dphy0>;
> + phy-names = "dphy";
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + panel@0 {
> + compatible = "huarui,lhr050h41";
> + reg = <0>;
> + power-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* PB07 */
> + reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_LOW>; /* PL05 */
> + backlight = <&pwm_bl>;
> + };
> +
> + port {
> + dsi0_in_tcon0: endpoint {
> + remote-endpoint = <&tcon0_out_dsi0>;
> + };
> + };
Kind of odd to have a mixture of panel and port. I guess that's valid
though. I'd recommend you put port under ports node so if you ever have
another port you are not mixing unit-address spaces.
With that,
Reviewed-by: Rob Herring <robh@kernel.org>
> +};
> +
> +dphy0: d-phy@1ca1000 {
> + compatible = "allwinner,sun6i-a31-mipi-dphy";
> + reg = <0x01ca1000 0x1000>;
> + clocks = <&ccu CLK_BUS_MIPI_DSI>,
> + <&ccu CLK_DSI_DPHY>;
> + clock-names = "bus", "mod";
> + resets = <&ccu RST_BUS_MIPI_DSI>;
> + #phy-cells = <0>;
> +};
> --
> git-series 0.9.1
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 06/10] dt-bindings: vendor: Add Huarui Lighting
2018-02-21 9:20 ` [PATCH v2 06/10] dt-bindings: vendor: Add Huarui Lighting Maxime Ripard
@ 2018-03-01 22:38 ` Rob Herring
0 siblings, 0 replies; 24+ messages in thread
From: Rob Herring @ 2018-03-01 22:38 UTC (permalink / raw)
To: Maxime Ripard
Cc: Mark Brown, Thierry Reding, Chen-Yu Tsai, Mark Rutland,
dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni, Maxime Ripard
On Wed, Feb 21, 2018 at 10:20:30AM +0100, Maxime Ripard wrote:
> From: Maxime Ripard <maxime.ripard@free-electrons.com>
>
> Huarui Lighting makes display panel, add it to the list of panels.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
> 1 file changed, 1 insertion(+)
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 08/10] drm/panel: Add Huarui LHR050H41 panel driver
2018-02-21 15:36 ` Chen-Yu Tsai
@ 2018-03-02 9:52 ` Maxime Ripard
0 siblings, 0 replies; 24+ messages in thread
From: Maxime Ripard @ 2018-03-02 9:52 UTC (permalink / raw)
To: Chen-Yu Tsai
Cc: Mark Brown, Thierry Reding, Mark Rutland, Rob Herring, dri-devel,
Gustavo Padovan, Daniel Vetter, Maarten Lankhorst, Sean Paul,
devicetree, linux-arm-kernel, linux-kernel, Thomas Petazzoni
[-- Attachment #1: Type: text/plain, Size: 1967 bytes --]
Hi,
On Wed, Feb 21, 2018 at 11:36:10PM +0800, Chen-Yu Tsai wrote:
> On Wed, Feb 21, 2018 at 5:20 PM, Maxime Ripard
> <maxime.ripard@bootlin.com> wrote:
> > From: Maxime Ripard <maxime.ripard@free-electrons.com>
> >
> > The LHR050H41 panel is the panel shipped with the BananaPi M2-Magic. Add a
> > driver for it.
>
> So I distinctly remember questioning the vendor name the first time.
> I would just use Bananapi as the vendor name instead.
Ack.
> > +config DRM_PANEL_HUARUI_LHR050H41
> > + tristate "Huarui LHR050H41 panel"
> > + depends on OF
> > + depends on DRM_MIPI_DSI
> > + depends on BACKLIGHT_CLASS_DEVICE
> > + help
> > + Say Y if you want to enable support for the Huarui Lighting
> > + LHR05041 DSI panel. The panel has a 1280x720 resolution.
> > +
>
> And it seems this panel is driven by an ILI9881C from Ilitek. So
> maybe you could make the panel driver more like the IL9322, as in
> having common code for the driver IC, then a data structure tied
> to actual panel compatible strings to handle any quirks.
>
> The datasheet can be found simply by googling the part ID, or here:
>
> http://en.startek-lcd.com/res/starteklcden/pdres/201706/20170617115241070.pdf
>
> This should help with the init command sequence.
>
> I also found this:
>
> http://www.ampdisplay.com/documents/pdf/AM-7201280ETZQW-00H.pdf
>
> which might or might not be the same panel.
>
> Now the IL9332 driver simply uses the device model (Dlink DIR-685)
> as part of the compatible string.
I guess we can create an ili9881c driver then, with the lhr050h41
compatible. I'm not sure there's much more we can do at this point,
since in order to know the set of quirks to associate to each
compatible, we'd need to have a second panel.
Thanks!
Maxime
--
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 04/10] dt-bindings: display: Add Allwinner MIPI-DSI bindings
2018-03-01 22:15 ` Rob Herring
@ 2018-03-06 13:23 ` Maxime Ripard
0 siblings, 0 replies; 24+ messages in thread
From: Maxime Ripard @ 2018-03-06 13:23 UTC (permalink / raw)
To: Rob Herring
Cc: Mark Brown, Thierry Reding, Chen-Yu Tsai, Mark Rutland,
dri-devel, Gustavo Padovan, Daniel Vetter, Maarten Lankhorst,
Sean Paul, devicetree, linux-arm-kernel, linux-kernel,
Thomas Petazzoni
[-- Attachment #1: Type: text/plain, Size: 4056 bytes --]
Hi Rob,
On Thu, Mar 01, 2018 at 04:15:43PM -0600, Rob Herring wrote:
> On Wed, Feb 21, 2018 at 10:20:28AM +0100, Maxime Ripard wrote:
> > From: Maxime Ripard <maxime.ripard@free-electrons.com>
> >
> > The Allwinner SoCs usually come with a DSI encoder. Add a binding for it.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > ---
> > Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt | 84 +++++++-
> > 1 file changed, 84 insertions(+)
> > create mode 100644 Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt
> >
> > diff --git a/Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt b/Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt
> > new file mode 100644
> > index 000000000000..cbcc673b9bcc
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt
> > @@ -0,0 +1,84 @@
> > +Allwinner A31 DSI Encoder
> > +=========================
> > +
> > +The DSI pipeline consists of two separate blocks: the DSI controller
> > +itself, and its associated D-PHY.
> > +
> > +DSI Encoder
> > +-----------
> > +
> > +The DSI Encoder generates the DSI signal from the TCON's.
> > +
> > +Required properties:
> > + - compatible: value must be one of:
> > + * allwinner,sun6i-a31-mipi-dsi
> > + - reg: base address and size of memory-mapped region
> > + - interrupts: interrupt associated to this IP
> > + - clocks: phandles to the clocks feeding the DSI encoder
> > + * bus: the DSI interface clock
> > + * mod: the DSI module clock
> > + - clock-names: the clock names mentioned above
> > + - phys: phandle to the D-PHY
> > + - phy-names: must be "dphy"
> > + - resets: phandle to the reset controller driving the encoder
> > +
> > + - ports: A ports node with endpoint definitions as defined in
> > + Documentation/devicetree/bindings/media/video-interfaces.txt. The
> > + port should be the input endpoint, usually coming from the
> > + associated TCON.
> > +
> > +Any MIPI-DSI device attached to this should be described according to
> > +the bindings defined in ../mipi-dsi-bus.txt
> > +
> > +D-PHY
> > +-----
> > +
> > +Required properties:
> > + - compatible: value must be one of:
> > + * allwinner,sun6i-a31-mipi-dphy
> > + - reg: base address and size of memory-mapped region
> > + - clocks: phandles to the clocks feeding the DSI encoder
> > + * bus: the DSI interface clock
> > + * mod: the DSI module clock
> > + - clock-names: the clock names mentioned above
> > + - resets: phandle to the reset controller driving the encoder
> > +
> > +Example:
> > +
> > +dsi0: dsi@1ca0000 {
> > + compatible = "allwinner,sun6i-a31-mipi-dsi";
> > + reg = <0x01ca0000 0x1000>;
> > + interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
> > + clocks = <&ccu CLK_BUS_MIPI_DSI>,
> > + <&ccu CLK_DSI_SCLK>;
> > + clock-names = "bus", "mod";
> > + resets = <&ccu RST_BUS_MIPI_DSI>;
> > + phys = <&dphy0>;
> > + phy-names = "dphy";
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + panel@0 {
> > + compatible = "huarui,lhr050h41";
> > + reg = <0>;
> > + power-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* PB07 */
> > + reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_LOW>; /* PL05 */
> > + backlight = <&pwm_bl>;
> > + };
> > +
> > + port {
> > + dsi0_in_tcon0: endpoint {
> > + remote-endpoint = <&tcon0_out_dsi0>;
> > + };
> > + };
>
> Kind of odd to have a mixture of panel and port. I guess that's valid
> though.
I guess the most elegant way would have been to have the panel also
part of the OF graph, but we have to conform to the generic DSI panels
as well :)
> I'd recommend you put port under ports node so if you ever have
> another port you are not mixing unit-address spaces.
Ok, I'll do that.
> With that,
>
> Reviewed-by: Rob Herring <robh@kernel.org>
Thanks!
Maxime
--
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2018-03-06 13:23 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-21 9:20 [PATCH v2 00/10] drm/sun4i: Allwinner MIPI-DSI support Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 01/10] regmap: mmio: Add function to attach a clock Maxime Ripard
2018-02-26 11:17 ` Applied "regmap: mmio: Add function to attach a clock" to the regmap tree Mark Brown
2018-02-26 13:12 ` [PATCH v2 01/10] regmap: mmio: Add function to attach a clock Mark Brown
2018-02-21 9:20 ` [PATCH v2 02/10] drm/sun4i: tcon: Add TRI finish interrupt for vblank Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 03/10] drm/sun4i: Protect the TCON pixel clocks Maxime Ripard
2018-02-23 14:05 ` [v2,03/10] " Giulio Benetti
2018-02-23 23:31 ` Giulio Benetti
2018-02-26 11:15 ` Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 04/10] dt-bindings: display: Add Allwinner MIPI-DSI bindings Maxime Ripard
2018-03-01 22:15 ` Rob Herring
2018-03-06 13:23 ` Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 05/10] drm/sun4i: Add Allwinner A31 MIPI-DSI controller support Maxime Ripard
2018-02-21 14:48 ` kbuild test robot
2018-02-21 9:20 ` [PATCH v2 06/10] dt-bindings: vendor: Add Huarui Lighting Maxime Ripard
2018-03-01 22:38 ` Rob Herring
2018-02-21 9:20 ` [PATCH v2 07/10] dt-bindings: panel: Add Huarui LHR050H41 panel documentation Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 08/10] drm/panel: Add Huarui LHR050H41 panel driver Maxime Ripard
2018-02-21 15:05 ` [RFC PATCH] drm/panel: lhr050h41_init[] can be static kbuild test robot
2018-02-21 15:05 ` [PATCH v2 08/10] drm/panel: Add Huarui LHR050H41 panel driver kbuild test robot
2018-02-21 15:36 ` Chen-Yu Tsai
2018-03-02 9:52 ` Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 09/10] arm: dts: sun8i: a33: Add the DSI-related nodes Maxime Ripard
2018-02-21 9:20 ` [PATCH v2 10/10] [DO NOT MERGE] arm: dts: sun8i: bpi-m2m: Add DSI display Maxime Ripard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).