aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/meson.dtsi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-02-15 16:04:51 +0100
committerArnd Bergmann <arnd@arndb.de>2019-02-15 16:05:07 +0100
commitf815bb4e97e42af7299cec7efa9771ba99929a06 (patch)
tree5646dcc5c0594c7c19a17df27599e675e6ec81ca /arch/arm/boot/dts/meson.dtsi
parentMerge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt (diff)
parentARM: dts: meson8b: ec100: add the GPIO line names (diff)
downloadlinux-dev-f815bb4e97e42af7299cec7efa9771ba99929a06.tar.xz
linux-dev-f815bb4e97e42af7299cec7efa9771ba99929a06.zip
Merge tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt
ARM: dts: Amlogic updates for v5.1 - more features for Endless EC100 board - chip temperature sensor support - fix ethernet pins - add Mali-450 GPU * tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM: dts: meson8b: ec100: add the GPIO line names ARM: dts: meson8b: ec100: improve the description of the regulators ARM: dts: meson8b: ec100: enable the Ethernet PHY interrupt ARM: dts: meson8m2: mxiii-plus: add iio-hwmon for the chip temperature ARM: dts: meson8b: odroidc1: add iio-hwmon for the chip temperature ARM: dts: meson8b: ec100: add iio-hwmon for the chip temperature ARM: dts: meson8b: add the temperature calibration data for the SAR ADC ARM: dts: meson8: add the temperature calibration data for the SAR ADC ARM: dts: meson8m2: use the Meson8m2 specific SAR ADC compatible ARM: dts: meson: switch the clock controller to the HHI register area ARM: dts: meson8b: fix the Ethernet data line signals in eth_rgmii_pins ARM: dts: meson8b: add the Mali-450 MP2 GPU ARM: dts: meson8: add the Mali-450 MP6 GPU dt-bindings: gpu: mali-utgard: add Amlogic Meson8 and Meson8b compatible ARM: dts: meson8b: add the APB bus ARM: dts: meson8: add the APB bus ARM: dts: meson6: add the APB2 bus Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/meson.dtsi')
-rw-r--r--arch/arm/boot/dts/meson.dtsi7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi
index 5c303092520a..cc30799a17d2 100644
--- a/arch/arm/boot/dts/meson.dtsi
+++ b/arch/arm/boot/dts/meson.dtsi
@@ -73,6 +73,13 @@
#size-cells = <1>;
ranges = <0x0 0xc1100000 0x200000>;
+ hhi: system-controller@4000 {
+ compatible = "amlogic,meson-hhi-sysctrl",
+ "simple-mfd",
+ "syscon";
+ reg = <0x4000 0x400>;
+ };
+
assist: assist@7c00 {
compatible = "amlogic,meson-mx-assist", "syscon";
reg = <0x7c00 0x200>;