Update dt & defconfig files for SudoMaker products

Ingenic-community · Sep 15, 2023 · 8ecdfc7 · 8ecdfc7
1 parent da91788
commit 8ecdfc7
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 128 deletions.
diff --git a/arch/mips/boot/dts/ingenic/loshark-l1-v2.2-lite.dts b/arch/mips/boot/dts/ingenic/loshark-l1-v2.2-lite.dts
@@ -17,7 +17,7 @@
 	};
 
 	chosen {
-		stdout-path = "serial2:115200n8";
+		bootargs = "console=null mem=8M@0x0 loglevel=7 ingenic_pm_clk=0 devtmpfs.mount=1 clk_ignore_unused no_hash_pointers";
 	};
 
 	memory {
@@ -103,44 +103,6 @@
 	pinctrl-0 = <&pins_uart2>;
 };
 
-&sfc {
-	status = "okay";
-
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pins_sfc>;
-
-	flash: xt25f16b@0 {
-		compatible = "xtx,xt25f16b-kgd", "xtx,xt25f16b", "jedec,spi-nor";
-		spi-max-frequency = <133000000>;
-		reg = <0>;
-
-		spi-rx-bus-width = <4>;
-		spi-tx-bus-width = <4>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			boot {
-				reg = <0x0 0x8000>;
-			};
-
-			kernel {
-				reg = <0x8000 0x138000>;
-			};
-
-			early_rootfs {
-				reg = <0x140000 0xC0000>;
-			};
-
-		};
-	};
-};
-
 &msc1 {
 	status = "okay";
 
@@ -150,9 +112,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pins_msc1>;
 
-	/delete-property/ dmas;
-	/delete-property/ dma-names;
-
 	non-removable;
 };
 

diff --git a/arch/mips/boot/dts/ingenic/loshark-l1-v2.2.dts b/arch/mips/boot/dts/ingenic/loshark-l1-v2.2.dts
@@ -17,7 +17,9 @@
 	};
 
 	chosen {
-		stdout-path = "serial2:115200n8";
+		bootargs = "console=null mem=8M@0x0 loglevel=7 ingenic_pm_clk=0 devtmpfs.mount=1 lo_prealloc=4 clk_ignore_unused no_hash_pointers";
+		// bootargs = "console=ttyS2,115200n8 mem=8M@0x0 loglevel=7 ingenic_pm_clk=0 devtmpfs.mount=1 lo_prealloc=4 clk_ignore_unused no_hash_pointers";
+		// stdout-path = "serial2:115200n8";
 	};
 
 	memory {
@@ -123,44 +125,6 @@
 	pinctrl-0 = <&pins_uart2>;
 };
 
-&sfc {
-	status = "okay";
-
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pins_sfc>;
-
-	flash: xt25f16b@0 {
-		compatible = "xtx,xt25f16b-kgd", "xtx,xt25f16b", "jedec,spi-nor";
-		spi-max-frequency = <133000000>;
-		reg = <0>;
-
-		spi-rx-bus-width = <4>;
-		spi-tx-bus-width = <4>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			boot {
-				reg = <0x0 0x8000>;
-			};
-
-			kernel {
-				reg = <0x8000 0x138000>;
-			};
-
-			early_rootfs {
-				reg = <0x140000 0xC0000>;
-			};
-
-		};
-	};
-};
-
 &msc1 {
 	status = "okay";
 
@@ -170,9 +134,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pins_msc1>;
 
-	/delete-property/ dmas;
-	/delete-property/ dma-names;
-
 	non-removable;
 };
 

diff --git a/arch/mips/boot/dts/ingenic/x1501-pico-evb.dts b/arch/mips/boot/dts/ingenic/x1501-pico-evb.dts
@@ -16,6 +16,7 @@
 	};
 
 	chosen {
+		bootargs = "console=ttyS2,115200n8 mem=8M@0x0 loglevel=7 ingenic_pm_clk=0 devtmpfs.mount=1 lo_prealloc=4 clk_ignore_unused no_hash_pointers";
 		stdout-path = "serial2:115200n8";
 	};
 
@@ -46,7 +47,7 @@
 
 	// MPLL = 552MHz
 	assigned-clocks = <&cgu X1000_CLK_SSIPLL>;
-	assigned-clock-rates = <276000000>;
+	assigned-clock-rates = <100000000>;
 
 	pinctrl-names = "default";
 	pinctrl-0 = <&pins_spi0>;

diff --git a/arch/mips/boot/dts/ingenic/x1501.dtsi b/arch/mips/boot/dts/ingenic/x1501.dtsi
@@ -382,27 +382,6 @@
 			clock-names = "gate_pdma";
 	};
 
-	msc0: mmc@13450000 {
-		compatible = "ingenic,x1000-mmc";
-		reg = <0x13450000 0x1000>;
-
-		interrupt-parent = <&intc>;
-		interrupts = <37>;
-
-		clocks = <&cgu X1000_CLK_MSC0>;
-		clock-names = "mmc";
-
-		cap-sd-highspeed;
-		cap-mmc-highspeed;
-		cap-sdio-irq;
-
-		dmas = <&pdma X1000_DMA_MSC0_RX>,
-			   <&pdma X1000_DMA_MSC0_TX>;
-		dma-names = "rx", "tx";
-
-		status = "disabled";
-	};
-
 	msc1: mmc@13460000 {
 		compatible = "ingenic,x1000-mmc";
 		reg = <0x13460000 0x1000>;
@@ -417,10 +396,6 @@
 		cap-mmc-highspeed;
 		cap-sdio-irq;
 
-		// dmas = <&pdma X1000_DMA_MSC1_RX>,
-		// 	   <&pdma X1000_DMA_MSC1_TX>;
-		// dma-names = "rx", "tx";
-
 		status = "disabled";
 	};
 

diff --git a/arch/mips/configs/loshark_l1_v2.2_defconfig b/arch/mips/configs/loshark_l1_v2.2_defconfig
@@ -335,10 +335,9 @@ CONFIG_BUILTIN_DTB=y
 CONFIG_MIPS_NO_APPENDED_DTB=y
 # CONFIG_MIPS_ELF_APPENDED_DTB is not set
 # CONFIG_MIPS_RAW_APPENDED_DTB is not set
-# CONFIG_MIPS_CMDLINE_FROM_DTB is not set
+CONFIG_MIPS_CMDLINE_FROM_DTB=y
 # CONFIG_MIPS_CMDLINE_DTB_EXTEND is not set
-CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y
-# CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND is not set
+# CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER is not set
 # end of Kernel type
 
 CONFIG_LOCKDEP_SUPPORT=y
@@ -426,7 +425,7 @@ CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP=y
+# CONFIG_SECCOMP is not set
 CONFIG_HAVE_STACKPROTECTOR=y
 # CONFIG_STACKPROTECTOR is not set
 CONFIG_LTO_NONE=y
@@ -439,7 +438,7 @@ CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_ARCH_MMAP_RND_BITS=15
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
@@ -529,11 +528,12 @@ CONFIG_SWAP=y
 #
 # SLAB allocator options
 #
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
-CONFIG_SLUB_TINY=y
 CONFIG_SLAB_MERGE_DEFAULT=y
+# CONFIG_SLAB_FREELIST_RANDOM is not set
+# CONFIG_SLAB_FREELIST_HARDENED is not set
 # end of SLAB allocator options
 
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
@@ -645,6 +645,7 @@ CONFIG_OF_RESERVED_MEM=y
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
 CONFIG_LYONTEK_LY68=y
+CONFIG_LYONTEK_LY68_MAX_TRANS_SEGS=1
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_AES=y
 # CONFIG_BLK_DEV_LOOP_KEYSCRUB is not set
@@ -1991,6 +1992,7 @@ CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 #
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_SLAB is not set
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_OBJECTS is not set
@@ -2015,7 +2017,7 @@ CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 #
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
+CONFIG_PANIC_TIMEOUT=10
 # CONFIG_SOFTLOCKUP_DETECTOR is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_WQ_WATCHDOG is not set
@@ -2095,9 +2097,7 @@ CONFIG_TRACING_SUPPORT=y
 #
 # mips Debugging
 #
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=null mem=8M@0x0 loglevel=7 ingenic_pm_clk=0 devtmpfs.mount=1 lo_prealloc=4 clk_ignore_unused no_hash_pointers"
-# CONFIG_CMDLINE_OVERRIDE is not set
+# CONFIG_CMDLINE_BOOL is not set
 # CONFIG_DEBUG_ZBOOT is not set
 # end of mips Debugging
 

diff --git a/arch/mips/configs/loshark_l1_v2.2_lite_defconfig b/arch/mips/configs/loshark_l1_v2.2_lite_defconfig
@@ -425,7 +425,7 @@ CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP=y
+# CONFIG_SECCOMP is not set
 CONFIG_HAVE_STACKPROTECTOR=y
 # CONFIG_STACKPROTECTOR is not set
 CONFIG_LTO_NONE=y
@@ -438,7 +438,7 @@ CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_ARCH_MMAP_RND_BITS=15
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
@@ -527,11 +527,12 @@ CONFIG_BINFMT_SCRIPT=y
 #
 # SLAB allocator options
 #
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
-CONFIG_SLUB_TINY=y
 CONFIG_SLAB_MERGE_DEFAULT=y
+# CONFIG_SLAB_FREELIST_RANDOM is not set
+# CONFIG_SLAB_FREELIST_HARDENED is not set
 # end of SLAB allocator options
 
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
@@ -1875,6 +1876,7 @@ CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 #
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_SLAB is not set
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_OBJECTS is not set
@@ -1899,7 +1901,7 @@ CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 #
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
+CONFIG_PANIC_TIMEOUT=10
 # CONFIG_SOFTLOCKUP_DETECTOR is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_WQ_WATCHDOG is not set