Commit 3a8ab4a1 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

Merge tag 'spi-nor/for-6.7' into mtd/next 



For SPI NOR we cleaned the flash info entries in order to have
them slimmer and self explanatory. In order to make the entries
as slim as possible, we introduced sane default values so that
the actual flash entries don't need to specify them. We now use
a flexible macro to specify the flash ID instead of the previous
INFOx() macros that had hardcoded ID lengths.

Instead of:
-       { "w25q512nwm", INFO(0xef8020, 0, 64 * 1024, 0)
-               OTP_INFO(256, 3, 0x1000, 0x1000) },

We now use:
+               .id = SNOR_ID(0xef, 0x80, 0x20),
+               .name = "w25q512nwm",
+               .otp = SNOR_OTP(256, 3, 0x1000, 0x1000),

We also removed some flash entries: the very old Catalyst
SPI EEPROMs that were introduced once with the SPI-NOR subsystem,
and a Fujitsu MRAM. Both should use the at25 EEPROM driver.
The latter even has device tree bindings for the at25 driver.

We made sure that the conversion didn't introduce any unwanted
changes by comparing the .rodata segment before and after the
conversion. The patches landed in linux-next immediately after
v6.6-rc2, we haven't seen any regressions yet.

Apart of the autumn cleaning we introduced a new flash entry,
at25ff321a, and added block protection support for mt25qu512a.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parents 565fe150 6823a838

Documentation/filesystems/btrfs.rst

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ For more information please refer to the documentation site or wiki 


  https://btrfs.readthedocs.io



  https://btrfs.wiki.kernel.org



that maintains information about administration tasks, frequently asked

questions, use cases, mount options, comprehensible changelogs, features,

Documentation/process/embargoed-hardware-issues.rst

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ an involved disclosed party. The current ambassadors list: 
  IBM Z		Christian Borntraeger <borntraeger@de.ibm.com>

  Intel		Tony Luck <tony.luck@intel.com>

  Qualcomm	Trilok Soni <tsoni@codeaurora.org>

  RISC-V	Palmer Dabbelt <palmer@dabbelt.com>

  Samsung	Javier González <javier.gonz@samsung.com>



  Microsoft	James Morris <jamorris@linux.microsoft.com>

MAINTAINERS

+11 −12
Original line number Diff line number Diff line
@@ -1855,7 +1855,7 @@ F: Documentation/devicetree/bindings/phy/amlogic* 
F:	arch/arm/boot/dts/amlogic/

F:	arch/arm/mach-meson/

F:	arch/arm64/boot/dts/amlogic/

F:	drivers/genpd/amlogic/

F:	drivers/pmdomain/amlogic/

F:	drivers/mmc/host/meson*

F:	drivers/phy/amlogic/

F:	drivers/pinctrl/meson/
@@ -1918,7 +1918,7 @@ F: drivers/bluetooth/hci_bcm4377.c 
F:	drivers/clk/clk-apple-nco.c

F:	drivers/cpufreq/apple-soc-cpufreq.c

F:	drivers/dma/apple-admac.c

F:	drivers/genpd/apple/

F:	drivers/pmdomain/apple/

F:	drivers/i2c/busses/i2c-pasemi-core.c

F:	drivers/i2c/busses/i2c-pasemi-platform.c

F:	drivers/iommu/apple-dart.c
@@ -2435,7 +2435,7 @@ F: arch/arm/mach-ux500/ 
F:	drivers/clk/clk-nomadik.c

F:	drivers/clocksource/clksrc-dbx500-prcmu.c

F:	drivers/dma/ste_dma40*

F:	drivers/genpd/st/ste-ux500-pm-domain.c

F:	drivers/pmdomain/st/ste-ux500-pm-domain.c

F:	drivers/hwspinlock/u8500_hsem.c

F:	drivers/i2c/busses/i2c-nomadik.c

F:	drivers/iio/adc/ab8500-gpadc.c
@@ -2598,7 +2598,7 @@ F: arch/arm/include/debug/renesas-scif.S 
F:	arch/arm/mach-shmobile/

F:	arch/arm64/boot/dts/renesas/

F:	arch/riscv/boot/dts/renesas/

F:	drivers/genpd/renesas/

