[PATCH 0/9] ARM: tegra: Enable DSI and panel support

[PATCH 0/9] ARM: tegra: Enable DSI and panel support

[Thierry Reding]

This series enables DSI, HDMI and gr2d support on Dalmore as well as
panel support for Cardhu and Harmony.

The DRM_PANEL and DRM_PANEL_SIMPLE Kconfig symbols enabled in patch 9
are introduced by the following patch series:

	[PATCH v2 00/27] drm/tegra: Repatriation and DSI support

Perhaps a good solution would be to postpone applying patch 9 until
after 3.13-rc1, so that the symbols are there when the above series
has gone in during the merge window.

Thierry

Mikko Perttunen (2):
  ARM: tegra: Add host1x, DC and HDMI to Tegra114 device tree
  ARM: tegra: Enable HDMI support on Dalmore

Thierry Reding (7):
  ARM: tegra: Enable LVDS and HDMI on Cardhu
  ARM: tegra: Enable LVDS output on Harmony
  ARM: tegra: Add MIPI calibration DT entries for Tegra114
  ARM: tegra: Add Tegra114 DSI support
  ARM: tegra: Add Tegra114 gr2d support
  ARM: tegra: Enable DSI support on Dalmore
  ARM: tegra: Enable DRM panel support

 arch/arm/boot/dts/tegra114-dalmore.dts         | 74 +++++++++++++++++------
 arch/arm/boot/dts/tegra114.dtsi                | 84 ++++++++++++++++++++++++++
 arch/arm/boot/dts/tegra20-harmony.dts          | 40 +++++++++++-
 arch/arm/boot/dts/tegra30-cardhu.dtsi          | 52 +++++++++++++++-
 arch/arm/configs/tegra_defconfig               |  2 +
 include/dt-bindings/gpu/host1x/tegra114-mipi.h | 11 ++++
 6 files changed, 240 insertions(+), 23 deletions(-)
 create mode 100644 include/dt-bindings/gpu/host1x/tegra114-mipi.h

-- 
1.8.4

[PATCH 1/9] ARM: tegra: Enable LVDS and HDMI on Cardhu

[Thierry Reding]

Add backlight and panel nodes for the Cardhu 10.1" WXGA TFT LCD panel
and enable the HDMI output and hotplug detection.

Note that HDMI doesn't work for some reason and I haven't found out why
yet. I remember someone reporting that it worked at some point in time
using this set of nodes but that no longer seems to be the case. Running
the same kernel on Beaver has working HDMI, though.

Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra30-cardhu.dtsi | 52 +++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index e19dbf2..2364673 100644
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -51,6 +51,27 @@
 		};
 	};
 
+	host1x {
+		dc@54200000 {
+			rgb {
+				status = "okay";
+
+				nvidia,panel = <&panel>;
+			};
+		};
+
+		hdmi {
+			status = "okay";
+
+			vdd-supply = <&sys_3v3_reg>;
+			pll-supply = <&vio_reg>;
+
+			nvidia,hpd-gpio =
+				<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
+			nvidia,ddc-i2c-bus = <&hdmiddc>;
+		};
+	};
+
 	pinmux {
 		pinctrl-names = "default";
 		pinctrl-0 = <&state_default>;
@@ -147,7 +168,11 @@
 		status = "okay";
 	};
 
-	i2c@7000c000 {
+	pwm {
+		status = "okay";
+	};
+
+	panelddc: i2c@7000c000 {
 		status = "okay";
 		clock-frequency = <100000>;
 	};
@@ -170,7 +195,7 @@
 		};
 	};
 
-	i2c@7000c700 {
+	hdmiddc: i2c@7000c700 {
 		status = "okay";
 		clock-frequency = <100000>;
 	};
@@ -366,6 +391,19 @@
 		status = "okay";
 	};
 
+	backlight: backlight {
+		compatible = "pwm-backlight";
+
+		enable-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
+		power-supply = <&vdd_bl_reg>;
+		pwms = <&pwm 0 5000000>;
+
+		brightness-levels = <0 4 8 16 32 64 128 255>;
+		default-brightness-level = <6>;
+
+		backlight-boot-off;
+	};
+
 	clocks {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -379,6 +417,16 @@
 		};
 	};
 
