Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ed0b8a7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-4.12/drivers' of http://github.com/Broadcom/stblinux into next/drivers 

Pull "Broadcom drivers changes for 4.12" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoC drivers updates for 4.12,
please pull the following changes:

- Florian updates the Broadcom STB GISB arbiter driver with a bunch of
  compatible strings for MIPS-based STBs found under arch/mips/boot/dts/brcm/ in
  order for the SoC identification driver to recognize these chips

* tag 'arm-soc/for-4.12/drivers' of http://github.com/Broadcom/stblinux:
  soc: bcm: brcmstb: Match additional compatible strings
parents 99b19a1f bd0faf08

drivers/soc/bcm/brcmstb/common.c

+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,15 @@ bool soc_is_brcmstb(void) 
}



static const struct of_device_id sun_top_ctrl_match[] = {

	{ .compatible = "brcm,bcm7125-sun-top-ctrl", },

	{ .compatible = "brcm,bcm7346-sun-top-ctrl", },

	{ .compatible = "brcm,bcm7358-sun-top-ctrl", },

	{ .compatible = "brcm,bcm7360-sun-top-ctrl", },

	{ .compatible = "brcm,bcm7362-sun-top-ctrl", },

	{ .compatible = "brcm,bcm7420-sun-top-ctrl", },

	{ .compatible = "brcm,bcm7425-sun-top-ctrl", },

	{ .compatible = "brcm,bcm7429-sun-top-ctrl", },

	{ .compatible = "brcm,bcm7425-sun-top-ctrl", },

	{ .compatible = "brcm,brcmstb-sun-top-ctrl", },

	{ }

};