diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-26 23:43:55 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-26 23:43:55 +0100 |
| commit | 80489b8b7c62068b5223af10ead175367dcd127d (patch) | |
| tree | d631b872fabb24731b221edb7b151414ac11165c | |
| parent | d7f02c9e0ced3e9d81728dae248fcc717cecff0d (diff) | |
| parent | a5db65458a911daa6f8927264366dab501715dc0 (diff) | |
| download | linux-next-80489b8b7c62068b5223af10ead175367dcd127d.tar.gz linux-next-80489b8b7c62068b5223af10ead175367dcd127d.zip | |
Merge branch 'for-next' of https://github.com/hisilicon/linux-hisi.git
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hip05.dtsi | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi b/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi index 2f4ad5da5e33..e5010c9d4c39 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi @@ -633,9 +633,7 @@ clocks = <&crg HISTB_USB2_BUS_CLK>, <&crg HISTB_USB2_12M_CLK>, <&crg HISTB_USB2_48M_CLK>; - clock-names = "bus", "clk12", "clk48"; resets = <&crg 0xb8 12>; - reset-names = "bus"; phys = <&usb2_phy1_port0>; phy-names = "usb"; status = "disabled"; @@ -648,11 +646,9 @@ clocks = <&crg HISTB_USB2_BUS_CLK>, <&crg HISTB_USB2_PHY_CLK>, <&crg HISTB_USB2_UTMI_CLK>; - clock-names = "bus", "phy", "utmi"; resets = <&crg 0xb8 12>, <&crg 0xb8 16>, <&crg 0xb8 13>; - reset-names = "bus", "phy", "utmi"; phys = <&usb2_phy1_port0>; phy-names = "usb"; status = "disabled"; diff --git a/arch/arm64/boot/dts/hisilicon/hip05.dtsi b/arch/arm64/boot/dts/hisilicon/hip05.dtsi index d0912ca5f237..2d376b3d30dd 100644 --- a/arch/arm64/boot/dts/hisilicon/hip05.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hip05.dtsi @@ -236,13 +236,13 @@ gic: interrupt-controller@8d000000 { compatible = "arm,gic-v3"; - #interrupt-cells = <3>; - #address-cells = <2>; - #size-cells = <2>; - ranges; - interrupt-controller; - #redistributor-regions = <1>; - redistributor-stride = <0x0 0x30000>; + #interrupt-cells = <3>; + #address-cells = <2>; + #size-cells = <2>; + ranges; + interrupt-controller; + #redistributor-regions = <1>; + redistributor-stride = <0x0 0x30000>; reg = <0x0 0x8d000000 0 0x10000>, /* GICD */ <0x0 0x8d100000 0 0x300000>, /* GICR */ <0x0 0xfe000000 0 0x10000>, /* GICC */ |