Skip to content

soc: renesas: ra: ra4m1: Migrate to FSP-based configuration #76794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 20, 2024
Merged

soc: renesas: ra: ra4m1: Migrate to FSP-based configuration #76794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0fcfa30
soc: renesas: ra: ra4m1: Migrate to FSP-based configuration
soburi Aug 3, 2024
3ec1008
soc: renesas: ra: ra4m1: Adapts the Option Setting Memory to FSP.
soburi Aug 21, 2024
2954fa6
dts: arm: renesas: ra4: Use renesas,ra-pinctrl-pfs driver
soburi Aug 7, 2024
db19098
dts: arm: renesas: ra4: Use renesas,ra-cgc-pclkblock driver
soburi Aug 21, 2024
f7cb154
boards: mikroe: clicker_ra4m1: Migrate to FSP
soburi Aug 21, 2024
8ed2b50
boards: arduino: uno_r4: Migrate to FSP
soburi Aug 21, 2024
cb0d010
boards: arduino: uno_r4: remove CONFIG_PINCTRL from defconfig of uno_r4
soburi Oct 9, 2024
995370a
drivers: pinctrl: Remove renesas,ra-pinctrl driver
soburi Aug 7, 2024
49b63b1
drivers: clock_contrl: Remove renesas,ra-clock-generation-circuit driver
soburi Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 26 additions & 8 deletions boards/arduino/uno_r4/arduino_uno_r4_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,30 @@
clock-frequency = <48000000>;
};

&cgc {
clock-source = <&hoco>;
iclk-div = <1>;
pclka-div = <1>;
pclkb-div = <2>;
pclkc-div = <1>;
pclkd-div = <1>;
fclk-div = <2>;
&pclkblock {
clocks = <&hoco>;
};

&iclk {
div = <1>;
};

&pclka {
div = <1>;
};

&pclkb {
div = <2>;
};

&pclkc {
div = <1>;
};

&pclkd {
div = <1>;
};

&fclk {
div = <2>;
};
10 changes: 8 additions & 2 deletions boards/arduino/uno_r4/arduino_uno_r4_minima-pinctrl.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-r7fa4m1xxxxxx.h>
#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h>

&pinctrl {
sci2_default: sci2_default {
group1 {
pinmux = <P301_RXD2>, <P302_TXD2>;
/* tx */
psels = <RA_PSEL(RA_PSEL_SCI_2, 3, 2)>;
drive-strength = "medium";
};
group2 {
/* rx */
psels = <RA_PSEL(RA_PSEL_SCI_2, 3, 1)>;
};
};
};
2 changes: 0 additions & 2 deletions boards/arduino/uno_r4/arduino_uno_r4_minima_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ CONFIG_UART_CONSOLE=y
# Enable GPIO
CONFIG_GPIO=y

CONFIG_PINCTRL=y

CONFIG_CLOCK_CONTROL=y

CONFIG_USE_DT_CODE_PARTITION=y
10 changes: 8 additions & 2 deletions boards/arduino/uno_r4/arduino_uno_r4_wifi-pinctrl.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-r7fa4m1xxxxxx.h>
#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h>

&pinctrl {
sci2_default: sci2_default {
group1 {
pinmux = <P301_RXD2>, <P302_TXD2>;
/* tx */
psels = <RA_PSEL(RA_PSEL_SCI_2, 3, 2)>;
drive-strength = "medium";
};
group2 {
/* rx */
psels = <RA_PSEL(RA_PSEL_SCI_2, 3, 1)>;
};
};
};
2 changes: 0 additions & 2 deletions boards/arduino/uno_r4/arduino_uno_r4_wifi_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ CONFIG_UART_CONSOLE=y
# Enable GPIO
CONFIG_GPIO=y

CONFIG_PINCTRL=y

CONFIG_CLOCK_CONTROL=y

CONFIG_USE_DT_CODE_PARTITION=y
45 changes: 34 additions & 11 deletions boards/mikroe/clicker_ra4m1/mikroe_clicker_ra4m1.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

/dts-v1/;
#include <renesas/ra/r7fa4m1ab3cfm.dtsi>
#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-r7fa4m1xxxxxx.h>
#include <zephyr/dt-bindings/gpio/gpio.h>
#include <zephyr/dt-bindings/input/input-event-codes.h>
#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h>

/ {
model = "Mikroe Clicker RA4M1";
Expand Down Expand Up @@ -52,7 +52,12 @@
&pinctrl {
sci0_default: sci0_default {
group1 {
pinmux = <P410_RXD0>, <P411_TXD0>;
/* tx */
psels = <RA_PSEL(RA_PSEL_SCI_0, 4, 11)>;
};
group2 {
/* rx */
psels = <RA_PSEL(RA_PSEL_SCI_0, 4, 10)>;
};
};
};
Expand All @@ -79,17 +84,35 @@
status = "okay";
};

&mosc {
&xtal {
status = "okay";
clock-frequency = <12000000>;
};

&cgc {
clock-source = <&mosc>;
iclk-div = <1>;
pclka-div = <1>;
pclkb-div = <2>;
pclkc-div = <1>;
pclkd-div = <1>;
fclk-div = <2>;
&pclkblock {
clocks = <&xtal>;
};

&iclk {
div = <1>;
};

&pclka {
div = <1>;
};

&pclkb {
div = <2>;
};

&pclkc {
div = <1>;
};

&pclkd {
div = <1>;
};

&fclk {
div = <2>;
};
1 change: 0 additions & 1 deletion drivers/clock_control/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_SI32_APB clock_cont
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_SMARTBOND clock_control_smartbond.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NUMAKER_SCC clock_control_numaker_scc.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NXP_S32 clock_control_nxp_s32.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RENESAS_RA clock_control_renesas_ra.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RENESAS_RA_CGC clock_control_renesas_ra_cgc.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_AMBIQ clock_control_ambiq.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_PWM clock_control_pwm.c)
Expand Down
2 changes: 0 additions & 2 deletions drivers/clock_control/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ source "drivers/clock_control/Kconfig.nxp_s32"

source "drivers/clock_control/Kconfig.agilex5"

source "drivers/clock_control/Kconfig.renesas_ra"

source "drivers/clock_control/Kconfig.renesas_ra_cgc"

source "drivers/clock_control/Kconfig.max32"
Expand Down
9 changes: 0 additions & 9 deletions drivers/clock_control/Kconfig.renesas_ra
View file
Open in desktop

This file was deleted.

Loading
Loading