Merge pull request #184 from truenas/NAS-130057

NAS-130057 / 24.10 / Enable CONFIG_WERROR and update to v6.6.40

Documentation/admin-guide/kernel-parameters.txt

@@ -3323,6 +3323,9 @@
  arch-independent options, each of which is an
  aggregation of existing arch-specific options.
 
+ Note, "mitigations" is supported if and only if the
+ kernel was built with CPU_MITIGATIONS=y.
+
  off
  Disable all optional CPU mitigations. This
  improves system performance, but it may also

Documentation/devicetree/bindings/dma/fsl,edma.yaml

@@ -47,8 +47,8 @@ properties:
  - 3
 
  dma-channels:
- minItems: 1
- maxItems: 64
+ minimum: 1
+ maximum: 64
 
  clocks:
  minItems: 1

Documentation/devicetree/bindings/i2c/atmel,at91sam-i2c.yaml

@@ -75,7 +75,7 @@ required:
  - clocks
 
 allOf:
- - $ref: i2c-controller.yaml
+ - $ref: /schemas/i2c/i2c-controller.yaml#
  - if:
  properties:
  compatible:

Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml

@@ -21,7 +21,7 @@ description: |
  google,cros-ec-spi or google,cros-ec-i2c.
 
 allOf:
- - $ref: i2c-controller.yaml#
+ - $ref: /schemas/i2c/i2c-controller.yaml#
 
 properties:
  compatible:

Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml

@@ -28,6 +28,9 @@ properties:
  reg:
  maxItems: 1
 
+ clocks:
+ maxItems: 1
+
  dmas:
  maxItems: 1
 
@@ -39,12 +42,16 @@ properties:
  $ref: /schemas/types.yaml#/definitions/phandle
  description:
  A reference to a the actual ADC to which this FPGA ADC interfaces to.
+ deprecated: true
+
+ '#io-backend-cells':
+ const: 0
 
 required:
  - compatible
  - dmas
  - reg
- - adi,adc-dev
+ - clocks
 
 additionalProperties: false
 
@@ -55,7 +62,7 @@ examples:
  reg = <0x44a00000 0x10000>;
  dmas = <&rx_dma 0>;
  dma-names = "rx";
-
- adi,adc-dev = <&spi_adc>;
+ clocks = <&axi_clk>;
+ #io-backend-cells = <0>;
  };
 ...

Documentation/devicetree/bindings/media/i2c/ovti,ov2680.yaml

@@ -37,15 +37,15 @@ properties:
  active low.
  maxItems: 1
 
- dovdd-supply:
+ DOVDD-supply:
  description:
  Definition of the regulator used as interface power supply.
 
- avdd-supply:
+ AVDD-supply:
  description:
  Definition of the regulator used as analog power supply.
 
- dvdd-supply:
+ DVDD-supply:
  description:
  Definition of the regulator used as digital power supply.
 
@@ -59,9 +59,9 @@ required:
  - reg
  - clocks
  - clock-names
- - dovdd-supply
- - avdd-supply
- - dvdd-supply
+ - DOVDD-supply
+ - AVDD-supply
+ - DVDD-supply
  - reset-gpios
  - port
 
@@ -82,9 +82,9 @@ examples:
  clock-names = "xvclk";
  reset-gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
 
- dovdd-supply = <&sw2_reg>;
- dvdd-supply = <&sw2_reg>;
- avdd-supply = <&reg_peri_3p15v>;
+ DOVDD-supply = <&sw2_reg>;
+ DVDD-supply = <&sw2_reg>;
+ AVDD-supply = <&reg_peri_3p15v>;
 
  port {
  ov2680_to_mipi: endpoint {

Documentation/devicetree/bindings/pci/rcar-pci-host.yaml

@@ -68,6 +68,18 @@ properties:
  phy-names:
  const: pcie
 
+ vpcie1v5-supply:
+ description: The 1.5v regulator to use for PCIe.
+
+ vpcie3v3-supply:
+ description: The 3.3v regulator to use for PCIe.
+
+ vpcie12v-supply:
+ description: The 12v regulator to use for PCIe.
+
+ iommu-map: true
+ iommu-map-mask: true
+
 required:
  - compatible
  - reg
@@ -121,5 +133,7 @@ examples:
  clock-names = "pcie", "pcie_bus";
  power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
  resets = <&cpg 319>;
+ vpcie3v3-supply = <&pcie_3v3>;
+ vpcie12v-supply = <&pcie_12v>;
  };
  };

Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie.yaml

@@ -37,6 +37,7 @@ properties:
  description: This property is needed if using 24MHz OSC for RC's PHY.
 
  ep-gpios:
