ARM64: dts: rk3368: add rk3368-sheep.dts for sheep board
authorJianqun Xu <jay.xu@rock-chips.com>
Tue, 14 Mar 2017 03:23:30 +0000 (11:23 +0800)
committerJianqun Xu <jay.xu@rock-chips.com>
Tue, 14 Mar 2017 08:06:12 +0000 (16:06 +0800)
rework for rk3368-tb.dtsi and rk3368-tb-sheep.dts, intergrate them
to rk3368-sheep.dts

Change-Id: Ieb9198be7c80a5c8c31b0a1990bac22079548eea
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
arch/arm64/boot/dts/rockchip/Makefile
arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
arch/arm64/boot/dts/rockchip/rk3368-sheep.dts [new file with mode: 0644]
arch/arm64/boot/dts/rockchip/rk3368-tb-sheep.dts [deleted file]
arch/arm64/boot/dts/rockchip/rk3368-tb.dtsi [deleted file]

index ddf5913782e231ffe14b17b0fb6368fe6cb46a6d..2ec03b77a63aa2490af02f631270c7e3b57b5746 100644 (file)
@@ -4,7 +4,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3366-tb.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-tb-sheep.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-sheep.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-box-808-android-6.0.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-box-rev1-android-6.0.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-box-rev1-disvr.dtb
index b2abf8b08e3175cce3b5cb5b56979068ae904b20..3e25c908a79bb027a9b1f1d7f32f9bfebf9e632c 100644 (file)
                status = "disabled";
        };
 
