Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44449bbf authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King
Browse files

[ARM] 2909/1: remove IXP2000_PROD_ID 



Patch from Lennert Buytenhek

The intel docs call it IXP2000_PRODUCT_ID, and we have a definition
for IXP2000_PRODUCT_ID as well, so IXP2000_PROD_ID can go.  It's only
used in one place.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 917afce1

include/asm-arm/arch-ixp2000/ixp2000-regs.h

+0 −2
Original line number Diff line number Diff line
@@ -370,8 +370,6 @@ 
#define GLOBAL_REG_BASE			(IXP2000_GLOBAL_REG_VIRT_BASE + 0x0a00)

#define GLOBAL_REG(x)			(volatile unsigned long*)(GLOBAL_REG_BASE | (x))



#define IXP2000_PROD_ID			GLOBAL_REG(0x00)



#define IXP2000_MAJ_PROD_TYPE_MASK	0x001F0000

#define IXP2000_MAJ_PROD_TYPE_IXP2000	0x00000000

#define IXP2000_MIN_PROD_TYPE_MASK 	0x0000FF00

include/asm-arm/arch-ixp2000/platform.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ void ixp2000_release_slowport(struct slowport_cfg *); 
 */

static inline unsigned ixp2000_has_broken_slowport(void)

{

	unsigned long id = *IXP2000_PROD_ID;

	unsigned long id = *IXP2000_PRODUCT_ID;

	unsigned long id_prod = id & (IXP2000_MAJ_PROD_TYPE_MASK |

				      IXP2000_MIN_PROD_TYPE_MASK);

	return (((id_prod ==