Commit c7edf197 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-fixes-for-5.1' of... 

Merge tag 'sunxi-fixes-for-5.1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes

Allwinner fixes for 5.1

 - Pinctrl related fixes for the A33 NAND controller
 - Fix the refcounting of DT nodes in our core code
 - Fix for a typo'd DT property

* tag 'sunxi-fixes-for-5.1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

:
  ARM: dts: sun8i: a33: Reintroduce default pinctrl muxing
  arm64: dts: allwinner: a64: Rename hpvcc-supply to cpvdd-supply
  ARM: sunxi: fix a leaked reference by adding missing of_node_put
  ARM: sunxi: fix a leaked reference by adding missing of_node_put

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f1e77642 fa44328f

arch/arm/boot/dts/sun8i-a23-a33.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ 
			clock-names = "ahb", "mod";

			resets = <&ccu RST_BUS_NAND>;

			reset-names = "ahb";

			pinctrl-names = "default";

			pinctrl-0 = <&nand_pins &nand_pins_cs0 &nand_pins_rb0>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

arch/arm/mach-sunxi/mc_smp.c

+4 −1
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static bool sunxi_core_is_cortex_a15(unsigned int core, unsigned int cluster) 
{

	struct device_node *node;

	int cpu = cluster * SUNXI_CPUS_PER_CLUSTER + core;

	bool is_compatible;



	node = of_cpu_device_node_get(cpu);
@@ -107,7 +108,9 @@ static bool sunxi_core_is_cortex_a15(unsigned int core, unsigned int cluster) 
		return false;

	}



	return of_device_is_compatible(node, "arm,cortex-a15");

	is_compatible = of_device_is_compatible(node, "arm,cortex-a15");

	of_node_put(node);

	return is_compatible;

}



static int sunxi_cpu_power_switch_set(unsigned int cpu, unsigned int cluster,

arch/arm/mach-sunxi/platsmp.c

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ static void __init sun6i_smp_prepare_cpus(unsigned int max_cpus) 
	}



	prcm_membase = of_iomap(node, 0);

	of_node_put(node);

	if (!prcm_membase) {

		pr_err("Couldn't map A31 PRCM registers\n");

		return;
@@ -63,6 +64,7 @@ static void __init sun6i_smp_prepare_cpus(unsigned int max_cpus) 
	}



	cpucfg_membase = of_iomap(node, 0);

	of_node_put(node);

	if (!cpucfg_membase)

		pr_err("Couldn't map A31 CPU config registers\n");
@@ -133,6 +135,7 @@ static void __init sun8i_smp_prepare_cpus(unsigned int max_cpus) 
	}



	prcm_membase = of_iomap(node, 0);

	of_node_put(node);

	if (!prcm_membase) {

		pr_err("Couldn't map A23 PRCM registers\n");

		return;
@@ -146,6 +149,7 @@ static void __init sun8i_smp_prepare_cpus(unsigned int max_cpus) 
	}



	cpucfg_membase = of_iomap(node, 0);

	of_node_put(node);

	if (!cpucfg_membase)

		pr_err("Couldn't map A23 CPU config registers\n");

arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ 
};



&codec_analog {

	hpvcc-supply = <&reg_eldo1>;

	cpvdd-supply = <&reg_eldo1>;

	status = "okay";

};

arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 
};



&codec_analog {

	hpvcc-supply = <&reg_eldo1>;

	cpvdd-supply = <&reg_eldo1>;

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE