This device-tree pxa update brings :
- fix pxa3xx MMC bindings - add pxa3xx GPIOs - add pxa3xx missing pin controller -----BEGIN PGP SIGNATURE----- iQJLBAABCAA1FiEExgkueSa0u8n4Ls+HA/Z63R24yxIFAlsIfykXHHJvYmVydC5q YXJ6bWlrQGZyZWUuZnIACgkQA/Z63R24yxLcVg//WRbgX91qcpqmXpzgysAU7YT6 F0mQwqt3IOWa6XUcckZKdPvl7pdLSj13yCBp/uvNi2rqSX2AydV+7p9Lz3HiXclT v/caYVIG1p8/idhpJy3vmiWmIcRArJm8pbDlzx1ywXEk3X6hX+j5vXsNFA6KW2qX YKOQT223mCrEAWL6rVuAT3/EIJ3NpuYdt6ChyzOsg7Kip9tJSplTlX6qIyBoQDKZ u5cakdX2818p9rd1fIX0Di7aGmS53euWUmAuQ0j3R2XgKKPPMMadWPDgH0w20FML Xjovvi1GWzFZYN1teJtqS7wUuyysKsQ0cReXzt2xAByTWraGVwm+g6I0TlnmI5c7 86JztT+/pd/YCppc+QBxtMogSjzmu79ax6A4bXIEh7Xpz/HBG1qL82ukE9nkW2AF EnTNKuA6sMR3EsKMwPf0lP1eFQIouUCmpKdjBSs3s4vAP1FSQoVRoOyNIuPFoaA/ KhAxBw1GPMSwAhCFQYS5xsLdv8H7xOt1ZYK3xBuyG2J4UzgCrAPxIltAg2LOHncz UKcC+sOBjeirC1rjyGcPXSAdz1lz+8oppJF87/ckVebcGhgZCvlng5JtLXtocPAG NEeG0FRLm5myCeiOuyXeBo1s06JOFkr1gS89tHHOUFYyt73w00qCcagNOg8/ODA9 /gh2mhBEcRj46SE8tSQ= =xfWX -----END PGP SIGNATURE----- Merge tag 'pxa-dt-4.18' of https://github.com/rjarzmik/linux into next/dt This device-tree pxa update brings : - fix pxa3xx MMC bindings - add pxa3xx GPIOs - add pxa3xx missing pin controller * tag 'pxa-dt-4.18' of https://github.com/rjarzmik/linux: ARM: dts: pxa3xx: fix MMC clocks ARM: pxa: dts: add pin definitions for extended GPIOs ARM: pxa: dts: add gpio-ranges to gpio controller Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Коммит
87815dda55
|
@ -8,6 +8,10 @@
|
|||
(gpio <= 98) ? (0x0400 + 4 * (gpio - 27)) : \
|
||||
(gpio <= 127) ? (0x0600 + 4 * (gpio - 99)) : \
|
||||
0)
|
||||
#define MFP_PIN_PXA300_2(gpio) \
|
||||
((gpio <= 1) ? (0x674 + 4 * gpio) : \
|
||||
(gpio <= 6) ? (0x2dc + 4 * gpio) : \
|
||||
0)
|
||||
|
||||
#define MFP_PIN_PXA310(gpio) \
|
||||
((gpio <= 2) ? (0x00b4 + 4 * gpio) : \
|
||||
|
@ -18,6 +22,11 @@
|
|||
(gpio <= 262) ? 0 : \
|
||||
(gpio <= 268) ? (0x052c + 4 * (gpio - 263)) : \
|
||||
0)
|
||||
#define MFP_PIN_PXA310_2(gpio) \
|
||||
((gpio <= 1) ? (0x674 + 4 * gpio) : \
|
||||
(gpio <= 6) ? (0x2dc + 4 * gpio) : \
|
||||
(gpio <= 10) ? (0x52c + 4 * gpio) : \
|
||||
0)
|
||||
|
||||
#define MFP_PIN_PXA320(gpio) \
|
||||
((gpio <= 4) ? (0x0124 + 4 * gpio) : \
|
||||
|
@ -30,6 +39,10 @@
|
|||
(gpio <= 98) ? (0x04f0 + 4 * (gpio - 74)) : \
|
||||
(gpio <= 127) ? (0x0600 + 4 * (gpio - 99)) : \
|
||||
0)
|
||||
#define MFP_PIN_PXA320_2(gpio) \
|
||||
((gpio <= 3) ? (0x674 + 4 * gpio) : \
|
||||
(gpio <= 5) ? (0x284 + 4 * gpio) : \
|
||||
0)
|
||||
|
||||
/*
|
||||
* MFP Alternate functions for pins having a gpio.
|
||||
|
@ -148,6 +161,7 @@
|
|||
compatible = "intel,pxa3xx-gpio";
|
||||
reg = <0x40e00000 0x10000>;
|
||||
clocks = <&clks CLK_GPIO>;
|
||||
gpio-ranges = <&pinctrl 0 0 128>;
|
||||
interrupt-names = "gpio0", "gpio1", "gpio_mux";
|
||||
interrupts = <8 9 10>;
|
||||
gpio-controller;
|
||||
|
@ -160,7 +174,7 @@
|
|||
compatible = "marvell,pxa-mmc";
|
||||
reg = <0x41100000 0x1000>;
|
||||
interrupts = <23>;
|
||||
clocks = <&clks CLK_MMC>;
|
||||
clocks = <&clks CLK_MMC1>;
|
||||
dmas = <&pdma 21 3
|
||||
&pdma 22 3>;
|
||||
dma-names = "rx", "tx";
|
||||
|
@ -171,7 +185,7 @@
|
|||
compatible = "marvell,pxa-mmc";
|
||||
reg = <0x42000000 0x1000>;
|
||||
interrupts = <41>;
|
||||
clocks = <&clks CLK_MMC1>;
|
||||
clocks = <&clks CLK_MMC2>;
|
||||
dmas = <&pdma 93 3
|
||||
&pdma 94 3>;
|
||||
dma-names = "rx", "tx";
|
||||
|
@ -182,7 +196,7 @@
|
|||
compatible = "marvell,pxa-mmc";
|
||||
reg = <0x42500000 0x1000>;
|
||||
interrupts = <55>;
|
||||
clocks = <&clks CLK_MMC2>;
|
||||
clocks = <&clks CLK_MMC3>;
|
||||
dmas = <&pdma 46 3
|
||||
&pdma 47 3>;
|
||||
dma-names = "rx", "tx";
|
||||
|
|
Загрузка…
Ссылка в новой задаче