Skip to content

Commit 3f3fb97

Browse files
committed
Merge tag 'apple-soc-fixes-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/sven/linux into arm/fixes
Apple SoC fixes for 6.16 One devicetree fix for a dtbs_warning that's been present for a while: - Rename the PCIe BCM4377 node to conform to the devicetree binding schema Two devicetree fixes for W=1 warnings that have been introduced recently: - Drop {address,size}-cells from SPI NOR which doesn't have any child nodes such that these don't make sense - Move touchbar mipi {address,size}-cells from the dtsi file where the node is disabled and has no children to the dts file where it's enabled and its children are declared Signed-off-by: Sven Peter <sven@kernel.org> * tag 'apple-soc-fixes-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/sven/linux: arm64: dts: apple: Move touchbar mipi {address,size}-cells from dtsi to dts arm64: dts: apple: Drop {address,size}-cells from SPI NOR arm64: dts: apple: t8103: Fix PCIe BCM4377 nodename
2 parents c6754d7 + 08a0d93 commit 3f3fb97

File tree

6 files changed

+5
-7
lines changed

6 files changed

+5
-7
lines changed

arch/arm64/boot/dts/apple/spi1-nvram.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
compatible = "jedec,spi-nor";
2121
reg = <0x0>;
2222
spi-max-frequency = <25000000>;
23-
#address-cells = <1>;
24-
#size-cells = <1>;
2523

2624
partitions {
2725
compatible = "fixed-partitions";

arch/arm64/boot/dts/apple/t8103-j293.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@
100100

101101
&displaydfr_mipi {
102102
status = "okay";
103+
#address-cells = <1>;
104+
#size-cells = <0>;
103105

104106
dfr_panel: panel@0 {
105107
compatible = "apple,j293-summit", "apple,summit";

arch/arm64/boot/dts/apple/t8103-jxxx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
*/
7272
&port00 {
7373
bus-range = <1 1>;
74-
wifi0: network@0,0 {
74+
wifi0: wifi@0,0 {
7575
compatible = "pci14e4,4425";
7676
reg = <0x10000 0x0 0x0 0x0 0x0>;
7777
/* To be filled by the loader */

arch/arm64/boot/dts/apple/t8103.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,6 @@
405405
compatible = "apple,t8103-display-pipe-mipi", "apple,h7-display-pipe-mipi";
406406
reg = <0x2 0x28600000 0x0 0x100000>;
407407
power-domains = <&ps_mipi_dsi>;
408-
#address-cells = <1>;
409-
#size-cells = <0>;
410408
status = "disabled";
411409

412410
ports {

arch/arm64/boot/dts/apple/t8112-j493.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363

6464
&displaydfr_mipi {
6565
status = "okay";
66+
#address-cells = <1>;
67+
#size-cells = <0>;
6668

6769
dfr_panel: panel@0 {
6870
compatible = "apple,j493-summit", "apple,summit";

arch/arm64/boot/dts/apple/t8112.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,6 @@
420420
compatible = "apple,t8112-display-pipe-mipi", "apple,h7-display-pipe-mipi";
421421
reg = <0x2 0x28600000 0x0 0x100000>;
422422
power-domains = <&ps_mipi_dsi>;
423-
#address-cells = <1>;
424-
#size-cells = <0>;
425423
status = "disabled";
426424

427425
ports {

0 commit comments

Comments
 (0)