diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-05-17 00:25:08 (GMT) |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-05-17 00:25:08 (GMT) |
| commit | 23ea5967d6bd30ed59480edbc5fe21eec81682a3 (patch) | |
| tree | 345bf01823cf76596bc05e83fab9bf21678fef90 /arch | |
| parent | c52c545ead97fcc2f4f8ea38f1ae3c23211e09a8 (diff) | |
| parent | d96caf8c33cad42b5eabcf1b686dd91581e306f4 (diff) | |
| download | linux-23ea5967d6bd30ed59480edbc5fe21eec81682a3.tar.xz | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.7 merge window.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/bcm-cygnus.dtsi | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi index 3878793..b42fe55 100644 --- a/arch/arm/boot/dts/bcm-cygnus.dtsi +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi @@ -351,9 +351,16 @@ <&pinctrl 142 10 1>; }; - touchscreen: tsc@180a6000 { + ts_adc_syscon: ts_adc_syscon@180a6000 { + compatible = "brcm,iproc-ts-adc-syscon", "syscon"; + reg = <0x180a6000 0xc30>; + }; + + touchscreen: touchscreen@180a6000 { compatible = "brcm,iproc-touchscreen"; - reg = <0x180a6000 0x40>; + #address-cells = <1>; + #size-cells = <1>; + ts_syscon = <&ts_adc_syscon>; clocks = <&asiu_clks BCM_CYGNUS_ASIU_ADC_CLK>; clock-names = "tsc_clk"; interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>; |