gpio/starfive: add gpio driver and support gpio reset
PATCH 1/1 gpio/starfive: add gpio driver and support gpio reset
Add gpio driver and gpio reset function in Starfive JH7110 SOC platform.
--- lib/utils/gpio/Kconfig | 3 + lib/utils/gpio/fdt_gpio_starfive.c | 117 +++++++++++++++++++++++++++++ lib/utils/gpio/objects.mk | 3 + platform/generic/configs/defconfig | 1 + 4 files changed, 124 insertions(+) create mode 100644 lib/utils/gpio/fdt_gpio_starfive.c
lib/utils/gpio/Kconfig +3 -0
@@ -14,6 +14,9 @@ config FDT_GPIO_SIFIVE bool "SiFive GPIO FDT driver" default n +config FDT_GPIO_STARFIVE + bool "StarFive GPIO FDT driver" + default n endif config GPIO
lib/utils/gpio/fdt_gpio_starfive.c new file +117 -0
117 lines not on this page · raw message
lib/utils/gpio/objects.mk +3 -0
@@ -13,4 +13,7 @@ libsbiutils-objs-$(CONFIG_FDT_GPIO) += gpio/fdt_gpio_drivers.o carray-fdt_gpio_drivers-$(CONFIG_FDT_GPIO_SIFIVE) += fdt_gpio_sifive libsbiutils-objs-$(CONFIG_FDT_GPIO_SIFIVE) += gpio/fdt_gpio_sifive.o +carray-fdt_gpio_drivers-$(CONFIG_FDT_GPIO_STARFIVE) += fdt_gpio_starfive +libsbiutils-objs-$(CONFIG_FDT_GPIO_STARFIVE) += gpio/fdt_gpio_starfive.o + libsbiutils-objs-$(CONFIG_GPIO) += gpio/gpio.o
platform/generic/configs/defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_PLATFORM_SIFIVE_FU740=y CONFIG_PLATFORM_STARFIVE_JH7110=y CONFIG_FDT_GPIO=y CONFIG_FDT_GPIO_SIFIVE=y +CONFIG_FDT_GPIO_STARFIVE=y CONFIG_FDT_I2C=y CONFIG_FDT_I2C_SIFIVE=y CONFIG_FDT_IPI=y
Signature · 1 line
2.17.1
PATCH 1/1 gpio/starfive: add gpio driver and support gpio reset
Quoted 5 lines · minda.chen
Add gpio driver and gpio reset function in Starfive JH7110 SOC platform.
Signed-off-by minda.chen <[email protected]>
I don't see a PATCH enabling it in defconfig.
How is this driver used in OpenSBI ?
Regards,
Anup
Quoted 177 lines
--- lib/utils/gpio/Kconfig | 3 + lib/utils/gpio/fdt_gpio_starfive.c | 117 +++++++++++++++++++++++++++++ lib/utils/gpio/objects.mk | 3 + platform/generic/configs/defconfig | 1 + 4 files changed, 124 insertions(+) create mode 100644 lib/utils/gpio/fdt_gpio_starfive.clib/utils/gpio/Kconfig +3
-0@@ -14,6 +14,9 @@ config FDT_GPIO_SIFIVE bool "SiFive GPIO FDT driver" default n +config FDT_GPIO_STARFIVE + bool "StarFive GPIO FDT driver" + default n endif config GPIOlib/utils/gpio/fdt_gpio_starfive.c new file +117
-0@@ -0,0 +1,117 @@ +/* +* SPDX-License-Identifier: BSD-2-Clause +* +* Copyright (c) 2022 Starfive +* +* Authors: +* Minda.chen <[email protected]> +*/ + +#include <sbi/riscv_io.h> +#include <sbi/sbi_error.h> +#include <sbi/sbi_console.h> +#include <sbi_utils/fdt/fdt_helper.h> +#include <sbi_utils/gpio/fdt_gpio.h> + +#define STARFIVE_GPIO_CHIP_MAX 2 +#define STARFIVE_GPIO_PINS_DEF 64 +#define STARFIVE_GPIO_OUTVAL 0x40 +#define STARFIVE_GPIO_MASK 0xff +#define STARFIVE_GPIO_REG_SHIFT_MASK 0x3 +#define STARFIVE_GPIO_SHIFT_BITS 0x3 + +struct starfive_gpio_chip { +unsigned long addr; +struct gpio_chip chip; +}; + +static unsigned int starfive_gpio_chip_count; +static struct starfive_gpio_chip starfive_gpio_chip_array[STARFIVE_GPIO_CHIP_MAX ]; + +static int starfive_gpio_direction_output (struct gpio_pin *gp,int value) +{ +u32 val; +unsigned long reg_addr; +u32 bit_mask, shift_bits; +struct starfive_gpio_chip *chip = + container_of(gp->chip, struct starfive_gpio_chip, chip); + +/* set out en*/ + reg_addr = chip->addr + gp->offset; + reg_addr &= ~(STARFIVE_GPIO_REG_SHIFT_MASK ); + + val =readl ((void *)(reg_addr)); + shift_bits = (gp->offset &STARFIVE_GPIO_REG_SHIFT_MASK ) + <<STARFIVE_GPIO_SHIFT_BITS ; + bit_mask =STARFIVE_GPIO_MASK << shift_bits; + + val =readl ((void *)reg_addr); + val &= ~bit_mask; +writel (val, (void *)reg_addr); + +return 0 ; +} + +static void starfive_gpio_set (struct gpio_pin *gp,int value) +{ +u32 val; +unsigned long reg_addr; +u32 bit_mask, shift_bits; +struct starfive_gpio_chip *chip = + container_of(gp->chip, struct starfive_gpio_chip, chip); + + reg_addr = chip->addr + gp->offset; + reg_addr &= ~(STARFIVE_GPIO_REG_SHIFT_MASK ); + + shift_bits = (gp->offset &STARFIVE_GPIO_REG_SHIFT_MASK ) + <<STARFIVE_GPIO_SHIFT_BITS ; + bit_mask =STARFIVE_GPIO_MASK << shift_bits; +/* set output value */ + val =readl ((void *)(reg_addr +STARFIVE_GPIO_OUTVAL )); + val &= ~bit_mask; + val |= value << shift_bits; +writel (val, (void *)(reg_addr +STARFIVE_GPIO_OUTVAL )); +} + +extern struct fdt_gpio fdt_gpio_starfive; + +static int starfive_gpio_init (void *fdt,int nodeoff,u32 phandle, +const struct fdt_match *match) +{ +int rc; +struct starfive_gpio_chip *chip; +u64 addr; + +if (starfive_gpio_chip_count >=STARFIVE_GPIO_CHIP_MAX ) +return SBI_ENOSPC ; + chip = &starfive_gpio_chip_array[starfive_gpio_chip_count]; + + rc =fdt_get_node_addr_size (fdt, nodeoff,0 , &addr,NULL ); +if (rc) +return rc; + + chip->addr = addr; + chip->chip.driver = &fdt_gpio_starfive; + chip->chip.id = phandle; + chip->chip.ngpio =STARFIVE_GPIO_PINS_DEF ; + chip->chip.direction_output = starfive_gpio_direction_output; + chip->chip.set = starfive_gpio_set; + rc =gpio_chip_add (&chip->chip); +if (rc) +return rc; + + starfive_gpio_chip_count++; +return 0 ; +} + +static const struct fdt_match starfive_gpio_match[] = { + { .compatible ="starfive,jh7110-sys-pinctrl" }, + { .compatible ="starfive,iomux-pinctrl" }, + { }, +}; + +struct fdt_gpio fdt_gpio_starfive = { + .match_table = starfive_gpio_match, + .xlate = fdt_gpio_simple_xlate, + .init = starfive_gpio_init, +};lib/utils/gpio/objects.mk +3
-0@@ -13,4 +13,7 @@ libsbiutils-objs-$(CONFIG_FDT_GPIO) += gpio/fdt_gpio_drivers.o carray-fdt_gpio_drivers-$(CONFIG_FDT_GPIO_SIFIVE) += fdt_gpio_sifive libsbiutils-objs-$(CONFIG_FDT_GPIO_SIFIVE) += gpio/fdt_gpio_sifive.o +carray-fdt_gpio_drivers-$(CONFIG_FDT_GPIO_STARFIVE) += fdt_gpio_starfive +libsbiutils-objs-$(CONFIG_FDT_GPIO_STARFIVE) += gpio/fdt_gpio_starfive.o + libsbiutils-objs-$(CONFIG_GPIO) += gpio/gpio.oplatform/generic/configs/defconfig +1
-1@@ -6,6 +6,7 @@ CONFIG_PLATFORM_SIFIVE_FU740=y CONFIG_PLATFORM_STARFIVE_JH7110=y CONFIG_FDT_GPIO=y CONFIG_FDT_GPIO_SIFIVE=y +CONFIG_FDT_GPIO_STARFIVE=y CONFIG_FDT_I2C=y CONFIG_FDT_I2C_SIFIVE=y CONFIG_FDT_IPI=y --2.17.1
--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi
PATCH 1/1 gpio/starfive: add gpio driver and support gpio reset
Quoted 5 lines · Anup Patel
Quoted 4 lines · minda.chen
Add gpio driver and gpio reset function in Starfive JH7110 SOC platform.
Quoted 9 lines
Quoted 1 line
Signed-off-by minda.chen <[email protected]>I don't see a PATCH enabling it in defconfig.
How is this driver used in OpenSBI ?
Regards,
Anup
I have enabled CONFIG_FDT_GPIO_STARFIVE in defconfig in this patch.
--- a/platform/generic/configs/defconfig
+++ b/platform/generic/configs/defconfig
@@ -6,6 +6,7 @@ CONFIG_PLATFORM_SIFIVE_FU740=y
CONFIG_PLATFORM_STARFIVE_JH7110=y
CONFIG_FDT_GPIO=y
CONFIG_FDT_GPIO_SIFIVE=y
+CONFIG_FDT_GPIO_STARFIVE=y
May I set this change to second commit ?
This patch is a gpio reset implementation for sbi ecall SBI_EXT_SRST_RESET.
Quoted 5 lines
Quoted 5 lines
--- lib/utils/gpio/Kconfig | 3 + lib/utils/gpio/fdt_gpio_starfive.c | 117 +++++++++++++++++++++++++++++ lib/utils/gpio/objects.mk | 3 + platform/generic/configs/defconfig | 1 +
defconfig have been changed.
Quoted 172 lines
Quoted 172 lines
4 files changed, 124 insertions(+) create mode 100644 lib/utils/gpio/fdt_gpio_starfive.clib/utils/gpio/Kconfig +3
-0@@ -14,6 +14,9 @@ config FDT_GPIO_SIFIVE bool "SiFive GPIO FDT driver" default n +config FDT_GPIO_STARFIVE + bool "StarFive GPIO FDT driver" + default n endif config GPIOlib/utils/gpio/fdt_gpio_starfive.c new file +117
-0@@ -0,0 +1,117 @@ +/* +* SPDX-License-Identifier: BSD-2-Clause +* +* Copyright (c) 2022 Starfive +* +* Authors: +* Minda.chen <[email protected]> +*/ + +#include <sbi/riscv_io.h> +#include <sbi/sbi_error.h> +#include <sbi/sbi_console.h> +#include <sbi_utils/fdt/fdt_helper.h> +#include <sbi_utils/gpio/fdt_gpio.h> + +#define STARFIVE_GPIO_CHIP_MAX 2 +#define STARFIVE_GPIO_PINS_DEF 64 +#define STARFIVE_GPIO_OUTVAL 0x40 +#define STARFIVE_GPIO_MASK 0xff +#define STARFIVE_GPIO_REG_SHIFT_MASK 0x3 +#define STARFIVE_GPIO_SHIFT_BITS 0x3 + +struct starfive_gpio_chip { +unsigned long addr; +struct gpio_chip chip; +}; + +static unsigned int starfive_gpio_chip_count; +static struct starfive_gpio_chip starfive_gpio_chip_array[STARFIVE_GPIO_CHIP_MAX ]; + +static int starfive_gpio_direction_output (struct gpio_pin *gp,int value) +{ +u32 val; +unsigned long reg_addr; +u32 bit_mask, shift_bits; +struct starfive_gpio_chip *chip = + container_of(gp->chip, struct starfive_gpio_chip, chip); + +/* set out en*/ + reg_addr = chip->addr + gp->offset; + reg_addr &= ~(STARFIVE_GPIO_REG_SHIFT_MASK ); + + val =readl ((void *)(reg_addr)); + shift_bits = (gp->offset &STARFIVE_GPIO_REG_SHIFT_MASK ) + <<STARFIVE_GPIO_SHIFT_BITS ; + bit_mask =STARFIVE_GPIO_MASK << shift_bits; + + val =readl ((void *)reg_addr); + val &= ~bit_mask; +writel (val, (void *)reg_addr); + +return 0 ; +} + +static void starfive_gpio_set (struct gpio_pin *gp,int value) +{ +u32 val; +unsigned long reg_addr; +u32 bit_mask, shift_bits; +struct starfive_gpio_chip *chip = + container_of(gp->chip, struct starfive_gpio_chip, chip); + + reg_addr = chip->addr + gp->offset; + reg_addr &= ~(STARFIVE_GPIO_REG_SHIFT_MASK ); + + shift_bits = (gp->offset &STARFIVE_GPIO_REG_SHIFT_MASK ) + <<STARFIVE_GPIO_SHIFT_BITS ; + bit_mask =STARFIVE_GPIO_MASK << shift_bits; +/* set output value */ + val =readl ((void *)(reg_addr +STARFIVE_GPIO_OUTVAL )); + val &= ~bit_mask; + val |= value << shift_bits; +writel (val, (void *)(reg_addr +STARFIVE_GPIO_OUTVAL )); +} + +extern struct fdt_gpio fdt_gpio_starfive; + +static int starfive_gpio_init (void *fdt,int nodeoff,u32 phandle, +const struct fdt_match *match) +{ +int rc; +struct starfive_gpio_chip *chip; +u64 addr; + +if (starfive_gpio_chip_count >=STARFIVE_GPIO_CHIP_MAX ) +return SBI_ENOSPC ; + chip = &starfive_gpio_chip_array[starfive_gpio_chip_count]; + + rc =fdt_get_node_addr_size (fdt, nodeoff,0 , &addr,NULL ); +if (rc) +return rc; + + chip->addr = addr; + chip->chip.driver = &fdt_gpio_starfive; + chip->chip.id = phandle; + chip->chip.ngpio =STARFIVE_GPIO_PINS_DEF ; + chip->chip.direction_output = starfive_gpio_direction_output; + chip->chip.set = starfive_gpio_set; + rc =gpio_chip_add (&chip->chip); +if (rc) +return rc; + + starfive_gpio_chip_count++; +return 0 ; +} + +static const struct fdt_match starfive_gpio_match[] = { + { .compatible ="starfive,jh7110-sys-pinctrl" }, + { .compatible ="starfive,iomux-pinctrl" }, + { }, +}; + +struct fdt_gpio fdt_gpio_starfive = { + .match_table = starfive_gpio_match, + .xlate = fdt_gpio_simple_xlate, + .init = starfive_gpio_init, +};lib/utils/gpio/objects.mk +3
-0@@ -13,4 +13,7 @@ libsbiutils-objs-$(CONFIG_FDT_GPIO) += gpio/fdt_gpio_drivers.o carray-fdt_gpio_drivers-$(CONFIG_FDT_GPIO_SIFIVE) += fdt_gpio_sifive libsbiutils-objs-$(CONFIG_FDT_GPIO_SIFIVE) += gpio/fdt_gpio_sifive.o +carray-fdt_gpio_drivers-$(CONFIG_FDT_GPIO_STARFIVE) += fdt_gpio_starfive +libsbiutils-objs-$(CONFIG_FDT_GPIO_STARFIVE) += gpio/fdt_gpio_starfive.o + libsbiutils-objs-$(CONFIG_GPIO) += gpio/gpio.oplatform/generic/configs/defconfig +1
-1@@ -6,6 +6,7 @@ CONFIG_PLATFORM_SIFIVE_FU740=y CONFIG_PLATFORM_STARFIVE_JH7110=y CONFIG_FDT_GPIO=y CONFIG_FDT_GPIO_SIFIVE=y +CONFIG_FDT_GPIO_STARFIVE=y CONFIG_FDT_I2C=y CONFIG_FDT_I2C_SIFIVE=y CONFIG_FDT_IPI=y --2.17.1
--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi
PATCH 1/1 gpio/starfive: add gpio driver and support gpio reset
Quoted 11 lines · Minda Chen
Quoted 7 lines · Anup Patel
Quoted 5 lines · minda.chen
Add gpio driver and gpio reset function in Starfive JH7110 SOC platform.
Signed-off-by minda.chen <[email protected]>
Quoted 8 lines
Quoted 7 lines
I don't see a PATCH enabling it in defconfig.
How is this driver used in OpenSBI ?
Regards,
AnupI have enabled
CONFIG_FDT_GPIO_STARFIVEin defconfig in this patch.
Okay.
Quoted 10 lines
--- a/platform/generic/configs/defconfig
+++ b/platform/generic/configs/defconfig
@@ -6,6 +6,7 @@CONFIG_PLATFORM_SIFIVE_FU740=y
CONFIG_PLATFORM_STARFIVE_JH7110=y
CONFIG_FDT_GPIO=y
CONFIG_FDT_GPIO_SIFIVE=y
+CONFIG_FDT_GPIO_STARFIVE=yMay I set this change to second commit ?
No need for a separate patch.
Quoted 2 lines
This patch is a gpio reset implementation for sbi ecall
SBI_EXT_SRST_RESET.
Fare enough but you also send another series "Add StarFive JH7110 SoC shutdown and reboot ops" which provides system reboot based on I2C PMIC.
Basically, we have two separate system reboot ops for JH7110, is that right ?
Regards,
Anup
Quoted 180 lines
Quoted 6 lines
Quoted 6 lines
--- lib/utils/gpio/Kconfig | 3 + lib/utils/gpio/fdt_gpio_starfive.c | 117 +++++++++++++++++++++++++++++ lib/utils/gpio/objects.mk | 3 + platform/generic/configs/defconfig | 1 +defconfig have been changed.
Quoted 172 lines
Quoted 172 lines
4 files changed, 124 insertions(+) create mode 100644 lib/utils/gpio/fdt_gpio_starfive.clib/utils/gpio/Kconfig +3
-0@@ -14,6 +14,9 @@ config FDT_GPIO_SIFIVE bool "SiFive GPIO FDT driver" default n +config FDT_GPIO_STARFIVE + bool "StarFive GPIO FDT driver" + default n endif config GPIOlib/utils/gpio/fdt_gpio_starfive.c new file +117
-0@@ -0,0 +1,117 @@ +/* +* SPDX-License-Identifier: BSD-2-Clause +* +* Copyright (c) 2022 Starfive +* +* Authors: +* Minda.chen <[email protected]> +*/ + +#include <sbi/riscv_io.h> +#include <sbi/sbi_error.h> +#include <sbi/sbi_console.h> +#include <sbi_utils/fdt/fdt_helper.h> +#include <sbi_utils/gpio/fdt_gpio.h> + +#define STARFIVE_GPIO_CHIP_MAX 2 +#define STARFIVE_GPIO_PINS_DEF 64 +#define STARFIVE_GPIO_OUTVAL 0x40 +#define STARFIVE_GPIO_MASK 0xff +#define STARFIVE_GPIO_REG_SHIFT_MASK 0x3 +#define STARFIVE_GPIO_SHIFT_BITS 0x3 + +struct starfive_gpio_chip { +unsigned long addr; +struct gpio_chip chip; +}; + +static unsigned int starfive_gpio_chip_count; +static struct starfive_gpio_chip starfive_gpio_chip_array[STARFIVE_GPIO_CHIP_MAX ]; + +static int starfive_gpio_direction_output (struct gpio_pin *gp,int value) +{ +u32 val; +unsigned long reg_addr; +u32 bit_mask, shift_bits; +struct starfive_gpio_chip *chip = + container_of(gp->chip, struct starfive_gpio_chip, chip); + +/* set out en*/ + reg_addr = chip->addr + gp->offset; + reg_addr &= ~(STARFIVE_GPIO_REG_SHIFT_MASK ); + + val =readl ((void *)(reg_addr)); + shift_bits = (gp->offset &STARFIVE_GPIO_REG_SHIFT_MASK ) + <<STARFIVE_GPIO_SHIFT_BITS ; + bit_mask =STARFIVE_GPIO_MASK << shift_bits; + + val =readl ((void *)reg_addr); + val &= ~bit_mask; +writel (val, (void *)reg_addr); + +return 0 ; +} + +static void starfive_gpio_set (struct gpio_pin *gp,int value) +{ +u32 val; +unsigned long reg_addr; +u32 bit_mask, shift_bits; +struct starfive_gpio_chip *chip = + container_of(gp->chip, struct starfive_gpio_chip, chip); + + reg_addr = chip->addr + gp->offset; + reg_addr &= ~(STARFIVE_GPIO_REG_SHIFT_MASK ); + + shift_bits = (gp->offset &STARFIVE_GPIO_REG_SHIFT_MASK ) + <<STARFIVE_GPIO_SHIFT_BITS ; + bit_mask =STARFIVE_GPIO_MASK << shift_bits; +/* set output value */ + val =readl ((void *)(reg_addr +STARFIVE_GPIO_OUTVAL )); + val &= ~bit_mask; + val |= value << shift_bits; +writel (val, (void *)(reg_addr +STARFIVE_GPIO_OUTVAL )); +} + +extern struct fdt_gpio fdt_gpio_starfive; + +static int starfive_gpio_init (void *fdt,int nodeoff,u32 phandle, +const struct fdt_match *match) +{ +int rc; +struct starfive_gpio_chip *chip; +u64 addr; + +if (starfive_gpio_chip_count >=STARFIVE_GPIO_CHIP_MAX ) +return SBI_ENOSPC ; + chip = &starfive_gpio_chip_array[starfive_gpio_chip_count]; + + rc =fdt_get_node_addr_size (fdt, nodeoff,0 , &addr,NULL ); +if (rc) +return rc; + + chip->addr = addr; + chip->chip.driver = &fdt_gpio_starfive; + chip->chip.id = phandle; + chip->chip.ngpio =STARFIVE_GPIO_PINS_DEF ; + chip->chip.direction_output = starfive_gpio_direction_output; + chip->chip.set = starfive_gpio_set; + rc =gpio_chip_add (&chip->chip); +if (rc) +return rc; + + starfive_gpio_chip_count++; +return 0 ; +} + +static const struct fdt_match starfive_gpio_match[] = { + { .compatible ="starfive,jh7110-sys-pinctrl" }, + { .compatible ="starfive,iomux-pinctrl" }, + { }, +}; + +struct fdt_gpio fdt_gpio_starfive = { + .match_table = starfive_gpio_match, + .xlate = fdt_gpio_simple_xlate, + .init = starfive_gpio_init, +};lib/utils/gpio/objects.mk +3
-0@@ -13,4 +13,7 @@ libsbiutils-objs-$(CONFIG_FDT_GPIO) += gpio/fdt_gpio_drivers.o carray-fdt_gpio_drivers-$(CONFIG_FDT_GPIO_SIFIVE) += fdt_gpio_sifive libsbiutils-objs-$(CONFIG_FDT_GPIO_SIFIVE) += gpio/fdt_gpio_sifive.o +carray-fdt_gpio_drivers-$(CONFIG_FDT_GPIO_STARFIVE) += fdt_gpio_starfive +libsbiutils-objs-$(CONFIG_FDT_GPIO_STARFIVE) += gpio/fdt_gpio_starfive.o + libsbiutils-objs-$(CONFIG_GPIO) += gpio/gpio.oplatform/generic/configs/defconfig +1
-1@@ -6,6 +6,7 @@ CONFIG_PLATFORM_SIFIVE_FU740=y CONFIG_PLATFORM_STARFIVE_JH7110=y CONFIG_FDT_GPIO=y CONFIG_FDT_GPIO_SIFIVE=y +CONFIG_FDT_GPIO_STARFIVE=y CONFIG_FDT_I2C=y CONFIG_FDT_I2C_SIFIVE=y CONFIG_FDT_IPI=y --2.17.1
--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi
PATCH 1/1 gpio/starfive: add gpio driver and support gpio reset
Quoted 43 lines · Anup Patel
Quoted 11 lines · Minda Chen
Quoted 7 lines · Anup Patel
Quoted 5 lines · minda.chen
Add gpio driver and gpio reset function in Starfive JH7110 SOC platform.
Signed-off-by minda.chen <[email protected]>Quoted 8 lines
Quoted 7 lines
I don't see a PATCH enabling it in defconfig.
How is this driver used in OpenSBI ?
Regards,
AnupI have enabled
CONFIG_FDT_GPIO_STARFIVEin defconfig in this patch.Okay.
Quoted 10 lines
--- a/platform/generic/configs/defconfig
+++ b/platform/generic/configs/defconfig
@@ -6,6 +6,7 @@CONFIG_PLATFORM_SIFIVE_FU740=y
CONFIG_PLATFORM_STARFIVE_JH7110=y
CONFIG_FDT_GPIO=y
CONFIG_FDT_GPIO_SIFIVE=y
+CONFIG_FDT_GPIO_STARFIVE=yMay I set this change to second commit ?
No need for a separate patch.
Quoted 2 lines
This patch is a gpio reset implementation for sbi ecall
SBI_EXT_SRST_RESET.Fare enough but you also send another series "Add StarFive JH7110 SoC shutdown and reboot ops" which provides system reboot based on I2C PMIC.
Quoted 6 lines
Basically, we have two separate system reboot ops for JH7110, is that right ?
Regards,
Anup
Yes, GPIO reset is for uboot warm reset, PMIC reset is for uboot cold reset and linux reboot.
Quoted 181 lines
Quoted 181 lines
Quoted 7 lines
Quoted 7 lines
--- lib/utils/gpio/Kconfig | 3 + lib/utils/gpio/fdt_gpio_starfive.c | 117 +++++++++++++++++++++++++++++ lib/utils/gpio/objects.mk | 3 + platform/generic/configs/defconfig | 1 +defconfig have been changed.
Quoted 172 lines
Quoted 172 lines
4 files changed, 124 insertions(+) create mode 100644 lib/utils/gpio/fdt_gpio_starfive.clib/utils/gpio/Kconfig +3
-0@@ -14,6 +14,9 @@ config FDT_GPIO_SIFIVE bool "SiFive GPIO FDT driver" default n +config FDT_GPIO_STARFIVE + bool "StarFive GPIO FDT driver" + default n endif config GPIOlib/utils/gpio/fdt_gpio_starfive.c new file +117
-0@@ -0,0 +1,117 @@ +/* +* SPDX-License-Identifier: BSD-2-Clause +* +* Copyright (c) 2022 Starfive +* +* Authors: +* Minda.chen <[email protected]> +*/ + +#include <sbi/riscv_io.h> +#include <sbi/sbi_error.h> +#include <sbi/sbi_console.h> +#include <sbi_utils/fdt/fdt_helper.h> +#include <sbi_utils/gpio/fdt_gpio.h> + +#define STARFIVE_GPIO_CHIP_MAX 2 +#define STARFIVE_GPIO_PINS_DEF 64 +#define STARFIVE_GPIO_OUTVAL 0x40 +#define STARFIVE_GPIO_MASK 0xff +#define STARFIVE_GPIO_REG_SHIFT_MASK 0x3 +#define STARFIVE_GPIO_SHIFT_BITS 0x3 + +struct starfive_gpio_chip { +unsigned long addr; +struct gpio_chip chip; +}; + +static unsigned int starfive_gpio_chip_count; +static struct starfive_gpio_chip starfive_gpio_chip_array[STARFIVE_GPIO_CHIP_MAX ]; + +static int starfive_gpio_direction_output (struct gpio_pin *gp,int value) +{ +u32 val; +unsigned long reg_addr; +u32 bit_mask, shift_bits; +struct starfive_gpio_chip *chip = + container_of(gp->chip, struct starfive_gpio_chip, chip); + +/* set out en*/ + reg_addr = chip->addr + gp->offset; + reg_addr &= ~(STARFIVE_GPIO_REG_SHIFT_MASK ); + + val =readl ((void *)(reg_addr)); + shift_bits = (gp->offset &STARFIVE_GPIO_REG_SHIFT_MASK ) + <<STARFIVE_GPIO_SHIFT_BITS ; + bit_mask =STARFIVE_GPIO_MASK << shift_bits; + + val =readl ((void *)reg_addr); + val &= ~bit_mask; +writel (val, (void *)reg_addr); + +return 0 ; +} + +static void starfive_gpio_set (struct gpio_pin *gp,int value) +{ +u32 val; +unsigned long reg_addr; +u32 bit_mask, shift_bits; +struct starfive_gpio_chip *chip = + container_of(gp->chip, struct starfive_gpio_chip, chip); + + reg_addr = chip->addr + gp->offset; + reg_addr &= ~(STARFIVE_GPIO_REG_SHIFT_MASK ); + + shift_bits = (gp->offset &STARFIVE_GPIO_REG_SHIFT_MASK ) + <<STARFIVE_GPIO_SHIFT_BITS ; + bit_mask =STARFIVE_GPIO_MASK << shift_bits; +/* set output value */ + val =readl ((void *)(reg_addr +STARFIVE_GPIO_OUTVAL )); + val &= ~bit_mask; + val |= value << shift_bits; +writel (val, (void *)(reg_addr +STARFIVE_GPIO_OUTVAL )); +} + +extern struct fdt_gpio fdt_gpio_starfive; + +static int starfive_gpio_init (void *fdt,int nodeoff,u32 phandle, +const struct fdt_match *match) +{ +int rc; +struct starfive_gpio_chip *chip; +u64 addr; + +if (starfive_gpio_chip_count >=STARFIVE_GPIO_CHIP_MAX ) +return SBI_ENOSPC ; + chip = &starfive_gpio_chip_array[starfive_gpio_chip_count]; + + rc =fdt_get_node_addr_size (fdt, nodeoff,0 , &addr,NULL ); +if (rc) +return rc; + + chip->addr = addr; + chip->chip.driver = &fdt_gpio_starfive; + chip->chip.id = phandle; + chip->chip.ngpio =STARFIVE_GPIO_PINS_DEF ; + chip->chip.direction_output = starfive_gpio_direction_output; + chip->chip.set = starfive_gpio_set; + rc =gpio_chip_add (&chip->chip); +if (rc) +return rc; + + starfive_gpio_chip_count++; +return 0 ; +} + +static const struct fdt_match starfive_gpio_match[] = { + { .compatible ="starfive,jh7110-sys-pinctrl" }, + { .compatible ="starfive,iomux-pinctrl" }, + { }, +}; + +struct fdt_gpio fdt_gpio_starfive = { + .match_table = starfive_gpio_match, + .xlate = fdt_gpio_simple_xlate, + .init = starfive_gpio_init, +};lib/utils/gpio/objects.mk +3
-0@@ -13,4 +13,7 @@ libsbiutils-objs-$(CONFIG_FDT_GPIO) += gpio/fdt_gpio_drivers.o carray-fdt_gpio_drivers-$(CONFIG_FDT_GPIO_SIFIVE) += fdt_gpio_sifive libsbiutils-objs-$(CONFIG_FDT_GPIO_SIFIVE) += gpio/fdt_gpio_sifive.o +carray-fdt_gpio_drivers-$(CONFIG_FDT_GPIO_STARFIVE) += fdt_gpio_starfive +libsbiutils-objs-$(CONFIG_FDT_GPIO_STARFIVE) += gpio/fdt_gpio_starfive.o + libsbiutils-objs-$(CONFIG_GPIO) += gpio/gpio.oplatform/generic/configs/defconfig +1
-1@@ -6,6 +6,7 @@ CONFIG_PLATFORM_SIFIVE_FU740=y CONFIG_PLATFORM_STARFIVE_JH7110=y CONFIG_FDT_GPIO=y CONFIG_FDT_GPIO_SIFIVE=y +CONFIG_FDT_GPIO_STARFIVE=y CONFIG_FDT_I2C=y CONFIG_FDT_I2C_SIFIVE=y CONFIG_FDT_IPI=y --2.17.1
--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi
Anup Patel
AppliedPATCH 1/1 gpio/starfive: add gpio driver and support gpio reset
In reply to minda.chenQuoted 5 lines · minda.chen
Add gpio driver and gpio reset function in Starfive JH7110 SOC platform.
Signed-off-by minda.chen <[email protected]>
Looks good to me.
Applied this patch to the riscv/opensbi repo.
Thanks,
Anup
Quoted 177 lines
--- lib/utils/gpio/Kconfig | 3 + lib/utils/gpio/fdt_gpio_starfive.c | 117 +++++++++++++++++++++++++++++ lib/utils/gpio/objects.mk | 3 + platform/generic/configs/defconfig | 1 + 4 files changed, 124 insertions(+) create mode 100644 lib/utils/gpio/fdt_gpio_starfive.clib/utils/gpio/Kconfig +3
-0@@ -14,6 +14,9 @@ config FDT_GPIO_SIFIVE bool "SiFive GPIO FDT driver" default n +config FDT_GPIO_STARFIVE + bool "StarFive GPIO FDT driver" + default n endif config GPIOlib/utils/gpio/fdt_gpio_starfive.c new file +117
-0@@ -0,0 +1,117 @@ +/* +* SPDX-License-Identifier: BSD-2-Clause +* +* Copyright (c) 2022 Starfive +* +* Authors: +* Minda.chen <[email protected]> +*/ + +#include <sbi/riscv_io.h> +#include <sbi/sbi_error.h> +#include <sbi/sbi_console.h> +#include <sbi_utils/fdt/fdt_helper.h> +#include <sbi_utils/gpio/fdt_gpio.h> + +#define STARFIVE_GPIO_CHIP_MAX 2 +#define STARFIVE_GPIO_PINS_DEF 64 +#define STARFIVE_GPIO_OUTVAL 0x40 +#define STARFIVE_GPIO_MASK 0xff +#define STARFIVE_GPIO_REG_SHIFT_MASK 0x3 +#define STARFIVE_GPIO_SHIFT_BITS 0x3 + +struct starfive_gpio_chip { +unsigned long addr; +struct gpio_chip chip; +}; + +static unsigned int starfive_gpio_chip_count; +static struct starfive_gpio_chip starfive_gpio_chip_array[STARFIVE_GPIO_CHIP_MAX ]; + +static int starfive_gpio_direction_output (struct gpio_pin *gp,int value) +{ +u32 val; +unsigned long reg_addr; +u32 bit_mask, shift_bits; +struct starfive_gpio_chip *chip = + container_of(gp->chip, struct starfive_gpio_chip, chip); + +/* set out en*/ + reg_addr = chip->addr + gp->offset; + reg_addr &= ~(STARFIVE_GPIO_REG_SHIFT_MASK ); + + val =readl ((void *)(reg_addr)); + shift_bits = (gp->offset &STARFIVE_GPIO_REG_SHIFT_MASK ) + <<STARFIVE_GPIO_SHIFT_BITS ; + bit_mask =STARFIVE_GPIO_MASK << shift_bits; + + val =readl ((void *)reg_addr); + val &= ~bit_mask; +writel (val, (void *)reg_addr); + +return 0 ; +} + +static void starfive_gpio_set (struct gpio_pin *gp,int value) +{ +u32 val; +unsigned long reg_addr; +u32 bit_mask, shift_bits; +struct starfive_gpio_chip *chip = + container_of(gp->chip, struct starfive_gpio_chip, chip); + + reg_addr = chip->addr + gp->offset; + reg_addr &= ~(STARFIVE_GPIO_REG_SHIFT_MASK ); + + shift_bits = (gp->offset &STARFIVE_GPIO_REG_SHIFT_MASK ) + <<STARFIVE_GPIO_SHIFT_BITS ; + bit_mask =STARFIVE_GPIO_MASK << shift_bits; +/* set output value */ + val =readl ((void *)(reg_addr +STARFIVE_GPIO_OUTVAL )); + val &= ~bit_mask; + val |= value << shift_bits; +writel (val, (void *)(reg_addr +STARFIVE_GPIO_OUTVAL )); +} + +extern struct fdt_gpio fdt_gpio_starfive; + +static int starfive_gpio_init (void *fdt,int nodeoff,u32 phandle, +const struct fdt_match *match) +{ +int rc; +struct starfive_gpio_chip *chip; +u64 addr; + +if (starfive_gpio_chip_count >=STARFIVE_GPIO_CHIP_MAX ) +return SBI_ENOSPC ; + chip = &starfive_gpio_chip_array[starfive_gpio_chip_count]; + + rc =fdt_get_node_addr_size (fdt, nodeoff,0 , &addr,NULL ); +if (rc) +return rc; + + chip->addr = addr; + chip->chip.driver = &fdt_gpio_starfive; + chip->chip.id = phandle; + chip->chip.ngpio =STARFIVE_GPIO_PINS_DEF ; + chip->chip.direction_output = starfive_gpio_direction_output; + chip->chip.set = starfive_gpio_set; + rc =gpio_chip_add (&chip->chip); +if (rc) +return rc; + + starfive_gpio_chip_count++; +return 0 ; +} + +static const struct fdt_match starfive_gpio_match[] = { + { .compatible ="starfive,jh7110-sys-pinctrl" }, + { .compatible ="starfive,iomux-pinctrl" }, + { }, +}; + +struct fdt_gpio fdt_gpio_starfive = { + .match_table = starfive_gpio_match, + .xlate = fdt_gpio_simple_xlate, + .init = starfive_gpio_init, +};lib/utils/gpio/objects.mk +3
-0@@ -13,4 +13,7 @@ libsbiutils-objs-$(CONFIG_FDT_GPIO) += gpio/fdt_gpio_drivers.o carray-fdt_gpio_drivers-$(CONFIG_FDT_GPIO_SIFIVE) += fdt_gpio_sifive libsbiutils-objs-$(CONFIG_FDT_GPIO_SIFIVE) += gpio/fdt_gpio_sifive.o +carray-fdt_gpio_drivers-$(CONFIG_FDT_GPIO_STARFIVE) += fdt_gpio_starfive +libsbiutils-objs-$(CONFIG_FDT_GPIO_STARFIVE) += gpio/fdt_gpio_starfive.o + libsbiutils-objs-$(CONFIG_GPIO) += gpio/gpio.oplatform/generic/configs/defconfig +1
-1@@ -6,6 +6,7 @@ CONFIG_PLATFORM_SIFIVE_FU740=y CONFIG_PLATFORM_STARFIVE_JH7110=y CONFIG_FDT_GPIO=y CONFIG_FDT_GPIO_SIFIVE=y +CONFIG_FDT_GPIO_STARFIVE=y CONFIG_FDT_I2C=y CONFIG_FDT_I2C_SIFIVE=y CONFIG_FDT_IPI=y --2.17.1
--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi