| Message ID | 1391539703-5787-2-git-send-email-valentine.barshak@cogentembedded.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 12c1d5a54e874f26d08fa27f13f63ef7ccf38a2a |
| Headers | show |
On Tue, Feb 04, 2014 at 10:48:20PM +0400, Valentine Barshak wrote: > This adds I2C[1245] busses support to Koelsch board. > I2C[03] do not have any slave devices connected and > are not used because of the following: > * I2C0 pins are multiplexed with LBSC pins; > * I2C3 pins are multiplexed with EtherMAC and VIN0 pins. > > Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com> Thanks, I have queued this up. > --- > arch/arm/mach-shmobile/board-koelsch.c | 46 ++++++++++++++++++++++++++++++++++ > 1 file changed, 46 insertions(+) > > Changes in V2: > * capitalized ARM in the subject; > > Changes in V3: > * rebased on top of renesas-devel-v3.14-rc1-20140204 tag. > > diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c > index 2ab5c75..b9f638e 100644 > --- a/arch/arm/mach-shmobile/board-koelsch.c > +++ b/arch/arm/mach-shmobile/board-koelsch.c > @@ -163,6 +163,38 @@ static const struct platform_device_info sata0_info __initconst = { > .dma_mask = DMA_BIT_MASK(32), > }; > > +/* I2C */ > +static const struct resource i2c_resources[] __initconst = { > + /* I2C0 */ > + DEFINE_RES_MEM(0xE6508000, 0x40), > + DEFINE_RES_IRQ(gic_spi(287)), > + /* I2C1 */ > + DEFINE_RES_MEM(0xE6518000, 0x40), > + DEFINE_RES_IRQ(gic_spi(288)), > + /* I2C2 */ > + DEFINE_RES_MEM(0xE6530000, 0x40), > + DEFINE_RES_IRQ(gic_spi(286)), > + /* I2C3 */ > + DEFINE_RES_MEM(0xE6540000, 0x40), > + DEFINE_RES_IRQ(gic_spi(290)), > + /* I2C4 */ > + DEFINE_RES_MEM(0xE6520000, 0x40), > + DEFINE_RES_IRQ(gic_spi(19)), > + /* I2C5 */ > + DEFINE_RES_MEM(0xE6528000, 0x40), > + DEFINE_RES_IRQ(gic_spi(20)), > +}; > + > +static void __init koelsch_add_i2c(unsigned idx) > +{ > + unsigned res_idx = idx * 2; > + > + BUG_ON(res_idx >= ARRAY_SIZE(i2c_resources)); > + > + platform_device_register_simple("i2c-rcar_gen2", idx, > + i2c_resources + res_idx, 2); > +} > + > static const struct pinctrl_map koelsch_pinctrl_map[] = { > /* DU */ > PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791", > @@ -186,6 +218,15 @@ static const struct pinctrl_map koelsch_pinctrl_map[] = { > /* SCIF1 (CN20: DEBUG SERIAL1) */ > PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.7", "pfc-r8a7791", > "scif1_data_d", "scif1"), > + /* I2C1 */ > + PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar_gen2.1", "pfc-r8a7791", > + "i2c1_e", "i2c1"), > + /* I2C2 */ > + PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar_gen2.2", "pfc-r8a7791", > + "i2c2", "i2c2"), > + /* I2C4 */ > + PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar_gen2.4", "pfc-r8a7791", > + "i2c4_c", "i2c4"), > }; > > static void __init koelsch_add_standard_devices(void) > @@ -209,6 +250,11 @@ static void __init koelsch_add_standard_devices(void) > koelsch_add_du_device(); > > platform_device_register_full(&sata0_info); > + > + koelsch_add_i2c(1); > + koelsch_add_i2c(2); > + koelsch_add_i2c(4); > + koelsch_add_i2c(5); > } > > /* > -- > 1.8.3.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c index 2ab5c75..b9f638e 100644 --- a/arch/arm/mach-shmobile/board-koelsch.c +++ b/arch/arm/mach-shmobile/board-koelsch.c @@ -163,6 +163,38 @@ static const struct platform_device_info sata0_info __initconst = { .dma_mask = DMA_BIT_MASK(32), }; +/* I2C */ +static const struct resource i2c_resources[] __initconst = { + /* I2C0 */ + DEFINE_RES_MEM(0xE6508000, 0x40), + DEFINE_RES_IRQ(gic_spi(287)), + /* I2C1 */ + DEFINE_RES_MEM(0xE6518000, 0x40), + DEFINE_RES_IRQ(gic_spi(288)), + /* I2C2 */ + DEFINE_RES_MEM(0xE6530000, 0x40), + DEFINE_RES_IRQ(gic_spi(286)), + /* I2C3 */ + DEFINE_RES_MEM(0xE6540000, 0x40), + DEFINE_RES_IRQ(gic_spi(290)), + /* I2C4 */ + DEFINE_RES_MEM(0xE6520000, 0x40), + DEFINE_RES_IRQ(gic_spi(19)), + /* I2C5 */ + DEFINE_RES_MEM(0xE6528000, 0x40), + DEFINE_RES_IRQ(gic_spi(20)), +}; + +static void __init koelsch_add_i2c(unsigned idx) +{ + unsigned res_idx = idx * 2; + + BUG_ON(res_idx >= ARRAY_SIZE(i2c_resources)); + + platform_device_register_simple("i2c-rcar_gen2", idx, + i2c_resources + res_idx, 2); +} + static const struct pinctrl_map koelsch_pinctrl_map[] = { /* DU */ PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791", @@ -186,6 +218,15 @@ static const struct pinctrl_map koelsch_pinctrl_map[] = { /* SCIF1 (CN20: DEBUG SERIAL1) */ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.7", "pfc-r8a7791", "scif1_data_d", "scif1"), + /* I2C1 */ + PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar_gen2.1", "pfc-r8a7791", + "i2c1_e", "i2c1"), + /* I2C2 */ + PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar_gen2.2", "pfc-r8a7791", + "i2c2", "i2c2"), + /* I2C4 */ + PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar_gen2.4", "pfc-r8a7791", + "i2c4_c", "i2c4"), }; static void __init koelsch_add_standard_devices(void) @@ -209,6 +250,11 @@ static void __init koelsch_add_standard_devices(void) koelsch_add_du_device(); platform_device_register_full(&sata0_info); + + koelsch_add_i2c(1); + koelsch_add_i2c(2); + koelsch_add_i2c(4); + koelsch_add_i2c(5); } /*
This adds I2C[1245] busses support to Koelsch board. I2C[03] do not have any slave devices connected and are not used because of the following: * I2C0 pins are multiplexed with LBSC pins; * I2C3 pins are multiplexed with EtherMAC and VIN0 pins. Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com> --- arch/arm/mach-shmobile/board-koelsch.c | 46 ++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) Changes in V2: * capitalized ARM in the subject; Changes in V3: * rebased on top of renesas-devel-v3.14-rc1-20140204 tag.