diff options
| author | Krzysztof Kozlowski <krzk@kernel.org> | 2026-08-04 08:07:26 +0200 |
|---|---|---|
| committer | Krzysztof Kozlowski <krzk@kernel.org> | 2026-08-04 08:07:26 +0200 |
| commit | acde40ba506aae78633e080b5704d33cf4bc13c6 (patch) | |
| tree | f354a99e2898280b1cb26916a49bb68e91114eab | |
| parent | 1d3be85d1fef6d632ab01793abdd875287775124 (diff) | |
| parent | db23b4aab4252f793d9fa97dc5d6f8d99c5e8e4b (diff) | |
| download | linux-next-acde40ba506aae78633e080b5704d33cf4bc13c6.tar.gz linux-next-acde40ba506aae78633e080b5704d33cf4bc13c6.zip | |
Merge branch 'next/dt64' into for-next
| -rw-r--r-- | arch/arm64/boot/dts/exynos/exynos8855-pinctrl.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/exynos/google/gs101-pinctrl.dtsi | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm64/boot/dts/exynos/exynos8855-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos8855-pinctrl.dtsi index b65f1698cd74..439d7d7e319b 100644 --- a/arch/arm64/boot/dts/exynos/exynos8855-pinctrl.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos8855-pinctrl.dtsi @@ -462,7 +462,7 @@ }; &pinctrl_hsi_ufs { - gpf3: gpf3-gpio-bank{ + gpf3: gpf3-gpio-bank { gpio-controller; #gpio-cells = <2>; diff --git a/arch/arm64/boot/dts/exynos/google/gs101-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/google/gs101-pinctrl.dtsi index a675f822acec..646722da4e8c 100644 --- a/arch/arm64/boot/dts/exynos/google/gs101-pinctrl.dtsi +++ b/arch/arm64/boot/dts/exynos/google/gs101-pinctrl.dtsi @@ -77,7 +77,7 @@ <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH 0>; }; - gpa5: gpa5-gpio-bank { + gpa5: gpa5-gpio-bank { gpio-controller; #gpio-cells = <2>; interrupt-controller; @@ -91,7 +91,7 @@ <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH 0>; }; - gpa9: gpa9-gpio-bank { + gpa9: gpa9-gpio-bank { gpio-controller; #gpio-cells = <2>; interrupt-controller; @@ -106,7 +106,7 @@ <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH 0>; }; - gpa10: gpa10-gpio-bank { + gpa10: gpa10-gpio-bank { gpio-controller; #gpio-cells = <2>; interrupt-controller; @@ -1030,7 +1030,7 @@ #interrupt-cells = <2>; }; - hsi2c13_bus: hsi2c13-bus-pins { + hsi2c13_bus: hsi2c13-bus-pins { samsung,pins = "gpp25-0", "gpp25-1"; samsung,pin-function = <GS101_PIN_FUNC_2>; samsung,pin-pud = <GS101_PIN_PULL_NONE>; |