diff --git a/arch/arm/boot/dts/at91-sama5d2_icp.dts b/arch/arm/boot/dts/at91-sama5d2_icp.dts
index dd1dec9d4e..3ee8e45ba4 100644
--- a/arch/arm/boot/dts/at91-sama5d2_icp.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_icp.dts
@@ -3,6 +3,7 @@
  * at91-sama5d2_icp.dts - Device Tree file for SAMA5D2-ICP board
  *
  *  Copyright (C) 2019 Microchip Technology Inc. and its subsidiaries
+ *  Copyright (C) 2022 Qortal Project
  *
  *	Author: Radu Pirea & Razvan Stefanescu,
  *		Codrin Ciubotariu <codrin.ciubotariu@microchip.com>,
@@ -24,8 +25,8 @@ aliases {
 		serial1 = &uart1;	/* mikro BUS 3 */
 		serial3 = &uart3;	/* mikro BUS 2 */
 		serial5 = &uart7;	/* flx2 */
-		i2c0 = &i2c0;
-		i2c1 = &i2c1;
+		i2c0	= &i2c0;
+		i2c1	= &i2c1;
 	};
 
 	chosen {
@@ -42,13 +43,14 @@ main_xtal {
 		};
 	};
 
-	gpio-keys {
+	gpio_keys {
 		compatible = "gpio-keys";
 
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_key_gpio_default>;
+		status = "okay";
 
-		button-1 {
+		sw4 {
 			label = "USER_PB1";
 			gpios = <&pioA PIN_PD0 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_PROG1>;
@@ -305,11 +307,8 @@ regulator-state-mem {
 };
 
 &i2c0 { /* mikrobus i2c */
-	pinctrl-names = "default", "gpio";
+	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_mikrobus_i2c>;
-	pinctrl-1 = <&pinctrl_i2c0_gpio>;
-	sda-gpios = <&pioA PIN_PD21 GPIO_ACTIVE_HIGH>;
-	scl-gpios = <&pioA PIN_PD22 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 	i2c-digital-filter;
 	i2c-digital-filter-width-ns = <35>;
 	status = "okay";
@@ -317,11 +316,8 @@ &i2c0 { /* mikrobus i2c */
 
 &i2c1 {
 	dmas = <0>, <0>;
-	pinctrl-names = "default", "gpio";
+	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c1_default>;
-	pinctrl-1 = <&pinctrl_i2c1_gpio>;
-	sda-gpios = <&pioA PIN_PD19 GPIO_ACTIVE_HIGH>;
-	scl-gpios = <&pioA PIN_PD20 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 	i2c-digital-filter;
 	i2c-digital-filter-width-ns = <35>;
 	status = "okay";
@@ -406,12 +402,6 @@ pinctrl_i2c1_default: i2c1_default {
 		bias-disable;
 	};
 
-	pinctrl_i2c1_gpio: i2c1_gpio {
-                pinmux = <PIN_PD19__GPIO>,
-                         <PIN_PD20__GPIO>;
-                bias-disable;
-        };
-
 	pinctrl_key_gpio_default: key_gpio_default {
 		pinmux = <PIN_PD0__GPIO>;
 		bias-pull-up;
@@ -473,12 +463,6 @@ pinctrl_mikrobus_i2c: mikrobus_i2c {
 		bias-disable;
 	};
 
-	pinctrl_i2c0_gpio: i2c0_gpio {
-		pinmux = <PIN_PD21__GPIO>,
-			 <PIN_PD22__GPIO>;
-		bias-disable;
-	};
-
 	pinctrl_mikrobus1_an: mikrobus1_an {
 		pinmux = <PIN_PD26__GPIO>;
 		bias-disable;