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

Commit 30a69ef7 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Move DT wake-up event handling over to use pinctrl-single-omap 



Now pinctrl-single-omap can handle the wake-up events for us now
as long as the events are configured in the .dts files.

Done in collaboration with Roger Quadros <rogerq@ti.com>.

Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Prakash Manjunathappa <prakash.pm@ti.com>
Cc: Roger Quadros <rogerq@ti.com>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarKevin Hilman <khilman@linaro.org>
Tested-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 8651bd8c

arch/arm/boot/dts/omap3.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ 
			reg = <0x48002030 0x05cc>;

			#address-cells = <1>;

			#size-cells = <0>;

			#interrupt-cells = <1>;

			interrupt-controller;

			pinctrl-single,register-width = <16>;

			pinctrl-single,function-mask = <0x7f1f>;

		};
@@ -116,6 +118,8 @@ 
			reg = <0x48002a00 0x5c>;

			#address-cells = <1>;

			#size-cells = <0>;

			#interrupt-cells = <1>;

			interrupt-controller;

			pinctrl-single,register-width = <16>;

			pinctrl-single,function-mask = <0x7f1f>;

		};

arch/arm/boot/dts/omap4.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ 
			reg = <0x4a100040 0x0196>;

			#address-cells = <1>;

			#size-cells = <0>;

			#interrupt-cells = <1>;

			interrupt-controller;

			pinctrl-single,register-width = <16>;

			pinctrl-single,function-mask = <0x7fff>;

		};
@@ -122,6 +124,8 @@ 
			reg = <0x4a31e040 0x0038>;

			#address-cells = <1>;

			#size-cells = <0>;

			#interrupt-cells = <1>;

			interrupt-controller;

			pinctrl-single,register-width = <16>;

			pinctrl-single,function-mask = <0x7fff>;

		};

arch/arm/mach-omap2/mux.c

+6 −2
Original line number Diff line number Diff line
@@ -811,6 +811,12 @@ int __init omap_mux_late_init(void) 
		}

	}



	omap_mux_dbg_init();



	/* see pinctrl-single-omap for the wake-up interrupt handling */

	if (of_have_populated_dt())

		return 0;



	ret = request_irq(omap_prcm_event_to_irq("io"),

		omap_hwmod_mux_handle_irq, IRQF_SHARED | IRQF_NO_SUSPEND,

			"hwmod_io", omap_mux_late_init);
@@ -818,8 +824,6 @@ int __init omap_mux_late_init(void) 
	if (ret)

		pr_warning("mux: Failed to setup hwmod io irq %d\n", ret);



	omap_mux_dbg_init();



	return 0;

}

arch/arm/mach-omap2/pdata-quirks.c

+18 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include <linux/of_platform.h>

#include <linux/wl12xx.h>



#include <linux/platform_data/pinctrl-single.h>



#include "common.h"

#include "common-board-devices.h"

#include "dss-common.h"
@@ -105,7 +107,23 @@ static void __init omap5_uevm_legacy_init(void) 
}

#endif



static struct pcs_pdata pcs_pdata;



void omap_pcs_legacy_init(int irq, void (*rearm)(void))

{

	pcs_pdata.irq = irq;

	pcs_pdata.rearm = rearm;

}



struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {

#ifdef CONFIG_ARCH_OMAP3

	OF_DEV_AUXDATA("ti,omap3-padconf", 0x48002030, "48002030.pinmux", &pcs_pdata),

	OF_DEV_AUXDATA("ti,omap3-padconf", 0x48002a00, "48002a00.pinmux", &pcs_pdata),

#endif

#ifdef CONFIG_ARCH_OMAP4

	OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a100040, "4a100040.pinmux", &pcs_pdata),

	OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a31e040, "4a31e040.pinmux", &pcs_pdata),

#endif

	{ /* sentinel */ },

};

arch/arm/mach-omap2/prm3xxx.h

+7 −1
Original line number Diff line number Diff line
@@ -144,7 +144,13 @@ extern u32 omap3_prm_vcvp_read(u8 offset); 
extern void omap3_prm_vcvp_write(u32 val, u8 offset);

extern u32 omap3_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset);



extern void omap3xxx_prm_reconfigure_io_chain(void);

#ifdef CONFIG_ARCH_OMAP3

void omap3xxx_prm_reconfigure_io_chain(void);

#else

static inline void omap3xxx_prm_reconfigure_io_chain(void)

{

}

#endif



/* PRM interrupt-related functions */

extern void omap3xxx_prm_read_pending_irqs(unsigned long *events);