* [PATCH linux dev-4.7 v4] ARM: dts: aspeed: Modify Laanyang BMC device tree
@ 2017-04-27 4:02 Ken Chen
2017-04-27 6:17 ` Andrew Jeffery
0 siblings, 1 reply; 3+ messages in thread
From: Ken Chen @ 2017-04-27 4:02 UTC (permalink / raw)
To: openbmc; +Cc: Ken Chen, joel
Modify Lanyang dts and add lanyang initial in aspeed.c
Signed-off-by: Ken Chen <chen.kenyy@inventec.com>
---
arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 13 ++++++-------
arch/arm/mach-aspeed/aspeed.c | 17 +++++++++++++++++
2 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
index 176e4b4..6456458 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
@@ -1,4 +1,4 @@
-/dts-v1/;
+/dts-v3/;
#include "aspeed-g5.dtsi"
#include <dt-bindings/gpio/aspeed-gpio.h>
@@ -302,18 +302,17 @@
};
&gpio {
- line_apss_reset {
- gpio-hog;
- gpios = <ASPEED_GPIO(E, 4) GPIO_ACTIVE_HIGH>;
- output-high;
- line-name = "BMC_APSS_RESET_N";
- };
+
};
&vuart {
status = "okay";
};
+&gfx {
+ status = "okay";
+};
+
&pinctrl {
aspeed,external-nodes = <&gfx &lhc>;
};
diff --git a/arch/arm/mach-aspeed/aspeed.c b/arch/arm/mach-aspeed/aspeed.c
index a7b03a0..0717181 100644
--- a/arch/arm/mach-aspeed/aspeed.c
+++ b/arch/arm/mach-aspeed/aspeed.c
@@ -238,6 +238,21 @@ static void __init do_romulus_setup(void)
writel(reg & ~BIT(4), AST_IO(AST_BASE_LPC | 0x98));
}
+static void __init do_lanyang_setup(void)
+{
+ unsigned long reg;
+
+ do_common_setup();
+
+ /* Disable default behavior of UART1 being held in reset by LPCRST#.
+ * By releasing UART1 from being controlled by LPC reset, it becomes
+ * immediately available regardless of the host being up.
+ */
+ reg = readl(AST_IO(AST_BASE_LPC | 0x98));
+ /* Clear "Enable UART1 reset source from LPC" */
+ writel(reg & ~BIT(4), AST_IO(AST_BASE_LPC | 0x98));
+}
+
#define SCU_PASSWORD 0x1688A8A8
static void __init aspeed_init_early(void)
@@ -275,6 +290,8 @@ static void __init aspeed_init_early(void)
do_witherspoon_setup();
if (of_machine_is_compatible("ibm,romulus-bmc"))
do_romulus_setup();
+ if (of_machine_is_compatible("inventec,lanyang-bmc"))
+ do_lanyang_setup();
}
static void __init aspeed_map_io(void)
--
2.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH linux dev-4.7 v4] ARM: dts: aspeed: Modify Laanyang BMC device tree
2017-04-27 4:02 [PATCH linux dev-4.7 v4] ARM: dts: aspeed: Modify Laanyang BMC device tree Ken Chen
@ 2017-04-27 6:17 ` Andrew Jeffery
2017-04-27 6:20 ` Joel Stanley
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Jeffery @ 2017-04-27 6:17 UTC (permalink / raw)
To: Ken Chen, openbmc
[-- Attachment #1: Type: text/plain, Size: 2751 bytes --]
On Thu, 2017-04-27 at 12:02 +0800, Ken Chen wrote:
> Modify Lanyang dts and add lanyang initial in aspeed.c
>
> Signed-off-by: Ken Chen <chen.kenyy@inventec.com>
Acked-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 13 ++++++-------
> arch/arm/mach-aspeed/aspeed.c | 17 +++++++++++++++++
> 2 files changed, 23 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
> index 176e4b4..6456458 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
> @@ -1,4 +1,4 @@
> -/dts-v1/;
> +/dts-v3/;
>
Was this necessary? What do we get from the change?
Cheers,
Andrew
> #include "aspeed-g5.dtsi"
> #include <dt-bindings/gpio/aspeed-gpio.h>
> @@ -302,18 +302,17 @@
> };
>
> &gpio {
> > - line_apss_reset {
> > - gpio-hog;
> > - gpios = <ASPEED_GPIO(E, 4) GPIO_ACTIVE_HIGH>;
> > - output-high;
> > - line-name = "BMC_APSS_RESET_N";
> > - };
> +
> };
>
> &vuart {
> > status = "okay";
> };
>
> +&gfx {
> + status = "okay";
> +};
> +
> &pinctrl {
> > aspeed,external-nodes = <&gfx &lhc>;
> };
> diff --git a/arch/arm/mach-aspeed/aspeed.c b/arch/arm/mach-aspeed/aspeed.c
> index a7b03a0..0717181 100644
> --- a/arch/arm/mach-aspeed/aspeed.c
> +++ b/arch/arm/mach-aspeed/aspeed.c
> @@ -238,6 +238,21 @@ static void __init do_romulus_setup(void)
> writel(reg & ~BIT(4), AST_IO(AST_BASE_LPC | 0x98));
> }
>
> +static void __init do_lanyang_setup(void)
> +{
> + unsigned long reg;
> +
> + do_common_setup();
> +
> + /* Disable default behavior of UART1 being held in reset by LPCRST#.
> + * By releasing UART1 from being controlled by LPC reset, it becomes
> + * immediately available regardless of the host being up.
> + */
> + reg = readl(AST_IO(AST_BASE_LPC | 0x98));
> + /* Clear "Enable UART1 reset source from LPC" */
> + writel(reg & ~BIT(4), AST_IO(AST_BASE_LPC | 0x98));
> +}
> +
> > #define SCU_PASSWORD 0x1688A8A8
>
> static void __init aspeed_init_early(void)
> @@ -275,6 +290,8 @@ static void __init aspeed_init_early(void)
> > do_witherspoon_setup();
> > if (of_machine_is_compatible("ibm,romulus-bmc"))
> > do_romulus_setup();
> + if (of_machine_is_compatible("inventec,lanyang-bmc"))
> + do_lanyang_setup();
> }
>
> static void __init aspeed_map_io(void)
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH linux dev-4.7 v4] ARM: dts: aspeed: Modify Laanyang BMC device tree
2017-04-27 6:17 ` Andrew Jeffery
@ 2017-04-27 6:20 ` Joel Stanley
0 siblings, 0 replies; 3+ messages in thread
From: Joel Stanley @ 2017-04-27 6:20 UTC (permalink / raw)
To: Andrew Jeffery; +Cc: Ken Chen, OpenBMC Maillist
On Thu, Apr 27, 2017 at 3:47 PM, Andrew Jeffery <andrew@aj.id.au> wrote:
> On Thu, 2017-04-27 at 12:02 +0800, Ken Chen wrote:
>> Modify Lanyang dts and add lanyang initial in aspeed.c
>>
>> Signed-off-by: Ken Chen <chen.kenyy@inventec.com>
>
> Acked-by: Andrew Jeffery <andrew@aj.id.au>
>
>> ---
>> arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 13 ++++++-------
>> arch/arm/mach-aspeed/aspeed.c | 17 +++++++++++++++++
>> 2 files changed, 23 insertions(+), 7 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
>> index 176e4b4..6456458 100644
>> --- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
>> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
>> @@ -1,4 +1,4 @@
>> -/dts-v1/;
>> +/dts-v3/;
>>
>
> Was this necessary? What do we get from the change?
This string should be left alone. I will fix that when applying.
>
>> #include "aspeed-g5.dtsi"
>> #include <dt-bindings/gpio/aspeed-gpio.h>
>> @@ -302,18 +302,17 @@
>> };
>>
>> &gpio {
>> > - line_apss_reset {
>> > - gpio-hog;
>> > - gpios = <ASPEED_GPIO(E, 4) GPIO_ACTIVE_HIGH>;
>> > - output-high;
>> > - line-name = "BMC_APSS_RESET_N";
>> > - };
>> +
>> };
You can remove this node now that is it empty. I will fix that when applying.
Thanks for the patch! I have applied this to dev-4.7.
Cheers,
Joel
>>
>> &vuart {
>> > status = "okay";
>> };
>>
>> +&gfx {
>> + status = "okay";
>> +};
>> +
>> &pinctrl {
>> > aspeed,external-nodes = <&gfx &lhc>;
>> };
>> diff --git a/arch/arm/mach-aspeed/aspeed.c b/arch/arm/mach-aspeed/aspeed.c
>> index a7b03a0..0717181 100644
>> --- a/arch/arm/mach-aspeed/aspeed.c
>> +++ b/arch/arm/mach-aspeed/aspeed.c
>> @@ -238,6 +238,21 @@ static void __init do_romulus_setup(void)
>> writel(reg & ~BIT(4), AST_IO(AST_BASE_LPC | 0x98));
>> }
>>
>> +static void __init do_lanyang_setup(void)
>> +{
>> + unsigned long reg;
>> +
>> + do_common_setup();
>> +
>> + /* Disable default behavior of UART1 being held in reset by LPCRST#.
>> + * By releasing UART1 from being controlled by LPC reset, it becomes
>> + * immediately available regardless of the host being up.
>> + */
>> + reg = readl(AST_IO(AST_BASE_LPC | 0x98));
>> + /* Clear "Enable UART1 reset source from LPC" */
>> + writel(reg & ~BIT(4), AST_IO(AST_BASE_LPC | 0x98));
>> +}
>> +
>> > #define SCU_PASSWORD 0x1688A8A8
>>
>> static void __init aspeed_init_early(void)
>> @@ -275,6 +290,8 @@ static void __init aspeed_init_early(void)
>> > do_witherspoon_setup();
>> > if (of_machine_is_compatible("ibm,romulus-bmc"))
>> > do_romulus_setup();
>> + if (of_machine_is_compatible("inventec,lanyang-bmc"))
>> + do_lanyang_setup();
>> }
>>
>> static void __init aspeed_map_io(void)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-04-27 6:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-27 4:02 [PATCH linux dev-4.7 v4] ARM: dts: aspeed: Modify Laanyang BMC device tree Ken Chen
2017-04-27 6:17 ` Andrew Jeffery
2017-04-27 6:20 ` Joel Stanley
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.