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

Commit 86d043d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_fixes_4.16_5' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips 

Pull MIPS fixes from James Hogan:
 "Another miscellaneous pile of MIPS fixes for 4.16:

   - lantiq: fixes for clocks and Amazon SE (4.14)

   - ralink: fix booting on MT7621 (4.5)

   - ralink: fix halt (3.9)"

* tag 'mips_fixes_4.16_5' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
  MIPS: ralink: Fix booting on MT7621
  MIPS: ralink: Remove ralink_halt()
  MIPS: lantiq: ase: Enable MFD_SYSCON
  MIPS: lantiq: Enable AHB Bus for USB
  MIPS: lantiq: Fix Danube USB clock
parents 095fe49f a63d706e

arch/mips/lantiq/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ choice 
config SOC_AMAZON_SE

	bool "Amazon SE"

	select SOC_TYPE_XWAY

	select MFD_SYSCON

	select MFD_CORE



config SOC_XWAY

	bool "XWAY"

arch/mips/lantiq/xway/sysctrl.c

+3 −3
Original line number Diff line number Diff line
@@ -549,9 +549,9 @@ void __init ltq_soc_init(void) 
		clkdev_add_static(ltq_ar9_cpu_hz(), ltq_ar9_fpi_hz(),

				ltq_ar9_fpi_hz(), CLOCK_250M);

		clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 0, PMU_USB0_P);

		clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0);

		clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0 | PMU_AHBM);

		clkdev_add_pmu("1f203034.usb2-phy", "phy", 1, 0, PMU_USB1_P);

		clkdev_add_pmu("1e106000.usb", "otg", 1, 0, PMU_USB1);

		clkdev_add_pmu("1e106000.usb", "otg", 1, 0, PMU_USB1 | PMU_AHBM);

		clkdev_add_pmu("1e180000.etop", "switch", 1, 0, PMU_SWITCH);

		clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO);

		clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);
@@ -560,7 +560,7 @@ void __init ltq_soc_init(void) 
	} else {

		clkdev_add_static(ltq_danube_cpu_hz(), ltq_danube_fpi_hz(),

				ltq_danube_fpi_hz(), ltq_danube_pp32_hz());

		clkdev_add_pmu("1f203018.usb2-phy", "ctrl", 1, 0, PMU_USB0);

		clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0 | PMU_AHBM);

		clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 0, PMU_USB0_P);

		clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO);

		clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);

arch/mips/ralink/mt7621.c

+22 −20
Original line number Diff line number Diff line
@@ -170,6 +170,28 @@ void prom_soc_init(struct ralink_soc_info *soc_info) 
	u32 n1;

	u32 rev;



	/* Early detection of CMP support */

	mips_cm_probe();

	mips_cpc_probe();



	if (mips_cps_numiocu(0)) {

		/*

		 * mips_cm_probe() wipes out bootloader

		 * config for CM regions and we have to configure them

		 * again. This SoC cannot talk to pamlbus devices

		 * witout proper iocu region set up.

		 *

		 * FIXME: it would be better to do this with values

		 * from DT, but we need this very early because

		 * without this we cannot talk to pretty much anything

		 * including serial.

		 */

		write_gcr_reg0_base(MT7621_PALMBUS_BASE);

		write_gcr_reg0_mask(~MT7621_PALMBUS_SIZE |

				    CM_GCR_REGn_MASK_CMTGT_IOCU0);

		__sync();

	}



	n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0);

	n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1);
@@ -194,26 +216,6 @@ void prom_soc_init(struct ralink_soc_info *soc_info) 


	rt2880_pinmux_data = mt7621_pinmux_data;



	/* Early detection of CMP support */

	mips_cm_probe();

	mips_cpc_probe();



	if (mips_cps_numiocu(0)) {

		/*

		 * mips_cm_probe() wipes out bootloader

		 * config for CM regions and we have to configure them

		 * again. This SoC cannot talk to pamlbus devices

		 * witout proper iocu region set up.

		 *

		 * FIXME: it would be better to do this with values

		 * from DT, but we need this very early because

		 * without this we cannot talk to pretty much anything

		 * including serial.

		 */

		write_gcr_reg0_base(MT7621_PALMBUS_BASE);

		write_gcr_reg0_mask(~MT7621_PALMBUS_SIZE |

				    CM_GCR_REGn_MASK_CMTGT_IOCU0);

	}



	if (!register_cps_smp_ops())

		return;

arch/mips/ralink/reset.c

+0 −7
Original line number Diff line number Diff line
@@ -96,16 +96,9 @@ static void ralink_restart(char *command) 
	unreachable();

}



static void ralink_halt(void)

{

	local_irq_disable();

	unreachable();

}



static int __init mips_reboot_setup(void)

{

	_machine_restart = ralink_restart;

	_machine_halt = ralink_halt;



	return 0;

}