Skip to content

Commit 680fd49

Browse files
committed
(maybe) move gpiomem node from overlay to bcm270x.dtsi
1 parent 5c8184d commit 680fd49

File tree

4 files changed

+12
-26
lines changed

4 files changed

+12
-26
lines changed

arch/arm/boot/dts/bcm2708.dtsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,11 @@
1515
arm-pmu {
1616
compatible = "arm,arm1176-pmu";
1717
};
18+
19+
gpiomem {
20+
compatible = "brcm,bcm2835-gpiomem";
21+
reg = <0x7e200000 0x1000>;
22+
status = "okay";
23+
};
1824
};
1925
};

arch/arm/boot/dts/bcm2709.dtsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
compatible = "arm,cortex-a7-pmu";
1717
interrupts = <3 9>;
1818
};
19+
20+
gpiomem {
21+
compatible = "brcm,bcm2835-gpiomem";
22+
reg = <0x7e200000 0x1000>;
23+
status = "okay";
24+
};
1925
};
2026

2127
timer {

arch/arm/boot/dts/overlays/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ dtb-$(RPI_DT_OVERLAYS) += bmp085_i2c-sensor-overlay.dtb
1717
dtb-$(RPI_DT_OVERLAYS) += dht11-overlay.dtb
1818
dtb-$(RPI_DT_OVERLAYS) += enc28j60-overlay.dtb
1919
dtb-$(RPI_DT_OVERLAYS) += gpio-poweroff-overlay.dtb
20-
dtb-$(RPI_DT_OVERLAYS) += gpiomem-overlay.dtb
2120
dtb-$(RPI_DT_OVERLAYS) += hifiberry-amp-overlay.dtb
2221
dtb-$(RPI_DT_OVERLAYS) += hifiberry-dac-overlay.dtb
2322
dtb-$(RPI_DT_OVERLAYS) += hifiberry-dacplus-overlay.dtb

arch/arm/boot/dts/overlays/gpiomem-overlay.dts

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)