From fc841ef35d8eb825be9910fb036f01b52e74ab1a Mon Sep 17 00:00:00 2001 From: maoxiaochuan Date: Fri, 14 Feb 2025 23:25:39 +0800 Subject: [PATCH] Remove unused code --- arch/loongarch/boot/dts/Makefile | 2 +- arch/loongarch/boot/dts/ls2k300_tewei.dts | 234 -------------- .../boot/dts/ls2k300_vanguard_pi_factory.dts | 48 --- .../boot/dts/ls2k300_vanguard_pi_v10.dts | 290 ------------------ arch/loongarch/include/asm/mach/boot_param.h | 18 -- arch/loongarch/kernel/setup.c | 49 +-- 6 files changed, 6 insertions(+), 635 deletions(-) delete mode 100644 arch/loongarch/boot/dts/ls2k300_tewei.dts delete mode 100644 arch/loongarch/boot/dts/ls2k300_vanguard_pi_factory.dts delete mode 100644 arch/loongarch/boot/dts/ls2k300_vanguard_pi_v10.dts diff --git a/arch/loongarch/boot/dts/Makefile b/arch/loongarch/boot/dts/Makefile index da5ba0253..4a07360a1 100644 --- a/arch/loongarch/boot/dts/Makefile +++ b/arch/loongarch/boot/dts/Makefile @@ -3,7 +3,7 @@ # dtb-y = loongson-2k0500-ref.dtb loongson-2k1000-ref.dtb loongson-2k2000-ref.dtb ifdef CONFIG_DTB_MATCH_BY_BOARD_NAME -dtb-$(CONFIG_LOONGSON_2K300) += ls2k300_mini_dp.dtb ls2k300_vanguard_pi.dtb ls2k300_tewei.dtb +dtb-$(CONFIG_LOONGSON_2K300) += ls2k300_mini_dp.dtb ls2k300_vanguard_pi.dtb obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) else obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_NAME)) diff --git a/arch/loongarch/boot/dts/ls2k300_tewei.dts b/arch/loongarch/boot/dts/ls2k300_tewei.dts deleted file mode 100644 index 8da3d418e..000000000 --- a/arch/loongarch/boot/dts/ls2k300_tewei.dts +++ /dev/null @@ -1,234 +0,0 @@ -#include "ls2k300_g2k03z0_core_v10.dtsi" -#include "loongson_panel_param.dtsi" -#include -#include - -/ { - model = "LS2K300-TEWEI"; - - leds { - compatible = "gpio-leds"; - - run_led { - label = "run_led"; - gpios = <&gpio 85 GPIO_ACTIVE_LOW>; - linux,default-trigger = "heartbeat"; - default-state = "on"; - }; - - err_led { - label = "err_led"; - gpios = <&gpio 82 GPIO_ACTIVE_LOW>; - default-state = "off"; - }; - }; - - lcd_backlight: backlight { - compatible = "pwm-backlight"; - pwms = <&pwm0 0 5000000 PWM_POLARITY_INVERTED>; - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <7>; - }; - - panel: dvo-connector@0 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "panel-lvds", "auo,b101ean01"; - backlight = <&lcd_backlight>; - - width-mm = <261>; - height-mm = <163>; - label = "TM121JDGP30-1280x800"; - data-mapping = "jeida-24"; - - panel-timing { - clock-frequency = <72200000>; - hactive = <1280>; - vactive = <800>; - hsync-len = <4>; - hfront-porch = <72>; - hback-porch = <84>; - vfront-porch = <15>; - vback-porch = <23>; - vsync-len = <4>; - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - - port@0 { - reg = <0>; - - #address-cells = <1>; - #size-cells = <0>; - - dvo_connector_in: endpoint@0 { - reg = <0>; - remote-endpoint = <&dc_out_rgb0>; - }; - }; - }; - - vccio_codec: 3_3V{ - compatible = "regulator-fixed"; - regulator-name = "VCC_IO"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - // 虽然这个时钟在从模式下没用，但 es8388 驱动必须指定这个时钟 - es8388_clk: es8388-clock { - compatible = "fixed-clock"; - clock-frequency = <12288000>; - #clock-cells = <1>; - }; -}; - -&dc { - status = "ok"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - dc_out_rgb0: endpoint { - remote-endpoint = <&dvo_connector_in>; - }; - }; - }; -}; - -&i2c0 { - status = "ok"; - - lm75bdp@48 { - compatible = "national,lm75b"; - reg = <0x48>; - }; - - eeprom@50 { - compatible = "atmel,24c64"; - reg = <0x50>; - pagesize = <32>; - }; -}; - -&i2c1 { - status = "ok"; - - codec: es8388@11{ - compatible = "everest,es8388"; - reg = <0x11>; - AVDD-supply = <&vccio_codec>; - DVDD-supply = <&vccio_codec>; - HPVDD-supply = <&vccio_codec>; - PVDD-supply = <&vccio_codec>; - clocks = <&es8388_clk 0>; - }; -}; - -&i2c2 { - status = "ok"; - - pcf8574@20 { - compatible = "nxp,pcf8574"; - reg = <0x20>; - // 2K300 GPIO 支持中断控制 - // GPIO 中断号为 vhwirq-base + pinnum (216 = 128 + 88) - interrupt-parent = <&gpio>; - interrupts = <216 0>; - gpio-controller; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - }; -}; - -&i2c3 { - status = "ok"; -}; - -&uart1 { - status = "ok"; -}; - -&uart2 { - status = "ok"; -}; - -&uart3 { - status = "ok"; -}; - -&can2 { - status = "ok"; -}; - -&spi1 { - status = "ok"; - - spi_wk2xxx0: spi_wk2xxx@0 { - status = "okay"; - compatible = "wkmic,wk2124_spi"; - reg = <0x0>; - spi-max-frequency = <10000000>; - reset-gpio = <&gpio 83 GPIO_ACTIVE_HIGH>; - irq-gpio = <&gpio 84 IRQ_TYPE_EDGE_FALLING>; - use-common-reset-gpio; - }; -}; - -&spi2 { - status = "ok"; - - spi_wk2xxx1: spi_wk2xxx@0 { - status = "okay"; - compatible = "wkmic,wk2124_spi"; - reg = <0x0>; - spi-max-frequency = <10000000>; - reset-gpio = <&gpio 83 GPIO_ACTIVE_HIGH>; - irq-gpio = <&gpio 69 IRQ_TYPE_EDGE_FALLING>; - use-common-reset-gpio; - }; -}; - -&rtc0 { - status = "okay"; -}; - -&sdio1 { - pinctrl-0 = <&sdio1_pins>; - pinctrl-names = "default"; - cap-sd-highspeed; - cap-mmc-highspeed; - bus-width = <4>; - cd-gpios = <&gpio 81 GPIO_ACTIVE_LOW>; - status = "okay"; -}; - -&pwm0 { - status = "okay"; - #pwm-cells = <3>; -}; - -&i2s { - status = "okay"; - //slave-mode; - //mclk-fixed = <12288000>; -}; - -&audio { - status = "okay"; -}; - -&sound { - status = "okay"; - loongson,audio-codec = <&codec>; - // Easy Compatible for asound.state Configure - loongson,sound-card-name = "ES8388"; -}; - diff --git a/arch/loongarch/boot/dts/ls2k300_vanguard_pi_factory.dts b/arch/loongarch/boot/dts/ls2k300_vanguard_pi_factory.dts deleted file mode 100644 index d3aabfabd..000000000 --- a/arch/loongarch/boot/dts/ls2k300_vanguard_pi_factory.dts +++ /dev/null @@ -1,48 +0,0 @@ -#include -#include -#include -#include - -#include "ls2k300_vanguard_pi_common.dtsi" - -/ { - factory { - tags = "factory-test"; - }; -}; - -&uart2 { - status = "disable"; -}; - -&uart5 { - status = "disabled"; -}; - -&uart6 { - status = "disabled"; -}; - -&uart7 { - status = "disabled"; -}; - -&uart8 { - status = "disabled"; -}; - -&can0 { - status = "disabled"; -}; - -&can1 { - status = "disabled"; -}; - -&can2 { - status = "disabled"; -}; - -&can3 { - status = "disabled"; -}; \ No newline at end of file diff --git a/arch/loongarch/boot/dts/ls2k300_vanguard_pi_v10.dts b/arch/loongarch/boot/dts/ls2k300_vanguard_pi_v10.dts deleted file mode 100644 index 8825be4ac..000000000 --- a/arch/loongarch/boot/dts/ls2k300_vanguard_pi_v10.dts +++ /dev/null @@ -1,290 +0,0 @@ -#include -#include -#include -#include - -#include "loongson2k300.dtsi" -#include "loongson_panel_param.dtsi" - -/ { - model = "LS2K300-PAI"; - - chosen { - stdout-path = "serial0:115200n8"; - bootargs = "earlycon"; - }; - - /* not need memory node, we get memory info from boot params. */ - //memory { - // name = "memory"; - // device_type = "memory"; - // reg = <0 0x00200000 0 0x0ee00000 - // 0 0x90000000 0 0x10000000>; - //}; - - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - linux,cma { - compatible = "shared-dma-pool"; - reusable; - size = <0 0x02000000>; - linux,cma-default; - }; - }; - - leds { - compatible = "gpio-leds"; - - led1 { - label = "led1"; - gpios = <&gpio 54 GPIO_ACTIVE_LOW>; - linux,default-trigger = "heartbeat"; - default-state = "on"; - }; - }; - - panel: dvo-connector@0 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "panel-lvds", "auo,b101ean01"; - //backlight = <&lcd_backlight>; - - /* lcd power on control gpio */ - // enable-gpios = <&pioA 3 GPIO_ACTIVE_HIGH>; - // power-supply = <&vdd_lcd>; -#if 0 // 4.3' LCD - width-mm = <223>; - height-mm = <125>; - label = "ATK-MD0430R-800x480"; - data-mapping = "jeida-24"; - - panel-timing { - clock-frequency = <27000000>; - hactive = <800>; - vactive = <480>; - hsync-len = <40>; - hfront-porch = <48>; - hback-porch = <40>; - vfront-porch = <13>; - vback-porch = <32>; - vsync-len = <1>; - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; -#else // 7' LCD - width-mm = <180>; - height-mm = <110>; - label = "ATK-MD0700R-1024x600"; - data-mapping = "jeida-24"; - - panel-timing { - clock-frequency = <51200000>; - hactive = <1024>; - vactive = <600>; - hsync-len = <20>; - hfront-porch = <160>; - hback-porch = <140>; - vfront-porch = <12>; - vback-porch = <20>; - vsync-len = <3>; - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; -#endif - port@0 { - reg = <0>; - - #address-cells = <1>; - #size-cells = <0>; - - dvo_connector_in: endpoint@0 { - reg = <0>; - remote-endpoint = <&dc_out_rgb0>; - }; - }; - }; - - vccio_codec: 3_3V{ - compatible = "regulator-fixed"; - regulator-name = "VCC_IO"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - humidity_sensor { - compatible = "dht11-sensor"; - SHT11-gpios = <&gpio 61 GPIO_ACTIVE_HIGH>; - status = "okay"; - }; - - // 虽然这个时钟在从模式下没用，但 es8388 驱动必须指定这个时钟 - es8388_clk: es8388-clock { - compatible = "fixed-clock"; - clock-frequency = <11289600>; - #clock-cells = <1>; - }; - - onewire { - compatible = "w1-gpio"; - gpios = <&gpio 68 GPIO_ACTIVE_HIGH>; - }; -}; - -&uart0 { - status = "okay"; -}; - -&spi0 { - status = "okay"; - - spi-flash@0 { - compatible = "jedec,spi-nor"; - spi-max-frequency = <25000000>; - reg = <0>; - }; -}; - -&gmac0 { - status = "okay"; - phy-handle = <&yt8511h0>; - mdio { - compatible = "snps,dwmac-mdio"; - #address-cells = <1>; - #size-cells = <0>; - - yt8511h0: ethernet-phy@0 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0>; - motorcomm,led0_cfg = <0x40>; //千兆常亮 - motorcomm,led1_cfg = <0x30>; //百兆 十兆常亮 - motorcomm,led2_cfg = <0x2600>; //有数据时闪烁 - }; - }; -}; - -&dc { - status = "ok"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - dc_out_rgb0: endpoint { - remote-endpoint = <&dvo_connector_in>; - }; - }; - }; -}; - -&i2c0 { - status = "ok"; - - codec: es8388@11{ - compatible = "everest,es8388"; - reg = <0x11>; - AVDD-supply = <&vccio_codec>; - DVDD-supply = <&vccio_codec>; - HPVDD-supply = <&vccio_codec>; - PVDD-supply = <&vccio_codec>; - clocks = <&es8388_clk 0>; - }; - - touchpad: gt9147@14 { - compatible = "goodix,gt9147"; - reg = <0x14>; - // 2K300 GPIO 支持中断控制 - // 暂时PCB布局有问题，所以随便写个引脚 - // GPIO 中断号为 vhwirq-base + pinnum (181 = 128 + 53) - interrupt-parent = <&gpio>; - interrupts = <181 IRQ_TYPE_EDGE_FALLING>; - irq-gpios = <&gpio 53 GPIO_ACTIVE_LOW>; - }; -}; - -&i2c1 { - status = "ok"; -}; - -// &i2c2 { -// status = "okay"; -// }; - -&uart2 { - status = "ok"; -}; - -// &can0 { -// status = "okay"; -// }; - -// &can1 { -// status = "okay"; -// }; - -// &can2 { -// status = "okay"; -// }; - -// &can3 { -// status = "okay"; -// }; - -// &spi1 { -// status = "okay"; - -// spidev0@0 { -// compatible = "rohm,dh2228fv"; -// reg = <0>; -// spi-max-frequency = <50000000>; -// }; -// }; - -&spi2 { - status = "ok"; - - mcp3004@0 { - compatible = "mcp3004"; - reg = <0>; - spi-max-frequency = <1500000>; - }; -}; - -&adc { - status = "okay"; -}; - -&rtc0 { - status = "disable"; -}; - -&sdio1 { - pinctrl-0 = <&sdio1_pins>; - pinctrl-names = "default"; - cap-sd-highspeed; - cap-mmc-highspeed; - bus-width = <4>; - cd-gpios = <&gpio 82 GPIO_ACTIVE_LOW>; - status = "okay"; -}; - -&i2s { - status = "okay"; -}; - -&audio { - status = "okay"; -}; - -&sound { - status = "okay"; -}; \ No newline at end of file diff --git a/arch/loongarch/include/asm/mach/boot_param.h b/arch/loongarch/include/asm/mach/boot_param.h index 169dee366..5739625cb 100644 --- a/arch/loongarch/include/asm/mach/boot_param.h +++ b/arch/loongarch/include/asm/mach/boot_param.h @@ -105,32 +105,14 @@ struct loongsonlist_screeninfo{ extern void *loongson_fdt_blob; extern u32 __dtb_loongson3_ls7a_begin[]; -extern u32 __dtb_ls2k500_hl_mb_begin[]; extern u32 __dtb_ls2k500_mini_dp_begin[]; extern u32 __dtb_ls2k500_dayu400_mb_begin[]; -extern u32 __dtb_ls2k500_modi_hct_begin[]; -extern u32 __dtb_ls2k500_zhengtai_pcs1800_v10_begin[]; -extern u32 __dtb_ls2k500_jiaoqian_v10_begin[]; -extern u32 __dtb_ls2k500_zjjz_begin[]; extern u32 __dtb_ls2k1000_jl_mb_begin[]; -extern u32 __dtb_ls2k1000_jl_mb_mu_begin[]; -extern u32 __dtb_ls2k1000_jl_mb_nodvo_begin[]; extern u32 __dtb_ls2k1000_dp_begin[]; extern u32 __dtb_ls2k1000_dp_i2s_begin[]; -extern u32 __dtb_ls2k1000_dp_test_begin[]; -extern u32 __dtb_ls2k1000_dp_factory_begin[]; -extern u32 __dtb_ksec_hac_mb_begin[]; -extern u32 __dtb_gbkpdm0_v10_begin[]; -extern u32 __dtb_gbkpdm0_litong_begin[]; -extern u32 __dtb_ls2k1000_cl_mb_begin[]; -extern u32 __dtb_ls2k1000_c4g_mb001_begin[]; -extern u32 __dtb_ls2k1000_znwlidzd_litong_begin[]; -extern u32 __dtb_ls2p500_evb_begin[]; -extern u32 __dtb_ls2p500_rsj_mb_v10_begin[]; extern u32 __dtb_ls2p500_gbkpjm0_v10_begin[]; extern u32 __dtb_ls2k300_mini_dp_begin[]; extern u32 __dtb_ls2k300_vanguard_pi_begin[]; -extern u32 __dtb_ls2k300_tewei_begin[]; extern char __dtb_start[]; extern struct boot_params *efi_bp; extern struct loongson_board_info b_info; diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c index 987884e70..e21858566 100644 --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -313,20 +313,10 @@ static void* __init get_fdt_by_board_name(void) if (board_name) { #ifdef CONFIG_LOONGSON_2K500 int i; - if (!strncmp(board_name, "LS2K500-HL-MB", 13)) - fdt = &__dtb_ls2k500_hl_mb_begin; - else if (!strncmp(board_name, "LS2K500-MINI-DP", 15)) + if (!strncmp(board_name, "LS2K500-MINI-DP", 15)) fdt = &__dtb_ls2k500_mini_dp_begin; else if (!strncmp(board_name, "LS2K500-DAYU400-MB", 17)) fdt = &__dtb_ls2k500_dayu400_mb_begin; - else if (!strncmp(board_name, "LS2K500-MODI-HCT", 16)) - fdt = &__dtb_ls2k500_modi_hct_begin; - else if (!strncmp(board_name, "LS2K500-ZHENGTAI-PCS1800-V10", 28)) - fdt = &__dtb_ls2k500_zhengtai_pcs1800_v10_begin; - else if (!strncmp(board_name, "LS2K500-JIAOQIAN-V10", 20)) - fdt = &__dtb_ls2k500_jiaoqian_v10_begin; - else if (!strncmp(board_name, "LS2K500-ZJJZ", 12)) - fdt = &__dtb_ls2k500_zjjz_begin; else fdt = &__dtb_ls2k500_mini_dp_begin; @@ -335,55 +325,26 @@ static void* __init get_fdt_by_board_name(void) // __cpu_full_name[i] = cpu_ls2k500_name; #elif defined(CONFIG_LOONGSON_2K1000) if (!strncmp(board_name, "LS2K1000-JL-MB", 14)) { - if (!strncmp(board_name, "LS2K1000-JL-MB-MU", 17)) - fdt = &__dtb_ls2k1000_jl_mb_mu_begin; - else if (!strncmp(board_name, "LS2K1000-JL-MB-NODVO", 20)) - fdt = &__dtb_ls2k1000_jl_mb_nodvo_begin; - else - fdt = &__dtb_ls2k1000_jl_mb_begin; + fdt = &__dtb_ls2k1000_jl_mb_begin; } else if (!strncmp(board_name, "LS2K1000-DP", 11)) { #ifdef CONFIG_SND_LS1X_SOC_I2S fdt = &__dtb_ls2k1000_dp_i2s_begin; #else - if (!strncmp(board_name, "LS2K1000-DP-TEST", 16)) { - fdt = &__dtb_ls2k1000_dp_test_begin; - } else if (!strncmp(board_name, "LS2K1000-DP-FACTORY", 19)){ - fdt = &__dtb_ls2k1000_dp_factory_begin; - } else { - fdt = &__dtb_ls2k1000_dp_begin; - } + fdt = &__dtb_ls2k1000_dp_begin; #endif - } else if (!strncmp(board_name, "HAC_MB_REVC", 11)) { - fdt = &__dtb_ksec_hac_mb_begin; - } else if (!strncmp(board_name, "GBKPDM0-V10", 11)) { - fdt = &__dtb_gbkpdm0_v10_begin; - } else if (!strncmp(board_name, "GBKPDM0-LITONG", 14)) { - fdt = &__dtb_gbkpdm0_litong_begin; - } else if (!strncmp(board_name, "LS2K1000-ChuangLong-MB", 22)) { - fdt = &__dtb_ls2k1000_cl_mb_begin; - } else if (!strncmp(board_name, "C4G-MB001", 9)) { - fdt = &__dtb_ls2k1000_c4g_mb001_begin; - } else if (!strncmp(board_name, "ZNWLIDZD-LITONG", 15)) { - fdt = &__dtb_ls2k1000_znwlidzd_litong_begin; } else { fdt = &__dtb_ls2k1000_dp_begin; } #elif defined(CONFIG_LOONGSON_2P500) - if (!strncmp(board_name, "LS2P500-EVB", 11)) - fdt = &__dtb_ls2p500_evb_begin; - else if (!strncmp(board_name, "LS2P500-RSJ", 11)) - fdt = &__dtb_ls2p500_rsj_mb_v10_begin; - else if (!strncmp(board_name, "LS2P500-GBKPJM0", 15)) + if (!strncmp(board_name, "LS2P500-GBKPJM0", 15)) fdt = &__dtb_ls2p500_gbkpjm0_v10_begin; else - fdt = &__dtb_ls2p500_evb_begin; + fdt = &__dtb_ls2p500_gbkpjm0_v10_begin; #elif defined(CONFIG_LOONGSON_2K300) if (!strncmp(board_name, "LS2K300-MINI-DP", 15)) fdt = &__dtb_ls2k300_mini_dp_begin; else if (!strncmp(board_name, "LS2K300-PAI", 11)) fdt = &__dtb_ls2k300_vanguard_pi_begin; - else if (!strncmp(board_name, "LS2K300-TEWEI", 13)) - fdt = &__dtb_ls2k300_tewei_begin; else fdt = &__dtb_ls2k300_mini_dp_begin; #endif