+	panel: panel {
+		compatible = "chunghwa,claa101wb01";
+		ddc-i2c-bus = <&panelddc>;
+
+		power-supply = <&vdd_pnl1_reg>;
+		enable-gpios = <&gpio TEGRA_GPIO(L, 2) GPIO_ACTIVE_HIGH>;
+
+		backlight = <&backlight>;
+	};
+
 	regulators {
 		compatible = "simple-bus";
 		#address-cells = <1>;
-- 
1.8.4

[PATCH 2/9] ARM: tegra: Enable LVDS output on Harmony

[Thierry Reding]

Add backlight and panel modes for the Harmony TFT LCD panel. Note that
currently the panel power supply is marked as boot-on/always-on because
otherwise regulator_enable() and regulator_disable() will become
unbalanced. That's something that needs to be fixed properly in the
panel driver.

Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra20-harmony.dts | 40 +++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index e156ab3..fa5660e 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -11,6 +11,14 @@
 	};
 
 	host1x {
+		dc@54200000 {
+			rgb {
+				status = "okay";
+
+				nvidia,panel = <&panel>;
+			};
+		};
+
 		hdmi {
 			status = "okay";
 
@@ -255,6 +263,10 @@
 		status = "okay";
 	};
 
+	pwm {
+		status = "okay";
+	};
+
 	i2c@7000c000 {
 		status = "okay";
 		clock-frequency = <400000>;
@@ -483,6 +495,19 @@
 		bus-width = <8>;
 	};
 
+	backlight: backlight {
+		compatible = "pwm-backlight";
+
+		enable-gpios = <&gpio TEGRA_GPIO(B, 5) GPIO_ACTIVE_HIGH>;
+		power-supply = <&vdd_bl_reg>;
+		pwms = <&pwm 0 5000000>;
+
+		brightness-levels = <0 4 8 16 32 64 128 255>;
+		default-brightness-level = <6>;
+
+		backlight-boot-off;
+	};
+
 	clocks {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -624,6 +649,15 @@
 				0x1F0400D6>;	/* KEY_QUESTION */
 	};
 
+	panel: panel {
+		compatible = "auo,b101aw03";
+
+		power-supply = <&vdd_pnl_reg>;
+		enable-gpios = <&gpio TEGRA_GPIO(B, 2) GPIO_ACTIVE_HIGH>;
+
+		backlight = <&backlight>;
+	};
+
 	regulators {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -667,17 +701,19 @@
 			enable-active-high;
 		};
 
-		regulator@4 {
+		vdd_pnl_reg: regulator@4 {
 			compatible = "regulator-fixed";
 			reg = <4>;
 			regulator-name = "vdd_pnl";
 			regulator-min-microvolt = <2800000>;
 			regulator-max-microvolt = <2800000>;
+			regulator-always-on;
+			regulator-boot-on;
 			gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
 			enable-active-high;
 		};
 
-		regulator@5 {
+		vdd_bl_reg: regulator@5 {
 			compatible = "regulator-fixed";
 			reg = <5>;
 			regulator-name = "vdd_bl";
-- 
1.8.4

Re: [PATCH 2/9] ARM: tegra: Enable LVDS output on Harmony

[Stephen Warren]

On 10/07/2013 05:48 AM, Thierry Reding wrote:
> Add backlight and panel modes for the Harmony TFT LCD panel. Note that
> currently the panel power supply is marked as boot-on/always-on because
> otherwise regulator_enable() and regulator_disable() will become
> unbalanced. That's something that needs to be fixed properly in the
> panel driver.

Presumably that's something that will be fixed before I apply these
patches, since the DT content shouldn't rely on the presence/absence of
bugs in one particular OS's drivers?

Re: [PATCH 2/9] ARM: tegra: Enable LVDS output on Harmony

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 830 bytes --]

On Mon, Oct 07, 2013 at 03:14:26PM -0600, Stephen Warren wrote:
> On 10/07/2013 05:48 AM, Thierry Reding wrote:
> > Add backlight and panel modes for the Harmony TFT LCD panel. Note that
> > currently the panel power supply is marked as boot-on/always-on because
> > otherwise regulator_enable() and regulator_disable() will become
> > unbalanced. That's something that needs to be fixed properly in the
> > panel driver.
> 
> Presumably that's something that will be fixed before I apply these
> patches, since the DT content shouldn't rely on the presence/absence of
> bugs in one particular OS's drivers?

Oh, that's fixed in the latest versions of the panel driver. I updated
the Dalmore patches, but forgot that I had used a similar hack for
Harmony.

I'll update this patch, thanks for catching.

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

[PATCH 3/9] ARM: tegra: Add MIPI calibration DT entries for Tegra114

[Thierry Reding]

Add a device node for the MIPI calibration block on Tegra114. There is
no need to disable it by default because it only enables the clock while
performing calibration and therefore shouldn't be consuming any power
when unused.

Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra114.dtsi                |  8 ++++++++
 include/dt-bindings/gpu/host1x/tegra114-mipi.h | 11 +++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 include/dt-bindings/gpu/host1x/tegra114-mipi.h

diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index 2905145..be91592 100644
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -1,6 +1,7 @@
 #include <dt-bindings/clock/tegra114-car.h>
 #include <dt-bindings/gpio/tegra-gpio.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/gpu/host1x/tegra114-mipi.h>
 
 #include "skeleton.dtsi"
 
@@ -398,6 +399,13 @@
 		};
 	};
 
+	mipi: mipi {
+		compatible = "nvidia,tegra114-mipi";
+		reg = <0x700e3000 0x100>;
+		clocks = <&tegra_car TEGRA114_CLK_MIPI_CAL>;
+		#calibrate-cells = <1>;
+	};
+
 	sdhci@78000000 {
 		compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
 		reg = <0x78000000 0x200>;
diff --git a/include/dt-bindings/gpu/host1x/tegra114-mipi.h b/include/dt-bindings/gpu/host1x/tegra114-mipi.h
new file mode 100644
index 0000000..1c218a4
--- /dev/null
+++ b/include/dt-bindings/gpu/host1x/tegra114-mipi.h
@@ -0,0 +1,11 @@
+/*
+ * This header provides constants for binding nvidia,tegra114-mipical
+ */
+
+#ifndef _DT_BINDINGS_GPU_HOST1X_TEGRA114_MIPICAL_H
+#define _DT_BINDINGS_GPU_HOST1X_TEGRA114_MIPICAL_H
+
+#define TEGRA114_MIPI_DSIA 0x060
+#define TEGRA114_MIPI_DSIB 0x180
+
+#endif
-- 
1.8.4

Re: [PATCH 3/9] ARM: tegra: Add MIPI calibration DT entries for Tegra114

[Stephen Warren]

On 10/07/2013 05:48 AM, Thierry Reding wrote:
> Add a device node for the MIPI calibration block on Tegra114. There is
> no need to disable it by default because it only enables the clock while
> performing calibration and therefore shouldn't be consuming any power
> when unused.

>  include/dt-bindings/gpu/host1x/tegra114-mipi.h | 11 +++++++++++

Shouldn't that file be added in the same patch that defines the binding
that header contains constants for? What are those constants anyway?

Re: [PATCH 3/9] ARM: tegra: Add MIPI calibration DT entries for Tegra114

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 1129 bytes --]

On Mon, Oct 07, 2013 at 03:16:11PM -0600, Stephen Warren wrote:
> On 10/07/2013 05:48 AM, Thierry Reding wrote:
> > Add a device node for the MIPI calibration block on Tegra114. There is
> > no need to disable it by default because it only enables the clock while
> > performing calibration and therefore shouldn't be consuming any power
> > when unused.
> 
> >  include/dt-bindings/gpu/host1x/tegra114-mipi.h | 11 +++++++++++
> 
> Shouldn't that file be added in the same patch that defines the binding
> that header contains constants for? What are those constants anyway?

I'm not sure. The values themselves are not used within the driver. They
are merely a convenience for DTS authors.

In a nutshell, the values defined within that file are a bitmask of the
pads that need calibration. There are 9 pads (5 for CSI, 4 for DSI) but
the association to each input/output isn't immediately obvious. One DSI
output uses DSIA and DSIB pads, while the other uses DSIC and DSID.

Perhaps in this case it isn't useful to introduce the header at all and
just using the numerical values would be fine?

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 3/9] ARM: tegra: Add MIPI calibration DT entries for Tegra114

