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

This project is archived. Its data is read-only.

Commit 4bd5a574 authored Jan 31, 2012 by Florian Fainelli Committed by Ralf Baechle Jul 23, 2012

MIPS: Alchemy: use IS_ENABLED() macro



Signed-off-by: Florian Fainelli <florian@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3331/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 889a4c7b

arch/mips/alchemy/board-mtx1.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -81,10 +81,10 @@ static void mtx1_power_off(void)

	void __init board_setup(void)		void __init board_setup(void)
	{		{
	#if defined(CONFIG_USB_OHCI_HCD) \|\| defined(CONFIG_USB_OHCI_HCD_MODULE)		#if IS_ENABLED(CONFIG_USB_OHCI_HCD)
	/* Enable USB power switch */		/* Enable USB power switch */
	alchemy_gpio_direction_output(204, 0);		alchemy_gpio_direction_output(204, 0);
	#endif /* defined(CONFIG_USB_OHCI_HCD) \|\| defined(CONFIG_USB_OHCI_HCD_MODULE) */		#endif /* IS_ENABLED(CONFIG_USB_OHCI_HCD) */

	/* Initialize sys_pinfunc */		/* Initialize sys_pinfunc */
	au_writel(SYS_PF_NI2, SYS_PINFUNC);		au_writel(SYS_PF_NI2, SYS_PINFUNC);

arch/mips/alchemy/devboards/pb1100.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,7 @@ void __init board_setup(void)
	alchemy_gpio1_input_enable();		alchemy_gpio1_input_enable();
	udelay(100);		udelay(100);

	#if defined(CONFIG_USB_OHCI_HCD) \|\| defined(CONFIG_USB_OHCI_HCD_MODULE)		#if IS_ENABLED(CONFIG_USB_OHCI_HCD)
	{		{
	u32 pin_func, sys_freqctrl, sys_clksrc;		u32 pin_func, sys_freqctrl, sys_clksrc;

	@@ -93,7 +93,7 @@ void __init board_setup(void)
	pin_func \|= SYS_PF_USB;		pin_func \|= SYS_PF_USB;
	au_writel(pin_func, SYS_PINFUNC);		au_writel(pin_func, SYS_PINFUNC);
	}		}
	#endif /* defined(CONFIG_USB_OHCI_HCD) \|\| defined(CONFIG_USB_OHCI_HCD_MODULE) */		#endif /* IS_ENABLED(CONFIG_USB_OHCI_HCD) */

	/* Enable sys bus clock divider when IDLE state or no bus activity. */		/* Enable sys bus clock divider when IDLE state or no bus activity. */
	au_writel(au_readl(SYS_POWERCTRL) \| (0x3 << 5), SYS_POWERCTRL);		au_writel(au_readl(SYS_POWERCTRL) \| (0x3 << 5), SYS_POWERCTRL);

arch/mips/alchemy/devboards/pb1500.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,7 @@ void __init board_setup(void)
	alchemy_gpio_direction_input(201);		alchemy_gpio_direction_input(201);
	alchemy_gpio_direction_input(203);		alchemy_gpio_direction_input(203);

	#if defined(CONFIG_USB_OHCI_HCD) \|\| defined(CONFIG_USB_OHCI_HCD_MODULE)		#if IS_ENABLED(CONFIG_USB_OHCI_HCD)

	/* Zero and disable FREQ2 */		/* Zero and disable FREQ2 */
	sys_freqctrl = au_readl(SYS_FREQCTRL0);		sys_freqctrl = au_readl(SYS_FREQCTRL0);
	@@ -87,7 +87,7 @@ void __init board_setup(void)
	/* 2nd USB port is USB host */		/* 2nd USB port is USB host */
	pin_func \|= SYS_PF_USB;		pin_func \|= SYS_PF_USB;
	au_writel(pin_func, SYS_PINFUNC);		au_writel(pin_func, SYS_PINFUNC);
	#endif /* defined(CONFIG_USB_OHCI_HCD) \|\| defined(CONFIG_USB_OHCI_HCD_MODULE) */		#endif /* IS_ENABLED(CONFIG_USB_OHCI_HCD) */

	#ifdef CONFIG_PCI		#ifdef CONFIG_PCI
	{		{