kernel: RV1106 6.18.46 patch series + hermetic build wrapper (P1)
- patches/: the pristine-6.18.46 -> WardenOS delta as a 13-patch, subsystem-split series (223 files, ~136K lines: clk, pinctrl, DTs/mach, usb-phy, VOP/panel/rgb, mailbox, pvtm, rknpu, rga, aic8800 wifi, audio codec, thermal/rtc/adc/gmac/touch). Verified: every patch applies cleanly onto pristine (git apply --check), the full series reproduces the hardware-verified tree, and the applied source configures + builds the warden dtb + rockchip DRM drivers (rc=0). - build/build-kernel.sh: fetch+verify pristine (sha256-pinned) -> apply series -> warden_defconfig -> zImage + rv1106-warden.dtb. build/warden_defconfig captured. - CI: `patches-apply` (GitHub-hosted, cached tarball) enforces the series applies; `kernel-build` (self-hosted warden-sdk runner, dispatch-gated until registered) runs the full build and uploads the image. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017wB8KB3MMQztRDXCMCkPrf
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
c7ff63b3f6
commit
f2a9c0a32c
@@ -0,0 +1,275 @@
|
||||
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
|
||||
index f1cba3d23..71ec73d41 100644
|
||||
--- a/drivers/pinctrl/pinctrl-rockchip.c
|
||||
+++ b/drivers/pinctrl/pinctrl-rockchip.c
|
||||
@@ -1466,6 +1466,166 @@ static int rv1108_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
|
||||
#define RV1108_DRV_PINS_PER_REG 8
|
||||
#define RV1108_DRV_BANK_STRIDE 16
|
||||
|
||||
+#define RV1106_DRV_BITS_PER_PIN 8
|
||||
+#define RV1106_DRV_PINS_PER_REG 2
|
||||
+#define RV1106_DRV_GPIO0_OFFSET 0x10
|
||||
+#define RV1106_DRV_GPIO1_OFFSET 0x80
|
||||
+#define RV1106_DRV_GPIO2_OFFSET 0x100C0
|
||||
+#define RV1106_DRV_GPIO3_OFFSET 0x20100
|
||||
+#define RV1106_DRV_GPIO4_OFFSET 0x30020
|
||||
+
|
||||
+static int rv1106_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
|
||||
+ int pin_num, struct regmap **regmap,
|
||||
+ int *reg, u8 *bit)
|
||||
+{
|
||||
+ struct rockchip_pinctrl *info = bank->drvdata;
|
||||
+
|
||||
+ /* GPIO0_IOC is located in PMU */
|
||||
+ switch (bank->bank_num) {
|
||||
+ case 0:
|
||||
+ *regmap = info->regmap_pmu;
|
||||
+ *reg = RV1106_DRV_GPIO0_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ case 1:
|
||||
+ *regmap = info->regmap_base;
|
||||
+ *reg = RV1106_DRV_GPIO1_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ case 2:
|
||||
+ *regmap = info->regmap_base;
|
||||
+ *reg = RV1106_DRV_GPIO2_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ case 3:
|
||||
+ *regmap = info->regmap_base;
|
||||
+ *reg = RV1106_DRV_GPIO3_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ case 4:
|
||||
+ *regmap = info->regmap_base;
|
||||
+ *reg = RV1106_DRV_GPIO4_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ default:
|
||||
+ dev_err(info->dev, "unsupported bank_num %d\n", bank->bank_num);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ *reg += ((pin_num / RV1106_DRV_PINS_PER_REG) * 4);
|
||||
+ *bit = pin_num % RV1106_DRV_PINS_PER_REG;
|
||||
+ *bit *= RV1106_DRV_BITS_PER_PIN;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+#define RV1106_PULL_BITS_PER_PIN 2
|
||||
+#define RV1106_PULL_PINS_PER_REG 8
|
||||
+#define RV1106_PULL_GPIO0_OFFSET 0x38
|
||||
+#define RV1106_PULL_GPIO1_OFFSET 0x1C0
|
||||
+#define RV1106_PULL_GPIO2_OFFSET 0x101D0
|
||||
+#define RV1106_PULL_GPIO3_OFFSET 0x201E0
|
||||
+#define RV1106_PULL_GPIO4_OFFSET 0x30070
|
||||
+
|
||||
+static int rv1106_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
|
||||
+ int pin_num, struct regmap **regmap,
|
||||
+ int *reg, u8 *bit)
|
||||
+{
|
||||
+ struct rockchip_pinctrl *info = bank->drvdata;
|
||||
+
|
||||
+ /* GPIO0_IOC is located in PMU */
|
||||
+ switch (bank->bank_num) {
|
||||
+ case 0:
|
||||
+ *regmap = info->regmap_pmu;
|
||||
+ *reg = RV1106_PULL_GPIO0_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ case 1:
|
||||
+ *regmap = info->regmap_base;
|
||||
+ *reg = RV1106_PULL_GPIO1_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ case 2:
|
||||
+ *regmap = info->regmap_base;
|
||||
+ *reg = RV1106_PULL_GPIO2_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ case 3:
|
||||
+ *regmap = info->regmap_base;
|
||||
+ *reg = RV1106_PULL_GPIO3_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ case 4:
|
||||
+ *regmap = info->regmap_base;
|
||||
+ *reg = RV1106_PULL_GPIO4_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ default:
|
||||
+ dev_err(info->dev, "unsupported bank_num %d\n", bank->bank_num);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ *reg += ((pin_num / RV1106_PULL_PINS_PER_REG) * 4);
|
||||
+ *bit = pin_num % RV1106_PULL_PINS_PER_REG;
|
||||
+ *bit *= RV1106_PULL_BITS_PER_PIN;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+#define RV1106_SMT_BITS_PER_PIN 1
|
||||
+#define RV1106_SMT_PINS_PER_REG 8
|
||||
+#define RV1106_SMT_GPIO0_OFFSET 0x40
|
||||
+#define RV1106_SMT_GPIO1_OFFSET 0x280
|
||||
+#define RV1106_SMT_GPIO2_OFFSET 0x10290
|
||||
+#define RV1106_SMT_GPIO3_OFFSET 0x202A0
|
||||
+#define RV1106_SMT_GPIO4_OFFSET 0x300A0
|
||||
+
|
||||
+static int rv1106_calc_schmitt_reg_and_bit(struct rockchip_pin_bank *bank,
|
||||
+ int pin_num,
|
||||
+ struct regmap **regmap,
|
||||
+ int *reg, u8 *bit)
|
||||
+{
|
||||
+ struct rockchip_pinctrl *info = bank->drvdata;
|
||||
+
|
||||
+ /* GPIO0_IOC is located in PMU */
|
||||
+ switch (bank->bank_num) {
|
||||
+ case 0:
|
||||
+ *regmap = info->regmap_pmu;
|
||||
+ *reg = RV1106_SMT_GPIO0_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ case 1:
|
||||
+ *regmap = info->regmap_base;
|
||||
+ *reg = RV1106_SMT_GPIO1_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ case 2:
|
||||
+ *regmap = info->regmap_base;
|
||||
+ *reg = RV1106_SMT_GPIO2_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ case 3:
|
||||
+ *regmap = info->regmap_base;
|
||||
+ *reg = RV1106_SMT_GPIO3_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ case 4:
|
||||
+ *regmap = info->regmap_base;
|
||||
+ *reg = RV1106_SMT_GPIO4_OFFSET;
|
||||
+ break;
|
||||
+
|
||||
+ default:
|
||||
+ dev_err(info->dev, "unsupported bank_num %d\n", bank->bank_num);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ *reg += ((pin_num / RV1106_SMT_PINS_PER_REG) * 4);
|
||||
+ *bit = pin_num % RV1106_SMT_PINS_PER_REG;
|
||||
+ *bit *= RV1106_SMT_BITS_PER_PIN;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static int rv1108_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
|
||||
int pin_num, struct regmap **regmap,
|
||||
int *reg, u8 *bit)
|
||||
@@ -2751,7 +2911,8 @@ static int rockchip_set_drive_perpin(struct rockchip_pin_bank *bank,
|
||||
goto config;
|
||||
} else if (ctrl->type == RK3528 ||
|
||||
ctrl->type == RK3562 ||
|
||||
- ctrl->type == RK3568) {
|
||||
+ ctrl->type == RK3568 ||
|
||||
+ ctrl->type == RV1106) {
|
||||
rmask_bits = RK3568_DRV_BITS_PER_PIN;
|
||||
ret = (1 << (strength + 1)) - 1;
|
||||
goto config;
|
||||
@@ -2888,6 +3049,7 @@ static int rockchip_get_pull(struct rockchip_pin_bank *bank, int pin_num)
|
||||
? PIN_CONFIG_BIAS_PULL_PIN_DEFAULT
|
||||
: PIN_CONFIG_BIAS_DISABLE;
|
||||
case PX30:
|
||||
+ case RV1106:
|
||||
case RV1108:
|
||||
case RK3188:
|
||||
case RK3288:
|
||||
@@ -2949,6 +3111,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
|
||||
ret = regmap_write(regmap, reg, data);
|
||||
break;
|
||||
case PX30:
|
||||
+ case RV1106:
|
||||
case RV1108:
|
||||
case RV1126:
|
||||
case RK3188:
|
||||
@@ -3218,6 +3381,7 @@ static bool rockchip_pinconf_pull_valid(struct rockchip_pin_ctrl *ctrl,
|
||||
case RK3066B:
|
||||
return pull ? false : true;
|
||||
case PX30:
|
||||
+ case RV1106:
|
||||
case RV1108:
|
||||
case RV1126:
|
||||
case RK3188:
|
||||
@@ -3960,6 +4124,48 @@ static struct rockchip_pin_ctrl px30_pin_ctrl = {
|
||||
.schmitt_calc_reg = px30_calc_schmitt_reg_and_bit,
|
||||
};
|
||||
|
||||
+static struct rockchip_pin_bank rv1106_pin_banks[] = {
|
||||
+ PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0",
|
||||
+ IOMUX_WIDTH_4BIT | IOMUX_SOURCE_PMU,
|
||||
+ IOMUX_WIDTH_4BIT | IOMUX_SOURCE_PMU,
|
||||
+ IOMUX_WIDTH_4BIT | IOMUX_SOURCE_PMU,
|
||||
+ IOMUX_WIDTH_4BIT | IOMUX_SOURCE_PMU),
|
||||
+ PIN_BANK_IOMUX_FLAGS_OFFSET(1, 32, "gpio1",
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ 0, 0x08, 0x10, 0x18),
|
||||
+ PIN_BANK_IOMUX_FLAGS_OFFSET(2, 32, "gpio2",
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ 0x10020, 0x10028, 0, 0),
|
||||
+ PIN_BANK_IOMUX_FLAGS_OFFSET(3, 32, "gpio3",
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ 0x20040, 0x20048, 0x20050, 0x20058),
|
||||
+ PIN_BANK_IOMUX_FLAGS_OFFSET(4, 24, "gpio4",
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ IOMUX_WIDTH_4BIT,
|
||||
+ 0,
|
||||
+ 0x30000, 0x30008, 0x30010, 0),
|
||||
+};
|
||||
+
|
||||
+static struct rockchip_pin_ctrl rv1106_pin_ctrl __maybe_unused = {
|
||||
+ .pin_banks = rv1106_pin_banks,
|
||||
+ .nr_banks = ARRAY_SIZE(rv1106_pin_banks),
|
||||
+ .label = "RV1106-GPIO",
|
||||
+ .type = RV1106,
|
||||
+ .pull_calc_reg = rv1106_calc_pull_reg_and_bit,
|
||||
+ .drv_calc_reg = rv1106_calc_drv_reg_and_bit,
|
||||
+ .schmitt_calc_reg = rv1106_calc_schmitt_reg_and_bit,
|
||||
+};
|
||||
+
|
||||
static struct rockchip_pin_bank rv1108_pin_banks[] = {
|
||||
PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", IOMUX_SOURCE_PMU,
|
||||
IOMUX_SOURCE_PMU,
|
||||
@@ -4531,6 +4737,8 @@ static struct rockchip_pin_ctrl rk3588_pin_ctrl = {
|
||||
static const struct of_device_id rockchip_pinctrl_dt_match[] = {
|
||||
{ .compatible = "rockchip,px30-pinctrl",
|
||||
.data = &px30_pin_ctrl },
|
||||
+ { .compatible = "rockchip,rv1106-pinctrl",
|
||||
+ .data = &rv1106_pin_ctrl },
|
||||
{ .compatible = "rockchip,rv1108-pinctrl",
|
||||
.data = &rv1108_pin_ctrl },
|
||||
{ .compatible = "rockchip,rv1126-pinctrl",
|
||||
diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockchip.h
|
||||
index 35cd38079..8d4b753ba 100644
|
||||
--- a/drivers/pinctrl/pinctrl-rockchip.h
|
||||
+++ b/drivers/pinctrl/pinctrl-rockchip.h
|
||||
@@ -185,6 +185,7 @@
|
||||
|
||||
enum rockchip_pinctrl_type {
|
||||
PX30,
|
||||
+ RV1106,
|
||||
RV1108,
|
||||
RV1126,
|
||||
RK2928,
|
||||
Reference in New Issue
Block a user