[Stephen Warren]

On 10/08/2013 04:05 AM, Thierry Reding wrote:
> On Mon, Oct 07, 2013 at 03:16:11PM -0600, Stephen Warren wrote:
>> On 10/07/2013 05:48 AM, Thierry Reding wrote:
>>> Add a device node for the MIPI calibration block on Tegra114.
>>> There is no need to disable it by default because it only
>>> enables the clock while performing calibration and therefore
>>> shouldn't be consuming any power when unused.
>> 
>>> include/dt-bindings/gpu/host1x/tegra114-mipi.h | 11
>>> +++++++++++
>> 
>> Shouldn't that file be added in the same patch that defines the
>> binding that header contains constants for? What are those
>> constants anyway?
> 
> I'm not sure. The values themselves are not used within the driver.
> They are merely a convenience for DTS authors.
> 
> In a nutshell, the values defined within that file are a bitmask of
> the pads that need calibration. There are 9 pads (5 for CSI, 4 for
> DSI) but the association to each input/output isn't immediately
> obvious. One DSI output uses DSIA and DSIB pads, while the other
> uses DSIC and DSID.

Ah. For values that are useful when creating *.dts, but not actually
part of a binding definition, I'd tend to #define them a header file
or *.dtsi in the dts/ directory, rather than the dt-bindings/
directory. The whole point of dt-bindings/ was for constants that both
*.dts and the driver need to share.

