diff options
| -rw-r--r-- | Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt | 12 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5250-smdk5250.dts | 10 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/mach-exynos5-dt.c | 2 |
3 files changed, 23 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt b/Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt new file mode 100644 index 000000000000..fa166d945809 --- /dev/null +++ b/Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | Device-Tree bindings for hdmiddc driver | ||
| 2 | |||
| 3 | Required properties: | ||
| 4 | - compatible: value should be "samsung,exynos5-hdmiddc". | ||
| 5 | - reg: I2C address of the hdmiddc device. | ||
| 6 | |||
| 7 | Example: | ||
| 8 | |||
| 9 | hdmiddc { | ||
| 10 | compatible = "samsung,exynos5-hdmiddc"; | ||
| 11 | reg = <0x50>; | ||
| 12 | }; | ||
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 7dc196f6b0a1..7212d538086d 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts | |||
| @@ -56,7 +56,15 @@ | |||
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | i2c@12C80000 { | 58 | i2c@12C80000 { |
| 59 | status = "disabled"; | 59 | samsung,i2c-sda-delay = <100>; |
| 60 | samsung,i2c-max-bus-freq = <66000>; | ||
| 61 | gpios = <&gpa0 6 3 3 0>, | ||
| 62 | <&gpa0 7 3 3 0>; | ||
| 63 | |||
| 64 | hdmiddc@50 { | ||
| 65 | compatible = "samsung,exynos5-hdmiddc"; | ||
| 66 | reg = <0x50>; | ||
| 67 | }; | ||
| 60 | }; | 68 | }; |
| 61 | 69 | ||
| 62 | i2c@12C90000 { | 70 | i2c@12C90000 { |
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index 0f20ba8fcf1b..db035374087e 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c | |||
| @@ -47,6 +47,8 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { | |||
| 47 | "s3c2440-i2c.0", NULL), | 47 | "s3c2440-i2c.0", NULL), |
| 48 | OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(1), | 48 | OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(1), |
| 49 | "s3c2440-i2c.1", NULL), | 49 | "s3c2440-i2c.1", NULL), |
| 50 | OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(2), | ||
| 51 | "s3c2440-i2c.2", NULL), | ||
| 50 | OF_DEV_AUXDATA("samsung,s3c2440-hdmiphy-i2c", EXYNOS5_PA_IIC(8), | 52 | OF_DEV_AUXDATA("samsung,s3c2440-hdmiphy-i2c", EXYNOS5_PA_IIC(8), |
| 51 | "s3c2440-hdmiphy-i2c", NULL), | 53 | "s3c2440-hdmiphy-i2c", NULL), |
| 52 | OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI0, | 54 | OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI0, |
