[PATCH v1 7/9] ARM: dts: gxp: add psu, i2c, gpio
Krzysztof Kozlowski
krzysztof.kozlowski at linaro.org
Tue Apr 18 10:25:51 PDT 2023
On 18/04/2023 17:28, nick.hawkins at hpe.com wrote:
> From: Nick Hawkins <nick.hawkins at hpe.com>
>
> Add support for the GXP I2C, PSU, and GPIO
> drivers. As well as adjust register ranges to be
> correct.
Please wrap commit message according to Linux coding style / submission
process (neither too early nor over the limit):
https://elixir.bootlin.com/linux/v5.18-rc4/source/Documentation/process/submitting-patches.rst#L586
>
> Signed-off-by: Nick Hawkins <nick.hawkins at hpe.com>
> ---
> arch/arm/boot/dts/hpe-bmc-dl360gen10.dts | 161 ++++++++++++++++++
> arch/arm/boot/dts/hpe-gxp.dtsi | 197 ++++++++++++++++++++---
> 2 files changed, 338 insertions(+), 20 deletions(-)
>
> diff --git a/arch/arm/boot/dts/hpe-bmc-dl360gen10.dts b/arch/arm/boot/dts/hpe-bmc-dl360gen10.dts
> index 3a7382ce40ef..487b6485a832 100644
> --- a/arch/arm/boot/dts/hpe-bmc-dl360gen10.dts
> +++ b/arch/arm/boot/dts/hpe-bmc-dl360gen10.dts
> @@ -23,4 +23,165 @@
> device_type = "memory";
> reg = <0x40000000 0x20000000>;
> };
> +
> + i2cmux at 4 {
> + compatible = "i2c-mux-reg";
> + i2c-parent = <&i2c4>;
> + reg = <0xd1000374 0x1>;
Keep reg as second property. Run dtbs_check W=1, doesn't it scream about
mistake in unit address?
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + i2c at 1 {
> + reg = <1>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + };
> +
> + i2c at 3 {
> + reg = <3>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + };
> +
> + i2c at 4 {
> + reg = <4>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + };
> + };
> +
> + i2cmux at 6 {
> + compatible = "i2c-mux-reg";
> + i2c-parent = <&i2c6>;
> + reg = <0xd1000376 0x1>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + i2c at 1 {
> + reg = <1>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + };
> +
> + i2c at 2 {
> + reg = <2>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + };
> +
> + i2c at 3 {
> + reg = <3>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + };
> +
> + i2c at 4 {
> + reg = <4>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + };
> +
> + i2c at 5 {
> + reg = <5>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + };
> + };
> +};
> +
> +&i2c0 {
> + status = "okay";
> +};
> +
> +&i2c1 {
> + status = "okay";
> +};
> +
> +&i2c2 {
> + status = "okay";
> + eeprom at 50 {
> + compatible = "atmel,24c02";
> + pagesize = <8>;
> + reg = <0x50>;
Keep reg as second property. In other places you have it correctly.
> + };
> +};
> +
> +&i2c3 {
> + status = "okay";
> +};
> +
> +&i2c4 {
> + status = "okay";
> +};
> +
> +&i2c5 {
> + status = "okay";
> +};
> +
> +&i2c6 {
> + status = "okay";
> +};
> +
> +&i2c7 {
> + status = "okay";
> + psu at 58 {
> + compatible = "hpe,gxp-psu";
> + reg = <0x58>;
> + hpe,sysreg = <&sysreg_system_controller2>;
> + };
> +
> + psu at 59 {
> + compatible = "hpe,gxp-psu";
> + reg = <0x59>;
> + hpe,sysreg = <&sysreg_system_controller2>;
> + };
> +};
> +
> +&i2c8 {
> + status = "okay";
> +};
> +
> +&i2c9 {
> + status = "okay";
> +};
> +
> +&gpio {
> + gpio-line-names =
> + "", "", "", "", "", "", "", "", "", "", /*0 - 9*/
That's very odd indentation. Usually it is one of:
gpio-line-names = "foo", "bar"
"baz", "zab";
gpio-line-names =
"foo", "bar"
"baz", "zab";
Where first one is preferred.
> + "", "", "", "", "", "", "", "", "", "", /*10 - 19*/
> + "", "", "", "", "", "", "", "", "", "", /*20 - 29*/
> + "", "", "", "", "", "", "", "", "", "", /*30 - 39*/
> + "", "", "", "", "", "", "", "", "", "", /*40 - 49*/
> + "", "", "", "", "", "", "", "", "", "", /*50 - 59*/
> + "", "", "", "", "", "", "", "", "", "", /*60 - 69*/
> + "", "", "", "", "", "", "", "", "", "", /*70 - 79*/
> + "", "", "", "", "", "", "", "", "", "", /*80 - 89*/
> + "", "", "", "", "", "", "", "", "", "", /*90 - 99*/
> + "", "", "", "", "", "", "", "", "", "", /*100 - 109*/
> + "", "", "", "", "", "", "", "", "", "", /*110 - 119*/
> + "", "", "", "", "", "", "", "", "", "", /*120 - 129*/
> + "", "", "", "", "", "", "", "", "", "", /*130 - 139*/
> + "", "", "", "", "", "", "", "", "", "", /*140 - 149*/
> + "", "", "", "", "", "", "", "", "", "", /*150 - 159*/
> + "", "", "", "", "", "", "", "", "", "", /*160 - 169*/
> + "", "", "", "", "", "", "", "", "", "", /*170 - 179*/
> + "", "", "", "", "", "", "", "", "", "", /*180 - 189*/
> + "", "", "RESET_OUT", "NMI_OUT", "", "", "", "", "", "", /*190 - 199*//*GPIO*/
> + "", "", "", "", "", "", "", "", "", "", /*Vuhc 200-209*/
> + "POWER_OUT", "PS_PWROK", "PCIERST", "POST_COMPLETE", "", "", "", "", "", ""; /*210 - 219*/
> +};
> +
> +&gpio1 {
> + gpio-line-names =
> + "IOP_LED1", "IOP_LED2", "IOP_LED3", "IOP_LED4", "IOP_LED5", "IOP_LED6", "IOP_LED7",
> + "IOP_LED8", "FAN1_INST", "FAN2_INST", "FAN3_INST", "FAN4_INST", "FAN5_INST", "FAN6_INST",
> + "FAN7_INST", "FAN8_INST", "FAN1_FAIL", "FAN2_FAIL", "FAN3_FAIL", "FAN4_FAIL", "FAN5_FAIL",
> + "FAN6_FAIL", "FAN7_FAIL", "FAN8_FAIL", "FAN1_ID", "FAN2_ID", "FAN3_ID", "FAN4_ID",
> + "FAN5_ID", "FAN6_ID", "FAN7_ID", "FAN8_ID", "IDENTIFY", "HEALTH_RED", "HEALTH_AMBER",
> + "POWER_BUTTON", "UID_PRESS", "SLP", "NMI_BUTTON", "RESET_BUTTON", "SIO_S5",
> + "SO_ON_CONTROL", "PSU1_INST", "PSU2_INST", "PSU3_INST", "PSU4_INST", "PSU5_INST",
> + "PSU6_INST", "PSU7_INST", "PSU8_INST", "PSU1_AC", "PSU2_AC", "PSU3_AC", "PSU4_AC",
> + "PSU5_AC", "PSU6_AC", "PSU7_AC", "PSU8_AC", "PSU1_DC", "PSU2_DC", "PSU3_DC", "PSU4_DC",
> + "PSU5_DC", "PSU6_DC", "PSU7_DC", "PSU8_DC", "", "", "", "",
> + "", "", "", "", "", "", "", "", "", "";
> };
> diff --git a/arch/arm/boot/dts/hpe-gxp.dtsi b/arch/arm/boot/dts/hpe-gxp.dtsi
> index cf735b3c4f35..8a8faf7fbd60 100644
> --- a/arch/arm/boot/dts/hpe-gxp.dtsi
> +++ b/arch/arm/boot/dts/hpe-gxp.dtsi
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0
> /*
> - * Device Tree file for HPE GXP
> + * Device Tree for HPE GXP
Not really related to this change,
> */
>
> /dts-v1/;
> @@ -52,76 +52,233 @@
> cache-level = <2>;
> };
>
> - ahb at c0000000 {
> + ahb at 80000000 {
> compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> - ranges = <0x0 0xc0000000 0x30000000>;
> - dma-ranges;
> + ranges = <0x0 0x80000000 0x20000000>,
> + <0x40000000 0xc0000000 0x3fff0000>;
Wrong indentation.
>
> - vic0: interrupt-controller at eff0000 {
> + vic0: interrupt-controller at 4eff0000 {
You need to better organize your changes and split some refactorings
from new devices. I don't understand why eff0000 becomes 4eff0000 -
whether this is a bug being fixed, incorrect design etc. Commit msg just
says "to be correct", so this is was a bug. Bugfixes cannot mixed with
new features/code/refactorings. Anyway this is very vague. Explain what
is not correct, why it has to be fixed.
> compatible = "arm,pl192-vic";
> - reg = <0xeff0000 0x1000>;
> + reg = <0x4eff0000 0x1000>;
> interrupt-controller;
> #interrupt-cells = <1>;
> };
>
> - vic1: interrupt-controller at 80f00000 {
> + vic1: interrupt-controller at f00000 {
> compatible = "arm,pl192-vic";
> - reg = <0x80f00000 0x1000>;
> + reg = <0xf00000 0x1000>;
> interrupt-controller;
> #interrupt-cells = <1>;
> };
>
> - uarta: serial at e0 {
> + uarta: serial at 400000e0 {
> compatible = "ns16550a";
> - reg = <0xe0 0x8>;
> + reg = <0x400000e0 0x8>;
> interrupts = <17>;
> interrupt-parent = <&vic0>;
> clock-frequency = <1846153>;
> reg-shift = <0>;
> };
>
> - uartb: serial at e8 {
> + uartb: serial at 400000e8 {
> compatible = "ns16550a";
> - reg = <0xe8 0x8>;
> + reg = <0x400000e8 0x8>;
> interrupts = <18>;
> interrupt-parent = <&vic0>;
> clock-frequency = <1846153>;
> reg-shift = <0>;
> };
>
> - uartc: serial at f0 {
> + uartc: serial at 400000f0 {
> compatible = "ns16550a";
> - reg = <0xf0 0x8>;
> + reg = <0x400000f0 0x8>;
> interrupts = <19>;
> interrupt-parent = <&vic0>;
> clock-frequency = <1846153>;
> reg-shift = <0>;
> };
>
> - usb0: usb at efe0000 {
> + usb0: usb at 4efe0000 {
> compatible = "hpe,gxp-ehci", "generic-ehci";
> - reg = <0xefe0000 0x100>;
> + reg = <0x4efe0000 0x100>;
> interrupts = <7>;
> interrupt-parent = <&vic0>;
> };
>
> - st: timer at 80 {
> + st: timer at 40000080 {
> compatible = "hpe,gxp-timer";
> - reg = <0x80 0x16>;
> + reg = <0x40000080 0x16>;
> interrupts = <0>;
> interrupt-parent = <&vic0>;
> clocks = <&iopclk>;
> clock-names = "iop";
> };
>
> - usb1: usb at efe0100 {
> + usb1: usb at 4efe0100 {
> compatible = "hpe,gxp-ohci", "generic-ohci";
> - reg = <0xefe0100 0x110>;
> + reg = <0x4efe0100 0x110>;
> interrupts = <6>;
> interrupt-parent = <&vic0>;
> };
> +
> + sysreg_system_controller: syscon at 400000f8 {
> + compatible = "hpe,gxp-sysreg", "syscon";
> + reg = <0x400000f8 0x8>;
> + };
> +
> + sysreg_system_controller2: syscon at 51000319 {
> + compatible = "hpe,gxp-sysreg", "syscon";
> + reg = <0x51000319 0x4>;
> + };
> +
> + i2c0: i2c at 40002000 {
> + compatible = "hpe,gxp-i2c";
> + reg = <0x40002000 0x70>;
> + interrupts = <9>;
> + interrupt-parent = <&vic0>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + status = "disabled";
Status is last property.
> + hpe,sysreg = <&sysreg_system_controller>;
> + clock-frequency = <100000>;
> + };
(...)
> +
> + fan-controller at 40000c10 { /* 0xc0000c10 */
> + compatible = "hpe,gxp-fan-ctrl";
> + reg = <0x40000c10 0x8>, <0x51000327 0x06>;
> + reg-names = "base", "pl";
> + };
> +
> + gpio: gpio at 0 {
> + compatible = "hpe,gxp-gpio";
> + reg = <0x0 0x400>, <0x200046 0x1>, <0x200070 0x08>,
> + <0x400064 0x80>, <0x5100030f 0x1>;
This looks randomly indented...
Best regards,
Krzysztof
More information about the linux-arm-kernel
mailing list