dts: txlx add multi dtb function [1/7]

PD#165131: dts: txlx add multi dtb function

Change-Id: Iafdc84a887046d9d5117532468e6f4059481b85f
Signed-off-by: Lei Qian <lei.qian@amlogic.com>

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
index f50089f..33f92d2 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
@@ -25,7 +25,7 @@
 
 / {
        model = "Amlogic";
-       amlogic-dt-id = "txlx_t962x_r311";
+       amlogic-dt-id = "txlx_t962x_r311-1g";
        compatible = "amlogic, txlx";
        interrupt-parent = <&gic>;
        #address-cells = <2>;
@@ -54,6 +54,14 @@
                #size-cells = <2>;
                ranges;
                /* global autoconfigured region for contiguous allocations */
+               ramoops@0x07400000 {
+                       compatible = "ramoops";
+                       reg = <0x0 0x07400000 0x0 0x00100000>;
+                       record-size = <0x8000>;
+                       console-size = <0x8000>;
+                       ftrace-size = <0x0>;
+                       pmsg-size = <0x8000>;
+               };
                secmon_reserved:linux,secmon {
                        compatible = "shared-dma-pool";
                        reusable;
@@ -384,6 +392,7 @@
                        "fclk_div4",
                        "vpu_clkb_tmp_composite",
                        "vpu_clkb_composite";
+               clock-range = <250 500>;
                /* buffer-size = <3621952>;(yuv422 8bit) */
                buffer-size = <4179008>;/*yuv422 fullpack*/
                /* reserve-iomap = "true"; */
@@ -604,7 +613,7 @@
                dev_name = "bt-dev";
                status = "okay";
                power_down_disable = <1>;
-               gpio_reset = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
+               gpio_reset = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;
                //gpio_en = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;
        };
 
@@ -758,7 +767,7 @@
                compatible = "amlogic, unifykey";
                status = "okay";
 
-               unifykey-num = <16>;
+               unifykey-num = <19>;
                unifykey-index-0 = <&keysn_0>;
                unifykey-index-1 = <&keysn_1>;
                unifykey-index-2 = <&keysn_2>;
@@ -775,6 +784,9 @@
                unifykey-index-13 = <&keysn_13>;
                unifykey-index-14 = <&keysn_14>;
                unifykey-index-15 = <&keysn_15>;
+               unifykey-index-16 = <&keysn_16>;
+               unifykey-index-17 = <&keysn_17>;
+               unifykey-index-18 = <&keysn_18>;
 
                keysn_0: key_0{
                        key-name = "usid";
@@ -861,6 +873,21 @@
                        key-device = "secure";
                        key-permit = "read","write","del";
                };
+               keysn_16:key_16{
+                       key-name = "lcd";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
+               keysn_17:key_17{
+                       key-name = "lcd_extern";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
+               keysn_18:key_18{
+                       key-name = "backlight";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
        }; /* End unifykey */
 
        vdac {

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index c6d7540..d1f7e44 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -25,7 +25,7 @@
 
 / {
        model = "Amlogic";
-       amlogic-dt-id = "txlx_t962x_r311";
+       amlogic-dt-id = "txlx_t962x_r311-2g";
        compatible = "amlogic, txlx";
        interrupt-parent = <&gic>;
        #address-cells = <2>;

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
index 0b939d1..f1c1c17 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
@@ -25,7 +25,7 @@
 
 / {
        model = "Amlogic";
-       amlogic-dt-id = "txlx_t962x_r311";
+       amlogic-dt-id = "txlx_t962x_r311-720p";
        compatible = "amlogic, txlx";
        interrupt-parent = <&gic>;
        #address-cells = <2>;
@@ -54,6 +54,14 @@
                #size-cells = <2>;
                ranges;
                /* global autoconfigured region for contiguous allocations */
+               ramoops@0x07400000 {
+                       compatible = "ramoops";
+                       reg = <0x0 0x07400000 0x0 0x00100000>;
+                       record-size = <0x8000>;
+                       console-size = <0x8000>;
+                       ftrace-size = <0x0>;
+                       pmsg-size = <0x8000>;
+               };
                secmon_reserved:linux,secmon {
                        compatible = "shared-dma-pool";
                        reusable;
@@ -240,12 +248,12 @@
                interrupts = <0 3 1
                        0 89 1>;
                interrupt-names = "viu-vsync", "rdma";
-               mem_size = <0x00400000 0x00800000 0x00100000>;
+               mem_size = <0x00400000 0x00b00000 0x00100000>;
                /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x0b51000*/
                display_mode_default = "720p60hz";
                scale_mode = <1>;
-               /*1280*720*4*2 = 0xA8C000*/
-               display_size_default = <1280 720 1280 1440 32>;
+               /*1280*720*4*3 = 0xA8C000*/
+               display_size_default = <1280 720 1280 2160 32>;
                pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
                logo_addr = "0x3fc00000";
        };
@@ -603,6 +611,7 @@
                compatible = "amlogic, bt-dev";
                dev_name = "bt-dev";
                status = "okay";
+               power_down_disable = <1>;
                gpio_reset = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;
                //gpio_en = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;
        };
@@ -681,7 +690,6 @@
                        caps2 = "MMC_CAP2_HS200", "MMC_CAP2_HS400";
                        f_min = <400000>;
                        f_max = <200000000>;
-                       tx_delay = <6>;
                        max_req_size = <0x20000>; /**128KB*/
                        gpio_dat3 = <&gpio BOOT_3 GPIO_ACTIVE_HIGH>;
                        hw_reset = <&gpio BOOT_9 GPIO_ACTIVE_HIGH>;
@@ -758,7 +766,7 @@
                compatible = "amlogic, unifykey";
                status = "okay";
 
-               unifykey-num = <16>;
+               unifykey-num = <19>;
                unifykey-index-0 = <&keysn_0>;
                unifykey-index-1 = <&keysn_1>;
                unifykey-index-2 = <&keysn_2>;
@@ -775,6 +783,9 @@
                unifykey-index-13 = <&keysn_13>;
                unifykey-index-14 = <&keysn_14>;
                unifykey-index-15 = <&keysn_15>;
+               unifykey-index-16 = <&keysn_16>;
+               unifykey-index-17 = <&keysn_17>;
+               unifykey-index-18 = <&keysn_18>;
 
                keysn_0: key_0{
                        key-name = "usid";
@@ -861,6 +872,21 @@
                        key-device = "secure";
                        key-permit = "read","write","del";
                };
+               keysn_16:key_16{
+                       key-name = "lcd";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
+               keysn_17:key_17{
+                       key-name = "lcd_extern";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
+               keysn_18:key_18{
+                       key-name = "backlight";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
        }; /* End unifykey */
 
        vdac {