diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-10 19:55:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-10 19:55:08 -0400 |
| commit | 7e8f270292ebacb25f366181f2022c819e5c7586 (patch) | |
| tree | 841cf474e29eedf6c173da8d1901d3b24d06ecbd /arch | |
| parent | e16e137c377c8b96d8d91263d0b6d8470169f841 (diff) | |
| parent | 192eab9357473e09218e0a4448b220d691d9d886 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/io.h | 7 | ||||
| -rw-r--r-- | arch/mips/dts/pic32mzda.dtsi | 12 | ||||
| -rw-r--r-- | arch/mips/dts/pic32mzda_sk.dts | 4 |
3 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 75773bdbe0..9d185a6122 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -284,6 +284,13 @@ static inline void __raw_readsl(unsigned long addr, void *data, int longlen) #define insw_p(port,to,len) insw(port,to,len) #define insl_p(port,to,len) insl(port,to,len) +#define writesl(a, d, s) __raw_writesl((unsigned long)a, d, s) +#define readsl(a, d, s) __raw_readsl((unsigned long)a, d, s) +#define writesw(a, d, s) __raw_writesw((unsigned long)a, d, s) +#define readsw(a, d, s) __raw_readsw((unsigned long)a, d, s) +#define writesb(a, d, s) __raw_writesb((unsigned long)a, d, s) +#define readsb(a, d, s) __raw_readsb((unsigned long)a, d, s) + /* * ioremap and friends. * diff --git a/arch/mips/dts/pic32mzda.dtsi b/arch/mips/dts/pic32mzda.dtsi index 7d180d9918..8a554f996d 100644 --- a/arch/mips/dts/pic32mzda.dtsi +++ b/arch/mips/dts/pic32mzda.dtsi @@ -171,4 +171,16 @@ #address-cells = <1>; #size-cells = <0>; }; + + usb: musb@1f8e3000 { + compatible = "microchip,pic32mzda-usb"; + reg = <0x1f8e3000 0x1000>, + <0x1f884000 0x1000>; + reg-names = "mc", "control"; + interrupts = <132 IRQ_TYPE_EDGE_RISING>, + <133 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clock PB5CLK>; + clock-names = "usb_clk"; + status = "disabled"; + }; }; diff --git a/arch/mips/dts/pic32mzda_sk.dts b/arch/mips/dts/pic32mzda_sk.dts index e5ce0bdc2e..0a7847e4e7 100644 --- a/arch/mips/dts/pic32mzda_sk.dts +++ b/arch/mips/dts/pic32mzda_sk.dts @@ -52,4 +52,8 @@ ethernet_phy: lan8740_phy@0 { reg = <0>; }; +}; + +&usb { + status = "okay"; };
\ No newline at end of file |