delete more useless patches
This commit is contained in:
parent
684abc3cdf
commit
680aaf21ac
@ -1,42 +0,0 @@
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
|
||||
index 5caba225b4f7..1eba1324e5b9 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
|
||||
@@ -51,6 +51,7 @@
|
||||
compatible = "friendlyarm,nanopi-a64", "allwinner,sun50i-a64";
|
||||
|
||||
aliases {
|
||||
+ ethernet0 = &emac;
|
||||
serial0 = &uart0;
|
||||
};
|
||||
|
||||
@@ -67,6 +68,15 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&emac {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&rgmii_pins>;
|
||||
+ phy-mode = "rgmii";
|
||||
+ phy-handle = <&ext_rgmii_phy>;
|
||||
+ phy-supply = <®_dcdc1>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
/* i2c1 connected with gpio headers like pine64, bananapi */
|
||||
&i2c1 {
|
||||
pinctrl-names = "default";
|
||||
@@ -78,6 +88,13 @@
|
||||
bias-pull-up;
|
||||
};
|
||||
|
||||
+&mdio {
|
||||
+ ext_rgmii_phy: ethernet-phy@1 {
|
||||
+ compatible = "ethernet-phy-ieee802.3-c22";
|
||||
+ reg = <7>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
&mmc0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&mmc0_pins>;
|
||||
@ -1,30 +0,0 @@
|
||||
diff --git a/drivers/clk/sunxi-ng/ccu_nkmp.c b/drivers/clk/sunxi-ng/ccu_nkmp.c
|
||||
index ebd9436d2c7c..9b49adb20d07 100644
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nkmp.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nkmp.c
|
||||
@@ -137,6 +137,13 @@ static long ccu_nkmp_round_rate(struct clk_hw *hw, unsigned long rate,
|
||||
if (nkmp->common.features & CCU_FEATURE_FIXED_POSTDIV)
|
||||
rate *= nkmp->fixed_post_div;
|
||||
|
||||
+ if (nkmp->max_rate && rate > nkmp->max_rate) {
|
||||
+ rate = nkmp->max_rate;
|
||||
+ if (nkmp->common.features & CCU_FEATURE_FIXED_POSTDIV)
|
||||
+ rate /= nkmp->fixed_post_div;
|
||||
+ return rate;
|
||||
+ }
|
||||
+
|
||||
_nkmp.min_n = nkmp->n.min ?: 1;
|
||||
_nkmp.max_n = nkmp->n.max ?: 1 << nkmp->n.width;
|
||||
_nkmp.min_k = nkmp->k.min ?: 1;
|
||||
diff --git a/drivers/clk/sunxi-ng/ccu_nkmp.h b/drivers/clk/sunxi-ng/ccu_nkmp.h
|
||||
index 6940503e7fc4..a9f8c116a745 100644
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nkmp.h
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nkmp.h
|
||||
@@ -35,6 +35,7 @@ struct ccu_nkmp {
|
||||
struct ccu_div_internal p;
|
||||
|
||||
unsigned int fixed_post_div;
|
||||
+ unsigned int max_rate;
|
||||
|
||||
struct ccu_common common;
|
||||
};
|
||||
@ -1,20 +0,0 @@
|
||||
diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-a83t.c b/drivers/clk/sunxi-ng/ccu-sun8i-a83t.c
|
||||
index 7d08015b980d..2d6555d73170 100644
|
||||
--- a/drivers/clk/sunxi-ng/ccu-sun8i-a83t.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu-sun8i-a83t.c
|
||||
@@ -108,6 +108,7 @@ static struct ccu_nkmp pll_video0_clk = {
|
||||
.n = _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),
|
||||
.m = _SUNXI_CCU_DIV(16, 1), /* input divider */
|
||||
.p = _SUNXI_CCU_DIV(0, 2), /* output divider */
|
||||
+ .max_rate = 3000000000UL,
|
||||
.common = {
|
||||
.reg = 0x010,
|
||||
.lock_reg = CCU_SUN8I_A83T_LOCK_REG,
|
||||
@@ -220,6 +221,7 @@ static struct ccu_nkmp pll_video1_clk = {
|
||||
.n = _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),
|
||||
.m = _SUNXI_CCU_DIV(16, 1), /* input divider */
|
||||
.p = _SUNXI_CCU_DIV(0, 2), /* external divider p */
|
||||
+ .max_rate = 3000000000UL,
|
||||
.common = {
|
||||
.reg = 0x04c,
|
||||
.lock_reg = CCU_SUN8I_A83T_LOCK_REG,
|
||||
@ -1,24 +0,0 @@
|
||||
diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi
|
||||
index afed6c0dea6f..798ab48c5479 100644
|
||||
--- a/arch/arm/boot/dts/sun8i-a83t.dtsi
|
||||
+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi
|
||||
@@ -992,6 +992,19 @@
|
||||
reg = <0x1f01c00 0x400>;
|
||||
};
|
||||
|
||||
+ r_cir: ir@1f02000 {
|
||||
+ compatible = "allwinner,sun8i-a83t-ir",
|
||||
+ "allwinner,sun5i-a13-ir";
|
||||
+ clocks = <&r_ccu CLK_APB0_IR>, <&r_ccu CLK_IR>;
|
||||
+ clock-names = "apb", "ir";
|
||||
+ resets = <&r_ccu RST_APB0_IR>;
|
||||
+ interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ reg = <0x01f02000 0x400>;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&r_cir_pin>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
r_pio: pinctrl@1f02c00 {
|
||||
compatible = "allwinner,sun8i-a83t-r-pinctrl";
|
||||
reg = <0x01f02c00 0x400>;
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
|
||||
index c3bff1105e5d..2f4d93de836e 100644
|
||||
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
|
||||
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
|
||||
@@ -818,7 +818,7 @@
|
||||
clock-names = "apb", "ir";
|
||||
resets = <&r_ccu RST_APB0_IR>;
|
||||
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
|
||||
- reg = <0x01f02000 0x40>;
|
||||
+ reg = <0x01f02000 0x400>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
|
||||
index 3b579d7..679a9aa 100644
|
||||
--- a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
|
||||
@@ -301,8 +301,8 @@
|
||||
|
||||
®_dldo3 {
|
||||
regulator-always-on;
|
||||
- regulator-min-microvolt = <2500000>;
|
||||
- regulator-max-microvolt = <2500000>;
|
||||
+ regulator-min-microvolt = <3300000>;
|
||||
+ regulator-max-microvolt = <3300000>;
|
||||
regulator-name = "vcc-pd";
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user