Commit 61d41792 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 09aae3ec 0c952efa

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

+6 −3
Original line number Diff line number Diff line
@@ -237,7 +237,8 @@ memc@0 { 
			ranges = <0x0 0x0 0x80000>;



			memc-ddr@2000 {

				compatible = "brcm,brcmstb-memc-ddr";

				compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x",

					     "brcm,brcmstb-memc-ddr";

				reg = <0x2000 0x800>;

			};
@@ -259,7 +260,8 @@ memc@80000 { 
			ranges = <0x0 0x80000 0x80000>;



			memc-ddr@2000 {

				compatible = "brcm,brcmstb-memc-ddr";

				compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x",

					     "brcm,brcmstb-memc-ddr";

				reg = <0x2000 0x800>;

			};
@@ -281,7 +283,8 @@ memc@100000 { 
			ranges = <0x0 0x100000 0x80000>;



			memc-ddr@2000 {

				compatible = "brcm,brcmstb-memc-ddr";

				compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x",

					     "brcm,brcmstb-memc-ddr";

				reg = <0x2000 0x800>;

			};

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

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static void __init samsung_gpiolib_add(struct samsung_gpio_chip *chip) 
		gc->direction_input = samsung_gpiolib_2bit_input;

	if (!gc->direction_output)

		gc->direction_output = samsung_gpiolib_2bit_output;

	if (!gc->set)

	if (!gc->set_rv)

		gc->set_rv = samsung_gpiolib_set;

	if (!gc->get)

		gc->get = samsung_gpiolib_get;

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

+0 −3
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ / { 
	interrupt-parent = <&gic>;

	#address-cells = <2>;

	#size-cells = <2>;

	numa-node-id = <0>;



	reserved-memory {

		#address-cells = <2>;
@@ -341,7 +340,6 @@ cpu0: cpu@0 { 
			status = "okay";



			enable-method = "psci";

			numa-node-id = <0>;



			i-cache-size = <65536>;

			i-cache-line-size = <64>;
@@ -358,7 +356,6 @@ cpu1: cpu@1 { 
			status = "okay";



			enable-method = "psci";

			numa-node-id = <0>;



			i-cache-size = <65536>;

			i-cache-line-size = <64>;