mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-08 20:07:46 +09:00
Merge tag 'xgene-dts-for-v4.6-part1' of https://github.com/AppliedMicro/xgene-next into next/dt64
Merge "First part of X-Gene DT changes queued for v4.6" from Duc Dang: This patch set includes: + A change in compatible string of X-Gene v2 SoC PLL DT node to reflect the v2 hardware + Update DT fields for X-Gene v1 and v2 standby GPIO controllers + Update declaration of power button GPIO for X-Gene v1 and X-Gene v2 platforms * tag 'xgene-dts-for-v4.6-part1' of https://github.com/AppliedMicro/xgene-next: arm64: dts: apm: Update GPIO to control power-off on X-Gene v2 platforms arm64: dts: apm: Update GPIO standby controller DT node for X-Gene v2 platforms arm64: dts: apm: Update GPIO to control power-off on X-Gene v1 platforms arm64: dts: apm: Update X-Gene standby GPIO controller DTS entries arm64: dts: apm: Update Merlin DT PCP PLL clock node for v2 hardware
This commit is contained in:
@@ -30,7 +30,8 @@
|
||||
label = "POWER";
|
||||
linux,code = <116>;
|
||||
linux,input-type = <0x1>;
|
||||
interrupts = <0x0 0x28 0x1>;
|
||||
interrupt-parent = <&sbgpio>;
|
||||
interrupts = <0x0 0x1>;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -30,7 +30,8 @@
|
||||
label = "POWER";
|
||||
linux,code = <116>;
|
||||
linux,input-type = <0x1>;
|
||||
interrupts = <0x0 0x2d 0x1>;
|
||||
interrupt-parent = <&sbgpio>;
|
||||
interrupts = <0x5 0x1>;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -224,7 +224,7 @@
|
||||
};
|
||||
|
||||
socpll: socpll@17000120 {
|
||||
compatible = "apm,xgene-socpll-clock";
|
||||
compatible = "apm,xgene-socpll-v2-clock";
|
||||
#clock-cells = <1>;
|
||||
clocks = <&refclk 0>;
|
||||
reg = <0x0 0x17000120 0x0 0x1000>;
|
||||
@@ -598,6 +598,12 @@
|
||||
<0x0 0x2d 0x1>,
|
||||
<0x0 0x2e 0x1>,
|
||||
<0x0 0x2f 0x1>;
|
||||
interrupt-parent = <&gic>;
|
||||
#interrupt-cells = <2>;
|
||||
interrupt-controller;
|
||||
apm,nr-gpios = <22>;
|
||||
apm,nr-irqs = <8>;
|
||||
apm,irq-start = <8>;
|
||||
};
|
||||
|
||||
sgenet0: ethernet@1f610000 {
|
||||
|
||||
@@ -883,6 +883,9 @@
|
||||
<0x0 0x2b 0x1>,
|
||||
<0x0 0x2c 0x1>,
|
||||
<0x0 0x2d 0x1>;
|
||||
interrupt-parent = <&gic>;
|
||||
#interrupt-cells = <2>;
|
||||
interrupt-controller;
|
||||
};
|
||||
|
||||
rtc: rtc@10510000 {
|
||||
|
||||
Reference in New Issue
Block a user