sunxi: Move ALL boards to the device-model

This fixes the following errors being printed during boot:

Error, wrong i2c adapter 0 max 0 possible
Error, wrong i2c adapter 0 max 0 possible

Signed-off-by Hans de Goede <[email protected]>

---
 include/configs/sunxi-common.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

include/configs/sunxi-common.h +3 -5

index 3e49aba..f97e626 100644
@@ -261,14 +261,15 @@
 #define CONFIG_SPL_I2C_SUPPORT
 #endif
 
-#define CONFIG_SYS_I2C
 #if defined CONFIG_I2C0_ENABLE || defined CONFIG_I2C1_ENABLE || \
     defined CONFIG_I2C2_ENABLE || defined CONFIG_I2C3_ENABLE || \
     defined CONFIG_I2C4_ENABLE
+#define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MVTWSI
-#endif
 #define CONFIG_SYS_I2C_SPEED           400000
 #define CONFIG_SYS_I2C_SLAVE           0x7f
+#define CONFIG_CMD_I2C
+#endif
 
 #if defined CONFIG_VIDEO_LCD_PANEL_I2C && !(defined CONFIG_SPL_BUILD)
 #define CONFIG_SYS_I2C_SOFT

@@ -288,8 +289,6 @@ extern int soft_i2c_gpio_scl;
 #define CONFIG_VIDEO_LCD_I2C_BUS       -1 /* NA, but necessary to compile */
 #endif
 
-#define CONFIG_CMD_I2C
-
 /* PMU */
 #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || defined CONFIG_AXP221_POWER
 #define CONFIG_SPL_POWER_SUPPORT
--

2.3.5

Hi Hans,

Quoted 6 lines · Hans de Goede

This fixes the following errors being printed during boot:

Error, wrong i2c adapter 0 max 0 possible
Error, wrong i2c adapter 0 max 0 possible

Signed-off-by Hans de Goede <[email protected]>

Where does the error come from?

Reviewed-by Simon Glass <[email protected]>

Quoted 36 lines

---
  include/configs/sunxi-common.h | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)

include/configs/sunxi-common.h +3 -5

index 3e49aba..f97e626 100644
@@ -261,14 +261,15 @@
  #define CONFIG_SPL_I2C_SUPPORT
  #endif
 
-#define CONFIG_SYS_I2C
  #if defined CONFIG_I2C0_ENABLE || defined CONFIG_I2C1_ENABLE || \
      defined CONFIG_I2C2_ENABLE || defined CONFIG_I2C3_ENABLE || \
      defined CONFIG_I2C4_ENABLE
+#define CONFIG_SYS_I2C
  #define CONFIG_SYS_I2C_MVTWSI
-#endif
  #define CONFIG_SYS_I2C_SPEED           400000
  #define CONFIG_SYS_I2C_SLAVE           0x7f
+#define CONFIG_CMD_I2C
+#endif
 
  #if defined CONFIG_VIDEO_LCD_PANEL_I2C && !(defined CONFIG_SPL_BUILD)
  #define CONFIG_SYS_I2C_SOFT

@@ -288,8 +289,6 @@ extern int soft_i2c_gpio_scl;
  #define CONFIG_VIDEO_LCD_I2C_BUS       -1 /* NA, but necessary to compile */
  #endif
 
-#define CONFIG_CMD_I2C
-
  /* PMU */
  #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || defined CONFIG_AXP221_POWER
  #define CONFIG_SPL_POWER_SUPPORT
--

Quoted 2 lines

2.3.5

Regards,
Simon

This fixes the following errors being printed during boot:

Error, wrong i2c adapter 0 max 0 possible
Error, wrong i2c adapter 0 max 0 possible

Signed-off-by Hans de Goede <[email protected]>

The device-model gpio functions may return another value then -1 as error, make the sunxi mmc code properly handle this.

Signed-off-by Hans de Goede <[email protected]>

---
 drivers/mmc/sunxi_mmc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

drivers/mmc/sunxi_mmc.c +4 -4

index fcc278d..a664236 100644
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <errno.h>
 #include <malloc.h>
 #include <mmc.h>
 #include <asm/io.h>

@@ -37,7 +38,7 @@ static int sunxi_mmc_getcd_gpio(int sdc_no)
        case 2: return sunxi_name_to_gpio(CONFIG_MMC2_CD_PIN);
        case 3: return sunxi_name_to_gpio(CONFIG_MMC3_CD_PIN);
        }
-       return -1;
+       return -EINVAL;
 }
 
 static int mmc_resource_init(int sdc_no)

@@ -72,7 +73,7 @@ static int mmc_resource_init(int sdc_no)
        mmchost->mmc_no = sdc_no;
 
        cd_pin = sunxi_mmc_getcd_gpio(sdc_no);