-       rga: rga@ff920000 {
+       rga@ff920000 {
                compatible = "rockchip,rga2";
                dev_mode = <1>;
                reg = <0x0 0xff920000 0x0 0x1000>;
                status = "disabled";
        };
 
-       fb: fb {
+       fb {
                compatible = "rockchip,rk-fb";
+               status = "okay";
+
                rockchip,disp-mode = <NO_DUAL>;
-               status = "disabled";
+               rockchip,uboot-logo-on = <0>;
+
        };
 
-       rk_screen: screen {
+       screen {
                compatible = "rockchip,screen";
-               status = "disabled";
+               status = "okay";
+
+               #include <dt-bindings/display/screen-timing/lcd-tv080wum-mipi.dtsi>
        };
 
        lcdc: lcdc@ff930000 {
                /*power-domains = <&power PD_VIO>;*/
                resets = <&cru SRST_LCDC0_AXI>, <&cru SRST_LCDC0_AHB>, <&cru SRST_LCDC0_DCLK>;
                reset-names = "axi", "ahb", "dclk";
-               status = "disabled";
        };
 
        mipi: mipi@ff960000 {
                clocks = <&cru SCLK_MIPIDSI_24M>, <&cru PCLK_DPHYTX0>, <&cru PCLK_MIPI_DSI0>;
                clock-names = "clk_mipi_24m", "pclk_mipi_dsi", "pclk_mipi_dsi_host";
                /*power-domains = <&power PD_VIO>;*/
-               status = "disabled";
        };
 
        lvds: lvds@ff968000 {
                pinctrl-names = "default", "gpio";
                pinctrl-0 = <&hdmii2c_xfer &hdmi_cec>;
                pinctrl-1 = <&i2c5_gpio>;
-               status = "disabled";
+               status = "okay";
        };
 
-       iep_mmu: iep-mmu {
+       iep-mmu {
                dbgname = "iep";
                compatible = "rockchip,iep_mmu";
                reg = <0x0 0xff900800 0x0 0x100>;
                interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "iep_mmu";
-               status = "disabled";
        };
 
-       vip_mmu: vip-mmu {
+       vip-mmu {
                dbgname = "vip";
                compatible = "rockchip,vip_mmu";
                reg = <0x0 0xff950800 0x0 0x100>;
                interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "vip_mmu";
-               status = "disabled";
        };
 
-       vopb_mmu: vopb-mmu {
+       vopb-mmu {
                dbgname = "vop";
                compatible = "rockchip,vopb_mmu";
                reg = <0x0 0xff930300 0x0 0x100>;
                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "vop_mmu";
-               status = "disabled";
        };
 
-       isp_mmu: isp-mmu {
+       isp-mmu {
                dbgname = "isp_mmu";
                compatible = "rockchip,isp_mmu";
                reg = <0x0 0xff914000 0x0 0x100>,
                      <0x0 0xff915000 0x0 0x100>;
                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "isp_mmu";
-               status = "disabled";
        };
 
-       hdcp_mmu: hdcp-mmu {
-                dbgname = "hdcp_mmu";
-                compatible = "rockchip,hdcp_mmu";
-                reg = <0x0 0xff940000 0x0 0x100>;
-                interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "hdcp_mmu";
-               status = "disabled";
+       hdcp-mmu {
+               dbgname = "hdcp_mmu";
+               compatible = "rockchip,hdcp_mmu";
+               reg = <0x0 0xff940000 0x0 0x100>;
+               interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "hdcp_mmu";
        };
 
-       hevc_mmu: hevc-mmu {
+       hevc-mmu {
                dbgname = "hevc";
                compatible = "rockchip,hevc_mmu";
                reg = <0x0 0xff9a0440 0x0 0x40>,
                      <0x0 0xff9a0480 0x0 0x40>;
                interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "hevc_mmu";
-               status = "disabled";
        };
 
-       vpu_mmu: vpu-mmu {
+       vpu-mmu {
                dbgname = "vpu";
                compatible = "rockchip,vpu_mmu";
                reg = <0x0 0xff9a0800 0x0 0x100>;
                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "vepu_mmu", "vdpu_mmu";
-               status = "disabled";
        };
 
        dwc_control_usb: dwc-control-usb {
                compatible = "rockchip,rk3368-dwc-control-usb";
+               status = "okay";
+
                rockchip,grf = <&grf>;
                grf-offset = <0x04bc>; /* GRF_SOC_STATUS for USB2.0 OTG */
                interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,
                                  "otg_linestate", "host0_linestate";
                clocks = <&cru HCLK_USB_PERI>;
                clock-names = "hclk_usb_peri";
-               status = "disabled";
+
+               otg_drv_gpio = <&gpio0 25 GPIO_ACTIVE_LOW>;
+               rockchip,remote_wakeup;
+               rockchip,usb_irq_wakeup;
 
                usb_bc {
                        compatible = "inno,phy";
                        rk_usb,dcpattach  = <0x4b8 29 1>;
                };
        };
+};
+
+&usb_otg {
+       clocks = <&cru SCLK_OTGPHY0>, <&cru HCLK_OTG0>;
+       clock-names = "sclk_otgphy0", "otg";
+       resets = <&cru SRST_USBOTG_AHB>,
+                <&cru SRST_USBOTG_PHY>,
+                <&cru SRST_USBOTG_CON>;
+       reset-names = "otg_ahb", "otg_phy", "otg_controller";
+       /* 0 - Normal, 1 - Force Host, 2 - Force Device */
+       rockchip,usb-mode = <0>;
+};
+
+&lcdc {
+       status = "okay";
+       backlight = <&backlight>;
+       rockchip,mirror = <NO_MIRROR>;
+       rockchip,cabc_mode = <0>;
+       rockchip,fb-win-map = <FB_DEFAULT_ORDER>;
+       power_ctr: power_ctr {
+               rockchip,debug = <0>;
+               lcd_en: lcd-en {
+                       rockchip,power_type = <GPIO>;
+                       gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;/*GPIO_C6 = 22*/
+                       rockchip,delay = <120>;
+               };
+
+               lcd_cs: lcd-cs {
+                       rockchip,power_type = <GPIO>;
+                       gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;/*GPIO_C5 = 21*/
+                       rockchip,delay = <10>;
+               };
+
+               /*lcd_rst: lcd-rst {
+                       rockchip,power_type = <GPIO>;
+                       gpios = <&gpio3 GPIO_D6 GPIO_ACTIVE_HIGH>;
+                       rockchip,delay = <5>;
+               };*/
+       };
+};
 
-       pinctrl {
-               hdmi_i2c {
-                       hdmii2c_xfer: hdmii2c-xfer {
-                               rockchip,pins = <3 26 RK_FUNC_1 &pcfg_pull_none>,
-                                               <3 27 RK_FUNC_1 &pcfg_pull_none>;
-                       };
+&pinctrl {
+       hdmi_i2c {
+               hdmii2c_xfer: hdmii2c-xfer {
+                       rockchip,pins = <3 26 RK_FUNC_1 &pcfg_pull_none>,
+                                       <3 27 RK_FUNC_1 &pcfg_pull_none>;
                };
+       };
 
-               hdmi_pin {
-                       hdmi_cec: hdmi-cec {
-                               rockchip,pins = <3 23 RK_FUNC_1 &pcfg_pull_none>;
-                       };
+       hdmi_pin {
+               hdmi_cec: hdmi-cec {
+                       rockchip,pins = <3 23 RK_FUNC_1 &pcfg_pull_none>;
                };
+       };
 
-               i2c5 {
-                       i2c5_gpio: i2c5-gpio {
-                               rockchip,pins = <3 26 RK_FUNC_GPIO &pcfg_pull_none>,
-                                               <3 27 RK_FUNC_GPIO &pcfg_pull_none>;
-                       };
+       i2c5 {
+               i2c5_gpio: i2c5-gpio {
+                       rockchip,pins = <3 26 RK_FUNC_GPIO &pcfg_pull_none>,
+                                       <3 27 RK_FUNC_GPIO &pcfg_pull_none>;
                };
+       };
 
-               lcdc {
-                       lcdc_lcdc: lcdc-lcdc {
-                               rockchip,pins =
-                                               <0 14 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D10
-                                               <0 15 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D11
-                                               <0 16 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D12
-                                               <0 17 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D13
-                                               <0 18 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D14
-                                               <0 18 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D15
-                                               <0 20 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D16
-                                               <0 21 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D17
-                                               <0 22 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D18
-                                               <0 23 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D19
-                                               <0 24 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D20
-                                               <0 25 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D21
-                                               <0 26 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D22
-                                               <0 27 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D23
-                                               <0 31 RK_FUNC_1 &pcfg_pull_none>,//DCLK
-                                               <0 30 RK_FUNC_1 &pcfg_pull_none>,//DEN
-                                               <0 28 RK_FUNC_1 &pcfg_pull_none>,//HSYNC
-                                               <0 29 RK_FUNC_1 &pcfg_pull_none>;//VSYN
-                       };
-
-                       lcdc_gpio: lcdc-gpio {
-                               rockchip,pins =
-                                               <0 14 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D10
-                                               <0 15 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D11
-                                               <0 16 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D12
-                                               <0 17 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D13
-                                               <0 18 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D14
-                                               <0 19 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D15
-                                               <0 20 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D16
-                                               <0 21 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D17
-                                               <0 22 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D18
-                                               <0 23 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D19
-                                               <0 24 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D20
-                                               <0 25 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D21
-                                               <0 26 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D22
-                                               <0 27 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D23
-                                               <0 31 RK_FUNC_GPIO &pcfg_pull_none>,//DCLK
-                                               <0 30 RK_FUNC_GPIO &pcfg_pull_none>,//DEN
-                                               <0 28 RK_FUNC_GPIO &pcfg_pull_none>,//HSYNC
-                                               <0 29 RK_FUNC_GPIO &pcfg_pull_none>;//VSYN
-                       };
+       lcdc {
+               lcdc_lcdc: lcdc-lcdc {
+                       rockchip,pins =
+                                       <0 14 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D10
+                                       <0 15 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D11
+                                       <0 16 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D12
+                                       <0 17 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D13
+                                       <0 18 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D14
+                                       <0 18 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D15
+                                       <0 20 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D16
+                                       <0 21 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D17
+                                       <0 22 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D18
+                                       <0 23 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D19
+                                       <0 24 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D20
+                                       <0 25 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D21
+                                       <0 26 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D22
+                                       <0 27 RK_FUNC_1 &pcfg_pull_none>,//LCDC_D23
+                                       <0 31 RK_FUNC_1 &pcfg_pull_none>,//DCLK
+                                       <0 30 RK_FUNC_1 &pcfg_pull_none>,//DEN
+                                       <0 28 RK_FUNC_1 &pcfg_pull_none>,//HSYNC
+                                       <0 29 RK_FUNC_1 &pcfg_pull_none>;//VSYN
                };
 
-               isp {
-                       cif_clkout: cif-clkout {
-                               rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none>;//cif_clkout
-                       };
-
-                       isp_dvp_d2d9: isp-dvp-d2d9 {
-                               rockchip,pins =
-                                               <1 0 RK_FUNC_1 &pcfg_pull_none>,//cif_data2
-                                               <1 1 RK_FUNC_1 &pcfg_pull_none>,//cif_data3
-                                               <1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
-                                               <1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
-                                               <1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
-                                               <1 5 RK_FUNC_1 &pcfg_pull_none>,//cif_data7
-                                               <1 6 RK_FUNC_1 &pcfg_pull_none>,//cif_data8
-                                               <1 7 RK_FUNC_1 &pcfg_pull_none>,//cif_data9
-                                               <1 8 RK_FUNC_1 &pcfg_pull_none>,//cif_sync
-                                               <1 9 RK_FUNC_1 &pcfg_pull_none>,//cif_href
-                                               <1 10 RK_FUNC_1 &pcfg_pull_none>,//cif_clkin
-                                               <1 11 RK_FUNC_1 &pcfg_pull_none>;//cif_clkout
-                       };
-
-                       isp_dvp_d0d1: isp-dvp-d0d1 {
-                               rockchip,pins =
-                                               <1 12 RK_FUNC_1 &pcfg_pull_none>,//cif_data0
-                                               <1 13 RK_FUNC_1 &pcfg_pull_none>;//cif_data1
-                       };
-
-                       isp_dvp_d10d11:isp_d10d11 {
-                               rockchip,pins =
-                                               <1 14 RK_FUNC_1 &pcfg_pull_none>,//cif_data10
-                                               <1 15 RK_FUNC_1 &pcfg_pull_none>;//cif_data11
-                       };
-
-                       isp_dvp_d0d7: isp-dvp-d0d7 {
-                               rockchip,pins =
-                                               <1 12 RK_FUNC_1 &pcfg_pull_none>,//cif_data0
-                                               <1 13 RK_FUNC_1 &pcfg_pull_none>,//cif_data1
-                                               <1 0 RK_FUNC_1 &pcfg_pull_none>,//cif_data2
-                                               <1 1 RK_FUNC_1 &pcfg_pull_none>,//cif_data3
-                                               <1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
-                                               <1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
-                                               <1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
-                                               <1 5 RK_FUNC_1 &pcfg_pull_none>;//cif_data7
-                       };
-
-                       isp_dvp_d4d11: isp-dvp-d4d11 {
-                               rockchip,pins =
-                                               <1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
-                                               <1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
-                                               <1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
-                                               <1 5 RK_FUNC_1 &pcfg_pull_none>,//cif_data7
-                                               <1 6 RK_FUNC_1 &pcfg_pull_none>,//cif_data8
-                                               <1 7 RK_FUNC_1 &pcfg_pull_none>,//cif_data9
-                                               <1 14 RK_FUNC_1 &pcfg_pull_none>,//cif_data10
-                                               <1 17 RK_FUNC_1 &pcfg_pull_none>;//cif_data11
-                       };
-
-                       isp_shutter: isp-shutter {
-                               rockchip,pins =
-                                               <3 19 RK_FUNC_2 &pcfg_pull_none>, //SHUTTEREN
-                                               <3 22 RK_FUNC_2 &pcfg_pull_none>;//SHUTTERTRIG
-                       };
-
-                       isp_flash_trigger: isp-flash-trigger {
-                               rockchip,pins = <3 20 RK_FUNC_2 &pcfg_pull_none>; //ISP_FLASHTRIGOU
-                       };
-
-                       isp_prelight: isp-prelight {
-                               rockchip,pins = <3 21 RK_FUNC_2 &pcfg_pull_none>;//ISP_PRELIGHTTRIG
-                       };
-
-                       isp_flash_trigger_as_gpio: isp_flash_trigger_as_gpio {
-                               rockchip,pins = <3 20 RK_FUNC_GPIO &pcfg_pull_none>;//ISP_FLASHTRIGOU
-                       };
+               lcdc_gpio: lcdc-gpio {
+                       rockchip,pins =
+                                       <0 14 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D10
+                                       <0 15 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D11
+                                       <0 16 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D12
+                                       <0 17 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D13
+                                       <0 18 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D14
+                                       <0 19 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D15
+                                       <0 20 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D16
+                                       <0 21 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D17
+                                       <0 22 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D18
+                                       <0 23 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D19
+                                       <0 24 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D20
+                                       <0 25 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D21
+                                       <0 26 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D22
+                                       <0 27 RK_FUNC_GPIO &pcfg_pull_none>,//LCDC_D23
+                                       <0 31 RK_FUNC_GPIO &pcfg_pull_none>,//DCLK
+                                       <0 30 RK_FUNC_GPIO &pcfg_pull_none>,//DEN
+                                       <0 28 RK_FUNC_GPIO &pcfg_pull_none>,//HSYNC
+                                       <0 29 RK_FUNC_GPIO &pcfg_pull_none>;//VSYN
                };
        };
-};
 
-&usb_otg {
-       clocks = <&cru SCLK_OTGPHY0>, <&cru HCLK_OTG0>;
-       clock-names = "sclk_otgphy0", "otg";
-       resets = <&cru SRST_USBOTG_AHB>,
-                <&cru SRST_USBOTG_PHY>,
-                <&cru SRST_USBOTG_CON>;
-       reset-names = "otg_ahb", "otg_phy", "otg_controller";
-       /* 0 - Normal, 1 - Force Host, 2 - Force Device */
-       rockchip,usb-mode = <0>;
+       isp {
+               cif_clkout: cif-clkout {
+                       rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none>;//cif_clkout
+               };
+
+               isp_dvp_d2d9: isp-dvp-d2d9 {
+                       rockchip,pins =
+                                       <1 0 RK_FUNC_1 &pcfg_pull_none>,//cif_data2
+                                       <1 1 RK_FUNC_1 &pcfg_pull_none>,//cif_data3
+                                       <1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
+                                       <1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
+                                       <1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
+                                       <1 5 RK_FUNC_1 &pcfg_pull_none>,//cif_data7
+                                       <1 6 RK_FUNC_1 &pcfg_pull_none>,//cif_data8
+                                       <1 7 RK_FUNC_1 &pcfg_pull_none>,//cif_data9
+                                       <1 8 RK_FUNC_1 &pcfg_pull_none>,//cif_sync
+                                       <1 9 RK_FUNC_1 &pcfg_pull_none>,//cif_href
+                                       <1 10 RK_FUNC_1 &pcfg_pull_none>,//cif_clkin
+                                       <1 11 RK_FUNC_1 &pcfg_pull_none>;//cif_clkout
+               };
+
+               isp_dvp_d0d1: isp-dvp-d0d1 {
+                       rockchip,pins =
+                                       <1 12 RK_FUNC_1 &pcfg_pull_none>,//cif_data0
+                                       <1 13 RK_FUNC_1 &pcfg_pull_none>;//cif_data1
+               };
+
+               isp_dvp_d10d11:isp_d10d11 {
+                       rockchip,pins =
+                                       <1 14 RK_FUNC_1 &pcfg_pull_none>,//cif_data10
+                                       <1 15 RK_FUNC_1 &pcfg_pull_none>;//cif_data11
+               };
+
+               isp_dvp_d0d7: isp-dvp-d0d7 {
+                       rockchip,pins =
+                                       <1 12 RK_FUNC_1 &pcfg_pull_none>,//cif_data0
+                                       <1 13 RK_FUNC_1 &pcfg_pull_none>,//cif_data1
+                                       <1 0 RK_FUNC_1 &pcfg_pull_none>,//cif_data2
+                                       <1 1 RK_FUNC_1 &pcfg_pull_none>,//cif_data3
+                                       <1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
+                                       <1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
+                                       <1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
+                                       <1 5 RK_FUNC_1 &pcfg_pull_none>;//cif_data7
+               };
+
+               isp_dvp_d4d11: isp-dvp-d4d11 {
+                       rockchip,pins =
+                                       <1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
+                                       <1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
+                                       <1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
+                                       <1 5 RK_FUNC_1 &pcfg_pull_none>,//cif_data7
+                                       <1 6 RK_FUNC_1 &pcfg_pull_none>,//cif_data8
+                                       <1 7 RK_FUNC_1 &pcfg_pull_none>,//cif_data9
+                                       <1 14 RK_FUNC_1 &pcfg_pull_none>,//cif_data10
+                                       <1 17 RK_FUNC_1 &pcfg_pull_none>;//cif_data11
+               };
+
+               isp_shutter: isp-shutter {
+                       rockchip,pins =
+                                       <3 19 RK_FUNC_2 &pcfg_pull_none>, //SHUTTEREN
+                                       <3 22 RK_FUNC_2 &pcfg_pull_none>;//SHUTTERTRIG
+               };
+
+               isp_flash_trigger: isp-flash-trigger {
+                       rockchip,pins = <3 20 RK_FUNC_2 &pcfg_pull_none>; //ISP_FLASHTRIGOU
+               };
+
+               isp_prelight: isp-prelight {
+                       rockchip,pins = <3 21 RK_FUNC_2 &pcfg_pull_none>;//ISP_PRELIGHTTRIG
+               };
+
+               isp_flash_trigger_as_gpio: isp_flash_trigger_as_gpio {
+                       rockchip,pins = <3 20 RK_FUNC_GPIO &pcfg_pull_none>;//ISP_FLASHTRIGOU
+               };
+       };
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts
new file mode 100644 (file)
index 0000000..de9976e
--- /dev/null
@@ -0,0 +1,527 @@
+/*
+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include <dt-bindings/pwm/pwm.h>
+#include "rk3368.dtsi"
+#include "rk3368-android.dtsi"
+
+/ {
+       model = "Rockchip Sheep board";
+       compatible = "rockchip,sheep", "rockchip,rk3368";
+
+       sound {
+               compatible = "simple-audio-card";
+               simple-audio-card,format = "i2s";
+               simple-audio-card,name = "rockchip,rt5640-codec";
+               simple-audio-card,mclk-fs = <256>;
+               simple-audio-card,widgets =
+                       "Microphone", "Mic Jack",
+                       "Headphone", "Headphone Jack";
+               simple-audio-card,routing =
+                       "Mic Jack", "MICBIAS1",
+                       "IN1P", "Mic Jack",
+                       "Headphone Jack", "HPOL",
+                       "Headphone Jack", "HPOR";
+               simple-audio-card,cpu {
+                       sound-dai = <&i2s_8ch>;
+               };
+               simple-audio-card,codec {
+                       sound-dai = <&rt5640>;
+               };
+       };
+
+       backlight: backlight {
+               compatible = "pwm-backlight";
+               pwms = <&pwm0 0 25000 PWM_POLARITY_INVERTED>;
+               brightness-levels = <
+                         0   1   2   3   4   5   6   7
+                         8   9  10  11  12  13  14  15
+                        16  17  18  19  20  21  22  23
+                        24  25  26  27  28  29  30  31
+                        32  33  34  35  36  37  38  39
+                        40  41  42  43  44  45  46  47
+                        48  49  50  51  52  53  54  55
+                        56  57  58  59  60  61  62  63
+                        64  65  66  67  68  69  70  71
+                        72  73  74  75  76  77  78  79
+                        80  81  82  83  84  85  86  87
+                        88  89  90  91  92  93  94  95
+                        96  97  98  99 100 101 102 103
+                       104 105 106 107 108 109 110 111
+                       112 113 114 115 116 117 118 119
+                       120 121 122 123 124 125 126 127
+                       128 129 130 131 132 133 134 135
+                       136 137 138 139 140 141 142 143
+                       144 145 146 147 148 149 150 151
+                       152 153 154 155 156 157 158 159
+                       160 161 162 163 164 165 166 167
+                       168 169 170 171 172 173 174 175
+                       176 177 178 179 180 181 182 183
+                       184 185 186 187 188 189 190 191
+                       192 193 194 195 196 197 198 199
+                       200 201 202 203 204 205 206 207
+                       208 209 210 211 212 213 214 215
+                       216 217 218 219 220 221 222 223
+                       224 225 226 227 228 229 230 231
+                       232 233 234 235 236 237 238 239
+                       240 241 242 243 244 245 246 247
+                       248 249 250 251 252 253 254 255>;
+               default-brightness-level = <200>;
+               enable-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
+       };
+
+       rk_key: rockchip-key {
+               compatible = "rockchip,key";
+               status = "okay";
+
+               io-channels = <&saradc 1>;
+
+               vol-up-key {
+                       linux,code = <115>;
+                       label = "volume up";
+                       rockchip,adc_value = <1>;
+               };
+
+               vol-down-key {
+                       linux,code = <114>;
+                       label = "volume down";
+                       rockchip,adc_value = <170>;
+               };
+
+               power-key {
+                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       linux,code = <116>;
+                       label = "power";
+                       gpio-key,wakeup;
+               };
+
+               menu-key {
+                       linux,code = <59>;
+                       label = "menu";
+                       rockchip,adc_value = <355>;
+               };
+
+               home-key {
+                       linux,code = <102>;
+                       label = "home";
+                       rockchip,adc_value = <746>;
+               };
+
+               back-key {
+                       linux,code = <158>;
+                       label = "back";
+                       rockchip,adc_value = <560>;
+               };
+
+               camera-key {
+                       linux,code = <212>;
+                       label = "camera";
+                       rockchip,adc_value = <450>;
+               };
+       };
+
+       vcc_sys: vcc-sys {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc_sys";
+               regulator-always-on;
+               regulator-boot-on;
+               regulator-min-microvolt = <3800000>;
+               regulator-max-microvolt = <3800000>;
+       };
+};
+
+&emmc {
+       status = "okay";
+       bus-width = <8>;
+       cap-mmc-highspeed;
+       supports-emmc;
+       disable-wp;
+       non-removable;
+       num-slots = <1>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
+};
+
+&sdmmc {
+       status = "okay";
+       clock-frequency = <37500000>;
+       clock-freq-min-max = <400000 37500000>;
+       supports-sd;
+       cap-mmc-highspeed;
+       cap-sd-highspeed;
+       card-detect-delay = <200>;
+       disable-wp;
+       num-slots = <1>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
+};
+
+&i2c0 {
+       status = "okay";
+
+       syr827: syr827@40 {
+               compatible = "silergy,syr827";
+               reg = <0x40>;
+               status = "okay";
+
+               regulator-compatible = "fan53555-reg";
+               regulator-name = "vdd_arm";
+               regulator-min-microvolt = <712500>;
+               regulator-max-microvolt = <1500000>;
+               regulator-ramp-delay = <1000>;
+               fcs,suspend-voltage-selector = <1>;
+               regulator-always-on;
+               regulator-boot-on;
+               regulator-initial-state = <3>;
+               regulator-state-mem {
+                       regulator-off-in-suspend;
+                       regulator-suspend-microvolt = <900000>;
+               };
+       };
+
+       rk818: pmic@1c {
+               compatible = "rockchip,rk818";
+               reg = <0x1c>;
+               status = "okay";
+
+               clock-output-names = "xin32k", "wifibt_32kin";
+               interrupt-parent = <&gpio0>;
+               interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pmic_int_l>;
+               rockchip,system-power-controller;
+               wakeup-source;
+               #clock-cells = <1>;
+
+               vcc1-supply = <&vcc_sys>;
+               vcc2-supply = <&vcc_sys>;
+               vcc3-supply = <&vcc_sys>;
+               vcc4-supply = <&vcc_sys>;
+               vcc6-supply = <&vcc_sys>;
+               vcc7-supply = <&vcc_sys>;
+               vcc8-supply = <&vcc_sys>;
+               vcc9-supply = <&vcc_io>;
+
+               regulators {
+                       vdd_logic: DCDC_REG1 {
+                               regulator-name = "vdd_logic";
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-min-microvolt = <750000>;
+                               regulator-max-microvolt = <1450000>;
+                               regulator-ramp-delay = <6001>;
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <1000000>;
+                               };
+                       };
+
+                       vdd_gpu: DCDC_REG2 {
+                               regulator-name = "vdd_gpu";
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <1250000>;
+                               regulator-ramp-delay = <6001>;
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <1000000>;
+                               };
+                       };
+
+                       vcc_ddr: DCDC_REG3 {
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-name = "vcc_ddr";
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                               };
+                       };
+
+                       vcc_io: DCDC_REG4 {
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-min-microvolt = <3300000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-name = "vcc_io";
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <3300000>;
+                               };
+                       };
+
+                       vcca_codec: LDO_REG1 {
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-min-microvolt = <3300000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-name = "vcca_codec";
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <3300000>;
+                               };
+                       };
+
+                       vcc_tp: LDO_REG2 {
+                               regulator-boot-on;
+                               regulator-min-microvolt = <3000000>;
+                               regulator-max-microvolt = <3000000>;
+                               regulator-name = "vcc_tp";
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
+                       };
+
+                       vdd_10: LDO_REG3 {
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-min-microvolt = <1000000>;
+                               regulator-max-microvolt = <1000000>;
+                               regulator-name = "vdd_10";
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <1000000>;
+                               };
+                       };
+
+                       vcc18_lcd: LDO_REG4 {
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-name = "vcc18_lcd";
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <1800000>;
+                               };
+                       };
+
+                       vccio_pmu: LDO_REG5 {
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-name = "vccio_pmu";
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <1800000>;
+                               };
+                       };
+
+                       vdd10_lcd: LDO_REG6 {
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-min-microvolt = <1000000>;
+                               regulator-max-microvolt = <1000000>;
+                               regulator-name = "vdd10_lcd";
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <1000000>;
+                               };
+                       };
+
+                       vcc_18: LDO_REG7 {
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-name = "vcc_18";
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <1800000>;
+                               };
+                       };
+
+                       vccio_wl: LDO_REG8 {
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-name = "vccio_wl";
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <3300000>;
+                               };
+                       };
+
+                       vccio_sd: LDO_REG9 {
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-name = "vccio_sd";
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <3300000>;
+                               };
+                       };
+
+                       vcc_sd: SWITCH_REG {
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-name = "vcc_sd";
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                               };
+                       };
+               };
+       };
+};
+
+&cpu_l0 {
+       cpu-supply = <&syr827>;
+};
+
+&cpu_l1 {
+       cpu-supply = <&syr827>;
+};
+
+&cpu_l2 {
+       cpu-supply = <&syr827>;
+};
+
+&cpu_l3 {
+       cpu-supply = <&syr827>;
+};
+
+&cpu_b0 {
+       cpu-supply = <&syr827>;
+};
+
+&cpu_b1 {
+       cpu-supply = <&syr827>;
+};
+
+&cpu_b2 {
+       cpu-supply = <&syr827>;
+};
+
+&cpu_b3 {
+       cpu-supply = <&syr827>;
+};
+
+&gpu {
+       logic-supply = <&vdd_logic>;
+};
+
+&i2c1 {
+       status = "okay";
+
+       rt5640: rt5640@1c {
+               compatible = "realtek,rt5640";
+               reg = <0x1c>;
+               #sound-dai-cells = <0>;
+               clocks = <&cru SCLK_I2S_8CH_OUT>;
+               clock-names = "mclk";
+               realtek,in1-differential;
+               status = "okay";
+       };
+};
+
+&i2c2 {
+       status = "okay";
+
+       gt9xx: gt9xx@14 {
+               compatible = "goodix,gt9xx";
+               reg = <0x14>;
+               touch-gpio = <&gpio0 12 IRQ_TYPE_LEVEL_LOW>;
+               reset-gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+               max-x = <1200>;
+               max-y = <1900>;
+               tp-size = <911>;
+               tp-supply = <&vcc_tp>;
+               status = "okay";
+       };
+};
+
+&i2s_8ch {
+       status = "okay";
+       rockchip,i2s-broken-burst-len;
+       rockchip,playback-channels = <8>;
+       rockchip,capture-channels = <2>;
+       #sound-dai-cells = <0>;
+};
+
+&io_domains {
+       status = "okay";
+       dvp-supply = <&vcc_18>;
+       audio-supply = <&vcc_io>;
+       gpio30-supply = <&vcc_io>;
+       gpio1830-supply = <&vcc_io>;
+       sdcard-supply = <&vccio_sd>;
+       wifi-supply = <&vccio_wl>;
+};
+
+&pmu_io_domains {
+       status = "okay";
+       pmu-supply = <&vcc_io>;
+       vop-supply = <&vcc_io>;
+};
+
+&pwm0 {
+       status = "okay";
+};
+
+&uart2 {
+       status = "okay";
+};
+
+&mailbox {
+       status = "okay";
+};
+
+&mailbox_scpi {
+       status = "okay";
+};
+
+&saradc {
+       status = "okay";
+};
+
+&pinctrl {
+       pmic {
+               pmic_int_l: pmic-int-l {
+                       rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
+               };
+       };
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-tb-sheep.dts b/arch/arm64/boot/dts/rockchip/rk3368-tb-sheep.dts
deleted file mode 100644 (file)
index aa420af..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2015 Fuzhou Rockchip Electronics Co., Ltd
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This file is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- * Or, alternatively,
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use,
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/dts-v1/;
-#include "rk3368-tb.dtsi"
-
-/ {
-       model = "Rockchip Sheep board";
-       compatible = "rockchip,sheep", "rockchip,rk3368";
-};
-
-&rt5640 {
-       status = "okay";
-};
-
-&gt9xx {
-       status = "okay";
-};
-
-&syr827 {
-       status = "okay";
-};
-
-&mipi {
-       status = "okay";
-};
-
-&rk_screen {
-       status = "okay";
-       #include <dt-bindings/display/screen-timing/lcd-tv080wum-mipi.dtsi>
-};
-
-&rk_key {
-       status = "okay";
-};
-
-&rk818 {
-       status = "okay";
-};
-
-&cpu_l0 {
-       cpu-supply = <&syr827>;
-};
-
-&cpu_l1 {
-       cpu-supply = <&syr827>;
-};
-
-&cpu_l2 {
-       cpu-supply = <&syr827>;
-};
-
-&cpu_l3 {
-       cpu-supply = <&syr827>;
-};
-
-&cpu_b0 {
-       cpu-supply = <&syr827>;
-};
-
-&cpu_b1 {
-       cpu-supply = <&syr827>;
-};
-
-&cpu_b2 {
-       cpu-supply = <&syr827>;
-};
-
-&cpu_b3 {
-       cpu-supply = <&syr827>;
-};
-
-&gpu {
-       logic-supply = <&vdd_logic>;
-};
-
-&dwc_control_usb {
-       otg_drv_gpio = <&gpio0 25 GPIO_ACTIVE_LOW>;
-
-       rockchip,remote_wakeup;
-       rockchip,usb_irq_wakeup;
-       status = "okay";
-};
-
-&usb_otg {
-       status = "okay";
-};
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-tb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-tb.dtsi
deleted file mode 100644 (file)
index aaf245b..0000000
+++ /dev/null
@@ -1,665 +0,0 @@
-/*
- * Copyright (c) 2015 Fuzhou Rockchip Electronics Co., Ltd
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This file is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- * Or, alternatively,
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use,
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <dt-bindings/pwm/pwm.h>
-#include "rk3368.dtsi"
-#include "rk3368-android.dtsi"
-
-/ {
-       compatible = "rockchip,tb", "rockchip,rk3368";
-
-       sound {
-               compatible = "simple-audio-card";
-               simple-audio-card,format = "i2s";
-               simple-audio-card,name = "rockchip,rt5640-codec";
-               simple-audio-card,mclk-fs = <256>;
-               simple-audio-card,widgets =
-                       "Microphone", "Mic Jack",
-                       "Headphone", "Headphone Jack";
-               simple-audio-card,routing =
-                       "Mic Jack", "MICBIAS1",
-                       "IN1P", "Mic Jack",
-                       "Headphone Jack", "HPOL",
-                       "Headphone Jack", "HPOR";
-               simple-audio-card,cpu {
-                       sound-dai = <&i2s_8ch>;
-               };
-               simple-audio-card,codec {
-                       sound-dai = <&rt5640>;
-               };
-       };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm0 0 25000 PWM_POLARITY_INVERTED>;
-               brightness-levels = <
-                         0   1   2   3   4   5   6   7
-                         8   9  10  11  12  13  14  15
-                        16  17  18  19  20  21  22  23
-                        24  25  26  27  28  29  30  31
-                        32  33  34  35  36  37  38  39
-                        40  41  42  43  44  45  46  47
-                        48  49  50  51  52  53  54  55
-                        56  57  58  59  60  61  62  63
-                        64  65  66  67  68  69  70  71
-                        72  73  74  75  76  77  78  79
-                        80  81  82  83  84  85  86  87
-                        88  89  90  91  92  93  94  95
-                        96  97  98  99 100 101 102 103
-                       104 105 106 107 108 109 110 111
-                       112 113 114 115 116 117 118 119
-                       120 121 122 123 124 125 126 127
-                       128 129 130 131 132 133 134 135
-                       136 137 138 139 140 141 142 143
-                       144 145 146 147 148 149 150 151
-                       152 153 154 155 156 157 158 159
-                       160 161 162 163 164 165 166 167
-                       168 169 170 171 172 173 174 175
-                       176 177 178 179 180 181 182 183
-                       184 185 186 187 188 189 190 191
-                       192 193 194 195 196 197 198 199
-                       200 201 202 203 204 205 206 207
-                       208 209 210 211 212 213 214 215
-                       216 217 218 219 220 221 222 223
-                       224 225 226 227 228 229 230 231
-                       232 233 234 235 236 237 238 239
-                       240 241 242 243 244 245 246 247
-                       248 249 250 251 252 253 254 255>;
-               default-brightness-level = <200>;
-               enable-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
-       };
-
-       rk_key: rockchip-key {
-               compatible = "rockchip,key";
-               status = "disabled";
-
-               io-channels = <&saradc 1>;
-
-               vol-up-key {
-                       linux,code = <115>;
-                       label = "volume up";
-                       rockchip,adc_value = <1>;
-               };
-
-               vol-down-key {
-                       linux,code = <114>;
-                       label = "volume down";
-                       rockchip,adc_value = <170>;
-               };
-
-               power-key {
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
-                       linux,code = <116>;
-                       label = "power";
-                       gpio-key,wakeup;
-               };
-
-               menu-key {
-                       linux,code = <59>;
-                       label = "menu";
-                       rockchip,adc_value = <355>;
-               };
-
-               home-key {
-                       linux,code = <102>;
-                       label = "home";
-                       rockchip,adc_value = <746>;
-               };
-
-               back-key {
-                       linux,code = <158>;
-                       label = "back";
-                       rockchip,adc_value = <560>;
-               };
-
-               camera-key {
-                       linux,code = <212>;
-                       label = "camera";
-                       rockchip,adc_value = <450>;
-               };
-       };
-
-       vcc_sys: vcc-sys {
-               compatible = "regulator-fixed";
-               regulator-name = "vcc_sys";
-               regulator-always-on;
-               regulator-boot-on;
-               regulator-min-microvolt = <3800000>;
-               regulator-max-microvolt = <3800000>;
-       };
-};
-
-&emmc {
-       bus-width = <8>;
-       cap-mmc-highspeed;
-       supports-emmc;
-       disable-wp;
-       non-removable;
-       num-slots = <1>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
-       status = "okay";
-};
-
-&sdmmc {
-       clock-frequency = <37500000>;
-       clock-freq-min-max = <400000 37500000>;
-       supports-sd;
-       cap-mmc-highspeed;
-       cap-sd-highspeed;
-       card-detect-delay = <200>;
-       disable-wp;
-       num-slots = <1>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
-       status = "disabled";
-};
-
-&i2c0 {
-       status = "okay";
-
-       syr827: syr827@40 {
-               compatible = "silergy,syr827";
-               status = "disabled";
-               reg = <0x40>;
-
-               regulator-compatible = "fan53555-reg";
-               regulator-name = "vdd_arm";
-               regulator-min-microvolt = <712500>;
-               regulator-max-microvolt = <1500000>;
-               regulator-ramp-delay = <1000>;
-               fcs,suspend-voltage-selector = <1>;
-               regulator-always-on;
-               regulator-boot-on;
-               regulator-initial-state = <3>;
-               regulator-state-mem {
-                       regulator-off-in-suspend;
-                       regulator-suspend-microvolt = <900000>;
-               };
-       };
-
-       syr828: syr828@41 {
-               compatible = "silergy,syr828";
-               status = "disabled";
-               reg = <0x41>;
-
-               regulator-compatible = "fan53555-reg";
-               regulator-name = "vdd_gpu";
-               regulator-min-microvolt = <712500>;
-               regulator-max-microvolt = <1500000>;
-               regulator-ramp-delay = <1000>;
-               fcs,suspend-voltage-selector = <1>;
-               regulator-always-on;
-               regulator-boot-on;
-               regulator-initial-state = <3>;
-               regulator-state-mem {
-                       regulator-on-in-suspend;
-                       regulator-suspend-microvolt = <900000>;
-               };
-       };
-
-       act8846: act8846@5a {
-               /*
-                * Note: u-boot ONLY match old compatible,
-                * it's better to add both instances here.
-                */
-               compatible = "act,act8846", "active-semi,act8846";
-               status = "disabled";
-               reg = <0x5a>;
-               system-power-controller;
-
-               regulators {
-                       act8846_reg1: REG1 {
-                               regulator-name = "VCC_DDR";
-                               regulator-min-microvolt = <1200000>;
-                               regulator-max-microvolt = <1200000>;
-                               regulator-always-on;
-                       };
-
-                       act8846_reg2: REG2 {
-                               regulator-name = "VCC_IO";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
-
-                       act8846_reg3: REG3 {
-                               regulator-name = "VDD_LOG";
-                               regulator-min-microvolt = <700000>;
-                               regulator-max-microvolt = <1500000>;
-                               regulator-always-on;
-                       };
-
-                       act8846_reg4: REG4 {
-                               regulator-name = "VCC_20";
-                               regulator-min-microvolt = <2000000>;
-                               regulator-max-microvolt = <2000000>;
-                               regulator-always-on;
-                       };
-
-                       act8846_reg5: REG5 {
-                               regulator-name = "VCCIO_SD";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
-
-                       act8846_reg6: REG6 {
-                               regulator-name = "VDD10_LCD";
-                               regulator-min-microvolt = <1000000>;
-                               regulator-max-microvolt = <1000000>;
-                               regulator-always-on;
-                       };
-
-                       act8846_reg7: REG7 {
-                               regulator-name = "VCCA_CODEC";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
-
-                       act8846_reg8: REG8 {
-                               regulator-name = "VCCA_TP";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
-
-                       act8846_reg9: REG9 {
-                               regulator-name = "VCCIO_PMU";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
-
-                       act8846_reg10: REG10 {
-                               regulator-name = "VDD_10";
-                               regulator-min-microvolt = <1000000>;
-                               regulator-max-microvolt = <1000000>;
-                               regulator-always-on;
-                       };
-
-                       act8846_reg11: REG11 {
-                               regulator-name = "VCC_18";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-always-on;
-                       };
-
-                       act8846_reg12: REG12 {
-                               regulator-name = "VCC18_LCD";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-always-on;
-                       };
-               };
-       };
-
-       rk818: pmic@1c {
-               compatible = "rockchip,rk818";
-               status = "disabled";
-               reg = <0x1c>;
-               clock-output-names = "xin32k", "wifibt_32kin";
-               interrupt-parent = <&gpio0>;
-               interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pmic_int_l>;
-               rockchip,system-power-controller;
-               wakeup-source;
-               #clock-cells = <1>;
-
-               vcc1-supply = <&vcc_sys>;
-               vcc2-supply = <&vcc_sys>;
-               vcc3-supply = <&vcc_sys>;
-               vcc4-supply = <&vcc_sys>;
-               vcc6-supply = <&vcc_sys>;
-               vcc7-supply = <&vcc_sys>;
-               vcc8-supply = <&vcc_sys>;
-               vcc9-supply = <&vcc_io>;
-
-               regulators {
-                       vdd_logic: DCDC_REG1 {
-                               regulator-name = "vdd_logic";
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <750000>;
-                               regulator-max-microvolt = <1450000>;
-                               regulator-ramp-delay = <6001>;
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <1000000>;
-                               };
-                       };
-
-                       vdd_gpu: DCDC_REG2 {
-                               regulator-name = "vdd_gpu";
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <1250000>;
-                               regulator-ramp-delay = <6001>;
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <1000000>;
-                               };
-                       };
-
-                       vcc_ddr: DCDC_REG3 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-name = "vcc_ddr";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                               };
-                       };
-
-                       vcc_io: DCDC_REG4 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-name = "vcc_io";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <3300000>;
-                               };
-                       };
-
-                       vcca_codec: LDO_REG1 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-name = "vcca_codec";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <3300000>;
-                               };
-                       };
-
-                       vcc_tp: LDO_REG2 {
-                               regulator-boot-on;
-                               regulator-min-microvolt = <3000000>;
-                               regulator-max-microvolt = <3000000>;
-                               regulator-name = "vcc_tp";
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                       };
-
-                       vdd_10: LDO_REG3 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <1000000>;
-                               regulator-max-microvolt = <1000000>;
-                               regulator-name = "vdd_10";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <1000000>;
-                               };
-                       };
-
-                       vcc18_lcd: LDO_REG4 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-name = "vcc18_lcd";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <1800000>;
-                               };
-                       };
-
-                       vccio_pmu: LDO_REG5 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-name = "vccio_pmu";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <1800000>;
-                               };
-                       };
-
-                       vdd10_lcd: LDO_REG6 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <1000000>;
-                               regulator-max-microvolt = <1000000>;
-                               regulator-name = "vdd10_lcd";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <1000000>;
-                               };
-                       };
-
-                       vcc_18: LDO_REG7 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-name = "vcc_18";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <1800000>;
-                               };
-                       };
-
-                       vccio_wl: LDO_REG8 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-name = "vccio_wl";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <3300000>;
-                               };
-                       };
-
-                       vccio_sd: LDO_REG9 {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-name = "vccio_sd";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <3300000>;
-                               };
-                       };
-
-                       vcc_sd: SWITCH_REG {
-                               regulator-always-on;
-                               regulator-boot-on;
-                               regulator-name = "vcc_sd";
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                               };
-                       };
-               };
-       };
-
-};
-
-&i2c1 {
-       status = "okay";
-
-       rt5640: rt5640@1c {
-               #sound-dai-cells = <0>;
-               compatible = "realtek,rt5640";
-               reg = <0x1c>;
-               clocks = <&cru SCLK_I2S_8CH_OUT>;
-               clock-names = "mclk";
-               realtek,in1-differential;
-               status = "disabled";
-       };
-};
-
-&i2c2 {
-       status = "okay";
-
-       gt911: gt911@14 {
-               compatible = "goodix,gt911";
-               reg = <0x14>;
-               interrupt-parent = <&gpio0>;
-               interrupts = <12 0>;
-               status = "disabled";
-       };
-
-       gt9xx: gt9xx@14 {
-               compatible = "goodix,gt9xx";
-               reg = <0x14>;
-               touch-gpio = <&gpio0 12 IRQ_TYPE_LEVEL_LOW>;
-               reset-gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
-               max-x = <1200>;
-               max-y = <1900>;
-               tp-size = <911>;
-               status = "disabled";
-               tp-supply = <&vcc_tp>;
-       };
-};
-
-&i2s_8ch {
-       status = "okay";
-       rockchip,i2s-broken-burst-len;
-       rockchip,playback-channels = <8>;
-       rockchip,capture-channels = <2>;
-       #sound-dai-cells = <0>;
-};
-
-&io_domains {
-       status = "okay";
-
-       dvp-supply = <&vcc_18>;
-       audio-supply = <&vcc_io>;
-       gpio30-supply = <&vcc_io>;
-       gpio1830-supply = <&vcc_io>;
-       sdcard-supply = <&vccio_sd>;
-       wifi-supply = <&vccio_wl>;
-};
-
-&pmu_io_domains {
-       status = "okay";
-
-       pmu-supply = <&vcc_io>;
-       vop-supply = <&vcc_io>;
-};
-
-&pwm0 {
-       status = "okay";
-};
-
-&uart2 {
-       status = "okay";
-};
-
-&fb {
-       status = "okay";
-       rockchip,disp-mode = <NO_DUAL>;
-       rockchip,uboot-logo-on = <0>;
-};
-
-&lcdc {
-       status = "okay";
-       backlight = <&backlight>;
-       rockchip,mirror = <NO_MIRROR>;
-       rockchip,cabc_mode = <0>;
-       rockchip,fb-win-map = <FB_DEFAULT_ORDER>;
-       power_ctr: power_ctr {
-               rockchip,debug = <0>;
-               lcd_en: lcd-en {
-                       rockchip,power_type = <GPIO>;
-                       gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;/*GPIO_C6 = 22*/
-                       rockchip,delay = <10>;
-               };
-
-               lcd_cs: lcd-cs {
-                       rockchip,power_type = <GPIO>;
-                       gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;/*GPIO_C5 = 21*/
-                       rockchip,delay = <10>;
-               };
-
-               /*lcd_rst: lcd-rst {
-                       rockchip,power_type = <GPIO>;
-                       gpios = <&gpio3 GPIO_D6 GPIO_ACTIVE_HIGH>;
-                       rockchip,delay = <5>;
-               };*/
-       };
-};
-
-&lvds {
-       pinctrl-names = "lcdc", "sleep";
-       pinctrl-0 = <&lcdc_lcdc>;
-       pinctrl-1 = <&lcdc_gpio>;
-       status = "disabled";
-};
-
-&mailbox {
-       status = "okay";
-};
-
-&mailbox_scpi {
-       status = "okay";
-};
-
-&rga {
-       status = "okay";
-};
-
-&saradc {
-       status = "okay";
-};
-
-&vopb_mmu {
-       status = "okay";
-};
-
-&pinctrl {
-       pmic {
-               pmic_int_l: pmic-int-l {
-                       rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
-               };
-       };
-};