Commit 0ec7dc8d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 

Pull MIPS fixes from Ralf Baechle:

 - Fix a flood of annoying build warnings

 - A number of fixes for Atheros 79xx platforms

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: ath79: Add a machine entry for booting OF machines
  MIPS: ath79: Fix the size of the MISC INTC registers in ar9132.dtsi
  MIPS: ath79: Fix the DDR control initialization on ar71xx and ar934x
  MIPS: Fix flood of warnings about comparsion being always true.
parents 94521b2f 55f1d598

arch/mips/ath79/setup.c

+6 −1
Original line number Diff line number Diff line
@@ -216,9 +216,9 @@ void __init plat_mem_setup(void) 
					   AR71XX_RESET_SIZE);

	ath79_pll_base = ioremap_nocache(AR71XX_PLL_BASE,

					 AR71XX_PLL_SIZE);

	ath79_detect_sys_type();

	ath79_ddr_ctrl_init();



	ath79_detect_sys_type();

	if (mips_machtype != ATH79_MACH_GENERIC_OF)

		detect_memory_region(0, ATH79_MEM_SIZE_MIN, ATH79_MEM_SIZE_MAX);
@@ -281,3 +281,8 @@ MIPS_MACHINE(ATH79_MACH_GENERIC, 
	     "Generic",

	     "Generic AR71XX/AR724X/AR913X based board",

	     ath79_generic_init);



MIPS_MACHINE(ATH79_MACH_GENERIC_OF,

	     "DTB",

	     "Generic AR71XX/AR724X/AR913X based board (DT)",

	     NULL);

arch/mips/boot/dts/qca/ar9132.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ 
			miscintc: interrupt-controller@18060010 {

				compatible = "qca,ar9132-misc-intc",

					   "qca,ar7100-misc-intc";

				reg = <0x18060010 0x4>;

				reg = <0x18060010 0x8>;



				interrupt-parent = <&cpuintc>;

				interrupts = <6>;

arch/mips/include/asm/page.h

+2 −1
Original line number Diff line number Diff line
@@ -200,8 +200,9 @@ static inline int pfn_valid(unsigned long pfn) 
{

	/* avoid <linux/mm.h> include hell */

	extern unsigned long max_mapnr;

	unsigned long pfn_offset = ARCH_PFN_OFFSET;



	return pfn >= ARCH_PFN_OFFSET && pfn < max_mapnr;

	return pfn >= pfn_offset && pfn < max_mapnr;

}



#elif defined(CONFIG_SPARSEMEM)

CRA Git | Maintained and supported by SUSTech CRA and CCSE