F:	drivers/pmdomain/renesas/

F:	drivers/soc/renesas/

F:	include/linux/soc/renesas/

K:	\brenesas,
@@ -4026,7 +4026,7 @@ F: arch/mips/kernel/*bmips* 
F:	drivers/irqchip/irq-bcm63*

F:	drivers/irqchip/irq-bcm7*

F:	drivers/irqchip/irq-brcmstb*

F:	drivers/genpd/bcm/bcm63xx-power.c

F:	drivers/pmdomain/bcm/bcm63xx-power.c

F:	include/linux/bcm963xx_nvram.h

F:	include/linux/bcm963xx_tag.h








@@ -4248,7 +4248,7 @@ R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>







L:	linux-pm@vger.kernel.org









S:	Maintained









T:	git https://github.com/broadcom/stblinux.git









F:	drivers/genpd/bcm/bcm-pmb.c









F:	drivers/pmdomain/bcm/bcm-pmb.c









F:	include/dt-bindings/soc/bcm-pmb.h

















BROADCOM SPECIFIC AMBA DRIVER (BCMA)








@@ -4378,7 +4378,6 @@ M:	David Sterba <dsterba@suse.com>







L:	linux-btrfs@vger.kernel.org









S:	Maintained









W:	https://btrfs.readthedocs.io









W:	https://btrfs.wiki.kernel.org/









Q:	https://patchwork.kernel.org/project/linux-btrfs/list/









C:	irc://irc.libera.chat/btrfs









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git








@@ -8729,7 +8728,7 @@ M:	Ulf Hansson <ulf.hansson@linaro.org>







L:	linux-pm@vger.kernel.org









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git









F:	drivers/genpd/









F:	drivers/pmdomain/

















GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER









M:	Eugen Hristev <eugen.hristev@microchip.com>








@@ -17680,7 +17679,7 @@ L:	linux-pm@vger.kernel.org







L:	linux-arm-msm@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml









F:	drivers/genpd/qcom/cpr.c









F:	drivers/pmdomain/qcom/cpr.c

















QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096









M:	Ilia Lin <ilia.lin@kernel.org>








@@ -20514,7 +20513,7 @@ STARFIVE JH71XX PMU CONTROLLER DRIVER







M:	Walker Chen <walker.chen@starfivetech.com>









S:	Supported









F:	Documentation/devicetree/bindings/power/starfive*









F:	drivers/genpd/starfive/jh71xx-pmu.c









F:	drivers/pmdomain/starfive/jh71xx-pmu.c









F:	include/dt-bindings/power/starfive,jh7110-pmu.h

















STARFIVE SOC DRIVERS








@@ -21339,7 +21338,7 @@ F:	drivers/irqchip/irq-ti-sci-inta.c







F:	drivers/irqchip/irq-ti-sci-intr.c









F:	drivers/reset/reset-ti-sci.c









F:	drivers/soc/ti/ti_sci_inta_msi.c









F:	drivers/genpd/ti/ti_sci_pm_domains.c









F:	drivers/pmdomain/ti/ti_sci_pm_domains.c









F:	include/dt-bindings/soc/ti,sci_pm_domain.h









F:	include/linux/soc/ti/ti_sci_inta_msi.h









F:	include/linux/soc/ti/ti_sci_protocol.h








@@ -21581,7 +21580,7 @@ L:	linux-kernel@vger.kernel.org







L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git









F:	drivers/genpd/ti/omap_prm.c









F:	drivers/pmdomain/ti/omap_prm.c









F:	drivers/soc/ti/*

















TI LM49xxx FAMILY ASoC CODEC DRIVERS

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 6









PATCHLEVEL = 6









SUBLEVEL = 0









EXTRAVERSION = -rc1









EXTRAVERSION = -rc2









NAME = Hurr durr I'ma ninja sloth



















# *DOCUMENTATION*
































arch/parisc/include/asm/cache.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -37,6 +37,7 @@ extern int split_tlb;







extern int dcache_stride;









extern int icache_stride;









extern struct pdc_cache_info cache_info;









extern struct pdc_btlb_info btlb_info;









void parisc_setup_cache_timing(void);



















#define pdtlb(sr, addr)	asm volatile("pdtlb 0(%%sr%0,%1)" \