Commit 6785e3cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips-fixes_6.10_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Thomas Bogendoerfer:

 - fix for BCM6538 boards

 - fix RB532 PCI workaround

* tag 'mips-fixes_6.10_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  Revert "MIPS: pci: lantiq: restore reset gpio polarity"
  mips: bmips: BCM6358: make sure CBR is correctly set
  MIPS: pci: lantiq: restore reset gpio polarity
  MIPS: Routerboard 532: Fix vendor retry check code
parents 92e5605a 6e5aee08

arch/mips/bmips/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ static void bcm6358_quirks(void) 
	 * RAC flush causes kernel panics on BCM6358 when booting from TP1

	 * because the bootloader is not initializing it properly.

	 */

	bmips_rac_flush_disable = !!(read_c0_brcm_cmt_local() & (1 << 31));

	bmips_rac_flush_disable = !!(read_c0_brcm_cmt_local() & (1 << 31)) ||

				  !!BMIPS_GET_CBR();

}



static void bcm6368_quirks(void)

arch/mips/pci/ops-rc32434.c

+2 −2
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ static int read_config_dword(struct pci_bus *bus, unsigned int devfn, 
	 * gives them time to settle

	 */

	if (where == PCI_VENDOR_ID) {

		if (ret == 0xffffffff || ret == 0x00000000 ||

		    ret == 0x0000ffff || ret == 0xffff0000) {

		if (*val == 0xffffffff || *val == 0x00000000 ||

		    *val == 0x0000ffff || *val == 0xffff0000) {

			if (delay > 4)

				return 0;

			delay *= 2;