diff options
| author | Thierry Reding <treding@nvidia.com> | 2015-11-25 16:37:42 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2016-02-15 19:54:14 +0100 |
| commit | 9d9976b0f52584ddbf73da7c03acd8b32e0461b3 (patch) | |
| tree | a3404c20056baa801aa70855a53ba061a2eda53d | |
| parent | d2c065cf062d60b6c3bf50c7303a1de1b030282e (diff) | |
| download | linux-next-9d9976b0f52584ddbf73da7c03acd8b32e0461b3.tar.gz | |
WIP
| -rw-r--r-- | arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 9 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/nvidia/tegra210.dtsi | 17 | ||||
| -rw-r--r-- | drivers/gpu/drm/tegra/sor.c | 2 |
4 files changed, 23 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi index aaaf89c883d0..3de2b1b208b5 100644 --- a/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi @@ -79,12 +79,11 @@ pins = "gpio5", "gpio6", "gpio7"; function = "gpio"; drive-push-pull = <1>; - ; }; + }; - max77620_gpio_default: gpio_default { - gpio-output-high = <2>; - }; + max77620_gpio_default: gpio_default { + gpio-output-high = <2>; }; watchdog { @@ -134,7 +133,7 @@ regulator-boot-on; maxim,fps-source = <1>; regulator-init-mode = <2>; - ; + }; max77620_sd1: sd1 { regulator-name = "VDD_DDR_1V1_PMIC"; diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi index f59f15e17d8b..935902ac8c1d 100644 --- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi @@ -36,6 +36,7 @@ nvidia,ddc-i2c-bus = <&hdmi_ddc>; nvidia,hpd-gpio = <&gpio TEGRA_GPIO(CC, 1) GPIO_ACTIVE_LOW>; + nvidia,kfuse = <&kfuse>; }; }; diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/arch/arm64/boot/dts/nvidia/tegra210.dtsi index 5a0f5318f595..4172a2962bd1 100644 --- a/arch/arm64/boot/dts/nvidia/tegra210.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra210.dtsi @@ -99,6 +99,18 @@ resets = <&tegra_car 207>; reset-names = "dpaux"; status = "disabled"; + + state_dpaux1_i2c: pinmux_i2c { + nvidia,function = "i2c"; + }; + + state_dpaux1_aux: pinmux_aux { + nvidia,function = "aux"; + }; + + state_dpaux1_off: pinmux_off { + nvidia,function = "off"; + }; }; vi@0,54080000 { @@ -233,6 +245,11 @@ resets = <&tegra_car 183>; reset-names = "sor"; status = "disabled"; + + pinctrl-names = "i2c", "aux", "off"; + pinctrl-0 = <&state_dpaux1_i2c>; + pinctrl-1 = <&state_dpaux1_aux>; + pinctrl-2 = <&state_dpaux1_off>; }; dpaux: dpaux@0,545c0000 { diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 393b89d0e6bf..9ea1f4b9bbca 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -2852,7 +2852,7 @@ static void tegra_sor_hdmi_enable(struct drm_encoder *encoder) if (sor->output.ddc) tegra_sor_hdmi_scdc(sor); - if (0 && sor->kfuse) + if (sor->kfuse) tegra_sor_hdmi_hdcp(sor); return; |