meta-ampere: mtmitchell: use standard gpio commands
Change to use gpioset and gpioget to set value for output GPIOs and read
value for input GPIOs.
This commit also corrects GPIO base numbers which are changed in Linux
kernel 6.5
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: I802f9d777537ff28f94945006b6582b15523e3a8
diff --git a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere_bmc_heartbeat.sh b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere_bmc_heartbeat.sh
index b9bba7b..0180996 100644
--- a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere_bmc_heartbeat.sh
+++ b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere_bmc_heartbeat.sh
@@ -1,19 +1,18 @@
#!/bin/bash
-# shellcheck source=meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/gpio-lib.sh
-source /usr/sbin/gpio-lib.sh
+# shellcheck disable=SC2046
value=0
while true;
do
if [[ $value -eq 0 ]]; then
value=1
- gpio_name_set led-sw-hb 1
- gpio_name_set led-bmc-hb 0
+ gpioset $(gpiofind led-sw-hb)=1
+ gpioset $(gpiofind led-bmc-hb)=0
else
value=0
- gpio_name_set led-sw-hb 0
- gpio_name_set led-bmc-hb 1
+ gpioset $(gpiofind led-sw-hb)=0
+ gpioset $(gpiofind led-bmc-hb)=1
fi
sleep 1s
done
diff --git a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh
index cae866e..4d737a7 100644
--- a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh
+++ b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh
@@ -1,7 +1,6 @@
#!/bin/bash
-# shellcheck source=meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/gpio-lib.sh
-source /usr/sbin/gpio-lib.sh
+# shellcheck disable=SC2046
# shellcheck source=meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/mtmitchell_platform_gpios_init.sh
source /usr/sbin/platform_gpios_init.sh
source /usr/sbin/ampere_uart_console_setup.sh
@@ -15,15 +14,15 @@
if [ "$bootstatus" == '32' ]; then
echo "CONFIGURE: gpio pins to output high after AC power"
for gpioName in "${output_high_gpios_in_ac[@]}"; do
- gpio_name_set "$gpioName" 1
+ gpioset $(gpiofind "$gpioName")=1
done
echo "CONFIGURE: gpio pins to output low after AC power"
for gpioName in "${output_low_gpios_in_ac[@]}"; do
- gpio_name_set "$gpioName" 0
+ gpioset $(gpiofind "$gpioName")=0
done
echo "CONFIGURE: gpio pins to input after AC power"
for gpioName in "${input_gpios_in_ac[@]}"; do
- gpio_name_input "$gpioName"
+ gpioget $(gpiofind "$gpioName")
done
fi
@@ -31,15 +30,15 @@
# Setting default value for others gpio pins
echo "CONFIGURE: gpio pins to output high"
for gpioName in "${output_high_gpios_in_bmc_reboot[@]}"; do
- gpio_name_set "$gpioName" 1
+ gpioset $(gpiofind "$gpioName")=1
done
echo "CONFIGURE: gpio pins to output low"
for gpioName in "${output_low_gpios_in_bmc_reboot[@]}"; do
- gpio_name_set "$gpioName" 0
+ gpioset $(gpiofind "$gpioName")=0
done
echo "CONFIGURE: gpio pins to input"
for gpioName in "${input_gpios_in_bmc_reboot[@]}"; do
- gpio_name_input "$gpioName"
+ gpioget $(gpiofind "$gpioName")
done
# =======================================================
diff --git a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/gpio-lib.sh b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/gpio-lib.sh
index 5fbbbcc..c9eb2b9 100644
--- a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/gpio-lib.sh
+++ b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/gpio-lib.sh
@@ -2,8 +2,8 @@
# Configure GPIO as output and set its value
AST2600_GPIO_BASE=(
- 816
- 780
+ 512
+ 720
)
function gpio_configure_output() {
diff --git a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/mtmitchell_platform_gpios_init.sh b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/mtmitchell_platform_gpios_init.sh
index 65acfc5..f5fefc3 100644
--- a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/mtmitchell_platform_gpios_init.sh
+++ b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/mtmitchell_platform_gpios_init.sh
@@ -1,7 +1,6 @@
#!/bin/bash
-# shellcheck source=meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/gpio-lib.sh
-source /usr/sbin/gpio-lib.sh
+# shellcheck disable=SC2046
function bind_rtc_driver() {
# If rtc device can not present, bind the device
@@ -34,20 +33,20 @@
if [ "$pgood" == '1' ]; then
echo "PSU is on. Setting PSON to 0"
- gpio_name_set power-chassis-control 0
+ gpioset $(gpiofind power-chassis-control)=0
else
echo "pgood D-Bus property response as 0. PSU is off."
# for unknown reason when stress reboot bmc power-control.exe detect power-chassis-good is 1 (power on)
# But "busctl get-property org.openbmc.control.Power /org/openbmc/control/power0 org.openbmc.control.Power pgood" responses 0 (power off)
# Add sleep 3 seconds after the pgood dbus reponse (power off) and recheck the power-chassis-good to confirm about the PSU power state
sleep 3
- pgood=$(gpio_name_get power-chassis-good)
+ pgood=$(gpioget $(gpiofind power-chassis-good))
if [ "$pgood" == '0' ]; then
echo "power-chassis-good reponse as 0. Confirm PSU is off. Setting PSON to 1."
- gpio_name_set power-chassis-control 1
+ gpioset $(gpiofind power-chassis-control)=1
fi
fi
- gpio_name_set host0-sysreset-n 1
+ gpioset $(gpiofind host0-sysreset-n)=1
# gpio-leds is controlling bmc-ready, not by gpio
echo 1 > /sys/class/leds/bmc-ready/brightness