powerpc/83xx: mpc836x_mds: add support for USB Host
RFC PATCH 2/2 powerpc/83xx: mpc836x_mds: add support for USB Host
Various changes to support QE USB Host on a MPC8360E-MDS board:
- Update the device tree per QE USB bindings;
- Configure QE Par IO;
- Set up BCSR for both USB Host and Peripheral modes;
- Add timer (GTM) node;
- Add gpio-controller node for BCSR13 bank;
- Select FSL_GTM, QE_GPIO and OF_SIMPLE_GPIO.
The work is loosely based on Li Yang's patch[1], which is used to support peripheral mode only.
[1] http://ozlabs.org/pipermail/linuxppc-dev/2008-August/061357.html
The s-o-b line of the original patch preserved here.
--- arch/powerpc/boot/dts/mpc836x_mds.dts | 44 +++++++++++++++++++++++++++- arch/powerpc/platforms/83xx/Kconfig | 3 ++ arch/powerpc/platforms/83xx/mpc836x_mds.c | 31 +++++++++++++++++++- 3 files changed, 75 insertions(+), 3 deletions(-)
arch/powerpc/boot/dts/mpc836x_mds.dts +42 -2
@@ -69,8 +69,19 @@ }; bcsr@1,0 { + #address-cells = <1>; + #size-cells = <1>; device_type = "board-control"; reg = <1 0 0x8000>; + ranges = <0 1 0 0x8000>; + + bcsr13: gpio-controller@d { + #gpio-cells = <2>; + compatible = "fsl,mpc8360mds-bcsr-gpio", + "simple-gpio-bank"; + reg = <0xd 1>; + gpio-controller; + }; }; };
@@ -191,10 +202,21 @@ }; par_io@1400 { + #address-cells = <1>; + #size-cells = <1>; reg = <0x1400 0x100>; + ranges = <0 0x1400 0x100>; device_type = "par_io"; num-ports = <7>; + qe_pio_b: gpio-controller@18 { + #gpio-cells = <2>; + compatible = "fsl,mpc8360-qe-pario-bank", + "fsl,mpc8323-qe-pario-bank"; + reg = <0x18 0x18>; + gpio-controller; + }; + pio1: ucc_pin@01 { pio-map = < /* port pin dir open_drain assignment has_irq */
@@ -278,6 +300,15 @@ }; }; + timer@440 { + compatible = "fsl,mpc8360-qe-gtm", + "fsl,qe-gtm", "fsl,gtm"; + reg = <0x440 0x40>; + clock-frequency = <132000000>; + interrupts = <12 13 14 15>; + interrupt-parent = <&qeic>; + }; + spi@4c0 { cell-index = <0>; compatible = "fsl,spi";
@@ -297,11 +328,20 @@ }; usb@6c0 { - compatible = "qe_udc"; + compatible = "fsl,mpc8360-qe-usb", + "fsl,mpc8323-qe-usb"; reg = <0x6c0 0x40 0x8b00 0x100>; interrupts = <11>; interrupt-parent = <&qeic>; - mode = "slave"; + fsl,fullspeed-clock = "clk21"; + fsl,lowspeed-clock = "brg9"; + gpios = <&qe_pio_b 2 0 /* USBOE */ + &qe_pio_b 3 0 /* USBTP */ + &qe_pio_b 8 0 /* USBTN */ + &qe_pio_b 9 0 /* USBRP */ + &qe_pio_b 11 0 /* USBRN */ + &bcsr13 5 0 /* SPEED */ + &bcsr13 4 1>; /* POWER */ }; enet0: ucc@2000 {
arch/powerpc/platforms/83xx/Kconfig +3 -0
@@ -58,6 +58,9 @@ config MPC836x_MDS bool "Freescale MPC836x MDS" select DEFAULT_UIMAGE select QUICC_ENGINE + select QE_GPIO + select OF_SIMPLE_GPIO + select FSL_GTM help This option enables support for the MPC836x MDS Processor Board.
arch/powerpc/platforms/83xx/mpc836x_mds.c +30 -1
@@ -127,9 +127,38 @@ static void __init mpc836x_mds_setup_arch(void) iounmap(immap); } -iounmap (bcsr_regs);of_node_put (np); } + + np =of_find_compatible_node (NULL ,NULL ,"fsl,mpc8323-qe-usb" ); +if (np) { +const char *mode =of_get_property (np,"mode" ,NULL ); + +par_io_config_pin (1 ,2 ,1 ,0 ,3 ,0 );/* USBOE */ +par_io_config_pin (1 ,3 ,1 ,0 ,3 ,0 );/* USBTP */ +par_io_config_pin (1 ,8 ,1 ,0 ,1 ,0 );/* USBTN */ +par_io_config_pin (1 ,10 ,2 ,0 ,3 ,0 );/* USBRXD */ +par_io_config_pin (1 ,9 ,2 ,1 ,3 ,0 );/* USBRP */ +par_io_config_pin (1 ,11 ,2 ,1 ,3 ,0 );/* USBRN */ +par_io_config_pin (2 ,20 ,2 ,0 ,1 ,0 );/* CLK21 */ + +#define BCSR13_USBMASK 0x0f +#define BCSR13_nUSBEN 0x08/* 1 - Disable, 0 - Enable */ +#define BCSR13_USBSPEED 0x04/* 1 - Full, 0 - Low */ +#define BCSR13_USBMODE 0x02/* 1 - Host, 0 - Function */ +#define BCSR13_nUSBVCC 0x01/* 1 - gets VBUS, 0 - supplies VBUS */ + +clrsetbits_8 (&bcsr_regs[13 ],BCSR13_USBMASK ,BCSR13_USBSPEED ); + +if (mode && !strcmp (mode,"peripheral" )) +setbits8 (&bcsr_regs[13 ], BCSR13_nUSBVCC); +else +setbits8 (&bcsr_regs[13 ],BCSR13_USBMODE ); + +of_node_put (np); + } + +iounmap (bcsr_regs);#endif /* CONFIG_QUICC_ENGINE */ }
Signature · 1 line
1.5.6.3
Quoted 29 lines · Anton Vorontsov
Various changes to support QE USB Host on a MPC8360E-MDS board:
- Update the device tree per QE USB bindings;
- Configure QE Par IO;
- Set up BCSR for both USB Host and Peripheral modes;
- Add timer (GTM) node;
- Add gpio-controller node for BCSR13 bank;
- SelectFSL_GTM,QE_GPIOandOF_SIMPLE_GPIO.The work is loosely based on Li Yang's patch[1], which is used to support peripheral mode only.
[1] http://ozlabs.org/pipermail/linuxppc-dev/2008-August/061357.html
The s-o-b line of the original patch preserved here.
Signed-off-by Li Yang <[email protected]>Signed-off-by Anton Vorontsov <[email protected]>--- arch/powerpc/boot/dts/mpc836x_mds.dts | 44 +++++++++++++++++++++++++++- arch/powerpc/platforms/83xx/Kconfig | 3 ++ arch/powerpc/platforms/83xx/mpc836x_mds.c | 31 +++++++++++++++++++- 3 files changed, 75 insertions(+), 3 deletions(-)arch/powerpc/boot/dts/mpc836x_mds.dts +0
-0
arch/powerpc/boot/dts/mpc836x_mds.dts line 74
Quoted 6 lines
arch/powerpc/boot/dts/mpc836x_mds.dts +2
-0@@ -69,8 +69,19 @@ }; bcsr@1,0 { + #address-cells = <1>; + #size-cells = <1>; device_type = "board-control";
Not the fault of this patch, obviously, but this device_type should never have been here.
Quoted 14 lines
arch/powerpc/boot/dts/mpc836x_mds.dts +9
-0reg = <1 0 0x8000>; + ranges = <0 1 0 0x8000>; + + bcsr13: gpio-controller@d { + #gpio-cells = <2>; + compatible = "fsl,mpc8360mds-bcsr-gpio", + "simple-gpio-bank"; + reg = <0xd 1>; + gpio-controller; + }; }; };
arch/powerpc/boot/dts/mpc836x_mds.dts line 209
Quoted 8 lines
arch/powerpc/boot/dts/mpc836x_mds.dts +3
-0@@ -191,10 +202,21 @@ }; par_io@1400 { + #address-cells = <1>; + #size-cells = <1>; reg = <0x1400 0x100>; + ranges = <0 0x1400 0x100>; device_type = "par_io";
Nor this one
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
RFC PATCH v2 2/2 powerpc/83xx: mpc836x_mds: add support for USB Host
In reply to Anton VorontsovVarious changes to support QE USB Host on a MPC8360E-MDS board:
- Update the device tree per QE USB bindings;
- Configure QE Par IO;
- Set up BCSR for both USB Host and Peripheral modes;
- Add timer (GTM) node;
- Add gpio-controller node for BCSR13 bank;
- Select FSL_GTM, QE_GPIO and OF_SIMPLE_GPIO.
The work is loosely based on Li Yang's patch[1], which is used to support peripheral mode only.
[1] http://ozlabs.org/pipermail/linuxppc-dev/2008-August/061357.html
The s-o-b line of the original patch preserved here.
---
v2:
- We should bring TSECs to RGMII mode, the hunk was missing.
arch/powerpc/boot/dts/mpc836x_mds.dts | 44 +++++++++++++++++++++++++++- arch/powerpc/platforms/83xx/Kconfig | 3 ++ arch/powerpc/platforms/83xx/mpc836x_mds.c | 43 +++++++++++++++++++++++++++- 3 files changed, 87 insertions(+), 3 deletions(-)
arch/powerpc/boot/dts/mpc836x_mds.dts +42 -2
@@ -69,8 +69,19 @@ }; bcsr@1,0 { + #address-cells = <1>; + #size-cells = <1>; device_type = "board-control"; reg = <1 0 0x8000>; + ranges = <0 1 0 0x8000>; + + bcsr13: gpio-controller@d { + #gpio-cells = <2>; + compatible = "fsl,mpc8360mds-bcsr-gpio", + "simple-gpio-bank"; + reg = <0xd 1>; + gpio-controller; + }; }; };
@@ -191,10 +202,21 @@ }; par_io@1400 { + #address-cells = <1>; + #size-cells = <1>; reg = <0x1400 0x100>; + ranges = <0 0x1400 0x100>; device_type = "par_io"; num-ports = <7>; + qe_pio_b: gpio-controller@18 { + #gpio-cells = <2>; + compatible = "fsl,mpc8360-qe-pario-bank", + "fsl,mpc8323-qe-pario-bank"; + reg = <0x18 0x18>; + gpio-controller; + }; + pio1: ucc_pin@01 { pio-map = < /* port pin dir open_drain assignment has_irq */
@@ -278,6 +300,15 @@ }; }; + timer@440 { + compatible = "fsl,mpc8360-qe-gtm", + "fsl,qe-gtm", "fsl,gtm"; + reg = <0x440 0x40>; + clock-frequency = <132000000>; + interrupts = <12 13 14 15>; + interrupt-parent = <&qeic>; + }; + spi@4c0 { cell-index = <0>; compatible = "fsl,spi";
@@ -297,11 +328,20 @@ }; usb@6c0 { - compatible = "qe_udc"; + compatible = "fsl,mpc8360-qe-usb", + "fsl,mpc8323-qe-usb"; reg = <0x6c0 0x40 0x8b00 0x100>; interrupts = <11>; interrupt-parent = <&qeic>; - mode = "slave"; + fsl,fullspeed-clock = "clk21"; + fsl,lowspeed-clock = "brg9"; + gpios = <&qe_pio_b 2 0 /* USBOE */ + &qe_pio_b 3 0 /* USBTP */ + &qe_pio_b 8 0 /* USBTN */ + &qe_pio_b 9 0 /* USBRP */ + &qe_pio_b 11 0 /* USBRN */ + &bcsr13 5 0 /* SPEED */ + &bcsr13 4 1>; /* POWER */ }; enet0: ucc@2000 {
arch/powerpc/platforms/83xx/Kconfig +3 -0
@@ -58,6 +58,9 @@ config MPC836x_MDS bool "Freescale MPC836x MDS" select DEFAULT_UIMAGE select QUICC_ENGINE + select QE_GPIO + select OF_SIMPLE_GPIO + select FSL_GTM help This option enables support for the MPC836x MDS Processor Board.
arch/powerpc/platforms/83xx/mpc836x_mds.c +42 -1
51 lines not on this page · raw message
Signature · 1 line
1.5.6.3
RE: [RFC PATCH 2/2 v2] powerpc/83xx: mpc836x_mds: add support for USBHost
Quoted 24 lines
-----Original Message-----
From: Anton Vorontsov [mailto:[email protected]]=20
Sent: Monday, September 01, 2008 9:35 PM
To: Kumar Gala
Cc: [email protected]; Li Yang-R58472
Subject: [RFC PATCH 2/2 v2] powerpc/83xx:mpc836x_mds: add=20 support for USBHost
=20
Various changes to support QE USB Host on a MPC8360E-MDS board:
=20
- Update the device tree per QE USB bindings;
- Configure QE Par IO;
- Set up BCSR for both USB Host and Peripheral modes;
- Add timer (GTM) node;
- Add gpio-controller node for BCSR13 bank;
- SelectFSL_GTM,QE_GPIOandOF_SIMPLE_GPIO.
=20
The work is loosely based on Li Yang's patch[1], which is=20 used to support peripheral mode only.
=20
[1] http://ozlabs.org/pipermail/linuxppc-dev/2008-August/061357.html
=20
The s-o-b line of the original patch preserved here.
=20
Quoted 2 lines
Signed-off-by Li Yang <[email protected]>Signed-off-by Anton Vorontsov <[email protected]>
{snip}
Quoted 10 lines
(quoted diff) +0
-0@@ -297,11 +328,20 @@ };=20
(quoted diff) +2
-1usb@6c0 { - compatible =3D "qe_udc"; + compatible =3D "fsl,mpc8360-qe-usb", + "fsl,mpc8323-qe-usb"; reg =3D <0x6c0 0x40 0x8b00 0x100>; interrupts =3D <11>; interrupt-parent =3D <&qeic>;
Review
Quoted 10 lines
(quoted diff) +9
-1- mode =3D "slave"; + fsl,fullspeed-clock =3D "clk21"; + fsl,lowspeed-clock =3D "brg9"; + gpios =3D <&qe_pio_b 2 0 /* USBOE */ + &qe_pio_b 3 0 /* USBTP */ + &qe_pio_b 8 0 /* USBTN */ + &qe_pio_b 9 0 /* USBRP */ + &qe_pio_b 11 0 /* USBRN */ + &bcsr13 5 0 /* SPEED */ + &bcsr13 4 1>; /* POWER */
Nothing against this node. But I don't think gpio nodes can replaces = par_io nodes. Gpios are focusing on the pins which are directly = manipulated by the core, but par_io are for pins used by internal SoCs.
- Leo
Re: [RFC PATCH 2/2 v2] powerpc/83xx: mpc836x_mds: add support for USBHost
Quoted 44 lines · On Thu, Sep 04, 2008 at 02:45:05PM +0800, Li Yang-R58472 wrote:
Quoted 20 lines
-----Original Message-----
From: Anton Vorontsov [mailto:[email protected]]
Sent: Monday, September 01, 2008 9:35 PM
To: Kumar Gala
Cc: [email protected]; Li Yang-R58472
Subject: [RFC PATCH 2/2 v2] powerpc/83xx:mpc836x_mds: add support for USBHostVarious changes to support QE USB Host on a MPC8360E-MDS board:
- Update the device tree per QE USB bindings;
- Configure QE Par IO;
- Set up BCSR for both USB Host and Peripheral modes;
- Add timer (GTM) node;
- Add gpio-controller node for BCSR13 bank;
- SelectFSL_GTM,QE_GPIOandOF_SIMPLE_GPIO.The work is loosely based on Li Yang's patch[1], which is used to support peripheral mode only.
Quoted 6 lines
[1] http://ozlabs.org/pipermail/linuxppc-dev/2008-August/061357.html
The s-o-b line of the original patch preserved here.
Signed-off-by Li Yang <[email protected]>Signed-off-by Anton Vorontsov <[email protected]>{snip}
Quoted 16 lines
arch/powerpc/boot/dts/mpc836x_mds.dts +7
-2@@ -297,11 +328,20 @@ }; usb@6c0 { - compatible = "qe_udc"; + compatible = "fsl,mpc8360-qe-usb", + "fsl,mpc8323-qe-usb"; reg = <0x6c0 0x40 0x8b00 0x100>; interrupts = <11>; interrupt-parent = <&qeic>; - mode = "slave"; + fsl,fullspeed-clock = "clk21"; + fsl,lowspeed-clock = "brg9"; + gpios = <&qe_pio_b 2 0 /* USBOE */ + &qe_pio_b 3 0 /* USBTP */ + &qe_pio_b 8 0 /* USBTN */
Quoted 8 lines
arch/powerpc/boot/dts/mpc836x_mds.dts line 344
Quoted 4 lines
arch/powerpc/boot/dts/mpc836x_mds.dts +4
-0+ &qe_pio_b 9 0 /* USBRP */ + &qe_pio_b 11 0 /* USBRN */ + &bcsr13 5 0 /* SPEED */ + &bcsr13 4 1>; /* POWER */Nothing against this node. But I don't think gpio nodes can replaces
par_ionodes.
Yes, they can't, and gpios = <> are not meant to be replacement for par_io nodes. gpios are used by the host driver, the driver really needs these "gpios = <>" as gpios.
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2