leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'ti-v2021.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti

Browse Source 
- Fix ethernet on J721e
- Sync am335x DT nodes from Linux 5.9-rc7
- Minor Clock fixes
This commit is contained in:
Tom Rini 2021-02-22 09:12:04 -05:00
commit bced796e2d
7 changed files with 84 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/dts/am33xx-clocks.dtsi
View File

@ -539,7 +539,7 @@
}; };
&prcm { &prcm {
l4_per_cm: l4_per-cm@0 { per_cm: per-cm@0 {
compatible = "ti,omap4-cm"; compatible = "ti,omap4-cm";
reg = <0x0 0x400>; reg = <0x0 0x400>;
#address-cells = <1>; #address-cells = <1>;
@ -604,7 +604,7 @@
l4_wkup_clkctrl: l4-wkup-clkctrl@0 { l4_wkup_clkctrl: l4-wkup-clkctrl@0 {
compatible = "ti,clkctrl"; compatible = "ti,clkctrl";
reg = <0x4 0x10>, <0xb4 0x24>; reg = <0x0 0x10>, <0xb4 0x24>;
#clock-cells = <2>; #clock-cells = <2>;
}; };
@ -670,9 +670,9 @@
#size-cells = <1>; #size-cells = <1>;
ranges = <0 0xa00 0x100>; ranges = <0 0xa00 0x100>;
l4_cefuse_clkctrl: clk@20 { l4_cefuse_clkctrl: l4-cefuse-clkctrl@0 {
compatible = "ti,clkctrl"; compatible = "ti,clkctrl";
reg = <0x20 0x4>; reg = <0x0 0x24>;
#clock-cells = <2>; #clock-cells = <2>;
}; };
}; };

64
arch/arm/dts/am33xx-l4.dtsi
View File

@ -148,6 +148,28 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0x7000 0x1000>; ranges = <0x0 0x7000 0x1000>;
gpio0: gpio@0 {
compatible = "ti,omap4-gpio";
gpio-ranges = <&am33xx_pinmux 0 82 8>,
<&am33xx_pinmux 8 52 4>,
<&am33xx_pinmux 12 94 4>,
<&am33xx_pinmux 16 71 2>,
<&am33xx_pinmux 18 135 1>,
<&am33xx_pinmux 19 108 2>,
<&am33xx_pinmux 21 73 1>,
<&am33xx_pinmux 22 8 2>,
<&am33xx_pinmux 26 10 2>,
<&am33xx_pinmux 28 74 1>,
<&am33xx_pinmux 29 81 1>,
<&am33xx_pinmux 30 28 2>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x0 0x1000>;
interrupts = <96>;
};
}; };
target-module@9000 { /* 0x44e09000, ap 16 04.0 */ target-module@9000 { /* 0x44e09000, ap 16 04.0 */
@ -1200,6 +1222,20 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0x4c000 0x1000>; ranges = <0x0 0x4c000 0x1000>;
gpio1: gpio@0 {
compatible = "ti,omap4-gpio";
gpio-ranges = <&am33xx_pinmux 0 0 8>,
<&am33xx_pinmux 8 90 4>,
<&am33xx_pinmux 12 12 16>,
<&am33xx_pinmux 28 30 4>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x0 0x1000>;
interrupts = <98>;
};
}; };
target-module@50000 { /* 0x48050000, ap 34 2c.0 */ target-module@50000 { /* 0x48050000, ap 34 2c.0 */
@ -1570,6 +1606,19 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0xac000 0x1000>; ranges = <0x0 0xac000 0x1000>;
gpio2: gpio@0 {
compatible = "ti,omap4-gpio";
gpio-ranges = <&am33xx_pinmux 0 34 18>,
<&am33xx_pinmux 18 77 4>,
<&am33xx_pinmux 22 56 10>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x0 0x1000>;
interrupts = <32>;
};
}; };
target-module@ae000 { /* 0x481ae000, ap 56 3a.0 */ target-module@ae000 { /* 0x481ae000, ap 56 3a.0 */
@ -1593,6 +1642,21 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0xae000 0x1000>; ranges = <0x0 0xae000 0x1000>;
gpio3: gpio@0 {
compatible = "ti,omap4-gpio";
gpio-ranges = <&am33xx_pinmux 0 66 5>,
<&am33xx_pinmux 5 98 2>,
<&am33xx_pinmux 7 75 2>,
<&am33xx_pinmux 13 141 1>,
<&am33xx_pinmux 14 100 8>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x0 0x1000>;
interrupts = <62>;
};
}; };
target-module@b0000 { /* 0x481b0000, ap 58 50.0 */ target-module@b0000 { /* 0x481b0000, ap 58 50.0 */

44
arch/arm/dts/am33xx.dtsi
View File

@ -301,50 +301,6 @@
}; };
}; };
gpio0: gpio@44e07000 {
compatible = "ti,omap4-gpio";
ti,hwmods = "gpio1";
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x44e07000 0x1000>;
interrupts = <96>;
};
gpio1: gpio@4804c000 {
compatible = "ti,omap4-gpio";
ti,hwmods = "gpio2";
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x4804c000 0x1000>;
interrupts = <98>;
};
gpio2: gpio@481ac000 {
compatible = "ti,omap4-gpio";
ti,hwmods = "gpio3";
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x481ac000 0x1000>;
interrupts = <32>;
};
gpio3: gpio@481ae000 {
compatible = "ti,omap4-gpio";
ti,hwmods = "gpio4";
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x481ae000 0x1000>;
interrupts = <62>;
};
i2c0: i2c@44e0b000 { i2c0: i2c@44e0b000 {
compatible = "ti,omap4-i2c"; compatible = "ti,omap4-i2c";
#address-cells = <1>; #address-cells = <1>;

1
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi
View File

@ -114,6 +114,7 @@
reg = <0x0 0x46000000 0x0 0x200000>, reg = <0x0 0x46000000 0x0 0x200000>,
<0x0 0x40f00200 0x0 0x8>; <0x0 0x40f00200 0x0 0x8>;
reg-names = "cpsw_nuss", "mac_efuse"; reg-names = "cpsw_nuss", "mac_efuse";
/delete-property/ ranges;
cpsw-phy-sel@40f04040 { cpsw-phy-sel@40f04040 {
compatible = "ti,am654-cpsw-phy-sel"; compatible = "ti,am654-cpsw-phy-sel";

26
arch/sandbox/include/asm/clk.h
View File

@ -74,7 +74,7 @@ int sandbox_clk_query_requested(struct udevice *dev, int id);
* sandbox_clk_test_get - Ask the sandbox clock test device to request its * sandbox_clk_test_get - Ask the sandbox clock test device to request its
* clocks. * clocks.
* *
* @dev: The sandbox clock test (client) devivce. * @dev: The sandbox clock test (client) device.
* @return: 0 if OK, or a negative error code. * @return: 0 if OK, or a negative error code.
*/ */
int sandbox_clk_test_get(struct udevice *dev); int sandbox_clk_test_get(struct udevice *dev);
@ -83,7 +83,7 @@ int sandbox_clk_test_get(struct udevice *dev);
* sandbox_clk_test_devm_get - Ask the sandbox clock test device to request its * sandbox_clk_test_devm_get - Ask the sandbox clock test device to request its
* clocks using the managed API. * clocks using the managed API.
* *
* @dev: The sandbox clock test (client) devivce. * @dev: The sandbox clock test (client) device.
* @return: 0 if OK, or a negative error code. * @return: 0 if OK, or a negative error code.
*/ */
int sandbox_clk_test_devm_get(struct udevice *dev); int sandbox_clk_test_devm_get(struct udevice *dev);
@ -92,7 +92,7 @@ int sandbox_clk_test_devm_get(struct udevice *dev);
* sandbox_clk_test_get_bulk - Ask the sandbox clock test device to request its * sandbox_clk_test_get_bulk - Ask the sandbox clock test device to request its
* clocks with the bulk clk API. * clocks with the bulk clk API.
* *
* @dev: The sandbox clock test (client) devivce. * @dev: The sandbox clock test (client) device.
* @return: 0 if OK, or a negative error code. * @return: 0 if OK, or a negative error code.
*/ */
int sandbox_clk_test_get_bulk(struct udevice *dev); int sandbox_clk_test_get_bulk(struct udevice *dev);
@ -100,7 +100,7 @@ int sandbox_clk_test_get_bulk(struct udevice *dev);
* sandbox_clk_test_get_rate - Ask the sandbox clock test device to query a * sandbox_clk_test_get_rate - Ask the sandbox clock test device to query a
* clock's rate. * clock's rate.
* *
* @dev: The sandbox clock test (client) devivce. * @dev: The sandbox clock test (client) device.
* @id: The test device's clock ID to query. * @id: The test device's clock ID to query.
* @return: The rate of the clock. * @return: The rate of the clock.
*/ */
@ -118,7 +118,7 @@ ulong sandbox_clk_test_round_rate(struct udevice *dev, int id, ulong rate);
* sandbox_clk_test_set_rate - Ask the sandbox clock test device to set a * sandbox_clk_test_set_rate - Ask the sandbox clock test device to set a
* clock's rate. * clock's rate.
* *
* @dev: The sandbox clock test (client) devivce. * @dev: The sandbox clock test (client) device.
* @id: The test device's clock ID to configure. * @id: The test device's clock ID to configure.
* @return: The new rate of the clock. * @return: The new rate of the clock.
*/ */
@ -127,7 +127,7 @@ ulong sandbox_clk_test_set_rate(struct udevice *dev, int id, ulong rate);
* sandbox_clk_test_enable - Ask the sandbox clock test device to enable a * sandbox_clk_test_enable - Ask the sandbox clock test device to enable a
* clock. * clock.
* *
* @dev: The sandbox clock test (client) devivce. * @dev: The sandbox clock test (client) device.
* @id: The test device's clock ID to configure. * @id: The test device's clock ID to configure.
* @return: 0 if OK, or a negative error code. * @return: 0 if OK, or a negative error code.
*/ */
@ -136,7 +136,7 @@ int sandbox_clk_test_enable(struct udevice *dev, int id);
* sandbox_clk_test_enable_bulk - Ask the sandbox clock test device to enable * sandbox_clk_test_enable_bulk - Ask the sandbox clock test device to enable
* all clocks in it's clock bulk struct. * all clocks in it's clock bulk struct.
* *
* @dev: The sandbox clock test (client) devivce. * @dev: The sandbox clock test (client) device.
* @return: 0 if OK, or a negative error code. * @return: 0 if OK, or a negative error code.
*/ */
int sandbox_clk_test_enable_bulk(struct udevice *dev); int sandbox_clk_test_enable_bulk(struct udevice *dev);
@ -144,7 +144,7 @@ int sandbox_clk_test_enable_bulk(struct udevice *dev);
* sandbox_clk_test_disable - Ask the sandbox clock test device to disable a * sandbox_clk_test_disable - Ask the sandbox clock test device to disable a
* clock. * clock.
* *
* @dev: The sandbox clock test (client) devivce. * @dev: The sandbox clock test (client) device.
* @id: The test device's clock ID to configure. * @id: The test device's clock ID to configure.
* @return: 0 if OK, or a negative error code. * @return: 0 if OK, or a negative error code.
*/ */
@ -153,7 +153,7 @@ int sandbox_clk_test_disable(struct udevice *dev, int id);
* sandbox_clk_test_disable_bulk - Ask the sandbox clock test device to disable * sandbox_clk_test_disable_bulk - Ask the sandbox clock test device to disable
* all clocks in it's clock bulk struct. * all clocks in it's clock bulk struct.
* *
* @dev: The sandbox clock test (client) devivce. * @dev: The sandbox clock test (client) device.
* @return: 0 if OK, or a negative error code. * @return: 0 if OK, or a negative error code.
*/ */
int sandbox_clk_test_disable_bulk(struct udevice *dev); int sandbox_clk_test_disable_bulk(struct udevice *dev);
@ -161,7 +161,7 @@ int sandbox_clk_test_disable_bulk(struct udevice *dev);
* sandbox_clk_test_free - Ask the sandbox clock test device to free its * sandbox_clk_test_free - Ask the sandbox clock test device to free its
* clocks. * clocks.
* *
* @dev: The sandbox clock test (client) devivce. * @dev: The sandbox clock test (client) device.
* @return: 0 if OK, or a negative error code. * @return: 0 if OK, or a negative error code.
*/ */
int sandbox_clk_test_free(struct udevice *dev); int sandbox_clk_test_free(struct udevice *dev);
@ -169,7 +169,7 @@ int sandbox_clk_test_free(struct udevice *dev);
* sandbox_clk_test_release_bulk - Ask the sandbox clock test device to release * sandbox_clk_test_release_bulk - Ask the sandbox clock test device to release
* all clocks in it's clock bulk struct. * all clocks in it's clock bulk struct.
* *
* @dev: The sandbox clock test (client) devivce. * @dev: The sandbox clock test (client) device.
* @return: 0 if OK, or a negative error code. * @return: 0 if OK, or a negative error code.
*/ */
int sandbox_clk_test_release_bulk(struct udevice *dev); int sandbox_clk_test_release_bulk(struct udevice *dev);
@ -177,7 +177,7 @@ int sandbox_clk_test_release_bulk(struct udevice *dev);
* sandbox_clk_test_valid - Ask the sandbox clock test device to check its * sandbox_clk_test_valid - Ask the sandbox clock test device to check its
* clocks are valid. * clocks are valid.
* *
* @dev: The sandbox clock test (client) devivce. * @dev: The sandbox clock test (client) device.
* @return: 0 if OK, or a negative error code. * @return: 0 if OK, or a negative error code.
*/ */
int sandbox_clk_test_valid(struct udevice *dev); int sandbox_clk_test_valid(struct udevice *dev);
@ -185,7 +185,7 @@ int sandbox_clk_test_valid(struct udevice *dev);
* sandbox_clk_test_valid - Ask the sandbox clock test device to check its * sandbox_clk_test_valid - Ask the sandbox clock test device to check its
* clocks are valid. * clocks are valid.
* *
* @dev: The sandbox clock test (client) devivce. * @dev: The sandbox clock test (client) device.
* @return: 0 if OK, or a negative error code. * @return: 0 if OK, or a negative error code.
*/ */
struct clk *sandbox_clk_test_get_devm_clk(struct udevice *dev, int id); struct clk *sandbox_clk_test_get_devm_clk(struct udevice *dev, int id);

4
drivers/clk/ti/clk-ctrl.c
View File

@ -49,7 +49,7 @@ static int clk_ti_ctrl_disable(struct clk *clk)
} }
clk_modules[0] = (u32 *)(offs); clk_modules[0] = (u32 *)(offs);
dev_dbg(clk->dev, "module address=%p\n", clk_modules[0]); dev_dbg(clk->dev, "disable module @ %p\n", clk_modules[0]);
do_disable_clocks(NULL, clk_modules, 1); do_disable_clocks(NULL, clk_modules, 1);
return 0; return 0;
} }
@ -69,7 +69,7 @@ static int clk_ti_ctrl_enable(struct clk *clk)
} }
clk_modules[0] = (u32 *)(offs); clk_modules[0] = (u32 *)(offs);
dev_dbg(clk->dev, "module address=%p\n", clk_modules[0]); dev_dbg(clk->dev, "enable module @ %p\n", clk_modules[0]);
do_enable_clocks(NULL, clk_modules, 1); do_enable_clocks(NULL, clk_modules, 1);
return 0; return 0;
} }

1
include/linux/clk-provider.h
View File

@ -12,7 +12,6 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/err.h> #include <linux/err.h>
#include <clk-uclass.h> #include <clk-uclass.h>
#include <linux/err.h>
struct udevice; struct udevice;