| Message ID | 1412348759-4599-6-git-send-email-hdegoede@redhat.com |
|---|---|
| State | Superseded |
| Delegated to: | Ian Campbell |
| Headers | show |
On Fri, 2014-10-03 at 17:05 +0200, Hans de Goede wrote: > None of the known sunxi devices actually use mmc1 routed through PH, where > as some devices do actually use mmc1 routed through PG, so change the routing > of mmc1 to PG. If in the future we encounter devices with mmc1 routed through > PH, we will need to change things to be a bit more flexible. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> Although it seems that adding a Kconfig choice option would only be a dozen or so lines of pretty trivial stuff if we wanted to do it now. Ian.
Hi, On 10/04/2014 10:37 AM, Ian Campbell wrote: > On Fri, 2014-10-03 at 17:05 +0200, Hans de Goede wrote: >> None of the known sunxi devices actually use mmc1 routed through PH, where >> as some devices do actually use mmc1 routed through PG, so change the routing >> of mmc1 to PG. If in the future we encounter devices with mmc1 routed through >> PH, we will need to change things to be a bit more flexible. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > Acked-by: Ian Campbell <ian.campbell@citrix.com> > > Although it seems that adding a Kconfig choice option would only be a > dozen or so lines of pretty trivial stuff if we wanted to do it now. This mostly seems to be a sun4i/sun7i vs sun5i thing. mmc1 could be routed through PH on sun4i/sun7i, but actually is never used there, as PH typically is used for gpio purposed on sun4i/sun7i, where as on sun5i (which has way less pins), mmc1 goes out on PG, and actually is used as such there. I have considered keeping the old pinmux settings using #if defined SUN5I for the new ones, but since the old ones are never used just replacing them seems better. Regards, Hans
On Mon, 2014-10-06 at 10:37 +0200, Hans de Goede wrote: > Hi, > > On 10/04/2014 10:37 AM, Ian Campbell wrote: > > On Fri, 2014-10-03 at 17:05 +0200, Hans de Goede wrote: > >> None of the known sunxi devices actually use mmc1 routed through PH, where > >> as some devices do actually use mmc1 routed through PG, so change the routing > >> of mmc1 to PG. If in the future we encounter devices with mmc1 routed through > >> PH, we will need to change things to be a bit more flexible. > >> > >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > > > Acked-by: Ian Campbell <ian.campbell@citrix.com> > > > > Although it seems that adding a Kconfig choice option would only be a > > dozen or so lines of pretty trivial stuff if we wanted to do it now. > > This mostly seems to be a sun4i/sun7i vs sun5i thing. mmc1 could be routed > through PH on sun4i/sun7i, but actually is never used there, as PH typically > is used for gpio purposed on sun4i/sun7i, where as on sun5i (which has way > less pins), mmc1 goes out on PG, and actually is used as such there. > > I have considered keeping the old pinmux settings using #if defined SUN5I > for the new ones, but since the old ones are never used just replacing > them seems better. Sure. Ian.
Hi, On 10/04/2014 10:37 AM, Ian Campbell wrote: > On Fri, 2014-10-03 at 17:05 +0200, Hans de Goede wrote: >> None of the known sunxi devices actually use mmc1 routed through PH, where >> as some devices do actually use mmc1 routed through PG, so change the routing >> of mmc1 to PG. If in the future we encounter devices with mmc1 routed through >> PH, we will need to change things to be a bit more flexible. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > Acked-by: Ian Campbell <ian.campbell@citrix.com> Hmm, do you want to use your citrix address for sunxi work from now on (fine by me), or is this a mistake ? Regards, Hans
On Mon, 2014-10-06 at 16:43 +0200, Hans de Goede wrote: > Hi, > > On 10/04/2014 10:37 AM, Ian Campbell wrote: > > On Fri, 2014-10-03 at 17:05 +0200, Hans de Goede wrote: > >> None of the known sunxi devices actually use mmc1 routed through PH, where > >> as some devices do actually use mmc1 routed through PG, so change the routing > >> of mmc1 to PG. If in the future we encounter devices with mmc1 routed through > >> PH, we will need to change things to be a bit more flexible. > >> > >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > > > Acked-by: Ian Campbell <ian.campbell@citrix.com> > > Hmm, do you want to use your citrix address for sunxi work from now on > (fine by me), or is this a mistake ? Oops, it's muscle memory in my fingers (since I ack an order of magnitude patches at work...). I've always managed to catch myself in the past... Acked-by: Ian Campbell <ijc@hellion.org.uk> Thanks for noticing! Ian.
diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h index c049d39..1fb3e0a 100644 --- a/arch/arm/include/asm/arch-sunxi/gpio.h +++ b/arch/arm/include/asm/arch-sunxi/gpio.h @@ -117,6 +117,8 @@ enum sunxi_gpio_number { #define SUN5I_GPB19_UART0_TX 2 #define SUN5I_GPB20_UART0_RX 2 +#define SUN5I_GPG3_SDC1 2 + #define SUN5I_GPG3_UART1_TX 4 #define SUN5I_GPG4_UART1_RX 4 diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 0a7be31..23f8887 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -75,9 +75,9 @@ static void mmc_pinmux_setup(int sdc) break; case 1: - /* CMD-PH22, CLK-PH23, D0~D3-PH24~27 : 5 */ - for (pin = SUNXI_GPH(22); pin <= SUNXI_GPH(27); pin++) { - sunxi_gpio_set_cfgpin(pin, SUN4I_GPH22_SDC1); + /* CMD-PG3, CLK-PG4, D0~D3-PG5-8 */ + for (pin = SUNXI_GPG(3); pin <= SUNXI_GPG(8); pin++) { + sunxi_gpio_set_cfgpin(pin, SUN5I_GPG3_SDC1); sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP); sunxi_gpio_set_drv(pin, 2); }
None of the known sunxi devices actually use mmc1 routed through PH, where as some devices do actually use mmc1 routed through PG, so change the routing of mmc1 to PG. If in the future we encounter devices with mmc1 routed through PH, we will need to change things to be a bit more flexible. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- arch/arm/include/asm/arch-sunxi/gpio.h | 2 ++ board/sunxi/board.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-)