+ maxItems: 1
  description: pre-reset GPIO
 
  vpcie12v-supply:

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml

@@ -71,7 +71,6 @@ required:
  - reg
  - clocks
  - clock-names
- - power-domains
  - resets
  - reset-names
  - vdda-phy-supply
@@ -130,6 +129,21 @@ allOf:
  clock-names:
  maxItems: 1
 
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - qcom,msm8996-qmp-ufs-phy
+ - qcom,msm8998-qmp-ufs-phy
+ then:
+ properties:
+ power-domains:
+ false
+ else:
+ required:
+ - power-domains
+
 additionalProperties: false
 
 examples:

Documentation/devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml

@@ -15,9 +15,6 @@ description: |
 properties:
  compatible:
  oneOf:
- - enum:
- - qcom,sc8180x-usb-hs-phy
- - qcom,usb-snps-femto-v2-phy
  - items:
  - enum:
  - qcom,sa8775p-usb-hs-phy
@@ -26,6 +23,7 @@ properties:
  - items:
  - enum:
  - qcom,sc7280-usb-hs-phy
+ - qcom,sc8180x-usb-hs-phy
  - qcom,sdx55-usb-hs-phy
  - qcom,sdx65-usb-hs-phy
  - qcom,sm6375-usb-hs-phy

Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml

@@ -97,16 +97,18 @@ patternProperties:
  then:
  properties:
  groups:
- enum: [emmc, emmc_rst]
+ items:
+ enum: [emmc, emmc_rst]
  - if:
  properties:
  function:
  const: eth
  then:
  properties:
  groups:
- enum: [esw, esw_p0_p1, esw_p2_p3_p4, rgmii_via_esw,
- rgmii_via_gmac1, rgmii_via_gmac2, mdc_mdio]
+ items:
+ enum: [esw, esw_p0_p1, esw_p2_p3_p4, rgmii_via_esw,
+ rgmii_via_gmac1, rgmii_via_gmac2, mdc_mdio]
  - if:
  properties:
  function:
@@ -123,10 +125,11 @@ patternProperties:
  then:
  properties:
  groups:
- enum: [i2s_in_mclk_bclk_ws, i2s1_in_data, i2s2_in_data,
- i2s3_in_data, i2s4_in_data, i2s_out_mclk_bclk_ws,
- i2s1_out_data, i2s2_out_data, i2s3_out_data,
- i2s4_out_data]
+ items:
+ enum: [i2s_in_mclk_bclk_ws, i2s1_in_data, i2s2_in_data,
+ i2s3_in_data, i2s4_in_data, i2s_out_mclk_bclk_ws,
+ i2s1_out_data, i2s2_out_data, i2s3_out_data,
+ i2s4_out_data]
  - if:
  properties:
  function:
@@ -159,10 +162,11 @@ patternProperties:
  then:
  properties:
  groups:
- enum: [pcie0_0_waken, pcie0_1_waken, pcie1_0_waken,
- pcie0_0_clkreq, pcie0_1_clkreq, pcie1_0_clkreq,
- pcie0_pad_perst, pcie1_pad_perst, pcie_pereset,
- pcie_wake, pcie_clkreq]
+ items:
+ enum: [pcie0_0_waken, pcie0_1_waken, pcie1_0_waken,
+ pcie0_0_clkreq, pcie0_1_clkreq, pcie1_0_clkreq,
+ pcie0_pad_perst, pcie1_pad_perst, pcie_pereset,
+ pcie_wake, pcie_clkreq]
  - if:
  properties:
  function:
@@ -178,11 +182,12 @@ patternProperties:
  then:
  properties:
  groups:
- enum: [pwm_ch1_0, pwm_ch1_1, pwm_ch1_2, pwm_ch2_0, pwm_ch2_1,
- pwm_ch2_2, pwm_ch3_0, pwm_ch3_1, pwm_ch3_2, pwm_ch4_0,
- pwm_ch4_1, pwm_ch4_2, pwm_ch4_3, pwm_ch5_0, pwm_ch5_1,
- pwm_ch5_2, pwm_ch6_0, pwm_ch6_1, pwm_ch6_2, pwm_ch6_3,
- pwm_ch7_0, pwm_0, pwm_1]
+ items:
+ enum: [pwm_ch1_0, pwm_ch1_1, pwm_ch1_2, pwm_ch2_0, pwm_ch2_1,
+ pwm_ch2_2, pwm_ch3_0, pwm_ch3_1, pwm_ch3_2, pwm_ch4_0,
+ pwm_ch4_1, pwm_ch4_2, pwm_ch4_3, pwm_ch5_0, pwm_ch5_1,
+ pwm_ch5_2, pwm_ch6_0, pwm_ch6_1, pwm_ch6_2, pwm_ch6_3,
+ pwm_ch7_0, pwm_0, pwm_1]
  - if:
  properties:
  function:
