hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IXP4xx DTS changes for the v5.16 kernel: 

- Add the PTP timesource
 
 - Push down PCI interrupt properties to the individual
   board files.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAmFvY+IACgkQQRCzN7AZ
 XXOsEg//Re3tlHYjuOR/p2tBvXkq0vzW1SynOAjtPc2aW4f6fj3Eu/7UjEuVixw8
 afVI4fd0MCXaeMVqJ2nyfZO/fFH93F5aZb6HI/uO5nxcoI6J8yo04QVkerXbqwyp
 te+VJQ3yH/hCTF84ahl32P/dLd4W2UhvBHzKWOEdhu2ZqXz9Pe4AMgl0/sXpU7Ym
 wzTmKbbl/dy1IkamYpDiSeBM09+XwH3SmaaZCvZ4IJpvw8jjHlpP6F02/4Rc5kOb
 thoAtpuvVFkSeTsZLTwmlf90Zno9VA0wkm/7oM6cAZWzB54lk7V2Z2ybaNXJw/73
 aTPmDliqTsdb/IBNj57O9+xBbFsmID9bvaH3+n214wYng7O5OatkvjM1zBNEKBCZ
 TIee4OPx3ghFIKrEjcQgRmQ4lGNHYPrtAwunLP8RK9DkrlxKvxNTVbN0wy5Blpfc
 vCO0Mmuu4srHlZ6FJmUXzcMuD2Pfb/+GNt+I7Irr/OFn2s/EjQzqoToKcjIPc1R3
 jrAF4+zJqRbg+juNa4h/3W6/4k04ZTU5HXmAGrXHVD4Am3y5Ig5f+TtekBB37uqJ
 tq3RsqKzTzD0JuNNqXXCFkOaPGiTGPWVCEa+fVazIFyaza50Oikj7mdzi08sQmur
 E+UkGkNW0+nM9VRe4pkBxPVnM1PxO2Me/wQO3h9gjaqLRluGC4A=
 =lM/f
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFwGt8ACgkQmmx57+YA
 GNkumhAAouY1VSZvY9b11OAOIWQxvBy3kiuybhbD1HxuwlCHVcvnwZi6seYmEAnv
 gHa18GBrN+HfXeiG6gwTDenUd4RdxmXKhekCobFm5D2s9cuRTl5E15fQqOdxHLwk
 glh8u3EbRImIAfpU2UlCRqVtG8dTJyrHdPtLezj6xJnLncY87rk85Na7CeRHYohb
 pSbWlRvK+qLsvKk061WiPFWj54FOyew0671gFx9EgcUdJCPcxLfmnAJHt0BBpKOI
 uTjqWiHUqqTSs5mXnoyvN9YdevjGYktuLx1NRYAAeOd+gQlpmM7vS2LfLkZW+hfu
 d+uebfBDIfDVW192YoK8DTY1qWiGQvhiI0C4td23W3x4QIT84eRlquyvM3HnMXhv
 tLcG06RnljJnRKgKFLkA6gMW/vPh6h60/NNgH3u8JDKbGXglCczYNh0dsMIGE5dg
 xC4EoPXxfhZQpNnjIfTyL3fe2NMdS69cHjwG9jCOect5raMMD2BLW8dSbSxNdXxk
 m+g9yR51WufMfD6rLq1L6GnHKbUdNUezCQlHeHYxIi2a10lAa49Kto0fr2Ad9LVK
 +xWZPRLGlitjD1HOFDtvxN3T1ZdUG5oe3Ya2VGBI3yaqp+NtIyCmz5y9V2x4jCR+
 plSktTIEr9kzDlKXj17uwK8dee4QUbzjejTCJY3g57ZDQROL5TY=
 =1tkn
 -----END PGP SIGNATURE-----

Merge tag 'ixp4xx-dts-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt

IXP4xx DTS changes for the v5.16 kernel:

- Add the PTP timesource

- Push down PCI interrupt properties to the individual
  board files.

* tag 'ixp4xx-dts-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: ixp4xx: Group PCI interrupt properties together
  ARM: dts: Add PTP timesource to the IXP456x

Link: https://lore.kernel.org/r/CACRpkdbSJ662h_B9mAGdXWBeq8ZwKTQvSJ7cZ2x2d8UgELP5QA@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-10-20 15:34:21 +02:00
parent b4ebc083a3 3e70cee46c
commit 804565cd99
14 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/intel-ixp42x-adi-coyote.dts
View File

@ -63,6 +63,8 @@
* We have slots (IDSEL) 1 and 2 with one assigned IRQ
* each handling all IRQs.
*/
#interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map =
/* IDSEL 1 */
<0x0800 0 0 1 &gpio0 6 IRQ_TYPE_LEVEL_LOW>, /* INT A on slot 1 is irq 6 */

2
arch/arm/boot/dts/intel-ixp42x-arcom-vulcan.dts
View File

@ -120,6 +120,8 @@
* We have 2 slots (IDSEL) 1 and 2 with one dedicated interrupt
* per slot. This interrupt is shared (OR:ed) by all four pins.
*/
#interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map =
/* IDSEL 1 */
<0x0800 0 0 1 &gpio0 2 IRQ_TYPE_LEVEL_LOW>, /* INT A on slot 1 is irq 2 */

2
arch/arm/boot/dts/intel-ixp42x-dlink-dsm-g600.dts
View File

