JustEnoughLinuxOS
diff --git a/‎Documentation/ABI/testing/sysfs-bus-iio
+1-1 b/‎Documentation/ABI/testing/sysfs-bus-iio
+1-1
diff --git a/‎Makefile
+4-4 b/‎Makefile
+4-4
diff --git a/‎arch/arm/Kconfig
-1 b/‎arch/arm/Kconfig
-1
diff --git a/‎arch/arm/boot/dts/armada-385-turris-omnia.dts
+2-2 b/‎arch/arm/boot/dts/armada-385-turris-omnia.dts
+2-2
diff --git a/‎arch/arm/boot/dts/exynos4412-midas.dtsi
+1-1 b/‎arch/arm/boot/dts/exynos4412-midas.dtsi
+1-1
diff --git a/‎arch/arm/boot/dts/exynos4412-origen.dts
+1-1 b/‎arch/arm/boot/dts/exynos4412-origen.dts
+1-1
diff --git a/‎arch/arm/boot/dts/imx6dl.dtsi
+3 b/‎arch/arm/boot/dts/imx6dl.dtsi
+3
diff --git a/‎arch/arm/boot/dts/imx6q.dtsi
+3 b/‎arch/arm/boot/dts/imx6q.dtsi
+3
diff --git a/‎arch/arm/boot/dts/imx6qp.dtsi
+6 b/‎arch/arm/boot/dts/imx6qp.dtsi
+6
diff --git a/‎arch/arm/boot/dts/imx6sl.dtsi
+3 b/‎arch/arm/boot/dts/imx6sl.dtsi
+3
diff --git a/‎arch/arm/boot/dts/imx6sll.dtsi
+3 b/‎arch/arm/boot/dts/imx6sll.dtsi
+3
diff --git a/‎arch/arm/boot/dts/imx6sx.dtsi
+6 b/‎arch/arm/boot/dts/imx6sx.dtsi
+6
diff --git a/‎arch/arm/boot/dts/imx7d-sdb.dts
+1-6 b/‎arch/arm/boot/dts/imx7d-sdb.dts
+1-6
diff --git a/‎arch/arm/boot/dts/kirkwood-lsxl.dtsi
+5-11 b/‎arch/arm/boot/dts/kirkwood-lsxl.dtsi
+5-11
diff --git a/‎arch/arm/mm/dump.c
+1-1 b/‎arch/arm/mm/dump.c
+1-1
diff --git a/‎arch/arm/mm/mmu.c
+4 b/‎arch/arm/mm/mmu.c
+4
diff --git a/‎arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
+1 b/‎arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
+1
diff --git a/‎arch/arm64/kernel/ftrace.c
+16-1 b/‎arch/arm64/kernel/ftrace.c
+16-1
diff --git a/‎arch/arm64/kernel/topology.c
+1-1 b/‎arch/arm64/kernel/topology.c
+1-1
diff --git a/‎arch/ia64/mm/numa.c
+1 b/‎arch/ia64/mm/numa.c
+1
diff --git a/‎arch/mips/bcm47xx/prom.c
+2-2 b/‎arch/mips/bcm47xx/prom.c
+2-2
@@ -142,7 +142,7 @@ Description:
 		Raw capacitance measurement from channel Y. Units after
 		application of scale and offset are nanofarads.
 
-What:		/sys/.../iio:deviceX/in_capacitanceY-in_capacitanceZ_raw
+What:		/sys/.../iio:deviceX/in_capacitanceY-capacitanceZ_raw
 KernelVersion:	3.2
 Contact:	[email protected]
 Description:
 
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 10
-SUBLEVEL = 149
+SUBLEVEL = 150
 EXTRAVERSION =
 NAME = Dare mighty things
 
@@ -834,12 +834,12 @@ endif
 
 # Initialize all stack variables with a zero value.
 ifdef CONFIG_INIT_STACK_ALL_ZERO
-# Future support for zero initialization is still being debated, see
-# https://bugs.llvm.org/show_bug.cgi?id=45497. These flags are subject to being
-# renamed or dropped.
 KBUILD_CFLAGS	+= -ftrivial-auto-var-init=zero
