From d14d9e5f7db05dd2b1c9bc2890bfdaef25eb6f13 Mon Sep 17 00:00:00 2001 From: Lei Qian Date: Thu, 17 Oct 2019 19:47:34 +0800 Subject: [PATCH] fix compile error PD#SWPL-15312 --- drivers/dma-buf/sw_sync.c | 3 +- include/dt-bindings/gpio/meson-tm2-gpio.h | 142 ++++++++++++++++++++++ 2 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 include/dt-bindings/gpio/meson-tm2-gpio.h diff --git a/drivers/dma-buf/sw_sync.c b/drivers/dma-buf/sw_sync.c index 862a37c32c85..59f89f26bf29 100644 --- a/drivers/dma-buf/sw_sync.c +++ b/drivers/dma-buf/sw_sync.c @@ -431,7 +431,7 @@ const struct file_operations sw_sync_debugfs_fops = { .compat_ioctl = sw_sync_ioctl, }; - +#if 0 /*api for amlogic use.*/ void *aml_sync_create_timeline(const char *tname) { @@ -509,3 +509,4 @@ void aml_sync_put_fence(struct fence *fence) fence_put(fence); } EXPORT_SYMBOL(aml_sync_put_fence); +#endif diff --git a/include/dt-bindings/gpio/meson-tm2-gpio.h b/include/dt-bindings/gpio/meson-tm2-gpio.h new file mode 100644 index 000000000000..8b016cd079c0 --- /dev/null +++ b/include/dt-bindings/gpio/meson-tm2-gpio.h @@ -0,0 +1,142 @@ +/* + * include/dt-bindings/gpio/meson-tm2-gpio.h + * + * Copyright (C) 2019 Amlogic, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + */ + +#ifndef __DT_BINDINGS_MESON_TM2_GPIO_H +#define __DT_BINDINGS_MESON_TM2_GPIO_H + +/* + * NOTICE: The gpio number sequence according to the gpio interrupts. + */ + + +/* AO Bank */ +#define GPIOAO_0 0 +#define GPIOAO_1 1 +#define GPIOAO_2 2 +#define GPIOAO_3 3 +#define GPIOAO_4 4 +#define GPIOAO_5 5 +#define GPIOAO_6 6 +#define GPIOAO_7 7 +#define GPIOAO_8 8 +#define GPIOAO_9 9 +#define GPIOAO_10 10 +#define GPIOAO_11 11 +#define GPIOE_0 12 +#define GPIOE_1 13 +#define GPIOE_2 14 + +/* TEST_N */ +#define GPIO_TEST_N 0 + +/* EE Bank */ +#define GPIOZ_0 0 +#define GPIOZ_1 1 +#define GPIOZ_2 2 +#define GPIOZ_3 3 +#define GPIOZ_4 4 +#define GPIOZ_5 5 +#define GPIOZ_6 6 +#define GPIOZ_7 7 +#define GPIOZ_8 8 +#define GPIOZ_9 9 +#define GPIOZ_10 10 + +#define GPIOH_0 11 +#define GPIOH_1 12 +#define GPIOH_2 13 +#define GPIOH_3 14 +#define GPIOH_4 15 +#define GPIOH_5 16 +#define GPIOH_6 17 +#define GPIOH_7 18 +#define GPIOH_8 19 +#define GPIOH_9 20 +#define GPIOH_10 21 +#define GPIOH_11 22 +#define GPIOH_12 23 +#define GPIOH_13 24 +#define GPIOH_14 25 +#define GPIOH_15 26 +#define GPIOH_16 27 +#define GPIOH_17 28 +#define GPIOH_18 29 +#define GPIOH_19 30 +#define GPIOH_20 31 +#define GPIOH_21 32 +#define GPIOH_22 33 +#define GPIOH_23 34 +#define GPIOH_24 35 + +#define BOOT_0 36 +#define BOOT_1 37 +#define BOOT_2 38 +#define BOOT_3 39 +#define BOOT_4 40 +#define BOOT_5 41 +#define BOOT_6 42 +#define BOOT_7 43 +#define BOOT_8 44 +#define BOOT_9 45 +#define BOOT_10 46 +#define BOOT_11 47 +#define BOOT_12 48 +#define BOOT_13 49 + +#define GPIOC_0 50 +#define GPIOC_1 51 +#define GPIOC_2 52 +#define GPIOC_3 53 +#define GPIOC_4 54 +#define GPIOC_5 55 +#define GPIOC_6 56 +#define GPIOC_7 57 +#define GPIOC_8 58 +#define GPIOC_9 59 +#define GPIOC_10 60 +#define GPIOC_11 61 +#define GPIOC_12 62 +#define GPIOC_13 63 +#define GPIOC_14 64 + +#define GPIOW_0 65 +#define GPIOW_1 66 +#define GPIOW_2 67 +#define GPIOW_3 68 +#define GPIOW_4 69 +#define GPIOW_5 70 +#define GPIOW_6 71 +#define GPIOW_7 72 +#define GPIOW_8 73 +#define GPIOW_9 74 +#define GPIOW_10 75 +#define GPIOW_11 76 + +#define GPIODV_0 77 +#define GPIODV_1 78 +#define GPIODV_2 79 +#define GPIODV_3 80 +#define GPIODV_4 81 +#define GPIODV_5 82 +#define GPIODV_6 83 +#define GPIODV_7 84 +#define GPIODV_8 85 +#define GPIODV_9 86 +#define GPIODV_10 87 +#define GPIODV_11 88 + +#endif