| Message ID | 20191120040725.32207-8-jerry.huang@nxp.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | new board ls1028ardb introduced | expand |
On Wed, 20 Nov 2019 12:07:23 +0800 Changming Huang <jerry.huang@nxp.com> wrote: > Because GPIO is used as interrupt for eNETC PHY and Micro-bus, > IIC5_PMUX and CLK_OUT_PMUX are enabled for GPIO. > > Signed-off-by: Changming Huang <jerry.huang@nxp.com> > --- > ...5_PMUX-for-GPIO-function.patch.conditional | 42 +++++++++++++++++++ > ...T_PMUX-for-GPIO-function.patch.conditional | 40 ++++++++++++++++++ > package/rcw/rcw.mk | 7 ++++ > 3 files changed, 89 insertions(+) > create mode 100644 package/rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch.conditional > create mode 100644 package/rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patch.conditional Sorry, but we really want to avoid conditional patches. Is there a better solution than this ? The patches modify only files in ls1028ardb/, and you apply them when the board name is ls1028ardb, so basically, you could just as well apply the patches unconditionally, no ? > +ifeq ($(findstring ls1028ardb, $(BR2_TARGET_UBOOT_BOARDNAME)), ls1028ardb) We really don't want to look at BR2_TARGET_UBOOT_BOARDNAME from package/rcw/. Best regards, Thomas
Hi, Thomas, Best Regards Jerry Huang > -----Original Message----- > From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > Sent: Wednesday, November 20, 2019 5:15 PM > To: Jerry Huang <jerry.huang@nxp.com> > Cc: buildroot@busybox.net > Subject: [EXT] Re: [Buildroot] [PATCH 7/9] package/rcw: Enable IIC5_PMUX and > CLK_OUT_PMUX for GPIO > > Caution: EXT Email > > On Wed, 20 Nov 2019 12:07:23 +0800 > Changming Huang <jerry.huang@nxp.com> wrote: > > > Because GPIO is used as interrupt for eNETC PHY and Micro-bus, > > IIC5_PMUX and CLK_OUT_PMUX are enabled for GPIO. > > > > Signed-off-by: Changming Huang <jerry.huang@nxp.com> > > --- > > ...5_PMUX-for-GPIO-function.patch.conditional | 42 > > +++++++++++++++++++ ...T_PMUX-for-GPIO-function.patch.conditional | 40 > ++++++++++++++++++ > > package/rcw/rcw.mk | 7 ++++ > > 3 files changed, 89 insertions(+) > > create mode 100644 > > package/rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch.c > > onditional create mode 100644 > > > package/rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patc > > h.conditional > > Sorry, but we really want to avoid conditional patches. Is there a better solution > than this ? > > The patches modify only files in ls1028ardb/, and you apply them when the > board name is ls1028ardb, so basically, you could just as well apply the patches > unconditionally, no ? I can change it to apply the patch unconfitionally. > > +ifeq ($(findstring ls1028ardb, $(BR2_TARGET_UBOOT_BOARDNAME)), > > +ls1028ardb) > > We really don't want to look at BR2_TARGET_UBOOT_BOARDNAME from > package/rcw/. > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbootlin.c > om&data=02%7C01%7Cjerry.huang%40nxp.com%7C219d7748f90148ab5c > d708d76d9a1a83%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637 > 098380943442208&sdata=C7gIJmLs7J8o6A2%2BlYs5HiKzQzSBMqUBWPET > TiW1iWY%3D&reserved=0
On Wed, 20 Nov 2019 09:34:13 +0000 Jerry Huang <jerry.huang@nxp.com> wrote: > > The patches modify only files in ls1028ardb/, and you apply them when the > > board name is ls1028ardb, so basically, you could just as well apply the patches > > unconditionally, no ? > I can change it to apply the patch unconfitionally. OK, thanks. Please make sure to submit the patch to the upstream rcw project, so that ultimately, we can drop the patches. Thanks, Thomas
Thanks a lot for your suggestion. Best Regards Jerry Huang > -----Original Message----- > From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > Sent: Wednesday, November 20, 2019 5:39 PM > To: Jerry Huang <jerry.huang@nxp.com> > Cc: buildroot@busybox.net > Subject: Re: [EXT] Re: [Buildroot] [PATCH 7/9] package/rcw: Enable IIC5_PMUX > and CLK_OUT_PMUX for GPIO > > Caution: EXT Email > > On Wed, 20 Nov 2019 09:34:13 +0000 > Jerry Huang <jerry.huang@nxp.com> wrote: > > > > The patches modify only files in ls1028ardb/, and you apply them > > > when the board name is ls1028ardb, so basically, you could just as > > > well apply the patches unconditionally, no ? > > I can change it to apply the patch unconfitionally. > > OK, thanks. Please make sure to submit the patch to the upstream rcw project, > so that ultimately, we can drop the patches. > > Thanks, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbootlin.c > om&data=02%7C01%7Cjerry.huang%40nxp.com%7Cb7d1e0c04eef467887 > dc08d76d9d7822%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637 > 098395434083898&sdata=JUgNCv0ZuKrsxcp%2F9rdqyK6ZFQ11Ic3NacjPuK > lB6hc%3D&reserved=0
diff --git a/package/rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch.conditional b/package/rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch.conditional new file mode 100644 index 0000000000..21c6c84cbd --- /dev/null +++ b/package/rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch.conditional @@ -0,0 +1,42 @@ +From 33b403cee1fa215927bc65dc14baf35a2fdbe7b3 Mon Sep 17 00:00:00 2001 +From: Jerry Huang <jerry.huang@nxp.com> +Date: Thu, 19 Sep 2019 12:12:20 +0800 +Subject: [PATCH 1/2] ls1028ardb: Enable IIC5_PMUX for GPIO function + +Set IIC5_PMUX = 1 to enable GPIO function. + +Signed-off-by: Jianchao Wang <jianchao.wang@nxp.com> +Signed-off-by: Jerry Huang <jerry.huang@nxp.com> +--- + ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw | 2 +- + ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw +index b46ea2e..5466a63 100644 +--- a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw ++++ b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw +@@ -26,7 +26,7 @@ SYSCLK_FREQ=600 + IIC2_PMUX=6 + IIC3_PMUX=2 + IIC4_PMUX=2 +-IIC5_PMUX=2 ++IIC5_PMUX=1 + IIC6_PMUX=2 + CLK_OUT_PMUX=2 + EC1_SAI4_5_PMUX=5 +diff --git a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw +index 04e2208..1908d8c 100644 +--- a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw ++++ b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw +@@ -26,7 +26,7 @@ SYSCLK_FREQ=600 + IIC2_PMUX=6 + IIC3_PMUX=2 + IIC4_PMUX=2 +-IIC5_PMUX=2 ++IIC5_PMUX=1 + IIC6_PMUX=3 + CLK_OUT_PMUX=2 + EC1_SAI4_5_PMUX=5 +-- +2.17.1 diff --git a/package/rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patch.conditional b/package/rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patch.conditional new file mode 100644 index 0000000000..4f00541d69 --- /dev/null +++ b/package/rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patch.conditional @@ -0,0 +1,40 @@ +From 4a3c9ea5d0c7bf8eec8cb6276d6f4d940f3946db Mon Sep 17 00:00:00 2001 +From: Jerry Huang <jerry.huang@nxp.com> +Date: Thu, 19 Sep 2019 12:13:48 +0800 +Subject: [PATCH 2/2] ls1028ardb/rcw: Enable CLK_OUT_PMUX for GPIO function + +Signed-off-by: Jianchao Wang <jianchao.wang@nxp.com> +Signed-off-by: Jerry Huang <jerry.huang@nxp.com> +--- + ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw | 2 +- + ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw +index 5466a63..a5ed4d4 100644 +--- a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw ++++ b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw +@@ -28,7 +28,7 @@ IIC3_PMUX=2 + IIC4_PMUX=2 + IIC5_PMUX=1 + IIC6_PMUX=2 +-CLK_OUT_PMUX=2 ++CLK_OUT_PMUX=1 + EC1_SAI4_5_PMUX=5 + EC1_SAI3_6_PMUX=5 + USB3_CLK_FSEL=39 +diff --git a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw +index 1908d8c..c930b83 100644 +--- a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw ++++ b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw +@@ -28,7 +28,7 @@ IIC3_PMUX=2 + IIC4_PMUX=2 + IIC5_PMUX=1 + IIC6_PMUX=3 +-CLK_OUT_PMUX=2 ++CLK_OUT_PMUX=1 + EC1_SAI4_5_PMUX=5 + EC1_SAI3_6_PMUX=5 + USB3_CLK_FSEL=39 +-- +2.17.1 diff --git a/package/rcw/rcw.mk b/package/rcw/rcw.mk index b12e577e39..a7e140eb1d 100644 --- a/package/rcw/rcw.mk +++ b/package/rcw/rcw.mk @@ -41,6 +41,13 @@ else RCW_BIN = $(call qstrip,$(BR2_PACKAGE_HOST_RCW_BIN)) RCW_PLATFORM = $(firstword $(subst /, ,$(RCW_BIN))) +ifeq ($(findstring ls1028ardb, $(BR2_TARGET_UBOOT_BOARDNAME)), ls1028ardb) +define HOST_RCW_CONFIGURE_CMDS + patch -p1 -s -d $(@D) < package/rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch.conditional; \ + patch -p1 -s -d $(@D) < package/rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patch.conditional +endef +endif + define HOST_RCW_BUILD_CMDS cd $(@D)/$(RCW_PLATFORM) && $(MAKE) endef
Because GPIO is used as interrupt for eNETC PHY and Micro-bus, IIC5_PMUX and CLK_OUT_PMUX are enabled for GPIO. Signed-off-by: Changming Huang <jerry.huang@nxp.com> --- ...5_PMUX-for-GPIO-function.patch.conditional | 42 +++++++++++++++++++ ...T_PMUX-for-GPIO-function.patch.conditional | 40 ++++++++++++++++++ package/rcw/rcw.mk | 7 ++++ 3 files changed, 89 insertions(+) create mode 100644 package/rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch.conditional create mode 100644 package/rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patch.conditional