From: Peter Ujfalusi <peter.ujfalusi@ti.com> To: Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>, Mark Brown <broonie@opensource.wolfsonmicro.com>, Samuel Ortiz <sameo@linux.intel.com>, Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: linux-input@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, Peter Ujfalusi <peter.ujfalusi@ti.com> Subject: [PATCH v6 01/18] OMAP: New twl-common for common TWL configuration Date: Tue, 21 Jun 2011 16:38:59 +0300 [thread overview] Message-ID: <1308663556-29120-2-git-send-email-peter.ujfalusi@ti.com> (raw) In-Reply-To: <1308663556-29120-1-git-send-email-peter.ujfalusi@ti.com> Introduce a new file, which will be used to configure common pmic (TWL) devices, regulators, and TWL audio. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/common-board-devices.c | 21 ------------- arch/arm/mach-omap2/common-board-devices.h | 26 +-------------- arch/arm/mach-omap2/twl-common.c | 46 ++++++++++++++++++++++++++++ arch/arm/mach-omap2/twl-common.h | 28 +++++++++++++++++ 5 files changed, 77 insertions(+), 46 deletions(-) create mode 100644 arch/arm/mach-omap2/twl-common.c create mode 100644 arch/arm/mach-omap2/twl-common.h diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index b148077..fee192e 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -269,4 +269,4 @@ obj-$(CONFIG_ARCH_OMAP4) += hwspinlock.o disp-$(CONFIG_OMAP2_DSS) := display.o obj-y += $(disp-m) $(disp-y) -obj-y += common-board-devices.o +obj-y += common-board-devices.o twl-common.o diff --git a/arch/arm/mach-omap2/common-board-devices.c b/arch/arm/mach-omap2/common-board-devices.c index 94ccf46..5e03b2e 100644 --- a/arch/arm/mach-omap2/common-board-devices.c +++ b/arch/arm/mach-omap2/common-board-devices.c @@ -20,36 +20,15 @@ * */ -#include <linux/i2c.h> -#include <linux/i2c/twl.h> - #include <linux/gpio.h> #include <linux/spi/spi.h> #include <linux/spi/ads7846.h> -#include <plat/i2c.h> #include <plat/mcspi.h> #include <plat/nand.h> #include "common-board-devices.h" -static struct i2c_board_info __initdata pmic_i2c_board_info = { - .addr = 0x48, - .flags = I2C_CLIENT_WAKE, -}; - -void __init omap_pmic_init(int bus, u32 clkrate, - const char *pmic_type, int pmic_irq, - struct twl4030_platform_data *pmic_data) -{ - strncpy(pmic_i2c_board_info.type, pmic_type, - sizeof(pmic_i2c_board_info.type)); - pmic_i2c_board_info.irq = pmic_irq; - pmic_i2c_board_info.platform_data = pmic_data; - - omap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1); -} - #if defined(CONFIG_TOUCHSCREEN_ADS7846) || \ defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) static struct omap2_mcspi_device_config ads7846_mcspi_config = { diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h index 6797190..a0b4a428 100644 --- a/arch/arm/mach-omap2/common-board-devices.h +++ b/arch/arm/mach-omap2/common-board-devices.h @@ -1,33 +1,11 @@ #ifndef __OMAP_COMMON_BOARD_DEVICES__ #define __OMAP_COMMON_BOARD_DEVICES__ +#include "twl-common.h" + #define NAND_BLOCK_SIZE SZ_128K -struct twl4030_platform_data; struct mtd_partition; - -void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq, - struct twl4030_platform_data *pmic_data); - -static inline void omap2_pmic_init(const char *pmic_type, - struct twl4030_platform_data *pmic_data) -{ - omap_pmic_init(2, 2600, pmic_type, INT_24XX_SYS_NIRQ, pmic_data); -} - -static inline void omap3_pmic_init(const char *pmic_type, - struct twl4030_platform_data *pmic_data) -{ - omap_pmic_init(1, 2600, pmic_type, INT_34XX_SYS_NIRQ, pmic_data); -} - -static inline void omap4_pmic_init(const char *pmic_type, - struct twl4030_platform_data *pmic_data) -{ - /* Phoenix Audio IC needs I2C1 to start with 400 KHz or less */ - omap_pmic_init(1, 400, pmic_type, OMAP44XX_IRQ_SYS_1N, pmic_data); -} - struct ads7846_platform_data; void omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce, diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c new file mode 100644 index 0000000..4f7b24c --- /dev/null +++ b/arch/arm/mach-omap2/twl-common.c @@ -0,0 +1,46 @@ +/* + * twl-common.c + * + * Copyright (C) 2011 Texas Instruments, Inc.. + * Author: Peter Ujfalusi <peter.ujfalusi@ti.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + * + */ + +#include <linux/i2c.h> +#include <linux/i2c/twl.h> +#include <linux/gpio.h> + +#include <plat/i2c.h> + +#include "twl-common.h" + +static struct i2c_board_info __initdata pmic_i2c_board_info = { + .addr = 0x48, + .flags = I2C_CLIENT_WAKE, +}; + +void __init omap_pmic_init(int bus, u32 clkrate, + const char *pmic_type, int pmic_irq, + struct twl4030_platform_data *pmic_data) +{ + strncpy(pmic_i2c_board_info.type, pmic_type, + sizeof(pmic_i2c_board_info.type)); + pmic_i2c_board_info.irq = pmic_irq; + pmic_i2c_board_info.platform_data = pmic_data; + + omap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1); +} diff --git a/arch/arm/mach-omap2/twl-common.h b/arch/arm/mach-omap2/twl-common.h new file mode 100644 index 0000000..e9fe2ab --- /dev/null +++ b/arch/arm/mach-omap2/twl-common.h @@ -0,0 +1,28 @@ +#ifndef __OMAP_PMIC_COMMON__ +#define __OMAP_PMIC_COMMON__ + +struct twl4030_platform_data; + +void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq, + struct twl4030_platform_data *pmic_data); + +static inline void omap2_pmic_init(const char *pmic_type, + struct twl4030_platform_data *pmic_data) +{ + omap_pmic_init(2, 2600, pmic_type, INT_24XX_SYS_NIRQ, pmic_data); +} + +static inline void omap3_pmic_init(const char *pmic_type, + struct twl4030_platform_data *pmic_data) +{ + omap_pmic_init(1, 2600, pmic_type, INT_34XX_SYS_NIRQ, pmic_data); +} + +static inline void omap4_pmic_init(const char *pmic_type, + struct twl4030_platform_data *pmic_data) +{ + /* Phoenix Audio IC needs I2C1 to start with 400 KHz or less */ + omap_pmic_init(1, 400, pmic_type, OMAP44XX_IRQ_SYS_1N, pmic_data); +} + +#endif /* __OMAP_PMIC_COMMON__ */ -- 1.7.5.3
WARNING: multiple messages have this Message-ID (diff)
From: Peter Ujfalusi <peter.ujfalusi@ti.com> To: Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>, Mark Brown <broonie@opensource.wolfsonmicro.com>, Samuel Ortiz <sameo@linux.intel.com>, Dmitry Torokhov <dmitry.torokhov@> Cc: linux-input@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, Peter Ujfalusi <peter.ujfalusi@ti.com> Subject: [PATCH v6 01/18] OMAP: New twl-common for common TWL configuration Date: Tue, 21 Jun 2011 16:38:59 +0300 [thread overview] Message-ID: <1308663556-29120-2-git-send-email-peter.ujfalusi@ti.com> (raw) In-Reply-To: <1308663556-29120-1-git-send-email-peter.ujfalusi@ti.com> Introduce a new file, which will be used to configure common pmic (TWL) devices, regulators, and TWL audio. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/common-board-devices.c | 21 ------------- arch/arm/mach-omap2/common-board-devices.h | 26 +-------------- arch/arm/mach-omap2/twl-common.c | 46 ++++++++++++++++++++++++++++ arch/arm/mach-omap2/twl-common.h | 28 +++++++++++++++++ 5 files changed, 77 insertions(+), 46 deletions(-) create mode 100644 arch/arm/mach-omap2/twl-common.c create mode 100644 arch/arm/mach-omap2/twl-common.h diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index b148077..fee192e 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -269,4 +269,4 @@ obj-$(CONFIG_ARCH_OMAP4) += hwspinlock.o disp-$(CONFIG_OMAP2_DSS) := display.o obj-y += $(disp-m) $(disp-y) -obj-y += common-board-devices.o +obj-y += common-board-devices.o twl-common.o diff --git a/arch/arm/mach-omap2/common-board-devices.c b/arch/arm/mach-omap2/common-board-devices.c index 94ccf46..5e03b2e 100644 --- a/arch/arm/mach-omap2/common-board-devices.c +++ b/arch/arm/mach-omap2/common-board-devices.c @@ -20,36 +20,15 @@ * */ -#include <linux/i2c.h> -#include <linux/i2c/twl.h> - #include <linux/gpio.h> #include <linux/spi/spi.h> #include <linux/spi/ads7846.h> -#include <plat/i2c.h> #include <plat/mcspi.h> #include <plat/nand.h> #include "common-board-devices.h" -static struct i2c_board_info __initdata pmic_i2c_board_info = { - .addr = 0x48, - .flags = I2C_CLIENT_WAKE, -}; - -void __init omap_pmic_init(int bus, u32 clkrate, - const char *pmic_type, int pmic_irq, - struct twl4030_platform_data *pmic_data) -{ - strncpy(pmic_i2c_board_info.type, pmic_type, - sizeof(pmic_i2c_board_info.type)); - pmic_i2c_board_info.irq = pmic_irq; - pmic_i2c_board_info.platform_data = pmic_data; - - omap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1); -} - #if defined(CONFIG_TOUCHSCREEN_ADS7846) || \ defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) static struct omap2_mcspi_device_config ads7846_mcspi_config = { diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h index 6797190..a0b4a428 100644 --- a/arch/arm/mach-omap2/common-board-devices.h +++ b/arch/arm/mach-omap2/common-board-devices.h @@ -1,33 +1,11 @@ #ifndef __OMAP_COMMON_BOARD_DEVICES__ #define __OMAP_COMMON_BOARD_DEVICES__ +#include "twl-common.h" + #define NAND_BLOCK_SIZE SZ_128K -struct twl4030_platform_data; struct mtd_partition; - -void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq, - struct twl4030_platform_data *pmic_data); - -static inline void omap2_pmic_init(const char *pmic_type, - struct twl4030_platform_data *pmic_data) -{ - omap_pmic_init(2, 2600, pmic_type, INT_24XX_SYS_NIRQ, pmic_data); -} - -static inline void omap3_pmic_init(const char *pmic_type, - struct twl4030_platform_data *pmic_data) -{ - omap_pmic_init(1, 2600, pmic_type, INT_34XX_SYS_NIRQ, pmic_data); -} - -static inline void omap4_pmic_init(const char *pmic_type, - struct twl4030_platform_data *pmic_data) -{ - /* Phoenix Audio IC needs I2C1 to start with 400 KHz or less */ - omap_pmic_init(1, 400, pmic_type, OMAP44XX_IRQ_SYS_1N, pmic_data); -} - struct ads7846_platform_data; void omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce, diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c new file mode 100644 index 0000000..4f7b24c --- /dev/null +++ b/arch/arm/mach-omap2/twl-common.c @@ -0,0 +1,46 @@ +/* + * twl-common.c + * + * Copyright (C) 2011 Texas Instruments, Inc.. + * Author: Peter Ujfalusi <peter.ujfalusi@ti.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + * + */ + +#include <linux/i2c.h> +#include <linux/i2c/twl.h> +#include <linux/gpio.h> + +#include <plat/i2c.h> + +#include "twl-common.h" + +static struct i2c_board_info __initdata pmic_i2c_board_info = { + .addr = 0x48, + .flags = I2C_CLIENT_WAKE, +}; + +void __init omap_pmic_init(int bus, u32 clkrate, + const char *pmic_type, int pmic_irq, + struct twl4030_platform_data *pmic_data) +{ + strncpy(pmic_i2c_board_info.type, pmic_type, + sizeof(pmic_i2c_board_info.type)); + pmic_i2c_board_info.irq = pmic_irq; + pmic_i2c_board_info.platform_data = pmic_data; + + omap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1); +} diff --git a/arch/arm/mach-omap2/twl-common.h b/arch/arm/mach-omap2/twl-common.h new file mode 100644 index 0000000..e9fe2ab --- /dev/null +++ b/arch/arm/mach-omap2/twl-common.h @@ -0,0 +1,28 @@ +#ifndef __OMAP_PMIC_COMMON__ +#define __OMAP_PMIC_COMMON__ + +struct twl4030_platform_data; + +void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq, + struct twl4030_platform_data *pmic_data); + +static inline void omap2_pmic_init(const char *pmic_type, + struct twl4030_platform_data *pmic_data) +{ + omap_pmic_init(2, 2600, pmic_type, INT_24XX_SYS_NIRQ, pmic_data); +} + +static inline void omap3_pmic_init(const char *pmic_type, + struct twl4030_platform_data *pmic_data) +{ + omap_pmic_init(1, 2600, pmic_type, INT_34XX_SYS_NIRQ, pmic_data); +} + +static inline void omap4_pmic_init(const char *pmic_type, + struct twl4030_platform_data *pmic_data) +{ + /* Phoenix Audio IC needs I2C1 to start with 400 KHz or less */ + omap_pmic_init(1, 400, pmic_type, OMAP44XX_IRQ_SYS_1N, pmic_data); +} + +#endif /* __OMAP_PMIC_COMMON__ */ -- 1.7.5.3
next prev parent reply other threads:[~2011-06-21 14:39 UTC|newest] Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-06-21 13:38 [PATCH v6 00/18] MFD/ASoC/Input: TWL4030/TWL60X0 changes Peter Ujfalusi 2011-06-21 13:38 ` Peter Ujfalusi 2011-06-21 13:38 ` Peter Ujfalusi [this message] 2011-06-21 13:38 ` [PATCH v6 01/18] OMAP: New twl-common for common TWL configuration Peter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 02/18] OMAP4: Move common twl6030 configuration to twl-common Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 03/18] OMAP3: Move common twl " Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 04/18] OMAP3: Move common regulator " Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 05/18] MFD: twl4030-codec: Rename internals from codec to audio Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 06/18] MFD: twl4030-codec -> twl4030-audio: Rename the driver Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 07/18] MFD: twl4030-audio: Rename platform data Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 08/18] mfd: twl6040: Add initial support Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-07-04 11:48 ` Samuel Ortiz 2011-07-04 13:11 ` Péter Ujfalusi 2011-07-04 13:11 ` Péter Ujfalusi 2011-07-04 14:08 ` Péter Ujfalusi 2011-07-04 14:08 ` Péter Ujfalusi 2011-07-04 17:39 ` Samuel Ortiz 2011-07-04 17:39 ` Samuel Ortiz 2011-07-05 9:28 ` Péter Ujfalusi 2011-07-05 9:28 ` Péter Ujfalusi 2011-07-04 12:53 ` Felipe Balbi 2011-07-04 13:09 ` Péter Ujfalusi 2011-07-04 13:09 ` Péter Ujfalusi 2011-07-04 13:27 ` Felipe Balbi 2011-06-21 13:39 ` [PATCH v6 09/18] ASoC: twl6040: Convert into TWL6040 MFD child Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 10/18] MFD: twl6040: Change platform data for soc codec driver Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 11/18] input: Add initial support for TWL6040 vibrator Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-21 20:32 ` Dmitry Torokhov 2011-06-22 11:37 ` Péter Ujfalusi 2011-06-22 11:37 ` Péter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 12/18] OMAP4: SDP4430: Add twl6040 vibrator platform support Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 13/18] ASoC: twl6040: add all ABE DAIs Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 14/18] ASoC: twl6040: Support other sample rates in constraints Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 15/18] ASoC: twl6040: Remove pll and headset mode dependency Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-21 17:35 ` Mark Brown 2011-06-22 11:39 ` Péter Ujfalusi 2011-06-22 11:39 ` Péter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 16/18] ASoC: twl6040: set default constraints Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-21 13:39 ` [PATCH v6 17/18] ASoC: twl6040: Configure ramp step based on platform Peter Ujfalusi 2011-06-21 13:39 ` Peter Ujfalusi 2011-06-22 11:25 ` [PATCH v6 18/18] OMAP4: SDP4430: Add twl6040 codec platform support Peter Ujfalusi 2011-06-22 11:25 ` Peter Ujfalusi 2011-06-27 9:43 ` [PATCH v6 00/18] MFD/ASoC/Input: TWL4030/TWL60X0 changes Péter Ujfalusi 2011-06-27 9:43 ` Péter Ujfalusi 2011-06-27 10:18 ` Tony Lindgren 2011-06-27 10:18 ` Tony Lindgren 2011-06-27 14:30 ` Péter Ujfalusi 2011-06-27 14:30 ` Péter Ujfalusi 2011-06-28 6:17 ` Tony Lindgren 2011-06-28 6:17 ` Tony Lindgren 2011-06-28 6:44 ` Re: " Péter Ujfalusi 2011-06-28 6:44 ` Péter Ujfalusi 2011-06-28 6:50 ` Re: " Tony Lindgren 2011-06-28 6:50 ` Tony Lindgren 2011-07-04 11:51 ` Samuel Ortiz 2011-07-04 11:51 ` Samuel Ortiz 2011-06-30 6:15 ` Re: [alsa-devel] " Péter Ujfalusi 2011-06-30 6:15 ` Péter Ujfalusi 2011-06-30 8:04 ` Re: [alsa-devel] " Samuel Ortiz 2011-06-30 8:04 ` Samuel Ortiz 2011-06-30 9:41 ` Péter Ujfalusi 2011-06-30 9:41 ` Péter Ujfalusi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1308663556-29120-2-git-send-email-peter.ujfalusi@ti.com \ --to=peter.ujfalusi@ti.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@opensource.wolfsonmicro.com \ --cc=dmitry.torokhov@gmail.com \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=lrg@ti.com \ --cc=sameo@linux.intel.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.