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 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAl0AZXEACgkQh9CWnEQH BwRBjQ/9FBksBwgZ0mxziXOMaO26M3sD10Wd08whfS/FPnTx4VXeHaEaFhwR/hTU 32sTjWUhzC0LfBwVt53Nz6V3xLEBxEligQY1TS+Yb1JTKr732vMV1SQxhGlFpYbi or3g+CByAI5jky6oZ6E3SJ/Us7gcuGVDX6aLnpME31K1puvh5ETiWbU3o+1ESsFO mL1J9t9WJ2rtZ09rlPo1Oi+7/6qfr8gACFW0zjMnNmXg8vUg3zSnIWBe6TKpGD30 Ht6kZfWxQ+zlHZHluIkt9RkG8ItiWiFjpa8CHQYIrx2ReD5dsfZ1O7Y+mQksQpX5 tAZ99QTPIRowCxg6BM4ibRCcav6HGnfAfGsRZE0SgQ9SpVGxiSR/IJwxE334oNYE BY1trTXPRC5zrSwLjOfLPukq8GwlRvimPwdemV77P8+k7IEVA52BG95ZQi5YiR9s 9T5cSU6V073OVDKX1Ew66ivCdijcUn5eFbYgGt2V/u4hCAiwi9iBMmG8itkSMp+q 6rgteb5ew0SXfrWgj0YyDufEFri1AoZEhUsscqWt1JCNzCmmxe7cp6/NgkDMtj4B 4i4HXD0Y40G24ZwXnOowfRMwEnI+8UCQi7F7me8bSete3OhROVY20bUnZdpF0ca5 tk3PkDpEbdwqxTZTbBhuOdeuckTMfVXr5HetJoMyz9z9D8mlAi0= =CdUx -----END PGP SIGNATURE----- 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: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
b06c51debc
|
@ -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.
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue