Merge branch 'linux-6.1-trunk/at91/dt' into linux-6.1-mchp

Author: cristibirsan

Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt

@@ -11,14 +11,10 @@ Required properties:
    "microchip,sam9x75-xlcdc"
  - reg: base address and size of the HLCDC device registers.
  - clock-names: the name of the 3 clocks requested by the HLCDC device.
-   Should contain "periph_clk", "sys_clk" and "slow_clk".
+   Should contain "periph_clk", "sys_clk" or "lvds_pll_clk" and "slow_clk".
  - clocks: should contain the 3 clocks requested by the HLCDC device.
  - interrupts: should contain the description of the HLCDC interrupt line
 
-Optional properties:
- - clocks: should contain the LVDS PLL clock requested by the HLCDC device.
- - clock-names: must be "lvds_pll_clk" requested by the HLCDC device.
-
 The HLCDC IP exposes two subdevices:
  - a PWM chip: see ../pwm/atmel-hlcdc-pwm.txt
  - a Display Controller: see ../display/atmel/hlcdc-dc.txt

arch/arm/boot/dts/sam9x7.dtsi

@@ -318,7 +318,7 @@
 		qspi: spi@f0014000 {
 			compatible = "microchip,sam9x7-ospi";
 			#address-cells = <1>;
-			#size-cells = <1>;
+			#size-cells = <0>;
 			reg = <0xf0014000 0x100>, <0x60000000 0x20000000>;
 			reg-names = "qspi_base", "qspi_mmap";
 			interrupts = <35 IRQ_TYPE_LEVEL_HIGH 7>;