hdmitx: bringup for g12b

PD#165090: hdmitx: bringup for g12b

1. update address of RESET0_REGISTER
2. open hdmitx function

Change-Id: I4878d25109058c67046003dc349572df2bb991a2
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>

diff --git a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
index c54da75789c3439976b45bd64a8f59e152f0d7ee..88bf0493c797e221b33b6ea339808960aad867df 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
@@ -265,7 +265,7 @@
        vpu {
                /*compatible = "amlogic, vpu-g12a";*/
                dev_name = "vpu";
-               status = "disabled";
+               status = "okay";
                clocks = <&clkc CLKID_VAPB_MUX>,
                        <&clkc CLKID_VPU_INTR>,
                        <&clkc CLKID_VPU_P0_COMP>,
@@ -1016,7 +1016,7 @@
        amhdmitx: amhdmitx{
                compatible = "amlogic, amhdmitx";
                dev_name = "amhdmitx";
-               status = "disabled";
+               status = "okay";
                vend-data = <&vend_data>;
                pinctrl-names="default", "hdmitx_i2c";
                pinctrl-0=<&hdmitx_hpd &hdmitx_ddc>;
@@ -1109,7 +1109,7 @@
        vout {
                compatible = "amlogic, vout";
                dev_name = "vout";
-               status = "disabled";
+               status = "okay";
        };
 
        vout2 {

diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/txlx_reg.h b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/txlx_reg.h
index c1107c34e8f38ba841a81e8b78cdf627ae70a166..6ce468fc6e9770cc3574b082f2a1acf72d635e3d 100644 (file)
--- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/txlx_reg.h
+++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/txlx_reg.h
@@ -19,9 +19,9 @@
 #define __TXLX_REG_H__
 #include "reg_ops.h"
 
-#define RESET0_REGISTER 0x1001
+#define RESET0_REGISTER 0x01
 #define P_RESET0_REGISTER RESET_CBUS_REG_ADDR(RESET0_REGISTER)
-#define RESET2_REGISTER 0x1003
+#define RESET2_REGISTER 0x03
 #define P_RESET2_REGISTER RESET_CBUS_REG_ADDR(RESET2_REGISTER)
 
 #define ISA_DEBUG_REG0 0x3c00