-       if (cd_pin != -1) {
+       if (cd_pin >= 0) {
                ret = gpio_request(cd_pin, "mmc_cd");
                if (!ret)
                        ret = gpio_direction_input(cd_pin);

@@ -424,7 +425,7 @@ static int sunxi_mmc_getcd(struct mmc *mmc)
        int cd_pin;
 
        cd_pin = sunxi_mmc_getcd_gpio(mmchost->mmc_no);
-       if (cd_pin == -1)
+       if (cd_pin < 0)
                return 1;
 
        return !gpio_get_value(cd_pin);
--

2.3.5

HI Hans,

Quoted 2 lines · Hans de Goede

The device-model gpio functions may return another value then -1 as error, make the sunxi mmc code properly handle this.

FYI I tend to call it 'drive model' rather than 'device model'. It

might be good to change your commit messages it to avoid confusion.

Reviewed-by Simon Glass <[email protected]>

arch/arm/cpu/armv7/sunxi/usbc.c int sunxi_usbc_request_resources(int index) · line 191

Quoted 3 lines · Hans de Goede

         sunxi_usbc->gpio_vbus = get_vbus_gpio(index);

arch/arm/cpu/armv7/sunxi/usbc.c +1 -1

-       if (sunxi_usbc->gpio_vbus != -1) {
+       if (sunxi_usbc->gpio_vbus >= 0) {

What about using dm_gpio_is_valid() instead?

Hi,

Quoted 9 lines · Fabio Estevam

Quoted 3 lines · Hans de Goede

         sunxi_usbc->gpio_vbus = get_vbus_gpio(index);

arch/arm/cpu/armv7/sunxi/usbc.c +1 -1

-       if (sunxi_usbc->gpio_vbus != -1) {
+       if (sunxi_usbc->gpio_vbus >= 0) {

Quoted 1 line

What about using dm_gpio_is_valid() instead?

dm_gpio_is_valid takes a struct gpio_desc *, where as this code is using good old gpio indexes (int). We will likely want to convert this to getting the gpio from devicetree directly in the future, but first we need this patch-set to convert all sunxi boards to the device-model, so that we can make such changes without the need to introduce a whole lot of #ifdef-s

Regards,

Hans

The device-model gpio functions may return another value then -1 as error, make the sunxi usbc properly handle this.

Signed-off-by Hans de Goede <[email protected]>

The device-model gpio functions may return another value then -1 as error, make the sunxi display code properly handle this.

Signed-off-by Hans de Goede <[email protected]>

---
 drivers/video/sunxi_display.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

drivers/video/sunxi_display.c +8 -9

index 07c7a18..79a513c 100644
@@ -600,19 +600,19 @@ static void sunxi_lcdc_panel_enable(void)
         * white while the lcd inits.
         */
        pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_BL_EN);
-       if (pin != -1) {
+       if (pin >= 0) {
                gpio_request(pin, "lcd_backlight_enable");
                gpio_direction_output(pin, 0);
        }
 
        pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_BL_PWM);
-       if (pin != -1) {
+       if (pin >= 0) {
                gpio_request(pin, "lcd_backlight_pwm");
                gpio_direction_output(pin, PWM_OFF);
        }
 
        reset_pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_RESET);
-       if (reset_pin != -1) {
+       if (reset_pin >= 0) {
                gpio_request(reset_pin, "lcd_reset");
                gpio_direction_output(reset_pin, 0); /* Assert reset */
        }

@@ -620,12 +620,12 @@ static void sunxi_lcdc_panel_enable(void)
        /* Give the backlight some time to turn off and power up the panel. */
        mdelay(40);
        pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_POWER);
-       if (pin != -1) {
+       if (pin >= 0) {
                gpio_request(pin, "lcd_power");
                gpio_direction_output(pin, 1);
        }
 
-       if (reset_pin != -1)
+       if (reset_pin >= 0)
                gpio_direction_output(reset_pin, 1); /* De-assert reset */
 }
 

@@ -640,11 +640,11 @@ static void sunxi_lcdc_backlight_enable(void)
        mdelay(40);
 
        pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_BL_EN);
-       if (pin != -1)
+       if (pin >= 0)
                gpio_direction_output(pin, 1);
 
        pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_BL_PWM);
-       if (pin != -1)
+       if (pin >= 0)
                gpio_direction_output(pin, PWM_ON);
 }
 

@@ -961,7 +961,7 @@ static void sunxi_vga_external_dac_enable(void)
        int pin;
 
        pin = sunxi_name_to_gpio(CONFIG_VIDEO_VGA_EXTERNAL_DAC_EN);
-       if (pin != -1) {
+       if (pin >= 0) {
                gpio_request(pin, "vga_enable");
                gpio_direction_output(pin, 1);
        }
--

2.3.5

The device-model gpio functions may return another value then -1 as error, make the sunxi display code properly handle this.

Signed-off-by Hans de Goede <[email protected]>

i2c_init_board() gets called before the device-model (gpio) code is initialized, so move the setup of the soft-i2c pins out of i2c_init_board() and into board_init(), at which time the device-model setup has been done.

Also add proper error checking and properly request the gpios as that is mandatory with the device-model.

Signed-off-by Hans de Goede <[email protected]>

---
 board/sunxi/board.c | 44 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

board/sunxi/board.c +38 -7

index 171f0bc..6b93f92 100644
@@ -29,6 +29,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc.h>
 #include <asm/arch/usbc.h>
+#include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/usb/musb.h>
 #include <net.h>

@@ -37,6 +38,41 @@
 /* So that we can use pin names in Kconfig and sunxi_name_to_gpio() */
 int soft_i2c_gpio_sda;
 int soft_i2c_gpio_scl;
+
+static int soft_i2c_board_init(void)
+{
+       int ret;
+
+       soft_i2c_gpio_sda = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_PANEL_I2C_SDA);
+       if (soft_i2c_gpio_sda < 0) {
+               printf("Error invalid soft i2c sda pin: '%s', err %d\n",
+                      CONFIG_VIDEO_LCD_PANEL_I2C_SDA, soft_i2c_gpio_sda);
+               return soft_i2c_gpio_sda;
+       }
+       ret = gpio_request(soft_i2c_gpio_sda, "soft-i2c-sda");
+       if (ret) {
+               printf("Error requesting soft i2c sda pin: '%s', err %d\n",
+                      CONFIG_VIDEO_LCD_PANEL_I2C_SDA, ret);
+               return ret;
+       }
+
+       soft_i2c_gpio_scl = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_PANEL_I2C_SCL);
+       if (soft_i2c_gpio_scl < 0) {
+               printf("Error invalid soft i2c scl pin: '%s', err %d\n",
+                      CONFIG_VIDEO_LCD_PANEL_I2C_SCL, soft_i2c_gpio_scl);
+               return soft_i2c_gpio_scl;
+       }
+       ret = gpio_request(soft_i2c_gpio_scl, "soft-i2c-scl");
+       if (ret) {
+               printf("Error requesting soft i2c scl pin: '%s', err %d\n",
+                      CONFIG_VIDEO_LCD_PANEL_I2C_SCL, ret);
+               return ret;
+       }
+
+       return 0;
+}
+#else
+static int soft_i2c_board_init(void) { return 0; }
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;

@@ -57,7 +93,8 @@ int board_init(void)
                asm volatile("mcr p15, 0, %0, c14, c0, 0" : : "r"(24000000));
        }
 
