]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
rockchip: rk3588: Sync device tree from linux v6.8-rc1
authorJonas Karlman <jonas@kwiboo.se>
Fri, 26 Jan 2024 22:14:53 +0000 (22:14 +0000)
committerKever Yang <kever.yang@rock-chips.com>
Sun, 4 Feb 2024 10:47:25 +0000 (18:47 +0800)
Sync rk3588 device tree from linux v6.8-rc1.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
14 files changed:
arch/arm/dts/rk3588-edgeble-neu6a-io.dts
arch/arm/dts/rk3588-edgeble-neu6b-io.dts
arch/arm/dts/rk3588-evb1-v10.dts
arch/arm/dts/rk3588-nanopc-t6.dts
arch/arm/dts/rk3588-orangepi-5-plus.dts
arch/arm/dts/rk3588-quartzpro64.dts
arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
arch/arm/dts/rk3588-rock-5b.dts
arch/arm/dts/rk3588-turing-rk1.dtsi
arch/arm/dts/rk3588s-orangepi-5.dts
arch/arm/dts/rk3588s-rock-5a.dts
arch/arm/dts/rk3588s-u-boot.dtsi
arch/arm/dts/rk3588s.dtsi
include/dt-bindings/soc/rockchip,vop2.h

index b5154389207873c90be593ecdd60c9765b3ea070..be6a4f4f90f68bb98decaf12070e5f8a9670b500 100644 (file)
        compatible = "edgeble,neural-compute-module-6a-io",
                     "edgeble,neural-compute-module-6a", "rockchip,rk3588";
 
-       aliases {
-               serial2 = &uart2;
-       };
-
        chosen {
                stdout-path = "serial2:1500000n8";
        };
index 9933765e40979073166f6f8cc4760e8452c6cf48..070baeb63431f960345f5622e1a1ee3a3df1b1ca 100644 (file)
@@ -9,13 +9,9 @@
 
 / {
        model = "Edgeble Neu6B IO Board";
-       compatible = "edgeble,neural-compute-module-6b-io",
+       compatible = "edgeble,neural-compute-module-6a-io",
                     "edgeble,neural-compute-module-6b", "rockchip,rk3588";
 
-       aliases {
-               serial2 = &uart2;
-       };
-
        chosen {
                stdout-path = "serial2:1500000n8";
        };
index b9d789d57862c2def973671cb4de41ea91b0bba5..ac7c677b0fb9c3d6af9e7b8bcd399d9d24ef0b84 100644 (file)
@@ -16,8 +16,8 @@
        compatible = "rockchip,rk3588-evb1-v10", "rockchip,rk3588";
 
        aliases {
+               ethernet0 = &gmac0;
                mmc0 = &sdhci;
-               serial2 = &uart2;
        };
 
        chosen {
                };
        };
 
+       analog-sound {
+               compatible = "simple-audio-card";
+               pinctrl-names = "default";
+               pinctrl-0 = <&hp_detect>;
+               simple-audio-card,name = "RK3588 EVB1 Audio";
+               simple-audio-card,aux-devs = <&amp_headphone>, <&amp_speaker>;
+               simple-audio-card,bitclock-master = <&masterdai>;
+               simple-audio-card,format = "i2s";
+               simple-audio-card,frame-master = <&masterdai>;
+               simple-audio-card,hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
+               simple-audio-card,mclk-fs = <256>;
+               simple-audio-card,pin-switches = "Headphones", "Speaker";
+               simple-audio-card,routing =
+                       "Speaker Amplifier INL", "LOUT2",
+                       "Speaker Amplifier INR", "ROUT2",
+                       "Speaker", "Speaker Amplifier OUTL",
+                       "Speaker", "Speaker Amplifier OUTR",
+                       "Headphones Amplifier INL", "LOUT1",
+                       "Headphones Amplifier INR", "ROUT1",
+                       "Headphones", "Headphones Amplifier OUTL",
+                       "Headphones", "Headphones Amplifier OUTR",
+                       "LINPUT1", "Onboard Microphone",
+                       "RINPUT1", "Onboard Microphone",
+                       "LINPUT2", "Microphone Jack",
+                       "RINPUT2", "Microphone Jack";
+               simple-audio-card,widgets =
+                       "Microphone", "Microphone Jack",
+                       "Microphone", "Onboard Microphone",
+                       "Headphone", "Headphones",
+                       "Speaker", "Speaker";
+
+               simple-audio-card,cpu {
+                       sound-dai = <&i2s0_8ch>;
+               };
+
+               masterdai: simple-audio-card,codec {
+                       sound-dai = <&es8388>;
+                       system-clock-frequency = <12288000>;
+               };
+       };
+
+       amp_headphone: headphone-amplifier {
+               compatible = "simple-audio-amplifier";
+               enable-gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&headphone_amplifier_en>;
+               sound-name-prefix = "Headphones Amplifier";
+       };
+
+       amp_speaker: speaker-amplifier {
+               compatible = "simple-audio-amplifier";
+               enable-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&speaker_amplifier_en>;
+               sound-name-prefix = "Speaker Amplifier";
+       };
+
        backlight: backlight {
                compatible = "pwm-backlight";
                power-supply = <&vcc12v_dcin>;
        };
 };
 
