diff options
| author | Neil Armstrong <narmstrong@baylibre.com> | 2016-12-13 11:36:17 +0100 |
|---|---|---|
| committer | Neil Armstrong <narmstrong@baylibre.com> | 2016-12-13 11:36:17 +0100 |
| commit | db2c54de3976c584b540846f474cb455048dd543 (patch) | |
| tree | 40eaf7cccc5d61b5a75bd7564783891a7031916b | |
| parent | 063d9c13eb8ddd871d64ea2b75fae946b48125b7 (diff) | |
Fix hdmi regs, gpio and add hdmi resetsamlogic/v4.9/drm-hdmi-devamlogic/v4.9/drm
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 849c2b9b7767..e9758f8f826e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -382,9 +382,9 @@ }; }; - hdmi_tx: hdmi-tx@da83a000 { + hdmi_tx: hdmi-tx@c883a000 { compatible = "amlogic,meson-gx-dw-hdmi"; - reg = <0x0 0xda83a000 0x0 0x1c>; + reg = <0x0 0xc883a000 0x0 0x1c>; interrupts = <GIC_SPI 54 IRQ_TYPE_EDGE_RISING>; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi index 3cce62c42384..79989008adca 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi @@ -290,13 +290,15 @@ &cvbs_vdac_port { cvbs_vdac_out: endpoint { + /* remote-endpoint = <&cvbs_connector_in>; + */ }; }; &hdmi_tx { status = "okay"; - hpd-gpios = <&gpio GPIOH_0>; + hpd-gpios = <&gpio GPIOH_0 0>; ddc-i2c-bus = <&i2c_hdmi>; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index f2d9b0f47441..64874154205b 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -535,6 +535,10 @@ &hdmi_tx { compatible = "amlogic,meson-gxbb-dw-hdmi", "amlogic,meson-gx-dw-hdmi"; + resets = <&reset RESET_HDMITX_CAPB3>, + <&reset RESET_HDMI_SYSTEM_RESET>, + <&reset RESET_HDMI_TX>; + reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy"; hdp-gpios = <&gpio GPIOH_0 0>; ddc-i2c-bus = <&i2c_hdmi>; }; |