| Message ID | 20220812175003.70366-1-jrtc27@jrtc27.com |
|---|---|
| State | Accepted |
| Commit | b236a66ab576c3e55f5768074b3d5a9e1399dcb8 |
| Delegated to: | Andes |
| Headers | show |
| Series | riscv: dts: Sync important Unmatched pmic and qspi0 changes from Linux | expand |
On Fri, Aug 12, 2022 at 06:50:03PM +0100, Jessica Clarke wrote: > This adds the onkey, RTC and watchdog children to the DA9063 PMIC node, > fixes the compatible for qspi0's flash node to match the official DT > schema (it being an is25wp256 is discoverable, hence jedec,spi-nor is > the only compatible that should be present) and exposes the card detect > GPIO. > > Note that the device trees still diverge in some places (including > important things like the PCIe controller's clock name) and should be > cleaned up so that a common device tree is used in both projects rather > than having different bindings. This patch does not attempt to do that, > merely expose important functionality present in Linux's that is not in > U-Boot's so that it can be used without the OS providing its own bundled > copy. > > Signed-off-by: Jessica Clarke <jrtc27@jrtc27.com> > --- > arch/riscv/dts/hifive-unmatched-a00.dts | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
diff --git a/arch/riscv/dts/hifive-unmatched-a00.dts b/arch/riscv/dts/hifive-unmatched-a00.dts index b44e8c160d..ea32ae72e8 100644 --- a/arch/riscv/dts/hifive-unmatched-a00.dts +++ b/arch/riscv/dts/hifive-unmatched-a00.dts @@ -76,6 +76,18 @@ interrupts = <1 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; + onkey { + compatible = "dlg,da9063-onkey"; + }; + + rtc { + compatible = "dlg,da9063-rtc"; + }; + + wdt { + compatible = "dlg,da9063-watchdog"; + }; + regulators { vdd_bcore1: bcore1 { regulator-min-microvolt = <1050000>; @@ -217,7 +229,7 @@ &qspi0 { status = "okay"; flash@0 { - compatible = "issi,is25wp256", "jedec,spi-nor"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; m25p,fast-read; @@ -234,6 +246,7 @@ spi-max-frequency = <20000000>; voltage-ranges = <3300 3300>; disable-wp; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; };
This adds the onkey, RTC and watchdog children to the DA9063 PMIC node, fixes the compatible for qspi0's flash node to match the official DT schema (it being an is25wp256 is discoverable, hence jedec,spi-nor is the only compatible that should be present) and exposes the card detect GPIO. Note that the device trees still diverge in some places (including important things like the PCIe controller's clock name) and should be cleaned up so that a common device tree is used in both projects rather than having different bindings. This patch does not attempt to do that, merely expose important functionality present in Linux's that is not in U-Boot's so that it can be used without the OS providing its own bundled copy. Signed-off-by: Jessica Clarke <jrtc27@jrtc27.com> --- arch/riscv/dts/hifive-unmatched-a00.dts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)