Skip to content

Commit 61d4179

Browse files
committed
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
2 parents 09aae3e + 0c952ef commit 61d4179

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

arch/arm/boot/dts/broadcom/bcm7445.dtsi

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,8 @@
237237
ranges = <0x0 0x0 0x80000>;
238238

239239
memc-ddr@2000 {
240-
compatible = "brcm,brcmstb-memc-ddr";
240+
compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x",
241+
"brcm,brcmstb-memc-ddr";
241242
reg = <0x2000 0x800>;
242243
};
243244

@@ -259,7 +260,8 @@
259260
ranges = <0x0 0x80000 0x80000>;
260261

261262
memc-ddr@2000 {
262-
compatible = "brcm,brcmstb-memc-ddr";
263+
compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x",
264+
"brcm,brcmstb-memc-ddr";
263265
reg = <0x2000 0x800>;
264266
};
265267

@@ -281,7 +283,8 @@
281283
ranges = <0x0 0x100000 0x80000>;
282284

283285
memc-ddr@2000 {
284-
compatible = "brcm,brcmstb-memc-ddr";
286+
compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x",
287+
"brcm,brcmstb-memc-ddr";
285288
reg = <0x2000 0x800>;
286289
};
287290

arch/arm/mach-s3c/gpio-samsung.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ static void __init samsung_gpiolib_add(struct samsung_gpio_chip *chip)
516516
gc->direction_input = samsung_gpiolib_2bit_input;
517517
if (!gc->direction_output)
518518
gc->direction_output = samsung_gpiolib_2bit_output;
519-
if (!gc->set)
519+
if (!gc->set_rv)
520520
gc->set_rv = samsung_gpiolib_set;
521521
if (!gc->get)
522522
gc->get = samsung_gpiolib_get;

arch/arm64/boot/dts/nvidia/tegra264.dtsi

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
interrupt-parent = <&gic>;
1212
#address-cells = <2>;
1313
#size-cells = <2>;
14-
numa-node-id = <0>;
1514

1615
reserved-memory {
1716
#address-cells = <2>;
@@ -341,7 +340,6 @@
341340
status = "okay";
342341

343342
enable-method = "psci";
344-
numa-node-id = <0>;
345343

346344
i-cache-size = <65536>;
347345
i-cache-line-size = <64>;
@@ -358,7 +356,6 @@
358356
status = "okay";
359357

360358
enable-method = "psci";
361-
numa-node-id = <0>;
362359

363360
i-cache-size = <65536>;
364361
i-cache-line-size = <64>;

0 commit comments

Comments
 (0)