diff options
| author | br <br@FreeBSD.org> | 2014-03-20 17:03:44 +0000 |
|---|---|---|
| committer | br <br@FreeBSD.org> | 2014-03-20 17:03:44 +0000 |
| commit | ef1ba07d1cea245fc06a176be4864ae02abd2a08 (patch) | |
| tree | c9b159ffd7c63d83fbcd76483bce254f24bb5959 | |
| parent | 0af13351c59d7bc54e999f248d301d97780dab21 (diff) | |
| download | FreeBSD-src-ef1ba07d1cea245fc06a176be4864ae02abd2a08.zip FreeBSD-src-ef1ba07d1cea245fc06a176be4864ae02abd2a08.tar.gz | |
- Add display-related and clk devices to the tree
- Prevent resources intersection with EHCI driver
| -rw-r--r-- | sys/arm/samsung/exynos/ehci_exynos5.c | 6 | ||||
| -rw-r--r-- | sys/boot/fdt/dts/arm/exynos5250.dtsi | 36 |
2 files changed, 36 insertions, 6 deletions
diff --git a/sys/arm/samsung/exynos/ehci_exynos5.c b/sys/arm/samsung/exynos/ehci_exynos5.c index 7022d46..dc438d5 100644 --- a/sys/arm/samsung/exynos/ehci_exynos5.c +++ b/sys/arm/samsung/exynos/ehci_exynos5.c @@ -61,8 +61,8 @@ __FBSDID("$FreeBSD$"); #define GPIO_MASK 0xf #define GPIO_OUTPUT 1 #define GPIO_INPUT 0 -#define GPX3CON 0x0C60 -#define GPX3DAT 0x0C64 +#define GPX3CON 0x0 +#define GPX3DAT 0x4 #define PIN_USB 5 /* PWR control */ @@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$"); #define PHY_POWER_OFF 0 /* SYSREG */ -#define EXYNOS5_SYSREG_USB2_PHY 0x230 +#define EXYNOS5_SYSREG_USB2_PHY 0x0 #define USB2_MODE_HOST 0x1 /* USB HOST */ diff --git a/sys/boot/fdt/dts/arm/exynos5250.dtsi b/sys/boot/fdt/dts/arm/exynos5250.dtsi index 860fcd0..f679a13 100644 --- a/sys/boot/fdt/dts/arm/exynos5250.dtsi +++ b/sys/boot/fdt/dts/arm/exynos5250.dtsi @@ -32,7 +32,16 @@ #size-cells = <1>; interrupt-parent = <&GIC>; - Exynos5@0 { + aliases { + soc = &SOC; + serial0 = &serial0; + serial1 = &serial1; + clk0 = &clk0; + dp0 = &dp0; + fimd0 = &fimd0; + }; + + SOC: Exynos5@0 { #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; @@ -48,6 +57,11 @@ #interrupt-cells = <1>; }; + clk0: clk@10010000 { + compatible = "exynos,clk"; + reg = < 0x10020000 0x20000 >; + }; + mct { compatible = "exynos,mct"; reg = < 0x101C0000 0x1000 >; @@ -72,8 +86,8 @@ reg = <0x12110000 0x1000>, /* EHCI */ <0x12130000 0x1000>, /* EHCI host ctrl */ <0x10040000 0x1000>, /* Power */ - <0x10050000 0x1000>, /* Sysreg */ - <0x11400000 0x1000>; /* GPIO left */ + <0x10050230 0x10>, /* Sysreg */ + <0x11400C60 0x10>; /* GPIO left */ interrupts = < 103 >; interrupt-parent = <&GIC>; }; @@ -153,5 +167,21 @@ current-speed = <115200>; }; + fimd0: fimd@14400000 { + compatible = "exynos,fimd"; + status = "disabled"; + reg = < 0x14400000 0x10000 >, /* fimd */ + < 0x14420000 0x10000 >, /* disp */ + < 0x10050000 0x220 >; /* sysreg */ + interrupt-parent = <&GIC>; + }; + + dp0: dp@145B0000 { + compatible = "exynos,dp"; + status = "disabled"; + reg = < 0x145B0000 0x10000 >, + < 0x10040720 0x10 >; /* PHY */ + interrupt-parent = <&GIC>; + }; }; }; |