> Perhaps in this case it isn't useful to introduce the header at all
> and just using the numerical values would be fine?

It's probably useful to name them, although a comment in the final
*.dts would likely be fine too.

[PATCH 4/9] ARM: tegra: Add host1x, DC and HDMI to Tegra114 device tree

[Thierry Reding]

From: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Add host1x, DC (display controller) and HDMI devices to Tegra114
device tree.

Signed-off-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra114.dtsi | 49 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index be91592..600196a 100644
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -16,6 +16,55 @@
 		serial3 = &uartd;
 	};
 
+	host1x@50000000 {
+		compatible = "nvidia,tegra114-host1x", "simple-bus";
+		reg = <0x50000000 0x00028000>;
+		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
+			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
+		clocks = <&tegra_car TEGRA114_CLK_HOST1X>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		ranges = <0x54000000 0x54000000 0x01000000>;
+
+		dc@54200000 {
+			compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc";
+			reg = <0x54200000 0x00040000>;
+			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&tegra_car TEGRA114_CLK_DISP1>,
+				 <&tegra_car TEGRA114_CLK_PLL_P>;
+			clock-names = "disp1", "parent";
+
+			rgb {
+				status = "disabled";
+			};
+		};
+
+		dc@54240000 {
+			compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc";
+			reg = <0x54240000 0x00040000>;
+			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&tegra_car TEGRA114_CLK_DISP2>,
+				 <&tegra_car TEGRA114_CLK_PLL_P>;
+			clock-names = "disp2", "parent";
+
+			rgb {
+				status = "disabled";
+			};
+		};
+
+		hdmi@54280000 {
+			compatible = "nvidia,tegra114-hdmi";
+			reg = <0x54280000 0x00040000>;
+			interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&tegra_car TEGRA114_CLK_HDMI>,
+				 <&tegra_car TEGRA114_CLK_PLL_D2_OUT0>;
+			clock-names = "hdmi", "parent";
+			status = "disabled";
+		};
+	};
+
 	gic: interrupt-controller {
 		compatible = "arm,cortex-a15-gic";
 		#interrupt-cells = <3>;
-- 
1.8.4

Re: [PATCH 4/9] ARM: tegra: Add host1x, DC and HDMI to Tegra114 device tree

[Stephen Warren]

On 10/07/2013 05:48 AM, Thierry Reding wrote:
> From: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> 
> Add host1x, DC (display controller) and HDMI devices to Tegra114
> device tree.

> diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi

> +		dc@54200000 {
> +			compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc";

Is the HW really 100% backwards-compatible, such that any driver that
only knew about the Tegra20 HW could work unmodified on Tegra114?
Perhaps that's possible, since your large driver patch doesn't seem to
have a patch to add Tegra114 DC support...

Re: [PATCH 4/9] ARM: tegra: Add host1x, DC and HDMI to Tegra114 device tree

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 941 bytes --]

On Mon, Oct 07, 2013 at 03:19:02PM -0600, Stephen Warren wrote:
> On 10/07/2013 05:48 AM, Thierry Reding wrote:
> > From: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> > 
> > Add host1x, DC (display controller) and HDMI devices to Tegra114
> > device tree.
> 
> > diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
> 
> > +		dc@54200000 {
> > +			compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc";
> 
> Is the HW really 100% backwards-compatible, such that any driver that
> only knew about the Tegra20 HW could work unmodified on Tegra114?
> Perhaps that's possible, since your large driver patch doesn't seem to
> have a patch to add Tegra114 DC support...

AFAIK the DC hasn't changed since Tegra20. Or at least not significantly
enough that it doesn't work with the generic driver. There might be more
features, but nothing backwards incompatible.

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

[PATCH 5/9] ARM: tegra: Add Tegra114 DSI support

[Thierry Reding]

Add device tree nodes for the DSI controllers found on Tegra114 SoCs.

Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra114.dtsi | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index 600196a..a79b44b 100644
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -63,6 +63,26 @@
 			clock-names = "hdmi", "parent";
 			status = "disabled";
 		};
+
+		dsi@54300000 {
+			compatible = "nvidia,tegra114-dsi";
+			reg = <0x54300000 0x00040000>;
+			clocks = <&tegra_car TEGRA114_CLK_DSIA>,
+				 <&tegra_car TEGRA114_CLK_PLL_D_OUT0>;
+			clock-names = "dsi", "parent";
+			calibrate = <&mipi TEGRA114_MIPI_DSIA>;
+			status = "disabled";
+		};
+
+		dsi@54400000 {
+			compatible = "nvidia,tegra114-dsi";
+			reg = <0x54400000 0x00040000>;
+			clocks = <&tegra_car TEGRA114_CLK_DSIB>,
+				 <&tegra_car TEGRA114_CLK_PLL_D2_OUT0>;
+			clock-names = "dsi", "parent";
+			calibrate = <&mipi TEGRA114_MIPI_DSIB>;
+			status = "disabled";
+		};
 	};
 
 	gic: interrupt-controller {
-- 
1.8.4

Re: [PATCH 5/9] ARM: tegra: Add Tegra114 DSI support

[Stephen Warren]

On 10/07/2013 05:48 AM, Thierry Reding wrote:
> Add device tree nodes for the DSI controllers found on Tegra114 SoCs.

Why not squash patches 3, 4, 5 together, since they're all just adding a
bunch of similar things to the same DT file?

Re: [PATCH 5/9] ARM: tegra: Add Tegra114 DSI support

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]

On Mon, Oct 07, 2013 at 03:21:06PM -0600, Stephen Warren wrote:
> On 10/07/2013 05:48 AM, Thierry Reding wrote:
> > Add device tree nodes for the DSI controllers found on Tegra114 SoCs.
> 
> Why not squash patches 3, 4, 5 together, since they're all just adding a
> bunch of similar things to the same DT file?

I did that mostly to mirror the the driver updates. And because the
patches actually come from different people and I wanted to preserve
authorship information.

But I can squash them if you still prefer.

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

[PATCH 6/9] ARM: tegra: Add Tegra114 gr2d support

[Thierry Reding]

Add the device tree for the gr2d hardware found on Tegra114 SoCs.

Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra114.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index a79b44b..570d26b 100644
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -28,6 +28,13 @@
 
 		ranges = <0x54000000 0x54000000 0x01000000>;
 
+		gr2d@54140000 {
+			compatible = "nvidia,tegra114-gr2d";
+			reg = <0x54140000 0x00040000>;
+			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&tegra_car TEGRA114_CLK_GR2D>;
+		};
+
 		dc@54200000 {
 			compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc";
 			reg = <0x54200000 0x00040000>;
-- 
1.8.4

[PATCH 7/9] ARM: tegra: Enable DSI support on Dalmore

[Thierry Reding]

Dalmore has a 10.1" WUXGA panel connected to one of the DSI outputs of
the Tegra114.

Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
Changes in v2:
- rename vdd-supply property to power-supply to comply with binding
---
 arch/arm/boot/dts/tegra114-dalmore.dts | 59 +++++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index 871aff5..d8e54ab 100644
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -11,6 +11,14 @@
 		reg = <0x80000000 0x40000000>;
 	};
 
+	host1x@50000000 {
+		dsi@54300000 {
+			status = "okay";
+
+			nvidia,panel = <&panel>;
+		};
+	};
+
 	pinmux {
 		pinctrl-names = "default";
 		pinctrl-0 = <&state_default>;
@@ -718,6 +726,10 @@
 		status = "okay";
 	};
 
+	pwm {
+		status = "okay";
+	};
+
 	i2c@7000c000 {
 		status = "okay";
 		clock-frequency = <100000>;
@@ -798,7 +810,7 @@
 					regulator-boot-on;
 				};
 
-				fet1 {
+				vdd_bl_reg: fet1 {
 					regulator-name = "vdd-lcd-bl";
 				};
 
@@ -806,7 +818,7 @@
 					regulator-name = "vdd-modem-3v3";
 				};
 
-				fet4 {
+				avdd_lcd_reg: fet4 {
 					regulator-name = "avdd-lcd";
 				};
 
@@ -1076,6 +1088,19 @@
 		vbus-supply = <&usb3_vbus_reg>;
 	};
 
+	backlight: backlight {
+		compatible = "pwm-backlight";
+
+		enable-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
+		power-supply = <&vdd_bl_reg>;
+		pwms = <&pwm 1 1000000>;
+
+		brightness-levels = <0 4 8 16 32 64 128 255>;
+		default-brightness-level = <6>;
+
+		backlight-boot-off;
+	};
+
 	clocks {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -1118,6 +1143,12 @@
 		};
 	};
 
+	panel: panel {
+		compatible = "panasonic,vvx10f004b00";
+		power-supply = <&avdd_lcd_reg>;
+		backlight = <&backlight>;
+	};
+
 	regulators {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -1142,19 +1173,9 @@
 			gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
 		};
 
