diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-11-23 08:22:12 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-11-23 08:22:12 +0100 |
| commit | b14d55313746a4249999495b076979366f7838a8 (patch) | |
| tree | b9f4c2c35113addc3476ead446993ff441b746a8 /dts/src/arm | |
| parent | 4577982e48f853a29581726d332a7f7ea032a875 (diff) | |
| download | barebox-b14d55313746a4249999495b076979366f7838a8.tar.gz barebox-b14d55313746a4249999495b076979366f7838a8.tar.xz | |
dts: update to v6.1-rc6
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm')
| -rw-r--r-- | dts/src/arm/imx7s.dtsi | 4 | ||||
| -rw-r--r-- | dts/src/arm/lan966x-pcb8291.dts | 20 | ||||
| -rw-r--r-- | dts/src/arm/sama7g5-pinfunc.h | 2 |
3 files changed, 23 insertions, 3 deletions
diff --git a/dts/src/arm/imx7s.dtsi b/dts/src/arm/imx7s.dtsi index 0fc9e6b8b0..03d2e8544a 100644 --- a/dts/src/arm/imx7s.dtsi +++ b/dts/src/arm/imx7s.dtsi @@ -1270,10 +1270,10 @@ clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>; }; - gpmi: nand-controller@33002000{ + gpmi: nand-controller@33002000 { compatible = "fsl,imx7d-gpmi-nand"; #address-cells = <1>; - #size-cells = <1>; + #size-cells = <0>; reg = <0x33002000 0x2000>, <0x33004000 0x4000>; reg-names = "gpmi-nand", "bch"; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; diff --git a/dts/src/arm/lan966x-pcb8291.dts b/dts/src/arm/lan966x-pcb8291.dts index f4f054cdf2..3a3d76af86 100644 --- a/dts/src/arm/lan966x-pcb8291.dts +++ b/dts/src/arm/lan966x-pcb8291.dts @@ -69,6 +69,12 @@ pins = "GPIO_35", "GPIO_36"; function = "can0_b"; }; + + sgpio_a_pins: sgpio-a-pins { + /* SCK, D0, D1, LD */ + pins = "GPIO_32", "GPIO_33", "GPIO_34", "GPIO_35"; + function = "sgpio_a"; + }; }; &can0 { @@ -118,6 +124,20 @@ status = "okay"; }; +&sgpio { + pinctrl-0 = <&sgpio_a_pins>; + pinctrl-names = "default"; + microchip,sgpio-port-ranges = <0 3>, <8 11>; + status = "okay"; + + gpio@0 { + ngpios = <64>; + }; + gpio@1 { + ngpios = <64>; + }; +}; + &switch { status = "okay"; }; diff --git a/dts/src/arm/sama7g5-pinfunc.h b/dts/src/arm/sama7g5-pinfunc.h index 4eb30445d2..6e87f0d4b8 100644 --- a/dts/src/arm/sama7g5-pinfunc.h +++ b/dts/src/arm/sama7g5-pinfunc.h @@ -261,7 +261,7 @@ #define PIN_PB2__FLEXCOM6_IO0 PINMUX_PIN(PIN_PB2, 2, 1) #define PIN_PB2__ADTRG PINMUX_PIN(PIN_PB2, 3, 1) #define PIN_PB2__A20 PINMUX_PIN(PIN_PB2, 4, 1) -#define PIN_PB2__FLEXCOM11_IO0 PINMUX_PIN(PIN_PB2, 6, 3) +#define PIN_PB2__FLEXCOM11_IO1 PINMUX_PIN(PIN_PB2, 6, 3) #define PIN_PB3 35 #define PIN_PB3__GPIO PINMUX_PIN(PIN_PB3, 0, 0) #define PIN_PB3__RF1 PINMUX_PIN(PIN_PB3, 1, 1) |