* [PATCH 1/4] ARM: dts: move hdmi pinctrl out of board file.
@ 2017-01-04 13:34 Srinivas Kandagatla
2017-01-04 13:34 ` [PATCH 2/4] ARM: dts: sd-600eval: add hdmi support Srinivas Kandagatla
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Srinivas Kandagatla @ 2017-01-04 13:34 UTC (permalink / raw)
To: linux-arm-kernel
This patch moves hdmi pinctrl defination from board file to soc level
pinctrl file. If not this pinctrl setup will be duplicated across all
the apq8064 based board files.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 22 ----------------------
arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 19 +++++++++++++++++++
arch/arm/boot/dts/qcom-apq8064.dtsi | 2 ++
3 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
index 3d37cab..881ce70 100644
--- a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
@@ -75,25 +75,6 @@
bias-disable;
};
};
-
- hdmi_pinctrl: hdmi-pinctrl {
- mux {
- pins = "gpio70", "gpio71", "gpio72";
- function = "hdmi";
- };
-
- pinconf_ddc {
- pins = "gpio70", "gpio71";
- bias-pull-up;
- drive-strength = <2>;
- };
-
- pinconf_hpd {
- pins = "gpio72";
- bias-pull-down;
- drive-strength = <16>;
- };
- };
};
rpm at 108000 {
@@ -368,9 +349,6 @@
hpd-gpios = <&tlmm_pinmux 72 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <&hdmi_pinctrl>;
-
ports {
port at 0 {
endpoint {
diff --git a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
index 6b801e7..cba4450 100644
--- a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
@@ -284,4 +284,23 @@
bias-disable = <0>;
};
};
+
+ hdmi_pinctrl: hdmi-pinctrl {
+ mux {
+ pins = "gpio70", "gpio71", "gpio72";
+ function = "hdmi";
+ };
+
+ pinconf_ddc {
+ pins = "gpio70", "gpio71";
+ bias-pull-up;
+ drive-strength = <2>;
+ };
+
+ pinconf_hpd {
+ pins = "gpio72";
+ bias-pull-down;
+ drive-strength = <16>;
+ };
+ };
};
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 407a461..e68a8a1 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -1327,6 +1327,8 @@
hdmi: hdmi-tx at 4a00000 {
compatible = "qcom,hdmi-tx-8960";
+ pinctrl-names = "default";
+ pinctrl-0 = <&hdmi_pinctrl>;
reg = <0x04a00000 0x2f0>;
reg-names = "core_physical";
interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
--
2.10.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] ARM: dts: sd-600eval: add hdmi support
2017-01-04 13:34 [PATCH 1/4] ARM: dts: move hdmi pinctrl out of board file Srinivas Kandagatla
@ 2017-01-04 13:34 ` Srinivas Kandagatla
2017-01-09 8:52 ` Archit Taneja
2017-01-04 13:34 ` [PATCH 3/4] ARM: dts: sd-600eval: enable 1.8v regulator on LS expansion Srinivas Kandagatla
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Srinivas Kandagatla @ 2017-01-04 13:34 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
.../arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts | 44 ++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts b/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
index 39ae2bc..4e908af 100644
--- a/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
@@ -39,6 +39,17 @@
};
+ hdmi-out {
+ compatible = "hdmi-connector";
+ type = "a";
+
+ port {
+ hdmi_con: endpoint {
+ remote-endpoint = <&hdmi_out>;
+ };
+ };
+ };
+
soc {
rpm at 108000 {
regulators {
@@ -347,5 +358,38 @@
cd-gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_HIGH>;
};
};
+
+ hdmi-tx at 4a00000 {
+ status = "okay";
+ core-vdda-supply = <&pm8921_hdmi_switch>;
+ hdmi-mux-supply = <&vcc3v3>;
+
+ hpd-gpio = <&tlmm_pinmux 72 GPIO_ACTIVE_HIGH>;
+
+ ports {
+ port at 1 {
+ endpoint {
+ remote-endpoint = <&hdmi_con>;
+ };
+ };
+ };
+ };
+
+ hdmi-phy at 4a00400 {
+ status = "okay";
+ core-vdda-supply = <&pm8921_hdmi_switch>;
+ };
+
+ mdp at 5100000 {
+ status = "okay";
+
+ ports {
+ port at 3 {
+ endpoint {
+ remote-endpoint = <&hdmi_in>;
+ };
+ };
+ };
+ };
};
};
--
2.10.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] ARM: dts: sd-600eval: enable 1.8v regulator on LS expansion
2017-01-04 13:34 [PATCH 1/4] ARM: dts: move hdmi pinctrl out of board file Srinivas Kandagatla
2017-01-04 13:34 ` [PATCH 2/4] ARM: dts: sd-600eval: add hdmi support Srinivas Kandagatla
@ 2017-01-04 13:34 ` Srinivas Kandagatla
2017-01-04 13:34 ` [PATCH 4/4] ARM: dts: apq8064: Add ADM configuration node Srinivas Kandagatla
2017-01-09 8:52 ` [PATCH 1/4] ARM: dts: move hdmi pinctrl out of board file Archit Taneja
3 siblings, 0 replies; 6+ messages in thread
From: Srinivas Kandagatla @ 2017-01-04 13:34 UTC (permalink / raw)
To: linux-arm-kernel
This patch enables 1.8v regulator on LS expansion, which should be
always on according to 96boards spec.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts b/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
index 4e908af..40f7168 100644
--- a/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
@@ -132,6 +132,16 @@
bias-pull-down;
};
+ /**
+ * 1.8v required on LS expansion
+ * for mezzanine boards
+ */
+ l15 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-always-on;
+ };
+
l23 {
regulator-min-microvolt = <1700000>;
regulator-max-microvolt = <1900000>;
--
2.10.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] ARM: dts: apq8064: Add ADM configuration node
2017-01-04 13:34 [PATCH 1/4] ARM: dts: move hdmi pinctrl out of board file Srinivas Kandagatla
2017-01-04 13:34 ` [PATCH 2/4] ARM: dts: sd-600eval: add hdmi support Srinivas Kandagatla
2017-01-04 13:34 ` [PATCH 3/4] ARM: dts: sd-600eval: enable 1.8v regulator on LS expansion Srinivas Kandagatla
@ 2017-01-04 13:34 ` Srinivas Kandagatla
2017-01-09 8:52 ` [PATCH 1/4] ARM: dts: move hdmi pinctrl out of board file Archit Taneja
3 siblings, 0 replies; 6+ messages in thread
From: Srinivas Kandagatla @ 2017-01-04 13:34 UTC (permalink / raw)
To: linux-arm-kernel
From: "Ivan T. Ivanov" <ivan.ivanov@linaro.org>
Add Application Data Mover (DMA) device node.
Connect GSBI6 UARTDM RX and TX channels to it.
Signed-off-by: Ivan T. Ivanov <ivan.ivanov@linaro.org>
---
arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 4 ++++
arch/arm/boot/dts/qcom-apq8064.dtsi | 28 ++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
index 881ce70..eec67cd 100644
--- a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
@@ -234,6 +234,10 @@
};
};
+ adm: dma at 18320000 {
+ status = "okay";
+ };
+
sata_phy0: phy at 1b400000 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index e68a8a1..8a7c325 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -564,6 +564,7 @@
#address-cells = <1>;
#size-cells = <1>;
ranges;
+ syscon-tcsr = <&tcsr>;
gsbi6_serial: serial at 16540000 {
compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
@@ -572,6 +573,13 @@
interrupts = <0 156 0x0>;
clocks = <&gcc GSBI6_UART_CLK>, <&gcc GSBI6_H_CLK>;
clock-names = "core", "iface";
+
+ qcom,rx-crci = <11>;
+ qcom,tx-crci = <6>;
+
+ dmas = <&adm 6>, <&adm 7>;
+ dma-names = "rx", "tx";
+
status = "disabled";
};
@@ -1059,6 +1067,26 @@
};
};
+ adm: dma at 18320000 {
+ compatible = "qcom,adm";
+ reg = <0x18320000 0xE0000>;
+ interrupts = <GIC_SPI 171 IRQ_TYPE_NONE>;
+ #dma-cells = <1>;
+
+ clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>;
+ clock-names = "core", "iface";
+
+ resets = <&gcc ADM0_RESET>,
+ <&gcc ADM0_PBUS_RESET>,
+ <&gcc ADM0_C0_RESET>,
+ <&gcc ADM0_C1_RESET>,
+ <&gcc ADM0_C2_RESET>;
+ reset-names = "clk", "pbus", "c0", "c1", "c2";
+ qcom,ee = <1>;
+
+ status = "disabled";
+ };
+
tcsr: syscon at 1a400000 {
compatible = "qcom,tcsr-apq8064", "syscon";
reg = <0x1a400000 0x100>;
--
2.10.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/4] ARM: dts: move hdmi pinctrl out of board file.
2017-01-04 13:34 [PATCH 1/4] ARM: dts: move hdmi pinctrl out of board file Srinivas Kandagatla
` (2 preceding siblings ...)
2017-01-04 13:34 ` [PATCH 4/4] ARM: dts: apq8064: Add ADM configuration node Srinivas Kandagatla
@ 2017-01-09 8:52 ` Archit Taneja
3 siblings, 0 replies; 6+ messages in thread
From: Archit Taneja @ 2017-01-09 8:52 UTC (permalink / raw)
To: linux-arm-kernel
On 01/04/2017 07:04 PM, Srinivas Kandagatla wrote:
> This patch moves hdmi pinctrl defination from board file to soc level
> pinctrl file. If not this pinctrl setup will be duplicated across all
> the apq8064 based board files.
Reviewed-by: Archit Taneja <architt@codeaurora.org>
>
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> ---
> arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 22 ----------------------
> arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 19 +++++++++++++++++++
> arch/arm/boot/dts/qcom-apq8064.dtsi | 2 ++
> 3 files changed, 21 insertions(+), 22 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
> index 3d37cab..881ce70 100644
> --- a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
> +++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
> @@ -75,25 +75,6 @@
> bias-disable;
> };
> };
> -
> - hdmi_pinctrl: hdmi-pinctrl {
> - mux {
> - pins = "gpio70", "gpio71", "gpio72";
> - function = "hdmi";
> - };
> -
> - pinconf_ddc {
> - pins = "gpio70", "gpio71";
> - bias-pull-up;
> - drive-strength = <2>;
> - };
> -
> - pinconf_hpd {
> - pins = "gpio72";
> - bias-pull-down;
> - drive-strength = <16>;
> - };
> - };
> };
>
> rpm at 108000 {
> @@ -368,9 +349,6 @@
>
> hpd-gpios = <&tlmm_pinmux 72 GPIO_ACTIVE_HIGH>;
>
> - pinctrl-names = "default";
> - pinctrl-0 = <&hdmi_pinctrl>;
> -
> ports {
> port at 0 {
> endpoint {
> diff --git a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
> index 6b801e7..cba4450 100644
> --- a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
> +++ b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
> @@ -284,4 +284,23 @@
> bias-disable = <0>;
> };
> };
> +
> + hdmi_pinctrl: hdmi-pinctrl {
> + mux {
> + pins = "gpio70", "gpio71", "gpio72";
> + function = "hdmi";
> + };
> +
> + pinconf_ddc {
> + pins = "gpio70", "gpio71";
> + bias-pull-up;
> + drive-strength = <2>;
> + };
> +
> + pinconf_hpd {
> + pins = "gpio72";
> + bias-pull-down;
> + drive-strength = <16>;
> + };
> + };
> };
> diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
> index 407a461..e68a8a1 100644
> --- a/arch/arm/boot/dts/qcom-apq8064.dtsi
> +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
> @@ -1327,6 +1327,8 @@
>
> hdmi: hdmi-tx at 4a00000 {
> compatible = "qcom,hdmi-tx-8960";
> + pinctrl-names = "default";
> + pinctrl-0 = <&hdmi_pinctrl>;
> reg = <0x04a00000 0x2f0>;
> reg-names = "core_physical";
> interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
>
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/4] ARM: dts: sd-600eval: add hdmi support
2017-01-04 13:34 ` [PATCH 2/4] ARM: dts: sd-600eval: add hdmi support Srinivas Kandagatla
@ 2017-01-09 8:52 ` Archit Taneja
0 siblings, 0 replies; 6+ messages in thread
From: Archit Taneja @ 2017-01-09 8:52 UTC (permalink / raw)
To: linux-arm-kernel
On 01/04/2017 07:04 PM, Srinivas Kandagatla wrote:
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Archit Taneja <architt@codeaurora.org>
> ---
> .../arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts | 44 ++++++++++++++++++++++
> 1 file changed, 44 insertions(+)
>
> diff --git a/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts b/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
> index 39ae2bc..4e908af 100644
> --- a/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
> +++ b/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
> @@ -39,6 +39,17 @@
>
> };
>
> + hdmi-out {
> + compatible = "hdmi-connector";
> + type = "a";
> +
> + port {
> + hdmi_con: endpoint {
> + remote-endpoint = <&hdmi_out>;
> + };
> + };
> + };
> +
> soc {
> rpm at 108000 {
> regulators {
> @@ -347,5 +358,38 @@
> cd-gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_HIGH>;
> };
> };
> +
> + hdmi-tx at 4a00000 {
> + status = "okay";
> + core-vdda-supply = <&pm8921_hdmi_switch>;
> + hdmi-mux-supply = <&vcc3v3>;
> +
> + hpd-gpio = <&tlmm_pinmux 72 GPIO_ACTIVE_HIGH>;
> +
> + ports {
> + port at 1 {
> + endpoint {
> + remote-endpoint = <&hdmi_con>;
> + };
> + };
> + };
> + };
> +
> + hdmi-phy at 4a00400 {
> + status = "okay";
> + core-vdda-supply = <&pm8921_hdmi_switch>;
> + };
> +
> + mdp at 5100000 {
> + status = "okay";
> +
> + ports {
> + port at 3 {
> + endpoint {
> + remote-endpoint = <&hdmi_in>;
> + };
> + };
> + };
> + };
> };
> };
>
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-01-09 8:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-04 13:34 [PATCH 1/4] ARM: dts: move hdmi pinctrl out of board file Srinivas Kandagatla
2017-01-04 13:34 ` [PATCH 2/4] ARM: dts: sd-600eval: add hdmi support Srinivas Kandagatla
2017-01-09 8:52 ` Archit Taneja
2017-01-04 13:34 ` [PATCH 3/4] ARM: dts: sd-600eval: enable 1.8v regulator on LS expansion Srinivas Kandagatla
2017-01-04 13:34 ` [PATCH 4/4] ARM: dts: apq8064: Add ADM configuration node Srinivas Kandagatla
2017-01-09 8:52 ` [PATCH 1/4] ARM: dts: move hdmi pinctrl out of board file Archit Taneja
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).