GPIO: spear: remove empty plat/gpio.h
Subsystems (2)
PATCH 1/1 GPIO: spear: remove empty plat/gpio.h
Viresh - can you test and provide a tested-by for this please?
Grant,
You may wish to (eventually) take this through your gpio tree.
It's not something I've build-tested, but afaics nothing refers to plat/gpio.h outside of arch/arm - and nothing spear-wise refers to that include after this commit so it should be entirely safe. Nevertheless, waiting for Viresh to confirm...
8<---
From: Russell King <[email protected]>
GPIO: spear: remove empty plat/gpio.h
Spear now has an empty plat/gpio.h, and two mach/gpio.h which include this file. Simply this by emptying the mach/gpio.h headers, and getting rid of plat/gpio.h entirely.
--- arch/arm/mach-spear3xx/include/mach/gpio.h | 20 +------------------- arch/arm/mach-spear6xx/include/mach/gpio.h | 20 +------------------- arch/arm/plat-spear/include/plat/gpio.h | 1 - 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 arch/arm/plat-spear/include/plat/gpio.h
arch/arm/mach-spear3xx/include/mach/gpio.h +1 -19
@@ -1,19 +1 @@ -/* -* arch/arm/mach-spear3xx/include/mach/gpio.h -* -* GPIO macros for SPEAr3xx machine family -* -* Copyright (C) 2009 ST Microelectronics -* Viresh Kumar<[email protected]> -* -* This file is licensed under the terms of the GNU General Public -* License version 2. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. -*/ - -#ifndef __MACH_GPIO_H -#define __MACH_GPIO_H - -#include <plat/gpio.h> - -#endif /* __MACH_GPIO_H */ +/* empty */
arch/arm/mach-spear6xx/include/mach/gpio.h +1 -19
@@ -1,19 +1 @@ -/* -* arch/arm/mach-spear6xx/include/mach/gpio.h -* -* GPIO macros for SPEAr6xx machine family -* -* Copyright (C) 2009 ST Microelectronics -* Viresh Kumar<[email protected]> -* -* This file is licensed under the terms of the GNU General Public -* License version 2. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. -*/ - -#ifndef __MACH_GPIO_H -#define __MACH_GPIO_H - -#include <plat/gpio.h> - -#endif /* __MACH_GPIO_H */ +/* empty */
arch/arm/plat-spear/include/plat/gpio.h deleted +0 -1
@@ -1 +0,0 @@ -/* empty */
PATCH 1/1 GPIO: spear: remove empty plat/gpio.h
Quoted 84 lines · Russell King - ARM Linux
Viresh - can you test and provide a tested-by for this please?
Grant,
You may wish to (eventually) take this through your gpio tree.
It's not something I've build-tested, but afaics nothing refers to
plat/gpio.houtside ofarch/arm- and nothing spear-wise refers to that include after this commit so it should be entirely safe. Nevertheless, waiting for Viresh to confirm...8<---
From: Russell King <[email protected]>
GPIO: spear: remove emptyplat/gpio.hSpear now has an empty
plat/gpio.h, and twomach/gpio.hwhich include this file. Simply this by emptying themach/gpio.hheaders, and getting rid ofplat/gpio.hentirely.Signed-off-by Russell King <[email protected]>--- arch/arm/mach-spear3xx/include/mach/gpio.h | 20 +------------------- arch/arm/mach-spear6xx/include/mach/gpio.h | 20 +------------------- arch/arm/plat-spear/include/plat/gpio.h | 1 - 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 arch/arm/plat-spear/include/plat/gpio.harch/arm/mach-spear3xx/include/mach/gpio.h +1
-19@@ -1,19 +1 @@ -/* -* arch/arm/mach-spear3xx/include/mach/gpio.h -* -* GPIO macros for SPEAr3xx machine family -* -* Copyright (C) 2009 ST Microelectronics -* Viresh Kumar<[email protected]> -* -* This file is licensed under the terms of the GNU General Public -* License version 2. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. -*/ - -#ifndef __MACH_GPIO_H -#define __MACH_GPIO_H - -#include <plat/gpio.h> - -#endif /* __MACH_GPIO_H */ +/* empty */ arch/arm/mach-spear6xx/include/mach/gpio.h +1
-19@@ -1,19 +1 @@ -/* -* arch/arm/mach-spear6xx/include/mach/gpio.h -* -* GPIO macros for SPEAr6xx machine family -* -* Copyright (C) 2009 ST Microelectronics -* Viresh Kumar<[email protected]> -* -* This file is licensed under the terms of the GNU General Public -* License version 2. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. -*/ - -#ifndef __MACH_GPIO_H -#define __MACH_GPIO_H - -#include <plat/gpio.h> - -#endif /* __MACH_GPIO_H */ +/* empty */ arch/arm/plat-spear/include/plat/gpio.h deleted +0
-1@@ -1 +0,0 @@ -/* empty */
Quoted 2 lines
.
Hi Russell,
Due to some other priorities in ST we were not able to update our code to Mainline since sometime. We have now reserved time for doing Mainline activities.
We would be required to add this file again once we start pushing our code to mainline.
So i would request to keep this patch on hold till the time we present our patches once again.
Signature · 1 line
viresh
PATCH 1/1 GPIO: spear: remove empty plat/gpio.h
Quoted 90 lines · Viresh Kumar
Quoted 84 lines · Russell King - ARM Linux
Viresh - can you test and provide a tested-by for this please?
Grant,
You may wish to (eventually) take this through your gpio tree.
It's not something I've build-tested, but afaics nothing refers to
plat/gpio.houtside ofarch/arm- and nothing spear-wise refers to that include after this commit so it should be entirely safe. Nevertheless, waiting for Viresh to confirm...8<---
From: Russell King <[email protected]>
GPIO: spear: remove emptyplat/gpio.hSpear now has an empty
plat/gpio.h, and twomach/gpio.hwhich include this file. Simply this by emptying themach/gpio.hheaders, and getting rid ofplat/gpio.hentirely.Signed-off-by Russell King <[email protected]>--- arch/arm/mach-spear3xx/include/mach/gpio.h | 20 +------------------- arch/arm/mach-spear6xx/include/mach/gpio.h | 20 +------------------- arch/arm/plat-spear/include/plat/gpio.h | 1 - 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 arch/arm/plat-spear/include/plat/gpio.harch/arm/mach-spear3xx/include/mach/gpio.h +1
-19@@ -1,19 +1 @@ -/* -* arch/arm/mach-spear3xx/include/mach/gpio.h -* -* GPIO macros for SPEAr3xx machine family -* -* Copyright (C) 2009 ST Microelectronics -* Viresh Kumar<[email protected]> -* -* This file is licensed under the terms of the GNU General Public -* License version 2. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. -*/ - -#ifndef __MACH_GPIO_H -#define __MACH_GPIO_H - -#include <plat/gpio.h> - -#endif /* __MACH_GPIO_H */ +/* empty */ arch/arm/mach-spear6xx/include/mach/gpio.h +1
-19@@ -1,19 +1 @@ -/* -* arch/arm/mach-spear6xx/include/mach/gpio.h -* -* GPIO macros for SPEAr6xx machine family -* -* Copyright (C) 2009 ST Microelectronics -* Viresh Kumar<[email protected]> -* -* This file is licensed under the terms of the GNU General Public -* License version 2. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. -*/ - -#ifndef __MACH_GPIO_H -#define __MACH_GPIO_H - -#include <plat/gpio.h> - -#endif /* __MACH_GPIO_H */ +/* empty */ arch/arm/plat-spear/include/plat/gpio.h deleted +0
-1@@ -1 +0,0 @@ -/* empty */ Quoted 2 lines
.
Hi Russell,
Quoted 8 lines
Due to some other priorities in ST we were not able to update our code to Mainline since sometime. We have now reserved time for doing Mainline activities.
We would be required to add this file again once we start pushing our code to mainline.
So i would request to keep this patch on hold till the time we present our patches once again.
With the move to gpiolib, and the cleanups which are happening - specifically that the simple gpiolib implementation is now contained within asm/gpio.h, and we're moving towards having ARCH_NR_GPIO defined outside of mach/gpio.h, you should not require any plat/gpio.h.
Platform specific gpio definitions unrelated to gpiolib should be placed into a separate header file.
PATCH 1/1 GPIO: spear: remove empty plat/gpio.h
Quoted 64 lines · Russell King - ARM Linux
Quoted 64 lines
Quoted 64 lines
GPIO: spear: remove empty
plat/gpio.hSpear now has an empty
plat/gpio.h, and twomach/gpio.hwhich include this file. Simply this by emptying themach/gpio.hheaders, and getting rid ofplat/gpio.hentirely.Signed-off-by Russell King <[email protected]>--- arch/arm/mach-spear3xx/include/mach/gpio.h | 20 +------------------- arch/arm/mach-spear6xx/include/mach/gpio.h | 20 +------------------- arch/arm/plat-spear/include/plat/gpio.h | 1 - 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 arch/arm/plat-spear/include/plat/gpio.harch/arm/mach-spear3xx/include/mach/gpio.h +1
-19@@ -1,19 +1 @@ -/* -* arch/arm/mach-spear3xx/include/mach/gpio.h -* -* GPIO macros for SPEAr3xx machine family -* -* Copyright (C) 2009 ST Microelectronics -* Viresh Kumar<[email protected]> -* -* This file is licensed under the terms of the GNU General Public -* License version 2. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. -*/ - -#ifndef __MACH_GPIO_H -#define __MACH_GPIO_H - -#include <plat/gpio.h> - -#endif /* __MACH_GPIO_H */ +/* empty */ arch/arm/mach-spear6xx/include/mach/gpio.h +1
-19@@ -1,19 +1 @@ -/* -* arch/arm/mach-spear6xx/include/mach/gpio.h -* -* GPIO macros for SPEAr6xx machine family -* -* Copyright (C) 2009 ST Microelectronics -* Viresh Kumar<[email protected]> -* -* This file is licensed under the terms of the GNU General Public -* License version 2. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. -*/ - -#ifndef __MACH_GPIO_H -#define __MACH_GPIO_H - -#include <plat/gpio.h> - -#endif /* __MACH_GPIO_H */ +/* empty */
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/arm/plat-spear/include/plat/gpio.h deleted +0
-1@@ -1 +0,0 @@ -/* empty */ .
Signature · 1 line
viresh