diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 13:39:38 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 13:39:38 +1000 |
| commit | c2d1934024872abc08c309ee6f49c58e306ca827 (patch) | |
| tree | 02a7d0b4bae149462650168c86ad13ad1aa66e40 /arch | |
| parent | 70befe58f083ad9aaf5efe9312920cc5d42c1dac (diff) | |
| parent | e179d5fa8d6dd0df62bc7ba2a6ee777f7d1142b5 (diff) | |
Merge remote-tracking branch 'input/next'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/am437x-gp-evm.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/am43x-epos-evm.dts | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts index f0422c2a7468..646a6eade788 100644 --- a/arch/arm/boot/dts/am437x-gp-evm.dts +++ b/arch/arm/boot/dts/am437x-gp-evm.dts @@ -334,8 +334,8 @@ attb-gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; - x-size = <1024>; - y-size = <600>; + touchscreen-size-x = <1024>; + touchscreen-size-y = <600>; }; }; diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts index f1ee74957512..ed7dd2395915 100644 --- a/arch/arm/boot/dts/am43x-epos-evm.dts +++ b/arch/arm/boot/dts/am43x-epos-evm.dts @@ -403,8 +403,8 @@ attb-gpio = <&gpio1 17 GPIO_ACTIVE_HIGH>; - x-size = <1024>; - y-size = <600>; + touchscreen-size-x = <1024>; + touchscreen-size-y = <600>; }; }; |