-       return 0;
+       /* Uses dm gpio code so do this here and not in i2c_init_board() */
+       return soft_i2c_board_init();
 }
 
 int dram_init(void)

@@ -351,11 +388,6 @@ void i2c_init_board(void)
        clock_twi_onoff(4, 1);
 #endif
 #endif
-
-#if defined CONFIG_VIDEO_LCD_PANEL_I2C && !(defined CONFIG_SPL_BUILD)
-       soft_i2c_gpio_sda = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_PANEL_I2C_SDA);
-       soft_i2c_gpio_scl = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_PANEL_I2C_SCL);
-#endif
 }
 
 #ifdef CONFIG_SPL_BUILD
--

2.3.5

i2c_init_board() gets called before the device-model (gpio) code is initialized, so move the setup of the soft-i2c pins out of i2c_init_board() and into board_init(), at which time the device-model setup has been done.

Also add proper error checking and properly request the gpios as that is mandatory with the device-model.

Signed-off-by Hans de Goede <[email protected]>

We want to use device-model/fdt with other model SoCs too, so add compatible strings for the other SoCs to the dm sunxi gpio code.

Signed-off-by Hans de Goede <[email protected]>

---
 drivers/gpio/sunxi_gpio.c | 7 +++++++
 1 file changed, 7 insertions(+)

drivers/gpio/sunxi_gpio.c +7 -1

index 89209df..e6a90b9 100644
@@ -322,7 +322,14 @@ static int gpio_sunxi_bind(struct udevice *parent)
 }
 
 static const struct udevice_id sunxi_gpio_ids[] = {
+       { .compatible = "allwinner,sun4i-a10-pinctrl" },
+       { .compatible = "allwinner,sun5i-a10s-pinctrl" },
+       { .compatible = "allwinner,sun5i-a13-pinctrl" },
+       { .compatible = "allwinner,sun6i-a31-pinctrl" },
+       { .compatible = "allwinner,sun6i-a31s-pinctrl" },
        { .compatible = "allwinner,sun7i-a20-pinctrl" },
+       { .compatible = "allwinner,sun8i-a23-pinctrl" },
+       { .compatible = "allwinner,sun9i-a80-pinctrl" },
        { }
 };
 
--

2.3.5

We want to use device-model/fdt with other model SoCs too, so add compatible strings for the other SoCs to the dm sunxi gpio code.

Signed-off-by Hans de Goede <[email protected]>

When doing a device-model enabled build we still need sunxi_name_to_gpio_bank (for now) for the mmc pinmux code in board/sunxi/board.c, so build it for device-model enabled builds too.

Signed-off-by Hans de Goede <[email protected]>

---
 drivers/gpio/sunxi_gpio.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

drivers/gpio/sunxi_gpio.c +14 -15

index e6a90b9..91af1a5 100644
@@ -118,20 +118,6 @@ int gpio_set_value(unsigned gpio, int value)
        return sunxi_gpio_output(gpio, value);
 }
 
-int sunxi_name_to_gpio_bank(const char *name)
-{
-       int group = 0;
-
-       if (*name == 'P' || *name == 'p')
-               name++;
-       if (*name >= 'A') {
-               group = *name - (*name > 'a' ? 'a' : 'A');
-               return group;
-       }
-
-       return -1;
-}
-
 int sunxi_name_to_gpio(const char *name)
 {
        int group = 0;

@@ -171,6 +157,20 @@ int sunxi_name_to_gpio(const char *name)
 }
 #endif
 
+int sunxi_name_to_gpio_bank(const char *name)
+{
+       int group = 0;
+
+       if (*name == 'P' || *name == 'p')
+               name++;
+       if (*name >= 'A') {
+               group = *name - (*name > 'a' ? 'a' : 'A');
+               return group;
+       }
+
+       return -1;
+}
+
 #ifdef CONFIG_DM_GPIO
 /* TODO(sjg at chromium.org): Remove this function and use device tree */
 int sunxi_name_to_gpio(const char *name)
--

2.3.5

When doing a device-model enabled build we still need sunxi_name_to_gpio_bank (for now) for the mmc pinmux code in board/sunxi/board.c, so build it for device-model enabled builds too.

Signed-off-by Hans de Goede <[email protected]>

Change the axp_gpio_foo function prototypes to match the gpio uclass op prototypes, so that they can be used directly when adding device-model support for the axp gpios.

Signed-off-by Hans de Goede <[email protected]>

---
 drivers/gpio/sunxi_gpio.c |  8 ++++----
 drivers/power/axp209.c    | 10 +++++-----
 drivers/power/axp221.c    | 10 +++++-----
 include/axp209.h          | 10 ++++++----
 include/axp221.h          | 10 ++++++----
 5 files changed, 26 insertions(+), 22 deletions(-)

drivers/gpio/sunxi_gpio.c +4 -4

index 91af1a5..0774b70 100644
@@ -81,7 +81,7 @@ int gpio_direction_input(unsigned gpio)
 {
 #ifdef AXP_GPIO
        if (gpio >= SUNXI_GPIO_AXP0_START)
-               return axp_gpio_direction_input(gpio - SUNXI_GPIO_AXP0_START);
+               return axp_gpio_direction_input(NULL, gpio - SUNXI_GPIO_AXP0_START);
 #endif
        sunxi_gpio_set_cfgpin(gpio, SUNXI_GPIO_INPUT);
 

@@ -92,7 +92,7 @@ int gpio_direction_output(unsigned gpio, int value)
 {
 #ifdef AXP_GPIO
        if (gpio >= SUNXI_GPIO_AXP0_START)
-               return axp_gpio_direction_output(gpio - SUNXI_GPIO_AXP0_START,
+               return axp_gpio_direction_output(NULL, gpio - SUNXI_GPIO_AXP0_START,
                                                 value);
 #endif
        sunxi_gpio_set_cfgpin(gpio, SUNXI_GPIO_OUTPUT);

@@ -104,7 +104,7 @@ int gpio_get_value(unsigned gpio)
 {
 #ifdef AXP_GPIO
        if (gpio >= SUNXI_GPIO_AXP0_START)
-               return axp_gpio_get_value(gpio - SUNXI_GPIO_AXP0_START);
+               return axp_gpio_get_value(NULL, gpio - SUNXI_GPIO_AXP0_START);
 #endif
        return sunxi_gpio_input(gpio);
 }

@@ -113,7 +113,7 @@ int gpio_set_value(unsigned gpio, int value)
 {
 #ifdef AXP_GPIO
        if (gpio >= SUNXI_GPIO_AXP0_START)
-               return axp_gpio_set_value(gpio - SUNXI_GPIO_AXP0_START, value);
+               return axp_gpio_set_value(NULL, gpio - SUNXI_GPIO_AXP0_START, value);
 #endif
        return sunxi_gpio_output(gpio, value);
 }

drivers/power/axp209.c +5 -5

index 1d7be49..98c214f 100644
@@ -167,7 +167,7 @@ static u8 axp209_get_gpio_ctrl_reg(unsigned int pin)
        return 0;
 }
 
-int axp_gpio_direction_input(unsigned int pin)
+int axp_gpio_direction_input(struct udevice *dev, unsigned pin)
 {
        if (pin == SUNXI_GPIO_AXP0_VBUS_DETECT)
                return 0;

@@ -179,7 +179,7 @@ int axp_gpio_direction_input(unsigned int pin)
        return axp209_write(reg, val);
 }
 
-int axp_gpio_direction_output(unsigned int pin, unsigned int val)
+int axp_gpio_direction_output(struct udevice *dev, unsigned pin, int val)
 {
        u8 reg = axp209_get_gpio_ctrl_reg(pin);
 

@@ -194,7 +194,7 @@ int axp_gpio_direction_output(unsigned int pin, unsigned int val)
        return axp209_write(reg, val);
 }
 
-int axp_gpio_get_value(unsigned int pin)
+int axp_gpio_get_value(struct udevice *dev, unsigned pin)
 {
        u8 val, mask;
        int rc;

@@ -215,7 +215,7 @@ int axp_gpio_get_value(unsigned int pin)
        return (val & mask) ? 1 : 0;
 }
 
-int axp_gpio_set_value(unsigned int pin, unsigned int val)
+int axp_gpio_set_value(struct udevice *dev, unsigned pin, int val)
 {
-       return axp_gpio_direction_output(pin, val);
+       return axp_gpio_direction_output(dev, pin, val);
 }

drivers/power/axp221.c +5 -5

index dc3a7f1..4970ab4 100644
@@ -386,7 +386,7 @@ int axp221_get_sid(unsigned int *sid)
        return 0;
 }
 
-int axp_gpio_direction_input(unsigned int pin)
+int axp_gpio_direction_input(struct udevice *dev, unsigned pin)
 {
        switch (pin) {
        case SUNXI_GPIO_AXP0_VBUS_DETECT:

@@ -396,7 +396,7 @@ int axp_gpio_direction_input(unsigned int pin)
        }
 }
 
-int axp_gpio_direction_output(unsigned int pin, unsigned int val)
+int axp_gpio_direction_output(struct udevice *dev, unsigned pin, int val)
 {
        int ret;
 

@@ -407,13 +407,13 @@ int axp_gpio_direction_output(unsigned int pin, unsigned int val)
                if (ret)
                        return ret;
 
-               return axp_gpio_set_value(pin, val);
+               return axp_gpio_set_value(dev, pin, val);
        default:
                return -EINVAL;
        }
 }
 
-int axp_gpio_get_value(unsigned int pin)
+int axp_gpio_get_value(struct udevice *dev, unsigned pin)
 {
        int ret;
        u8 val;

@@ -430,7 +430,7 @@ int axp_gpio_get_value(unsigned int pin)
        }
 }
 
