sandbox, test: change hog gpio

Since commit 9ba84329dc45 ("sandbox, test: add test for GPIO_HOG
function"), the gpio_a 0,1,2 and 3 are used by hog in test.dts.
But 2 leds 'sandbox:red' and 'sandbox:green' are using gpio_a 0
and 1. As hog always request his gpios, the led command on both
led is broken:

=> led sandbox:red
LED 'sandbox:red' not found (err=-16)

The gpio is already requested by hog, so it can't be enabled
for led 'sandbox:red'.

This commit change the gpio used by hog to 10, 11, 12 and 13,
so the led command could be used again with 'sandbox:red' and
'sandbox:green'.

Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 2ae42397216f3f21a2f01a94aa0f4685891a11bc..2325ec6e69d0c75399c13b68194e5cb7805b1ab6 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -355,22 +355,22 @@
                        hog_input_active_low {
                                gpio-hog;
                                input;
-                               gpios = <0 GPIO_ACTIVE_LOW>;
+                               gpios = <10 GPIO_ACTIVE_LOW>;
                        };
                        hog_input_active_high {
                                gpio-hog;
                                input;
-                               gpios = <1 GPIO_ACTIVE_HIGH>;
+                               gpios = <11 GPIO_ACTIVE_HIGH>;
                        };
                        hog_output_low {
                                gpio-hog;
                                output-low;
-                               gpios = <2 GPIO_ACTIVE_HIGH>;
+                               gpios = <12 GPIO_ACTIVE_HIGH>;
                        };
                        hog_output_high {
                                gpio-hog;
                                output-high;
-                               gpios = <3 GPIO_ACTIVE_HIGH>;
+                               gpios = <13 GPIO_ACTIVE_HIGH>;
                        };
                };
 

diff --git a/test/dm/gpio.c b/test/dm/gpio.c
index 29701389fcd59f71778538e63d0cc6ff6aad6b0c..b7ee8fc3caebd4f13126db38a7b73d79f6c2e537 100644 (file)
--- a/test/dm/gpio.c
+++ b/test/dm/gpio.c
@@ -114,21 +114,21 @@ static int dm_test_gpio(struct unit_test_state *uts)
        /* add gpio hog tests */
        ut_assertok(gpio_hog_lookup_name("hog_input_active_low", &desc));
        ut_asserteq(GPIOD_IS_IN | GPIOD_ACTIVE_LOW, desc->flags);
-       ut_asserteq(0, desc->offset);
+       ut_asserteq(10, desc->offset);
        ut_asserteq(1, dm_gpio_get_value(desc));
        ut_assertok(gpio_hog_lookup_name("hog_input_active_high", &desc));
        ut_asserteq(GPIOD_IS_IN, desc->flags);
-       ut_asserteq(1, desc->offset);
+       ut_asserteq(11, desc->offset);
        ut_asserteq(0, dm_gpio_get_value(desc));
        ut_assertok(gpio_hog_lookup_name("hog_output_low", &desc));
        ut_asserteq(GPIOD_IS_OUT, desc->flags);
-       ut_asserteq(2, desc->offset);
+       ut_asserteq(12, desc->offset);
        ut_asserteq(0, dm_gpio_get_value(desc));
        ut_assertok(dm_gpio_set_value(desc, 1));
        ut_asserteq(1, dm_gpio_get_value(desc));
        ut_assertok(gpio_hog_lookup_name("hog_output_high", &desc));
        ut_asserteq(GPIOD_IS_OUT, desc->flags);
-       ut_asserteq(3, desc->offset);
+       ut_asserteq(13, desc->offset);
        ut_asserteq(1, dm_gpio_get_value(desc));
        ut_assertok(dm_gpio_set_value(desc, 0));
        ut_asserteq(0, dm_gpio_get_value(desc));
@@ -137,8 +137,8 @@ static int dm_test_gpio(struct unit_test_state *uts)
        ut_assertok(gpio_lookup_name("hog_input_active_low", &dev, &offset,
                                     &gpio));
        ut_asserteq_str(dev->name, "base-gpios");
-       ut_asserteq(0, offset);
-       ut_asserteq(CONFIG_SANDBOX_GPIO_COUNT + 0, gpio);
+       ut_asserteq(10, offset);
+       ut_asserteq(CONFIG_SANDBOX_GPIO_COUNT + 10, gpio);
        ut_assert(gpio_lookup_name("hog_not_exist", &dev, &offset,
                                   &gpio));