Commit 599d1691 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips-fixes_5.19_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Thomas Bogendoerfer:

 - several refcount fixes

 - added missing clock for ingenic

 - fix wrong irq_err_count for vr41xx

* tag 'mips-fixes_5.19_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  mips: lantiq: Add missing of_node_put() in irq.c
  mips: dts: ingenic: Add TCU clock to x1000/x1830 tcu device node
  mips/pic32/pic32mzda: Fix refcount leak bugs
  mips: lantiq: xway: Fix refcount leak bug in sysctrl
  mips: lantiq: falcon: Fix refcount leak bug in sysctrl
  mips: ralink: Fix refcount leak in of.c
  mips: mti-malta: Fix refcount leak in malta-time.c
  arch: mips: generic: Add missing of_node_put() in board-ranchu.c
  MIPS: Remove repetitive increase irq_err_count
parents 399bd66e 3748d218

arch/mips/boot/dts/ingenic/x1000.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -111,8 +111,9 @@ 


		clocks = <&cgu X1000_CLK_RTCLK>,

			 <&cgu X1000_CLK_EXCLK>,

			 <&cgu X1000_CLK_PCLK>;

		clock-names = "rtc", "ext", "pclk";

			 <&cgu X1000_CLK_PCLK>,

			 <&cgu X1000_CLK_TCU>;

		clock-names = "rtc", "ext", "pclk", "tcu";



		interrupt-controller;

		#interrupt-cells = <1>;

arch/mips/boot/dts/ingenic/x1830.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -104,8 +104,9 @@ 


		clocks = <&cgu X1830_CLK_RTCLK>,

			 <&cgu X1830_CLK_EXCLK>,

			 <&cgu X1830_CLK_PCLK>;

		clock-names = "rtc", "ext", "pclk";

			 <&cgu X1830_CLK_PCLK>,

			 <&cgu X1830_CLK_TCU>;

		clock-names = "rtc", "ext", "pclk", "tcu";



		interrupt-controller;

		#interrupt-cells = <1>;

arch/mips/generic/board-ranchu.c

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static __init unsigned int ranchu_measure_hpt_freq(void) 
		      __func__);



	rtc_base = of_iomap(np, 0);

	of_node_put(np);

	if (!rtc_base)

		panic("%s(): Failed to ioremap Goldfish RTC base!", __func__);

arch/mips/lantiq/falcon/sysctrl.c

+6 −0
Original line number Diff line number Diff line
@@ -208,6 +208,12 @@ void __init ltq_soc_init(void) 
			of_address_to_resource(np_sysgpe, 0, &res_sys[2]))

		panic("Failed to get core resources");



	of_node_put(np_status);

	of_node_put(np_ebu);

	of_node_put(np_sys1);

	of_node_put(np_syseth);

	of_node_put(np_sysgpe);



	if ((request_mem_region(res_status.start, resource_size(&res_status),

				res_status.name) < 0) ||

		(request_mem_region(res_ebu.start, resource_size(&res_ebu),

arch/mips/lantiq/irq.c

+1 −0
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent) 
		if (!ltq_eiu_membase)

			panic("Failed to remap eiu memory");

	}

	of_node_put(eiu_node);



	return 0;

}