Commit 45a5ac7a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_fixes_5.8_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Thomas Bogendoerfer:

 - fix for missing hazard barrier

 - DT fix for ingenic

 - DT fix of GPHY names for lantiq

 - fix usage of smp_processor_id() while preemption is enabled

* tag 'mips_fixes_5.8_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Do not use smp_processor_id() in preemptible code
  MIPS: Add missing EHB in mtc0 -> mfc0 sequence for DSPen
  MIPS: ingenic: gcw0: Fix HP detection GPIO.
  MIPS: lantiq: xway: sysctrl: fix the GPHY clock alias names
parents 9bc0b029 5868347a

arch/mips/boot/dts/ingenic/gcw0.dts

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
			"MIC1N", "Built-in Mic";

		simple-audio-card,pin-switches = "Speaker", "Headphones";



		simple-audio-card,hp-det-gpio = <&gpf 21 GPIO_ACTIVE_HIGH>;

		simple-audio-card,hp-det-gpio = <&gpf 21 GPIO_ACTIVE_LOW>;

		simple-audio-card,aux-devs = <&speaker_amp>, <&headphones_amp>;



		simple-audio-card,bitclock-master = <&dai_codec>;

arch/mips/kernel/traps.c

+6 −3
Original line number Diff line number Diff line
@@ -723,12 +723,14 @@ static int simulate_loongson3_cpucfg(struct pt_regs *regs, 
		perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, regs, 0);



		/* Do not emulate on unsupported core models. */

		if (!loongson3_cpucfg_emulation_enabled(&current_cpu_data))

		preempt_disable();

		if (!loongson3_cpucfg_emulation_enabled(&current_cpu_data)) {

			preempt_enable();

			return -1;



		}

		regs->regs[rd] = loongson3_cpucfg_read_synthesized(

			&current_cpu_data, sel);



		preempt_enable();

		return 0;

	}
@@ -2169,6 +2171,7 @@ static void configure_status(void) 


	change_c0_status(ST0_CU|ST0_MX|ST0_RE|ST0_FR|ST0_BEV|ST0_TS|ST0_KX|ST0_SX|ST0_UX,

			 status_set);

	back_to_back_c0_hazard();

}



unsigned int hwrena;

arch/mips/lantiq/xway/sysctrl.c

+4 −4
Original line number Diff line number Diff line
@@ -514,8 +514,8 @@ void __init ltq_soc_init(void) 
		clkdev_add_pmu("1e10b308.eth", NULL, 0, 0, PMU_SWITCH |

			       PMU_PPE_DP | PMU_PPE_TC);

		clkdev_add_pmu("1da00000.usif", "NULL", 1, 0, PMU_USIF);

		clkdev_add_pmu("1e108000.gswip", "gphy0", 0, 0, PMU_GPHY);

		clkdev_add_pmu("1e108000.gswip", "gphy1", 0, 0, PMU_GPHY);

		clkdev_add_pmu("1e108000.switch", "gphy0", 0, 0, PMU_GPHY);

		clkdev_add_pmu("1e108000.switch", "gphy1", 0, 0, PMU_GPHY);

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

		clkdev_add_pmu("1e116000.mei", "afe", 1, 2, PMU_ANALOG_DSL_AFE);

		clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);
@@ -538,8 +538,8 @@ void __init ltq_soc_init(void) 
				PMU_SWITCH | PMU_PPE_DPLUS | PMU_PPE_DPLUM |

				PMU_PPE_EMA | PMU_PPE_TC | PMU_PPE_SLL01 |

				PMU_PPE_QSB | PMU_PPE_TOP);

		clkdev_add_pmu("1e108000.gswip", "gphy0", 0, 0, PMU_GPHY);

		clkdev_add_pmu("1e108000.gswip", "gphy1", 0, 0, PMU_GPHY);

		clkdev_add_pmu("1e108000.switch", "gphy0", 0, 0, PMU_GPHY);

		clkdev_add_pmu("1e108000.switch", "gphy1", 0, 0, PMU_GPHY);

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

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

		clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);

CRA Git | Maintained and supported by SUSTech CRA and CCSE