@@ -260,33 +265,34 @@ patternProperties:
  pins:
  description:
  An array of strings. Each string contains the name of a pin.
- enum: [GPIO_A, I2S1_IN, I2S1_OUT, I2S_BCLK, I2S_WS, I2S_MCLK, TXD0,
- RXD0, SPI_WP, SPI_HOLD, SPI_CLK, SPI_MOSI, SPI_MISO, SPI_CS,
- I2C_SDA, I2C_SCL, I2S2_IN, I2S3_IN, I2S4_IN, I2S2_OUT,
- I2S3_OUT, I2S4_OUT, GPIO_B, MDC, MDIO, G2_TXD0, G2_TXD1,
- G2_TXD2, G2_TXD3, G2_TXEN, G2_TXC, G2_RXD0, G2_RXD1, G2_RXD2,
- G2_RXD3, G2_RXDV, G2_RXC, NCEB, NWEB, NREB, NDL4, NDL5, NDL6,
- NDL7, NRB, NCLE, NALE, NDL0, NDL1, NDL2, NDL3, MDI_TP_P0,
- MDI_TN_P0, MDI_RP_P0, MDI_RN_P0, MDI_TP_P1, MDI_TN_P1,
- MDI_RP_P1, MDI_RN_P1, MDI_RP_P2, MDI_RN_P2, MDI_TP_P2,
- MDI_TN_P2, MDI_TP_P3, MDI_TN_P3, MDI_RP_P3, MDI_RN_P3,
- MDI_RP_P4, MDI_RN_P4, MDI_TP_P4, MDI_TN_P4, PMIC_SCL,
- PMIC_SDA, SPIC1_CLK, SPIC1_MOSI, SPIC1_MISO, SPIC1_CS,
- GPIO_D, WATCHDOG, RTS3_N, CTS3_N, TXD3, RXD3, PERST0_N,
- PERST1_N, WLED_N, EPHY_LED0_N, AUXIN0, AUXIN1, AUXIN2,
- AUXIN3, TXD4, RXD4, RTS4_N, CST4_N, PWM1, PWM2, PWM3, PWM4,
- PWM5, PWM6, PWM7, GPIO_E, TOP_5G_CLK, TOP_5G_DATA,
- WF0_5G_HB0, WF0_5G_HB1, WF0_5G_HB2, WF0_5G_HB3, WF0_5G_HB4,
- WF0_5G_HB5, WF0_5G_HB6, XO_REQ, TOP_RST_N, SYS_WATCHDOG,
- EPHY_LED0_N_JTDO, EPHY_LED1_N_JTDI, EPHY_LED2_N_JTMS,
- EPHY_LED3_N_JTCLK, EPHY_LED4_N_JTRST_N, WF2G_LED_N,
- WF5G_LED_N, GPIO_9, GPIO_10, GPIO_11, GPIO_12, UART1_TXD,
- UART1_RXD, UART1_CTS, UART1_RTS, UART2_TXD, UART2_RXD,
- UART2_CTS, UART2_RTS, SMI_MDC, SMI_MDIO, PCIE_PERESET_N,
- PWM_0, GPIO_0, GPIO_1, GPIO_2, GPIO_3, GPIO_4, GPIO_5,
- GPIO_6, GPIO_7, GPIO_8, UART0_TXD, UART0_RXD, TOP_2G_CLK,
- TOP_2G_DATA, WF0_2G_HB0, WF0_2G_HB1, WF0_2G_HB2, WF0_2G_HB3,
- WF0_2G_HB4, WF0_2G_HB5, WF0_2G_HB6]
+ items:
+ enum: [GPIO_A, I2S1_IN, I2S1_OUT, I2S_BCLK, I2S_WS, I2S_MCLK, TXD0,
+ RXD0, SPI_WP, SPI_HOLD, SPI_CLK, SPI_MOSI, SPI_MISO, SPI_CS,
+ I2C_SDA, I2C_SCL, I2S2_IN, I2S3_IN, I2S4_IN, I2S2_OUT,
+ I2S3_OUT, I2S4_OUT, GPIO_B, MDC, MDIO, G2_TXD0, G2_TXD1,
+ G2_TXD2, G2_TXD3, G2_TXEN, G2_TXC, G2_RXD0, G2_RXD1, G2_RXD2,
+ G2_RXD3, G2_RXDV, G2_RXC, NCEB, NWEB, NREB, NDL4, NDL5, NDL6,
+ NDL7, NRB, NCLE, NALE, NDL0, NDL1, NDL2, NDL3, MDI_TP_P0,
+ MDI_TN_P0, MDI_RP_P0, MDI_RN_P0, MDI_TP_P1, MDI_TN_P1,
+ MDI_RP_P1, MDI_RN_P1, MDI_RP_P2, MDI_RN_P2, MDI_TP_P2,
+ MDI_TN_P2, MDI_TP_P3, MDI_TN_P3, MDI_RP_P3, MDI_RN_P3,
+ MDI_RP_P4, MDI_RN_P4, MDI_TP_P4, MDI_TN_P4, PMIC_SCL,
+ PMIC_SDA, SPIC1_CLK, SPIC1_MOSI, SPIC1_MISO, SPIC1_CS,
+ GPIO_D, WATCHDOG, RTS3_N, CTS3_N, TXD3, RXD3, PERST0_N,
+ PERST1_N, WLED_N, EPHY_LED0_N, AUXIN0, AUXIN1, AUXIN2,
+ AUXIN3, TXD4, RXD4, RTS4_N, CST4_N, PWM1, PWM2, PWM3, PWM4,
+ PWM5, PWM6, PWM7, GPIO_E, TOP_5G_CLK, TOP_5G_DATA,
+ WF0_5G_HB0, WF0_5G_HB1, WF0_5G_HB2, WF0_5G_HB3, WF0_5G_HB4,
+ WF0_5G_HB5, WF0_5G_HB6, XO_REQ, TOP_RST_N, SYS_WATCHDOG,
+ EPHY_LED0_N_JTDO, EPHY_LED1_N_JTDI, EPHY_LED2_N_JTMS,
+ EPHY_LED3_N_JTCLK, EPHY_LED4_N_JTRST_N, WF2G_LED_N,
+ WF5G_LED_N, GPIO_9, GPIO_10, GPIO_11, GPIO_12, UART1_TXD,
+ UART1_RXD, UART1_CTS, UART1_RTS, UART2_TXD, UART2_RXD,
+ UART2_CTS, UART2_RTS, SMI_MDC, SMI_MDIO, PCIE_PERESET_N,
+ PWM_0, GPIO_0, GPIO_1, GPIO_2, GPIO_3, GPIO_4, GPIO_5,
+ GPIO_6, GPIO_7, GPIO_8, UART0_TXD, UART0_RXD, TOP_2G_CLK,
+ TOP_2G_DATA, WF0_2G_HB0, WF0_2G_HB1, WF0_2G_HB2, WF0_2G_HB3,
+ WF0_2G_HB4, WF0_2G_HB5, WF0_2G_HB6]
 
  bias-disable: true
 

