ARC: boards: HSDK: ged rid of pinmux usage

evgeniy-paltsev · carlescufi · commit f81b3e03aca3 · 2022-05-18T17:20:26.000+02:00
Pinmux is deprecated (see #39740) so let's get rid of it's usage for HSDK board. As we call pinmux only once at init phase we simply do register setup in platform code instead of pinmux. Signed-off-by: Evgeniy Paltsev <PaltsevEvgeniy@gmail.com> Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
diff --git a/boards/arc/hsdk/CMakeLists.txt b/boards/arc/hsdk/CMakeLists.txt
@@ -4,4 +4,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-zephyr_sources_ifdef(CONFIG_PINMUX_HSDK pinmux.c)
+zephyr_sources(platform.c)
diff --git a/boards/arc/hsdk/hsdk_2cores_defconfig b/boards/arc/hsdk/hsdk_2cores_defconfig
@@ -11,8 +11,6 @@ CONFIG_ARCV2_TIMER=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-CONFIG_PINMUX=y
-CONFIG_PINMUX_HSDK=y
 CONFIG_GPIO=y
 CONFIG_SPI=y
 CONFIG_SMP=y
diff --git a/boards/arc/hsdk/hsdk_defconfig b/boards/arc/hsdk/hsdk_defconfig
@@ -11,8 +11,6 @@ CONFIG_ARCV2_TIMER=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-CONFIG_PINMUX=y
-CONFIG_PINMUX_HSDK=y
 CONFIG_GPIO=y
 CONFIG_SPI=y
 CONFIG_SMP=y
diff --git a/boards/arc/hsdk/pinmux.c b/boards/arc/hsdk/pinmux.c
diff --git a/boards/arc/hsdk/platform.c b/boards/arc/hsdk/platform.c
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2022 Synopsys
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <soc.h>
+#include <init.h>
+
+#define HSDK_CREG_GPIO_MUX_REG	0xf0001484
+#define HSDK_CREG_GPIO_MUX_VAL	0x00000400
+
+static int hsdk_creg_gpio_mux_init(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	sys_write32(HSDK_CREG_GPIO_MUX_REG, HSDK_CREG_GPIO_MUX_VAL);
+
+	return 0;
+}
+
+SYS_INIT(hsdk_creg_gpio_mux_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/dts/arc/synopsys/arc_hsdk.dtsi b/dts/arc/synopsys/arc_hsdk.dtsi
@@ -66,11 +66,6 @@
 			reg = <0x90000000 0x50000000>;
 		};
 
-		pinctrl: pinctrl@f0001484 {
-			compatible = "snps,creg-gpio-mux-hsdk";
-			reg = <0xf0001484 0x4>;
-		};
-
 		uart0: uart@f0005000 {
 			compatible = "ns16550";
 			clock-frequency = <33333333>;

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`	`# SPDX-License-Identifier: Apache-2.0`
`5`	`5`	`#`
`6`	`6`
`7`		`-zephyr_sources_ifdef(CONFIG_PINMUX_HSDK pinmux.c)`
	`7`	`+zephyr_sources(platform.c)`