ARM: OMAP2+: Remove unused legacy code for PRM (2a26d31b) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm/mach-omap2/prm3xxx.c

+7 −10

Original line number	Original line	Diff line number	Diff line
	@@ -690,6 +690,8 @@ static const struct of_device_id omap3_prm_dt_match_table[] = {

	static int omap3xxx_prm_late_init(void)		static int omap3xxx_prm_late_init(void)
	{		{
			struct device_node *np;
			int irq_num;
	int ret;		int ret;

	if (!(prm_features & PRM_HAS_IO_WAKEUP))		if (!(prm_features & PRM_HAS_IO_WAKEUP))
	@@ -702,17 +704,12 @@ static int omap3xxx_prm_late_init(void)
	omap3_prcm_irq_setup.reconfigure_io_chain =		omap3_prcm_irq_setup.reconfigure_io_chain =
	omap3430_pre_es3_1_reconfigure_io_chain;		omap3430_pre_es3_1_reconfigure_io_chain;

	if (of_have_populated_dt()) {
	struct device_node *np;
	int irq_num;

	np = of_find_matching_node(NULL, omap3_prm_dt_match_table);		np = of_find_matching_node(NULL, omap3_prm_dt_match_table);
	if (np) {		if (np) {
	irq_num = of_irq_get(np, 0);		irq_num = of_irq_get(np, 0);
	if (irq_num >= 0)		if (irq_num >= 0)
	omap3_prcm_irq_setup.irq = irq_num;		omap3_prcm_irq_setup.irq = irq_num;
	}		}
	}

	omap3xxx_prm_enable_io_wakeup();		omap3xxx_prm_enable_io_wakeup();
	ret = omap_prcm_register_chain_handler(&omap3_prcm_irq_setup);		ret = omap_prcm_register_chain_handler(&omap3_prcm_irq_setup);

arch/arm/mach-omap2/prm44xx.c

+0 −59

Original line number	Original line	Diff line number	Diff line
	@@ -336,27 +336,6 @@ static void omap44xx_prm_reconfigure_io_chain(void)
	return;		return;
	}		}

	/**
	* omap44xx_prm_enable_io_wakeup - enable wakeup events from I/O wakeup latches
	*
	* Activates the I/O wakeup event latches and allows events logged by
	* those latches to signal a wakeup event to the PRCM. For I/O wakeups
	* to occur, WAKEUPENABLE bits must be set in the pad mux registers, and
	* omap44xx_prm_reconfigure_io_chain() must be called. No return value.
	*/
	static void __init omap44xx_prm_enable_io_wakeup(void)
	{
	s32 inst = omap4_prmst_get_prm_dev_inst();

	if (inst == PRM_INSTANCE_UNKNOWN)
	return;

	omap4_prm_rmw_inst_reg_bits(OMAP4430_GLOBAL_WUEN_MASK,
	OMAP4430_GLOBAL_WUEN_MASK,
	inst,
	omap4_prcm_irq_setup.pm_ctrl);
	}

	/**		/**
	* omap44xx_prm_read_reset_sources - return the last SoC reset source		* omap44xx_prm_read_reset_sources - return the last SoC reset source
	*		*
	@@ -689,8 +668,6 @@ struct pwrdm_ops omap4_pwrdm_operations = {
	.pwrdm_has_voltdm = omap4_check_vcvp,		.pwrdm_has_voltdm = omap4_check_vcvp,
	};		};

	static int omap44xx_prm_late_init(void);

	/*		/*
	* XXX document		* XXX document
	*/		*/
	@@ -698,7 +675,6 @@ static struct prm_ll_data omap44xx_prm_ll_data = {
	.read_reset_sources = &omap44xx_prm_read_reset_sources,		.read_reset_sources = &omap44xx_prm_read_reset_sources,
	.was_any_context_lost_old = &omap44xx_prm_was_any_context_lost_old,		.was_any_context_lost_old = &omap44xx_prm_was_any_context_lost_old,
	.clear_context_loss_flags_old = &omap44xx_prm_clear_context_loss_flags_old,		.clear_context_loss_flags_old = &omap44xx_prm_clear_context_loss_flags_old,
	.late_init = &omap44xx_prm_late_init,
	.assert_hardreset = omap4_prminst_assert_hardreset,		.assert_hardreset = omap4_prminst_assert_hardreset,
	.deassert_hardreset = omap4_prminst_deassert_hardreset,		.deassert_hardreset = omap4_prminst_deassert_hardreset,
	.is_hardreset_asserted = omap4_prminst_is_hardreset_asserted,		.is_hardreset_asserted = omap4_prminst_is_hardreset_asserted,
	@@ -735,41 +711,6 @@ int __init omap44xx_prm_init(const struct omap_prcm_init_data *data)
	return prm_register(&omap44xx_prm_ll_data);		return prm_register(&omap44xx_prm_ll_data);
	}		}

	static int omap44xx_prm_late_init(void)
	{
	int irq_num;

	if (!(prm_features & PRM_HAS_IO_WAKEUP))
	return 0;

	/* OMAP4+ is DT only now */
	if (!of_have_populated_dt())
	return 0;

	irq_num = of_irq_get(prm_init_data->np, 0);
	/*
	* Already have OMAP4 IRQ num. For all other platforms, we need
	* IRQ numbers from DT
	*/
	if (irq_num < 0 && !(prm_init_data->flags & PRM_IRQ_DEFAULT)) {
	if (irq_num == -EPROBE_DEFER)
	return irq_num;

	/* Have nothing to do */
	return 0;
	}

	/* Once OMAP4 DT is filled as well */
	if (irq_num >= 0) {
	omap4_prcm_irq_setup.irq = irq_num;
	omap4_prcm_irq_setup.xlate_irq = NULL;
	}

	omap44xx_prm_enable_io_wakeup();

	return omap_prcm_register_chain_handler(&omap4_prcm_irq_setup);
	}

	static void __exit omap44xx_prm_exit(void)		static void __exit omap44xx_prm_exit(void)
	{		{
	prm_unregister(&omap44xx_prm_ll_data);		prm_unregister(&omap44xx_prm_ll_data);

arch/arm/mach-omap2/prm_common.c

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -267,10 +267,9 @@ int omap_prcm_register_chain_handler(struct omap_prcm_irq_setup *irq_setup)
	{		{
	int nr_regs;		int nr_regs;
	u32 mask[OMAP_PRCM_MAX_NR_PENDING_REG];		u32 mask[OMAP_PRCM_MAX_NR_PENDING_REG];
	int offset, i;		int offset, i, irq;
	struct irq_chip_generic *gc;		struct irq_chip_generic *gc;
	struct irq_chip_type *ct;		struct irq_chip_type *ct;
	unsigned int irq;

	if (!irq_setup)		if (!irq_setup)
	return -EINVAL;		return -EINVAL;
	@@ -344,10 +343,8 @@ int omap_prcm_register_chain_handler(struct omap_prcm_irq_setup *irq_setup)
	prcm_irq_chips[i] = gc;		prcm_irq_chips[i] = gc;
	}		}

	if (of_have_populated_dt()) {		irq = omap_prcm_event_to_irq("io");
	int irq = omap_prcm_event_to_irq("io");
	omap_pcs_legacy_init(irq, irq_setup->reconfigure_io_chain);		omap_pcs_legacy_init(irq, irq_setup->reconfigure_io_chain);
	}

	return 0;		return 0;