author | pengcheng chen <pengcheng.chen@amlogic.com> | 2018-04-19 06:59:39 (GMT) |
---|---|---|
committer | Xindong Xu <xindong.xu@amlogic.com> | 2018-05-02 02:04:47 (GMT) |
commit | 0dc9afb5314baf71b19c7e84f7d74eef5f92711a (patch) | |
tree | 412b1c04b04fad93cca36ed2b577bf0d8bdf2848 | |
parent | 8ad3df01d2cffa98310051d98add3f7b9cf25fd2 (diff) | |
download | common-0dc9afb5314baf71b19c7e84f7d74eef5f92711a.zip common-0dc9afb5314baf71b19c7e84f7d74eef5f92711a.tar.gz common-0dc9afb5314baf71b19c7e84f7d74eef5f92711a.tar.bz2 |
osd: optimize osd dts
PD#164824: osd: optimize osd dts
Change-Id: I7cc372a4124b136bf999a73888ba6fd5671e9b5f
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
-rw-r--r-- | arch/arm64/boot/dts/amlogic/g12a_pxp.dts | 32 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts | 32 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts | 36 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts | 32 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts | 32 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts | 32 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/g12a_s905d2_u220.dts | 32 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts | 32 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts | 32 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/mesong12a.dtsi | 18 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/mesong12a_drm.dtsi | 7 |
11 files changed, 105 insertions, 212 deletions
diff --git a/arch/arm64/boot/dts/amlogic/g12a_pxp.dts b/arch/arm64/boot/dts/amlogic/g12a_pxp.dts index 42e7fff..2e0cbc1 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_pxp.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_pxp.dts @@ -200,29 +200,6 @@ tv_mode = <0>;/*1:enabel ;0:disable*/ }; - meson-fb { - compatible = "amlogic, meson-g12a"; - memory-region = <&logo_reserved>; - dev_name = "meson-fb"; - status = "okay"; - interrupts = <0 3 1 - 0 56 1 - 0 89 1>; - interrupt-names = "viu-vsync", "viu2-vsync", "rdma"; - mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; - /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/ - display_mode_default = "1080p60hz"; - scale_mode = <1>; - /** 0:VPU free scale 1:OSD free scale 2:OSD super scale */ - display_size_default = <1920 1080 1920 2160 32>; - /*1920*1080*4*3 = 0x17BB000*/ - pxp_mode = <1>; /** 0:normal mode 1:pxp mode */ - mem_alloc = <1>; - logo_addr = "0x3f800000"; - clocks = <&clkc CLKID_VPU_CLKC_MUX>; - clock-names = "vpu_clkc"; - }; - /* Audio Related start */ pdm_codec:dummy{ @@ -421,6 +398,15 @@ }; /* end of / */ +&meson_fb { + status = "okay"; + display_size_default = <1920 1080 1920 2160 32>; + mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; + logo_addr = "0x7f800000"; + mem_alloc = <1>; + pxp_mode = <1>; /** 0:normal mode 1:pxp mode */ +}; + &pwm_AO_cd { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts index f26cce2..86fb8a3 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts @@ -393,29 +393,6 @@ tv_mode = <0>;/*1:enabel ;0:disable*/ }; - meson-fb { - compatible = "amlogic, meson-g12a"; - memory-region = <&logo_reserved>; - dev_name = "meson-fb"; - status = "okay"; - interrupts = <0 3 1 - 0 56 1 - 0 89 1>; - interrupt-names = "viu-vsync", "viu2-vsync", "rdma"; - mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; - /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/ - display_mode_default = "1080p60hz"; - scale_mode = <1>; - /** 0:VPU free scale 1:OSD free scale 2:OSD super scale */ - display_size_default = <1920 1080 1920 2160 32>; - /*1920*1080*4*3 = 0x17BB000*/ - pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ - mem_alloc = <0>; - logo_addr = "0x3f800000"; - clocks = <&clkc CLKID_VPU_CLKC_MUX>; - clock-names = "vpu_clkc"; - }; - /* Audio Related start */ pdm_codec:dummy{ #sound-dai-cells = <0>; @@ -697,6 +674,15 @@ }; /* end of / */ +&meson_fb { + status = "okay"; + display_size_default = <1920 1080 1920 2160 32>; + mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; + logo_addr = "0x7f800000"; + mem_alloc = <0>; + pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ +}; + &pwm_AO_cd { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts index 3ce6ba5..579c798 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts @@ -394,29 +394,6 @@ tv_mode = <0>;/*1:enabel ;0:disable*/ }; - meson-fb { - compatible = "amlogic, meson-g12a"; - memory-region = <&logo_reserved>; - dev_name = "meson-fb"; - status = "disable"; - interrupts = <0 3 1 - 0 56 1 - 0 89 1>; - interrupt-names = "viu-vsync", "viu2-vsync", "rdma"; - mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; - /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/ - display_mode_default = "1080p60hz"; - scale_mode = <1>; - /** 0:VPU free scale 1:OSD free scale 2:OSD super scale */ - display_size_default = <1920 1080 1920 2160 32>; - /*1920*1080*4*3 = 0x17BB000*/ - pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ - mem_alloc = <0>; - logo_addr = "0x3f800000"; - clocks = <&clkc CLKID_VPU_CLKC_MUX>; - clock-names = "vpu_clkc"; - }; - /* Audio Related start */ pdm_codec:dummy{ #sound-dai-cells = <0>; @@ -646,6 +623,15 @@ }; /* end of / */ +&meson_fb { + status = "okay"; + display_size_default = <1920 1080 1920 2160 32>; + mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; + logo_addr = "0x7f800000"; + mem_alloc = <1>; + pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ +}; + &drm_vpu { status = "okay"; }; @@ -658,10 +644,6 @@ status = "okay"; }; -&pwm_AO_cd { - status = "okay"; -}; - &i2c0 { status = "okay"; pinctrl-names="default"; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts index 73355c0..c554e76 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts @@ -419,29 +419,6 @@ tv_mode = <0>;/*1:enabel ;0:disable*/ }; - meson-fb { - compatible = "amlogic, meson-g12a"; - memory-region = <&logo_reserved>; - dev_name = "meson-fb"; - status = "okay"; - interrupts = <0 3 1 - 0 56 1 - 0 89 1>; - interrupt-names = "viu-vsync", "viu2-vsync", "rdma"; - mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; - /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/ - display_mode_default = "1080p60hz"; - scale_mode = <1>; - /** 0:VPU free scale 1:OSD free scale 2:OSD super scale */ - display_size_default = <1920 1080 1920 2160 32>; - /*1920*1080*4*3 = 0x17BB000*/ - pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ - mem_alloc = <0>; - logo_addr = "0x3f800000"; - clocks = <&clkc CLKID_VPU_CLKC_MUX>; - clock-names = "vpu_clkc"; - }; - /* Audio Related start */ pdm_codec:dummy{ #sound-dai-cells = <0>; @@ -723,6 +700,15 @@ }; /* end of / */ +&meson_fb { + status = "okay"; + display_size_default = <1920 1080 1920 2160 32>; + mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; + logo_addr = "0x7f800000"; + mem_alloc = <0>; + pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ +}; + &pwm_AO_cd { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts index e42d33f..8f4c552 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts @@ -500,29 +500,6 @@ tv_mode = <0>;/*1:enabel ;0:disable*/ }; - meson-fb { - compatible = "amlogic, meson-g12a"; - /*memory-region = <&logo_reserved>;*/ - dev_name = "meson-fb"; - status = "okay"; - interrupts = <0 3 1 - 0 56 1 - 0 89 1>; - interrupt-names = "viu-vsync", "viu2-vsync", "rdma"; - mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; - /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/ - display_mode_default = "1080p60hz"; - scale_mode = <1>; - /** 0:VPU free scale 1:OSD free scale 2:OSD super scale */ - display_size_default = <1920 1080 1920 2160 32>; - /*1920*1080*4*3 = 0x17BB000*/ - pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ - mem_alloc = <1>; - logo_addr = "0x3f800000"; - clocks = <&clkc CLKID_VPU_CLKC_MUX>; - clock-names = "vpu_clkc"; - }; - /* Audio Related start */ pdm_codec:dummy{ #sound-dai-cells = <0>; @@ -804,6 +781,15 @@ }; /* end of / */ +&meson_fb { + status = "okay"; + display_size_default = <1920 1080 1920 2160 32>; + mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; + logo_addr = "0x7f800000"; + mem_alloc = <1>; + pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ +}; + &pwm_AO_cd { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts index 8fba27b..0896a5c 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts @@ -501,29 +501,6 @@ tv_mode = <0>;/*1:enabel ;0:disable*/ }; - meson-fb { - compatible = "amlogic, meson-g12a"; - /*memory-region = <&logo_reserved>;*/ - dev_name = "meson-fb"; - status = "disable"; - interrupts = <0 3 1 - 0 56 1 - 0 89 1>; - interrupt-names = "viu-vsync", "viu2-vsync", "rdma"; - mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; - /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/ - display_mode_default = "1080p60hz"; - scale_mode = <1>; - /** 0:VPU free scale 1:OSD free scale 2:OSD super scale */ - display_size_default = <1920 1080 1920 2160 32>; - /*1920*1080*4*3 = 0x17BB000*/ - pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ - mem_alloc = <1>; - logo_addr = "0x3f800000"; - clocks = <&clkc CLKID_VPU_CLKC_MUX>; - clock-names = "vpu_clkc"; - }; - /* Audio Related start */ pdm_codec:dummy{ #sound-dai-cells = <0>; @@ -805,6 +782,15 @@ }; /* end of / */ +&meson_fb { + status = "disable"; + display_size_default = <1920 1080 1920 2160 32>; + mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; + logo_addr = "0x7f800000"; + mem_alloc = <1>; + pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ +}; + &drm_vpu { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u220.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u220.dts index 07a1053..f826cb4 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u220.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u220.dts @@ -419,29 +419,6 @@ tv_mode = <0>;/*1:enabel ;0:disable*/ }; - meson-fb { - compatible = "amlogic, meson-g12a"; - memory-region = <&logo_reserved>; - dev_name = "meson-fb"; - status = "okay"; - interrupts = <0 3 1 - 0 56 1 - 0 89 1>; - interrupt-names = "viu-vsync", "viu2-vsync", "rdma"; - mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; - /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/ - display_mode_default = "1080p60hz"; - scale_mode = <1>; - /** 0:VPU free scale 1:OSD free scale 2:OSD super scale */ - display_size_default = <1920 1080 1920 2160 32>; - /*1920*1080*4*3 = 0x17BB000*/ - pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ - mem_alloc = <0>; - logo_addr = "0x3f800000"; - clocks = <&clkc CLKID_VPU_CLKC_MUX>; - clock-names = "vpu_clkc"; - }; - /* Audio Related start */ pdm_codec:dummy{ #sound-dai-cells = <0>; @@ -723,6 +700,15 @@ }; /* end of / */ +&meson_fb { + status = "okay"; + display_size_default = <1920 1080 1920 2160 32>; + mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; + logo_addr = "0x7f800000"; + mem_alloc = <0>; + pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ +}; + &pwm_AO_cd { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts index 8fe99a1..f5eb96f 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts @@ -433,29 +433,6 @@ tv_mode = <0>;/*1:enabel ;0:disable*/ }; - meson-fb { - compatible = "amlogic, meson-g12a"; - memory-region = <&logo_reserved>; - dev_name = "meson-fb"; - status = "okay"; - interrupts = <0 3 1 - 0 56 1 - 0 89 1>; - interrupt-names = "viu-vsync", "viu2-vsync", "rdma"; - mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; - /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/ - display_mode_default = "1080p60hz"; - scale_mode = <1>; - /** 0:VPU free scale 1:OSD free scale 2:OSD super scale */ - display_size_default = <1920 1080 1920 2160 32>; - /*1920*1080*4*3 = 0x17BB000*/ - pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ - mem_alloc = <0>; - logo_addr = "0x3f800000"; - clocks = <&clkc CLKID_VPU_CLKC_MUX>; - clock-names = "vpu_clkc"; - }; - /* Audio Related start */ pdm_codec:dummy{ #sound-dai-cells = <0>; @@ -737,6 +714,15 @@ }; /* end of / */ +&meson_fb { + status = "okay"; + display_size_default = <1920 1080 1920 2160 32>; + mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; + logo_addr = "0x7f800000"; + mem_alloc = <0>; + pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ +}; + &pwm_AO_cd { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts index a693317..a7f27f6 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts @@ -393,29 +393,6 @@ tv_mode = <0>;/*1:enabel ;0:disable*/ }; - meson-fb { - compatible = "amlogic, meson-g12a"; - memory-region = <&logo_reserved>; - dev_name = "meson-fb"; - status = "okay"; - interrupts = <0 3 1 - 0 56 1 - 0 89 1>; - interrupt-names = "viu-vsync", "viu2-vsync", "rdma"; - mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; - /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/ - display_mode_default = "1080p60hz"; - scale_mode = <1>; - /** 0:VPU free scale 1:OSD free scale 2:OSD super scale */ - display_size_default = <1920 1080 1920 2160 32>; - /*1920*1080*4*3 = 0x17BB000*/ - pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ - mem_alloc = <0>; - logo_addr = "0x3f800000"; - clocks = <&clkc CLKID_VPU_CLKC_MUX>; - clock-names = "vpu_clkc"; - }; - /* Audio Related start */ pdm_codec:dummy{ #sound-dai-cells = <0>; @@ -697,6 +674,15 @@ }; /* end of / */ +&meson_fb { + status = "okay"; + display_size_default = <1920 1080 1920 2160 32>; + mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; + logo_addr = "0x7f800000"; + mem_alloc = <0>; + pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ +}; + &pwm_AO_cd { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi index 3365a23..8b400cd 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi @@ -1268,6 +1268,24 @@ interrupt-names = "rdma"; }; + meson_fb: meson-fb { + compatible = "amlogic, meson-g12a"; + memory-region = <&logo_reserved>; + dev_name = "meson-fb"; + status = "disable"; + interrupts = <0 3 1 + 0 56 1 + 0 89 1>; + interrupt-names = "viu-vsync", "viu2-vsync", "rdma"; + /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/ + display_mode_default = "1080p60hz"; + scale_mode = <1>; + /** 0:VPU free scale 1:OSD free scale 2:OSD super scale */ + display_size_default = <1920 1080 1920 2160 32>; + /*1920*1080*4*3 = 0x17BB000*/ + clocks = <&clkc CLKID_VPU_CLKC_MUX>; + clock-names = "vpu_clkc"; + }; irblaster: meson-irblaster { compatible = "amlogic, meson_irblaster"; dev_name = "meson-irblaster"; diff --git a/arch/arm64/boot/dts/amlogic/mesong12a_drm.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a_drm.dtsi index ffe517a..6905763 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12a_drm.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12a_drm.dtsi @@ -74,11 +74,16 @@ drm_vpu: drm-vpu@0xff900000 { status = "disabled"; compatible = "amlogic,meson-g12a-vpu"; + memory-region = <&logo_reserved>; reg = <0x0 0xff900000 0x0 0x40000>, <0x0 0xff63c000 0x0 0x2000>, <0x0 0xff638000 0x0 0x2000>; reg-names = "base", "hhi", "dmc"; - interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>; + interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 56 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "viu-vsync", "viu2-vsync"; + clocks = <&clkc CLKID_VPU_CLKC_MUX>; + clock-names = "vpu_clkc"; dma-coherent; vpu_out: port { #address-cells = <1>; |