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

Merge tag 'arm-soc/for-5.3/soc' of https://github.com/Broadcom/stblinux into arm/soc 

This pull request contains Broadcom ARM-based SoC Kconfig/machine
changes for 5.3, please pull the following:

- Wen fixes a missing referenc count on the CPU device_node object
  throughout mach-bcm/

- Jim adds the ability for ARCH_BRCMSTB to use reset controllers

- Doug adds the ability for ARCH_BRCMSTB to use the PINCTRL framework

* tag 'arm-soc/for-5.3/soc' of https://github.com/Broadcom/stblinux

:
  ARM: bcm: Enable PINCTRL for ARCH_BRCMSTB
  ARM: bcm: Enable ARCH_HAS_RESET_CONTROLLER for ARCH_BRCMSTB
  ARM: bcm: fix a leaked reference by adding missing of_node_put

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4ab3a3e7 885895a8

arch/arm/mach-bcm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ config ARCH_BCM_63XX 
config ARCH_BRCMSTB

	bool "Broadcom BCM7XXX based boards"

	depends on ARCH_MULTI_V7

	select ARCH_HAS_RESET_CONTROLLER

	select ARM_GIC

	select ARM_ERRATA_798181 if SMP

	select HAVE_ARM_ARCH_TIMER
@@ -217,6 +218,7 @@ config ARCH_BRCMSTB 
	select ZONE_DMA if ARM_LPAE

	select SOC_BRCMSTB

	select SOC_BUS

	select PINCTRL

	help

	  Say Y if you intend to run the kernel on a Broadcom ARM-based STB

	  chipset.

arch/arm/mach-bcm/bcm63xx_smp.c

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ static int bcm63138_smp_boot_secondary(unsigned int cpu, 
	 * return

	 */

	ret = bcm63xx_pmb_power_on_cpu(dn);

	of_node_put(dn);

	if (ret)

		goto out;

out:

arch/arm/mach-bcm/board_bcm281xx.c

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ static void bcm281xx_restart(enum reboot_mode mode, const char *cmd) 
		return;

	}

	base = of_iomap(np_wdog, 0);

	of_node_put(np_wdog);

	if (!base) {

		pr_emerg("Couldn't map brcm,kona-wdt\n");

		return;

arch/arm/mach-bcm/platsmp-brcmstb.c

+5 −2
Original line number Diff line number Diff line
@@ -334,11 +334,14 @@ static void __init brcmstb_cpu_ctrl_setup(unsigned int max_cpus) 


	rc = setup_hifcpubiuctrl_regs(np);

	if (rc)

		return;

		goto out_put_node;



	rc = setup_hifcont_regs(np);

	if (rc)

		return;

		goto out_put_node;



out_put_node:

	of_node_put(np);

}



static int brcmstb_boot_secondary(unsigned int cpu, struct task_struct *idle)

CRA Git | Maintained and supported by SUSTech CRA and CCSE