(maybe) move gpiomem node from overlay to bcm270x.dtsi

raspberrypi · Aug 20, 2015 · 680fd49 · 680fd49
1 parent 5c8184d
commit 680fd49
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 26 deletions.
diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi
@@ -15,5 +15,11 @@
 		arm-pmu {
 			compatible = "arm,arm1176-pmu";
 		};
+
+		gpiomem {
+			compatible = "brcm,bcm2835-gpiomem";
+			reg = <0x7e200000 0x1000>;
+			status = "okay";
+		};
 	};
 };
diff --git a/arch/arm/boot/dts/bcm2709.dtsi b/arch/arm/boot/dts/bcm2709.dtsi
@@ -16,6 +16,12 @@
 			compatible = "arm,cortex-a7-pmu";
 			interrupts = <3 9>;
 		};
+
+		gpiomem {
+			compatible = "brcm,bcm2835-gpiomem";
+			reg = <0x7e200000 0x1000>;
+			status = "okay";
+		};
 	};
 
 	timer {

diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
@@ -17,7 +17,6 @@ dtb-$(RPI_DT_OVERLAYS) += bmp085_i2c-sensor-overlay.dtb
 dtb-$(RPI_DT_OVERLAYS) += dht11-overlay.dtb
 dtb-$(RPI_DT_OVERLAYS) += enc28j60-overlay.dtb
 dtb-$(RPI_DT_OVERLAYS) += gpio-poweroff-overlay.dtb
-dtb-$(RPI_DT_OVERLAYS) += gpiomem-overlay.dtb
 dtb-$(RPI_DT_OVERLAYS) += hifiberry-amp-overlay.dtb
 dtb-$(RPI_DT_OVERLAYS) += hifiberry-dac-overlay.dtb
 dtb-$(RPI_DT_OVERLAYS) += hifiberry-dacplus-overlay.dtb

diff --git a/arch/arm/boot/dts/overlays/gpiomem-overlay.dts b/arch/arm/boot/dts/overlays/gpiomem-overlay.dts