-int axp_gpio_set_value(unsigned int pin, unsigned int val)
+int axp_gpio_set_value(struct udevice *dev, unsigned pin, int val)
 {
        int ret;
 

include/axp209.h +6 -4

index d36da41..fe4a169 100644
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
+struct udevice;
+
 enum axp209_reg {
        AXP209_POWER_STATUS = 0x00,
        AXP209_CHIP_VERSION = 0x03,

@@ -53,7 +55,7 @@ extern int axp209_init(void);
 extern int axp209_poweron_by_dc(void);
 extern int axp209_power_button(void);
 
-extern int axp_gpio_direction_input(unsigned int pin);
-extern int axp_gpio_direction_output(unsigned int pin, unsigned int val);
-extern int axp_gpio_get_value(unsigned int pin);
-extern int axp_gpio_set_value(unsigned int pin, unsigned int val);
+extern int axp_gpio_direction_input(struct udevice *dev, unsigned offset);
+extern int axp_gpio_direction_output(struct udevice *dev, unsigned offset, int val);
+extern int axp_gpio_get_value(struct udevice *dev, unsigned offset);
+extern int axp_gpio_set_value(struct udevice *dev, unsigned offset, int val);

include/axp221.h +6 -5

index 0aac04d..e826ca8 100644
@@ -6,6 +6,8 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
+struct udevice;
+
 #define AXP221_CHIP_ADDR 0x68
 #define AXP221_CTRL_ADDR 0x3e
 #define AXP221_INIT_DATA 0x3e

@@ -80,7 +82,7 @@ int axp221_set_eldo(int eldo_num, unsigned int mvolt);
 int axp221_init(void);
 int axp221_get_sid(unsigned int *sid);
 
-int axp_gpio_direction_input(unsigned int pin);
-int axp_gpio_direction_output(unsigned int pin, unsigned int val);
-int axp_gpio_get_value(unsigned int pin);
-int axp_gpio_set_value(unsigned int pin, unsigned int val);
+int axp_gpio_direction_input(struct udevice *dev, unsigned offset);
+int axp_gpio_direction_output(struct udevice *dev, unsigned offset, int val);
+int axp_gpio_get_value(struct udevice *dev, unsigned offset);
+int axp_gpio_set_value(struct udevice *dev, unsigned offset, int val);
--

2.3.5

This really should be part of the axp pmic driver, but that is not converted yet to device-model, and the upstream kernel does not support axp gpios yet so there is no devicetree binding for them yet.

So for now bolt on the axp gpio support to the SoC's own gpio support like we've been doing for the non dm case. This allows boards using axp gpios to be converted to dm.

Signed-off-by Hans de Goede <[email protected]>

---
 arch/arm/include/asm/arch-sunxi/gpio.h |  6 ++--
 drivers/gpio/sunxi_gpio.c              | 64 +++++++++++++++++++++++++++++-----
 2 files changed, 60 insertions(+), 10 deletions(-)

arch/arm/include/asm/arch-sunxi/gpio.h +4 -2

index c9bfb4c..cbb3328 100644
@@ -204,8 +204,10 @@ enum sunxi_gpio_number {
 #define SUNXI_GPIO_PULL_DOWN   2
 
 /* Virtual AXP0 GPIOs */
-#define SUNXI_GPIO_AXP0_VBUS_DETECT    8
-#define SUNXI_GPIO_AXP0_VBUS_ENABLE    9
+#define SUNXI_GPIO_AXP0_PREFIX "AXP0-"
+#define SUNXI_GPIO_AXP0_VBUS_DETECT    4
+#define SUNXI_GPIO_AXP0_VBUS_ENABLE    5
+#define SUNXI_GPIO_AXP0_GPIO_COUNT     6
 
 void sunxi_gpio_set_cfgbank(struct sunxi_gpio *pio, int bank_offset, u32 val);
 void sunxi_gpio_set_cfgpin(u32 pin, u32 val);

drivers/gpio/sunxi_gpio.c +56 -9

index 0774b70..38d72b7 100644
@@ -126,7 +126,7 @@ int sunxi_name_to_gpio(const char *name)
        char *eptr;
 
 #ifdef AXP_GPIO
-       if (strncasecmp(name, "AXP0-", 5) == 0) {
+       if (strncasecmp(name, SUNXI_GPIO_AXP0_PREFIX, 5) == 0) {
                name += 5;
                if (strcmp(name, "VBUS-DETECT") == 0)
                        return SUNXI_GPIO_AXP0_START +

@@ -172,12 +172,56 @@ int sunxi_name_to_gpio_bank(const char *name)
 }
 
 #ifdef CONFIG_DM_GPIO
+
+#ifdef AXP_GPIO
+/* FIXME this should be part of the axp drivers */
+static const struct dm_gpio_ops gpio_axp_ops = {
+       .direction_input        = axp_gpio_direction_input,
+       .direction_output       = axp_gpio_direction_output,
+       .get_value              = axp_gpio_get_value,
+       .set_value              = axp_gpio_set_value,
+};
+
+static int gpio_axp_probe(struct udevice *dev)
+{
+       struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+
+       /* Tell the uclass how many GPIOs we have */
+       uc_priv->bank_name = strdup(SUNXI_GPIO_AXP0_PREFIX);
+       uc_priv->gpio_count = SUNXI_GPIO_AXP0_GPIO_COUNT;
+
+       return 0;
+}
+
+struct driver gpio_axp_driver = {
+       .name   = "gpio_axp",
+       .id     = UCLASS_GPIO,
+       .ops    = &gpio_axp_ops,
+       .probe  = gpio_axp_probe,
+};
+#endif
+
 /* TODO(sjg at chromium.org): Remove this function and use device tree */
 int sunxi_name_to_gpio(const char *name)
 {
        unsigned int gpio;
        int ret;
-
+#ifdef AXP_GPIO
+       char lookup[8];
+
+       if (strncasecmp(name, SUNXI_GPIO_AXP0_PREFIX, 5) == 0) {
+               int len = strlen(SUNXI_GPIO_AXP0_PREFIX);
+               if (strcmp(name + len, "VBUS-DETECT") == 0) {
+                       sprintf(lookup, SUNXI_GPIO_AXP0_PREFIX "%d",
+                               SUNXI_GPIO_AXP0_VBUS_DETECT);
+                       name = lookup;
+               } else if (strcmp(name + len, "VBUS-ENABLE") == 0) {
+                       sprintf(lookup, "AXP0-%d\n",
+                               SUNXI_GPIO_AXP0_VBUS_ENABLE);
+                       name = lookup;
+               }
+       }
+#endif
        ret = gpio_lookup_name(name, NULL, NULL, &gpio);
 
        return ret ? ret : gpio;

@@ -222,7 +266,7 @@ static int sunxi_gpio_set_value(struct udevice *dev, unsigned offset,
        struct sunxi_gpio_platdata *plat = dev_get_platdata(dev);
        u32 num = GPIO_NUM(offset);
 
-       clrsetbits_le32(&plat->regs->dat, 1 << num, value ? (1 << num) : 0);
+;      clrsetbits_le32(&plat->regs->dat, 1 << num, value ? (1 << num) : 0);
        return 0;
 }
 

@@ -289,21 +333,19 @@ static int gpio_sunxi_probe(struct udevice *dev)
  */
 static int gpio_sunxi_bind(struct udevice *parent)
 {
-       struct sunxi_gpio_platdata *plat = parent->platdata;
+       struct sunxi_gpio_platdata *plat;
        struct sunxi_gpio_reg *ctlr;
+       struct udevice *dev;
        int bank;
        int ret;
 
        /* If this is a child device, there is nothing to do here */
-       if (plat)
+       if (parent->platdata)
                return 0;
 
        ctlr = (struct sunxi_gpio_reg *)fdtdec_get_addr(gd->fdt_blob,
                                                   parent->of_offset, "reg");
        for (bank = 0; bank < SUNXI_GPIO_BANKS; bank++) {
-               struct sunxi_gpio_platdata *plat;
-               struct udevice *dev;
-
                plat = calloc(1, sizeof(*plat));
                if (!plat)
                        return -ENOMEM;

@@ -318,6 +360,12 @@ static int gpio_sunxi_bind(struct udevice *parent)
                dev->of_offset = parent->of_offset;
        }
 
+#ifdef AXP_GPIO
+       /* FIXME this should be a child of the axp device */
+       ret = device_bind(parent, &gpio_axp_driver, "AXP", NULL, -1, &dev);
+       if (ret)
+               return ret;
+#endif
        return 0;
 }
 
--

2.3.5

netdev.h should not be included in device-model enabled builds (doing so causes compiler warnings about struct eth_device not being declared), but we do use sunxi_gmac_initialize in the device-model case, so move it out of netdev.h .

Signed-off-by Hans de Goede <[email protected]>

---
 arch/arm/include/asm/arch-sunxi/sys_proto.h | 3 +++
 include/netdev.h                            | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

arch/arm/include/asm/arch-sunxi/sys_proto.h +3 -0

index 60a5bd8..9df3744 100644
@@ -23,4 +23,7 @@ void sdelay(unsigned long);
  */
 void return_to_fel(uint32_t lr, uint32_t sp);
 
+/* Board / SoC level designware gmac init */
+int sunxi_gmac_initialize(bd_t *bis);
+
 #endif

include/netdev.h +0 -2

index d96e1da..e6bdfdf 100644
@@ -81,7 +81,6 @@ int skge_initialize(bd_t *bis);
 int smc91111_initialize(u8 dev_num, int base_addr);
 int smc911x_initialize(u8 dev_num, int base_addr);
 int sunxi_emac_initialize(bd_t *bis);
-int sunxi_gmac_initialize(bd_t *bis);
 int tsi108_eth_initialize(bd_t *bis);
 int uec_standard_init(bd_t *bis);
 int uli526x_initialize(bd_t *bis);
--

2.3.5

netdev.h should not be included in device-model enabled builds (doing so causes compiler warnings about struct eth_device not being declared), but we do use sunxi_gmac_initialize in the device-model case, so move it out of netdev.h .

Signed-off-by Hans de Goede <[email protected]>

Quoted 4 lines · Hans de Goede

netdev.h should not be included in device-model enabled builds (doing so causes compiler warnings about struct eth_device not being declared), but we do use sunxi_gmac_initialize in the device-model case, so move it out of netdev.h .

Worth keeping the emac one alongside?

This is a preparation-patch for adding device-model support to the emac driver.

Signed-off-by Hans de Goede <[email protected]>

Modify the sunxi-emac eth driver to support device model.

Signed-off-by Hans de Goede <[email protected]>

---
 arch/arm/cpu/armv7/sunxi/board.c |  4 +-
 drivers/net/sunxi_emac.c         | 81 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)

arch/arm/cpu/armv7/sunxi/board.c +3 -1

index 7e9cf11..cde13ef 100644
@@ -12,7 +12,9 @@
 
 #include <common.h>
 #include <i2c.h>
+#ifndef CONFIG_DM_ETH
 #include <netdev.h>
+#endif
 #include <miiphy.h>
 #include <serial.h>
 #ifdef CONFIG_SPL_BUILD

@@ -224,7 +226,7 @@ int cpu_eth_init(bd_t *bis)
        mdelay(200);
 #endif
 
-#ifdef CONFIG_SUNXI_EMAC
+#if defined CONFIG_SUNXI_EMAC && !defined CONFIG_DM_ETH
        rc = sunxi_emac_initialize(bis);
        if (rc < 0) {
                printf("sunxi: failed to initialize emac\n");

drivers/net/sunxi_emac.c +1 -0

index 038f474..a9efe11 100644
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <linux/err.h>
 #include <malloc.h>
 #include <miiphy.h>

drivers/net/sunxi_emac.c +78 -1

+#endif
 };
 
 struct emac_rxhdr {

@@ -509,6 +513,7 @@ static void sunxi_emac_board_setup(struct emac_eth_dev *priv)
        clrsetbits_le32(&regs->mac_mcfg, 0xf << 2, 0xd << 2);
 }
 
+#ifndef CONFIG_DM_ETH
 static int sunxi_emac_eth_init(struct eth_device *dev, bd_t *bis)
 {
        return _sunxi_emac_eth_init(dev->priv, dev->enetaddr);

@@ -573,3 +578,79 @@ int sunxi_emac_initialize(void)
 
        return sunxi_emac_init_phy(priv, dev);
 }
+#endif
+
+#ifdef CONFIG_DM_ETH
+static int sunxi_emac_eth_start(struct udevice *dev)
+{
+       struct eth_pdata *pdata = dev_get_platdata(dev);
+
+       return _sunxi_emac_eth_init(dev->priv, pdata->enetaddr);
+}
+
+static int sunxi_emac_eth_send(struct udevice *dev, void *packet, int length)
+{
+       struct emac_eth_dev *priv = dev_get_priv(dev);
+
+       return _sunxi_emac_eth_send(priv, packet, length);
+}
+
+static int sunxi_emac_eth_recv(struct udevice *dev, uchar **packetp)
+{
+       struct emac_eth_dev *priv = dev_get_priv(dev);
+       int rx_len;
+
+       rx_len = _sunxi_emac_eth_recv(priv, priv->rx_buf);
+       *packetp = priv->rx_buf;
+
+       return rx_len;
+}
+
+static void sunxi_emac_eth_stop(struct udevice *dev)
+{
+       /* Nothing to do here */
+}
+
+static int sunxi_emac_eth_probe(struct udevice *dev)
+{
+       struct eth_pdata *pdata = dev_get_platdata(dev);
+       struct emac_eth_dev *priv = dev_get_priv(dev);
+
+       priv->regs = (struct emac_regs *)pdata->iobase;
+       sunxi_emac_board_setup(priv);
+
+       return sunxi_emac_init_phy(priv, dev);
+}
+
+static const struct eth_ops sunxi_emac_eth_ops = {
+       .start                  = sunxi_emac_eth_start,
+       .send                   = sunxi_emac_eth_send,
+       .recv                   = sunxi_emac_eth_recv,
+       .stop                   = sunxi_emac_eth_stop,
+};
+
+static int sunxi_emac_eth_ofdata_to_platdata(struct udevice *dev)
+{
+       struct eth_pdata *pdata = dev_get_platdata(dev);
+
+       pdata->iobase = dev_get_addr(dev);
+
+       return 0;
+}
+
+static const struct udevice_id sunxi_emac_eth_ids[] = {
+       { .compatible = "allwinner,sun4i-a10-emac" },
+       { }
+};
+
+U_BOOT_DRIVER(eth_sunxi_emac) = {
+       .name   = "eth_sunxi_emac",
+       .id     = UCLASS_ETH,
+       .of_match = sunxi_emac_eth_ids,
+       .ofdata_to_platdata = sunxi_emac_eth_ofdata_to_platdata,
+       .probe  = sunxi_emac_eth_probe,
+       .ops    = &sunxi_emac_eth_ops,
+       .priv_auto_alloc_size = sizeof(struct emac_eth_dev),
+       .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+};
+#endif
--

2.3.5

Hi Hans,

Quoted 38 lines · Hans de Goede

Modify the sunxi-emac eth driver to support device model.

Signed-off-by Hans de Goede <[email protected]>

---
  arch/arm/cpu/armv7/sunxi/board.c |  4 +-
  drivers/net/sunxi_emac.c         | 81 ++++++++++++++++++++++++++++++++++++++++
  2 files changed, 84 insertions(+), 1 deletion(-)

arch/arm/cpu/armv7/sunxi/board.c +3 -1

index 7e9cf11..cde13ef 100644
@@ -12,7 +12,9 @@
 
  #include <common.h>
  #include <i2c.h>
+#ifndef CONFIG_DM_ETH
  #include <netdev.h>
+#endif
  #include <miiphy.h>
  #include <serial.h>
  #ifdef CONFIG_SPL_BUILD

@@ -224,7 +226,7 @@ int cpu_eth_init(bd_t *bis)
         mdelay(200);
  #endif
 
-#ifdef CONFIG_SUNXI_EMAC
+#if defined CONFIG_SUNXI_EMAC && !defined CONFIG_DM_ETH
         rc = sunxi_emac_initialize(bis);
         if (rc < 0) {
                 printf("sunxi: failed to initialize emac\n");

drivers/net/sunxi_emac.c +0 -0

index 038f474..a9efe11 100644
@@ -7,6 +7,7 @@
   */
 

drivers/net/sunxi_emac.c struct emac_eth_dev { · line 165

Quoted 11 lines

drivers/net/sunxi_emac.c +3 -0

  #include <common.h>
+#include <dm.h>
  #include <linux/err.h>
  #include <malloc.h>
  #include <miiphy.h>

@@ -160,6 +161,9 @@ struct emac_eth_dev {
         struct mii_dev *bus;
         struct phy_device *phydev;
         int link_printed;
+#ifdef CONFIG_DM_ETH
+       uchar rx_buf[DMA_CPU_TRRESHOLD];

THRESHOLD

Also does this need to be DMA-aligned? - e.g. DM_FLAG_ALLOC_PRIV_DMA

Quoted 94 lines

drivers/net/sunxi_emac.c +78 -1

+#endif
  };
 
  struct emac_rxhdr {

@@ -509,6 +513,7 @@ static void sunxi_emac_board_setup(struct emac_eth_dev *priv)
         clrsetbits_le32(&regs->mac_mcfg, 0xf << 2, 0xd << 2);
  }
 
+#ifndef CONFIG_DM_ETH
  static int sunxi_emac_eth_init(struct eth_device *dev, bd_t *bis)
  {
         return _sunxi_emac_eth_init(dev->priv, dev->enetaddr);

@@ -573,3 +578,79 @@ int sunxi_emac_initialize(void)
 
         return sunxi_emac_init_phy(priv, dev);
  }
+#endif
+
+#ifdef CONFIG_DM_ETH
+static int sunxi_emac_eth_start(struct udevice *dev)
+{
+       struct eth_pdata *pdata = dev_get_platdata(dev);
+
+       return _sunxi_emac_eth_init(dev->priv, pdata->enetaddr);
+}
+
+static int sunxi_emac_eth_send(struct udevice *dev, void *packet, int length)
+{
+       struct emac_eth_dev *priv = dev_get_priv(dev);
+
+       return _sunxi_emac_eth_send(priv, packet, length);
+}
+
+static int sunxi_emac_eth_recv(struct udevice *dev, uchar **packetp)
+{
+       struct emac_eth_dev *priv = dev_get_priv(dev);
+       int rx_len;
+
+       rx_len = _sunxi_emac_eth_recv(priv, priv->rx_buf);
+       *packetp = priv->rx_buf;
+
+       return rx_len;
+}
+
+static void sunxi_emac_eth_stop(struct udevice *dev)
+{
+       /* Nothing to do here */
+}
+
+static int sunxi_emac_eth_probe(struct udevice *dev)
+{
+       struct eth_pdata *pdata = dev_get_platdata(dev);
+       struct emac_eth_dev *priv = dev_get_priv(dev);
+
+       priv->regs = (struct emac_regs *)pdata->iobase;
+       sunxi_emac_board_setup(priv);
+
+       return sunxi_emac_init_phy(priv, dev);
+}
+
+static const struct eth_ops sunxi_emac_eth_ops = {
+       .start                  = sunxi_emac_eth_start,
+       .send                   = sunxi_emac_eth_send,
+       .recv                   = sunxi_emac_eth_recv,
+       .stop                   = sunxi_emac_eth_stop,
+};
+
+static int sunxi_emac_eth_ofdata_to_platdata(struct udevice *dev)
+{
+       struct eth_pdata *pdata = dev_get_platdata(dev);
+
+       pdata->iobase = dev_get_addr(dev);
+
+       return 0;
+}
+
+static const struct udevice_id sunxi_emac_eth_ids[] = {
+       { .compatible = "allwinner,sun4i-a10-emac" },
+       { }
+};
+
+U_BOOT_DRIVER(eth_sunxi_emac) = {
+       .name   = "eth_sunxi_emac",
+       .id     = UCLASS_ETH,
+       .of_match = sunxi_emac_eth_ids,
+       .ofdata_to_platdata = sunxi_emac_eth_ofdata_to_platdata,
+       .probe  = sunxi_emac_eth_probe,
+       .ops    = &sunxi_emac_eth_ops,
+       .priv_auto_alloc_size = sizeof(struct emac_eth_dev),
+       .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+};
+#endif
--

Quoted 2 lines

2.3.5

Regards,
Simon

Bring all the sunxi dts files (and update existing ones) from mripard/sunxi/dt-for-4.1 (which will be merged into upstream master any day now). This is necessary so that we can move all sunxi boards over to the device model.

Signed-off-by Hans de Goede <[email protected]>

Bring all the sunxi dts files (and update existing ones) from mripard/sunxi/dt-for-4.1

(which will be merged into upstream master any
day now). This is necessary so that we can move all sunxi boards over to the device model.

Signed-off-by Hans de Goede <[email protected]>

We need dts files for all boards we support, so bring in a few unmerged ones, these will be replaced with the upstream merged versions the next time we sync dts files.

Signed-off-by Hans de Goede <[email protected]>

---
 arch/arm/dts/Makefile                 |   2 +
 arch/arm/dts/sun4i-a10-jesurun-q5.dts | 194 ++++++++++++++++++++++++++++++++++
 arch/arm/dts/sun7i-a20-primo73.dts    | 102 ++++++++++++++++++
 3 files changed, 298 insertions(+)
 create mode 100644 arch/arm/dts/sun4i-a10-jesurun-q5.dts
 create mode 100644 arch/arm/dts/sun7i-a20-primo73.dts

We need dts files for all boards we support, so bring in a few unmerged ones, these will be replaced with the upstream merged versions the next time we sync dts files.

Signed-off-by Hans de Goede <[email protected]>