@ -129,6 +129,8 @@
* We have slots (IDSEL) 1, 2, 3, 4 and pins 1, 2 and 3.
* Only slot 3 have three IRQs.
*/
#interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map =
/* IDSEL 1 */
<0x0800 0 0 1 &gpio0 7 IRQ_TYPE_LEVEL_LOW>, /* INT E on slot 1 is irq 7 */

2
arch/arm/boot/dts/intel-ixp42x-freecom-fsg-3.dts
View File

@ -106,6 +106,8 @@
* Written based on the FSG-3 PCI boardfile.
* We have slots 12, 13 & 14 (IDSEL) with one IRQ each.
*/
#interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map =
/* IDSEL 12 */
<0x6000 0 0 1 &gpio0 5 IRQ_TYPE_LEVEL_LOW>, /* INT A on slot 12 is irq 5 */

2
arch/arm/boot/dts/intel-ixp42x-gateworks-gw2348.dts
View File

@ -115,6 +115,8 @@
*
* We have up to 4 slots (IDSEL) with 4 swizzled IRQs.
*/
#interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map =
/* IDSEL 1 */
<0x0800 0 0 1 &gpio0 11 IRQ_TYPE_LEVEL_LOW>, /* INT A on slot 1 is irq 11 */

2
arch/arm/boot/dts/intel-ixp42x-iomega-nas100d.dts
View File

@ -115,6 +115,8 @@
* Taken from NAS 100D PCI boardfile (nas100d-pci.c)
* We have slots (IDSEL) 1, 2 and 3 and pins 1, 2 and 3.
*/
#interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map =
/* IDSEL 1 */
<0x0800 0 0 1 &gpio0 11 IRQ_TYPE_LEVEL_LOW>, /* INT A on slot 1 is irq 11 */

2
arch/arm/boot/dts/intel-ixp42x-ixdpg425.dts
View File

@ -68,6 +68,8 @@
* We have slots (IDSEL) 12, 13 and 14 with one assigned IRQ
* for 12 & 13 and one for 14.
*/
#interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map =
/* IDSEL 12 */
<0x6000 0 0 1 &gpio0 7 IRQ_TYPE_LEVEL_LOW>, /* INT A on slot 12 is irq 7 */

2
arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts
View File

@ -122,6 +122,8 @@
* Taken from NSLU2 PCI boardfile, INT A, B, C swizzled D constant
* We have slots (IDSEL) 1, 2 and 3.
*/
#interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map =
/* IDSEL 1 */
<0x0800 0 0 1 &gpio0 11 IRQ_TYPE_LEVEL_LOW>, /* INT A on slot 1 is irq 11 */

2
arch/arm/boot/dts/intel-ixp42x-linksys-wrv54g.dts
View File

@ -123,6 +123,8 @@
* We have up to 2 slots (IDSEL) with 2 swizzled IRQs.
* Derived from the GTWX5715 PCI boardfile.
*/
#interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map =
/* IDSEL 0 */
<0x0000 0 0 1 &gpio0 10 IRQ_TYPE_LEVEL_LOW>, /* INT A on slot 0 is irq 10 */

2
arch/arm/boot/dts/intel-ixp42x-netgear-wg302v2.dts
View File

@ -62,6 +62,8 @@
* We have slots (IDSEL) 1 and 2 with one assigned IRQ
* each handling all IRQs.
*/
#interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map =
/* IDSEL 1 */
<0x0800 0 0 1 &gpio0 8 IRQ_TYPE_LEVEL_LOW>, /* INT A on slot 1 is irq 8 */

2
arch/arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts
View File

@ -131,6 +131,8 @@
* have instead assumed that they are rotated (swizzled) like
* this with 11, 10, 9, 8 for the 4 pins on IDSEL 1 etc.
*/
#interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map =
/* IDSEL 1 */
<0x0800 0 0 1 &gpio0 11 IRQ_TYPE_LEVEL_LOW>, /* INT A on slot 1 is irq 11 */

8
arch/arm/boot/dts/intel-ixp45x-ixp46x.dtsi
View File

@ -74,5 +74,13 @@
queue-rx = <&qmgr 0>;
queue-txready = <&qmgr 0>;
};
ptp-timer@c8010000 {
compatible = "intel,ixp46x-ptp-timer";
reg = <0xc8010000 0x1000>;
interrupt-parent = <&gpio0>;
interrupts = <8 IRQ_TYPE_EDGE_FALLING>, <7 IRQ_TYPE_EDGE_FALLING>;
interrupt-names = "master", "slave";
};
};
};

2
arch/arm/boot/dts/intel-ixp4xx-reference-design.dtsi
View File

@ -106,6 +106,8 @@
* PCI slots on the BIXMB425BD base card.
* We have up to 4 slots (IDSEL) with 4 swizzled IRQs.
*/
#interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map =
/* IDSEL 1 */
<0x0800 0 0 1 &gpio0 11 IRQ_TYPE_LEVEL_LOW>, /* INT A on slot 1 is irq 11 */

2
arch/arm/boot/dts/intel-ixp4xx.dtsi
View File

@ -78,8 +78,6 @@
dma-ranges =
<0x02000000 0 0x00000000 0x00000000 0 0x04000000>;
#interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>;
/* Each unique DTS using PCI must specify the swizzling */
};