-		lcd_bl_en_reg: regulator@2 {
+		usb1_vbus_reg: regulator@2 {
 			compatible = "regulator-fixed";
 			reg = <2>;
-			regulator-name = "lcd_bl_en";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			enable-active-high;
-			gpio = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
-		};
-
-		usb1_vbus_reg: regulator@3 {
-			compatible = "regulator-fixed";
-			reg = <3>;
 			regulator-name = "usb1_vbus";
 			regulator-min-microvolt = <5000000>;
 			regulator-max-microvolt = <5000000>;
@@ -1164,9 +1185,9 @@
 			vin-supply = <&tps65090_dcdc1_reg>;
 		};
 
-		usb3_vbus_reg: regulator@4 {
+		usb3_vbus_reg: regulator@3 {
 			compatible = "regulator-fixed";
-			reg = <4>;
+			reg = <3>;
 			regulator-name = "usb2_vbus";
 			regulator-min-microvolt = <5000000>;
 			regulator-max-microvolt = <5000000>;
@@ -1176,9 +1197,9 @@
 			vin-supply = <&tps65090_dcdc1_reg>;
 		};
 
-		vdd_hdmi_reg: regulator@5 {
+		vdd_hdmi_reg: regulator@4 {
 			compatible = "regulator-fixed";
-			reg = <5>;
+			reg = <4>;
 			regulator-name = "vdd_hdmi_5v0";
 			regulator-min-microvolt = <5000000>;
 			regulator-max-microvolt = <5000000>;
@@ -1187,9 +1208,9 @@
 			vin-supply = <&tps65090_dcdc1_reg>;
 		};
 
-		vdd_cam_1v8_reg: regulator@6 {
+		vdd_cam_1v8_reg: regulator@5 {
 			compatible = "regulator-fixed";
-			reg = <6>;
+			reg = <5>;
 			regulator-name = "vdd_cam_1v8_reg";
 			regulator-min-microvolt = <1800000>;
 			regulator-max-microvolt = <1800000>;
-- 
1.8.4

Re: [PATCH 7/9] ARM: tegra: Enable DSI support on Dalmore

[Stephen Warren]

On 10/07/2013 05:48 AM, Thierry Reding wrote:
> Dalmore has a 10.1" WUXGA panel connected to one of the DSI outputs of
> the Tegra114.

> diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts

> -		lcd_bl_en_reg: regulator@2 {
> +		usb1_vbus_reg: regulator@2 {
>  			compatible = "regulator-fixed";
>  			reg = <2>;
> -			regulator-name = "lcd_bl_en";
> -			regulator-min-microvolt = <5000000>;
> -			regulator-max-microvolt = <5000000>;
> -			enable-active-high;
> -			gpio = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
> -		};
> -
> -		usb1_vbus_reg: regulator@3 {
> -			compatible = "regulator-fixed";
> -			reg = <3>;
>  			regulator-name = "usb1_vbus";
>  			regulator-min-microvolt = <5000000>;
>  			regulator-max-microvolt = <5000000>;

Rather than renumbering all the regulators, can you just delete the one
regulator and leave a gap in the numbering? That'd make the diff a lot
smaller and clearer. There's no need for the reg values to be contiguous
here, so I don't think the renumbering is useful in-and-of-itself.

Re: [PATCH 7/9] ARM: tegra: Enable DSI support on Dalmore

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 1274 bytes --]

On Mon, Oct 07, 2013 at 03:25:52PM -0600, Stephen Warren wrote:
> On 10/07/2013 05:48 AM, Thierry Reding wrote:
> > Dalmore has a 10.1" WUXGA panel connected to one of the DSI outputs of
> > the Tegra114.
> 
> > diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
> 
> > -		lcd_bl_en_reg: regulator@2 {
> > +		usb1_vbus_reg: regulator@2 {
> >  			compatible = "regulator-fixed";
> >  			reg = <2>;
> > -			regulator-name = "lcd_bl_en";
> > -			regulator-min-microvolt = <5000000>;
> > -			regulator-max-microvolt = <5000000>;
> > -			enable-active-high;
> > -			gpio = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
> > -		};
> > -
> > -		usb1_vbus_reg: regulator@3 {
> > -			compatible = "regulator-fixed";
> > -			reg = <3>;
> >  			regulator-name = "usb1_vbus";
> >  			regulator-min-microvolt = <5000000>;
> >  			regulator-max-microvolt = <5000000>;
> 
> Rather than renumbering all the regulators, can you just delete the one
> regulator and leave a gap in the numbering? That'd make the diff a lot
> smaller and clearer. There's no need for the reg values to be contiguous
> here, so I don't think the renumbering is useful in-and-of-itself.

Okay, I've reverted the renumbering changes.

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

[PATCH 8/9] ARM: tegra: Enable HDMI support on Dalmore

[Thierry Reding]

From: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Add HDMI node to the Dalmore device tree and hook up the VDD and PLL
regulators as well as the I2C adapter used for DDC and the GPIO used
for hotplug detection.

Signed-off-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra114-dalmore.dts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index d8e54ab..2c33587 100644
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -12,6 +12,17 @@
 	};
 
 	host1x@50000000 {
+		hdmi@54280000 {
+			status = "okay";
+
+			vdd-supply = <&vdd_hdmi_reg>;
+			pll-supply = <&palmas_smps3_reg>;
+
+			nvidia,ddc-i2c-bus = <&hdmi_ddc>;
+			nvidia,hpd-gpio =
+				<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
+		};
+
 		dsi@54300000 {
 			status = "okay";
 
@@ -753,6 +764,10 @@
 		};
 	};
 
+	hdmi_ddc: i2c@7000c700 {
+		status = "okay";
+	};
+
 	i2c@7000d000 {
 		status = "okay";
 		clock-frequency = <400000>;
-- 
1.8.4

[PATCH 9/9] ARM: tegra: Enable DRM panel support

[Thierry Reding]

Enable DRM panel core support along with support for various simple
panels.

Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/configs/tegra_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index ec4f6e7..ad3bf02 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -163,6 +163,8 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_DRM=y
+CONFIG_DRM_PANEL=y
+CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_TEGRA_HOST1X=y
 CONFIG_DRM_TEGRA=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-- 
1.8.4

Re: [PATCH 0/9] ARM: tegra: Enable DSI and panel support

[Stephen Warren]

On 10/07/2013 05:48 AM, Thierry Reding wrote:
> This series enables DSI, HDMI and gr2d support on Dalmore as well as
> panel support for Cardhu and Harmony.
> 
> The DRM_PANEL and DRM_PANEL_SIMPLE Kconfig symbols enabled in patch 9
> are introduced by the following patch series:
> 
> 	[PATCH v2 00/27] drm/tegra: Repatriation and DSI support
> 
> Perhaps a good solution would be to postpone applying patch 9 until
> after 3.13-rc1, so that the symbols are there when the above series
> has gone in during the merge window.

I think it's fine to add those options to tegra_defconfig now; people
rebuilding the defconfig hopefully do it on top of linux-next rather
than the Tegra tree itself, and even if they don't, it's not too hard to
edit out the differences they don't want to post.