diff --git a/src/arm/soc.c b/src/arm/soc.c index 99c5877..af05749 100644 --- a/src/arm/soc.c +++ b/src/arm/soc.c @@ -734,6 +734,7 @@ bool get_rk_soc_from_efuse(struct system_on_chip* soc, char* efuse) { rkToSoC socFromRK[] = { // TODO: Add RK2XXX // RK3XXX + // Reverse order {0x2388, {SOC_ROCKCHIP_3288, SOC_VENDOR_ROCKCHIP, 28, "RK3288", NULL} }, {0x2392, {SOC_ROCKCHIP_3229, SOC_VENDOR_ROCKCHIP, 28, "RK3229", NULL} }, // https://gadgetversus.com/processor/rockchip-rk3229-vs-rockchip-rk3128/ {0x3380, {SOC_ROCKCHIP_3308, SOC_VENDOR_ROCKCHIP, 28, "RK3308", NULL} }, // https://en.t-firefly.com/product/rocrk3308cc?theme=pc @@ -742,10 +743,12 @@ bool get_rk_soc_from_efuse(struct system_on_chip* soc, char* efuse) { {0x3382, {SOC_ROCKCHIP_3328, SOC_VENDOR_ROCKCHIP, 28, "RK3328", NULL} }, {0x3386, {SOC_ROCKCHIP_3368, SOC_VENDOR_ROCKCHIP, 28, "RK3368", NULL} }, {0x3399, {SOC_ROCKCHIP_3399, SOC_VENDOR_ROCKCHIP, 28, "RK3399", NULL} }, - {0x5366, {SOC_ROCKCHIP_3566, SOC_VENDOR_ROCKCHIP, 22, "RK3566", NULL} }, - {0x5386, {SOC_ROCKCHIP_3568, SOC_VENDOR_ROCKCHIP, 22, "RK3568", NULL} }, - {0x5388, {SOC_ROCKCHIP_3588, SOC_VENDOR_ROCKCHIP, 8, "RK3588", NULL} }, - {0x3588, {SOC_ROCKCHIP_3588S, SOC_VENDOR_ROCKCHIP, 8, "RK3588S", NULL} }, // https://github.com/Dr-Noob/cpufetch/issues/188 + // Normal Order (https://github.com/Dr-Noob/cpufetch/issues/209) + {0x3528, {SOC_ROCKCHIP_3528, SOC_VENDOR_ROCKCHIP, 28, "RK3528", NULL} }, + {0x3562, {SOC_ROCKCHIP_3562, SOC_VENDOR_ROCKCHIP, 22, "RK3562", NULL} }, + {0x3566, {SOC_ROCKCHIP_3566, SOC_VENDOR_ROCKCHIP, 22, "RK3566", NULL} }, + {0x3586, {SOC_ROCKCHIP_3568, SOC_VENDOR_ROCKCHIP, 22, "RK3568", NULL} }, + {0x3588, {SOC_ROCKCHIP_3588, SOC_VENDOR_ROCKCHIP, 8, "RK3588", NULL} }, // No known way to distingish between S version: https://github.com/Dr-Noob/cpufetch/issues/188,209 // Unknown {0x0000, {UNKNOWN, SOC_VENDOR_UNKNOWN, -1, "", NULL} } }; diff --git a/src/arm/socs.h b/src/arm/socs.h index 0261fa6..b4cf53a 100644 --- a/src/arm/socs.h +++ b/src/arm/socs.h @@ -349,10 +349,11 @@ enum { SOC_ROCKCHIP_3328, SOC_ROCKCHIP_3368, SOC_ROCKCHIP_3399, + SOC_ROCKCHIP_3528, + SOC_ROCKCHIP_3562, SOC_ROCKCHIP_3566, SOC_ROCKCHIP_3568, SOC_ROCKCHIP_3588, - SOC_ROCKCHIP_3588S, // GOOGLE SOC_GOOGLE_TENSOR, SOC_GOOGLE_TENSOR_G2, @@ -369,7 +370,7 @@ inline static VENDOR get_soc_vendor_from_soc(SOC soc) { else if(soc >= SOC_SNAPD_QSD8650 && soc <= SOC_SNAPD_SM8450) return SOC_VENDOR_SNAPDRAGON; else if(soc >= SOC_APPLE_M1 && soc <= SOC_APPLE_M3_MAX) return SOC_VENDOR_APPLE; else if(soc >= SOC_ALLWINNER_A10 && soc <= SOC_ALLWINNER_R328) return SOC_VENDOR_ALLWINNER; - else if(soc >= SOC_ROCKCHIP_3288 && soc <= SOC_ROCKCHIP_3588S) return SOC_VENDOR_ROCKCHIP; + else if(soc >= SOC_ROCKCHIP_3288 && soc <= SOC_ROCKCHIP_3588) return SOC_VENDOR_ROCKCHIP; else if(soc >= SOC_GOOGLE_TENSOR && soc <= SOC_GOOGLE_TENSOR_G3) return SOC_VENDOR_GOOGLE; return SOC_VENDOR_UNKNOWN; }