Documentation/devicetree/bindings/soc/rockchip/grf.yaml

@@ -163,6 +163,7 @@ allOf:
  unevaluatedProperties: false
 
  pcie-phy:
+ type: object
  description:
  Documentation/devicetree/bindings/phy/rockchip-pcie-phy.txt
 

Documentation/devicetree/bindings/sound/rt5645.txt

@@ -20,6 +20,11 @@ Optional properties:
  a GPIO spec for the external headphone detect pin. If jd-mode = 0,
  we will get the JD status by getting the value of hp-detect-gpios.
 
+- cbj-sleeve-gpios:
+ a GPIO spec to control the external combo jack circuit to tie the sleeve/ring2
+ contacts to the ground or floating. It could avoid some electric noise from the
+ active speaker jacks.
+
 - realtek,in2-differential
  Boolean. Indicate MIC2 input are differential, rather than single-ended.
 
@@ -68,6 +73,7 @@ codec: rt5650@1a {
  compatible = "realtek,rt5650";
  reg = <0x1a>;
  hp-detect-gpios = <&gpio 19 0>;
+ cbj-sleeve-gpios = <&gpio 20 0>;
  interrupt-parent = <&gpio>;
  interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
  realtek,dmic-en = "true";

Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml

@@ -14,7 +14,7 @@ description: |
  It is a MIPI System Power Management (SPMI) controller.
 
  The PMIC part is provided by
- ./Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml.
+ Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml.
 
 allOf:
  - $ref: spmi.yaml#
@@ -48,7 +48,7 @@ patternProperties:
  PMIC properties, which are specific to the used SPMI PMIC device(s).
  When used in combination with HiSilicon 6421v600, the properties
  are documented at
- drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml.
+ Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml
 
 unevaluatedProperties: false