| Message ID | 20211004131254.29880-2-robert.marko@sartura.hr |
|---|---|
| State | Accepted |
| Commit | bdce2124aceca9857518220704069d97210ba939 |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | [1/2] arm: mvebu: dts: m801: correct CP1 pinctrl | expand |
On 04.10.21 15:12, Robert Marko wrote: > Since the CP1 pinctrl is not properly set in the DTS, there is no > need for setting the pinctrl by writing hardcoded values to the MPP > registers. > > So, drop the code relating to that. > > Fixes: 87c220d0 ("arm: mvebu: mvebu_armada-8k: Add support for initializing iEi Puzzle-M801 networking") > Signed-off-by: Robert Marko <robert.marko@sartura.hr> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > board/Marvell/mvebu_armada-8k/board.c | 20 +------------------- > 1 file changed, 1 insertion(+), 19 deletions(-) > > diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c > index 7da5d9f96b..77c7dd7ab0 100644 > --- a/board/Marvell/mvebu_armada-8k/board.c > +++ b/board/Marvell/mvebu_armada-8k/board.c > @@ -35,17 +35,6 @@ DECLARE_GLOBAL_DATA_PTR; > #define I2C_IO_REG_CL ((1 << I2C_IO_REG_0_USB_H0_CL) | \ > (1 << I2C_IO_REG_0_USB_H1_CL)) > > -/* > - * Information specific to the iEi Puzzle-M801 board. > - */ > - > -/* Internal configuration registers */ > -#define CP1_CONF_REG_BASE 0xf4440000 > -#define CONF_REG_MPP0 0x0 > -#define CONF_REG_MPP1 0x4 > -#define CONF_REG_MPP2 0x8 > -#define CONF_REG_MPP3 0xC > - > static int usb_enabled = 0; > > /* Board specific xHCI dis-/enable code */ > @@ -153,14 +142,7 @@ int board_xhci_enable(fdt_addr_t base) > > int board_early_init_f(void) > { > - /* Initialize some platform specific memory locations */ > - if (of_machine_is_compatible("marvell,armada8040-puzzle-m801")) { > - /* MPP setup */ > - writel(0x00444444, CP1_CONF_REG_BASE + CONF_REG_MPP0); > - writel(0x00000000, CP1_CONF_REG_BASE + CONF_REG_MPP1); > - writel(0x00000000, CP1_CONF_REG_BASE + CONF_REG_MPP2); > - writel(0x08888000, CP1_CONF_REG_BASE + CONF_REG_MPP3); > - } > + /* Nothing to do yet */ > > return 0; > } > Viele Grüße, Stefan
On 08.10.21 08:13, Stefan Roese wrote: > On 04.10.21 15:12, Robert Marko wrote: >> Since the CP1 pinctrl is not properly set in the DTS, there is no >> need for setting the pinctrl by writing hardcoded values to the MPP >> registers. >> >> So, drop the code relating to that. >> >> Fixes: 87c220d0 ("arm: mvebu: mvebu_armada-8k: Add support for >> initializing iEi Puzzle-M801 networking") >> Signed-off-by: Robert Marko <robert.marko@sartura.hr> > > Reviewed-by: Stefan Roese <sr@denx.de> Applied to u-boot-marvell/master Thanks, Stefan > > Thanks, > Stefan > >> --- >> board/Marvell/mvebu_armada-8k/board.c | 20 +------------------- >> 1 file changed, 1 insertion(+), 19 deletions(-) >> >> diff --git a/board/Marvell/mvebu_armada-8k/board.c >> b/board/Marvell/mvebu_armada-8k/board.c >> index 7da5d9f96b..77c7dd7ab0 100644 >> --- a/board/Marvell/mvebu_armada-8k/board.c >> +++ b/board/Marvell/mvebu_armada-8k/board.c >> @@ -35,17 +35,6 @@ DECLARE_GLOBAL_DATA_PTR; >> #define I2C_IO_REG_CL ((1 << I2C_IO_REG_0_USB_H0_CL) | \ >> (1 << I2C_IO_REG_0_USB_H1_CL)) >> -/* >> - * Information specific to the iEi Puzzle-M801 board. >> - */ >> - >> -/* Internal configuration registers */ >> -#define CP1_CONF_REG_BASE 0xf4440000 >> -#define CONF_REG_MPP0 0x0 >> -#define CONF_REG_MPP1 0x4 >> -#define CONF_REG_MPP2 0x8 >> -#define CONF_REG_MPP3 0xC >> - >> static int usb_enabled = 0; >> /* Board specific xHCI dis-/enable code */ >> @@ -153,14 +142,7 @@ int board_xhci_enable(fdt_addr_t base) >> int board_early_init_f(void) >> { >> - /* Initialize some platform specific memory locations */ >> - if (of_machine_is_compatible("marvell,armada8040-puzzle-m801")) { >> - /* MPP setup */ >> - writel(0x00444444, CP1_CONF_REG_BASE + CONF_REG_MPP0); >> - writel(0x00000000, CP1_CONF_REG_BASE + CONF_REG_MPP1); >> - writel(0x00000000, CP1_CONF_REG_BASE + CONF_REG_MPP2); >> - writel(0x08888000, CP1_CONF_REG_BASE + CONF_REG_MPP3); >> - } >> + /* Nothing to do yet */ >> return 0; >> } >> > > > Viele Grüße, > Stefan > Viele Grüße, Stefan
diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c index 7da5d9f96b..77c7dd7ab0 100644 --- a/board/Marvell/mvebu_armada-8k/board.c +++ b/board/Marvell/mvebu_armada-8k/board.c @@ -35,17 +35,6 @@ DECLARE_GLOBAL_DATA_PTR; #define I2C_IO_REG_CL ((1 << I2C_IO_REG_0_USB_H0_CL) | \ (1 << I2C_IO_REG_0_USB_H1_CL)) -/* - * Information specific to the iEi Puzzle-M801 board. - */ - -/* Internal configuration registers */ -#define CP1_CONF_REG_BASE 0xf4440000 -#define CONF_REG_MPP0 0x0 -#define CONF_REG_MPP1 0x4 -#define CONF_REG_MPP2 0x8 -#define CONF_REG_MPP3 0xC - static int usb_enabled = 0; /* Board specific xHCI dis-/enable code */ @@ -153,14 +142,7 @@ int board_xhci_enable(fdt_addr_t base) int board_early_init_f(void) { - /* Initialize some platform specific memory locations */ - if (of_machine_is_compatible("marvell,armada8040-puzzle-m801")) { - /* MPP setup */ - writel(0x00444444, CP1_CONF_REG_BASE + CONF_REG_MPP0); - writel(0x00000000, CP1_CONF_REG_BASE + CONF_REG_MPP1); - writel(0x00000000, CP1_CONF_REG_BASE + CONF_REG_MPP2); - writel(0x08888000, CP1_CONF_REG_BASE + CONF_REG_MPP3); - } + /* Nothing to do yet */ return 0; }
Since the CP1 pinctrl is not properly set in the DTS, there is no need for setting the pinctrl by writing hardcoded values to the MPP registers. So, drop the code relating to that. Fixes: 87c220d0 ("arm: mvebu: mvebu_armada-8k: Add support for initializing iEi Puzzle-M801 networking") Signed-off-by: Robert Marko <robert.marko@sartura.hr> --- board/Marvell/mvebu_armada-8k/board.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)