powerpc/85xx: Add P2020DS board support
Subsystems (4)
PATCH v3 1/1 powerpc/85xx: Add P2020DS board support
The P2020 is a dual e500v2 core based SOC with:
* 3 PCIe controllers
* 2 General purpose DMA controllers
* 2 sRIO controllers
* 3 eTSECS
* USB 2.0
* SDHC
* SPI, I2C, DUART
* enhanced localbus
* and optional Security (P2020E) security w/XOR acceleration
The p2020 DS reference board is pretty similar to the existing MPC85xx DS boards and has a ULI 1575 connected on one of the PCIe controllers.
---
* Fixed soc node compat to have "p2020-immr"
* Fixed up SEC node per Kim's comments
- k
arch/powerpc/boot/dts/p2020ds.dts | 668 ++++++++++++++++++++++++++++++ arch/powerpc/platforms/85xx/mpc85xx_ds.c | 35 ++- arch/powerpc/platforms/fsl_uli1575.c | 1 + arch/powerpc/sysdev/fsl_pci.c | 2 + include/linux/pci_ids.h | 2 + 5 files changed, 707 insertions(+), 1 deletions(-) create mode 100644 arch/powerpc/boot/dts/p2020ds.dts
arch/powerpc/boot/dts/p2020ds.dts new file +668 -0
@@ -0,0 +1,668 @@ +/* + * P2020 DS Device Tree Source + * + * Copyright 2007-2009 Freescale Semiconductor Inc. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +/dts-v1/; +/ { + model = "fsl,P2020"; + compatible = "fsl,P2020DS"; + #address-cells = <2>; + #size-cells = <2>; + + aliases { + ethernet0 = &enet0; + ethernet1 = &enet1; + ethernet2 = &enet2; + serial0 = &serial0; + serial1 = &serial1; + pci0 = &pci0; + pci1 = &pci1; + pci2 = &pci2; + }; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + PowerPC,P2020@0 { + device_type = "cpu"; + reg = <0x0>; + next-level-cache = <&L2>; + }; + + PowerPC,P2020@1 { + device_type = "cpu"; + reg = <0x1>; + next-level-cache = <&L2>; + }; + }; + + memory { + device_type = "memory"; + }; + + localbus@ffe05000 { + #address-cells = <2>; + #size-cells = <1>; + compatible = "fsl,elbc", "simple-bus"; + reg = <0 0xffe05000 0 0x1000>; + interrupts = <19 2>; + interrupt-parent = <&mpic>; + + ranges = <0x0 0x0 0x0 0xe8000000 0x08000000 + 0x1 0x0 0x0 0xe0000000 0x08000000 + 0x2 0x0 0x0 0xffa00000 0x00040000 + 0x3 0x0 0x0 0xffdf0000 0x00008000 + 0x4 0x0 0x0 0xffa40000 0x00040000 + 0x5 0x0 0x0 0xffa80000 0x00040000 + 0x6 0x0 0x0 0xffac0000 0x00040000>; + + nor@0,0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "cfi-flash"; + reg = <0x0 0x0 0x8000000>; + bank-width = <2>; + device-width = <1>; + + ramdisk@0 { + reg = <0x0 0x03000000>; + read-only; + }; + + diagnostic@3000000 { + reg = <0x03000000 0x00e00000>; + read-only; + }; + + dink@3e00000 { + reg = <0x03e00000 0x00200000>; + read-only; + }; + + kernel@4000000 { + reg = <0x04000000 0x00400000>; + read-only; + }; + + jffs2@4400000 { + reg = <0x04400000 0x03b00000>; + }; + + dtb@7f00000 { + reg = <0x07f00000 0x00080000>; + read-only; + }; + + u-boot@7f80000 { + reg = <0x07f80000 0x00080000>; + read-only; + }; + }; + + nand@2,0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fsl,elbc-fcm-nand"; + reg = <0x2 0x0 0x40000>; + + u-boot@0 { + reg = <0x0 0x02000000>; + read-only; + }; + + jffs2@2000000 { + reg = <0x02000000 0x10000000>; + }; + + ramdisk@12000000 { + reg = <0x12000000 0x08000000>; + read-only; + }; + + kernel@1a000000 { + reg = <0x1a000000 0x04000000>; + }; + + dtb@1e000000 { + reg = <0x1e000000 0x01000000>; + read-only; + }; + + empty@1f000000 { + reg = <0x1f000000 0x21000000>; + }; + }; + + nand@4,0 { + compatible = "fsl,elbc-fcm-nand"; + reg = <0x4 0x0 0x40000>; + }; + + nand@5,0 { + compatible = "fsl,elbc-fcm-nand"; + reg = <0x5 0x0 0x40000>; + }; + + nand@6,0 { + compatible = "fsl,elbc-fcm-nand"; + reg = <0x6 0x0 0x40000>; + }; + }; + + soc@ffe00000 { + #address-cells = <1>; + #size-cells = <1>; + device_type = "soc"; + compatible = "fsl,p2020-immr", "simple-bus"; + ranges = <0x0 0 0xffe00000 0x100000>; + reg = <0 0xffe00000 0 0x1000>; // CCSRBAR & soc regs, remove once parse code for immrbase fixed + bus-frequency = <0>; // Filled out by uboot. + + memory-controller@2000 { + compatible = "fsl,p2020-memory-controller"; + reg = <0x2000 0x1000>; + interrupt-parent = <&mpic>; + interrupts = <18 2>; + }; + + L2: l2-cache-controller@20000 { + compatible = "fsl,p2020-l2-cache-controller"; + reg = <0x20000 0x1000>; + cache-line-size = <32>; // 32 bytes + cache-size = <0x100000>; // L2, 1M + interrupt-parent = <&mpic>; + interrupts = <16 2>; + }; + + i2c@3000 { + #address-cells = <1>; + #size-cells = <0>; + cell-index = <0>; + compatible = "fsl-i2c"; + reg = <0x3000 0x100>; + interrupts = <43 2>; + interrupt-parent = <&mpic>; + dfsrr; + }; + + i2c@3100 { + #address-cells = <1>; + #size-cells = <0>; + cell-index = <1>; + compatible = "fsl-i2c"; + reg = <0x3100 0x100>; + interrupts = <43 2>; + interrupt-parent = <&mpic>; + dfsrr; + }; + + dma@c300 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fsl,eloplus-dma"; + reg = <0xc300 0x4>; + ranges = <0x0 0xc100 0x200>; + cell-index = <1>; + dma-channel@0 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x0 0x80>; + cell-index = <0>; + interrupt-parent = <&mpic>; + interrupts = <76 2>; + }; + dma-channel@80 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x80 0x80>; + cell-index = <1>; + interrupt-parent = <&mpic>; + interrupts = <77 2>; + }; + dma-channel@100 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x100 0x80>; + cell-index = <2>; + interrupt-parent = <&mpic>; + interrupts = <78 2>; + }; + dma-channel@180 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x180 0x80>; + cell-index = <3>; + interrupt-parent = <&mpic>; + interrupts = <79 2>; + }; + }; + + dma@21300 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fsl,eloplus-dma"; + reg = <0x21300 0x4>; + ranges = <0x0 0x21100 0x200>; + cell-index = <0>; + dma-channel@0 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x0 0x80>; + cell-index = <0>; + interrupt-parent = <&mpic>; + interrupts = <20 2>; + }; + dma-channel@80 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x80 0x80>; + cell-index = <1>; + interrupt-parent = <&mpic>; + interrupts = <21 2>; + }; + dma-channel@100 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x100 0x80>; + cell-index = <2>; + interrupt-parent = <&mpic>; + interrupts = <22 2>; + }; + dma-channel@180 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x180 0x80>; + cell-index = <3>; + interrupt-parent = <&mpic>; + interrupts = <23 2>; + }; + }; + + usb@22000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl-usb2-mph"; + reg = <0x22000 0x1000>; + interrupt-parent = <&mpic>; + interrupts = <28 0x2>; + phy_type = "ulpi"; + }; + + + enet0: ethernet@24000 { + #address-cells = <1>; + #size-cells = <1>; + cell-index = <0>; + device_type = "network"; + model = "eTSEC"; + compatible = "gianfar"; + reg = <0x24000 0x1000>; + ranges = <0x0 0x24000 0x1000>; + local-mac-address = [ 00 00 00 00 00 00 ]; + interrupts = <29 2 30 2 34 2>; + interrupt-parent = <&mpic>; + tbi-handle = <&tbi0>; + phy-handle = <&phy0>; + phy-connection-type = "rgmii-id"; + + mdio@520 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,gianfar-mdio"; + reg = <0x520 0x20>; + + phy0: ethernet-phy@0 { + interrupt-parent = <&mpic>; + interrupts = <3 1>; + reg = <0x0>; + }; + phy1: ethernet-phy@1 { + interrupt-parent = <&mpic>; + interrupts = <3 1>; + reg = <0x1>; + }; + phy2: ethernet-phy@2 { + interrupt-parent = <&mpic>; + interrupts = <3 1>; + reg = <0x2>; + }; + tbi0: tbi-phy@11 { + reg = <0x11>; + device_type = "tbi-phy"; + }; + }; + }; + + enet1: ethernet@25000 { + #address-cells = <1>; + #size-cells = <1>; + cell-index = <1>; + device_type = "network"; + model = "eTSEC"; + compatible = "gianfar"; + reg = <0x25000 0x1000>; + ranges = <0x0 0x25000 0x1000>; + local-mac-address = [ 00 00 00 00 00 00 ]; + interrupts = <35 2 36 2 40 2>; + interrupt-parent = <&mpic>; + tbi-handle = <&tbi1>; + phy-handle = <&phy1>; + phy-connection-type = "rgmii-id"; + + mdio@520 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,gianfar-tbi"; + reg = <0x520 0x20>; + + tbi1: tbi-phy@11 { + reg = <0x11>; + device_type = "tbi-phy"; + }; + }; + }; + + enet2: ethernet@26000 { + #address-cells = <1>; + #size-cells = <1>; + cell-index = <2>; + device_type = "network"; + model = "eTSEC"; + compatible = "gianfar"; + reg = <0x26000 0x1000>; + ranges = <0x0 0x26000 0x1000>; + local-mac-address = [ 00 00 00 00 00 00 ]; + interrupts = <31 2 32 2 33 2>; + interrupt-parent = <&mpic>; + tbi-handle = <&tbi2>; + phy-handle = <&phy2>; + phy-connection-type = "rgmii-id"; + + mdio@520 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,gianfar-tbi"; + reg = <0x520 0x20>; + + tbi2: tbi-phy@11 { + reg = <0x11>; + device_type = "tbi-phy"; + }; + }; + }; + + serial0: serial@4500 { + cell-index = <0>; + device_type = "serial"; + compatible = "ns16550"; + reg = <0x4500 0x100>; + clock-frequency = <0>; + interrupts = <42 2>; + interrupt-parent = <&mpic>; + }; + + serial1: serial@4600 { + cell-index = <1>; + device_type = "serial"; + compatible = "ns16550"; + reg = <0x4600 0x100>; + clock-frequency = <0>; + interrupts = <42 2>; + interrupt-parent = <&mpic>; + }; + + global-utilities@e0000 { //global utilities block + compatible = "fsl,p2020-guts"; + reg = <0xe0000 0x1000>; + fsl,has-rstcr; + }; + + msi@41600 { + compatible = "fsl,mpic-msi"; + reg = <0x41600 0x80>; + msi-available-ranges = <0 0x100>; + interrupts = < + 0xe0 0 + 0xe1 0 + 0xe2 0 + 0xe3 0 + 0xe4 0 + 0xe5 0 + 0xe6 0 + 0xe7 0>; + interrupt-parent = <&mpic>; + }; + + crypto@30000 { + compatible = "fsl,sec3.1", "fsl,sec3.0", "fsl,sec2.4", + "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0"; + reg = <0x30000 0x10000>; + interrupts = <45 2 58 2>; + interrupt-parent = <&mpic>; + fsl,num-channels = <4>; + fsl,channel-fifo-len = <24>; + fsl,exec-units-mask = <0xbfe>; + fsl,descriptor-types-mask = <0x3ab0ebf>; + }; + + mpic: pic@40000 { + interrupt-controller; + #address-cells = <0>; + #interrupt-cells = <2>; + reg = <0x40000 0x40000>; + compatible = "chrp,open-pic"; + device_type = "open-pic"; + }; + }; + + pci0: pcie@ffe08000 { + compatible = "fsl,mpc8548-pcie"; + device_type = "pci"; + #interrupt-cells = <1>; + #size-cells = <2>; + #address-cells = <3>; + reg = <0 0xffe08000 0 0x1000>; + bus-range = <0 255>; + ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000 + 0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>; + clock-frequency = <33333333>; + interrupt-parent = <&mpic>; + interrupts = <24 2>; + interrupt-map-mask = <0xf800 0x0 0x0 0x7>; + interrupt-map = < + /* IDSEL 0x0 */ + 0000 0x0 0x0 0x1 &mpic 0x8 0x1 + 0000 0x0 0x0 0x2 &mpic 0x9 0x1 + 0000 0x0 0x0 0x3 &mpic 0xa 0x1 + 0000 0x0 0x0 0x4 &mpic 0xb 0x1 + >; + pcie@0 { + reg = <0x0 0x0 0x0 0x0 0x0>; + #size-cells = <2>; + #address-cells = <3>; + device_type = "pci"; + ranges = <0x2000000 0x0 0x80000000 + 0x2000000 0x0 0x80000000 + 0x0 0x20000000 + + 0x1000000 0x0 0x0 + 0x1000000 0x0 0x0 + 0x0 0x10000>; + }; + }; + + pci1: pcie@ffe09000 { + compatible = "fsl,mpc8548-pcie"; + device_type = "pci"; + #interrupt-cells = <1>; + #size-cells = <2>; + #address-cells = <3>; + reg = <0 0xffe09000 0 0x1000>; + bus-range = <0 255>; + ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000 + 0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>; + clock-frequency = <33333333>; + interrupt-parent = <&mpic>; + interrupts = <25 2>; + interrupt-map-mask = <0xff00 0x0 0x0 0x7>; + interrupt-map = < + + // IDSEL 0x11 func 0 - PCI slot 1 + 0x8800 0x0 0x0 0x1 &i8259 0x9 0x2 + 0x8800 0x0 0x0 0x2 &i8259 0xa 0x2 + + // IDSEL 0x11 func 1 - PCI slot 1 + 0x8900 0x0 0x0 0x1 &i8259 0x9 0x2 + 0x8900 0x0 0x0 0x2 &i8259 0xa 0x2 + + // IDSEL 0x11 func 2 - PCI slot 1 + 0x8a00 0x0 0x0 0x1 &i8259 0x9 0x2 + 0x8a00 0x0 0x0 0x2 &i8259 0xa 0x2 + + // IDSEL 0x11 func 3 - PCI slot 1 + 0x8b00 0x0 0x0 0x1 &i8259 0x9 0x2 + 0x8b00 0x0 0x0 0x2 &i8259 0xa 0x2 + + // IDSEL 0x11 func 4 - PCI slot 1 + 0x8c00 0x0 0x0 0x1 &i8259 0x9 0x2 + 0x8c00 0x0 0x0 0x2 &i8259 0xa 0x2 + + // IDSEL 0x11 func 5 - PCI slot 1 + 0x8d00 0x0 0x0 0x1 &i8259 0x9 0x2 + 0x8d00 0x0 0x0 0x2 &i8259 0xa 0x2 + + // IDSEL 0x11 func 6 - PCI slot 1 + 0x8e00 0x0 0x0 0x1 &i8259 0x9 0x2 + 0x8e00 0x0 0x0 0x2 &i8259 0xa 0x2 + + // IDSEL 0x11 func 7 - PCI slot 1 + 0x8f00 0x0 0x0 0x1 &i8259 0x9 0x2 + 0x8f00 0x0 0x0 0x2 &i8259 0xa 0x2 + + // IDSEL 0x1d Audio + 0xe800 0x0 0x0 0x1 &i8259 0x6 0x2 + + // IDSEL 0x1e Legacy + 0xf000 0x0 0x0 0x1 &i8259 0x7 0x2 + 0xf100 0x0 0x0 0x1 &i8259 0x7 0x2 + + // IDSEL 0x1f IDE/SATA + 0xf800 0x0 0x0 0x1 &i8259 0xe 0x2 + 0xf900 0x0 0x0 0x1 &i8259 0x5 0x2 + >; + + pcie@0 { + reg = <0x0 0x0 0x0 0x0 0x0>; + #size-cells = <2>; + #address-cells = <3>; + device_type = "pci"; + ranges = <0x2000000 0x0 0xa0000000 + 0x2000000 0x0 0xa0000000 + 0x0 0x20000000 + + 0x1000000 0x0 0x0 + 0x1000000 0x0 0x0 + 0x0 0x10000>; + uli1575@0 { + reg = <0x0 0x0 0x0 0x0 0x0>; + #size-cells = <2>; + #address-cells = <3>; + ranges = <0x2000000 0x0 0xa0000000 + 0x2000000 0x0 0xa0000000 + 0x0 0x20000000 + + 0x1000000 0x0 0x0 + 0x1000000 0x0 0x0 + 0x0 0x10000>; + isa@1e { + device_type = "isa"; + #interrupt-cells = <2>; + #size-cells = <1>; + #address-cells = <2>; + reg = <0xf000 0x0 0x0 0x0 0x0>; + ranges = <0x1 0x0 0x1000000 0x0 0x0 + 0x1000>; + interrupt-parent = <&i8259>; + + i8259: interrupt-controller@20 { + reg = <0x1 0x20 0x2 + 0x1 0xa0 0x2 + 0x1 0x4d0 0x2>; + interrupt-controller; + device_type = "interrupt-controller"; + #address-cells = <0>; + #interrupt-cells = <2>; + compatible = "chrp,iic"; + interrupts = <4 1>; + interrupt-parent = <&mpic>; + }; + + i8042@60 { + #size-cells = <0>; + #address-cells = <1>; + reg = <0x1 0x60 0x1 0x1 0x64 0x1>; + interrupts = <1 3 12 3>; + interrupt-parent = + <&i8259>; + + keyboard@0 { + reg = <0x0>; + compatible = "pnpPNP,303"; + }; + + mouse@1 { + reg = <0x1>; + compatible = "pnpPNP,f03"; + }; + }; + + rtc@70 { + compatible = "pnpPNP,b00"; + reg = <0x1 0x70 0x2>; + }; + + gpio@400 { + reg = <0x1 0x400 0x80>; + }; + }; + }; + }; + + }; + + pci2: pcie@ffe0a000 { + compatible = "fsl,mpc8548-pcie"; + device_type = "pci"; + #interrupt-cells = <1>; + #size-cells = <2>; + #address-cells = <3>; + reg = <0 0xffe0a000 0 0x1000>; + bus-range = <0 255>; + ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000 + 0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x10000>; + clock-frequency = <33333333>; + interrupt-parent = <&mpic>; + interrupts = <26 2>; + interrupt-map-mask = <0xf800 0x0 0x0 0x7>; + interrupt-map = < + /* IDSEL 0x0 */ + 0000 0x0 0x0 0x1 &mpic 0x0 0x1 + 0000 0x0 0x0 0x2 &mpic 0x1 0x1 + 0000 0x0 0x0 0x3 &mpic 0x2 0x1 + 0000 0x0 0x0 0x4 &mpic 0x3 0x1 + >; + pcie@0 { + reg = <0x0 0x0 0x0 0x0 0x0>; + #size-cells = <2>; + #address-cells = <3>; + device_type = "pci"; + ranges = <0x2000000 0x0 0xc0000000 + 0x2000000 0x0 0xc0000000 + 0x0 0x20000000 + + 0x1000000 0x0 0x0 + 0x1000000 0x0 0x0 + 0x0 0x10000>; + }; + }; +};
arch/powerpc/platforms/85xx/mpc85xx_ds.c +34 -1
@@ -163,7 +163,8 @@ static void __init mpc85xx_ds_setup_arch(void)#ifdef CONFIG_PCI for_each_node_by_type (np,"pci" ) {if (of_device_is_compatible (np,"fsl,mpc8540-pci" ) || -of_device_is_compatible (np,"fsl,mpc8548-pcie" )) { +of_device_is_compatible (np,"fsl,mpc8548-pcie" ) || +of_device_is_compatible (np,"fsl,p2020-pcie" )) {struct resource rsrc;of_address_to_resource (np,0 , &rsrc);if ((rsrc.start &0xfffff ) == primary_phb_addr)
@@ -214,6 +215,7 @@ static int __init mpc85xxds_publish_devices(void) }machine_device_initcall (mpc8544_ds, mpc85xxds_publish_devices);machine_device_initcall (mpc8572_ds, mpc85xxds_publish_devices); +machine_device_initcall (p2020_ds, mpc85xxds_publish_devices);/* * Called very early, device-tree isn't unflattened
@@ -232,6 +234,23 @@ static int __init mpc8572_ds_probe(void) } } +/* +* Called very early, device-tree isn't unflattened +*/ +static int __init p2020_ds_probe (void ) +{ +unsigned long root =of_get_flat_dt_root (); + +if (of_flat_dt_is_compatible (root,"fsl,P2020DS" )) { +#ifdef CONFIG_PCI + primary_phb_addr =0x9000 ; +#endif +return 1 ; + }else { +return 0 ; + } +} +define_machine (mpc8544_ds) { .name = "MPC8544 DS", .probe = mpc8544_ds_probe,
@@ -259,3 +278,17 @@ define_machine(mpc8572_ds) { .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, }; + +define_machine (p2020_ds) { + .name = "P2020 DS", + .probe = p2020_ds_probe, + .setup_arch = mpc85xx_ds_setup_arch, + .init_IRQ = mpc85xx_ds_pic_init, +#ifdef CONFIG_PCI + .pcibios_fixup_bus = fsl_pcibios_fixup_bus, +#endif + .get_irq = mpic_get_irq, + .restart = fsl_rstcr_restart, + .calibrate_decr = generic_calibrate_decr, + .progress = udbg_progress, +};
arch/powerpc/platforms/fsl_uli1575.c +1 -0
@@ -55,6 +55,7 @@ static inline bool is_quirk_valid(void) {return (machine_is (mpc86xx_hpcn) ||machine_is (mpc8544_ds) || +machine_is (p2020_ds) || machine_is(mpc8572_ds)) }
arch/powerpc/sysdev/fsl_pci.c +2 -0
@@ -296,6 +296,8 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8536, quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8641 , quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8641D , quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8610 , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P2020E , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P2020 , quirk_fsl_pcie_header);#endif /* CONFIG_PPC_85xx || CONFIG_PPC_86xx */ #if defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_MPC512x)
include/linux/pci_ids.h +2 -0
@@ -2286,6 +2286,8 @@#define PCI_DEVICE_ID_MPC8572 0x0041#define PCI_DEVICE_ID_MPC8536E 0x0050#define PCI_DEVICE_ID_MPC8536 0x0051 +#define PCI_DEVICE_ID_P2020E 0x0070 +#define PCI_DEVICE_ID_P2020 0x0071#define PCI_DEVICE_ID_MPC8641 0x7010#define PCI_DEVICE_ID_MPC8641D 0x7011#define PCI_DEVICE_ID_MPC8610 0x7018
Signature · 1 line
1.6.0.6
Review
Quoted 8 lines
(quoted diff) +8
-0+ L2: l2-cache-controller@20000 { + compatible =3D "fsl,p2020-l2-cache-controller"; + reg =3D <0x20000 0x1000>; + cache-line-size =3D <32>; // 32 bytes + cache-size =3D <0x100000>; // L2, 1M + interrupt-parent =3D <&mpic>; + interrupts =3D <16 2>; + };
One nit --here should be 512KB L2 cache
Review
Quoted 9 lines
(quoted diff) +9
-0+ usb@22000 { + #address-cells =3D <1>; + #size-cells =3D <0>; + compatible =3D "fsl-usb2-mph"; + reg =3D <0x22000 0x1000>; + interrupt-parent =3D <&mpic>; + interrupts =3D <28 0x2>; + phy_type =3D "ulpi"; + };
It should be "fsl-usb2-dr"
arch/powerpc/boot/dts/p2020ds.dts line 54
Quoted 4 lines · Kumar Gala
arch/powerpc/boot/dts/p2020ds.dts new file +4
-0+ localbus@ffe05000 { + #address-cells = <2>; + #size-cells = <1>; + compatible = "fsl,elbc", "simple-bus";
If this has an elbc more recent than 1.0 (looks like it), we should indicate that here.
arch/powerpc/boot/dts/p2020ds.dts line 166
Quoted 1 line
arch/powerpc/boot/dts/p2020ds.dts new file +1
-0+ reg = <0 0xffe00000 0 0x1000>; // CCSRBAR & soc regs, remove once parse code for immrbase fixed
The immrbase code was fixed a long time ago -- this can go away.
arch/powerpc/platforms/85xx/mpc85xx_ds.c static int __init mpc8572_ds_probe(void) · line 252
Quoted 13 lines
arch/powerpc/platforms/85xx/mpc85xx_ds.c +13
-0+static int __init p2020_ds_probe (void ) +{ +unsigned long root =of_get_flat_dt_root (); + +if (of_flat_dt_is_compatible (root,"fsl,P2020DS" )) { +#ifdef CONFIG_PCI + primary_phb_addr =0x9000 ; +#endif +return 1 ; + }else { +return 0 ; + } +}
Unnecessary "else".
-Scott
Quoted 8 lines · Scott Wood
arch/powerpc/boot/dts/p2020ds.dts line 54
Quoted 4 lines · Kumar Gala
arch/powerpc/boot/dts/p2020ds.dts new file +4
-0+ localbus@ffe05000 { + #address-cells = <2>; + #size-cells = <1>; + compatible = "fsl,elbc", "simple-bus";If this has an elbc more recent than 1.0 (looks like it), we should indicate that here.
that might be the case, but I leave it to u-boot to do that.
Quoted 4 lines
Quoted 2 lines
(quoted diff) +1
-0+ reg = <0 0xffe00000 0 0x1000>; // CCSRBAR & soc regs, removeonce parse code for immrbase fixed
The immrbase code was fixed a long time ago -- this can go away.
will remove
Quoted 7 lines
Quoted 7 lines
arch/powerpc/platforms/85xx/mpc85xx_ds.c +7
-0+static int __init p2020_ds_probe (void ) +{ +unsigned long root =of_get_flat_dt_root (); + +if (of_flat_dt_is_compatible (root,"fsl,P2020DS" )) { +#ifdef CONFIG_PCI + primary_phb_addr =0x9000 ;
Quoted 8 lines
arch/powerpc/platforms/85xx/mpc85xx_ds.c static int __init mpc8572_ds_probe(void) · line 252
Quoted 6 lines
arch/powerpc/platforms/85xx/mpc85xx_ds.c +6
-0+#endif +return 1 ; + }else { +return 0 ; + } +}Unnecessary "else".
will fix this and the 2 other cases it shows up on.
- k
Quoted 4 lines · Kumar Gala
Quoted 2 lines
If this has an elbc more recent than 1.0 (looks like it), we should indicate that here.
that might be the case, but I leave it to u-boot to do that.
Why? There's no p2020 with an older eLBC, and there's no block version register.
-Scott
Quoted 6 lines · Scott Wood
Quoted 3 lines · Kumar Gala
Quoted 2 lines
If this has an elbc more recent than 1.0 (looks like it), we should indicate that here.
that might be the case, but I leave it to u-boot to do that.
Why? There's no p2020 with an older eLBC, and there's no block version register.
But there might be a p2020 w/a newer eLBC version in the future.
- k
Quoted 11 lines · Kumar Gala
Quoted 6 lines · Scott Wood
Quoted 3 lines · Kumar Gala
Quoted 2 lines
If this has an elbc more recent than 1.0 (looks like it), we should indicate that here.
that might be the case, but I leave it to u-boot to do that.
Why? There's no p2020 with an older eLBC, and there's no block version register.
But there might be a p2020 w/a newer eLBC version in the future.
At which point we can add something to u-boot -- but magic SVR tables seem a step backward from the dts except where needed to avoid the creation of extra dts files.
-Scott
Quoted 11 lines · Scott Wood
Quoted 8 lines · Kumar Gala
Quoted 6 lines · Scott Wood
Quoted 3 lines · Kumar Gala
Quoted 2 lines
If this has an elbc more recent than 1.0 (looks like it), we should indicate that here.
that might be the case, but I leave it to u-boot to do that.
Why? There's no p2020 with an older eLBC, and there's no block version register.
But there might be a p2020 w/a newer eLBC version in the future.
At which point we can add something to u-boot -- but magic SVR tables seem a step backward from the dts except where needed to avoid the creation of extra dts files.
I don't see the value of complicating u-boot to have to parse and "fixup" the compatible instead of just having to prepend to it. Especially since I don't believe there is anything specific we care about in the 1.2 version of elbc at this point.
- k
Quoted 8 lines · Kumar Gala
Quoted 5 lines · Scott Wood
Quoted 4 lines · Kumar Gala
Quoted 3 lines · Scott Wood
Quoted 2 lines · Kumar Gala
Quoted 2 lines
If this has an elbc more recent than 1.0 (looks like it), we should indicate that here.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Quoted 3 lines
Quoted 1 line
that might be the case, but I leave it to u-boot to do that.
Why? There's no p2020 with an older eLBC, and there's no block version register.
But there might be a p2020 w/a newer eLBC version in the future.
At which point we can add something to u-boot -- but magic SVR tables seem a step backward from the dts except where needed to avoid the creation of extra dts files.
I don't see the value of complicating u-boot
But complicating u-boot is just what you're suggesting. Put it in the dts, and u-boot has *zero* code to deal with this unless we find ourselves wanting to share the dts with another board rev with a newer chip with a newer elbc.
Quoted 1 line
to have to parse and "fixup" the compatible instead of just having to prepend to it. Especially since I don't believe there is anything specific we care about in the 1.2 version of elbc at this point.
If the new elbc is compatible with the current one, then you will still just be prepending. If it is not, then it very likely isn't compatible with 1.0 either, so you'll have to remove fsl,elbc anyway.
What "we care about" at this point is irrelevant, given the PITA it would be to change the device trees (or u-boot) that are already in use once we do begin to care.
-Scott
Quoted 15 lines · Scott Wood
Quoted 6 lines · Kumar Gala
Quoted 5 lines · Scott Wood
Quoted 4 lines · Kumar Gala
Quoted 3 lines · Scott Wood
Quoted 2 lines · Kumar Gala
Quoted 2 lines
If this has an elbc more recent than 1.0 (looks like it), we should indicate that here.
Quoted 7 lines
Quoted 6 lines
Quoted 4 lines
Quoted 3 lines
Quoted 1 line
that might be the case, but I leave it to u-boot to do that.
Why? There's no p2020 with an older eLBC, and there's no block version register.
But there might be a p2020 w/a newer eLBC version in the future.
At which point we can add something to u-boot -- but magic SVR tables seem a step backward from the dts except where needed to avoid the creation of extra dts files.
I don't see the value of complicating u-boot
Quoted 7 lines
But complicating u-boot is just what you're suggesting. Put it in the dts, and u-boot has *zero* code to deal with this unless we find ourselves wanting to share the dts with another board rev with a newer chip with a newer elbc.
Quoted 1 line
to have to parse and "fixup" the compatible instead of just having to prepend to it. Especially since I don't believe there is anything specific we care about in the 1.2 version of elbc at this point.
If the new elbc is compatible with the current one, then you will still just be prepending. If it is not, then it very likely isn't compatible with 1.0 either, so you'll have to remove fsl,elbc anyway.
What "we care about" at this point is irrelevant, given the PITA it would be to change the device trees (or u-boot) that are already in use once we do begin to care.
Which is exactly why I didn't put it in the .dts right now. Today we know NO code exists that cares about "fsl,elbc-1.2". Once someone adds such code they can also update the .dts to match it.
- k
Quoted 3 lines · Kumar Gala
Quoted 1 line
What "we care about" at this point is irrelevant, given the PITA it would be to change the device trees (or u-boot) that are already in use once we do begin to care.
Which is exactly why I didn't put it in the .dts right now.
???
Quoted 1 line
Today we know NO code exists that cares about "fsl,elbc-1.2". Once someone adds such code they can also update the .dts to match it.
DTS files and firmware are *MUCH* harder to update once they're out there than the kernel. Why such opposition to using an appropriate compatible?
Is there anything in the p2020ds u-boot patches to set the elbc version, or was that just a brush-off?
-Scott
Quoted 9 lines · Scott Wood
Quoted 2 lines · Kumar Gala
Quoted 1 line
What "we care about" at this point is irrelevant, given the PITA it would be to change the device trees (or u-boot) that are already in use once we do begin to care.
Which is exactly why I didn't put it in the .dts right now.
???
Quoted 1 line
Today we know NO code exists that cares about "fsl,elbc-1.2". Once someone adds such code they can also update the .dts to match it.
DTS files and firmware are *MUCH* harder to update once they're out there than the kernel. Why such opposition to using an appropriate compatible?
Because I want to avoid make the decision right now. We are on rev1.x silicon and I want to avoid greatly having to spawn a new .dts just for "fsl,elbc-1.2.1" that has some errata fix in it. If dtc was smarter and I had less duplication between the 40-50 .dts we have for our various parts I wouldn't care that match.
Quoted 1 line
Is there anything in the p2020ds u-boot patches to set the elbc version, or was that just a brush-off?
I was hoping that Poonam would look at doing that, but there isn't anything right now.
I can put out some code for u-boot to address the specific elbc issue if that will resolve this.
- k