+ifdef CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_ENABLER
+# https://github.com/llvm/llvm-project/issues/44842
 KBUILD_CFLAGS	+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang
 endif
+endif
 
 DEBUG_CFLAGS	:=
 
 
@@ -1792,7 +1792,6 @@ config CMDLINE
 choice
 	prompt "Kernel command line type" if CMDLINE != ""
 	default CMDLINE_FROM_BOOTLOADER
-	depends on ATAGS
 
 config CMDLINE_FROM_BOOTLOADER
 	bool "Use bootloader kernel arguments if available"
 
@@ -307,7 +307,7 @@
 		marvell,function = "spi0";
 	};
 
-	spi0cs1_pins: spi0cs1-pins {
+	spi0cs2_pins: spi0cs2-pins {
 		marvell,pins = "mpp26";
 		marvell,function = "spi0";
 	};
@@ -342,7 +342,7 @@
 		};
 	};
 
-	/* MISO, MOSI, SCLK and CS1 are routed to pin header CN11 */
+	/* MISO, MOSI, SCLK and CS2 are routed to pin header CN11 */
 };
 
 &uart0 {
 
@@ -588,7 +588,7 @@
 		clocks = <&camera 1>;
 		clock-names = "extclk";
 		samsung,camclk-out = <1>;
-		gpios = <&gpm1 6 GPIO_ACTIVE_HIGH>;
+		gpios = <&gpm1 6 GPIO_ACTIVE_LOW>;
 
 		port {
 			is_s5k6a3_ep: endpoint {
 
@@ -95,7 +95,7 @@
 };
 
 &ehci {
-	samsung,vbus-gpio = <&gpx3 5 1>;
+	samsung,vbus-gpio = <&gpx3 5 GPIO_ACTIVE_HIGH>;
 	status = "okay";
 	phys = <&exynos_usbphy 2>, <&exynos_usbphy 3>;
 	phy-names = "hsic0", "hsic1";
 
@@ -84,6 +84,9 @@
 		ocram: sram@900000 {
 			compatible = "mmio-sram";
 			reg = <0x00900000 0x20000>;
+			ranges = <0 0x00900000 0x20000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
 			clocks = <&clks IMX6QDL_CLK_OCRAM>;
 		};
 
 
@@ -163,6 +163,9 @@
 		ocram: sram@900000 {
 			compatible = "mmio-sram";
 			reg = <0x00900000 0x40000>;
+			ranges = <0 0x00900000 0x40000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
 			clocks = <&clks IMX6QDL_CLK_OCRAM>;
 		};
 
 
@@ -9,12 +9,18 @@
 		ocram2: sram@940000 {
 			compatible = "mmio-sram";
 			reg = <0x00940000 0x20000>;
+			ranges = <0 0x00940000 0x20000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
 			clocks = <&clks IMX6QDL_CLK_OCRAM>;
 		};
 
 		ocram3: sram@960000 {
 			compatible = "mmio-sram";
 			reg = <0x00960000 0x20000>;
+			ranges = <0 0x00960000 0x20000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
 			clocks = <&clks IMX6QDL_CLK_OCRAM>;
 		};
 
 
@@ -114,6 +114,9 @@
 		ocram: sram@900000 {
 			compatible = "mmio-sram";
 			reg = <0x00900000 0x20000>;
+			ranges = <0 0x00900000 0x20000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
 			clocks = <&clks IMX6SL_CLK_OCRAM>;
 		};
 
 
@@ -115,6 +115,9 @@
 		ocram: sram@900000 {
 			compatible = "mmio-sram";
 			reg = <0x00900000 0x20000>;
+			ranges = <0 0x00900000 0x20000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
 		};
 
 		intc: interrupt-controller@a01000 {
 
@@ -161,12 +161,18 @@
 		ocram_s: sram@8f8000 {
 			compatible = "mmio-sram";
 			reg = <0x008f8000 0x4000>;
+			ranges = <0 0x008f8000 0x4000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
 			clocks = <&clks IMX6SX_CLK_OCRAM_S>;
 		};
 
 		ocram: sram@900000 {
 			compatible = "mmio-sram";
 			reg = <0x00900000 0x20000>;
+			ranges = <0 0x00900000 0x20000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
 			clocks = <&clks IMX6SX_CLK_OCRAM>;
 		};
 
 
@@ -199,12 +199,7 @@
 		interrupt-parent = <&gpio2>;
 		interrupts = <29 0>;
 		pendown-gpio = <&gpio2 29 GPIO_ACTIVE_HIGH>;
-		ti,x-min = /bits/ 16 <0>;
-		ti,x-max = /bits/ 16 <0>;
-		ti,y-min = /bits/ 16 <0>;
-		ti,y-max = /bits/ 16 <0>;
-		ti,pressure-max = /bits/ 16 <0>;
-		ti,x-plate-ohms = /bits/ 16 <400>;
+		touchscreen-max-pressure = <255>;
 		wakeup-source;
 	};
 };
 
@@ -10,6 +10,11 @@
 
 	ocp@f1000000 {
 		pinctrl: pin-controller@10000 {
+			/* Non-default UART pins */
+			pmx_uart0: pmx-uart0 {
+				marvell,pins = "mpp4", "mpp5";
+			};
+
 			pmx_power_hdd: pmx-power-hdd {
 				marvell,pins = "mpp10";
 				marvell,function = "gpo";
@@ -213,22 +218,11 @@
 &mdio {
 	status = "okay";
 
-	ethphy0: ethernet-phy@0 {
-		reg = <0>;
-	};
-
 	ethphy1: ethernet-phy@8 {
 		reg = <8>;
 	};
 };
 
-&eth0 {
-	status = "okay";
-	ethernet0-port@0 {
-		phy-handle = <&ethphy0>;
-	};
-};
-
 &eth1 {
 	status = "okay";
 	ethernet1-port@0 {
 
@@ -342,7 +342,7 @@ static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start)
 		addr = start + i * PMD_SIZE;
 		domain = get_domain_name(pmd);
 		if (pmd_none(*pmd) || pmd_large(*pmd) || !pmd_present(*pmd))
-			note_page(st, addr, 3, pmd_val(*pmd), domain);
+			note_page(st, addr, 4, pmd_val(*pmd), domain);
 		else
 			walk_pte(st, pmd, addr, domain);
 
 
@@ -300,7 +300,11 @@ static struct mem_type mem_types[] __ro_after_init = {
 		.prot_pte  = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
 			     L_PTE_XN | L_PTE_RDONLY,
 		.prot_l1   = PMD_TYPE_TABLE,
+#ifdef CONFIG_ARM_LPAE
+		.prot_sect = PMD_TYPE_SECT | L_PMD_SECT_RDONLY | PMD_SECT_AP2,
+#else
 		.prot_sect = PMD_TYPE_SECT,
+#endif
 		.domain    = DOMAIN_KERNEL,
 	},
 	[MT_ROM] = {
 
@@ -899,6 +899,7 @@
 		interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_gauge>;
+		power-supplies = <&bq25895>;
 		maxim,over-heat-temp = <700>;
 		maxim,over-volt = <4500>;
 		maxim,rsns-microohm = <5000>;
 
@@ -216,11 +216,26 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec,
 	unsigned long pc = rec->ip;
 	u32 old = 0, new;
 
+	new = aarch64_insn_gen_nop();
+
+	/*
+	 * When using mcount, callsites in modules may have been initalized to
+	 * call an arbitrary module PLT (which redirects to the _mcount stub)
+	 * rather than the ftrace PLT we'll use at runtime (which redirects to
+	 * the ftrace trampoline). We can ignore the old PLT when initializing
+	 * the callsite.
+	 *
+	 * Note: 'mod' is only set at module load time.
+	 */
+	if (!IS_ENABLED(CONFIG_DYNAMIC_FTRACE_WITH_REGS) &&
+	    IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) && mod) {
+		return aarch64_insn_patch_text_nosync((void *)pc, new);
+	}
+
 	if (!ftrace_find_callable_addr(rec, mod, &addr))
 		return -EINVAL;
 
 	old = aarch64_insn_gen_branch_imm(pc, addr, AARCH64_INSN_BRANCH_LINK);
-	new = aarch64_insn_gen_nop();
 
 	return ftrace_modify_code(pc, old, new, true);
 }
 
@@ -158,7 +158,7 @@ static int validate_cpu_freq_invariance_counters(int cpu)
 	}
 
 	/* Convert maximum frequency from KHz to Hz and validate */
-	max_freq_hz = cpufreq_get_hw_max_freq(cpu) * 1000;
+	max_freq_hz = cpufreq_get_hw_max_freq(cpu) * 1000ULL;
 	if (unlikely(!max_freq_hz)) {
 		pr_debug("CPU%d: invalid maximum frequency.\n", cpu);
 		return -EINVAL;
 
@@ -106,5 +106,6 @@ int memory_add_physaddr_to_nid(u64 addr)
 		return 0;
 	return nid;
 }
+EXPORT_SYMBOL(memory_add_physaddr_to_nid);
 #endif
 #endif
@@ -86,7 +86,7 @@ static __init void prom_init_mem(void)
 			pr_debug("Assume 128MB RAM\n");
 			break;
 		}
-		if (!memcmp(prom_init, prom_init + mem, 32))
+		if (!memcmp((void *)prom_init, (void *)prom_init + mem, 32))
 			break;
 	}
 	lowmem = mem;
@@ -163,7 +163,7 @@ void __init bcm47xx_prom_highmem_init(void)
 
 	off = EXTVBASE + __pa(off);
 	for (extmem = 128 << 20; extmem < 512 << 20; extmem <<= 1) {
-		if (!memcmp(prom_init, (void *)(off + extmem), 16))
+		if (!memcmp((void *)prom_init, (void *)(off + extmem), 16))
 			break;
 	}
 	extmem -= lowmem;
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ static int validate_cpu_freq_invariance_counters(int cpu)`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`/* Convert maximum frequency from KHz to Hz and validate */`
`161`		`- max_freq_hz = cpufreq_get_hw_max_freq(cpu) * 1000;`
	`161`	`+ max_freq_hz = cpufreq_get_hw_max_freq(cpu) * 1000ULL;`
`162`	`162`	`if (unlikely(!max_freq_hz)) {`
`163`	`163`	`pr_debug("CPU%d: invalid maximum frequency.\n", cpu);`
`164`	`164`	`return -EINVAL;`
Original file line number	Diff line number	Diff line change
`@@ -106,5 +106,6 @@ int memory_add_physaddr_to_nid(u64 addr)`
`106`	`106`	`return 0;`
`107`	`107`	`return nid;`
`108`	`108`	`}`
	`109`	`+EXPORT_SYMBOL(memory_add_physaddr_to_nid);`
`109`	`110`	`#endif`
`110`	`111`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ static __init void prom_init_mem(void)`
`86`	`86`	`pr_debug("Assume 128MB RAM\n");`
`87`	`87`	`break;`
`88`	`88`	`}`
`89`		`- if (!memcmp(prom_init, prom_init + mem, 32))`
	`89`	`+ if (!memcmp((void )prom_init, (void )prom_init + mem, 32))`
`90`	`90`	`break;`
`91`	`91`	`}`
`92`	`92`	`lowmem = mem;`
`@@ -163,7 +163,7 @@ void __init bcm47xx_prom_highmem_init(void)`
`163`	`163`
`164`	`164`	`off = EXTVBASE + __pa(off);`
`165`	`165`	`for (extmem = 128 << 20; extmem < 512 << 20; extmem <<= 1) {`
`166`		`- if (!memcmp(prom_init, (void *)(off + extmem), 16))`
	`166`	`+ if (!memcmp((void )prom_init, (void )(off + extmem), 16))`
`167`	`167`	`break;`
`168`	`168`	`}`
`169`	`169`	`extmem -= lowmem;`