mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-18 00:16:42 +07:00
ASPEED device tree updates for 4.19
- New support for the ASPEED USB host controller and USB vhub (device) support - Descriptions for the ColdFire processor that is part of the ASPEED SoC - Small fixes: * pwm/tach clock -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE+nHMAt9PCBDH63wBa3ZZB4FHcJ4FAltacAgACgkQa3ZZB4FH cJ7VIg//S1Df+le7rn4LYqF4OSXoDDTU4oDTkQtjvMIBoTjGnWbwhtaMYKzSsE82 nNgo+BXFuKufNc27zNCiK2aGrWMbFqjcvC3OKE6V/qERMsyE5g1b41oAb8sbusJJ NnbvHL1g9UE3fojwOyHNkQG5pfUAv/+Dj3P0hdmKa3Jsk+pVHlKN1mB1z5tM80Ab MR+/MaGnNHqj1giTdubLvh8Bhp+sOS3XymVsvZfKjadloLO4qcIbQnxpTJB3GyRE xa4KhXv1oSSzAIsfwtR/iTyvuc3Klr/K1ePdlObeFVmc+IH75GrPYZEJznhuKUau JKhZlgIpfFoeDbEIO9Os/tejobHh30W+/FjsVvaZ353sqzx1r7i5limw5Hip0j1w PgxZAdYBTAGSRRK5n43N6aK6IsrNxGiHzFlzU/gBFUAIJfZUHtJ4Kn0eO61Ee3FJ fsVyxtosx5LBhV+rjkoZBB4wfoMmuI0YoKc+o3/wb4zYEUq9HitoBq7KasCBi9/L 20e+Qf0YNZ4r2STeLIeY0/1wkmUrH4Z3nthhlIjySnuscAEX8utGFEobGUf3WYnR mN1Kk4ur+j9b7Yv77MseQheFXn9MtyCqI3sElJPaOjnkUUZBDLPJ65sW75OOPW9u SmdvV6am7ndo8LSmIFH34lmLEwEt6b3r+zzgCpu1ZTw9YznWmsc= =aigP -----END PGP SIGNATURE----- Merge tag 'aspeed-4.19-devicetree-no-fsi' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into next/dt ASPEED device tree updates for 4.19 - New support for the ASPEED USB host controller and USB vhub (device) support - Descriptions for the ColdFire processor that is part of the ASPEED SoC - Small fixes: * pwm/tach clock * tag 'aspeed-4.19-devicetree-no-fsi' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed: ARM: dts: aspeed: Add coprocessor interrupt controller ARM: dts: aspeed: Use 24MHz fixed clock for pwm ARM: dts: aspeed: Fix Romulus VGA frame buffer ARM: dts: aspeed: Enable vhub on port A of AST2500 EVB ARM: dts: aspeed: Add G5 USB Virtual Hub ARM: dts: aspeed: Add G4 USB Virtual Hub ARM: dts: aspeed: Add G5 USB host pinmux ARM: dts: aspeed: Add G4 USB pinmux Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
commit
61c22946ad
@ -80,20 +80,20 @@ lm75@4d {
|
||||
};
|
||||
};
|
||||
|
||||
&ehci0 {
|
||||
/*
|
||||
* Enable port A as device (via the virtual hub) and port B as
|
||||
* host by default on the eval board. This can be easily changed
|
||||
* by replacing the override below with &ehci0 { ... } to enable
|
||||
* host on both ports.
|
||||
*/
|
||||
&vhub {
|
||||
status = "okay";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_usb2ah_default>;
|
||||
};
|
||||
|
||||
&ehci1 {
|
||||
status = "okay";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_usb2bh_default>;
|
||||
};
|
||||
|
||||
&uhci {
|
||||
status = "okay";
|
||||
|
||||
/* No pinctrl, this follows the above EHCI settings */
|
||||
};
|
||||
|
||||
@ -21,9 +21,9 @@ reserved-memory {
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
|
||||
vga_memory: framebuffer@bf000000 {
|
||||
vga_memory: framebuffer@9f000000 {
|
||||
no-map;
|
||||
reg = <0xbf000000 0x01000000>; /* 16M */
|
||||
reg = <0x9f000000 0x01000000>; /* 16M */
|
||||
};
|
||||
|
||||
flash_memory: region@98000000 {
|
||||
|
||||
@ -92,6 +92,12 @@ vic: interrupt-controller@1e6c0080 {
|
||||
reg = <0x1e6c0080 0x80>;
|
||||
};
|
||||
|
||||
cvic: copro-interrupt-controller@1e6c2000 {
|
||||
compatible = "aspeed,ast2400-cvic", "aspeed-cvic";
|
||||
valid-sources = <0x7fffffff>;
|
||||
reg = <0x1e6c2000 0x80>;
|
||||
};
|
||||
|
||||
mac0: ethernet@1e660000 {
|
||||
compatible = "aspeed,ast2400-mac", "faraday,ftgmac100";
|
||||
reg = <0x1e660000 0x180>;
|
||||
@ -113,6 +119,8 @@ ehci0: usb@1e6a1000 {
|
||||
reg = <0x1e6a1000 0x100>;
|
||||
interrupts = <5>;
|
||||
clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_usb2h_default>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@ -123,6 +131,20 @@ uhci: usb@1e6b0000 {
|
||||
#ports = <3>;
|
||||
clocks = <&syscon ASPEED_CLK_GATE_USBUHCICLK>;
|
||||
status = "disabled";
|
||||
/*
|
||||
* No default pinmux, it will follow EHCI, use an explicit pinmux
|
||||
* override if you don't enable EHCI
|
||||
*/
|
||||
};
|
||||
|
||||
vhub: usb-vhub@1e6a0000 {
|
||||
compatible = "aspeed,ast2400-usb-vhub";
|
||||
reg = <0x1e6a0000 0x300>;
|
||||
interrupts = <5>;
|
||||
clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_usb2d_default>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
apb {
|
||||
@ -161,7 +183,7 @@ adc: adc@1e6e9000 {
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sram@1e720000 {
|
||||
sram: sram@1e720000 {
|
||||
compatible = "mmio-sram";
|
||||
reg = <0x1e720000 0x8000>; // 32K
|
||||
};
|
||||
@ -224,7 +246,7 @@ pwm_tacho: pwm-tacho-controller@1e786000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
reg = <0x1e786000 0x1000>;
|
||||
clocks = <&syscon ASPEED_CLK_APB>;
|
||||
clocks = <&syscon ASPEED_CLK_24M>;
|
||||
resets = <&syscon ASPEED_RESET_PWM>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@ -127,6 +127,13 @@ vic: interrupt-controller@1e6c0080 {
|
||||
reg = <0x1e6c0080 0x80>;
|
||||
};
|
||||
|
||||
cvic: copro-interrupt-controller@1e6c2000 {
|
||||
compatible = "aspeed,ast2500-cvic", "aspeed-cvic";
|
||||
valid-sources = <0xffffffff>;
|
||||
copro-sw-interrupts = <1>;
|
||||
reg = <0x1e6c2000 0x80>;
|
||||
};
|
||||
|
||||
mac0: ethernet@1e660000 {
|
||||
compatible = "aspeed,ast2500-mac", "faraday,ftgmac100";
|
||||
reg = <0x1e660000 0x180>;
|
||||
@ -148,6 +155,8 @@ ehci0: usb@1e6a1000 {
|
||||
reg = <0x1e6a1000 0x100>;
|
||||
interrupts = <5>;
|
||||
clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_usb2ah_default>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@ -156,6 +165,8 @@ ehci1: usb@1e6a3000 {
|
||||
reg = <0x1e6a3000 0x100>;
|
||||
interrupts = <13>;
|
||||
clocks = <&syscon ASPEED_CLK_GATE_USBPORT2CLK>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_usb2bh_default>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@ -166,6 +177,20 @@ uhci: usb@1e6b0000 {
|
||||
#ports = <2>;
|
||||
clocks = <&syscon ASPEED_CLK_GATE_USBUHCICLK>;
|
||||
status = "disabled";
|
||||
/*
|
||||
* No default pinmux, it will follow EHCI, use an explicit pinmux
|
||||
* override if you don't enable EHCI
|
||||
*/
|
||||
};
|
||||
|
||||
vhub: usb-vhub@1e6a0000 {
|
||||
compatible = "aspeed,ast2500-usb-vhub";
|
||||
reg = <0x1e6a0000 0x300>;
|
||||
interrupts = <5>;
|
||||
clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_usb2ad_default>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
apb {
|
||||
@ -211,7 +236,7 @@ adc: adc@1e6e9000 {
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sram@1e720000 {
|
||||
sram: sram@1e720000 {
|
||||
compatible = "mmio-sram";
|
||||
reg = <0x1e720000 0x9000>; // 36K
|
||||
};
|
||||
@ -281,7 +306,7 @@ pwm_tacho: pwm-tacho-controller@1e786000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
reg = <0x1e786000 0x1000>;
|
||||
clocks = <&syscon ASPEED_CLK_APB>;
|
||||
clocks = <&syscon ASPEED_CLK_24M>;
|
||||
resets = <&syscon ASPEED_RESET_PWM>;
|
||||
status = "disabled";
|
||||
};
|
||||
@ -1417,6 +1442,11 @@ pinctrl_usb2ah_default: usb2ah_default {
|
||||
groups = "USB2AH";
|
||||
};
|
||||
|
||||
pinctrl_usb2ad_default: usb2ad_default {
|
||||
function = "USB2AD";
|
||||
groups = "USB2AD";
|
||||
};
|
||||
|
||||
pinctrl_usb11bhid_default: usb11bhid_default {
|
||||
function = "USB11BHID";
|
||||
groups = "USB11BHID";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user