| Message ID | 1353672107-12904-5-git-send-email-rajeshwari.s@samsung.com |
|---|---|
| State | New |
| Headers | show |
Hi Rajeshwari, On Fri, Nov 23, 2012 at 4:01 AM, Rajeshwari Shinde <rajeshwari.s@samsung.com> wrote: > Api is added to decode peripheral id based on the interrupt number > of the peripheral. > > Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> > --- > Chnages in V3: > - New patch added. > arch/arm/cpu/armv7/exynos/pinmux.c | 28 ++++++++++++++++++++++++++++ > arch/arm/include/asm/arch-exynos/periph.h | 28 +++++++++++++++------------- > arch/arm/include/asm/arch-exynos/pinmux.h | 8 ++++++++ > 3 files changed, 51 insertions(+), 13 deletions(-) > > diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c > index f02f441..4812c8e 100644 > --- a/arch/arm/cpu/armv7/exynos/pinmux.c > +++ b/arch/arm/cpu/armv7/exynos/pinmux.c > @@ -22,6 +22,7 @@ > */ > > #include <common.h> > +#include <fdtdec.h> > #include <asm/arch/gpio.h> > #include <asm/arch/pinmux.h> > #include <asm/arch/sromc.h> > @@ -396,3 +397,30 @@ int exynos_pinmux_config(int peripheral, int flags) > return -1; > } > } > + > +#ifdef CONFIG_OF_CONTROL > +static int exynos5_decode_periph_id(const void *blob, int node) > +{ > + int err; > + u32 cell[3]; > + > + err = fdtdec_get_int_array(blob, node, "interrupts", cell, > + ARRAY_SIZE(cell)); > + if (err) > + return PERIPH_ID_NONE; > + > + if ((129 > cell[1]) || (cell[1] < 31)) > + return cell[1]; > + > + debug(" invalid peripheral id\n"); > + return PERIPH_ID_NONE; > +} > + > +int decode_periph_id(const void *blob, int node) I think it would be better if the exported function had some sort of prefix, perhaps pinmux_decode_periph_id() since it is in that file. > +{ > + if (cpu_is_exynos5()) > + return exynos5_decode_periph_id(blob, node); > + else > + return PERIPH_ID_NONE; > +} > +#endif > diff --git a/arch/arm/include/asm/arch-exynos/periph.h b/arch/arm/include/asm/arch-exynos/periph.h > index 13abd2d..1de48d5 100644 > --- a/arch/arm/include/asm/arch-exynos/periph.h > +++ b/arch/arm/include/asm/arch-exynos/periph.h > @@ -25,12 +25,17 @@ > #define __ASM_ARM_ARCH_PERIPH_H > > /* > - * Peripherals requiring clock/pinmux configuration. List will > + * Peripherals requiring pinmux configuration0. List will > * grow with support for more devices getting added. > + * Numbering based on interrupt table. > * > */ > enum periph_id { > - PERIPH_ID_I2C0, > + PERIPH_ID_UART0 = 51, > + PERIPH_ID_UART1, > + PERIPH_ID_UART2, > + PERIPH_ID_UART3, > + PERIPH_ID_I2C0 = 56, > PERIPH_ID_I2C1, > PERIPH_ID_I2C2, > PERIPH_ID_I2C3, > @@ -38,22 +43,19 @@ enum periph_id { > PERIPH_ID_I2C5, > PERIPH_ID_I2C6, > PERIPH_ID_I2C7, > - PERIPH_ID_I2S1, > - PERIPH_ID_SDMMC0, > + PERIPH_ID_SPI0 = 68, > + PERIPH_ID_SPI1, > + PERIPH_ID_SPI2, > + PERIPH_ID_SDMMC0 = 75, > PERIPH_ID_SDMMC1, > PERIPH_ID_SDMMC2, > PERIPH_ID_SDMMC3, > - PERIPH_ID_SDMMC4, > - PERIPH_ID_SROMC, > - PERIPH_ID_SPI0, > - PERIPH_ID_SPI1, > - PERIPH_ID_SPI2, > + PERIPH_ID_I2S1 = 99, > + > + PERIPH_ID_SROMC = 128, Is it right that these numbers are unused for interrupts so you are using them arbitrarily? In that case I suggest a short comment would help. > PERIPH_ID_SPI3, > PERIPH_ID_SPI4, > - PERIPH_ID_UART0, > - PERIPH_ID_UART1, > - PERIPH_ID_UART2, > - PERIPH_ID_UART3, > + PERIPH_ID_SDMMC4, > > PERIPH_ID_COUNT, > PERIPH_ID_NONE = -1, > diff --git a/arch/arm/include/asm/arch-exynos/pinmux.h b/arch/arm/include/asm/arch-exynos/pinmux.h > index 10ea736..1f5a48a 100644 > --- a/arch/arm/include/asm/arch-exynos/pinmux.h > +++ b/arch/arm/include/asm/arch-exynos/pinmux.h > @@ -55,4 +55,12 @@ enum { > */ > int exynos_pinmux_config(int peripheral, int flags); > > +/** > + * Decode the peripheral id using the interrpt numbers. > + * > + * @param blob Device tree blbo > + * @param node FDT I2C node to find > + * @return peripheral id if ok, -1 on error (e.g. unsupported peripheral) PERIPH_ID_NONE really > + */ > +int decode_periph_id(const void *blob, int node); > #endif > -- > 1.7.4.4 > Regards, Simon
diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c index f02f441..4812c8e 100644 --- a/arch/arm/cpu/armv7/exynos/pinmux.c +++ b/arch/arm/cpu/armv7/exynos/pinmux.c @@ -22,6 +22,7 @@ */ #include <common.h> +#include <fdtdec.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> #include <asm/arch/sromc.h> @@ -396,3 +397,30 @@ int exynos_pinmux_config(int peripheral, int flags) return -1; } } + +#ifdef CONFIG_OF_CONTROL +static int exynos5_decode_periph_id(const void *blob, int node) +{ + int err; + u32 cell[3]; + + err = fdtdec_get_int_array(blob, node, "interrupts", cell, + ARRAY_SIZE(cell)); + if (err) + return PERIPH_ID_NONE; + + if ((129 > cell[1]) || (cell[1] < 31)) + return cell[1]; + + debug(" invalid peripheral id\n"); + return PERIPH_ID_NONE; +} + +int decode_periph_id(const void *blob, int node) +{ + if (cpu_is_exynos5()) + return exynos5_decode_periph_id(blob, node); + else + return PERIPH_ID_NONE; +} +#endif diff --git a/arch/arm/include/asm/arch-exynos/periph.h b/arch/arm/include/asm/arch-exynos/periph.h index 13abd2d..1de48d5 100644 --- a/arch/arm/include/asm/arch-exynos/periph.h +++ b/arch/arm/include/asm/arch-exynos/periph.h @@ -25,12 +25,17 @@ #define __ASM_ARM_ARCH_PERIPH_H /* - * Peripherals requiring clock/pinmux configuration. List will + * Peripherals requiring pinmux configuration0. List will * grow with support for more devices getting added. + * Numbering based on interrupt table. * */ enum periph_id { - PERIPH_ID_I2C0, + PERIPH_ID_UART0 = 51, + PERIPH_ID_UART1, + PERIPH_ID_UART2, + PERIPH_ID_UART3, + PERIPH_ID_I2C0 = 56, PERIPH_ID_I2C1, PERIPH_ID_I2C2, PERIPH_ID_I2C3, @@ -38,22 +43,19 @@ enum periph_id { PERIPH_ID_I2C5, PERIPH_ID_I2C6, PERIPH_ID_I2C7, - PERIPH_ID_I2S1, - PERIPH_ID_SDMMC0, + PERIPH_ID_SPI0 = 68, + PERIPH_ID_SPI1, + PERIPH_ID_SPI2, + PERIPH_ID_SDMMC0 = 75, PERIPH_ID_SDMMC1, PERIPH_ID_SDMMC2, PERIPH_ID_SDMMC3, - PERIPH_ID_SDMMC4, - PERIPH_ID_SROMC, - PERIPH_ID_SPI0, - PERIPH_ID_SPI1, - PERIPH_ID_SPI2, + PERIPH_ID_I2S1 = 99, + + PERIPH_ID_SROMC = 128, PERIPH_ID_SPI3, PERIPH_ID_SPI4, - PERIPH_ID_UART0, - PERIPH_ID_UART1, - PERIPH_ID_UART2, - PERIPH_ID_UART3, + PERIPH_ID_SDMMC4, PERIPH_ID_COUNT, PERIPH_ID_NONE = -1, diff --git a/arch/arm/include/asm/arch-exynos/pinmux.h b/arch/arm/include/asm/arch-exynos/pinmux.h index 10ea736..1f5a48a 100644 --- a/arch/arm/include/asm/arch-exynos/pinmux.h +++ b/arch/arm/include/asm/arch-exynos/pinmux.h @@ -55,4 +55,12 @@ enum { */ int exynos_pinmux_config(int peripheral, int flags); +/** + * Decode the peripheral id using the interrpt numbers. + * + * @param blob Device tree blbo + * @param node FDT I2C node to find + * @return peripheral id if ok, -1 on error (e.g. unsupported peripheral) + */ +int decode_periph_id(const void *blob, int node); #endif
Api is added to decode peripheral id based on the interrupt number of the peripheral. Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> --- Chnages in V3: - New patch added. arch/arm/cpu/armv7/exynos/pinmux.c | 28 ++++++++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/periph.h | 28 +++++++++++++++------------- arch/arm/include/asm/arch-exynos/pinmux.h | 8 ++++++++ 3 files changed, 51 insertions(+), 13 deletions(-)