* [U-Boot] [PATCH 1/2] sunxi: Fix gmac not working on the Colombus board @ 2015-08-06 18:13 Hans de Goede 2015-08-06 18:13 ` [U-Boot] [PATCH 2/2] sunxi: gpio: Add support for the gpio banks which are part of the R-io cluster Hans de Goede 2015-08-11 7:47 ` [U-Boot] [PATCH 1/2] sunxi: Fix gmac not working on the Colombus board Ian Campbell 0 siblings, 2 replies; 7+ messages in thread From: Hans de Goede @ 2015-08-06 18:13 UTC (permalink / raw) To: u-boot The phy is using a RGMII interface, which we need to specify in our board-config, and the dts needs a gmac section (the dts changes have also been submitted to the kernel). Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- arch/arm/dts/sun6i-a31-colombus.dts | 12 ++++++++++++ configs/Colombus_defconfig | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/sun6i-a31-colombus.dts b/arch/arm/dts/sun6i-a31-colombus.dts index 0cf9926..0d0b6f2 100644 --- a/arch/arm/dts/sun6i-a31-colombus.dts +++ b/arch/arm/dts/sun6i-a31-colombus.dts @@ -66,6 +66,18 @@ status = "okay"; }; +&gmac { + pinctrl-names = "default"; + pinctrl-0 = <&gmac_pins_rgmii_a>; + phy = <&phy1>; + phy-mode = "rgmii"; + status = "okay"; + + phy1: ethernet-phy at 1 { + reg = <1>; + }; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins_a>; diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig index 1ae8c16..7fa9ef1 100644 --- a/configs/Colombus_defconfig +++ b/configs/Colombus_defconfig @@ -7,7 +7,7 @@ CONFIG_USB1_VBUS_PIN="" CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC" +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -- 2.4.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] sunxi: gpio: Add support for the gpio banks which are part of the R-io cluster 2015-08-06 18:13 [U-Boot] [PATCH 1/2] sunxi: Fix gmac not working on the Colombus board Hans de Goede @ 2015-08-06 18:13 ` Hans de Goede 2015-08-11 7:49 ` Ian Campbell 2015-08-17 22:14 ` Simon Glass 2015-08-11 7:47 ` [U-Boot] [PATCH 1/2] sunxi: Fix gmac not working on the Colombus board Ian Campbell 1 sibling, 2 replies; 7+ messages in thread From: Hans de Goede @ 2015-08-06 18:13 UTC (permalink / raw) To: u-boot sun6i and later have a couple of io-blocks which are shared between the main CPU core and the "R" cpu which is small embedded cpu which can be active while the main system is suspended. These gpio banks sit at a different mmio address then the normal banks, and have a separate devicetree node and compatible, this adds support for these banks to the sunxi-gpio code when built with device-model support. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/gpio/sunxi_gpio.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c index afa165a..57b78e5 100644 --- a/drivers/gpio/sunxi_gpio.c +++ b/drivers/gpio/sunxi_gpio.c @@ -266,16 +266,28 @@ static int gpio_sunxi_bind(struct udevice *parent) { struct sunxi_gpio_platdata *plat = parent->platdata; struct sunxi_gpio_reg *ctlr; - int bank; - int ret; + int bank, no_banks, ret, start; /* If this is a child device, there is nothing to do here */ if (plat) return 0; + if (fdt_node_check_compatible(gd->fdt_blob, parent->of_offset, + "allwinner,sun6i-a31-r-pinctrl") == 0) { + start = 'L' - 'A'; + no_banks = 2; /* L & M */ + } else if (fdt_node_check_compatible(gd->fdt_blob, parent->of_offset, + "allwinner,sun8i-a23-r-pinctrl") == 0) { + start = 'L' - 'A'; + no_banks = 1; /* L only */ + } else { + start = 0; + no_banks = SUNXI_GPIO_BANKS; + } + ctlr = (struct sunxi_gpio_reg *)fdtdec_get_addr(gd->fdt_blob, parent->of_offset, "reg"); - for (bank = 0; bank < SUNXI_GPIO_BANKS; bank++) { + for (bank = 0; bank < no_banks; bank++) { struct sunxi_gpio_platdata *plat; struct udevice *dev; @@ -283,7 +295,7 @@ static int gpio_sunxi_bind(struct udevice *parent) if (!plat) return -ENOMEM; plat->regs = &ctlr->gpio_bank[bank]; - plat->bank_name = gpio_bank_name(bank); + plat->bank_name = gpio_bank_name(start + bank); plat->gpio_count = SUNXI_GPIOS_PER_BANK; ret = device_bind(parent, parent->driver, @@ -306,6 +318,8 @@ static const struct udevice_id sunxi_gpio_ids[] = { { .compatible = "allwinner,sun8i-a23-pinctrl" }, { .compatible = "allwinner,sun8i-a33-pinctrl" }, { .compatible = "allwinner,sun9i-a80-pinctrl" }, + { .compatible = "allwinner,sun6i-a31-r-pinctrl" }, + { .compatible = "allwinner,sun8i-a23-r-pinctrl" }, { } }; -- 2.4.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] sunxi: gpio: Add support for the gpio banks which are part of the R-io cluster 2015-08-06 18:13 ` [U-Boot] [PATCH 2/2] sunxi: gpio: Add support for the gpio banks which are part of the R-io cluster Hans de Goede @ 2015-08-11 7:49 ` Ian Campbell 2015-08-17 22:14 ` Simon Glass 1 sibling, 0 replies; 7+ messages in thread From: Ian Campbell @ 2015-08-11 7:49 UTC (permalink / raw) To: u-boot On Thu, 2015-08-06 at 20:13 +0200, Hans de Goede wrote: > sun6i and later have a couple of io-blocks which are shared between > the > main CPU core and the "R" cpu which is small embedded cpu which can > be > active while the main system is suspended. > > These gpio banks sit at a different mmio address then the normal > banks, > and have a separate devicetree node and compatible, this adds support > for > these banks to the sunxi-gpio code when built with device-model > support. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] sunxi: gpio: Add support for the gpio banks which are part of the R-io cluster 2015-08-06 18:13 ` [U-Boot] [PATCH 2/2] sunxi: gpio: Add support for the gpio banks which are part of the R-io cluster Hans de Goede 2015-08-11 7:49 ` Ian Campbell @ 2015-08-17 22:14 ` Simon Glass 2015-08-18 9:29 ` Hans de Goede 1 sibling, 1 reply; 7+ messages in thread From: Simon Glass @ 2015-08-17 22:14 UTC (permalink / raw) To: u-boot Hi Hans, On 6 August 2015 at 12:13, Hans de Goede <hdegoede@redhat.com> wrote: > sun6i and later have a couple of io-blocks which are shared between the > main CPU core and the "R" cpu which is small embedded cpu which can be > active while the main system is suspended. > > These gpio banks sit at a different mmio address then the normal banks, > and have a separate devicetree node and compatible, this adds support for > these banks to the sunxi-gpio code when built with device-model support. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/gpio/sunxi_gpio.c | 22 ++++++++++++++++++---- > 1 file changed, 18 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c > index afa165a..57b78e5 100644 > --- a/drivers/gpio/sunxi_gpio.c > +++ b/drivers/gpio/sunxi_gpio.c > @@ -266,16 +266,28 @@ static int gpio_sunxi_bind(struct udevice *parent) > { > struct sunxi_gpio_platdata *plat = parent->platdata; > struct sunxi_gpio_reg *ctlr; > - int bank; > - int ret; > + int bank, no_banks, ret, start; > > /* If this is a child device, there is nothing to do here */ > if (plat) > return 0; > > + if (fdt_node_check_compatible(gd->fdt_blob, parent->of_offset, > + "allwinner,sun6i-a31-r-pinctrl") == 0) { If I understand what you are doing here, the correct way is to use a .data field in sunxi_gpio_ids[] below. In any case you should not be checking the compatible string of a parent. > + start = 'L' - 'A'; > + no_banks = 2; /* L & M */ > + } else if (fdt_node_check_compatible(gd->fdt_blob, parent->of_offset, > + "allwinner,sun8i-a23-r-pinctrl") == 0) { > + start = 'L' - 'A'; > + no_banks = 1; /* L only */ > + } else { > + start = 0; > + no_banks = SUNXI_GPIO_BANKS; > + } > + > ctlr = (struct sunxi_gpio_reg *)fdtdec_get_addr(gd->fdt_blob, > parent->of_offset, "reg"); > - for (bank = 0; bank < SUNXI_GPIO_BANKS; bank++) { > + for (bank = 0; bank < no_banks; bank++) { > struct sunxi_gpio_platdata *plat; > struct udevice *dev; > > @@ -283,7 +295,7 @@ static int gpio_sunxi_bind(struct udevice *parent) > if (!plat) > return -ENOMEM; > plat->regs = &ctlr->gpio_bank[bank]; > - plat->bank_name = gpio_bank_name(bank); > + plat->bank_name = gpio_bank_name(start + bank); > plat->gpio_count = SUNXI_GPIOS_PER_BANK; > > ret = device_bind(parent, parent->driver, > @@ -306,6 +318,8 @@ static const struct udevice_id sunxi_gpio_ids[] = { > { .compatible = "allwinner,sun8i-a23-pinctrl" }, > { .compatible = "allwinner,sun8i-a33-pinctrl" }, > { .compatible = "allwinner,sun9i-a80-pinctrl" }, > + { .compatible = "allwinner,sun6i-a31-r-pinctrl" }, > + { .compatible = "allwinner,sun8i-a23-r-pinctrl" }, > { } > }; > > -- > 2.4.3 > > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot Regards, Simon ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] sunxi: gpio: Add support for the gpio banks which are part of the R-io cluster 2015-08-17 22:14 ` Simon Glass @ 2015-08-18 9:29 ` Hans de Goede 2015-08-18 12:45 ` Simon Glass 0 siblings, 1 reply; 7+ messages in thread From: Hans de Goede @ 2015-08-18 9:29 UTC (permalink / raw) To: u-boot Hi, On 18-08-15 00:14, Simon Glass wrote: > Hi Hans, > > On 6 August 2015 at 12:13, Hans de Goede <hdegoede@redhat.com> wrote: >> sun6i and later have a couple of io-blocks which are shared between the >> main CPU core and the "R" cpu which is small embedded cpu which can be >> active while the main system is suspended. >> >> These gpio banks sit at a different mmio address then the normal banks, >> and have a separate devicetree node and compatible, this adds support for >> these banks to the sunxi-gpio code when built with device-model support. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> drivers/gpio/sunxi_gpio.c | 22 ++++++++++++++++++---- >> 1 file changed, 18 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c >> index afa165a..57b78e5 100644 >> --- a/drivers/gpio/sunxi_gpio.c >> +++ b/drivers/gpio/sunxi_gpio.c >> @@ -266,16 +266,28 @@ static int gpio_sunxi_bind(struct udevice *parent) >> { >> struct sunxi_gpio_platdata *plat = parent->platdata; >> struct sunxi_gpio_reg *ctlr; >> - int bank; >> - int ret; >> + int bank, no_banks, ret, start; >> >> /* If this is a child device, there is nothing to do here */ >> if (plat) >> return 0; >> >> + if (fdt_node_check_compatible(gd->fdt_blob, parent->of_offset, >> + "allwinner,sun6i-a31-r-pinctrl") == 0) { > > If I understand what you are doing here, the correct way is to use a > .data field in sunxi_gpio_ids[] below. Yes that would work too, but that indirection makes it harder to follow what the code is doing without giving us much benefit IMHO. > In any case you should not be > checking the compatible string of a parent. AFAICT this is the right way to check a compatible string in a bind function, the parent variable name here is confusing as this actually points to the udevice passed into the bind function, not its parent. I guess it is named parent rather then device to distinguish it from the per bank gpio udevices the bind function is instantiating. So I'm not really checking the parents compatible but its own, it just looks that way because of the bind function parameter name being parent. Regards, Hans > >> + start = 'L' - 'A'; >> + no_banks = 2; /* L & M */ >> + } else if (fdt_node_check_compatible(gd->fdt_blob, parent->of_offset, >> + "allwinner,sun8i-a23-r-pinctrl") == 0) { >> + start = 'L' - 'A'; >> + no_banks = 1; /* L only */ >> + } else { >> + start = 0; >> + no_banks = SUNXI_GPIO_BANKS; >> + } >> + >> ctlr = (struct sunxi_gpio_reg *)fdtdec_get_addr(gd->fdt_blob, >> parent->of_offset, "reg"); >> - for (bank = 0; bank < SUNXI_GPIO_BANKS; bank++) { >> + for (bank = 0; bank < no_banks; bank++) { >> struct sunxi_gpio_platdata *plat; >> struct udevice *dev; >> >> @@ -283,7 +295,7 @@ static int gpio_sunxi_bind(struct udevice *parent) >> if (!plat) >> return -ENOMEM; >> plat->regs = &ctlr->gpio_bank[bank]; >> - plat->bank_name = gpio_bank_name(bank); >> + plat->bank_name = gpio_bank_name(start + bank); >> plat->gpio_count = SUNXI_GPIOS_PER_BANK; >> >> ret = device_bind(parent, parent->driver, >> @@ -306,6 +318,8 @@ static const struct udevice_id sunxi_gpio_ids[] = { >> { .compatible = "allwinner,sun8i-a23-pinctrl" }, >> { .compatible = "allwinner,sun8i-a33-pinctrl" }, >> { .compatible = "allwinner,sun9i-a80-pinctrl" }, >> + { .compatible = "allwinner,sun6i-a31-r-pinctrl" }, >> + { .compatible = "allwinner,sun8i-a23-r-pinctrl" }, >> { } >> }; >> >> -- >> 2.4.3 >> >> _______________________________________________ >> U-Boot mailing list >> U-Boot at lists.denx.de >> http://lists.denx.de/mailman/listinfo/u-boot > > Regards, > Simon > ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] sunxi: gpio: Add support for the gpio banks which are part of the R-io cluster 2015-08-18 9:29 ` Hans de Goede @ 2015-08-18 12:45 ` Simon Glass 0 siblings, 0 replies; 7+ messages in thread From: Simon Glass @ 2015-08-18 12:45 UTC (permalink / raw) To: u-boot Hi Hans, On 18 August 2015 at 03:29, Hans de Goede <hdegoede@redhat.com> wrote: > Hi, > > > On 18-08-15 00:14, Simon Glass wrote: >> >> Hi Hans, >> >> On 6 August 2015 at 12:13, Hans de Goede <hdegoede@redhat.com> wrote: >>> >>> sun6i and later have a couple of io-blocks which are shared between the >>> main CPU core and the "R" cpu which is small embedded cpu which can be >>> active while the main system is suspended. >>> >>> These gpio banks sit at a different mmio address then the normal banks, >>> and have a separate devicetree node and compatible, this adds support for >>> these banks to the sunxi-gpio code when built with device-model support. >>> >>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >>> --- >>> drivers/gpio/sunxi_gpio.c | 22 ++++++++++++++++++---- >>> 1 file changed, 18 insertions(+), 4 deletions(-) >>> >>> diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c >>> index afa165a..57b78e5 100644 >>> --- a/drivers/gpio/sunxi_gpio.c >>> +++ b/drivers/gpio/sunxi_gpio.c >>> @@ -266,16 +266,28 @@ static int gpio_sunxi_bind(struct udevice *parent) >>> { >>> struct sunxi_gpio_platdata *plat = parent->platdata; >>> struct sunxi_gpio_reg *ctlr; >>> - int bank; >>> - int ret; >>> + int bank, no_banks, ret, start; >>> >>> /* If this is a child device, there is nothing to do here */ >>> if (plat) >>> return 0; >>> >>> + if (fdt_node_check_compatible(gd->fdt_blob, parent->of_offset, >>> + "allwinner,sun6i-a31-r-pinctrl") == 0) { >> >> >> If I understand what you are doing here, the correct way is to use a >> .data field in sunxi_gpio_ids[] below. > > > Yes that would work too, but that indirection makes it harder to follow > what the code is doing without giving us much benefit IMHO. > >> In any case you should not be >> checking the compatible string of a parent. > > > AFAICT this is the right way to check a compatible string in a bind > function, > the parent variable name here is confusing as this actually points to the > udevice passed into the bind function, not its parent. I guess it is named > parent rather then device to distinguish it from the per bank gpio udevices > the bind function is instantiating. Sounds fine. > > So I'm not really checking the parents compatible but its own, it just looks > that way because of the bind function parameter name being parent. See for example, drivers/i2c/tegra_i2c.c: static const struct udevice_id tegra_i2c_ids[] = { { .compatible = "nvidia,tegra114-i2c", .data = TYPE_114 }, { .compatible = "nvidia,tegra20-i2c", .data = TYPE_STD }, { .compatible = "nvidia,tegra20-i2c-dvc", .data = TYPE_DVC }, { } }; ... i2c_bus->type = dev_get_driver_data(dev); which gets the 'data' value. So it's pretty easy to use and is the standard way to make a driver support multiple hardware types. > > Regards, > > Hans > > > >> >>> + start = 'L' - 'A'; >>> + no_banks = 2; /* L & M */ >>> + } else if (fdt_node_check_compatible(gd->fdt_blob, >>> parent->of_offset, >>> + "allwinner,sun8i-a23-r-pinctrl") == 0) { >>> + start = 'L' - 'A'; >>> + no_banks = 1; /* L only */ >>> + } else { >>> + start = 0; >>> + no_banks = SUNXI_GPIO_BANKS; >>> + } >>> + >>> ctlr = (struct sunxi_gpio_reg *)fdtdec_get_addr(gd->fdt_blob, >>> parent->of_offset, >>> "reg"); >>> - for (bank = 0; bank < SUNXI_GPIO_BANKS; bank++) { >>> + for (bank = 0; bank < no_banks; bank++) { >>> struct sunxi_gpio_platdata *plat; >>> struct udevice *dev; >>> >>> @@ -283,7 +295,7 @@ static int gpio_sunxi_bind(struct udevice *parent) >>> if (!plat) >>> return -ENOMEM; >>> plat->regs = &ctlr->gpio_bank[bank]; >>> - plat->bank_name = gpio_bank_name(bank); >>> + plat->bank_name = gpio_bank_name(start + bank); >>> plat->gpio_count = SUNXI_GPIOS_PER_BANK; >>> >>> ret = device_bind(parent, parent->driver, >>> @@ -306,6 +318,8 @@ static const struct udevice_id sunxi_gpio_ids[] = { >>> { .compatible = "allwinner,sun8i-a23-pinctrl" }, >>> { .compatible = "allwinner,sun8i-a33-pinctrl" }, >>> { .compatible = "allwinner,sun9i-a80-pinctrl" }, >>> + { .compatible = "allwinner,sun6i-a31-r-pinctrl" }, >>> + { .compatible = "allwinner,sun8i-a23-r-pinctrl" }, >>> { } >>> }; >>> >>> -- >>> 2.4.3 >>> >>> _______________________________________________ >>> U-Boot mailing list >>> U-Boot at lists.denx.de >>> http://lists.denx.de/mailman/listinfo/u-boot Regards, Simon ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 1/2] sunxi: Fix gmac not working on the Colombus board 2015-08-06 18:13 [U-Boot] [PATCH 1/2] sunxi: Fix gmac not working on the Colombus board Hans de Goede 2015-08-06 18:13 ` [U-Boot] [PATCH 2/2] sunxi: gpio: Add support for the gpio banks which are part of the R-io cluster Hans de Goede @ 2015-08-11 7:47 ` Ian Campbell 1 sibling, 0 replies; 7+ messages in thread From: Ian Campbell @ 2015-08-11 7:47 UTC (permalink / raw) To: u-boot On Thu, 2015-08-06 at 20:13 +0200, Hans de Goede wrote: > The phy is using a RGMII interface, which we need to specify in our > board-config, and the dts needs a gmac section (the dts changes have > also been submitted to the kernel). > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk> ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-08-18 12:45 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-08-06 18:13 [U-Boot] [PATCH 1/2] sunxi: Fix gmac not working on the Colombus board Hans de Goede 2015-08-06 18:13 ` [U-Boot] [PATCH 2/2] sunxi: gpio: Add support for the gpio banks which are part of the R-io cluster Hans de Goede 2015-08-11 7:49 ` Ian Campbell 2015-08-17 22:14 ` Simon Glass 2015-08-18 9:29 ` Hans de Goede 2015-08-18 12:45 ` Simon Glass 2015-08-11 7:47 ` [U-Boot] [PATCH 1/2] sunxi: Fix gmac not working on the Colombus board Ian Campbell
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.