+&i2c7 {
+       status = "okay";
+
+       es8388: audio-codec@11 {
+               compatible = "everest,es8388";
+               reg = <0x11>;
+               clocks = <&cru I2S0_8CH_MCLKOUT>;
+               assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
+               assigned-clock-rates = <12288000>;
+               AVDD-supply = <&avcc_1v8_codec_s0>;
+               DVDD-supply = <&avcc_1v8_codec_s0>;
+               HPVDD-supply = <&vcc_3v3_s0>;
+               PVDD-supply = <&vcc_3v3_s0>;
+               #sound-dai-cells = <0>;
+       };
+};
+
+&i2s0_8ch {
+       pinctrl-0 = <&i2s0_lrck
+                    &i2s0_mclk
+                    &i2s0_sclk
+                    &i2s0_sdi0
+                    &i2s0_sdo0>;
+       status = "okay";
+};
+
 &mdio0 {
        rgmii_phy: ethernet-phy@1 {
                /* RTL8211F */
 };
 
 &pinctrl {
+       audio {
+               hp_detect: headphone-detect {
+                       rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+
+               headphone_amplifier_en: headphone-amplifier-en {
+                       rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+
+               speaker_amplifier_en: speaker-amplifier-en {
+                       rockchip,pins = <1 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
+
        rtl8111 {
                rtl8111_isolate: rtl8111-isolate {
                        rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
index 97af4f912828543c0b5fb12fd3cf7ad75399b92c..d7722772ecd8a0afb7e844ffb168fa9a7462cb03 100644 (file)
@@ -19,7 +19,6 @@
        aliases {
                mmc0 = &sdhci;
                mmc1 = &sdmmc;
-               serial2 = &uart2;
        };
 
        chosen {
 };
 
 &sdmmc {
-       max-frequency = <200000000>;
-       no-sdio;
-       no-mmc;
        bus-width = <4>;
        cap-mmc-highspeed;
        cap-sd-highspeed;
        disable-wp;
+       no-mmc;
+       no-sdio;
        sd-uhs-sdr104;
        vmmc-supply = <&vcc_3v3_s3>;
        vqmmc-supply = <&vccio_sd_s0>;
                pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
                            <&rk806_dvs2_null>, <&rk806_dvs3_null>;
 
+               system-power-controller;
+
                vcc1-supply = <&vcc4v0_sys>;
                vcc2-supply = <&vcc4v0_sys>;
                vcc3-supply = <&vcc4v0_sys>;
                #gpio-cells = <2>;
 
                rk806_dvs1_null: dvs1-null-pins {
-                       pins = "gpio_pwrctrl2";
+                       pins = "gpio_pwrctrl1";
                        function = "pin_fun0";
                };
 
index 298c183d6f4fc9b5e8110a956551156f350b6325..3e660ff6cd5ff3d966356667e5b7db80a298da3b 100644 (file)
@@ -19,7 +19,6 @@
        aliases {
                mmc0 = &sdhci;
                mmc1 = &sdmmc;
-               serial2 = &uart2;
        };
 
        chosen {
index 5c59f9571dce6ebb9cfd5c52a411b7fc4de4da4c..87a0abf95f7d4f9ac0846c61a7ad18ba6cdabea1 100644 (file)
@@ -17,9 +17,9 @@
        compatible = "pine64,quartzpro64", "rockchip,rk3588";
 
        aliases {
+               ethernet0 = &gmac0;
                mmc0 = &sdhci;
                mmc1 = &sdmmc;
-               serial2 = &uart2;
        };
 
        chosen {
index b595ddef702846de00ee32f2daa4a2c6c54e28f8..5fa20cecc044a39bbc2fcb24cb3bdb5afcd14db4 100644 (file)
        };
 };
 
-&combphy2_psu {
-       status = "okay";
-};
-
 &fspim2_pins {
        bootph-all;
 };
        status = "okay";
 };
 
-&usb_host2_xhci {
-       status = "okay";
-};
-
 &i2c4 {
        pinctrl-names = "default";
        pinctrl-0 = <&i2c4m1_xfer>;
index 741f631db345f0095a6e6f5e21bb5d2e400b30fc..a0e303c3a1dc6d839528188571cb53c2759535fa 100644 (file)
@@ -14,7 +14,6 @@
                mmc0 = &sdhci;
                mmc1 = &sdmmc;
                mmc2 = &sdio;
-               serial2 = &uart2;
        };
 
        chosen {
        status = "okay";
 };
 
+&combphy2_psu {
+       status = "okay";
+};
+
 &cpu_b0 {
        cpu-supply = <&vdd_cpu_big0_s0>;
 };
                pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
                            <&rk806_dvs2_null>, <&rk806_dvs3_null>;
 
+               system-power-controller;
+
                vcc1-supply = <&vcc5v0_sys>;
                vcc2-supply = <&vcc5v0_sys>;
                vcc3-supply = <&vcc5v0_sys>;
                #gpio-cells = <2>;
 
                rk806_dvs1_null: dvs1-null-pins {
-                       pins = "gpio_pwrctrl2";
+                       pins = "gpio_pwrctrl1";
                        function = "pin_fun0";
                };
 
 &usb_host1_ohci {
        status = "okay";
 };
+
+&usb_host2_xhci {
+       status = "okay";
+};
index d88c0e852356518a95f9dd9d8bb1c5bccd999384..dc08da518a76d13cc4841c44a8844a348785f023 100644 (file)
@@ -19,8 +19,6 @@
        aliases {
                ethernet0 = &gmac1;
                mmc0 = &sdhci;
-               serial2 = &uart2;
-               serial9 = &uart9;
        };
 
        fan: pwm-fan {
index e3a839a12dc6f07bb4247fc30bb2af18b15d4ac2..25de4362af386747983e810d650d74c2afaa67fd 100644 (file)
@@ -13,8 +13,8 @@
        compatible = "xunlong,orangepi-5", "rockchip,rk3588s";
 
        aliases {
+               ethernet0 = &gmac1;
                mmc0 = &sdmmc;
-               serial2 = &uart2;
        };
 
        chosen {
                pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
                                <&rk806_dvs2_null>, <&rk806_dvs3_null>;
                spi-max-frequency = <1000000>;
+               system-power-controller;
 
                vcc1-supply = <&vcc5v0_sys>;
                vcc2-supply = <&vcc5v0_sys>;
 &usb_host1_ohci {
        status = "okay";
 };
+
+&usb_host2_xhci {
+       status = "okay";
+};
index 8347adcbd00301770170571d11bb0f782956b18a..2002fd0221fa30cf2b81afcab5bf600dd8328ae1 100644 (file)
@@ -12,9 +12,9 @@
        compatible = "radxa,rock-5a", "rockchip,rk3588s";
 
        aliases {
+               ethernet0 = &gmac1;
                mmc0 = &sdhci;
                mmc1 = &sdmmc;
-               serial2 = &uart2;
        };
 
        analog-sound {
        };
 };
 
+&combphy2_psu {
+       status = "okay";
+};
+
 &cpu_b0 {
        cpu-supply = <&vdd_cpu_big0_s0>;
 };
 &usb_host1_ohci {
        status = "okay";
 };
+
+&usb_host2_xhci {
+       status = "okay";
+};
index ebee2131ceeb22d564655c0b0987ec0238b5539b..d251a210b3136d90d94a4515c38093d9eef26c46 100644 (file)
@@ -7,11 +7,6 @@
 
 / {
        aliases {
-               spi0 = &spi0;
-               spi1 = &spi1;
-               spi2 = &spi2;
-               spi3 = &spi3;
-               spi4 = &spi4;
                spi5 = &sfc;
        };
 
index 8aa0499f9b032d3a2da92d416421e56df15e9f06..36b1b7acfe6a15042600a595875054744d48f257 100644 (file)
        #address-cells = <2>;
        #size-cells = <2>;
 
+       aliases {
+               gpio0 = &gpio0;
+               gpio1 = &gpio1;
+               gpio2 = &gpio2;
+               gpio3 = &gpio3;
+               gpio4 = &gpio4;
+               i2c0 = &i2c0;
+               i2c1 = &i2c1;
+               i2c2 = &i2c2;
+               i2c3 = &i2c3;
+               i2c4 = &i2c4;
+               i2c5 = &i2c5;
+               i2c6 = &i2c6;
+               i2c7 = &i2c7;
+               i2c8 = &i2c8;
+               serial0 = &uart0;
+               serial1 = &uart1;
+               serial2 = &uart2;
+               serial3 = &uart3;
+               serial4 = &uart4;
+               serial5 = &uart5;
+               serial6 = &uart6;
+               serial7 = &uart7;
+               serial8 = &uart8;
+               serial9 = &uart9;
+               spi0 = &spi0;
+               spi1 = &spi1;
+               spi2 = &spi2;
+               spi3 = &spi3;
+               spi4 = &spi4;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
                #clock-cells = <0>;
        };
 
+       display_subsystem: display-subsystem {
+               compatible = "rockchip,display-subsystem";
+               ports = <&vop_out>;
+       };
+
        timer {
                compatible = "arm,armv8-timer";
                interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH 0>,
                reg = <0x0 0xfd58c000 0x0 0x1000>;
        };
 
+       vop_grf: syscon@fd5a4000 {
+               compatible = "rockchip,rk3588-vop-grf", "syscon";
+               reg = <0x0 0xfd5a4000 0x0 0x2000>;
+       };
+
+       vo1_grf: syscon@fd5a8000 {
+               compatible = "rockchip,rk3588-vo-grf", "syscon";
+               reg = <0x0 0xfd5a8000 0x0 0x100>;
+       };
+
        php_grf: syscon@fd5b0000 {
                compatible = "rockchip,rk3588-php-grf", "syscon";
                reg = <0x0 0xfd5b0000 0x0 0x1000>;
                status = "disabled";
        };
 
+       vop: vop@fdd90000 {
+               compatible = "rockchip,rk3588-vop";
+               reg = <0x0 0xfdd90000 0x0 0x4200>, <0x0 0xfdd95000 0x0 0x1000>;
+               reg-names = "vop", "gamma-lut";
+               interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH 0>;
+               clocks = <&cru ACLK_VOP>,
+                        <&cru HCLK_VOP>,
+                        <&cru DCLK_VOP0>,
+                        <&cru DCLK_VOP1>,
+                        <&cru DCLK_VOP2>,
+                        <&cru DCLK_VOP3>,
+                        <&cru PCLK_VOP_ROOT>;
+               clock-names = "aclk",
+                             "hclk",
+                             "dclk_vp0",
+                             "dclk_vp1",
+                             "dclk_vp2",
+                             "dclk_vp3",
+                             "pclk_vop";
+               iommus = <&vop_mmu>;
+               power-domains = <&power RK3588_PD_VOP>;
+               rockchip,grf = <&sys_grf>;
+               rockchip,vop-grf = <&vop_grf>;
+               rockchip,vo1-grf = <&vo1_grf>;
+               rockchip,pmu = <&pmu>;
+               status = "disabled";
+
+               vop_out: ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       vp0: port@0 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               reg = <0>;
+                       };
+
+                       vp1: port@1 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               reg = <1>;
+                       };
+
+                       vp2: port@2 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               reg = <2>;
+                       };
+
+                       vp3: port@3 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               reg = <3>;
+                       };
+               };
+       };
+
+       vop_mmu: iommu@fdd97e00 {
+               compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu";
+               reg = <0x0 0xfdd97e00 0x0 0x100>, <0x0 0xfdd97f00 0x0 0x100>;
+               interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH 0>;
+               clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>;
+               clock-names = "aclk", "iface";
+               #iommu-cells = <0>;
+               power-domains = <&power RK3588_PD_VOP>;
+               status = "disabled";
+       };
+
        uart0: serial@fd890000 {
                compatible = "rockchip,rk3588-uart", "snps,dw-apb-uart";
                reg = <0x0 0xfd890000 0x0 0x100>;
                                reg = <RK3588_PD_USB>;
                                clocks = <&cru PCLK_PHP_ROOT>,
                                         <&cru ACLK_USB_ROOT>,
+                                        <&cru ACLK_USB>,
                                         <&cru HCLK_USB_ROOT>,
                                         <&cru HCLK_HOST0>,
                                         <&cru HCLK_HOST_ARB0>,
index 6e66a802b96a50bacc7503284fced6eee39161e7..668f199df9f04e1b670802002a1906ec162d06e7 100644 (file)
@@ -10,5 +10,9 @@
 #define ROCKCHIP_VOP2_EP_LVDS0 5
 #define ROCKCHIP_VOP2_EP_MIPI1 6
 #define ROCKCHIP_VOP2_EP_LVDS1 7
+#define ROCKCHIP_VOP2_EP_HDMI1 8
+#define ROCKCHIP_VOP2_EP_EDP1  9
+#define ROCKCHIP_VOP2_EP_DP0   10
+#define ROCKCHIP_VOP2_EP_DP1   11
 
 #endif /* __DT_BINDINGS_ROCKCHIP_VOP2_H */