superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soc: fixes for 6.17, part 1 

These are a few patches to fix up bits that went missing during the
 merge window: The tegra and s3c patches address trivial regressions
 from conflicts, the bcm7445 makes the dt conform to the binding that
 was made stricter.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmiWY0UACgkQmmx57+YA
 GNnEKA/+KZne51B+zEBFM/Fp4cOdMbC1+Bp5qfSqlR3P0btV7D9kvJWqCLb67Rj0
 gNcZP6zrxK/jgdlkS7uUKx55nPiuDiZKnY/PZyMJqrKcw34Xz/c0PAFPb5Q0EOeE
 frBHfGgpC4ERyAinpJJm8qX1LSCDk7cdV+7oaOM8UCDByLWdoj+4UZEI0dXR7HI8
 aTkTnHtcX62/stvujMDZkfF8Pdvx0E1pTNYM1dsUmyHJ/h8enjmBPljQr6Guyt/n
 uflMGMK6Fqdd5BjiLYyZRep0IzHNu5x9+MmS+f+FUgRQYwU+pyuWA75z/cj78lOA
 VMmmwwddh8MD7pOCmY/YliAzGbX6LOdxr3SaGKl5OhMWZqt64NXzfyRHDuTLINK4
 OoUCSwW+1LEi+nlt3ibVKQrPkQlsckCcdQ9n4BbZOhDczHZIOMYQBKsCfFx88eNf
 s834O18hz9UNkyd1297nC2chSc9JYThoqqFAPwciq/LnPTXDPuSiHuc1vxHV4hQo
 1w/q5rvK3kTocCsGf2fsM0oSK5KGSIHuo2ke/7/EBZVajLpkStoADBdiEWdvxRTr
 Y62qF7u0Z1LP5zgvF3Xxhmr9hH80GFrq4k1HHzSKV2eYp4MDwNkxqQLPUhxGzfYm
 fFNQxlvjsRNtq8VS0/fFbvM7RhUWff3RW7dJUUUdZfb4YADqLWM=
 =fzZb
 -----END PGP SIGNATURE-----

Merge tag 'soc-fixes-6.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull SoC fixes from Arnd Bergmann:
 "These are a few patches to fix up bits that went missing during the
  merge window: The tegra and s3c patches address trivial regressions
  from conflicts, the bcm7445 makes the dt conform to the binding that
  was made stricter"

* tag 'soc-fixes-6.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  arm64: tegra: Remove numa-node-id properties
  ARM: s3c/gpio: complete the conversion to new GPIO value setters
  ARM: dts: broadcom: Fix bcm7445 memory controller compatible
pull/1340/head
Linus Torvalds 2025-08-09 07:58:55 +03:00
parent 09aae3ecf8 0c952efa0d
commit 61d417921c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/boot/dts/broadcom/bcm7445.dtsi
View File

@ -237,7 +237,8 @@
ranges = <0x0 0x0 0x80000>; ranges = <0x0 0x0 0x80000>;
memc-ddr@2000 { memc-ddr@2000 {
compatible = "brcm,brcmstb-memc-ddr"; compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x",
"brcm,brcmstb-memc-ddr";
reg = <0x2000 0x800>; reg = <0x2000 0x800>;
}; };
@ -259,7 +260,8 @@
ranges = <0x0 0x80000 0x80000>; ranges = <0x0 0x80000 0x80000>;
memc-ddr@2000 { memc-ddr@2000 {
compatible = "brcm,brcmstb-memc-ddr"; compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x",
"brcm,brcmstb-memc-ddr";
reg = <0x2000 0x800>; reg = <0x2000 0x800>;
}; };
@ -281,7 +283,8 @@
ranges = <0x0 0x100000 0x80000>; ranges = <0x0 0x100000 0x80000>;
memc-ddr@2000 { memc-ddr@2000 {
compatible = "brcm,brcmstb-memc-ddr"; compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x",
"brcm,brcmstb-memc-ddr";
reg = <0x2000 0x800>; reg = <0x2000 0x800>;
}; };

2
arch/arm/mach-s3c/gpio-samsung.c
View File

@ -516,7 +516,7 @@ static void __init samsung_gpiolib_add(struct samsung_gpio_chip *chip)
gc->direction_input = samsung_gpiolib_2bit_input; gc->direction_input = samsung_gpiolib_2bit_input;
if (!gc->direction_output) if (!gc->direction_output)
gc->direction_output = samsung_gpiolib_2bit_output; gc->direction_output = samsung_gpiolib_2bit_output;
if (!gc->set) if (!gc->set_rv)
gc->set_rv = samsung_gpiolib_set; gc->set_rv = samsung_gpiolib_set;
if (!gc->get) if (!gc->get)
gc->get = samsung_gpiolib_get; gc->get = samsung_gpiolib_get;

3
arch/arm64/boot/dts/nvidia/tegra264.dtsi
View File

@ -11,7 +11,6 @@
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
numa-node-id = <0>;
reserved-memory { reserved-memory {
#address-cells = <2>; #address-cells = <2>;
@ -341,7 +340,6 @@
status = "okay"; status = "okay";
enable-method = "psci"; enable-method = "psci";
numa-node-id = <0>;
i-cache-size = <65536>; i-cache-size = <65536>;
i-cache-line-size = <64>; i-cache-line-size = <64>;
@ -358,7 +356,6 @@
status = "okay"; status = "okay";
enable-method = "psci"; enable-method = "psci";
numa-node-id = <0>;
i-cache-size = <65536>; i-cache-size = <65536>;
i-cache-line-size = <64>; i-cache-line-size = <64>;